diff --git a/appendices/aliases.xml b/appendices/aliases.xml
index e08ecb5cff6e..f0d81fd51e28 100644
--- a/appendices/aliases.xml
+++ b/appendices/aliases.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<appendix xml:id="aliases" xmlns="http://docbook.org/ns/docbook">
+<appendix xml:id="aliases" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>List of Function Aliases</title>
  <para>
   There are quite a few functions in PHP which you can call with more
@@ -234,92 +234,92 @@
      <row>
       <entry>mysql</entry>
       <entry><function>mysql_db_query</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_createdb</entry>
       <entry><function>mysql_create_db</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_db_name</entry>
       <entry><function>mysql_result</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_dbname</entry>
       <entry><function>mysql_result</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_dropdb</entry>
       <entry><function>mysql_drop_db</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_fieldflags</entry>
       <entry><function>mysql_field_flags</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_fieldlen</entry>
       <entry><function>mysql_field_len</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_fieldname</entry>
       <entry><function>mysql_field_name</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_fieldtable</entry>
       <entry><function>mysql_field_table</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_fieldtype</entry>
       <entry><function>mysql_field_type</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_freeresult</entry>
       <entry><function>mysql_free_result</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_listdbs</entry>
       <entry><function>mysql_list_dbs</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_listfields</entry>
       <entry><function>mysql_list_fields</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_listtables</entry>
       <entry><function>mysql_list_tables</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_numfields</entry>
       <entry><function>mysql_num_fields</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_numrows</entry>
       <entry><function>mysql_num_rows</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_selectdb</entry>
       <entry><function>mysql_select_db</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>mysql_tablename</entry>
       <entry><function>mysql_result</function></entry>
-      <entry><link linkend="ref.mysql">MySQL</link></entry>
+      <entry><link xlink:href="../extensions/ref.mysql.php">MySQL</link></entry>
      </row>
      <row>
       <entry>ociassignelem</entry>
@@ -594,7 +594,7 @@
      <row>
       <entry>recode</entry>
       <entry><function>recode_string</function></entry>
-      <entry><link linkend="ref.recode">Recode</link></entry>
+      <entry><link xlink:href="../extensions/ref.recode.php">Recode</link></entry>
      </row>
      <row>
       <entry>show_source</entry>
diff --git a/appendices/extensions.xml b/appendices/extensions.xml
index 302fd4ce2920..88e91452a0de 100644
--- a/appendices/extensions.xml
+++ b/appendices/extensions.xml
@@ -8,35 +8,22 @@
 
   <itemizedlist>
    <listitem><simpara><xref linkend="book.apache"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.apcu"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.array"/></simpara></listitem>
    <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.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.ctype"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.cubrid"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.curl"/></simpara></listitem>
    <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.dio"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dir"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.dom"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ds"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.eio"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.enchant"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.errorfunc"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ev"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.event"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.exec"/></simpara></listitem>
    <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.fdf"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ffi"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.fileinfo"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.filesystem"/></simpara></listitem>
@@ -44,154 +31,73 @@
    <listitem><simpara><xref linkend="book.fpm"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.ftp"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.funchand"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.gearman"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.gender"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.geoip"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.gettext"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.gmagick"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.gmp"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.gnupg"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.hash"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.hrtime"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ibase"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ibm-db2"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.iconv"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.igbinary"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.image"/></simpara></listitem>
-   <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.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.litespeed"/></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>
    <listitem><simpara><xref linkend="book.math"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.mbstring"/></simpara></listitem>
-   <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.mhash"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.misc"/></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.network"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.oauth"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.oci8"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.opcache"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.openal"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.openssl"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.operator"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.outcontrol"/></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>
    <listitem><simpara><xref linkend="book.pcre"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.pdo"/></simpara></listitem>
-   <listitem><simpara><xref linkend="ref.pdo-cubrid"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-dblib"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-firebird"/></simpara></listitem>
-   <listitem><simpara><xref linkend="ref.pdo-ibm"/></simpara></listitem>
-   <listitem><simpara><xref linkend="ref.pdo-informix"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-mysql"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-oci"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-odbc"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-pgsql"/></simpara></listitem>
    <listitem><simpara><xref linkend="ref.pdo-sqlite"/></simpara></listitem>
-   <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.posix"/></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.random"/></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.rnp"/></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>
    <listitem><simpara><xref linkend="book.session"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.shmop"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.simdjson"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.simplexml"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.snmp"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.soap"/></simpara></listitem>
    <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.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.svm"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.svn"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.swoole"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.sync"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.taint"/></simpara></listitem>
-   <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.trader"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.ui"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.uodbc"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.uopz"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.uri"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.url"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.v8js"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.var"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.var_representation"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.varnish"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.wddx"/></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.xpass"/></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>
-   <listitem><simpara><xref linkend="book.yar"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.yaz"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.zip"/></simpara></listitem>
    <listitem><simpara><xref linkend="book.zlib"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.zmq"/></simpara></listitem>
-   <listitem><simpara><xref linkend="book.zookeeper"/></simpara></listitem>
   </itemizedlist>
  </section>
 
@@ -310,104 +216,10 @@
    &extcat.membership.pecl;
 
    <itemizedlist>
-    <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.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.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.hrtime"/></para></listitem>
-    <listitem><para><xref linkend="book.ibase"/></para></listitem>
-    <listitem><para><xref linkend="book.ibm-db2"/></para></listitem>
-    <listitem><para><xref linkend="book.igbinary"/></para></listitem>
-    <listitem><para><xref linkend="book.imagick"/></para></listitem>
     <listitem><para><xref linkend="book.imap"/></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.mongodb"/></para></listitem>
-    <listitem><para><xref linkend="book.mqseries"/></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.oci8"/></para></listitem>
-    <listitem><para><xref linkend="book.openal"/></para></listitem>
-    <listitem><para><xref linkend="book.operator"/></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-oci"/></para></listitem>
-    <listitem><para><xref linkend="ref.pdo-sqlsrv"/></para></listitem>
-    <listitem><para><xref linkend="book.ps"/></para></listitem>
     <listitem><para><xref linkend="book.pspell"/></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.rnp"/></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.simdjson"/></para></listitem>
-    <listitem><para><xref linkend="book.solr"/></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.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.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.var_representation"/></para></listitem>
-    <listitem><para><xref linkend="book.varnish"/></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.xpass"/></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>
  </section>
@@ -420,27 +232,6 @@
 
    <itemizedlist>
     <listitem><para><xref linkend="book.imap"/></para></listitem>
-    <listitem><para><xref linkend="book.mysql"/></para></listitem>
-    <listitem><para><xref linkend="book.recode"/></para></listitem>
-    <listitem><para><xref linkend="book.stats"/></para></listitem>
-    <listitem><para><xref linkend="book.wddx"/></para></listitem>
-    <listitem><para><xref linkend="book.xmlrpc"/></para></listitem>
-   </itemizedlist>
-  </section>
-
-  <section xml:id="extensions.state.experimental">
-   &extcat.state.experimental;
-
-   <itemizedlist>
-    <listitem><para><xref linkend="book.gmagick"/></para></listitem>
-    <listitem><para><xref linkend="book.imagick"/></para></listitem>
-    <listitem><para><xref linkend="book.mqseries"/></para></listitem>
-    <listitem><para><xref linkend="book.parle"/></para></listitem>
-    <listitem><para><xref linkend="book.rnp"/></para></listitem>
-    <listitem><para><xref linkend="book.svm"/></para></listitem>
-    <listitem><para><xref linkend="book.svn"/></para></listitem>
-    <listitem><para><xref linkend="book.ui"/></para></listitem>
-    <listitem><para><xref linkend="book.zmq"/></para></listitem>
    </itemizedlist>
   </section>
  </section>
diff --git a/appendices/filters.xml b/appendices/filters.xml
index 5eb5a72f9ebb..5e496a8dd701 100644
--- a/appendices/filters.xml
+++ b/appendices/filters.xml
@@ -581,7 +581,7 @@ The compressed file is 1488 bytes long.
     <literal>mcrypt.*</literal> and <literal>mdecrypt.*</literal>
     provide symmetric encryption and decryption using libmcrypt.
     Both sets of filters support the same algorithms available to
-    <link linkend="ref.mcrypt">mcrypt extension</link> in the form of
+    <link xlink:href="../extensions/ref.mcrypt.php">mcrypt extension</link> in the form of
     <literal>mcrypt.ciphername</literal> where <parameter>ciphername</parameter>
     is the name of the cipher as it would be passed to
     <function>mcrypt_module_open</function>.
diff --git a/appendices/ini.list.xml b/appendices/ini.list.xml
index 99a9146072e6..6f4919e7a242 100644
--- a/appendices/ini.list.xml
+++ b/appendices/ini.list.xml
@@ -302,7 +302,6 @@
        <entry><constant>INI_ALL</constant></entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('expect.configuration.list')/*)"/>
       <row>
        <entry><link linkend="ini.expose-php">expose_php</link></entry>
        <entry><literal>"1"</literal></entry>
@@ -347,7 +346,6 @@
        <entry></entry>
       </row>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('image.configuration.list')/*)"/>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('geoip.configuration.list')/*)"/>
       <row>
        <entry>hard_timeout</entry>
        <entry><literal>"2"</literal></entry>
@@ -390,8 +388,6 @@
        <entry><constant>INI_ALL</constant></entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibase.configuration.list')/*)"/>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('ibm-db2.configuration.list')/*)"/>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('iconv.configuration.list')/*)"/>
       <row>
        <entry><link linkend="ini.ignore-repeated-errors">ignore_repeated_errors</link></entry>
@@ -486,15 +482,12 @@
        <entry></entry>
       </row>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mbstring.configuration.list')/*)"/>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mcrypt.configuration.list')/*)"/>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('memcache.ini.list')/*)"/>
       <row>
        <entry><link linkend="ini.memory-limit">memory_limit</link></entry>
        <entry><literal>"128M"</literal></entry>
        <entry><constant>INI_ALL</constant></entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysql.configuration.list')/*)"/>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqli.configuration.list')/*)"/>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mysqlnd.config.options.list')/*)"/>
       <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('oci8.configuration.list')/*)"/>
@@ -571,7 +564,6 @@
        <entry><constant>INI_PERDIR</constant></entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runkit7.configuration.list')/*)"/>
       <row>
        <entry><link linkend="ini.sendmail-from">sendmail_from</link></entry>
        <entry>&null;</entry>
@@ -715,7 +707,6 @@
        <entry><constant>INI_SYSTEM</constant></entry>
        <entry></entry>
       </row>
-      <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('uopz.configuration.list')/*)"/>
       <row>
        <entry><link linkend="ini.variables-order">variables_order</link></entry>
        <entry><literal>"EGPCS"</literal></entry>
diff --git a/appendices/migration56/changed-functions.xml b/appendices/migration56/changed-functions.xml
index 646b322b33ef..ceb8a3ae8e7e 100644
--- a/appendices/migration56/changed-functions.xml
+++ b/appendices/migration56/changed-functions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<sect1 xml:id="migration56.changed-functions">
+<sect1 xml:id="migration56.changed-functions" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Changed functions</title>
 
  <sect2 xml:id="migration56.changed-functions.core">
@@ -46,7 +46,7 @@
  </sect2>
 
  <sect2 xml:id="migration56.changed-functions.mcrypt">
-  <title><link linkend="book.mcrypt">Mcrypt</link></title>
+  <title><link xlink:href="../extensions/book.mcrypt.php">Mcrypt</link></title>
 
   <itemizedlist>
    <listitem>
diff --git a/appendices/migration56/incompatible.xml b/appendices/migration56/incompatible.xml
index 5ca3e4402b48..fce677341ee3 100644
--- a/appendices/migration56/incompatible.xml
+++ b/appendices/migration56/incompatible.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<sect1 xml:id="migration56.incompatible">
+<sect1 xml:id="migration56.incompatible" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Backward incompatible changes</title>
  <simpara>
   Although most existing PHP 5 code should work without changes, please take
@@ -99,7 +99,7 @@ array(3) {
  </sect2>
 
  <sect2 xml:id="migration56.incompatible.mcrypt">
-  <title><link linkend="book.mcrypt">Mcrypt</link> functions now require valid keys and IVs</title>
+  <title><link xlink:href="../extensions/book.mcrypt.php">Mcrypt</link> functions now require valid keys and IVs</title>
 
   <para>
    <function>mcrypt_encrypt</function>, <function>mcrypt_decrypt</function>,
diff --git a/appendices/migration70/incompatible/removed-functions.xml b/appendices/migration70/incompatible/removed-functions.xml
index 19945fb7ae2b..0bdb9ac50f50 100644
--- a/appendices/migration70/incompatible/removed-functions.xml
+++ b/appendices/migration70/incompatible/removed-functions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<sect2 xml:id="migration70.incompatible.removed-functions">
+<sect2 xml:id="migration70.incompatible.removed-functions" xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>Removed functions</title>
 
  <sect3 xml:id="migration70.incompatible.removed-functions.call-user-method">
@@ -33,7 +33,7 @@
  </sect3>
 
  <sect3 xml:id="migration70.incompatible.removed-functions.mcrypt">
-  <title><link linkend="book.mcrypt">mcrypt</link> aliases</title>
+  <title><link xlink:href="../extensions/book.mcrypt.php">mcrypt</link> aliases</title>
 
   <para>
    The deprecated <function>mcrypt_generic_end</function> function has been
@@ -53,11 +53,11 @@
   <title>
    All ext/mysql functions
   </title>
-  <para>
-   All <link linkend="book.mysql">ext/mysql</link> functions were removed. For
+  <simpara>
+   All <link xlink:href="../extensions/book.mysql.php">ext/mysql</link> functions were removed. For
    details about choosing a different MySQL API, see
    <link linkend="mysqlinfo.api.choosing">Choosing a MySQL API</link>.
-  </para>
+  </simpara>
  </sect3>
 
  <sect3 xml:id="migration70.incompatible.removed-functions.mssql">
@@ -67,9 +67,9 @@
   <para>
    All <literal>ext/mssql</literal> functions were removed.
    <simplelist role="alternatives">
-    <member><link linkend="ref.pdo-sqlsrv">PDO_SQLSRV</link></member>
+    <member><link xlink:href="../extensions/ref.pdo-sqlsrv.php">PDO_SQLSRV</link></member>
     <member><link linkend="ref.pdo-odbc">PDO_ODBC</link></member>
-    <member><link linkend="book.sqlsrv">SQLSRV</link></member>
+    <member><link xlink:href="../extensions/book.sqlsrv.php">SQLSRV</link></member>
     <member><link linkend="book.uodbc">Unified ODBC API</link></member>
    </simplelist>
   </para>
diff --git a/appendices/migration72/other-changes.xml b/appendices/migration72/other-changes.xml
index 3314557d8bf8..4b6868dffe8e 100644
--- a/appendices/migration72/other-changes.xml
+++ b/appendices/migration72/other-changes.xml
@@ -83,15 +83,15 @@
  </sect2>
 
  <sect2 xml:id="migration72.other-changes.mcrypt">
-  <title>Moving <link linkend="book.mcrypt">MCrypt</link> to PECL</title>
+  <title>Moving <link xlink:href="../extensions/book.mcrypt.php">MCrypt</link> to PECL</title>
 
-  <para>
-   The <link linkend="book.mcrypt">MCrypt</link> extension has now been moved
+  <simpara>
+   The <link xlink:href="../extensions/book.mcrypt.php">MCrypt</link> extension has now been moved
    out of the core to PECL. Given the mcrypt library has not seen any updates
    since 2007, its usage is highly discouraged. Instead, either the
    <link linkend="book.openssl">OpenSSL</link> or <link linkend="book.sodium">Sodium</link>
    extension should be used.
-  </para>
+  </simpara>
  </sect2>
 
  <sect2 xml:id="migration72.other-changes.session-module-name">
diff --git a/appendices/migration74/removed-extensions.xml b/appendices/migration74/removed-extensions.xml
index be09c5fcd9b4..33bb9180347a 100644
--- a/appendices/migration74/removed-extensions.xml
+++ b/appendices/migration74/removed-extensions.xml
@@ -13,19 +13,19 @@
  <itemizedlist>
   <listitem>
    <simpara>
-    <link linkend="book.ibase">Firebird/Interbase</link>
+    <link xlink:href="../extensions/book.ibase.php">Firebird/Interbase</link>
     - access to an InterBase and/or Firebird based database is still
     available with the PDO Firebird driver. 
    </simpara>
   </listitem>
   <listitem>
    <simpara>
-    <link linkend="book.recode">Recode</link>
+    <link xlink:href="../extensions/book.recode.php">Recode</link>
    </simpara>
   </listitem>
   <listitem>
    <simpara>
-    <link linkend="book.wddx">WDDX</link>
+    <link xlink:href="../extensions/book.wddx.php">WDDX</link>
    </simpara>
   </listitem>
  </itemizedlist>
diff --git a/faq/databases.xml b/faq/databases.xml
index b8574f19bf7b..9e579a4756a0 100644
--- a/faq/databases.xml
+++ b/faq/databases.xml
@@ -22,10 +22,10 @@
       On Unix machines you can use <link linkend="ref.pdo-odbc">PDO_ODBC</link>
       or the <link linkend="book.uodbc">Unified ODBC API</link>.
      </para>
-     <para>
-      On Windows machines you can also use <link linkend="ref.pdo-sqlsrv">PDO_SQLSRV</link>
-      or <link linkend="book.sqlsrv">SQLSRV</link>.
-     </para>
+     <simpara>
+      On Windows machines you can also use <link xlink:href="../extensions/ref.pdo-sqlsrv.php">PDO_SQLSRV</link>
+      or <link xlink:href="../extensions/book.sqlsrv.php">SQLSRV</link>.
+     </simpara>
      <para>
       Also see the answer to the next question.
      </para>
diff --git a/install/pie.xml b/install/pie.xml
index d730e02bd1c8..c59a49730035 100644
--- a/install/pie.xml
+++ b/install/pie.xml
@@ -17,7 +17,7 @@
   <simpara>
    After <link xlink:href="&url.pie;?tab=readme-ov-file#using-pie---what-do-i-need-to-get-started">installing
    the requirements and PIE itself</link>, you can then install the
-   <link linkend="mongodb.mongodb">MongoDB extension</link> by running the
+   <link xlink:href="../extensions/mongodb.mongodb.php">MongoDB extension</link> by running the
    following on the command line.
   </simpara>
   <example>
diff --git a/install/unix/alpine.xml b/install/unix/alpine.xml
index af35e4ce7ef2..c6f3414aebf9 100644
--- a/install/unix/alpine.xml
+++ b/install/unix/alpine.xml
@@ -54,7 +54,7 @@
    Only the core extensions are installed with the base package. Additional
    extensions such as
    <simplelist type="inline">
-    <member><link linkend="book.mysql">MySQL</link></member>
+    <member><link xlink:href="../extensions/book.mysql.php">MySQL</link></member>
     <member><link linkend="book.curl">cURL</link></member>
     <member><link linkend="book.image">GD</link></member>
     <member>etc.</member>
diff --git a/install/unix/debian.xml b/install/unix/debian.xml
index 587e46297940..5b3c53592ee0 100644
--- a/install/unix/debian.xml
+++ b/install/unix/debian.xml
@@ -53,7 +53,7 @@ dependencies, and then activate it.  Apache httpd should be restarted in order f
    <simpara>
     In the last section, PHP was installed with only core modules. It's
     very likely that additional modules will be desired, such as
-    <link linkend="book.mysql">MySQL</link>,
+    <link xlink:href="../extensions/book.mysql.php">MySQL</link>,
     <link linkend="book.curl">cURL</link>,
     <link linkend="book.image">GD</link>,
     etc. These may also be installed via the <command>apt</command> command.
diff --git a/install/unix/dnf.xml b/install/unix/dnf.xml
index db21bc8bd0d0..df89b699be81 100644
--- a/install/unix/dnf.xml
+++ b/install/unix/dnf.xml
@@ -52,7 +52,7 @@
    In the last section, PHP was installed with only core modules. It's
    very likely that additional modules will be desired, such as
    <simplelist type="inline">
-    <member><link linkend="book.mysql">MySQL</link></member>
+    <member><link xlink:href="../extensions/book.mysql.php">MySQL</link></member>
     <member><link linkend="book.curl">cURL</link></member>
     <member><link linkend="book.image">GD</link></member>
     <member>etc.</member>
diff --git a/install/unix/pacman.xml b/install/unix/pacman.xml
index ba6113ba1f2e..e14e913c78d0 100644
--- a/install/unix/pacman.xml
+++ b/install/unix/pacman.xml
@@ -50,7 +50,7 @@
    In the last section, PHP was installed with only core modules. It is
    very likely that additional modules will be desired, such as
    <simplelist type="inline">
-    <member><link linkend="book.mysql">MySQL</link></member>
+    <member><link xlink:href="../extensions/book.mysql.php">MySQL</link></member>
     <member><link linkend="book.curl">cURL</link></member>
     <member><link linkend="book.image">GD</link></member>
     <member>etc.</member>
diff --git a/install/windows/recommended.xml b/install/windows/recommended.xml
index 6c4c242ad707..129360c6c427 100644
--- a/install/windows/recommended.xml
+++ b/install/windows/recommended.xml
@@ -57,7 +57,7 @@ wincache.ocenabled=1 ; removed as of wincache 2.0.0.0
     </screen>
    </example>
    For more info, see:
-   <link linkend="wincache.configuration">WinCache Configuration</link>
+   <link xlink:href="../extensions/wincache.configuration.php">WinCache Configuration</link>
   </para>
  </sect2>
 </sect1>
diff --git a/language-snippets.ent b/language-snippets.ent
index a721f1edb553..b9680a366f90 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -367,8 +367,8 @@ This function should be used at your own risk.
 </simpara></warning>'>
 
 <!ENTITY warn.imaprecodeyaz '<warning xmlns="http://docbook.org/ns/docbook"><simpara>The <link
-linkend="book.imap">IMAP</link>, <link linkend="book.recode">recode</link> and
-<link linkend="book.yaz">YAZ</link>
+linkend="book.imap">IMAP</link>, <link xlink:href="../extensions/book.recode.php" xmlns:xlink="http://www.w3.org/1999/xlink">recode</link> and
+<link xlink:href="../extensions/book.yaz.php" xmlns:xlink="http://www.w3.org/1999/xlink">YAZ</link>
 extensions cannot be used in conjunction, because they
 share the same internal symbols. Note: Yaz 2.0 and above does not suffer from this problem.</simpara></warning>'>
 
@@ -1340,7 +1340,7 @@ encoding value will be used.</simpara>'>
  <listitem>
   <simpara>
    A function or method to call.
-   It should return a valid <link linkend="gearman.constants">Gearman return value</link>.
+   It should return a valid <link xlink:href="../extensions/gearman.constants.php" xmlns:xlink="http://www.w3.org/1999/xlink">Gearman return value</link>.
   </simpara>
   <simpara>
    If no return statement is present, it defaults to <constant>GEARMAN_SUCCESS</constant>.
@@ -2259,19 +2259,19 @@ See also <link linkend="mysqlinfo.api.choosing">MySQL: choosing an API</link> gu
 Alternatives to this function include:</simpara>'>
 
 <!ENTITY mysql.alternative.note.4-3-0 '<simpara xmlns="http://docbook.org/ns/docbook">This function was deprecated in PHP 4.3.0, and it
-and the entire <link linkend="book.mysql">original MySQL extension</link> was removed in PHP 7.0.0.
+and the entire <link xlink:href="../extensions/book.mysql.php" xmlns:xlink="http://www.w3.org/1999/xlink">original MySQL extension</link> was removed in PHP 7.0.0.
 Instead, use either the actively developed <link linkend="book.mysqli">MySQLi</link> or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
 See also the <link linkend="mysqlinfo.api.choosing">MySQL: choosing an API</link> guide.
 Alternatives to this function include:</simpara>'>
 
 <!ENTITY mysql.alternative.note.5-3-0 '<simpara xmlns="http://docbook.org/ns/docbook">This function was deprecated in PHP 5.3.0, and it
-and the entire <link linkend="book.mysql">original MySQL extension</link> was removed in PHP 7.0.0.
+and the entire <link xlink:href="../extensions/book.mysql.php" xmlns:xlink="http://www.w3.org/1999/xlink">original MySQL extension</link> was removed in PHP 7.0.0.
 Instead, use either the actively developed <link linkend="book.mysqli">MySQLi</link> or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
 See also the <link linkend="mysqlinfo.api.choosing">MySQL: choosing an API</link> guide.
 Alternatives to this function include:</simpara>'>
 
 <!ENTITY mysql.alternative.note.5-4-0 '<simpara xmlns="http://docbook.org/ns/docbook">This function was deprecated in PHP 5.4.0, and it
-and the entire <link linkend="book.mysql">original MySQL extension</link> was removed in PHP 7.0.0.
+and the entire <link xlink:href="../extensions/book.mysql.php" xmlns:xlink="http://www.w3.org/1999/xlink">original MySQL extension</link> was removed in PHP 7.0.0.
 Instead, use either the actively developed <link linkend="book.mysqli">MySQLi</link> or <link linkend="ref.pdo-mysql">PDO_MySQL</link> extensions.
 See also the <link linkend="mysqlinfo.api.choosing">MySQL: choosing an API</link> guide.
 Alternatives to this function include:</simpara>'>
@@ -3417,7 +3417,7 @@ local: {
      </simpara>
      <note>
       <simpara>
-       When evaluating query criteria, MongoDB compares types and values according to its own <link xlink:href="&url.mongodb.docs;reference/bson-type-comparison-order/" xmlns:xlink="http://www.w3.org/1999/xlink">comparison rules for BSON types</link>, which differs from PHP&apos;s <link linkend="types.comparisons">comparison</link> and <link linkend="language.types.type-juggling">type juggling</link> rules. When matching a special BSON type the query criteria should use the respective <link linkend="mongodb.bson">BSON class</link> (e.g. use <classname>MongoDB\BSON\ObjectId</classname> to match an <link xlink:href="&url.mongodb.docs.objectid;" xmlns:xlink="http://www.w3.org/1999/xlink">ObjectId</link>).
+       When evaluating query criteria, MongoDB compares types and values according to its own <link xlink:href="&url.mongodb.docs;reference/bson-type-comparison-order/" xmlns:xlink="http://www.w3.org/1999/xlink">comparison rules for BSON types</link>, which differs from PHP&apos;s <link linkend="types.comparisons">comparison</link> and <link linkend="language.types.type-juggling">type juggling</link> rules. When matching a special BSON type the query criteria should use the respective <link xlink:href="../extensions/mongodb.bson.php" xmlns:xlink="http://www.w3.org/1999/xlink">BSON class</link> (e.g. use <classname>MongoDB\BSON\ObjectId</classname> to match an <link xlink:href="&url.mongodb.docs.objectid;" xmlns:xlink="http://www.w3.org/1999/xlink">ObjectId</link>).
       </simpara>
      </note>
     </listitem>
diff --git a/language/operators.xml b/language/operators.xml
index 68b5fcfd53d6..d0433795a349 100644
--- a/language/operators.xml
+++ b/language/operators.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<chapter xml:id="language.operators" xmlns="http://docbook.org/ns/docbook" annotations="interactive">
+<chapter xml:id="language.operators" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
  <title>Operators</title>
  <simpara>
   An operator is something that takes one or more values (or
@@ -31,7 +31,7 @@
  </para>
  <simpara>
   There is a PECL extension that allows for overloading of some operators for
-  objects. For more information, see the <link linkend="book.operator">Operator
+  objects. For more information, see the <link xlink:href="../extensions/book.operator.php">Operator
   Overloading for Objects</link> section.
  </simpara>
 
diff --git a/manual.xml b/manual.xml
index d9302073d28d..bd6773834908 100644
--- a/manual.xml
+++ b/manual.xml
@@ -110,30 +110,12 @@
 
   <set xml:id="refs.basic.php">
    <title>&AffectingPHPsBehaviour;</title>
-   &reference.apcu.book;
-   &reference.componere.book;
    &reference.errorfunc.book;
    &reference.ffi.book;
    &reference.opcache.book;
-   &reference.operator.book;
    &reference.outcontrol.book;
    &reference.info.book;
    &reference.phpdbg.book;
-   &reference.runkit7.book;
-   &reference.uopz.book;
-   &reference.wincache.book;
-   &reference.xhprof.book;
-   &reference.yac.book;
-  </set>
-
-  <set xml:id="refs.utilspec.audio">
-   <title>&AudioFormatsManipulation;</title>
-   &reference.openal.book;
-  </set>
-
-  <set xml:id="refs.remote.auth">
-   <title>&AuthenticationServices;</title>
-   &reference.radius.book;
   </set>
 
   <set xml:id="refs.utilspec.cmdline">
@@ -144,9 +126,7 @@
   <set xml:id="refs.compression">
    <title>&CompressionExtensions;</title>
    &reference.bzip2.book;
-   &reference.lzf.book;
    &reference.phar.book;
-   &reference.rar.book;
    &reference.zip.book;
    &reference.zlib.book;
   </set>
@@ -154,13 +134,10 @@
   <set xml:id="refs.crypto">
    <title>&CryptographyExtensions;</title>
    &reference.hash.book;
-   &reference.mcrypt.book;
    &reference.mhash.book;
    &reference.openssl.book;
    &reference.password.book;
-   &reference.rnp.book;
    &reference.sodium.book;
-   &reference.xpass.book;
   </set>
 
   <set xml:id="refs.database">
@@ -175,16 +152,10 @@
 
    <set xml:id="refs.database.vendors">
     <title>&VendorSpecificDatabaseExtensions;</title>
-    &reference.cubrid.book;
-    &reference.dbase.book;
-    &reference.ibase.book;
-    &reference.ibm-db2.book;
-    &reference.mongodb.book;
     &reference.mysqlinfo.set;
     &reference.oci8.book;
     &reference.pgsql.book;
     &reference.sqlite3.book;
-    &reference.sqlsrv.book;
    </set>
   </set>
 
@@ -192,45 +163,35 @@
    <title>&CalendarandEventRelatedExtensions;</title>
    &reference.calendar.book;
    &reference.datetime.book;
-   &reference.hrtime.book;
   </set>
 
   <set xml:id="refs.fileprocess.file">
    <title>&FileSystemRelatedExtensions;</title>
-   &reference.dio.book;
    &reference.dir.book;
    &reference.fileinfo.book;
    &reference.filesystem.book;
-   &reference.inotify.book;
-   &reference.xattr.book;
-   &reference.xdiff.book;
   </set>
 
   <set xml:id="refs.international">
    <title>&HumanLanguageandCharacterEncodingSupport;</title>
    &reference.enchant.book;
-   &reference.gender.book;
    &reference.gettext.book;
    &reference.iconv.book;
    &reference.intl.book;
    &reference.mbstring.book;
    &reference.pspell.book;
-   &reference.recode.book;
   </set>
 
   <set xml:id="refs.utilspec.image">
    <title>&ImageProcessingandGeneration;</title>
    &reference.exif.book;
    &reference.image.book;
-   &reference.gmagick.book;
-   &reference.imagick.book;
   </set>
 
   <set xml:id="refs.remote.mail">
    <title>&MailRelatedExtensions;</title>
    &reference.imap.book;
    &reference.mail.book;
-   &reference.mailparse.book;
   </set>
 
   <set xml:id="refs.math">
@@ -238,92 +199,38 @@
    &reference.bc.book;
    &reference.gmp.book;
    &reference.math.book;
-   &reference.stats.book;
-   &reference.trader.book;
-  </set>
-
-  <set xml:id="refs.utilspec.nontext">
-   <title>&NonTextMIMEOutput;</title>
-   &reference.fdf.book;
-   &reference.gnupg.book;
-   &reference.wkhtmltox.book;
-   &reference.ps.book;
-   &reference.rpminfo.book;
-   &reference.xlswriter.book;
   </set>
 
   <set xml:id="refs.fileprocess.process">
    <title>&ProcessControlExtensions;</title>
-   &reference.eio.book;
-   &reference.ev.book;
-   &reference.expect.book;
    &reference.pcntl.book;
    &reference.posix.book;
    &reference.exec.book;
-   &reference.parallel.book;
-   &reference.pthreads.book;
    &reference.sem.book;
    &reference.shmop.book;
-   &reference.sync.book;
   </set>
 
   <set xml:id="refs.basic.other">
    <title>&OtherBasicExtensions;</title>
-   &reference.geoip.book;
-   &reference.fann.book;
-   &reference.igbinary.book;
    &reference.json.book;
-   &reference.simdjson.book;
-   &reference.lua.book;
-   &reference.luasandbox.book;
    &reference.misc.book;
    &reference.random.book;
-   &reference.seaslog.book;
    &reference.spl.book;
    &reference.stream.book;
-   &reference.swoole.book;
    &reference.tidy.book;
    &reference.tokenizer.book;
    &reference.uri.book;
    &reference.url.book;
-   &reference.v8js.book;
-   &reference.yaml.book;
-   &reference.yaf.book;
-   &reference.yaconf.book;
-   &reference.taint.book;
-   &reference.ds.book;
-   &reference.var-representation.book;
   </set>
 
   <set xml:id="refs.remote.other">
    <title>&OtherServices;</title>
    &reference.curl.book;
-   &reference.event.book;
    &reference.ftp.book;
-   &reference.gearman.book;
    &reference.ldap.book;
-   &reference.memcache.book;
-   &reference.memcached.book;
-   &reference.mqseries.book;
    &reference.network.book;
-   &reference.rrd.book;
-   &reference.scoutapm.book;
    &reference.snmp.book;
    &reference.sockets.book;
-   &reference.ssh2.book;
-   &reference.stomp.book;
-   &reference.svm.book;
-   &reference.svn.book;
-   &reference.tcpwrap.book;
-   &reference.varnish.book;
-   &reference.yaz.book;
-   &reference.zmq.book;
-   &reference.zookeeper.book;
-  </set>
-
-  <set xml:id="refs.search">
-   <title>&SearchEngineExtensions;</title>
-   &reference.solr.book;
   </set>
 
   <set xml:id="refs.utilspec.server">
@@ -340,10 +247,7 @@
 
   <set xml:id="refs.basic.text">
    <title>&TextProcessing;</title>
-   &reference.cmark.book;
-   &reference.parle.book;
    &reference.pcre.book;
-   &reference.ssdeep.book;
    &reference.strings.book;
   </set>
 
@@ -354,23 +258,18 @@
    &reference.ctype.book;
    &reference.filter.book;
    &reference.funchand.book;
-   &reference.quickhash.book;
    &reference.reflection.book;
    &reference.var.book;
   </set>
 
   <set xml:id="refs.webservice">
    <title>&WebServices;</title>
-   &reference.oauth.book;
    &reference.soap.book;
-   &reference.yar.book;
-   &reference.xmlrpc.book;
   </set>
 
   <set xml:id="refs.utilspec.windows">
    <title>&WindowsOnlyExtensions;</title>
    &reference.com.book;
-   &reference.win32service.book;
   </set>
 
   <set xml:id="refs.xml">
@@ -378,18 +277,11 @@
    &reference.dom.book;
    &reference.libxml.book;
    &reference.simplexml.book;
-   &reference.wddx.book;
-   &reference.xmldiff.book;
    &reference.xml.book;
    &reference.xmlreader.book;
    &reference.xmlwriter.book;
    &reference.xsl.book;
   </set>
-
-  <set xml:id="refs.ui">
-   <title>&UIExtensions;</title>
-   &reference.ui.book;
-  </set>
  </set>
 
  <book xml:id="faq">
diff --git a/reference/apcu/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/apcu/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/apcu/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/apcu/apcuiterator.xml b/reference/apcu/apcuiterator.xml
deleted file mode 100644
index 924907b12cdf..000000000000
--- a/reference/apcu/apcuiterator.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.apcuiterator" role="class">
-
- <title>The APCUIterator class</title>
- <titleabbrev>APCUIterator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ APCUIterator intro -->
-  <section xml:id="apcuiterator.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>APCUIterator</classname> class makes it easier to iterate
-    over large APCu caches. This is helpful as it allows iterating over large
-    caches in steps, while grabbing a defined number of entries per lock instance,
-    so it frees the cache locks for other activities rather than hold up the
-    entire cache to grab 100 (the default) entries. Also, using regular expression
-    matching is more efficient as it's been moved to the C level.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="apcuiterator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>APCUIterator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>APCUIterator</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.apcuiterator')/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.apcuiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.apcu.entities.apcuiterator;
-
-</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/apcu/apcuiterator/construct.xml b/reference/apcu/apcuiterator/construct.xml
deleted file mode 100644
index 3bec4bcefade..000000000000
--- a/reference/apcu/apcuiterator/construct.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.construct">
- <refnamediv>
-  <refname>APCUIterator::__construct</refname>
-  <refpurpose>Constructs an APCUIterator iterator object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>APCUIterator::__construct</methodname>
-   <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>
-  </constructorsynopsis>
-  <simpara>
-   Constructs an <classname>APCUIterator</classname> <type>object</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>search</parameter></term>
-    <listitem>
-     <simpara>
-      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.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      The desired format, as configured with one or more of the
-      <link linkend="apcu.constants">APC_ITER_*</link> constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>chunk_size</parameter></term>
-    <listitem>
-     <simpara>
-      The chunk size. Must be a value greater than 0. The default
-      value is 100.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>list</parameter></term>
-    <listitem>
-     <simpara>
-      The type to list. Either pass in <constant>APC_LIST_ACTIVE</constant>
-      or <constant>APC_LIST_DELETED</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>APCUIterator::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-foreach (new APCUIterator('/^counter\./') as $counter) {
-    echo "$counter[key]: $counter[value]\n";
-    apc_dec($counter['key'], $counter['value']);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_exists</function></member>
-   <member><function>apcu_cache_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/current.xml b/reference/apcu/apcuiterator/current.xml
deleted file mode 100644
index 5cce4dd5f085..000000000000
--- a/reference/apcu/apcuiterator/current.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.current">
- <refnamediv>
-  <refname>APCUIterator::current</refname>
-  <refpurpose>Get current item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>APCUIterator::current</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the current item from the <classname>APCUIterator</classname> stack.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current item on success, or &false; if no
-   more items exist, or on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::next</methodname></member>
-   <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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/gettotalcount.xml b/reference/apcu/apcuiterator/gettotalcount.xml
deleted file mode 100644
index 719580b177c3..000000000000
--- a/reference/apcu/apcuiterator/gettotalcount.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.gettotalcount">
- <refnamediv>
-  <refname>APCUIterator::getTotalCount</refname>
-  <refpurpose>Get total count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>APCUIterator::getTotalCount</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get the total count.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The total count.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::getTotalHits</methodname></member>
-   <member><methodname>APCUIterator::getTotalSize</methodname></member>
-   <member><function>apcu_cache_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/gettotalhits.xml b/reference/apcu/apcuiterator/gettotalhits.xml
deleted file mode 100644
index 34554fc8cb54..000000000000
--- a/reference/apcu/apcuiterator/gettotalhits.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.gettotalhits">
- <refnamediv>
-  <refname>APCUIterator::getTotalHits</refname>
-  <refpurpose>Get total cache hits</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>APCUIterator::getTotalHits</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the total number of cache hits.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of hits on success, or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::getTotalCount</methodname></member>
-   <member><methodname>APCUIterator::getTotalSize</methodname></member>
-   <member><function>apcu_cache_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/gettotalsize.xml b/reference/apcu/apcuiterator/gettotalsize.xml
deleted file mode 100644
index 7e45a4553c47..000000000000
--- a/reference/apcu/apcuiterator/gettotalsize.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.gettotalsize">
- <refnamediv>
-  <refname>APCUIterator::getTotalSize</refname>
-  <refpurpose>Get total cache size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>APCUIterator::getTotalSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the total cache size.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The total cache size.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::getTotalCount</methodname></member>
-   <member><methodname>APCUIterator::getTotalHits</methodname></member>
-   <member><function>apc_cache_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/key.xml b/reference/apcu/apcuiterator/key.xml
deleted file mode 100644
index d48684001129..000000000000
--- a/reference/apcu/apcuiterator/key.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.key">
- <refnamediv>
-  <refname>APCUIterator::key</refname>
-  <refpurpose>Get iterator key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>APCUIterator::key</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the current iterator key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key on success, or &false; upon failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::current</methodname></member>
-   <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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/next.xml b/reference/apcu/apcuiterator/next.xml
deleted file mode 100644
index f24b7fd7ca4c..000000000000
--- a/reference/apcu/apcuiterator/next.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.next">
- <refnamediv>
-  <refname>APCUIterator::next</refname>
-  <refpurpose>Move pointer to next item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>APCUIterator::next</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Moves the iterator pointer to the next element.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::current</methodname></member>
-   <member><methodname>APCUIterator::rewind</methodname></member>
-   <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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/rewind.xml b/reference/apcu/apcuiterator/rewind.xml
deleted file mode 100644
index 1204b4a97101..000000000000
--- a/reference/apcu/apcuiterator/rewind.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.rewind">
- <refnamediv>
-  <refname>APCUIterator::rewind</refname>
-  <refpurpose>Rewinds iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>APCUIterator::rewind</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Rewinds back the iterator to the first element.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::next</methodname></member>
-   <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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/apcuiterator/valid.xml b/reference/apcu/apcuiterator/valid.xml
deleted file mode 100644
index 9a5c27755657..000000000000
--- a/reference/apcu/apcuiterator/valid.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcuiterator.valid">
- <refnamediv>
-  <refname>APCUIterator::valid</refname>
-  <refpurpose>Checks if current position is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>APCUIterator::valid</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Checks if the current iterator position is valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the current iterator position is valid, otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>APCUIterator::current</methodname></member>
-   <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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/book.xml b/reference/apcu/book.xml
deleted file mode 100644
index 9d72f0feede6..000000000000
--- a/reference/apcu/book.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.apcu">
- <?phpdoc extension-membership="pecl" ?>
- <title>APC User Cache</title>
- <titleabbrev>APCu</titleabbrev>
-
- <preface xml:id="intro.apcu">
-  &reftitle.intro;
-  <simpara>
-   APCu is an in-memory key-value store for PHP.
-   Keys are of type &string; and values can be any PHP variables.
-   APCu only supports userland caching of variables.
-  </simpara>
-  <simpara>
-   The APCu cache is per-process on Windows, so when using a process-based
-   (rather than thread-based) SAPI, it will not be shared between different processes.
-  </simpara>
-  <simpara>
-   APCu is APC stripped of opcode caching.
-  </simpara>
-  <simpara>
-   The first APCu codebase was versioned 4.0.0, it was forked from the head of the APC master branch at the time.
-   PHP 7 support is available as of APCu 5.0.0. PHP 8 support is available as of APCu 5.1.19.
-  </simpara>
- </preface>
-
- &reference.apcu.setup;
- &reference.apcu.constants;
- &reference.apcu.reference;
- &reference.apcu.apcuiterator;
-
-</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/apcu/constants.xml b/reference/apcu/constants.xml
deleted file mode 100644
index 6f53dbd84588..000000000000
--- a/reference/apcu/constants.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --><appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcu.constants">
- &reftitle.constants;
- &extension.constants;
-
- <variablelist>
-  <varlistentry xml:id="constant.apc-iter-all">
-   <term>
-    <constant>APC_ITER_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-atime">
-   <term>
-    <constant>APC_ITER_ATIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-ctime">
-   <term>
-    <constant>APC_ITER_CTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-device">
-   <term>
-    <constant>APC_ITER_DEVICE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-dtime">
-   <term>
-    <constant>APC_ITER_DTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-filename">
-   <term>
-    <constant>APC_ITER_FILENAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-inode">
-   <term>
-    <constant>APC_ITER_INODE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-key">
-   <term>
-    <constant>APC_ITER_KEY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-md5">
-   <term>
-    <constant>APC_ITER_MD5</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-mem-size">
-   <term>
-    <constant>APC_ITER_MEM_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-mtime">
-   <term>
-    <constant>APC_ITER_MTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-none">
-   <term>
-    <constant>APC_ITER_NONE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-num-hits">
-   <term>
-    <constant>APC_ITER_NUM_HITS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-refcount">
-   <term>
-    <constant>APC_ITER_REFCOUNT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-ttl">
-   <term>
-    <constant>APC_ITER_TTL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-type">
-   <term>
-    <constant>APC_ITER_TYPE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-iter-value">
-   <term>
-    <constant>APC_ITER_VALUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-list-active">
-   <term>
-    <constant>APC_LIST_ACTIVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.apc-list-deleted">
-   <term>
-    <constant>APC_LIST_DELETED</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/apcu/functions/apcu-add.xml b/reference/apcu/functions/apcu-add.xml
deleted file mode 100644
index 5ec172f31048..000000000000
--- a/reference/apcu/functions/apcu-add.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-add">
- <refnamediv>
-  <refname>apcu_add</refname>
-  <refpurpose>
-   Cache a new variable in the data store
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>apcu_add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>apcu_add</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>unused</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Caches a variable in the data store, only if it's not already stored.
-  </simpara>
-  <note>
-   <simpara>
-    Unlike many other mechanisms in PHP, variables stored using
-    <function>apcu_add</function> will persist between requests (until the
-    value is removed from the cache).
-   </simpara>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      Store the variable using this name. <parameter>key</parameter>s are
-      cache-unique, so attempting to use <function>apcu_add</function> to
-      store data with a key that already exists will not overwrite the
-      existing data, and will instead return &false;. (This is the only
-      difference between <function>apcu_add</function> and
-      <function>apcu_store</function>.)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>var</parameter></term>
-    <listitem>
-     <simpara>
-      The variable to store
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      Time To Live; store <parameter>var</parameter> in the cache for
-      <parameter>ttl</parameter> seconds. After the
-      <parameter>ttl</parameter> has passed, the stored variable will be
-      expunged from the cache (on the next request). If no <parameter>ttl</parameter>
-      is supplied (or if the <parameter>ttl</parameter> is
-      <literal>0</literal>), the value will persist until it is removed from
-      the cache manually, or otherwise fails to exist in the cache (clear,
-      restart, etc.).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-      Names in key, variables in value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns TRUE if something has effectively been added into the cache, FALSE otherwise.
-   Second syntax returns array with error keys.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_add</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-apcu_add('foo', $bar);
-var_dump(apcu_fetch('foo'));
-echo "\n";
-$bar = 'NEVER GETS SET';
-apcu_add('foo', $bar);
-var_dump(apcu_fetch('foo'));
-echo "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "BAR"
-string(3) "BAR"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_store</function></member>
-   <member><function>apcu_fetch</function></member>
-   <member><function>apcu_delete</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/apcu/functions/apcu-cache-info.xml b/reference/apcu/functions/apcu-cache-info.xml
deleted file mode 100644
index 3ac7c291ccf4..000000000000
--- a/reference/apcu/functions/apcu-cache-info.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-cache-info">
- <refnamediv>
-  <refname>apcu_cache_info</refname>
-  <refpurpose>
-   Retrieves cached information from APCu's data store
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>apcu_cache_info</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>limited</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves cached information and meta-data from APCu's data store.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limited</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>limited</parameter> is &true;, the
-      return value will exclude the individual list of cache entries.  This
-      is useful when trying to optimize calls for statistics gathering.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array of cached data (and meta-data)&return.falseforfailure;
-  </simpara>
-  <note>
-   <simpara>
-    <function>apcu_cache_info</function> will raise a warning if it is unable to
-    retrieve APCu cache data. This typically occurs when APCu is not enabled.
-   </simpara>
-  </note>
- </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.11</entry>
-      <entry>
-       The <parameter>limited</parameter> parameter was introduced.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL apcu 3.0.16</entry>
-      <entry>
-       The "<literal>filehits</literal>" option for the
-       <parameter>cache_type</parameter> parameter was introduced.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_cache_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print_r(apcu_cache_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [num_slots] => 2000
-    [ttl] => 0
-    [num_hits] => 9
-    [num_misses] => 3
-    [start_time] => 1123958803
-    [cache_list] => Array
-        (
-            [0] => Array
-                (
-                    [filename] => /path/to/apcu_test.php
-                    [device] => 29954
-                    [inode] => 1130511
-                    [type] => file
-                    [num_hits] => 1
-                    [mtime] => 1123960686
-                    [creation_time] => 1123960696
-                    [deletion_time] => 0
-                    [access_time] => 1123962864
-                    [ref_count] => 1
-                    [mem_size] => 677
-                )
-            [1] => Array (...iterates for each cached file)
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="apcu.configuration">APCu configuration directives</link></member>
-   <member><methodname>APCUIterator::getTotalSize</methodname></member>
-   <member><methodname>APCUIterator::getTotalHits</methodname></member>
-   <member><methodname>APCUIterator::getTotalCount</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/apcu/functions/apcu-cas.xml b/reference/apcu/functions/apcu-cas.xml
deleted file mode 100644
index c7ed9635aceb..000000000000
--- a/reference/apcu/functions/apcu-cas.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.apcu-cas">
- <refnamediv>
-  <refname>apcu_cas</refname>
-  <refpurpose>Updates an old value with a new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>apcu_cas</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>old</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>apcu_cas</function> updates an already existing integer value if the
-   <parameter>old</parameter> parameter matches the currently stored value
-   with the value of the <parameter>new</parameter> parameter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the value being updated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>old</parameter></term>
-    <listitem>
-     <simpara>
-      The old value (the value currently stored).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new</parameter></term>
-    <listitem>
-     <simpara>
-      The new value to update to.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>apcu_cas</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-apcu_store('foobar', 2);
-echo '$foobar = 2', PHP_EOL;
-echo '$foobar == 1 ? 2 : 1 = ', (apcu_cas('foobar', 1, 2) ? 'ok' : 'fail'), PHP_EOL;
-echo '$foobar == 2 ? 1 : 2 = ', (apcu_cas('foobar', 2, 1) ? 'ok' : 'fail'), PHP_EOL;
-
-echo '$foobar = ', apcu_fetch('foobar'), PHP_EOL;
-
-echo '$f__bar == 1 ? 2 : 1 = ', (apcu_cas('f__bar', 1, 2) ? 'ok' : 'fail'), PHP_EOL;
-
-apcu_store('perfection', 'xyz');
-echo '$perfection == 2 ? 1 : 2 = ', (apcu_cas('perfection', 2, 1) ? 'ok' : 'epic fail'), PHP_EOL;
-
-echo '$foobar = ', apcu_fetch('foobar'), PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-$foobar = 2
-$foobar == 1 ? 2 : 1 = fail
-$foobar == 2 ? 1 : 2 = ok
-$foobar = 1
-$f__bar == 1 ? 2 : 1 = fail
-$perfection == 2 ? 1 : 2 = epic fail
-$foobar = 1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_dec</function></member>
-   <member><function>apcu_store</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/apcu/functions/apcu-clear-cache.xml b/reference/apcu/functions/apcu-clear-cache.xml
deleted file mode 100644
index afdb45ef8b02..000000000000
--- a/reference/apcu/functions/apcu-clear-cache.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-clear-cache">
- <refnamediv>
-  <refname>apcu_clear_cache</refname>
-  <refpurpose>
-   Clears the APCu cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>apcu_clear_cache</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Clears the cache.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; always
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_cache_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/functions/apcu-dec.xml b/reference/apcu/functions/apcu-dec.xml
deleted file mode 100644
index 02fa81a20ce9..000000000000
--- a/reference/apcu/functions/apcu-dec.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.apcu-dec">
- <refnamediv>
-  <refname>apcu_dec</refname>
-  <refpurpose>Decrease a stored number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>apcu_dec</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>step</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decreases a stored integer value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the value being decreased.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>step</parameter></term>
-    <listitem>
-     <simpara>
-      The step, or value to decrease.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>success</parameter></term>
-    <listitem>
-     <simpara>
-      Optionally pass the success or fail boolean value to
-      this referenced variable.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      TTL to use if the operation inserts a new value (rather than decrementing an existing one).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current value of <parameter>key</parameter>'s value on success,
-   &return.falseforfailure;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>apcu_dec</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo "Let's do something with success", PHP_EOL;
-
-apcu_store('anumber', 42);
-
-echo apcu_fetch('anumber'), PHP_EOL;
-
-echo apcu_dec('anumber'), PHP_EOL;
-echo apcu_dec('anumber', 10), PHP_EOL;
-echo apcu_dec('anumber', 10, $success), PHP_EOL;
-
-var_dump($success);
-
-echo "Now, let's fail", PHP_EOL, PHP_EOL;
-
-apcu_store('astring', 'foo');
-
-$ret = apcu_dec('astring', 1, $fail);
-
-var_dump($ret);
-var_dump($fail);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Let's do something with success
-42
-41
-31
-21
-bool(true)
-Now, let's fail
-
-bool(false)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_inc</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/apcu/functions/apcu-delete.xml b/reference/apcu/functions/apcu-delete.xml
deleted file mode 100644
index edf55339ec95..000000000000
--- a/reference/apcu/functions/apcu-delete.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-delete">
- <refnamediv>
-  <refname>apcu_delete</refname>
-  <refpurpose>
-   Removes a stored variable from the cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>apcu_delete</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes a stored variable from the cache.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-    <simpara>
-     A <parameter>key</parameter> used to store the value as a
-     <type>string</type> for a single key,
-     or as an <type>array</type> of strings for several keys,
-     or as an <classname>APCUIterator</classname> <type>object</type>.
-    </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If <parameter>key</parameter> is an &array;, an indexed &array; of the keys is returned.
-   Otherwise &true; is returned on success, or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_delete</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-apcu_store('foo', $bar);
-apcu_delete('foo');
-// this is obviously useless in this form
-
-// Alternatively delete multiple keys.
-apcu_delete(['foo', 'bar', 'baz']);
-
-// Or use an Iterator with a regular expression.
-apcu_delete(new APCUIterator('#^myprefix_#'));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_store</function></member>
-   <member><function>apcu_fetch</function></member>
-   <member><function>apcu_clear_cache</function></member>
-   <member><classname>APCUIterator</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/apcu/functions/apcu-enabled.xml b/reference/apcu/functions/apcu-enabled.xml
deleted file mode 100644
index 444becf25c91..000000000000
--- a/reference/apcu/functions/apcu-enabled.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.apcu-enabled">
- <refnamediv>
-  <refname>apcu_enabled</refname>
-  <refpurpose>Whether APCu is usable in the current environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>apcu_enabled</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns whether APCu is usable in the current environment.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when APCu is usable in the current environment, &false; otherwise.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/apcu/functions/apcu-entry.xml b/reference/apcu/functions/apcu-entry.xml
deleted file mode 100644
index 7abe698949b9..000000000000
--- a/reference/apcu/functions/apcu-entry.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-entry">
- <refnamediv>
-  <refname>apcu_entry</refname>
-  <refpurpose>
-   Atomically fetch or generate a cache entry
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>apcu_entry</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Atomically attempts to find <parameter>key</parameter> in the cache, if it cannot be found <parameter>callback</parameter>
-   is called, passing <parameter>key</parameter> as the only argument. The return value of the call is then cached with the optionally specified
-   <parameter>ttl</parameter>, and returned.
-  </simpara>
-  <note>
-   <simpara>
-    When control enters <function>apcu_entry</function> the lock for the cache is acquired exclusively, it is released when control leaves <function>apcu_entry</function>:
-    In effect, this turns the body of <parameter>callback</parameter> into a critical section, disallowing two processes from executing the same code paths concurrently.
-    In addition, it prohibits the concurrent execution of any other APCu functions, since they will acquire the same lock.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    The only APCu function that can be called safely by <parameter>callback</parameter> is <function>apcu_entry</function>.
-   </simpara>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      Identity of cache entry
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      A callable that accepts <parameter>key</parameter> as the only argument and returns the value to cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      Time To Live; store the <parameter>callback</parameter>'s return value in the cache for
-      <parameter>ttl</parameter> seconds. After the
-      <parameter>ttl</parameter> has passed, the stored entry will be
-      expunged from the cache (on the next request). If no <parameter>ttl</parameter>
-      is supplied (or if the <parameter>ttl</parameter> is
-      <literal>0</literal>), the value will persist until it is removed from
-      the cache manually, or otherwise fails to exist in the cache (clear,
-      restart, etc.).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the cached value
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>An <function>apcu_entry</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = apcu_entry("config", function($key) {
- return [
-   "fruit" => apcu_entry("config.fruit", function($key){
-     return [
-       "apples",
-       "pears"
-     ];
-   }),
-   "people" => apcu_entry("config.people", function($key){
-     return [
-      "bob",
-      "joe",
-      "niki"
-     ];
-   })
- ];
-});
-
-var_dump($config);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  ["fruit"]=>
-  array(2) {
-    [0]=>
-    string(6) "apples"
-    [1]=>
-    string(5) "pears"
-  }
-  ["people"]=>
-  array(3) {
-    [0]=>
-    string(3) "bob"
-    [1]=>
-    string(3) "joe"
-    [2]=>
-    string(4) "niki"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_store</function></member>
-   <member><function>apcu_fetch</function></member>
-   <member><function>apcu_delete</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/apcu/functions/apcu-exists.xml b/reference/apcu/functions/apcu-exists.xml
deleted file mode 100644
index 61a81f2b7842..000000000000
--- a/reference/apcu/functions/apcu-exists.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.apcu-exists">
- <refnamediv>
-  <refname>apcu_exists</refname>
-  <refpurpose>Checks if entry exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>bool</type><type>array</type></type><methodname>apcu_exists</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>keys</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks if one or more APCu entries exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keys</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>string</type>, or an <type>array</type> of strings, that
-      contain keys.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the key exists, otherwise &false; Or if an
-   <type>array</type> was passed to <parameter>keys</parameter>, then
-   an array is returned that contains all existing keys, or an empty
-   array if none exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>apcu_exists</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fruit  = 'apple';
-$veggie = 'carrot';
-
-apcu_store('foo', $fruit);
-apcu_store('bar', $veggie);
-
-if (apcu_exists('foo')) {
-    echo "Foo exists: ";
-    echo apcu_fetch('foo');
-} else {
-    echo "Foo does not exist";
-}
-
-echo PHP_EOL;
-if (apcu_exists('baz')) {
-    echo "Baz exists.";
-} else {
-    echo "Baz does not exist";
-}
-
-echo PHP_EOL;
-
-$ret = apcu_exists(array('foo', 'donotexist', 'bar'));
-var_dump($ret);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Foo exists: apple
-Baz does not exist
-array(2) {
-  ["foo"]=>
-  bool(true)
-  ["bar"]=>
-  bool(true)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_cache_info</function></member>
-   <member><function>apcu_fetch</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/apcu/functions/apcu-fetch.xml b/reference/apcu/functions/apcu-fetch.xml
deleted file mode 100644
index 1555e9862eb0..000000000000
--- a/reference/apcu/functions/apcu-fetch.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-fetch">
- <refnamediv>
-  <refname>apcu_fetch</refname>
-  <refpurpose>
-   Fetch a stored variable from the cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>apcu_fetch</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetches an entry from the cache.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>key</parameter> used to store the value (with
-      <function>apcu_store</function>). If an array is passed then each
-      element is fetched and returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>success</parameter></term>
-    <listitem>
-     <simpara>
-      Set to &true; in success and &false; in failure.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The stored variable or array of variables on success; &false; on failure
-  </simpara>
- </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;
-  <example>
-   <title>A <function>apcu_fetch</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-apcu_store('foo', $bar);
-var_dump(apcu_fetch('foo'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "BAR"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_store</function></member>
-   <member><function>apcu_delete</function></member>
-   <member><classname>APCUIterator</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/apcu/functions/apcu-inc.xml b/reference/apcu/functions/apcu-inc.xml
deleted file mode 100644
index af7b0465b259..000000000000
--- a/reference/apcu/functions/apcu-inc.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.apcu-inc">
- <refnamediv>
-  <refname>apcu_inc</refname>
-  <refpurpose>Increase a stored number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>apcu_inc</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>step</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Increases a stored number.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the value being increased.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>step</parameter></term>
-    <listitem>
-     <simpara>
-      The step, or value to increase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>success</parameter></term>
-    <listitem>
-     <simpara>
-      Optionally pass the success or fail boolean value to
-      this referenced variable.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      TTL to use if the operation inserts a new value (rather than incrementing an existing one).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current value of <parameter>key</parameter>'s value on success,
-   &return.falseforfailure;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>apcu_inc</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo "Let's do something with success", PHP_EOL;
-
-apcu_store('anumber', 42);
-
-echo apcu_fetch('anumber'), PHP_EOL;
-
-echo apcu_inc('anumber'), PHP_EOL;
-echo apcu_inc('anumber', 10), PHP_EOL;
-echo apcu_inc('anumber', 10, $success), PHP_EOL;
-
-var_dump($success);
-
-echo "Now, let's fail", PHP_EOL, PHP_EOL;
-
-apcu_store('astring', 'foo');
-
-$ret = apcu_inc('astring', 1, $fail);
-
-var_dump($ret);
-var_dump($fail);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Let's do something with success
-42
-43
-53
-63
-bool(true)
-Now, let's fail
-
-bool(false)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_dec</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/apcu/functions/apcu-key-info.xml b/reference/apcu/functions/apcu-key-info.xml
deleted file mode 100644
index cfaf160e5034..000000000000
--- a/reference/apcu/functions/apcu-key-info.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-key-info">
- <refnamediv>
-  <refname>apcu_key_info</refname>
-  <refpurpose>
-   Get detailed information about the cache key
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>apcu_key_info</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get detailed information about the cache key
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key to retrieve information for.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array containing the detailed information about the cache key, or &null; if the key does not exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_key_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-apcu_add('a','b');
-var_dump(apcu_key_info('a'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(7) {
-  ["hits"]=>
-  int(0)
-  ["access_time"]=>
-  int(1606701783)
-  ["mtime"]=>
-  int(1606701783)
-  ["creation_time"]=>
-  int(1606701783)
-  ["deletion_time"]=>
-  int(0)
-  ["ttl"]=>
-  int(0)
-  ["refs"]=>
-  int(0)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_store</function></member>
-   <member><function>apcu_fetch</function></member>
-   <member><function>apcu_delete</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/apcu/functions/apcu-sma-info.xml b/reference/apcu/functions/apcu-sma-info.xml
deleted file mode 100644
index 135779b929e3..000000000000
--- a/reference/apcu/functions/apcu-sma-info.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-sma-info">
- <refnamediv>
-  <refname>apcu_sma_info</refname>
-  <refpurpose>
-   Retrieves APCu Shared Memory Allocation information
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>apcu_sma_info</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>limited</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves APCu Shared Memory Allocation information.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limited</parameter></term>
-    <listitem>
-     <simpara>
-      When set to &false; (default) <function>apcu_sma_info</function> will
-      return a detailed information about each segment.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array of Shared Memory Allocation data; &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_sma_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print_r(apcu_sma_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [num_seg] => 1
-    [seg_size] => 31457280
-    [avail_mem] => 31448408
-    [block_lists] => Array
-        (
-            [0] => Array
-                (
-                    [0] => Array
-                        (
-                            [size] => 31448408
-                            [offset] => 8864
-                        )
-
-                )
-
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link linkend="apcu.configuration">APCu configuration directives</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/apcu/functions/apcu-store.xml b/reference/apcu/functions/apcu-store.xml
deleted file mode 100644
index 0bd00e37a76c..000000000000
--- a/reference/apcu/functions/apcu-store.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.apcu-store">
- <refnamediv>
-  <refname>apcu_store</refname>
-  <refpurpose>
-   Cache a variable in the data store
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>apcu_store</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>apcu_store</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>unused</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Cache a variable in the data store.
-  </simpara>
-  <note>
-   <simpara>
-    Unlike many other mechanisms in PHP, variables stored using
-    <function>apcu_store</function> will persist between requests (until the
-    value is removed from the cache).
-   </simpara>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      Store the variable using this name. <parameter>key</parameter>s are
-      cache-unique, so storing a second value with the same
-      <parameter>key</parameter> will overwrite the original value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>var</parameter></term>
-    <listitem>
-     <simpara>
-      The variable to store
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      Time To Live; store <parameter>var</parameter> in the cache for
-      <parameter>ttl</parameter> seconds. After the
-      <parameter>ttl</parameter> has passed, the stored variable will be
-      expunged from the cache (on the next request). If no <parameter>ttl</parameter>
-      is supplied (or if the <parameter>ttl</parameter> is
-      <literal>0</literal>), the value will persist until it is removed from
-      the cache manually, or otherwise fails to exist in the cache (clear,
-      restart, etc.).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-      Names in key, variables in value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-   Second syntax returns array with error keys.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>apcu_store</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-apcu_store('foo', $bar);
-var_dump(apcu_fetch('foo'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "BAR"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>apcu_add</function></member>
-   <member><function>apcu_fetch</function></member>
-   <member><function>apcu_delete</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/apcu/ini.xml b/reference/apcu/ini.xml
deleted file mode 100644
index 06a0f5eccfee..000000000000
--- a/reference/apcu/ini.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="apcu.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <simpara>
-  Although the default APCu settings are fine for many installations, serious
-  users should consider tuning the following parameters.
- </simpara>
- <simpara>
-  There is one decision to be made configuring APCu.
-  How much memory is going to be allocated to APCu.
-  The ini directive that controls this is <literal>apc.shm_size</literal>
-  Read the sections on this carefully below.
- </simpara>
- <simpara>
-  Once the server is running, the <literal>apc.php</literal> script that
-  is bundled with the extension should be copied somewhere into the docroot and
-  viewed with a browser as it provides a detailed analysis of the internal
-  workings of APCu. If GD is enabled in PHP, it will even display some
-  interesting graphs.</simpara>
-  <simpara>
-  If APCu is working, the <literal>Cache full count
-  </literal> number (on the left) will display the number of times the cache
-  has reached maximum capacity and has had to evict entries to free up memory.
-  During eviction, if <literal>apc.ttl</literal> was specified, APCu will first
-  attempt to remove expired entries, i.e. entries whose TTL has either expired,
-  or entries that have no TTL set and haven't been accessed in the last
-  <literal>apc.ttl</literal> seconds. If <literal>apc.ttl</literal> was not set,
-  or removing expired entries did not free up enough space, APCu will clear the
-  entire cache.
-  </simpara>
-  <simpara>
-  The number of evictions should be minimal in a well-configured cache. If the
-  cache is constantly being filled, and thusly forcefully freed, the resulting
-  churning will have disparaging effects on script performance. The easiest way
-  to minimize this number is to allocate more memory for APCu.
- </simpara>
- <simpara>
-  When APCu is compiled with mmap support (Memory Mapping), it will use only one
-  memory segment, unlike when APCu is built with SHM (SysV Shared Memory) support
-  that uses multiple memory segments. MMAP does not have a maximum limit like SHM
-  does in <literal>/proc/sys/kernel/shmmax</literal>. In general MMAP support is
-  recommended because it will reclaim the memory faster when the webserver is
-  restarted and all in all reduces memory allocation impact at startup.
- </simpara>
- <para>
-  <table>
-   <title>APCu configuration options</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.apcu.enabled">apc.enabled</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.shm-segments">apc.shm_segments</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.shm-size">apc.shm_size</link></entry>
-      <entry>"32M"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.entries-hint">apc.entries_hint</link></entry>
-      <entry>512 * apc.shm_size</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Prior to APCu 5.1.25, the default was 4096</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.ttl">apc.ttl</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.gc-ttl">apc.gc_ttl</link></entry>
-      <entry>3600</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.mmap-file-mask">apc.mmap_file_mask</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.slam-defense">apc.slam_defense</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.enable-cli">apc.enable_cli</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.use-request-time">apc.use_request_time</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Prior to APCu 5.1.19, the default was <literal>1</literal>.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.serializer">apc.serializer</link></entry>
-      <entry>"php"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Prior to APCu 5.1.15, the default was <literal>"default"</literal>.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.coredump-unmap">apc.coredump_unmap</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.apcu.preload-path">apc.preload_path</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.apcu.enabled">
-   <term>
-    <parameter>apc.enabled</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     <literal>apc.enabled</literal> can be set to 0 to disable APC. This is
-     primarily useful when APC is statically compiled
-     into PHP, since there is no other way to disable
-     it (when compiled as a DSO, the <literal>extension</literal>
-     line in <literal>php.ini</literal> can just be commented-out).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.shm-segments">
-   <term>
-    <parameter>apc.shm_segments</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     The number of shared memory segments to allocate
-     for the compiler cache. If APC is running out of
-     shared memory but <literal>apc.shm_size</literal>
-     is set as high as the system allows, raising
-     this value might prevent APC from exhausting its memory.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.shm-size">
-   <term>
-    <parameter>apc.shm_size</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     The size of each shared memory segment given by a shorthand notation as
-     described in <link linkend="faq.using.shorthandbytes">this FAQ</link>.
-     By default, some systems (including most BSD
-     variants) have very low limits on the size of a
-     shared memory segment.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.entries-hint">
-   <term>
-    <parameter>apc.entries_hint</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     A "hint" about the number of distinct variables that might be stored.
-     Set to zero or omit if not sure.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.ttl">
-   <term>
-    <parameter>apc.ttl</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     Consider cache entries without an explicit TTL to be
-     expired if they have not been accessed in this many
-     seconds. Effectively, this allows such entries to be
-     removed opportunistically during a cache insert, or
-     prior to a full expunge. Note that because removal is
-     opportunistic, entries can still be readable even if
-     they are older than <literal>apc.ttl</literal> seconds.
-     This setting has no effect on cache entries that have
-     an explicit TTL specified.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.gc-ttl">
-   <term>
-    <parameter>apc.gc_ttl</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     The number of seconds that a cache entry may
-     remain on the garbage-collection list after being removed or invalidated.
-     Entries are eligible for removal if their reference count is zero,
-     or they exceed this time limit.
-     If set to <literal>0</literal>, time-based cleanup is disabled,
-     and entries are only removed when their reference count drops to zero.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.mmap-file-mask">
-   <term>
-    <parameter>apc.mmap_file_mask</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     If compiled with MMAP support by using <literal>--enable-mmap</literal>
-     this is the mktemp-style file_mask to pass to the
-     mmap module for determining whether your mmap'ed memory
-     region is going to be file-backed or shared memory
-     backed.  For straight file-backed mmap, set it to
-     something like <literal>/tmp/apc.XXXXXX</literal>
-     (exactly 6 <literal>X</literal>s).
-     To use POSIX-style shm_open/mmap put a <literal>.shm</literal>
-     somewhere in your mask.  e.g. <literal>/apc.shm.XXXXXX</literal>
-     You can also set it to <literal>/dev/zero</literal> to use your
-     kernel's <literal>/dev/zero</literal> interface to anonymous mmap'ed
-     memory. Leaving it undefined will force an anonymous mmap.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.slam-defense">
-   <term>
-    <parameter>apc.slam_defense</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     On very busy servers whenever you start the server or
-     modify files you can create a race of many processes
-     all trying to cache the same file at the same time.
-     Setting <literal>apc.slam_defense</literal> to <literal>1</literal>
-     can help prevent multiple processes from caching the
-     same file simultaneously by introducing a probability
-     mechanism. If the same key is attempted to be cached
-     within a short period by different processes, it skips
-     the caching for the current process to mitigate potential
-     cache slams.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.enable-cli">
-   <term>
-    <parameter>apc.enable_cli</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     Mostly for testing and debugging.  Setting this enables APC
-     for the CLI version of PHP.  Under normal circumstances, it is
-     not ideal to create, populate and destroy the APC cache on every
-     CLI request, but for various test scenarios it is useful to be
-     able to enable APC for the CLI version of PHP easily.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.serializer">
-   <term>
-    <parameter>apc.serializer</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     Used to configure APC to use a third party serializer.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.coredump-unmap">
-   <term>
-    <parameter>apc.coredump_unmap</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     Enables APC handling of signals, such as SIGSEGV, that write
-     core files when signaled. When these signals are received,
-     APC will attempt to unmap the shared memory segment in order
-     to exclude it from the core file. This setting may improve
-     system stability when fatal signals are received and a large
-     APC shared memory segment is configured.
-    </simpara>
-    <warning>
-     <simpara>
-      This feature is potentially dangerous. Unmapping the shared
-      memory segment in a fatal signal handler may cause undefined
-      behaviour if a fatal error occurs.
-     </simpara>
-    </warning>
-    <note>
-     <simpara>
-      Although some kernels may provide a facility to ignore various
-      types of shared memory when generating a core dump file, these
-      implementations may also ignore important shared memory segments
-      such as the Apache scoreboard.
-     </simpara>
-    </note>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.apcu.preload-path">
-   <term>
-    <parameter>apc.preload_path</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     Optionally, set a path to the directory that APC will load
-     cache data at startup.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="ini.apcu.use-request-time">
-   <term>
-    <parameter>apc.use_request_time</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     Use the <acronym>SAPI</acronym> request start time for
-     <acronym>TTL</acronym>.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</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/apcu/reference.xml b/reference/apcu/reference.xml
deleted file mode 100644
index dd8251c90c35..000000000000
--- a/reference/apcu/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.apcu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>APCu &Functions;</title>
-
- &reference.apcu.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/apcu/setup.xml b/reference/apcu/setup.xml
deleted file mode 100644
index e6263aa74b89..000000000000
--- a/reference/apcu/setup.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="apcu.setup">
- &reftitle.setup;
-
- <section xml:id="apcu.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;apcu">&url.pecl.package;apcu</link>.
-  </simpara>
-  <tip>
-   <simpara>
-    PHP 7 has a separate module (<link xlink:href="&url.apc.bc;">apcu-bc</link>) for backwards compatibility with APC.
-   </simpara>
-   <simpara>
-    In backward compatibility mode, APCu registers the applicable APC functions
-    with backward compatible prototypes.
-   </simpara>
-   <simpara>
-    Where an APC function accepted <parameter>cache_type</parameter>, it is simply
-    ignored by the backward compatible version, and omitted from the prototype for
-    the APCu version.
-   </simpara>
-  </tip>
-  <warning>
-   <simpara>
-    As of PHP 8.0.0, apcu-bc is no longer supported.
-   </simpara>
-  </warning>
-  <note>
-   <simpara>
-    On Windows, APCu needs a temp path to exist, and be
-    writable by the web server.  It checks the TMP, TEMP
-    and USERPROFILE environment variables in that order
-    and finally tries the WINDOWS directory if none of
-    those are set.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    For more in-depth, highly technical implementation details, see the
-    <link xlink:href="&url.apc.technotes;">
-     developer-supplied TECHNOTES file
-    </link>.
-   </simpara>
-  </note>
-  <simpara>
-   APCu sources can be found <link xlink:href="&url.git.hub;krakjoe/apcu">here</link>.
-  </simpara>
- </section>
-
- &reference.apcu.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/apcu/versions.xml b/reference/apcu/versions.xml
deleted file mode 100644
index b9d0992d6890..000000000000
--- a/reference/apcu/versions.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='apcu_add' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_cache_info' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_cas' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_clear_cache' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_dec' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_delete' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_enabled' from='PECL apcu &gt;= 4.0.3'/>
- <function name='apcu_entry' from='PECL apcu &gt;= 5.1.0'/>
- <function name='apcu_exists' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_fetch' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_inc' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_sma_info' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_store' from='PECL apcu &gt;= 4.0.0'/>
- <function name='apcu_key_info' from='PECL apcu &gt;= 4.0.2'/>
-
- <function name='APCUIterator' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::__construct' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::current' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::getTotalCount' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::getTotalHits' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::getTotalSize' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::key' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::next' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::rewind' from='PECL apcu &gt;= 5.0.0'/>
- <function name='APCUIterator::valid' from='PECL apcu &gt;= 5.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/cmark/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/cmark/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/cmark/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/cmark/book.xml b/reference/cmark/book.xml
deleted file mode 100644
index 2b81863aeaf6..000000000000
--- a/reference/cmark/book.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="book.cmark">
- <?phpdoc extension-membership="pecl" ?>
- <title>CommonMark</title>
- <titleabbrev>CommonMark</titleabbrev>
-
- <preface xml:id="intro.cmark">
-  &reftitle.intro;
-  <simpara>
-  This extension provides access to the reference implementation of CommonMark, a rationalized version of Markdown syntax with a specification.
-  </simpara>
-  <formalpara>
-    <title>Parsing:</title>
-    <para>
-    The CommonMark extension provides a simple parsing API:
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-parse')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-    </para>
-  </formalpara>
-  <formalpara>
-    <title>Rendering:</title>
-    <para>
-    The CommonMark extension provides simple rendering API that supports multiple formats:
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-render')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-  <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-render-html')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-  <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-render-xml')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-  <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-render-man')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-  <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('function.commonmark-render-latex')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-    </para>
-  </formalpara>
-  <formalpara>
-    <title>AST:</title>
-    <para>
-    The CommonMark extension implements visitation for CommonMark\Node objects:
-  <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.accept')/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    </para>
-  </formalpara>
-  <formalpara>
-    <title>CQL:</title>
-    <para>
-    The CommonMark extension provides an interface to CQL, CommonMark Query Language:
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-cql.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    </para>
-  </formalpara>
- </preface>
-
- &reference.cmark.setup;
- &reference.cmark.constants;
- &reference.cmark.commonmark.node.document;
- &reference.cmark.commonmark.node.heading;
- &reference.cmark.commonmark.node.paragraph;
- &reference.cmark.commonmark.node.blockquote;
- &reference.cmark.commonmark.node.bulletlist;
- &reference.cmark.commonmark.node.orderedlist;
- &reference.cmark.commonmark.node.item;
- &reference.cmark.commonmark.node.text;
- &reference.cmark.commonmark.node.text.strong;
- &reference.cmark.commonmark.node.text.emphasis;
- &reference.cmark.commonmark.node.thematicbreak;
- &reference.cmark.commonmark.node.softbreak;
- &reference.cmark.commonmark.node.linebreak;
- &reference.cmark.commonmark.node.code;
- &reference.cmark.commonmark.node.codeblock;
- &reference.cmark.commonmark.node.htmlblock;
- &reference.cmark.commonmark.node.htmlinline;
- &reference.cmark.commonmark.node.image;
- &reference.cmark.commonmark.node.link;
- &reference.cmark.commonmark.node.customblock;
- &reference.cmark.commonmark.node.custominline;
- &reference.cmark.commonmark.node;
- &reference.cmark.commonmark.interfaces.ivisitor;
- &reference.cmark.commonmark.interfaces.ivisitable;
- &reference.cmark.commonmark.parser;
- &reference.cmark.commonmark.cql;
- &reference.cmark.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/cmark/commonmark.cql.xml b/reference/cmark/commonmark.cql.xml
deleted file mode 100644
index c839f164bda7..000000000000
--- a/reference/cmark/commonmark.cql.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.commonmark-cql" role="class">
-
- <title>The CommonMark\CQL class</title>
- <titleabbrev>CommonMark\CQL</titleabbrev>
-
- <partintro>
-
-<!-- {{{ CommonMark\Parser intro -->
-  <section xml:id="commonmark-cql.intro">
-   &reftitle.intro;
-   <simpara>
-    CommonMark Query Language is a DSL for describing how to travel through a CommonMark Node tree implemented as a parser and compiler for a small set of instructions, and a virtual machine for executing those instructions.
-   </simpara>
-   <formalpara>
-    <title>Paths:</title>
-     <para>
-      In its most simplistic form, a CQL query combines the following paths and <literal>/</literal> to describe how to travel through a tree:
-      <simplelist>
-       <member>firstChild</member>
-       <member>lastChild</member>
-       <member>previous</member>
-       <member>next</member>
-       <member>parent</member>
-      </simplelist>
-      For example, <literal>/firstChild/lastChild</literal> would travel to the last child node of the first child node.
-     </para>
-   </formalpara>
-   <formalpara>
-   <title>Loops</title>
-   <para>
-    CQL can be instructed to loop, for example through the children of, or siblings to a particular node, by using the path <literal>children</literal>, or <literal>siblings</literal>. For example, <literal>/firstChild/children</literal> will travel to all the children of the first child node.
-   </para>
-   </formalpara>
-   <formalpara>
-    <title>Subqueries</title>
-     <para>
-      CQL can be instructed how to travel by using a subquery like <literal>[/firstChild]</literal>. For example, <literal>/firstChild/children[/firstChild]</literal> will travel to the first child node of all the children of the first child node.
-     </para>
-   </formalpara>
-   <formalpara>
-    <title>Loop Constraints</title>
-     <para>
-      While looping, CQL can be instructed to constrict the travelled path to nodes of particular type. For example <literal>/children(BlockQuote)</literal> will travel to the children of a node where the type is <literal>BlockQuote</literal>. The following types are recognized (case insensitively):
-      <simplelist>
-       <member>BlockQuote</member>
-       <member>List</member>
-       <member>Item</member>
-       <member>CodeBlock</member>
-       <member>HtmlBlock</member>
-       <member>CustomBlock</member>
-       <member>Paragraph</member>
-       <member>Heading</member>
-       <member>ThematicBreak</member>
-       <member>Text</member>
-       <member>SoftBreak</member>
-       <member>LineBreak</member>
-       <member>Code</member>
-       <member>HtmlInline</member>
-       <member>CustomInline</member>
-       <member>Emphasis</member>
-       <member>Strong</member>
-       <member>Link</member>
-       <member>Image</member>
-      </simplelist>
-      Types may be used as a union, for example <literal>/children(BlockQuote|List)</literal> will travel to the children of a node where the type is <literal>BlockQuote</literal> or <literal>List</literal>. Types, or unions of types, may be also negated. For example <literal>/children(~BlockQuote)</literal> will travel to the children of a node where the type is not <literal>BlockQuote</literal>, and <literal>/children(~BlockQuote|Paragraph)</literal> will travel to the children of a node where the type is not <literal>BlockQuote</literal> or <literal>Paragraph</literal>
-     </para>
-   </formalpara>
-   <formalpara>
-    <title>Path Constraints</title>
-     <para>
-      CQL can be instructed to create a loop to travel to a node of a particular type, at a particular path. For example, <literal>/firstChild(BlockQuote)</literal> will travel to the first child node where the type is <literal>BlockQuote</literal>. Note that like other loops for <literal>children</literal> and <literal>siblings</literal>, this kind of path can only be followed by a subquery.
-     </para>
-   </formalpara>
-   <formalpara>
-    <title>Implementation Notes</title>
-    <para>
-    While CQL has been implemented as part of the PHP CommonMark extension, it stands separately from PHP and does not use PHP's virtual machine or internal representation of values.
-   </para>
-   </formalpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="commonmark-cql.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\CQL</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>CommonMark\CQL</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-cql.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-cql')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.cmark.commonmark.cql.construct;
-  &reference.cmark.commonmark.cql.invoke;
-
-</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/cmark/commonmark.interfaces.ivisitable.xml b/reference/cmark/commonmark.interfaces.ivisitable.xml
deleted file mode 100644
index 1cc72f649069..000000000000
--- a/reference/cmark/commonmark.interfaces.ivisitable.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.commonmark-interfaces-ivisitable" role="class">
-
- <title>The CommonMark\Interfaces\IVisitable interface</title>
- <titleabbrev>CommonMark\Interfaces\IVisitable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ CommonMark\Interfaces\IVisitable intro -->
-  <section xml:id="commonmark-interfaces-ivisitable.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="commonmark-interfaces-ivisitable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Interfaces\IVisitable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Interfaces\IVisitable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-interfaces-ivisitable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.interfaces.ivisitable.accept;
-
-</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/cmark/commonmark.interfaces.ivisitor.xml b/reference/cmark/commonmark.interfaces.ivisitor.xml
deleted file mode 100644
index 67b524ba79cd..000000000000
--- a/reference/cmark/commonmark.interfaces.ivisitor.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.commonmark-interfaces-ivisitor" role="class">
-
- <title>The CommonMark\Interfaces\IVisitor interface</title>
- <titleabbrev>CommonMark\Interfaces\IVisitor</titleabbrev>
-
- <partintro>
-
-<!-- {{{ CommonMark\Interfaces\IVisitor intro -->
-  <section xml:id="commonmark-interfaces-ivisitor.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="commonmark-interfaces-ivisitor.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Interfaces\IVisitor</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Interfaces\IVisitor</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname>CommonMark\Interfaces\IVisitor::Done</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname>CommonMark\Interfaces\IVisitor::Enter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname>CommonMark\Interfaces\IVisitor::Leave</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-interfaces-ivisitor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.interfaces.ivisitor.enter;
- &reference.cmark.commonmark.interfaces.ivisitor.leave;
-
-</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/cmark/commonmark.node.blockquote.xml b/reference/cmark/commonmark.node.blockquote.xml
deleted file mode 100644
index cdc4f3492473..000000000000
--- a/reference/cmark/commonmark.node.blockquote.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-blockquote" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>BlockQuote concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\BlockQuote</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-blockquote.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\BlockQuote</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\BlockQuote</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.bulletlist.xml b/reference/cmark/commonmark.node.bulletlist.xml
deleted file mode 100644
index cc64e15a8a7f..000000000000
--- a/reference/cmark/commonmark.node.bulletlist.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-bulletlist" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>BulletList concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\BulletList</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-bulletlist.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\BulletList</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\BulletList</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname>tight</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>delimiter</varname>
-    </fieldsynopsis>
-
-<classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-bulletlist.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.node.bulletlist.construct;
-
-</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/cmark/commonmark.node.code.xml b/reference/cmark/commonmark.node.code.xml
deleted file mode 100644
index d484612f4827..000000000000
--- a/reference/cmark/commonmark.node.code.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-code" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Code concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Code</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-code.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Code</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Code</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node\Text</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
- 
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.codeblock.xml b/reference/cmark/commonmark.node.codeblock.xml
deleted file mode 100644
index 19b66f9cdaad..000000000000
--- a/reference/cmark/commonmark.node.codeblock.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-codeblock" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CodeBlock concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\CodeBlock</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-codeblock.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\CodeBlock</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\CodeBlock</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node\Text</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>fence</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-codeblock.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
- &reference.cmark.commonmark.node.codeblock.construct;
-
-</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/cmark/commonmark.node.customblock.xml b/reference/cmark/commonmark.node.customblock.xml
deleted file mode 100644
index 660080400713..000000000000
--- a/reference/cmark/commonmark.node.customblock.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-customblock" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CustomBlock concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\CustomBlock</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-customblock.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\CustomBlock</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\CustomBlock</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>onEnter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>onLeave</varname>
-    </fieldsynopsis>    
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.custominline.xml b/reference/cmark/commonmark.node.custominline.xml
deleted file mode 100644
index c84074bd74c7..000000000000
--- a/reference/cmark/commonmark.node.custominline.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-custominline" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CustomInline concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\CustomInline</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-custominline.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\CustomInline</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\CustomInline</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>onEnter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>onLeave</varname>
-    </fieldsynopsis>    
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.document.xml b/reference/cmark/commonmark.node.document.xml
deleted file mode 100644
index 8ec1ce8e3789..000000000000
--- a/reference/cmark/commonmark.node.document.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-document" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Document concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Document</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-document.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Document</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Document</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.heading.xml b/reference/cmark/commonmark.node.heading.xml
deleted file mode 100644
index 9d9bcc0cdeba..000000000000
--- a/reference/cmark/commonmark.node.heading.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-heading" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Heading concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Heading</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-heading.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Heading</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Heading</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>level</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-heading.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-   &reference.cmark.commonmark.node.heading.construct;
-</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/cmark/commonmark.node.htmlblock.xml b/reference/cmark/commonmark.node.htmlblock.xml
deleted file mode 100644
index a12622f73857..000000000000
--- a/reference/cmark/commonmark.node.htmlblock.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-htmlblock" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>HTMLBlock concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\HTMLBlock</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-htmlblock.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\HTMLBlock</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\HTMLBlock</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node\Text</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.htmlinline.xml b/reference/cmark/commonmark.node.htmlinline.xml
deleted file mode 100644
index cdca6b31fc59..000000000000
--- a/reference/cmark/commonmark.node.htmlinline.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-htmlinline" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>HTMLInline concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\HTMLInline</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-htmlinline.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\HTMLInline</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\HTMLInline</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node\Text</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.synopsis')/descendant::db:fieldsynopsis)" />
-
-<classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.image.xml b/reference/cmark/commonmark.node.image.xml
deleted file mode 100644
index 60369de685eb..000000000000
--- a/reference/cmark/commonmark.node.image.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-image" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Image concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Image</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-image.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Image</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Image</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>url</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>title</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-image.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
- </partintro>
-
- &reference.cmark.commonmark.node.image.construct;
-
-</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/cmark/commonmark.node.item.xml b/reference/cmark/commonmark.node.item.xml
deleted file mode 100644
index 0cb79c3e2410..000000000000
--- a/reference/cmark/commonmark.node.item.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-item" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Item concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Item</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-item.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Item</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Item</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.linebreak.xml b/reference/cmark/commonmark.node.linebreak.xml
deleted file mode 100644
index f8a2942c6de8..000000000000
--- a/reference/cmark/commonmark.node.linebreak.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-linebreak" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>LineBreak concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\LineBreak</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-linebreak.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\LineBreak</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\LineBreak</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.link.xml b/reference/cmark/commonmark.node.link.xml
deleted file mode 100644
index f7071a33cdd6..000000000000
--- a/reference/cmark/commonmark.node.link.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-link" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Link concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Link</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-link.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Link</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Link</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>url</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>title</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-link.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.node.link.construct;
-
-</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/cmark/commonmark.node.orderedlist.xml b/reference/cmark/commonmark.node.orderedlist.xml
deleted file mode 100644
index 3121b8510a36..000000000000
--- a/reference/cmark/commonmark.node.orderedlist.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-orderedlist" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>OrderedList concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\OrderedList</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-orderedlist.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\OrderedList</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\OrderedList</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname>tight</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>delimiter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>start</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-orderedlist.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.node.orderedlist.construct;
-
-</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/cmark/commonmark.node.paragraph.xml b/reference/cmark/commonmark.node.paragraph.xml
deleted file mode 100644
index 337a6b517728..000000000000
--- a/reference/cmark/commonmark.node.paragraph.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-paragraph" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Paragraph concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Paragraph</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-paragraph.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Paragraph</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Paragraph</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.softbreak.xml b/reference/cmark/commonmark.node.softbreak.xml
deleted file mode 100644
index 579d42576548..000000000000
--- a/reference/cmark/commonmark.node.softbreak.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-softbreak" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>SoftBreak concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\SoftBreak</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-softbreak.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\SoftBreak</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\SoftBreak</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.text.emphasis.xml b/reference/cmark/commonmark.node.text.emphasis.xml
deleted file mode 100644
index 40bbbb3904db..000000000000
--- a/reference/cmark/commonmark.node.text.emphasis.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-text-emphasis" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Emphasis concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Text\Emphasis</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-text-emphasis.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Text\Emphasis</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Text\Emphasis</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.text.strong.xml b/reference/cmark/commonmark.node.text.strong.xml
deleted file mode 100644
index 787b2d67cff0..000000000000
--- a/reference/cmark/commonmark.node.text.strong.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-text-strong" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Strong concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Text\Strong</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-text-strong.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Text\Strong</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Text\Strong</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.text.xml b/reference/cmark/commonmark.node.text.xml
deleted file mode 100644
index 7343edcae75e..000000000000
--- a/reference/cmark/commonmark.node.text.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-text" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Text concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\Text</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-text.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\Text</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\Text</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname>literal</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node-text.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.cmark.commonmark.node.text.construct;
-
-</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/cmark/commonmark.node.thematicbreak.xml b/reference/cmark/commonmark.node.thematicbreak.xml
deleted file mode 100644
index 61643cd00ca4..000000000000
--- a/reference/cmark/commonmark.node.thematicbreak.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.commonmark-node-thematicbreak" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>ThematicBreak concrete CommonMark\Node</title>
- <titleabbrev>CommonMark\Node\ThematicBreak</titleabbrev>
-
- <partintro>
-
-  <section xml:id="commonmark-node-thematicbreak.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node\ThematicBreak</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Node\ThematicBreak</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-     
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-node.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/cmark/commonmark.node.xml b/reference/cmark/commonmark.node.xml
deleted file mode 100644
index e57acf2123bf..000000000000
--- a/reference/cmark/commonmark.node.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.commonmark-node" role="class">
-
- <title>Abstract CommonMark\Node</title>
- <titleabbrev>CommonMark\Node</titleabbrev>
-
- <partintro>
-
-<!-- {{{ CommonMark\Node intro -->
-  <section xml:id="commonmark-node.intro">
-   &reftitle.intro;
-   <simpara>
-   Represents an Abstract Node, this final abstract is not for direct use by the programmer.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="commonmark-node.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Node</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <modifier>abstract</modifier>
-      <classname>CommonMark\Node</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>CommonMark\Interfaces\IVisitable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>Node</type><type>null</type></type>
-     <varname>parent</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>Node</type><type>null</type></type>
-     <varname>previous</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>Node</type><type>null</type></type>
-     <varname>next</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>Node</type><type>null</type></type>
-     <varname>lastChild</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>Node</type><type>null</type></type>
-     <varname>firstChild</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname>startLine</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname>endLine</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname>startColumn</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname>endColumn</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-node')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
-  &reference.cmark.commonmark.node.appendchild;
-  &reference.cmark.commonmark.node.prependchild;
-  &reference.cmark.commonmark.node.insertafter;
-  &reference.cmark.commonmark.node.insertbefore;
-  &reference.cmark.commonmark.node.replace;
-  &reference.cmark.commonmark.node.unlink;
-  &reference.cmark.commonmark.node.accept;
-
-</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/cmark/commonmark.parser.xml b/reference/cmark/commonmark.parser.xml
deleted file mode 100644
index 9ea64aa69064..000000000000
--- a/reference/cmark/commonmark.parser.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.commonmark-parser" role="class">
-
- <title>The CommonMark\Parser class</title>
- <titleabbrev>CommonMark\Parser</titleabbrev>
-
- <partintro>
-
-<!-- {{{ CommonMark\Parser intro -->
-  <section xml:id="commonmark-parser.intro">
-   &reftitle.intro;
-   <simpara>
-    Provides an incremental parser as an alternative to the simple Parsing API function
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="commonmark-parser.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>CommonMark\Parser</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>CommonMark\Parser</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constructor;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('commonmark-parser.construct')/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.commonmark-parser')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.cmark.commonmark.parser.construct;
-  &reference.cmark.commonmark.parser.parse;
-  &reference.cmark.commonmark.parser.finish;
-
-</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/cmark/commonmark/cql/construct.xml b/reference/cmark/commonmark/cql/construct.xml
deleted file mode 100644
index 08aff3732155..000000000000
--- a/reference/cmark/commonmark/cql/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-cql.construct">
- <refnamediv>
-  <refname>CommonMark\CQL::__construct</refname>
-  <refpurpose>CQL Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\CQL::__construct</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      a CQL string
-     </simpara>
-    </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/cmark/commonmark/cql/invoke.xml b/reference/cmark/commonmark/cql/invoke.xml
deleted file mode 100644
index 534758d3a309..000000000000
--- a/reference/cmark/commonmark/cql/invoke.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-cql.invoke">
- <refnamediv>
-  <refname>CommonMark\CQL::__invoke</refname>
-  <refpurpose>CQL Execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\CQL::__invoke</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>root</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall invoke the current CQL function on the given <parameter>root</parameter>,
-   executing the given <parameter>handler</parameter> on entry to a <type>CommonMark\Node</type>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>the root node of a tree</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>handler</parameter></term>
-    <listitem>
-     <para>
-      should have the prototype:
-      <methodsynopsis role="procedural">
-      <type class="union"><type>bool</type><type>null</type></type><methodname>handler</methodname>
-      <methodparam><type>CommonMark\Node</type><parameter>root</parameter></methodparam>
-      <methodparam><type>CommonMark\Node</type><parameter>entering</parameter></methodparam>
-      </methodsynopsis>
-      <simplelist>
-       <member>Should <parameter>handler</parameter> fail to return (void), or return <type>null</type>, CQL will continue executing</member>
-       <member>Should the handler return a truthy value, CQL will continue executing.</member>
-       <member>Should the handler return a falsy value, CQL will stop executing</member>
-      </simplelist>
-     </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/cmark/commonmark/interfaces/ivisitable/accept.xml b/reference/cmark/commonmark/interfaces/ivisitable/accept.xml
deleted file mode 100644
index 791b8cff8450..000000000000
--- a/reference/cmark/commonmark/interfaces/ivisitable/accept.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-interfaces-ivisitable.accept">
- <refnamediv>
-  <refname>CommonMark\Interfaces\IVisitable::accept</refname>
-  <refpurpose>Visitation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>CommonMark\Interfaces\IVisitable::accept</methodname>
-   <methodparam><type>CommonMark\Interfaces\IVisitor</type><parameter>visitor</parameter></methodparam>
-  </methodsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>visitor</parameter></term>
-    <listitem>
-     <simpara>
-      An object implementing <classname>CommonMark\Interfaces\IVisitor</classname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="commonmark-interfaces-ivisitor.enter"/></member>
-    <member><xref linkend="commonmark-interfaces-ivisitor.leave"/></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/cmark/commonmark/interfaces/ivisitor/enter.xml b/reference/cmark/commonmark/interfaces/ivisitor/enter.xml
deleted file mode 100644
index 2d23d8c24155..000000000000
--- a/reference/cmark/commonmark/interfaces/ivisitor/enter.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-interfaces-ivisitor.enter">
- <refnamediv>
-  <refname>CommonMark\Interfaces\IVisitor::enter</refname>
-  <refpurpose>Visitation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::enter</methodname>
-   <methodparam><type>IVisitable</type><parameter>visitable</parameter></methodparam>
-  </methodsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>visitable</parameter></term>
-    <listitem>
-     <simpara>
-      The current <classname>CommonMark\Interfaces\IVisitable</classname> being entered
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returning <varname>CommonMark\Interfaces\IVisitor::Done</varname> will cause the backing iterator to exit.
-  </simpara>
-  <simpara>
-  Returning <varname>CommonMark\Interfaces\IVisitor::Enter</varname> will reset the backing iterator at entering the current <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning <varname>CommonMark\Interfaces\IVisitor::Leave</varname> will reset the backing iterator at exiting the current <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning an <classname>IVisitable</classname> will reset the backing iterator at entering the given <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning nothing will allow the backing iterator to continue
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="commonmark-interfaces-ivisitable.accept"/></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/cmark/commonmark/interfaces/ivisitor/leave.xml b/reference/cmark/commonmark/interfaces/ivisitor/leave.xml
deleted file mode 100644
index d603b92cf95a..000000000000
--- a/reference/cmark/commonmark/interfaces/ivisitor/leave.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-interfaces-ivisitor.leave">
- <refnamediv>
-  <refname>CommonMark\Interfaces\IVisitor::leave</refname>
-  <refpurpose>Visitation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::leave</methodname>
-   <methodparam><type>IVisitable</type><parameter>visitable</parameter></methodparam>
-  </methodsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>visitable</parameter></term>
-    <listitem>
-     <simpara>
-      The current <classname>CommonMark\Interfaces\IVisitable</classname> being exited
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returning <varname>CommonMark\Interfaces\IVisitor::Done</varname> will cause the backing iterator to exit.
-  </simpara>
-  <simpara>
-  Returning <varname>CommonMark\Interfaces\IVisitor::Enter</varname> will reset the backing iterator at entering the current <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning <varname>CommonMark\Interfaces\IVisitor::Leave</varname> will reset the backing iterator at exiting the current <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning an <classname>IVisitable</classname> will reset the backing iterator at exiting the given <classname>IVisitable</classname>
-  </simpara>
-  <simpara>
-  Returning nothing will allow the backing iterator to continue
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="commonmark-interfaces-ivisitable.accept"/></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/cmark/commonmark/node/accept.xml b/reference/cmark/commonmark/node/accept.xml
deleted file mode 100644
index 473619597f3f..000000000000
--- a/reference/cmark/commonmark/node/accept.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.accept">
- <refnamediv>
-  <refname>CommonMark\Node::accept</refname>
-  <refpurpose>Visitation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>CommonMark\Node::accept</methodname>
-   <methodparam><type>CommonMark\Interfaces\IVisitor</type><parameter>visitor</parameter></methodparam>
-  </methodsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>visitor</parameter></term>
-    <listitem>
-     <simpara>
-      An object implementing <classname>CommonMark\Interfaces\IVisitor</classname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="commonmark-interfaces-ivisitor.enter"/></member>
-    <member><xref linkend="commonmark-interfaces-ivisitor.leave"/></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/cmark/commonmark/node/appendchild.xml b/reference/cmark/commonmark/node/appendchild.xml
deleted file mode 100644
index ba6328f08e33..000000000000
--- a/reference/cmark/commonmark/node/appendchild.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.appendchild">
- <refnamediv>
-  <refname>CommonMark\Node::appendChild</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Node::appendChild</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>child</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>child</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/bulletlist/construct.xml b/reference/cmark/commonmark/node/bulletlist/construct.xml
deleted file mode 100644
index cbf2ee8a063b..000000000000
--- a/reference/cmark/commonmark/node/bulletlist/construct.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-bulletlist.construct">
- <refnamediv>
-  <refname>CommonMark\Node\BulletList::__construct</refname>
-  <refpurpose>BulletList Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\BulletList::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\BulletList::__construct</methodname>
-   <methodparam><type>int</type><parameter>tight</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\BulletList::__construct</methodname>
-   <methodparam><type>int</type><parameter>tight</parameter></methodparam>
-   <methodparam><type>int</type><parameter>delimiter</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/codeblock/construct.xml b/reference/cmark/commonmark/node/codeblock/construct.xml
deleted file mode 100644
index 0c4f468ad969..000000000000
--- a/reference/cmark/commonmark/node/codeblock/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-codeblock.construct">
- <refnamediv>
-  <refname>CommonMark\Node\CodeBlock::__construct</refname>
-  <refpurpose>CodeBlock Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\CodeBlock::__construct</methodname>
-   <methodparam><type>string</type><parameter>fence</parameter></methodparam>
-   <methodparam><type>string</type><parameter>literal</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fence</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>literal</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/heading/construct.xml b/reference/cmark/commonmark/node/heading/construct.xml
deleted file mode 100644
index 6ba1bad660d2..000000000000
--- a/reference/cmark/commonmark/node/heading/construct.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-heading.construct">
- <refnamediv>
-  <refname>CommonMark\Node\Heading::__construct</refname>
-  <refpurpose>Heading Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Heading::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Heading::__construct</methodname>
-   <methodparam><type>int</type><parameter>level</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/image/construct.xml b/reference/cmark/commonmark/node/image/construct.xml
deleted file mode 100644
index 15a950104ec2..000000000000
--- a/reference/cmark/commonmark/node/image/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-image.construct">
- <refnamediv>
-  <refname>CommonMark\Node\Image::__construct</refname>
-  <refpurpose>Image Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Image::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Image::__construct</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Image::__construct</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/insertafter.xml b/reference/cmark/commonmark/node/insertafter.xml
deleted file mode 100644
index 5df5829eeefe..000000000000
--- a/reference/cmark/commonmark/node/insertafter.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.insertafter">
- <refnamediv>
-  <refname>CommonMark\Node::insertAfter</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Node::insertAfter</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>sibling</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sibling</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/insertbefore.xml b/reference/cmark/commonmark/node/insertbefore.xml
deleted file mode 100644
index efcfb595d86f..000000000000
--- a/reference/cmark/commonmark/node/insertbefore.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.insertbefore">
- <refnamediv>
-  <refname>CommonMark\Node::insertBefore</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Node::insertBefore</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>sibling</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sibling</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/link/construct.xml b/reference/cmark/commonmark/node/link/construct.xml
deleted file mode 100644
index 277c2e100d00..000000000000
--- a/reference/cmark/commonmark/node/link/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-link.construct">
- <refnamediv>
-  <refname>CommonMark\Node\Link::__construct</refname>
-  <refpurpose>Link Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Link::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Link::__construct</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Link::__construct</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/orderedlist/construct.xml b/reference/cmark/commonmark/node/orderedlist/construct.xml
deleted file mode 100644
index 3e7f12d0fb22..000000000000
--- a/reference/cmark/commonmark/node/orderedlist/construct.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-orderedlist.construct">
- <refnamediv>
-  <refname>CommonMark\Node\OrderedList::__construct</refname>
-  <refpurpose>OrderedList Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\OrderedList::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\OrderedList::__construct</methodname>
-   <methodparam><type>int</type><parameter>tight</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\OrderedList::__construct</methodname>
-   <methodparam><type>int</type><parameter>tight</parameter></methodparam>
-   <methodparam><type>int</type><parameter>delimiter</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\OrderedList::__construct</methodname>
-   <methodparam><type>int</type><parameter>tight</parameter></methodparam>
-   <methodparam><type>int</type><parameter>delimiter</parameter></methodparam>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tight</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>delimiter</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/prependchild.xml b/reference/cmark/commonmark/node/prependchild.xml
deleted file mode 100644
index 40533d1df48e..000000000000
--- a/reference/cmark/commonmark/node/prependchild.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.prependchild">
- <refnamediv>
-  <refname>CommonMark\Node::prependChild</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Node::prependChild</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>child</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>child</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/replace.xml b/reference/cmark/commonmark/node/replace.xml
deleted file mode 100644
index e9dd7e643cb8..000000000000
--- a/reference/cmark/commonmark/node/replace.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.replace">
- <refnamediv>
-  <refname>CommonMark\Node::replace</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Node::replace</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>target</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>target</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/text/construct.xml b/reference/cmark/commonmark/node/text/construct.xml
deleted file mode 100644
index fd224d92883a..000000000000
--- a/reference/cmark/commonmark/node/text/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node-text.construct">
- <refnamediv>
-  <refname>CommonMark\Node\Text::__construct</refname>
-  <refpurpose>Text Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Text::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Node\Text::__construct</methodname>
-   <methodparam><type>string</type><parameter>literal</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>literal</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/node/unlink.xml b/reference/cmark/commonmark/node/unlink.xml
deleted file mode 100644
index e6259d869a05..000000000000
--- a/reference/cmark/commonmark/node/unlink.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-node.unlink">
- <refnamediv>
-  <refname>CommonMark\Node::unlink</refname>
-  <refpurpose>AST Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>CommonMark\Node::unlink</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/parser/construct.xml b/reference/cmark/commonmark/parser/construct.xml
deleted file mode 100644
index d6d2254656fd..000000000000
--- a/reference/cmark/commonmark/parser/construct.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-parser.construct">
- <refnamediv>
-  <refname>CommonMark\Parser::__construct</refname>
-  <refpurpose>Parsing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>CommonMark\Parser::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Normal</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Normalize</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\ValidateUTF8</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Smart</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     </variablelist>
-    </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/cmark/commonmark/parser/finish.xml b/reference/cmark/commonmark/parser/finish.xml
deleted file mode 100644
index be0085cc6c9c..000000000000
--- a/reference/cmark/commonmark/parser/finish.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-parser.finish">
- <refnamediv>
-  <refname>CommonMark\Parser::finish</refname>
-  <refpurpose>Parsing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>CommonMark\Node</type><methodname>CommonMark\Parser::finish</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/commonmark/parser/parse.xml b/reference/cmark/commonmark/parser/parse.xml
deleted file mode 100644
index 4812cf407c0c..000000000000
--- a/reference/cmark/commonmark/parser/parse.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="commonmark-parser.parse">
- <refnamediv>
-  <refname>CommonMark\Parser::parse</refname>
-  <refpurpose>Parsing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>CommonMark\Parser::parse</methodname>
-   <methodparam><type>string</type><parameter>buffer</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/configure.xml b/reference/cmark/configure.xml
deleted file mode 100644
index 6b66114e805a..000000000000
--- a/reference/cmark/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="cmark.installation">
- &reftitle.install;
-
- <simpara>
-  Use <option role="configure">--with-cmark[=DIR]</option> when compiling PHP.
- </simpara>
-
- <simpara>
-  Windows users should include <filename>php_cmark.dll</filename> into &php.ini;
- </simpara>
-
-</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/cmark/constants.xml b/reference/cmark/constants.xml
deleted file mode 100644
index 50f69e8a0781..000000000000
--- a/reference/cmark/constants.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="cmark.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- <variablelist>
-  <varlistentry xml:id="constant.commonmark-parser-normal">
-   <term>
-    <constant>CommonMark\Parser\Normal</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-parser-normalize">
-   <term>
-    <constant>CommonMark\Parser\Normalize</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-parser-smart">
-   <term>
-    <constant>CommonMark\Parser\Smart</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-parser-validateutf8">
-   <term>
-    <constant>CommonMark\Parser\ValidateUTF8</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-render-hardbreaks">
-   <term>
-    <constant>CommonMark\Render\HardBreaks</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-render-nobreaks">
-   <term>
-    <constant>CommonMark\Render\NoBreaks</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-render-normal">
-   <term>
-    <constant>CommonMark\Render\Normal</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-render-safe">
-   <term>
-    <constant>CommonMark\Render\Safe</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.commonmark-render-sourcepos">
-   <term>
-    <constant>CommonMark\Render\SourcePos</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/cmark/functions/commonmark.parse.xml b/reference/cmark/functions/commonmark.parse.xml
deleted file mode 100644
index 21477c4328fe..000000000000
--- a/reference/cmark/functions/commonmark.parse.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-parse">
- <refnamediv>
-  <refname>CommonMark\Parse</refname>
-  <refpurpose>Parsing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>CommonMark\Node</type><methodname>CommonMark\Parse</methodname>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Shall parse <parameter>content</parameter>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      markdown string
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Normal</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Normalize</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\ValidateUTF8</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>
-       <constant>CommonMark\Parser\Smart</constant>
-       (<type>int</type>)
-      </term>
-      <listitem>
-       <simpara>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Shall return root CommonMark\Node
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/functions/commonmark.render.html.xml b/reference/cmark/functions/commonmark.render.html.xml
deleted file mode 100644
index 2bb03904dfa9..000000000000
--- a/reference/cmark/functions/commonmark.render.html.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-render-html">
- <refnamediv>
-  <refname>CommonMark\Render\HTML</refname>
-  <refpurpose>Rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>CommonMark\Render\HTML</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>node</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Normal</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\SourcePos</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\HardBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Safe</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\NoBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/functions/commonmark.render.latex.xml b/reference/cmark/functions/commonmark.render.latex.xml
deleted file mode 100644
index 328bfa05c077..000000000000
--- a/reference/cmark/functions/commonmark.render.latex.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-render-latex">
- <refnamediv>
-  <refname>CommonMark\Render\Latex</refname>
-  <refpurpose>Rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>CommonMark\Render\Latex</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>node</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Normal</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\SourcePos</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\HardBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Safe</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\NoBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/functions/commonmark.render.man.xml b/reference/cmark/functions/commonmark.render.man.xml
deleted file mode 100644
index 240df7b85d05..000000000000
--- a/reference/cmark/functions/commonmark.render.man.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-render-man">
- <refnamediv>
-  <refname>CommonMark\Render\Man</refname>
-  <refpurpose>Rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>CommonMark\Render\Man</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>node</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Normal</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\SourcePos</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\HardBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Safe</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\NoBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/functions/commonmark.render.xml b/reference/cmark/functions/commonmark.render.xml
deleted file mode 100644
index 488719b1f6d4..000000000000
--- a/reference/cmark/functions/commonmark.render.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-render">
- <refnamediv>
-  <refname>CommonMark\Render</refname>
-  <refpurpose>Rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>CommonMark\Render</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>node</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Normal</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\SourcePos</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\HardBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Safe</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\NoBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/functions/commonmark.render.xml.xml b/reference/cmark/functions/commonmark.render.xml.xml
deleted file mode 100644
index 5b68b282f6b8..000000000000
--- a/reference/cmark/functions/commonmark.render.xml.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.commonmark-render-xml">
- <refnamediv>
-  <refname>CommonMark\Render\XML</refname>
-  <refpurpose>Rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>CommonMark\Render\XML</methodname>
-   <methodparam><type>CommonMark\Node</type><parameter>node</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>node</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      A mask of:
-     </simpara>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Normal</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\SourcePos</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\HardBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\Safe</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <constant>CommonMark\Render\NoBreaks</constant>
-        (<type>int</type>)
-       </term>
-       <listitem>
-        <simpara>
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/cmark/reference.xml b/reference/cmark/reference.xml
deleted file mode 100644
index d4141697190b..000000000000
--- a/reference/cmark/reference.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.cmark" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>CommonMark &Functions;</title>
-
- &reference.cmark.functions.commonmark.parse;
- &reference.cmark.functions.commonmark.render;
- &reference.cmark.functions.commonmark.render.html;
- &reference.cmark.functions.commonmark.render.latex;
- &reference.cmark.functions.commonmark.render.man;
- &reference.cmark.functions.commonmark.render.xml;
-
-</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/cmark/setup.xml b/reference/cmark/setup.xml
deleted file mode 100644
index 0ec50755c003..000000000000
--- a/reference/cmark/setup.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="cmark.setup">
- &reftitle.setup;
-
- <section xml:id="cmark.requirements">
-  &reftitle.required;
-  <simpara>
-  The CommonMark extension requires the (C) reference implementation of <link xlink:href="&url.git.hub;commonmark/cmark">cmark</link>.
-  </simpara>
- </section>
-
- <section xml:id="cmark.installation">
-  &reftitle.install;
-  <simpara>
-  The CommonMark extension releases are hosted by PECL and source is hosted on
-   <link xlink:href="&url.git.hub;krakjoe/cmark">github</link>,
-   the easiest route to installation is the normal PECL route:
-   <link xlink:href="&url.pecl.package;cmark">&url.pecl.package;cmark</link>.
-  </simpara>
-  <simpara>
- Windows users can download prebuilt release binaries from the <link xlink:href="&url.pecl.package;cmark">PECL</link> website.
-  </simpara>
-  <caution>
-   <simpara>
- Windows users need to take the additional step of adding cmark.dll (distributed with Windows releases) to their <envar>PATH</envar>.
-   </simpara>
-  </caution>
-
- </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/cmark/versions.xml b/reference/cmark/versions.xml
deleted file mode 100644
index 8c41ecfb9fbe..000000000000
--- a/reference/cmark/versions.xml
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='commonmark\parse' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\render' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\render\xml' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\render\html' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\render\man' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\render\latex' from='cmark &gt;= 1.0.0'/>
- <!-- Classes and Methods -->
-
- <function name='commonmark\node' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\interfaces\ivisitor' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\interfaces\ivisitor::enter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\interfaces\ivisitor::leave' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\interfaces\ivisitable' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\interfaces\ivisitable::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\text' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\text\emphasis' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\emphasis::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\text\strong' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\text\strong::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\document' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\document::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\blockquote' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\blockquote::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\orderedlist' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\orderedlist::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\bulletlist' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\bulletlist::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\item' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\item::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\codeblock' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\codeblock::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\htmlblock' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlblock::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\customblock' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\customblock::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\paragraph' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\paragraph::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\heading' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\heading::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\thematicbreak' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\thematicbreak::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\softbreak' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\softbreak::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\linebreak' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\linebreak::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\code' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\code::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\htmlinline' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\htmlinline::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\custominline' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\custominline::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\link' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\link::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\node\image' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::appendchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::prependchild' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::insertbefore' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::insertafter' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::replace' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::unlink' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\node\image::accept' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\parser' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\parser::__construct' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\parser::parse' from='cmark &gt;= 1.0.0'/>
- <function name='commonmark\parser::finish' from='cmark &gt;= 1.0.0'/>
-
- <function name='commonmark\cql' from='cmark &gt;= 1.1.0'/>
- <function name='commonmark\cql::__construct' from='cmark &gt;= 1.1.0'/>
- <function name='commonmark\cql::__invoke' from='cmark &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/componere/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/componere/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/componere/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/componere/book.xml b/reference/componere/book.xml
deleted file mode 100644
index 07e62a234353..000000000000
--- a/reference/componere/book.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="book.componere">
- <?phpdoc extension-membership="pecl" ?>
- <title>Componere</title>
- <titleabbrev>Componere</titleabbrev>
-
- <preface xml:id="intro.componere">
-  &reftitle.intro;
-  <simpara>
-   Componere <subscript>(latin, English: compose)</subscript> targets production environments and provides an API for
-   composition of classes, monkey patching, and casting.
-  </simpara>
-   <formalpara>
-    <title>Composition:</title>
-    <para>
-     <classname>Componere\Definition</classname> is used to define (or redefine) a class at runtime;
-     The class can then be registered, and in the case of redefinition it replaces the original class
-     for as long as the <classname>Componere\Definition</classname> exists.
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-definition')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    </para>
-   </formalpara>
-
-   <formalpara>
-    <title>Patching:</title>
-    <para>
-     <classname>Componere\Patch</classname> is used to change the class of a specific instance of an object at runtime;
-     Upon application the patch will remain applied for as long as the <classname>Componere\Patch</classname> exists, and can be reverted explicitly.
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-patch')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    </para>
-  </formalpara>
-
-  <formalpara>
-    <title>Casting:</title>
-    <para>
-     <classname>Componere\</classname> casting functions can cast among user defined compatible types;
-     Where compatible means <classname>Type</classname> is sub or super to the type of <parameter>object</parameter>.
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('componere.cast')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('componere.cast_by_ref')/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-    </para>
-  </formalpara>
-
- </preface>
-
- &reference.componere.setup;
- &reference.componere.componere.abstract.definition;
- &reference.componere.componere.definition;
- &reference.componere.componere.patch;
- &reference.componere.componere.method;
- &reference.componere.componere.value;
- &reference.componere.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/componere/componere.abstract.definition.xml b/reference/componere/componere.abstract.definition.xml
deleted file mode 100644
index 06e0d3e9571e..000000000000
--- a/reference/componere/componere.abstract.definition.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.componere-abstract-definition" role="class">
-
- <title>The Componere\Abstract\Definition class</title>
- <titleabbrev>Componere\Abstract\Definition</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Componere\Abstract\Definition intro -->
-  <section xml:id="componere-abstract-definition.intro">
-   &reftitle.intro;
-   <simpara>
-    This final abstract represents a class entry, and should not be used by the programmer.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="componere-abstract-definition.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Componere\Abstract\Definition</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <modifier>abstract</modifier>
-      <classname>Componere\Abstract\Definition</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-abstract-definition')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.componere.componere.abstract.entities.definition;
-
-</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/componere/componere.definition.xml b/reference/componere/componere.definition.xml
deleted file mode 100644
index e6030ed3501a..000000000000
--- a/reference/componere/componere.definition.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.componere-definition" role="class">
-
- <title>The Componere\Definition class</title>
- <titleabbrev>Componere\Definition</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Componere\Definition intro -->
-  <section xml:id="componere-definition.intro">
-   &reftitle.intro;
-   <simpara>
-    The Definition class allows the programmer to build and register a type at runtime.
-   </simpara>
-   <simpara>
-    Should a Definition replace an existing class, the existing class will be restored when the Definition is destroyed.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="componere-definition.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>Componere\Definition</classname>
-    </ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Componere\Definition</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Componere\Abstract\Definition</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructors</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-definition')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-definition')/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.componere-abstract-definition')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.componere.componere.definition.construct;
-  &reference.componere.componere.definition.addconstant;
-  &reference.componere.componere.definition.addproperty;
-  &reference.componere.componere.definition.register;
-  &reference.componere.componere.definition.isregistered;
-  &reference.componere.componere.definition.getclosure;
-  &reference.componere.componere.definition.getclosures;
-</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/componere/componere.method.xml b/reference/componere/componere.method.xml
deleted file mode 100644
index 2a15ae14ba4e..000000000000
--- a/reference/componere/componere.method.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.componere-method" role="class">
-
- <title>The Componere\Method class</title>
- <titleabbrev>Componere\Method</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Componere\Method intro -->
-  <section xml:id="componere-method.intro">
-   &reftitle.intro;
-   <simpara>
-    A Method represents a function with modifiable accessibility flags
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="componere-method.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Componere\Method</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Componere\Method</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-method')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-method')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.componere.componere.method.construct;
-  &reference.componere.componere.method.setprivate;
-  &reference.componere.componere.method.setprotected;
-  &reference.componere.componere.method.setstatic;
-  &reference.componere.componere.method.getreflector;
-
-</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/componere/componere.patch.xml b/reference/componere/componere.patch.xml
deleted file mode 100644
index 0ebe39a2b112..000000000000
--- a/reference/componere/componere.patch.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.componere-patch" role="class">
-
- <title>The Componere\Patch class</title>
- <titleabbrev>Componere\Patch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Componere\Patch intro -->
-  <section xml:id="componere-patch.intro">
-   &reftitle.intro;
-   <simpara>
-    The Patch class allows the programmer to change the type of an instance at runtime without registering a new Definition
-   </simpara>
-   <simpara>
-    When a Patch is destroyed it is reverted, so that instances that were patched during the lifetime of the Patch are restored to their formal type.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="componere-patch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Componere\Patch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Componere\Patch</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Componere\Abstract\Definition</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructors</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-patch')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-patch')/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.componere-abstract-definition')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.componere.componere.patch.construct;
-  &reference.componere.componere.patch.apply;
-  &reference.componere.componere.patch.revert;
-  &reference.componere.componere.patch.isapplied;
-  &reference.componere.componere.patch.derive;
-  &reference.componere.componere.patch.getclosure;
-  &reference.componere.componere.patch.getclosures;
-
-</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/componere/componere.value.xml b/reference/componere/componere.value.xml
deleted file mode 100644
index 0f7918f957bc..000000000000
--- a/reference/componere/componere.value.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.componere-value" role="class">
-
- <title>The Componere\Value class</title>
- <titleabbrev>Componere\Value</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Componere\Value intro -->
-  <section xml:id="componere-value.intro">
-   &reftitle.intro;
-   <simpara>
-    A Value represents a PHP variable of all types, including undefined
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="componere-value.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Componere\Value</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Componere\Value</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-value')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.componere-value')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.componere.componere.value.construct;
-  &reference.componere.componere.value.setprivate;
-  &reference.componere.componere.value.setprotected;
-  &reference.componere.componere.value.setstatic;
-  &reference.componere.componere.value.isprivate;
-  &reference.componere.componere.value.isprotected;
-  &reference.componere.componere.value.isstatic;
-  &reference.componere.componere.value.hasdefault;
-
-</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/componere/componere/abstract/definition/addinterface.xml b/reference/componere/componere/abstract/definition/addinterface.xml
deleted file mode 100644
index 04df5e92421c..000000000000
--- a/reference/componere/componere/abstract/definition/addinterface.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-abstract-definition.addinterface">
- <refnamediv>
-  <refname>Componere\Abstract\Definition::addInterface</refname>
-  <refpurpose>Add Interface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Definition</type><methodname>Componere\Abstract\Definition::addInterface</methodname>
-   <methodparam><type>string</type><parameter>interface</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall implement the given interface on the current definition
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>interface</parameter></term>
-    <listitem>
-     <simpara>
-      The case insensitive name of an interface
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/abstract/definition/addmethod.xml b/reference/componere/componere/abstract/definition/addmethod.xml
deleted file mode 100644
index dac3f10d7c6f..000000000000
--- a/reference/componere/componere/abstract/definition/addmethod.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-abstract-definition.addmethod">
- <refnamediv>
-  <refname>Componere\Abstract\Definition::addMethod</refname>
-  <refpurpose>Add Method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Definition</type><methodname>Componere\Abstract\Definition::addMethod</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>Componere\Method</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall create or override a method on the current definition.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The case insensitive name for method
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method</parameter></term>
-    <listitem>
-     <simpara>
-      <type>Componere\Method</type> not previously added to another <type>Definition</type>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if Method was added to another Definition
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/abstract/definition/addtrait.xml b/reference/componere/componere/abstract/definition/addtrait.xml
deleted file mode 100644
index f720ee8a36ca..000000000000
--- a/reference/componere/componere/abstract/definition/addtrait.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-abstract-definition.addtrait">
- <refnamediv>
-  <refname>Componere\Abstract\Definition::addTrait</refname>
-  <refpurpose>Add Trait</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Definition</type><methodname>Componere\Abstract\Definition::addTrait</methodname>
-   <methodparam><type>string</type><parameter>trait</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall use the given trait for the current definition
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>trait</parameter></term>
-    <listitem>
-     <simpara>
-      The case insensitive name of a trait
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/abstract/definition/getreflector.xml b/reference/componere/componere/abstract/definition/getreflector.xml
deleted file mode 100644
index 11a93d485d04..000000000000
--- a/reference/componere/componere/abstract/definition/getreflector.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-abstract-definition.getreflector">
- <refnamediv>
-  <refname>Componere\Abstract\Definition::getReflector</refname>
-  <refpurpose>Reflection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReflectionClass</type><methodname>Componere\Abstract\Definition::getReflector</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall create or return a ReflectionClass
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A ReflectionClass for the current definition (cached)
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/addconstant.xml b/reference/componere/componere/definition/addconstant.xml
deleted file mode 100644
index 351f347cc51a..000000000000
--- a/reference/componere/componere/definition/addconstant.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.addconstant">
- <refnamediv>
-  <refname>Componere\Definition::addConstant</refname>
-  <refpurpose>Add Constant</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Definition</type><methodname>Componere\Definition::addConstant</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>Componere\Value</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall declare a class constant on the current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The case sensitive name for the constant
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The Value for the constant, must not be undefined or static
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> is already declared as a constant
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>value</parameter> is static
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>value</parameter> is undefined
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/addproperty.xml b/reference/componere/componere/definition/addproperty.xml
deleted file mode 100644
index 74a702d41cc4..000000000000
--- a/reference/componere/componere/definition/addproperty.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.addproperty">
- <refnamediv>
-  <refname>Componere\Definition::addProperty</refname>
-  <refpurpose>Add Property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Definition</type><methodname>Componere\Definition::addProperty</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>Componere\Value</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall declare a class property on the current Definition
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The case sensitive name for the property
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The default Value for the property
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> is already declared as a property
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/construct.xml b/reference/componere/componere/definition/construct.xml
deleted file mode 100644
index 96c3f5ab9156..000000000000
--- a/reference/componere/componere/definition/construct.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.construct">
- <refnamediv>
-  <refname>Componere\Definition::__construct</refname>
-  <refpurpose>Definition Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Definition::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </constructorsynopsis>
-
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Definition::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>parent</parameter></methodparam>
-  </constructorsynopsis>
-
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Definition::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>array</type><parameter>interfaces</parameter></methodparam>
-  </constructorsynopsis>
-
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Definition::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>parent</parameter></methodparam>
-   <methodparam><type>array</type><parameter>interfaces</parameter></methodparam>
-  </constructorsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      A case insensitive class name
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parent</parameter></term>
-    <listitem>
-     <simpara>
-      A case insensitive class name
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>interfaces</parameter></term>
-    <listitem>
-     <simpara>
-      An array of case insensitive class names
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-  <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace an internal class
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace an interface
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if an attempt is made to replace a trait
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/getclosure.xml b/reference/componere/componere/definition/getclosure.xml
deleted file mode 100644
index 3c741c10ed46..000000000000
--- a/reference/componere/componere/definition/getclosure.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.getclosure">
- <refnamediv>
-  <refname>Componere\Definition::getClosure</refname>
-  <refpurpose>Get Closure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Closure</type><methodname>Componere\Definition::getClosure</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall return a Closure for the method specified by name
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The case insensitive name of the method
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A Closure bound to the correct scope
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> could not be found
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/getclosures.xml b/reference/componere/componere/definition/getclosures.xml
deleted file mode 100644
index 808e71d37adb..000000000000
--- a/reference/componere/componere/definition/getclosures.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.getclosures">
- <refnamediv>
-  <refname>Componere\Definition::getClosures</refname>
-  <refpurpose>Get Closures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Componere\Definition::getClosures</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall return an array of Closures
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Shall return all methods as an array of Closure objects bound to the correct scope
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/isregistered.xml b/reference/componere/componere/definition/isregistered.xml
deleted file mode 100644
index 401906108e05..000000000000
--- a/reference/componere/componere/definition/isregistered.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.isregistered">
- <refnamediv>
-  <refname>Componere\Definition::isRegistered</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Definition::isRegistered</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall detect the registration state of this Definition
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Shall return true if this Definition is registered
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/definition/register.xml b/reference/componere/componere/definition/register.xml
deleted file mode 100644
index f5f96e8204f5..000000000000
--- a/reference/componere/componere/definition/register.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-definition.register">
- <refnamediv>
-  <refname>Componere\Definition::register</refname>
-  <refpurpose>Registration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Componere\Definition::register</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall register the current Definition
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <type>Definition</type> was registered
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/method/construct.xml b/reference/componere/componere/method/construct.xml
deleted file mode 100644
index 1ae6a0ce0a95..000000000000
--- a/reference/componere/componere/method/construct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-method.construct">
- <refnamediv>
-  <refname>Componere\Method::__construct</refname>
-  <refpurpose>Method Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Method::__construct</methodname>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-  </constructorsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>closure</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </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/componere/componere/method/getreflector.xml b/reference/componere/componere/method/getreflector.xml
deleted file mode 100644
index 0d9b8b798462..000000000000
--- a/reference/componere/componere/method/getreflector.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-method.getreflector">
- <refnamediv>
-  <refname>Componere\Method::getReflector</refname>
-  <refpurpose>Reflection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReflectionMethod</type><methodname>Componere\Method::getReflector</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall create or return a ReflectionMethod
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A ReflectionMethod for the current method (cached)
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/method/setprivate.xml b/reference/componere/componere/method/setprivate.xml
deleted file mode 100644
index d3865ea8200a..000000000000
--- a/reference/componere/componere/method/setprivate.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-method.setprivate">
- <refnamediv>
-  <refname>Componere\Method::setPrivate</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Method</type><methodname>Componere\Method::setPrivate</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Method
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/method/setprotected.xml b/reference/componere/componere/method/setprotected.xml
deleted file mode 100644
index e13da56616a8..000000000000
--- a/reference/componere/componere/method/setprotected.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-method.setprotected">
- <refnamediv>
-  <refname>Componere\Method::setProtected</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Method</type><methodname>Componere\Method::setProtected</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Method
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/method/setstatic.xml b/reference/componere/componere/method/setstatic.xml
deleted file mode 100644
index 62b63361c0b7..000000000000
--- a/reference/componere/componere/method/setstatic.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-method.setstatic">
- <refnamediv>
-  <refname>Componere\Method::setStatic</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Method</type><methodname>Componere\Method::setStatic</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Method
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/apply.xml b/reference/componere/componere/patch/apply.xml
deleted file mode 100644
index a2339e5775e2..000000000000
--- a/reference/componere/componere/patch/apply.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.apply">
- <refnamediv>
-  <refname>Componere\Patch::apply</refname>
-  <refpurpose>Application</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Componere\Patch::apply</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall apply the current patch
-  </simpara>
-
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/construct.xml b/reference/componere/componere/patch/construct.xml
deleted file mode 100644
index 954cdd48a61e..000000000000
--- a/reference/componere/componere/patch/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.construct">
- <refnamediv>
-  <refname>Componere\Patch::__construct</refname>
-  <refpurpose>Patch Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Patch::__construct</methodname>
-   <methodparam><type>object</type><parameter>instance</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Patch::__construct</methodname>
-   <methodparam><type>object</type><parameter>instance</parameter></methodparam>
-   <methodparam><type>array</type><parameter>interfaces</parameter></methodparam>
-  </constructorsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>instance</parameter></term>
-    <listitem>
-     <simpara>
-      The target for this Patch
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>interfaces</parameter></term>
-    <listitem>
-     <simpara>
-      A case insensitive array of class names
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> cannot be found
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if a class in <parameter>interfaces</parameter> is not an interface
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/derive.xml b/reference/componere/componere/patch/derive.xml
deleted file mode 100644
index 7f93bb98efa7..000000000000
--- a/reference/componere/componere/patch/derive.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.derive">
- <refnamediv>
-  <refname>Componere\Patch::derive</refname>
-  <refpurpose>Patch Derivation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Patch</type><methodname>Componere\Patch::derive</methodname>
-   <methodparam><type>object</type><parameter>instance</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall derive a <type>Patch</type> for the given <parameter>instance</parameter>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>instance</parameter></term>
-    <listitem>
-     <simpara>
-      The target for the derived Patch
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <type>Patch</type> for <parameter>instance</parameter> derived from the current <type>Patch</type>
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <parameter>instance</parameter> is not compatible
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/getclosure.xml b/reference/componere/componere/patch/getclosure.xml
deleted file mode 100644
index 1da32bb40510..000000000000
--- a/reference/componere/componere/patch/getclosure.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.getclosure">
- <refnamediv>
-  <refname>Componere\Patch::getClosure</refname>
-  <refpurpose>Get Closure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Closure</type><methodname>Componere\Patch::getClosure</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall return a Closure for the method specified by name
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The case insensitive name of the method
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A Closure bound to the correct scope and object
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if <parameter>name</parameter> could not be found
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/getclosures.xml b/reference/componere/componere/patch/getclosures.xml
deleted file mode 100644
index 9752284dfc74..000000000000
--- a/reference/componere/componere/patch/getclosures.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.getclosures">
- <refnamediv>
-  <refname>Componere\Patch::getClosures</refname>
-  <refpurpose>Get Closures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Componere\Patch::getClosures</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall return an array of Closures
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Shall return all methods as an array of Closure objects bound to the correct scope and object
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/isapplied.xml b/reference/componere/componere/patch/isapplied.xml
deleted file mode 100644
index b69a4251d7f6..000000000000
--- a/reference/componere/componere/patch/isapplied.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="componere-patch.isapplied" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Componere\Patch::isApplied</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Patch::isApplied</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/patch/revert.xml b/reference/componere/componere/patch/revert.xml
deleted file mode 100644
index adb6623911c4..000000000000
--- a/reference/componere/componere/patch/revert.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-patch.revert">
- <refnamediv>
-  <refname>Componere\Patch::revert</refname>
-  <refpurpose>Reversal</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Componere\Patch::revert</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall revert the current patch
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/construct.xml b/reference/componere/componere/value/construct.xml
deleted file mode 100644
index 83ab23eace65..000000000000
--- a/reference/componere/componere/value/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.construct">
- <refnamediv>
-  <refname>Componere\Value::__construct</refname>
-  <refpurpose>Value Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Componere\Value::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <parameter>default</parameter> does not have a suitable value
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/hasdefault.xml b/reference/componere/componere/value/hasdefault.xml
deleted file mode 100644
index 1f996146225e..000000000000
--- a/reference/componere/componere/value/hasdefault.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.hasdefault">
- <refnamediv>
-  <refname>Componere\Value::hasDefault</refname>
-  <refpurpose>Value Interaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Value::hasDefault</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/isprivate.xml b/reference/componere/componere/value/isprivate.xml
deleted file mode 100644
index dc9a57aaf55b..000000000000
--- a/reference/componere/componere/value/isprivate.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.isprivate">
- <refnamediv>
-  <refname>Componere\Value::isPrivate</refname>
-  <refpurpose>Accessibility Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Value::isPrivate</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/isprotected.xml b/reference/componere/componere/value/isprotected.xml
deleted file mode 100644
index 80415bb68a2a..000000000000
--- a/reference/componere/componere/value/isprotected.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.isprotected">
- <refnamediv>
-  <refname>Componere\Value::isProtected</refname>
-  <refpurpose>Accessibility Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Value::isProtected</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/isstatic.xml b/reference/componere/componere/value/isstatic.xml
deleted file mode 100644
index 49a1eb667da5..000000000000
--- a/reference/componere/componere/value/isstatic.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.isstatic">
- <refnamediv>
-  <refname>Componere\Value::isStatic</refname>
-  <refpurpose>Accessibility Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Componere\Value::isStatic</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/setprivate.xml b/reference/componere/componere/value/setprivate.xml
deleted file mode 100644
index 8db7513303f8..000000000000
--- a/reference/componere/componere/value/setprivate.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.setprivate">
- <refnamediv>
-  <refname>Componere\Value::setPrivate</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Value</type><methodname>Componere\Value::setPrivate</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Value
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/setprotected.xml b/reference/componere/componere/value/setprotected.xml
deleted file mode 100644
index 99be9efe848e..000000000000
--- a/reference/componere/componere/value/setprotected.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.setprotected">
- <refnamediv>
-  <refname>Componere\Value::setProtected</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Value</type><methodname>Componere\Value::setProtected</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Value
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>RuntimeException</type> if access level was previously set
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/componere/value/setstatic.xml b/reference/componere/componere/value/setstatic.xml
deleted file mode 100644
index 271a90347084..000000000000
--- a/reference/componere/componere/value/setstatic.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere-value.setstatic">
- <refnamediv>
-  <refname>Componere\Value::setStatic</refname>
-  <refpurpose>Accessibility Modification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Value</type><methodname>Componere\Value::setStatic</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current Value
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/componere/configure.xml b/reference/componere/configure.xml
deleted file mode 100644
index 08d790f5aa29..000000000000
--- a/reference/componere/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere.installation">
- &reftitle.install;
-
- <simpara>
-  Use <option role="configure">--with-componere[=DIR]</option> when compiling PHP.
- </simpara>
-
- <simpara>
-  Windows users should include <filename>php_componere.dll</filename> into &php.ini;
- </simpara>
-
-</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/componere/functions/componere.cast.xml b/reference/componere/functions/componere.cast.xml
deleted file mode 100644
index f9b7b48e953a..000000000000
--- a/reference/componere/functions/componere.cast.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere.cast">
- <refnamediv>
-  <refname>Componere\cast</refname>
-  <refpurpose>Casting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>Componere\cast</methodname>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <simpara>
-      A user defined type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>object</parameter></term>
-    <listitem>
-     <simpara>
-      An object with a user defined type compatible with <exceptionname>Type</exceptionname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>object</type> of type <exceptionname>Type</exceptionname>, cast from <parameter>object</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="componere.cast_by_ref"/></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/componere/functions/componere.cast_by_ref.xml b/reference/componere/functions/componere.cast_by_ref.xml
deleted file mode 100644
index 6d7d387fa8ea..000000000000
--- a/reference/componere/functions/componere.cast_by_ref.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere.cast_by_ref">
- <refnamediv>
-  <refname>Componere\cast_by_ref</refname>
-  <refpurpose>Casting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>Componere\cast_by_ref</methodname>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>object</type><parameter>object</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><exceptionname>type</exceptionname></term>
-    <listitem>
-     <simpara>
-      A user defined type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>object</parameter></term>
-    <listitem>
-     <simpara>
-      An object with a user defined type compatible with <exceptionname>Type</exceptionname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>object</type> of type <exceptionname>Type</exceptionname>, cast from <parameter>object</parameter>, where members are references to <parameter>object</parameter> members
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if the type of <parameter>object</parameter> is or is derived from an internal class
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an interface
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is a trait
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is an abstract
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>InvalidArgumentException</type> if <exceptionname>Type</exceptionname> is not compatible with the type of <parameter>object</parameter>
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="componere.cast"/></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/componere/reference.xml b/reference/componere/reference.xml
deleted file mode 100644
index 69e298cd891c..000000000000
--- a/reference/componere/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="reference.componere" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Componere &Functions;</title>
-
- &reference.componere.functions.componere.cast;
- &reference.componere.functions.componere.cast-by-ref;
-
-</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/componere/setup.xml b/reference/componere/setup.xml
deleted file mode 100644
index c4ffd18407b6..000000000000
--- a/reference/componere/setup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="componere.setup">
- &reftitle.setup;
-
- <section xml:id="componere.requirements">
-  &reftitle.required;
-  <simpara>
-   Reflection is required
-  </simpara>
- </section>
-
- <section xml:id="componere.installation">
-  &reftitle.install;
-  <simpara>
-   Componere source and releases are available on
-   <link xlink:href="&url.git.hub;krakjoe/componere">github</link>
-  </simpara>
- </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/componere/versions.xml b/reference/componere/versions.xml
deleted file mode 100644
index 88636c107484..000000000000
--- a/reference/componere/versions.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='componere\abstract\definition' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\abstract\definition::addmethod' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\abstract\definition::addtrait' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\abstract\definition::addinterface' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\abstract\definition::getreflector' from='Componere 2 &gt;= 2.1.0'/>
-
- <function name='componere\definition' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::__construct' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::addproperty' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::addconstant' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::getclosure' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::getclosures' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::register' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::isregistered' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::addmethod' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::addtrait' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::addinterface' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\definition::getreflector' from='Componere 2 &gt;= 2.1.0'/>
-
- <function name='componere\patch' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::__construct' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::getclosure' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::getclosures' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::apply' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::revert' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::isapplied' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::derive' from='Componere 2 &gt;= 2.1.1'/>
- <function name='componere\patch::addmethod' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::addtrait' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::addinterface' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\patch::getreflector' from='Componere 2 &gt;= 2.1.0'/>
-
- <function name='componere\method' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\method::__construct' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\method::setprotected' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\method::setprivate' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\method::setstatic' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\method::getreflector' from='Componere 2 &gt;= 2.1.0'/>
-
- <function name='componere\value' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::__construct' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::setprotected' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::setprivate' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::setstatic' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::isprotected' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::isprivate' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::isstatic' from='Componere 2 &gt;= 2.1.0'/>
- <function name='componere\value::hasdefault' from='Componere 2 &gt;= 2.1.0'/>
-
- <function name='componere\cast' from='Componere 2 &gt;= 2.1.2'/>
- <function name='componere\cast_by_ref' from='Componere 2 &gt;= 2.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/cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/cubrid/aliases.xml b/reference/cubrid/aliases.xml
deleted file mode 100644
index dda3ccce688c..000000000000
--- a/reference/cubrid/aliases.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="oldaliases.cubrid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>CUBRID Obsolete Aliases and Functions</title>
-
-  &reference.cubrid.entities.oldaliases;
-
-</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/cubrid/book.xml b/reference/cubrid/book.xml
deleted file mode 100644
index e01ff29a97e6..000000000000
--- a/reference/cubrid/book.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.cubrid">
- <?phpdoc extension-membership="pecl" ?>
- <title>CUBRID</title>
- <titleabbrev>CUBRID</titleabbrev>
-
- <preface xml:id="intro.cubrid">
-  &reftitle.intro;
-  <simpara>
-    These functions allow you to access CUBRID database servers. More information about CUBRID can be found at <link xlink:href="&url.cubrid;">CUBRID</link>.
-  </simpara>
-  <simpara>
-    Documentation for CUBRID can be found at <link xlink:href="&url.cubrid.docs;">CUBRID Documentation</link>.
-  </simpara>
-
- </preface>
-
- &reference.cubrid.setup;
- &reference.cubrid.constants;
- &reference.cubrid.examples;
- &reference.cubrid.reference;
- &reference.cubrid.cubridmysql;
- &reference.cubrid.aliases;
-
-</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/cubrid/configure.xml b/reference/cubrid/configure.xml
deleted file mode 100644
index 3a88ab53011c..000000000000
--- a/reference/cubrid/configure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="cubrid.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;cubrid">&url.pecl.package;cubrid</link>.
- </simpara>
- <simpara>
-  &pecl.windows.download;
- </simpara>
- <simpara>
-  For information about manual installation on Linux and Windows systems, please
-  read the file <filename>build-guide.html</filename> included in the package.
- </simpara>
-
-</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/cubrid/constants.xml b/reference/cubrid/constants.xml
deleted file mode 100644
index ab004bb06c56..000000000000
--- a/reference/cubrid/constants.xml
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="cubrid.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-  <para>
-  The following constants can be used when executing SQL statement. They can
-  be passed to <function>cubrid_prepare</function> and
-  <function>cubrid_execute</function>.
-  <table>
-   <title>CUBRID SQL execution flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_INCLUDE_OID</constant></entry>
-       <entry>Determine whether to get OID during query execution.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_ASYNC</constant></entry>
-       <entry>Execute the query in asynchronous mode.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_EXEC_QUERY_ALL</constant></entry>
-       <entry>Execute the query in synchronous mode. This flag must be set
-        when executing multiple SQL statements.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-  The following constants can be used when fetching the results to specify
-  fetch behaviour. They can be passed to <function>cubrid_fetch</function> and
-  <function>cubrid_fetch_array</function>.
-  <table>
-   <title>CUBRID fetch flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_NUM</constant></entry>
-       <entry>Get query result as a numeric array (0-default).</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_ASSOC</constant></entry>
-       <entry>Get query result as an associative array.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_BOTH</constant></entry>
-       <entry>Get query result as both numeric and associative arrays (default value).</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_OBJECT</constant></entry>
-       <entry>Get query result as an object.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_LOB</constant></entry>
-       <entry>The constant CUBRID_LOB can be used when you want to operate the
-        lob object. It can be passed to <function>cubrid_fetch</function>,
-        <function>cubrid_fetch_row</function>,
-        <function>cubrid_fetch_array</function>,
-        <function>cubrid_fetch_assoc</function> and
-        <function>cubrid_fetch_object</function>.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when positioning the cursor in query
-   results. They can be passed to or returned by 
-   <function>cubrid_move_cursor</function>.
-  <table>
-   <title>CUBRID cursor position flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_CURSOR_FIRST</constant></entry>
-       <entry>Move current cursor to the first position in the result.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_CURSOR_CURRENT</constant></entry>
-       <entry>Move current cursor as a default value if the origin is not specified.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_CURSOR_LAST</constant></entry>
-       <entry>Move current cursor to the last position in the result.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_CURSOR_SUCCESS</constant></entry>
-       <entry>Returned value of <function>cubrid_move_cursor</function>
-        function in case of success. This flag has been removed from 8.4.1.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_NO_MORE_DATA</constant></entry>
-       <entry>Returned value of <function>cubrid_move_cursor</function>
-        function in case of failure. This flag has been removed from 8.4.1.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_CURSOR_ERROR</constant></entry>
-       <entry>Returned value of <function>cubrid_move_cursor</function>
-        function in case of failure. This flag has been removed from 8.4.1.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when setting the auto-commit mode for
-   the database connection. They can be passed to
-   <function>cubrid_set_autocommit</function> or returned by
-   <function>cubrid_get_autocommit</function>.
-  <table>
-   <title>CUBRID auto-commit mode flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_AUTOCOMMIT_TRUE</constant></entry>
-       <entry>Enable the auto-commit mode.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_AUTOCOMMIT_FALSE</constant></entry>
-       <entry>Disable the auto-commit mode.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when setting the database parameter.
-   They can be passed to <function>cubrid_set_db_parameter</function>.
-  <table>
-   <title>CUBRID parameter flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_PARAM_ISOLATION_LEVEL</constant></entry>
-       <entry>Transaction isolation level for the database connection.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_PARAM_LOCK_TIMEOUT</constant></entry>
-       <entry>Transaction timeout in seconds.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when setting the transaction isolation
-   level. They can be passed to <function>cubrid_set_db_parameter</function>
-   or returned by <function>cubrid_get_db_parameter</function>.
-  <table>
-   <title>CUBRID isolation level flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>TRAN_COMMIT_CLASS_UNCOMMIT_INSTANCE</constant></entry>
-       <entry>The lowest isolation level (1). A dirty, non-repeatable or
-        phantom read may occur for the tuple and a non-repeatable read may
-        occur for the table as well.</entry>
-      </row>
-      <row>
-       <entry><constant>TRAN_COMMIT_CLASS_COMMIT_INSTANCE</constant></entry>
-       <entry>A relatively low isolation level (2). A dirty read does not
-        occur, but non-repeatable or phantom read may occur.</entry>
-      </row>
-      <row>
-       <entry><constant>TRAN_REP_CLASS_UNCOMMIT_INSTANCE</constant></entry>
-       <entry>The default isolation of CUBRID (3). A dirty, non-repeatable or
-        phantom read may occur for the tuple, but repeatable read is ensured
-        for the table.</entry>
-      </row>
-      <row>
-       <entry><constant>TRAN_REP_CLASS_COMMIT_INSTANCE</constant></entry>
-       <entry>A relatively low isolation level (4). A dirty read does not
-        occur, but non-repeatable or phantom read may.</entry>
-      </row>
-      <row>
-       <entry><constant>TRAN_REP_CLASS_REP_INSTANCE</constant></entry>
-       <entry>A relatively high isolation level (5). A dirty or non-repeatable
-       read does not occur, but a phantom read may.</entry>
-      </row>
-      <row>
-       <entry><constant>TRAN_SERIALIZABLE</constant></entry>
-       <entry>The highest isolation level (6). Problems concerning concurrency
-       (e.g. dirty read, non-repeatable read, phantom read, etc.) do not
-       occur.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when getting schema information. They
-   can be passed to <function>cubrid_schema</function>.
-  <table>
-   <title>CUBRID schema flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_SCH_CLASS</constant></entry>
-       <entry>Get name and type of table in CUBRID.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_VCLASS</constant></entry>
-       <entry>Get name and type of view in CUBRID.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_QUERY_SPEC</constant></entry>
-       <entry>Get the query definition of view.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_ATTRIBUTE</constant></entry>
-       <entry>Get the attributes of table column.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_CLASS_ATTRIBUTE</constant></entry>
-       <entry>Get the attributes of table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_METHOD</constant></entry>
-       <entry>Get the instance method. The instance method is a method called
-       by a class instance. It is used more often than the class method
-       because most operations are executed in the instance.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_CLASS_METHOD</constant></entry>
-       <entry>Get the class method. The class method is a method called by a
-        class object. It is usually used to create a new class instance or to
-        initialize it. It is also used to access or update class
-        attributes.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_METHOD_FILE</constant></entry>
-       <entry>Get the information of the file where the method of the table is
-        defined.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_SUPERCLASS</constant></entry>
-       <entry>Get the name and type of table which table inherites attributes
-        from.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_SUBCLASS</constant></entry>
-       <entry>Get the name and type of table which inherites attributes from
-        this table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_CONSTRAINT</constant></entry>
-       <entry>Get the table constraints.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_TRIGGER</constant></entry>
-       <entry>Get the table triggers.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_CLASS_PRIVILEGE</constant></entry>
-       <entry>Get the privilege information of table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_ATTR_PRIVILEGE</constant></entry>
-       <entry>Get the privilege information of column.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_DIRECT_SUPER_CLASS</constant></entry>
-       <entry>Get the direct super table of table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_PRIMARY_KEY</constant></entry>
-       <entry>Get the table primary key.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_IMPORTED_KEYS</constant></entry>
-       <entry>Get imported keys of table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_EXPORTED_KEYS</constant></entry>
-       <entry>Get exported keys of table.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_SCH_CROSS_REFERENCE</constant></entry>
-       <entry>Get reference relationship of two tables.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-  The following constants can be used when reporting errors. They can be
-  returned from <function>cubrid_error_code_facility</function>.
-  <table>
-   <title>CUBRID error facility code</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><constant>CUBRID_FACILITY_DBMS</constant></entry>
-       <entry>The error occurred in CUBRID dbms.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_FACILITY_CAS</constant></entry>
-       <entry>The error occurred in CUBRID broker cas.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_FACILITY_CCI</constant></entry>
-       <entry>The error occurred in CUBRID cci.</entry>
-      </row>
-      <row>
-       <entry><constant>CUBRID_FACILITY_CLIENT</constant></entry>
-       <entry>The error occurred in CUBRID PHP client.</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/cubrid/cubridmysql.xml b/reference/cubrid/cubridmysql.xml
deleted file mode 100644
index fc44b1e6eef0..000000000000
--- a/reference/cubrid/cubridmysql.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="cubridmysql.cubrid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>CUBRID MySQL Compatibility Functions</title>
-
- &reference.cubrid.entities.cubridmysql;
-
-</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/cubrid/cubridmysql/cubrid-affected-rows.xml b/reference/cubrid/cubridmysql/cubrid-affected-rows.xml
deleted file mode 100644
index 354fde4e007a..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-affected-rows.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-affected-rows">
- <refnamediv>
-  <refname>cubrid_affected_rows</refname>
-  <refpurpose>Return the number of rows affected by the last SQL statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_affected_rows</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_affected_rows</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_affected_rows</function> function is used to get the
-    number of rows affected by the SQL statement (INSERT, DELETE, UPDATE).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>The CUBRID connection. If the connection identifier is not
-     specified, the last link opened by <function>cubrid_connect</function> is
-   assumed.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>req_identifier</parameter></term>
-   <listitem>
-     <simpara>
-       Request Identifier, could be returned from either <function>cubrid_prepare</function> or <function>cubrid_execute</function>.
-       If the request identifier is not specified, the last identifier requested by
-       <function>cubrid_prepare</function> or <function>cubrid_execute</function> is assumed.
-     </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Number of rows affected by the SQL statement, when process is successful.
-  </simpara>
-   <simpara>
-    -1, when SQL statement is not INSERT, DELETE or UPDATE.
-  </simpara>
-  <simpara>
-   &false;, when the request identifier is not specified, and there is no last
-   request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_affected_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect('localhost', 33000, 'demodb', 'dba', '');
-cubrid_execute($conn, "DROP TABLE IF EXISTS cubrid_test");
-cubrid_execute($conn, "CREATE TABLE cubrid_test (d varchar)");
-$sql_stmt = "INSERT INTO cubrid_test(d) VALUES('php-test')";
-$req = cubrid_prepare($conn, $sql_stmt);
-
-for ($i = 0; $i < 10; $i++) {
-    cubrid_execute($req);
-}
-cubrid_commit($conn);
-
-$req = cubrid_execute($conn, "DELETE FROM cubrid_test WHERE d='php-test'", CUBRID_ASYNC);
-var_dump(cubrid_affected_rows());
-var_dump(cubrid_affected_rows($conn));
-var_dump(cubrid_affected_rows($req));
-
-cubrid_disconnect($conn);
-
-print "done!";
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(10)
-int(10)
-int(10)
-done!
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_execute</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/cubrid/cubridmysql/cubrid-client-encoding.xml b/reference/cubrid/cubridmysql/cubrid-client-encoding.xml
deleted file mode 100644
index f3a0c3698769..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-client-encoding.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-client-encoding">
- <refnamediv>
-  <refname>cubrid_client_encoding</refname>
-  <refpurpose>Return the current CUBRID connection charset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_client_encoding</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the current CUBRID connection charset and is similar
-   to the CUBRID function <function>cubrid_get_charset</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>The CUBRID connection. If the connection identifier is not specified, the last link opened by <function>cubrid_connect</function> is assumed. </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string that represents the CUBRID connection charset; on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_client_encoding</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$con = cubrid_connect("localhost", 33000, "demodb");
-if (!$con)
-{
-    die('Could not connect.');
-}
-
-printf("CUBRID current charset: %s\n", cubrid_client_encoding($con));
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID current charset: iso8859-1
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_get_charset</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/cubrid/cubridmysql/cubrid-close.xml b/reference/cubrid/cubridmysql/cubrid-close.xml
deleted file mode 100644
index e262868436b8..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-close.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-close">
- <refnamediv>
-  <refname>cubrid_close</refname>
-  <refpurpose>Close CUBRID connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_close</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_close</function> function ends the transaction
-    currently in process, closes the connection handle and disconnects from
-    server. If there is any request handles not closed yet at this point,
-    they will be closed. It is similar to the CUBRID function
-    <function>cubrid_disconnect</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem><simpara>The CUBRID connection identifier. If the connection identifier is not specified, the last connection opened by <function>cubrid_connect</function> is assumed.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &true;, when process is successful.
-  </simpara>
-    <simpara>
-    &false;, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect ("localhost", 33000, "demodb");
-if ($con) {
-   echo "connected successfully";
-   $req = cubrid_execute ( $con, "insert into person values(1,'James')");
-   if ($req) {
-      cubrid_close_request ($req);
-      cubrid_commit ($con);
-   } else {
-      cubrid_rollback ($con);
-   }
-   cubrid_close ($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-     <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_disconnect</function></member>
-  <member><function>cubrid_connect</function></member>
-  <member><function>cubrid_connect_with_url</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/cubrid/cubridmysql/cubrid-data-seek.xml b/reference/cubrid/cubridmysql/cubrid-data-seek.xml
deleted file mode 100644
index 1751a9432256..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-data-seek.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-data-seek">
- <refnamediv>
-  <refname>cubrid_data_seek</refname>
-  <refpurpose>Move the internal row pointer of the CUBRID result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_data_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>row_number</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function performs the moving of the internal row pointer of the
-    CUBRID result (associated with the specified result identifier) to point
-    to a specific row number. There are functions, such as
-    <function>cubrid_fetch_assoc</function>, which use the currently stored
-    value of row number.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>result</parameter></term>
- <listitem><simpara>The result.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>row_number</parameter></term>
- <listitem><simpara>This is the desired row number of the new result pointer.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_data_seek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("127.0.0.1", 33000, "demodb");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-cubrid_data_seek($req, 0);
-
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_data_seek($req, 2);
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_data_seek($req, 4);
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-       &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  string(1) "X"
-  [1]=>
-  string(5) "Mixed"
-}
-array(2) {
-  [0]=>
-  string(1) "M"
-  [1]=>
-  string(3) "Man"
-}
-array(2) {
-  [0]=>
-  string(1) "S"
-  [1]=>
-  string(6) "Silver"
-}
-]]>
-    </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/cubrid/cubridmysql/cubrid-db-name.xml b/reference/cubrid/cubridmysql/cubrid-db-name.xml
deleted file mode 100644
index 5988306f6ff1..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-db-name.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.cubrid-db-name">
- <refnamediv>
-  <refname>cubrid_db_name</refname>
-  <refpurpose>Get db name from results of cubrid_list_dbs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_db_name</methodname>
-   <methodparam><type>array</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve the database name from a call to <function>cubrid_list_dbs</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      The result pointer from a call to <function>cubrid_list_dbs</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <simpara>
-      The index into the result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the database name on success, and &false; on failure. If &false;
-   is returned, use <function>cubrid_error</function> to determine the nature
-   of the error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_db_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-error_reporting(E_ALL);
-
-$conn = cubrid_connect('localhost', 33000, 'demodb', 'dba', '');
-$db_list = cubrid_list_dbs($conn);
-
-$i = 0;
-$cnt = count($db_list);
-while ($i < $cnt) {
-    echo cubrid_db_name($db_list, $i) . "\n";
-    $i++;
-}
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-demodb
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_list_dbs</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/cubrid/cubridmysql/cubrid-errno.xml b/reference/cubrid/cubridmysql/cubrid-errno.xml
deleted file mode 100644
index b76abb008a7c..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-errno.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-errno">
- <refnamediv>
-  <refname>cubrid_errno</refname>
-  <refpurpose>Return the numerical value of the error message from previous CUBRID operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_errno</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the error number from the last CUBRID function.
-  </simpara>
-  <simpara>
-   The <function>cubrid_errno</function> function is used to get the
-   error code of the error that occurred during the API execution.  Usually,
-   it gets the error code when API returns false as its return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      The CUBRID connection identifier. If the connection identifier is not
-      specified, the last connection opened by
-      <function>cubrid_connect</function> is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error number from the last CUBRID function, or <literal>0</literal> (zero) if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_errno</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect('localhost', 33000, 'demodb', 'dba', '');
-$req = cubrid_execute($con, "select id, name from person");
-if ($req) {
-    while (list ($id, $name) = cubrid_fetch($req))
-    echo $id, $name;
-} else {
-    echo "Error Code: ", cubrid_errno($con);
-    echo "Error Message: ", cubrid_error($con);
-}
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Error Code: -493 Error Message: Syntax: Unknown class "person". select id, [name] from person
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_error</function></member>
-   <member><function>cubrid_error_code</function></member>
-   <member><function>cubrid_error_msg</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/cubrid/cubridmysql/cubrid-error.xml b/reference/cubrid/cubridmysql/cubrid-error.xml
deleted file mode 100644
index eed8e743ac82..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-error.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-error">
- <refnamediv>
-  <refname>cubrid_error</refname>
-  <refpurpose>Get the error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_error</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_error</function> function is used to get the error
-    message that occurred during the use of CUBRID API. Usually, it gets error
-    message when API returns false as its return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem><simpara>The CUBRID connection.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Error message that occurred.
-  </simpara>
-  <simpara/>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_error</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect('localhost', 33000, 'demodb', 'dba', '');
-$req = cubrid_execute($con, "select id, name from person");
-if ($req) {
-    while (list ($id, $name) = cubrid_fetch($req))
-    echo $id, $name;
-} else {
-    echo "Error Code: ", cubrid_errno($con);
-    echo "Error Message: ", cubrid_error($con);
-}
-?>
-]]>
-   </programlisting>
-     &example.outputs;
-     <screen>
-<![CDATA[
-Error Code: -493 Error Message: Syntax: Unknown class "person". select id, [name] from person
-]]>
-     </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_errno</function></member>
-  <member><function>cubrid_error_code</function></member>
-  <member><function>cubrid_error_msg</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/cubrid/cubridmysql/cubrid-fetch-array.xml b/reference/cubrid/cubridmysql/cubrid-fetch-array.xml
deleted file mode 100644
index 7136019f98ce..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-array.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-array">
- <refnamediv>
-  <refname>cubrid_fetch_array</refname>
-  <refpurpose>Fetch a result row as an associative array, a numeric array, or both</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>CUBRID_BOTH</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_fetch_array</function> function is used to get a
-    single row from the query result and returns an array. The cursor
-    automatically moves to the next row after getting the result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>Result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>type</parameter></term>
-   <listitem><simpara>Array type of the fetched result CUBRID_NUM, CUBRID_ASSOC,
-     CUBRID_BOTH. If you need to operate the lob object, you can use CUBRID_LOB.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>Returns an array of strings that corresponds to the fetched row, when process is successful.</simpara>
-  <simpara>&false;, when there are no more rows; NULL, when process is unsuccessful.</simpara>
-  <simpara>The type of returned array depends on how type is defined. By using CUBRID_BOTH (default), you'll get an array with both associative and number indices, and you can decide which data type to use by setting the <parameter>type</parameter> argument. The <parameter>type</parameter> variable can be set to one of the following values:</simpara>
-    <simplelist>
-        <member>CUBRID_NUM : Numerical array (0-based)</member>
-        <member>CUBRID_ASSOC : Associative array</member>
-        <member>CUBRID_BOTH : Numerical &amp; Associative array (default)</member>
-    </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_array</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT name,area,seats,address FROM stadium WHERE nation_code='GRE' AND seats > 10000");
-
-printf("%-40s %-10s %-6s %-20s\n", "name", "area", "seats", "address");
-while ($row = cubrid_fetch_array($req, CUBRID_NUM)) {
-    printf("%-40s %-10s %-6s %-20s\n", $row[0], $row[1], $row[2], $row[3]);
-}
-
-// if you want to operate LOB object, you can use cubrid_fetch_array($req, CUBRID_NUM | CUBRID_LOB)
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-name                                     area       seats  address
-Panathinaiko Stadium                     86300.00   50000  Athens, Greece
-Olympic Stadium                          54700.00   13000  Athens, Greece
-Olympic Indoor Hall                      34100.00   18800  Athens, Greece
-Olympic Hall                             52400.00   21000  Athens, Greece
-Olympic Aquatic Centre                   42500.00   11500  Athens, Greece
-Markopoulo Olympic Equestrian Centre     64000.00   15000  Markopoulo, Athens, Greece
-Faliro Coastal Zone Olympic Complex      34650.00   12171  Faliro, Athens, Greece
-Athens Olympic Stadium                   120400.00  71030  Maroussi, Athens, Greece
-Ano Liossia                              34000.00   12000  Ano Liosia, Athens, Greece
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</function></member>
-  <member><function>cubrid_fetch</function></member>
-  <member><function>cubrid_fetch_row</function></member>
-  <member><function>cubrid_fetch_assoc</function></member>
-  <member><function>cubrid_fetch_object</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/cubrid/cubridmysql/cubrid-fetch-assoc.xml b/reference/cubrid/cubridmysql/cubrid-fetch-assoc.xml
deleted file mode 100644
index 72f4df77ec3b..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-assoc.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-assoc">
- <refnamediv>
-  <refname>cubrid_fetch_assoc</refname>
-  <refpurpose>Return the associative array that corresponds to the fetched row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_fetch_assoc</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the associative array, that corresponds to the
-    fetched row, and then moves the internal data pointer ahead, or returns
-    FALSE when the end is reached.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>type</parameter></term>
-   <listitem><simpara>Type can only be CUBRID_LOB, this parameter will be used
-     only when you need to operate the lob object.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Associative array, when process is successful.
-  </simpara>
-   <simpara>
-    &false;, when there are no more rows; NULL, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_assoc</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT name,area,seats,address FROM stadium WHERE nation_code='GRE' AND seats > 10000");
-
-printf("%-40s %-10s %-6s %-20s\n", "name", "area", "seats", "address");
-while ($row = cubrid_fetch_assoc($req)) {
-    printf("%-40s %-10s %-6s %-20s\n",
-        $row["name"], $row["area"], $row["seats"], $row["address"]);
-}
-
-// if you want to operate LOB object, you can use cubrid_fetch_assoc($req, CUBRID_LOB)
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-name                                     area       seats  address
-Panathinaiko Stadium                     86300.00   50000  Athens, Greece
-Olympic Stadium                          54700.00   13000  Athens, Greece
-Olympic Indoor Hall                      34100.00   18800  Athens, Greece
-Olympic Hall                             52400.00   21000  Athens, Greece
-Olympic Aquatic Centre                   42500.00   11500  Athens, Greece
-Markopoulo Olympic Equestrian Centre     64000.00   15000  Markopoulo, Athens, Greece
-Faliro Coastal Zone Olympic Complex      34650.00   12171  Faliro, Athens, Greece
-Athens Olympic Stadium                   120400.00  71030  Maroussi, Athens, Greece
-Ano Liossia                              34000.00   12000  Ano Liosia, Athens, Greece
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</function></member>
-  <member><function>cubrid_fetch</function></member>
-  <member><function>cubrid_fetch_row</function></member>
-  <member><function>cubrid_fetch_array</function></member>
-  <member><function>cubrid_fetch_object</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/cubrid/cubridmysql/cubrid-fetch-field.xml b/reference/cubrid/cubridmysql/cubrid-fetch-field.xml
deleted file mode 100644
index a4e105fdfe91..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-field.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-field">
- <refnamediv>
-  <refname>cubrid_fetch_field</refname>
-  <refpurpose>Get column information from a result and return as an object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>cubrid_fetch_field</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>field_offset</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns an object with certain properties of the specific
-    column. The properties of the object are:
-  </simpara>
-  <variablelist>
-   <varlistentry>
- <term><parameter>name</parameter></term>
- <listitem><simpara>column name</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>table</parameter></term>
- <listitem><simpara>name of the table that the column belongs to</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>def</parameter></term>
- <listitem><simpara>default value of the column</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>max_length</parameter></term>
- <listitem><simpara>maximum length of the column</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>not_null</parameter></term>
- <listitem><simpara>1 if the column cannot be NULL</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>primary_key</parameter></term>
- <listitem><simpara>1 if the column is a primary key</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>unique_key</parameter></term>
- <listitem><simpara>1 if the column is a unique key</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>multiple_key</parameter></term>
- <listitem><simpara>1 if the column is a non-unique key</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>numeric</parameter></term>
- <listitem><simpara>1 if the column is numeric</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>blob</parameter></term>
- <listitem><simpara>1 if the column is a BLOB</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>type</parameter></term>
- <listitem><simpara>the type of the column</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>unsigned</parameter></term>
- <listitem><simpara>1 if the column is unsigned</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>zerofill</parameter></term>
- <listitem><simpara>1 if the column is zero-filled</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>field_offset</parameter></term>
-   <listitem><simpara>
-    The numerical field offset. If the field offset is not specified, the
-    next field (that was not yet retrieved by this function) is retrieved.
-    The <parameter>field_offset</parameter> starts at 0.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Object with certain properties of the specific column, when process is successful.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_field</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT event_code,athlete_code,nation_code,game_date FROM game WHERE host_year=1988 and event_code=20001;");
-
-var_dump(cubrid_fetch_row($req));
-
-cubrid_field_seek($req, 1);
-$field = cubrid_fetch_field($req);
-
-printf("\n--- Field Properties ---\n");
-printf("%-30s %s\n", "name:", $field->name);
-printf("%-30s %s\n", "table:", $field->table);
-printf("%-30s \"%s\"\n", "default value:", $field->def);
-printf("%-30s %d\n", "max length:", $field->max_length);
-printf("%-30s %d\n", "not null:", $field->not_null);
-printf("%-30s %d\n", "primary key:", $field->primary_key);
-printf("%-30s %d\n", "unique key:", $field->unique_key);
-printf("%-30s %d\n", "multiple key:", $field->multiple_key);
-printf("%-30s %d\n", "numeric:", $field->numeric);
-printf("%-30s %d\n", "blob:", $field->blob);
-printf("%-30s %s\n", "type:", $field->type);
-printf("%-30s %d\n", "unsigned:", $field->unsigned);
-printf("%-30s %d\n", "zerofill:", $field->zerofill);
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  string(5) "20001"
-  [1]=>
-  string(5) "16681"
-  [2]=>
-  string(3) "KOR"
-  [3]=>
-  string(9) "1988-9-30"
-}
-
---- Field Properties ---
-name:                          athlete_code
-table:                         game
-default value:                 ""
-max length:                    0
-not null:                      1
-primary key:                   1
-unique key:                    1
-multiple key:                  0
-numeric:                       1
-blob:                          0
-type:                          integer
-unsigned:                      0
-zerofill:                      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/cubrid/cubridmysql/cubrid-fetch-lengths.xml b/reference/cubrid/cubridmysql/cubrid-fetch-lengths.xml
deleted file mode 100644
index b974c6713d82..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-lengths.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-lengths">
- <refnamediv>
-  <refname>cubrid_fetch_lengths</refname>
-  <refpurpose>Return an array with the lengths of the values of each field from the current row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_fetch_lengths</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns a numeric array with the lengths of the values of
-    each field from the current row of the result set or it returns FALSE on
-    failure.
-  </simpara>
-  <note>
-   <simpara>
-    If field data type is BLOB/CLOB, you should get its length by using
-    <function>cubrid_lob_size</function>.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A numeric array, when process is successful.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_lengths</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$row = cubrid_fetch_row($result);
-print_r($row);
-
-$lens = cubrid_fetch_lengths($result);
-print_r($lens);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [0] => 2004
-    [1] => 20085
-    [2] => 15118
-    [3] => 30134
-    [4] => AUS
-    [5] => G
-    [6] => 2004-8-20
-)
-Array
-(
-    [0] => 4
-    [1] => 5
-    [2] => 5
-    [3] => 5
-    [4] => 3
-    [5] => 1
-    [6] => 10
-)
-]]>
-    </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/cubrid/cubridmysql/cubrid-fetch-object.xml b/reference/cubrid/cubridmysql/cubrid-fetch-object.xml
deleted file mode 100644
index 012f242cb15c..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-object.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-object">
- <refnamediv>
-  <refname>cubrid_fetch_object</refname>
-  <refpurpose>Fetch the next row and return it as an object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>cubrid_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns an object with the column names of the result set as
-    properties. The values of these properties are extracted from the current
-    row of the result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
- <varlistentry>
-  <term><parameter>result</parameter></term>
-  <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
- </varlistentry>
- <varlistentry>
-   <term><parameter>class_name</parameter></term>
-     <listitem>
-      <simpara>
-       The name of the class to instantiate. If not specified, a
-       <classname>stdClass</classname> (stdClass is PHP's generic empty class
-       that's used when casting other types to objects) object is returned.
-      </simpara>
-    </listitem>
-  </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-     <listitem>
-      <simpara>
-       An optional <type>array</type> of parameters to pass to the constructor
-       for <parameter>class_name</parameter> objects.
-      </simpara>
-    </listitem>
-  </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-     <listitem>
-      <simpara>
-       Type can only be CUBRID_LOB, this parameter will be used only when you
-       need to operate the lob object.
-      </simpara>
-    </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    An object, when process is successful.
-  </simpara>
-   <simpara>
-    &false;, when there are no more rows; NULL, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_object</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$res = cubrid_execute($conn, "SELECT * FROM code");
-
-var_dump(cubrid_fetch_object($res));
-
-// if you want to operate LOB object, you can use cubrid_fetch_object($res, CUBRID_LOB)
-
-class demodb_code {
-    public $s_name = null;
-    public $f_name = null;
-
-    public function toString() {
-        var_dump($this);
-    }
-}
-
-var_dump(cubrid_fetch_object($res, "demodb_code"));
-
-// if you want to operate LOB object, you can use cubrid_fetch_object($res, "demodb_code", CUBRID_LOB)
-
-class demodb_code_construct extends demodb_code {
-    public function __construct($s, $f) {
-        $this->s_name = $s;
-        $this->f_name = $f;
-    }
-}
-
-var_dump(cubrid_fetch_object($res, 'demodb_code_construct', array('s_name', 'f_name')));
-
-// if you want to operate LOB object, you can use cubrid_fetch_object($res, 'demodb_code_construct', array('s_name', 'f_name'), CUBRID_LOB)
-
-
-var_dump(cubrid_fetch_object($res));
-
-cubrid_close_request($res);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-object(stdClass)#1 (2) {
-  ["s_name"]=>
-  string(1) "X"
-  ["f_name"]=>
-  string(5) "Mixed"
-}
-object(demodb_code)#1 (2) {
-  ["s_name"]=>
-  string(1) "W"
-  ["f_name"]=>
-  string(5) "Woman"
-}
-object(demodb_code_construct)#1 (2) {
-  ["s_name"]=>
-  string(6) "s_name"
-  ["f_name"]=>
-  string(6) "f_name"
-}
-object(stdClass)#1 (2) {
-  ["s_name"]=>
-  string(1) "B"
-  ["f_name"]=>
-  string(6) "Bronze"
-}
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</function></member>
-  <member><function>cubrid_fetch</function></member>
-  <member><function>cubrid_fetch_array</function></member>
-  <member><function>cubrid_fetch_assoc</function></member>
-  <member><function>cubrid_fetch_row</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/cubrid/cubridmysql/cubrid-fetch-row.xml b/reference/cubrid/cubridmysql/cubrid-fetch-row.xml
deleted file mode 100644
index 885ab68209b3..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-fetch-row.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch-row">
- <refnamediv>
-  <refname>cubrid_fetch_row</refname>
-  <refpurpose>Return a numerical array with the values of the current row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns a numerical array with the values of the current row
-    from the result set, starting from 0, and moves the internal data pointer
-    ahead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-   <varlistentry>
-   <term><parameter>type</parameter></term>
-   <listitem><simpara>Type can only be CUBRID_LOB, this parameter will be used
-     only when you need to operate the lob object.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A numerical array, when process is successful.
-  </simpara>
-   <simpara>
-    &false;, when there are no more rows; NULL, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch_row</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT name,area,seats,address FROM stadium WHERE nation_code='GRE' AND seats > 10000");
-
-printf("%-40s %-10s %-6s %-20s\n", "name", "area", "seats", "address");
-while ($row = cubrid_fetch_row($req)) {
-    printf("%-40s %-10s %-6s %-20s\n", $row[0], $row[1], $row[2], $row[3]);
-}
-
-// if you want to operate LOB object, you can use cubrid_fetch_row($req, CUBRID_LOB)
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-name                                     area       seats  address
-Panathinaiko Stadium                     86300.00   50000  Athens, Greece
-Olympic Stadium                          54700.00   13000  Athens, Greece
-Olympic Indoor Hall                      34100.00   18800  Athens, Greece
-Olympic Hall                             52400.00   21000  Athens, Greece
-Olympic Aquatic Centre                   42500.00   11500  Athens, Greece
-Markopoulo Olympic Equestrian Centre     64000.00   15000  Markopoulo, Athens, Greece
-Faliro Coastal Zone Olympic Complex      34650.00   12171  Faliro, Athens, Greece
-Athens Olympic Stadium                   120400.00  71030  Maroussi, Athens, Greece
-Ano Liossia                              34000.00   12000  Ano Liosia, Athens, Greece
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</function></member>
-  <member><function>cubrid_fetch</function></member>
-  <member><function>cubrid_fetch_array</function></member>
-  <member><function>cubrid_fetch_assoc</function></member>
-  <member><function>cubrid_fetch_object</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/cubrid/cubridmysql/cubrid-field-flags.xml b/reference/cubrid/cubridmysql/cubrid-field-flags.xml
deleted file mode 100644
index 7299de51f253..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-flags.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-flags">
- <refnamediv>
-  <refname>cubrid_field_flags</refname>
-  <refpurpose>Return a string with the flags of the given field offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_field_flags</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns a string with the flags of the given field offset
-    separated by space. You can split the returned value using explode. The
-    possible flags could be: <constant>not_null</constant>,
-    <constant>primary_key</constant>, <constant>unique_key</constant>,
-    <constant>foreign_key</constant>, <constant>auto_increment</constant>,
-    <constant>shared</constant>, <constant>reverse_index</constant>,
-    <constant>reverse_unique</constant> and <constant>timestamp</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>field_offset</parameter></term>
-   <listitem><simpara>
-    The numerical field offset. The <parameter>field_offset</parameter>
-    starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A string with flags, when process is successful.
-  </simpara>
-  <simpara>
-    &false; when invalid field_offset value.
-  </simpara>
-  <simpara>
-    -1 if SQL sentence is not SELECT.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_flags</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$col_num = cubrid_num_cols($result);
-
-printf("%-30s %s\n", "Field Name", "Field Flags");
-for($i = 0; $i < $col_num; $i++) {
-    printf("%-30s %s\n", cubrid_field_name($result, $i), cubrid_field_flags($result, $i));
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Field Name                     Field Flags
-host_year                      not_null primary_key unique_key
-event_code                     not_null primary_key unique_key foreign_key
-athlete_code                   not_null primary_key unique_key foreign_key
-stadium_code                   not_null
-nation_code
-medal
-game_date
-]]>
-    </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/cubrid/cubridmysql/cubrid-field-len.xml b/reference/cubrid/cubridmysql/cubrid-field-len.xml
deleted file mode 100644
index b6f9705e2e1a..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-len.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-len">
- <refnamediv>
-  <refname>cubrid_field_len</refname>
-  <refpurpose>Get the maximum length of the specified field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_field_len</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the maximum length of the specified field on success, or it returns FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-    <varlistentry>
- <term><parameter>field_offset</parameter></term>
- <listitem><simpara>The numerical field offset. The <parameter>field_offset</parameter> starts at 0. If <parameter>field_offset</parameter> does not exist, an error of level <constant>E_WARNING</constant> is also issued.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Maximum length, when process is successful.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_len</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$column_names = cubrid_column_names($result);
-$column_types = cubrid_column_types($result);
-
-printf("%-30s %-30s %-15s\n", "Column Names", "Column Types", "Column Maxlen");
-for($i = 0, $size = count($column_names); $i < $size; $i++) {
-    $column_len = cubrid_field_len($result, $i);
-    printf("%-30s %-30s %-15s\n", $column_names[$i], $column_types[$i], $column_len);
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Column Names                   Column Types                   Column Maxlen
-host_year                      integer                        11
-event_code                     integer                        11
-athlete_code                   integer                        11
-stadium_code                   integer                        11
-nation_code                    char                           3
-medal                          char                           1
-game_date                      date                           10
-]]>
-    </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/cubrid/cubridmysql/cubrid-field-name.xml b/reference/cubrid/cubridmysql/cubrid-field-name.xml
deleted file mode 100644
index ed9241d3cef9..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-name.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-name">
- <refnamediv>
-  <refname>cubrid_field_name</refname>
-  <refpurpose>Return the name of the specified field index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_field_name</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the name of the specified field index on success or
-    it returns FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>field_offset</parameter></term>
-   <listitem><simpara>
-    The numerical field offset. The <parameter>field_offset</parameter>
-    starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Name of specified field index, on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$col_num = cubrid_num_cols($result);
-
-printf("%-30s %s\n", "Field Name", "Field Flags");
-for($i = 0; $i < $col_num; $i++) {
-    printf("%-30s %s\n", cubrid_field_name($result, $i), cubrid_field_flags($result, $i));
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Field Name                     Field Flags
-host_year                      not_null primary_key unique_key
-event_code                     not_null primary_key unique_key foreign_key
-athlete_code                   not_null primary_key unique_key foreign_key
-stadium_code                   not_null
-nation_code
-medal
-game_date
-]]>
-    </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/cubrid/cubridmysql/cubrid-field-seek.xml b/reference/cubrid/cubridmysql/cubrid-field-seek.xml
deleted file mode 100644
index d88a2560da1b..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-seek.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-seek">
- <refnamediv>
-  <refname>cubrid_field_seek</refname>
-  <refpurpose>Move the result set cursor to the specified field offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_field_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>field_offset</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function moves the result set cursor to the specified field offset.
-    This offset is used by <function>cubrid_fetch_field</function> if it
-    doesn't include a field offset. It returns TRUE on success or FALSE on
-    failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-   <varlistentry>
-    <term><parameter>field_offset</parameter></term>
-    <listitem><simpara>
-      The numerical field offset. The <parameter>field_offset</parameter>
-      starts at 0. If <parameter>field_offset</parameter> does not exist, an
-      error of level <constant>E_WARNING</constant> is also issued.
-    </simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_seek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT event_code,athlete_code,nation_code,game_date FROM game WHERE host_year=1988 and event_code=20001;");
-
-var_dump(cubrid_fetch_row($req));
-
-cubrid_field_seek($req, 1);
-$field = cubrid_fetch_field($req);
-
-printf("\n--- Field Properties ---\n");
-printf("%-30s %s\n", "name:", $field->name);
-printf("%-30s %s\n", "table:", $field->table);
-printf("%-30s \"%s\"\n", "default value:", $field->def);
-printf("%-30s %d\n", "max length:", $field->max_length);
-printf("%-30s %d\n", "not null:", $field->not_null);
-printf("%-30s %d\n", "unique key:", $field->unique_key);
-printf("%-30s %d\n", "multiple key:", $field->multiple_key);
-printf("%-30s %d\n", "numeric:", $field->numeric);
-printf("%-30s %s\n", "type:", $field->type);
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  string(5) "20001"
-  [1]=>
-  string(5) "16132"
-  [2]=>
-  string(3) "KOR"
-  [3]=>
-  string(9) "1988-09-30"
-}
-
---- Field Properties ---
-name:                          athlete_code
-table:                         game
-default value:                 ""
-max length:                    0
-not null:                      1
-unique key:                    1
-multiple key:                  0
-numeric:                       1
-type:                          integer
-]]>
-    </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/cubrid/cubridmysql/cubrid-field-table.xml b/reference/cubrid/cubridmysql/cubrid-field-table.xml
deleted file mode 100644
index fd6a53ed60a6..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-table.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-table">
- <refnamediv>
-  <refname>cubrid_field_table</refname>
-  <refpurpose>Return the name of the table of the specified field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_field_table</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the name of the table of the specified field. This is useful when using large select queries with JOINS.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem>
-    <simpara><parameter>result</parameter> comes from a call to
-    <function>cubrid_execute</function></simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>field_offset</parameter></term>
-   <listitem><simpara>
-    The numerical field offset. The <parameter>field_offset</parameter>
-    starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Name of the table of the specified field, on success.
-  </simpara>
-  <simpara>
-    &false; when invalid field_offset value.
-  </simpara>
-  <simpara>
-    -1 if SQL sentence is not SELECT.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_table</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM code");
-
-$col_num = cubrid_num_cols($result);
-
-printf("%-15s %-15s %s\n", "Field Table", "Field Name", "Field Type");
-for($i = 0; $i < $col_num; $i++) {
-    printf("%-15s %-15s %s\n",
-        cubrid_field_table($result, $i), cubrid_field_name($result, $i), cubrid_field_type($result, $i));
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Field Table     Field Name      Field Type
-code            s_name          char
-code            f_name          varchar
-]]>
-    </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/cubrid/cubridmysql/cubrid-field-type.xml b/reference/cubrid/cubridmysql/cubrid-field-type.xml
deleted file mode 100644
index 45efda969746..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-field-type.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-field-type">
- <refnamediv>
-  <refname>cubrid_field_type</refname>
-  <refpurpose>Return the type of the column corresponding to the given field offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_field_type</methodname>
-    <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the type of the column corresponding to the given
-    field offset. The returned field type could be one of the following:
-    "int", "real", "string", etc.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem>
-    <simpara><parameter>result</parameter> comes from a call to
-    <function>cubrid_execute</function></simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>field_offset</parameter></term>
-   <listitem><simpara>
-    The numerical field offset. The <parameter>field_offset</parameter>
-    starts at 0. If <parameter>field_offset</parameter> does not exist, an
-    error of level <constant>E_WARNING</constant> is also issued.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Type of the column, on success.
-  </simpara>
-  <simpara>
-    &false; when invalid field_offset value.
-  </simpara>
-  <simpara>
-    -1 if SQL sentence is not SELECT.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_field_type</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$result = cubrid_execute($conn, "SELECT * FROM code");
-
-$col_num = cubrid_num_cols($result);
-
-printf("%-15s %-15s %s\n", "Field Table", "Field Name", "Field Type");
-for($i = 0; $i < $col_num; $i++) {
-    printf("%-15s %-15s %s\n",
-        cubrid_field_table($result, $i), cubrid_field_name($result, $i), cubrid_field_type($result, $i));
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Field Table     Field Name      Field Type
-code            s_name          char
-code            f_name          varchar
-]]>
-    </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/cubrid/cubridmysql/cubrid-list-dbs.xml b/reference/cubrid/cubridmysql/cubrid-list-dbs.xml
deleted file mode 100644
index 2e33932e4f61..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-list-dbs.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-list-dbs">
- <refnamediv>
-  <refname>cubrid_list_dbs</refname>
-  <refpurpose>Return an array with the list of all existing CUBRID databases</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_list_dbs</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns an array with the list of all existing Cubrid
-   databases.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>The CUBRID connection.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An numeric array with all existing Cubrid databases; on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_list_dbs</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$db_list = cubrid_list_dbs($conn);
-var_dump($db_list);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  string(6) "demodb"
-}
-]]>
-    </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/cubrid/cubridmysql/cubrid-num-fields.xml b/reference/cubrid/cubridmysql/cubrid-num-fields.xml
deleted file mode 100644
index b12852c7b5ed..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-num-fields.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-num-fields">
- <refnamediv>
-  <refname>cubrid_num_fields</refname>
-  <refpurpose>Return the number of columns in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the number of columns in the result set, on success,
-    or it returns FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to
-     <function>cubrid_execute</function>, <function>cubrid_query</function>
-     and <function>cubrid_prepare</function></simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Number of columns, on success.
-  </simpara>
-   <simpara>
-    -1 if SQL sentence is not SELECT.
-  </simpara>
-  <simpara>
-   &false; when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_num_fields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-
-$row_num = cubrid_num_rows($req);
-$col_num = cubrid_num_fields($req);
-
-printf("Row Num: %d\nColumn Num: %d\n", $row_num, $col_num);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Row Num: 6
-Column Num: 2
-]]>
-    </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/cubrid/cubridmysql/cubrid-ping.xml b/reference/cubrid/cubridmysql/cubrid-ping.xml
deleted file mode 100644
index 9d0c20540ef0..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-ping.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.cubrid-ping">
- <refnamediv>
-  <refname>cubrid_ping</refname>
-  <refpurpose>Ping a server connection or reconnect if there is no connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_ping</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks whether or not the connection to the server is working.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      The CUBRID connection identifier. If the connection identifier is not
-      specified, the last connection opened by
-      <function>cubrid_connect</function> is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the connection to the CUBRID server is working, otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_ping</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-set_time_limit(0);
-
-$conn = cubrid_connect('localhost', 33000, 'demodb');
-
-/* Assuming this query will take a long time */
-$sql = "select * from athlete";
-$result = cubrid_query($sql);
-if (!$result) {
-    echo 'Query #1 failed, exiting.';
-    exit;
-}
-
-/* Make sure the connection is still alive, if not, try to reconnect */
-if (!cubrid_ping($conn)) {
-    echo 'Lost connection, exiting after query #1';
-    exit;
-}
-cubrid_free_result($result);
-
-/* So the connection is still alive, let's run another query */
-$sql2 = "select * from code";
-$result2 = cubrid_query($sql2);
-?>
-]]>
-   </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/cubrid/cubridmysql/cubrid-query.xml b/reference/cubrid/cubridmysql/cubrid-query.xml
deleted file mode 100644
index 0a6261eca836..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-query.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.cubrid-query">
- <refnamediv>
-  <refname>cubrid_query</refname>
-  <refpurpose>Send a CUBRID query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_query</function> sends a unique query (multiple queries are not supported) to the
-   currently active database on the server that's associated with the specified <parameter>conn_identifier</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An SQL query
-     </simpara>
-     <simpara>
-      Data inside the query should be <link linkend="function.cubrid-real-escape-string">properly escaped</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      The CUBRID connection. If the connection identifier is not specified,
-      the last connection opened by <function>cubrid_connect</function> is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   For SELECT, SHOW, DESCRIBE, EXPLAIN and other statements returning resultset,
-   <function>cubrid_query</function> returns a <type>resource</type> on success, or &false; on error.
-  </simpara>
-  <simpara>
-   For other type of SQL statements, INSERT, UPDATE, DELETE, DROP, etc,
-   <function>cubrid_query</function> returns &true; on success or &false; on error.
-  </simpara>
-  <simpara>
-   The returned result resource should be passed to <function>cubrid_fetch_array</function>, and other
-   functions for dealing with result tables, to access the returned data.
-  </simpara>
-  <simpara>
-   Use <function>cubrid_num_rows</function> to find out how many rows were returned for a SELECT statement or
-   <function>cubrid_affected_rows</function> to find out how many rows were affected by a DELETE, INSERT, REPLACE, or UPDATE statement.
-  </simpara>
-  <simpara>
-   <function>cubrid_query</function> will also fail and return &false;
-   if the user does not have permission to access the table(s) referenced by the query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Invalid Query</title>
-   <simpara>
-    The following query is syntactically invalid, so <function>cubrid_query</function> fails and returns &false;.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect('localhost', 33000, 'demodb');
-
-$result = cubrid_query('SELECT * WHERE 1=1');
-if (!$result) {
-    die('Invalid query: ' . cubrid_error());
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Valid Query</title>
-   <simpara>
-    The following query is valid, so <function>cubrid_query</function> returns a <type>resource</type>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// This could be supplied by a user, for example
-$firstname = 'fred';
-$lastname  = 'fox';
-
-$conn = cubrid_connect('localhost', 33000, 'demodb');
-
-cubrid_execute($conn,"DROP TABLE if exists friends");
-cubrid_execute($conn,"create table friends(firstname varchar,lastname varchar,address char(24),age int)");
-cubrid_execute($conn,"insert into friends values('fred','fox','home-1','20')");
-cubrid_execute($conn,"insert into friends values('blue','cat','home-2','21')");
-// Formulate Query
-// This is the best way to perform an SQL query
-// For more examples, see cubrid_real_escape_string()
-$query = sprintf("SELECT firstname, lastname, address, age FROM friends WHERE firstname='%s' AND lastname='%s'",
-cubrid_real_escape_string($firstname),
-cubrid_real_escape_string($lastname));
-
-// Perform Query
-$result = cubrid_query($query);
-
-// Check result
-// This shows the actual query sent to CUBRID, and the error. Useful for debugging.
-if (!$result) {
-    $message  = 'Invalid query: ' . cubrid_error() . "\n";
-    $message .= 'Whole query: ' . $query;
-    die($message);
-}
-
-// Use result
-// Attempting to print $result won't allow access to information in the resource
-// One of the cubrid result functions must be used
-// See also cubrid_result(), cubrid_fetch_array(), cubrid_fetch_row(), etc.
-while ($row = cubrid_fetch_assoc($result)) {
-    echo $row['firstname'];
-    echo $row['lastname'];
-    echo $row['address'];
-    echo $row['age'];
-}
-
-// Free the resources associated with the result set
-// This is done automatically at the end of the script
-cubrid_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_connect</function></member>
-   <member><function>cubrid_error</function></member>
-   <member><function>cubrid_real_escape_string</function></member>
-   <member><function>cubrid_result</function></member>
-   <member><function>cubrid_fetch_assoc</function></member>
-   <member><function>cubrid_unbuffered_query</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/cubrid/cubridmysql/cubrid-real-escape-string.xml b/reference/cubrid/cubridmysql/cubrid-real-escape-string.xml
deleted file mode 100644
index 4b3cfe1f8dba..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-real-escape-string.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-real-escape-string">
- <refnamediv>
-  <refname>cubrid_real_escape_string</refname>
-  <refpurpose>Escape special characters in a string for use in an SQL statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_real_escape_string</methodname>
-   <methodparam><type>string</type><parameter>unescaped_string</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the escaped string version of the given string. It
-    will escape the following characters: <literal>'</literal>.
-
-    In general, single quotations are used to enclose character string. Double
-    quotations may be used as well depending on the value of ansi_quotes,
-    which is a parameter related to SQL statement. If the ansi_quotes value is
-    set to no, character string enclosed by double quotations is handled as
-    character string, not as an identifier. The default value is yes.
-
-    If you want to include a single quote as part of a character string, enter
-    two single quotes in a row.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-    <term><parameter>unescaped_string</parameter></term>
-    <listitem><simpara>The string that is to be escaped.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem><simpara>
-    The CUBRID connection. If the connection identifier is not specified, the
-    last connection opened by <function>cubrid_connect</function> is assumed.
-    </simpara></listitem>
-   </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Escaped string version of the given string, on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_real_escape_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$unescaped_str = ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-$escaped_str = cubrid_real_escape_string($unescaped_str);
-
-$len = strlen($unescaped_str);
-
-@cubrid_execute($conn, "DROP TABLE cubrid_test");
-cubrid_execute($conn, "CREATE TABLE cubrid_test (t char($len))");
-cubrid_execute($conn, "INSERT INTO cubrid_test (t) VALUES('$escaped_str')");
-
-$req = cubrid_execute($conn, "SELECT * FROM cubrid_test");
-$row = cubrid_fetch_assoc($req);
-
-var_dump($row);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  ["t"]=>
-  string(95) " !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-}
-]]>
-    </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/cubrid/cubridmysql/cubrid-result.xml b/reference/cubrid/cubridmysql/cubrid-result.xml
deleted file mode 100644
index b772ea58b10e..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-result.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-result">
- <refnamediv>
-  <refname>cubrid_result</refname>
-  <refpurpose>Return the value of a specific field in a specific row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>field</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns the value of a specific field in a specific row from
-    a result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-   <term><parameter>result</parameter></term>
-   <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-    <varlistentry>
- <term><parameter>row</parameter></term>
- <listitem><simpara>The row number from the result that is being retrieved. Row numbers start at 0.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>field</parameter></term>
- <listitem><simpara>
-   The name or offset of the <parameter>field</parameter> being retrieved. It
-   can be the field's offset, the field's name, or the field's table dot
-   field name (tablename.fieldname). If the column name has been aliased
-   ('select foo as bar from...'), use the alias instead of the column name.
-   If undefined, the first field is retrieved.
- </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Value of a specific field, on success (NULL if value if null).
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-
-$result = cubrid_result($req, 0);
-var_dump($result);
-
-$result = cubrid_result($req, 0, 1);
-var_dump($result);
-
-$result = cubrid_result($req, 5, "f_name");
-var_dump($result);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(1) "X"
-string(5) "Mixed"
-string(4) "Gold"
-]]>
-    </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/cubrid/cubridmysql/cubrid-unbuffered-query.xml b/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
deleted file mode 100644
index c45b4b9d49a9..000000000000
--- a/reference/cubrid/cubridmysql/cubrid-unbuffered-query.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-unbuffered-query">
- <refnamediv>
-  <refname>cubrid_unbuffered_query</refname>
-  <refpurpose>Perform a query without fetching the results into memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_unbuffered_query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function performs a query without waiting for that all query results have been complete. It will return
-    when the results are being generated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem><simpara>A SQL query.</simpara></listitem>
-  </varlistentry>
-    <varlistentry>
-     <term><parameter>conn_identifier</parameter></term>
-     <listitem><simpara>The CUBRID connection. If the connection identifier is not specified, the last connection opened by <function>cubrid_connect</function> is assumed.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   For SELECT, SHOW, DESCRIBE or EXPLAIN statements returns a request identifier resource on success.
-  </simpara>
-  <simpara>
-    For other type of SQL statements, UPDATE, DELETE, DROP, etc, returns &true; on success.
-  </simpara>
-   <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_unbuffered_query</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $link = cubrid_connect("localhost", 30000, "demodb", "dba", "");
-    if (!$link)
-    {
-        die('Could not connect.');
-    }
-    $query = "select * from code";
-    $result = cubrid_unbuffered_query($query, $link);
-
-    while ($row = cubrid_fetch($result))
-    {
-        var_dump($row);
-    }
-
-    cubrid_close_request($result);
-    cubrid_disconnect($link);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    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>.
-   </simpara>
-  </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/cubrid/examples.xml b/reference/cubrid/examples.xml
deleted file mode 100644
index 96769e13c43c..000000000000
--- a/reference/cubrid/examples.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="cubrid.examples">
- &reftitle.examples;
- <simpara>The following is a simple example that establishes a connection between PHP and CUBRID. This section will cover the most basic and notable features. The following code required to connect to CUBRID database, which means CUBRID Server and CUBRID Broker have to be running.</simpara>
- <simpara>The example below uses the demodb database as an examples. By default it is created during the installation. Make sure it has been created.</simpara>
-
- <example>
-  <title>Example of Data Retrieval</title>
-  <programlisting role="php">
-    <![CDATA[
-    <html>
-    <head>
-    <meta http-equiv="content-type" content="text/html; charset=euc-kr">
-    </head>
-    <body>
-    <center>
-    <table border=2>
-    <?php
-        /**
-         * Set server information for CUBRID connection. host_ip is the IP
-         * address where the CUBRID Broker is installed (localhost in this
-         * example), and host_port is the port number of the CUBRID Broker.
-         * The port number is the default given during the installation.
-         * For details, see "Administrator's Guide."
-         */
-        $host_ip = "localhost";
-        $host_port = 33000;
-        $db_name = "demodb";
-        /**
-         * Connect to CUBRID Server. Do not make the actual connection, but
-         * only retain the connection information. The reason for not making
-         * the actual connection is to handle transaction more efficiently
-         * in the 3-tier architecture.
-         */
-        $cubrid_con = @cubrid_connect($host_ip, $host_port, $db_name);
-
-        if (!$cubrid_con) {
-            echo "Database Connection Error";
-            exit;
-        }
-    ?>
-    <?php
-        $sql = "select sports, count(players) as players from event group by sports";
-        /**
-         * Request the CUBRID Server for the results of the SQL statement.
-         * Now make the actual connection to the CUBRID Server.
-         */
-        $result = cubrid_execute($cubrid_con, $sql);
-
-        if ($result) {
-            /**
-             * Get the column names from the result set created by the SQL query.
-             */
-            $columns = cubrid_column_names($result);
-            /**
-             * Get the number of columns in the result set created by the SQL query.
-             */
-            $num_fields = cubrid_num_cols($result);
-            /**
-             * List the column names of the result set on the screen.
-             */
-            echo "<tr>";
-
-            while (list($key, $colname) = each($columns)) {
-                echo "<td align=center>$colname</td>";
-            }
-
-            echo "</tr>";
-
-            /**
-             * Get the results from the result set.
-             */
-            while ($row = cubrid_fetch($result)) {
-                echo "<tr>";
-
-                for ($i = 0; $i < $num_fields; $i++) {
-                    echo "<td align=center>";
-                    echo $row[$i];
-                    echo "</td>";
-                }
-
-                echo "</tr>";
-            }
-        }
-        /**
-         * The PHP module in the CUBRID runs in a 3-tier architecture. Even when
-         * calling SELECT for transaction processing, it is processed as a part
-         * of the transaction. Therefore, the transaction needs to be rolled back
-         * by calling commit or rollback even though SELECT was called for smooth
-         * performance.
-         */
-        cubrid_commit($cubrid_con);
-        cubrid_disconnect($cubrid_con);
-    ?>
-    </body>
-    </html>
-    ]]>
-  </programlisting>
- </example>
- <example>
- <title>Example of Data Insertion</title>
-   <programlisting role="php">
-    <![CDATA[
-    <html>
-    <head>
-    <meta http-equiv="content-type" content="text/html; charset=euc- kr">
-    </head>
-    <body>
-    <center>
-    <table border=2>
-    <?php
-        /**
-         * host_ip is the IP address where the CUBRID Broker is installed
-         * host_port is the port number of the CUBRID Broker
-         * db_name is the name of CUBRID Database
-         */
-        $host_ip = "localhost";
-        $host_port = 33000;
-        $db_name = "demodb";
-        $cubrid_con = @cubrid_connect($host_ip, $host_port, $db_name);
-
-        if (!$cubrid_con) {
-            echo "Database Connection Error";
-            exit;
-        }
-    ?>
-    <?php
-        $sql = "insert into olympic (host_year,host_nation,host_city,"
-            . "opening_date,closing_date) values (2008, 'China', 'Beijing',"
-            . "to_date('08-08-2008','mm-dd- yyyy'),to_date('08-24-2008','mm-dd-yyyy')) ;";
-        $result = cubrid_execute($cubrid_con, $sql);
-        if ($result) {
-            /**
-             * Handled successfully, so commit.
-             */
-            cubrid_commit($cubrid_con);
-            echo "Inserted successfully ";
-        } else {
-            /**
-             * Error occurred, so the error message is output and rollback is called.
-             */
-            echo cubrid_error_msg();
-            cubrid_rollback($cubrid_con);
-        }
-        cubrid_disconnect($cubrid_con);
-    ?>
-    </body>
-    </html>
-    ]]>
-  </programlisting>
- </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/cubrid/functions/cubrid-bind.xml b/reference/cubrid/functions/cubrid-bind.xml
deleted file mode 100644
index c4c47f2578ea..000000000000
--- a/reference/cubrid/functions/cubrid-bind.xml
+++ /dev/null
@@ -1,325 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-bind">
- <refnamediv>
-  <refname>cubrid_bind</refname>
-  <refpurpose>Bind variables to a prepared statement as parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_bind</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bind_index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>bind_value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>bind_value_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_bind</function> function is used to bind values to a
-   corresponding named or question mark placeholder in the SQL statement that
-   was passed to <function>cubrid_prepare</function>. If
-   <parameter>bind_value_type</parameter> is not given, string will be the
-   default.
-  </simpara>
-  <note>
-   <simpara>
-    If the type of data to be bound is BLOB/CLOB, CUBRID will try to map the
-    data as a PHP stream. If the actually bind value type is not stream,
-    CUBRID will convert it to string, and use it as the full path and file
-    name of a file on the client filesystem.
-   </simpara>
-   <simpara>
-    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.
-   </simpara>
-   <simpara>
-    In CUBRID shard environment, the <parameter>bind_value_type</parameter> must be included in
-    the <function>cubrid_bind</function> function.
-   </simpara>
-  </note>
-  <simpara>
-  The following table shows the types of substitute values.
-  </simpara>
-  <table>
-   <title>CUBRID Bind Data Types</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Support</entry>
-      <entry>Bind Type</entry>
-      <entry>Corresponding SQL Type</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Supported</entry>
-      <entry>STRING</entry>
-      <entry>CHAR, VARCHAR</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>NCHAR</entry>
-      <entry>NCHAR, NVARCHAR</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>BIT</entry>
-      <entry>BIT, VARBIT</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>NUMERIC or NUMBER</entry>
-      <entry>SHORT, INT, NUMERIC</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>FLOAT</entry>
-      <entry>FLOAT</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>DOUBLE</entry>
-      <entry>DOUBLE</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>TIME</entry>
-      <entry>TIME</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>DATE</entry>
-      <entry>DATE</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>TIMESTAMP</entry>
-      <entry>TIMESTAMP</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>OBJECT</entry>
-      <entry>OBJECT</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>ENUM</entry>
-      <entry>ENUM</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>BLOB</entry>
-      <entry>BLOB</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>CLOB</entry>
-      <entry>CLOB</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-     </row>
-     <row>
-      <entry>Not supported</entry>
-      <entry>SET</entry>
-      <entry>SET</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>MULTISET</entry>
-      <entry>MULTISET</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>SEQUENCE</entry>
-      <entry>SEQUENCE</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier as a result of
-   <function>cubrid_prepare</function>.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>bind_index</parameter></term>
- <listitem><simpara>Location of binding parameters. It starts with 1.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>bind_value</parameter></term>
- <listitem><simpara>Actual value for binding.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>bind_value_type</parameter></term>
- <listitem><simpara>A type of the value to bind. (It is omitted by default.
-   Thus, the system internally uses string by default. However, you need to
-   specify the exact type of the value as an argument when they are NCHAR,
-   BIT, or BLOB/CLOB).</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.3.1</entry>
-      <entry>
-       Added BLOB/CLOB data types support.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$result = cubrid_execute($conn, "SELECT code FROM event WHERE sports='Basketball' and gender='M'");
-$row = cubrid_fetch_array($result, CUBRID_ASSOC);
-$event_code = $row["code"];
-
-cubrid_close_request($result);
-
-$game_req = cubrid_prepare($conn, "SELECT athlete_code FROM game WHERE host_year=1992 and event_code=? and nation_code='USA'");
-cubrid_bind($game_req, 1, $event_code, "number");
-cubrid_execute($game_req);
-
-printf("--- Dream Team (1992 United States men's Olympic basketball team) ---\n");
-while ($athlete_code = cubrid_fetch_array($game_req, CUBRID_NUM)) {
-    $athlete_req = cubrid_prepare($conn, "SELECT name FROM athlete WHERE code=? AND nation_code='USA' AND event='Basketball' AND gender='M'");
-    cubrid_bind($athlete_req, 1, $athlete_code[0], "number");
-    cubrid_execute($athlete_req);
-    $row = cubrid_fetch_assoc($athlete_req);
-    printf("%s\n", $row["name"]);
-}
-
-cubrid_close_request($game_req);
-cubrid_close_request($athlete_req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
---- Dream Team (1992 United States men's Olympic basketball team) ---
-Stockton John
-Robinson David
-Pippen Scottie
-Mullin C.
-Malone Karl
-Laettner C.
-Jordan Michael
-Johnson Earvin
-Ewing Patrick
-Drexler Clyde
-Bird Larry
-Barkley Charles
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>cubrid_bind</function> BLOB/CLOB example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-if ($con) {
-    cubrid_execute($con,"DROP TABLE if exists php_cubrid_lob_test");
-    cubrid_execute($con,"CREATE TABLE php_cubrid_lob_test (doc_content CLOB)");
-    $sql = "INSERT INTO php_cubrid_lob_test(doc_content) VALUES(?)";
-    $req = cubrid_prepare($con, $sql);
-
-    $fp = fopen("book.txt", "rb");
-
-    cubrid_bind($req, 1, $fp, "clob");
-    cubrid_execute($req);
-}
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>cubrid_bind</function> BLOB/CLOB example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-if ($con) {
-    cubrid_execute($con,"DROP TABLE if exists php_cubrid_lob_test");
-    cubrid_execute($con,"CREATE TABLE php_cubrid_lob_test (image BLOB)");
-    $sql = "INSERT INTO php_cubrid_lob_test(image) VALUES(?)";
-    $req = cubrid_prepare($con, $sql);
-
-    cubrid_bind($req, 1, "cubrid_logo.png", "blob");
-    cubrid_execute($req);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_execute</function></member>
-   <member><function>cubrid_prepare</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/cubrid/functions/cubrid-close-prepare.xml b/reference/cubrid/functions/cubrid-close-prepare.xml
deleted file mode 100644
index 7f02a650246e..000000000000
--- a/reference/cubrid/functions/cubrid-close-prepare.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-close-prepare">
- <refnamediv>
-  <refname>cubrid_close_prepare</refname>
-  <refpurpose>Close the request handle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_close_prepare</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_close_prepare</function> function closes the request
-   handle given by the <parameter>req_identifier</parameter> argument, and
-   releases the memory region related to the handle. It is an alias of
-   <function>cubrid_close_request</function>.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Return &true; on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_close_prepare</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect ("localhost", 33000, "demodb", "dba", "");
-if ($con) {
-   echo "connected successfully";
-   $req = cubrid_execute ( $con, "select * from members",
-                           CUBRID_INCLUDE_OID | CUBRID_ASYNC);
-   if ($req) {
-      while ( list ($id, $name) = cubrid_fetch ($req) ){
-         echo $id;
-         echo $name;
-      }
-      cubrid_close_prepare($req); // or you can use cubrid_close_request($req)
-   }
-   cubrid_disconnect($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_close_request</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/cubrid/functions/cubrid-close-request.xml b/reference/cubrid/functions/cubrid-close-request.xml
deleted file mode 100644
index 9ab9f38d89d2..000000000000
--- a/reference/cubrid/functions/cubrid-close-request.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-close-request">
- <refnamediv>
-  <refname>cubrid_close_request</refname>
-  <refpurpose>Close the request handle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_close_request</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_close_request</function> function closes the request
-    handle given by the <parameter>req_identifier</parameter> argument, and
-    releases the memory region related to the handle. It is an alias of
-    <function>cubrid_close_prepare</function>.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Return &true; on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_close_request</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect ("localhost", 33000, "demodb", "dba", "");
-if ($con) {
-   echo "connected successfully";
-   $req = cubrid_execute ( $con, "select * from members",
-                           CUBRID_INCLUDE_OID | CUBRID_ASYNC);
-   if ($req) {
-      while ( list ($id, $name) = cubrid_fetch ($req) ){
-         echo $id;
-         echo $name;
-      }
-      cubrid_close_request($req); // or you can use cubrid_close_prepare($req)
-   }
-   cubrid_disconnect($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_close_prepare</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/cubrid/functions/cubrid-col-get.xml b/reference/cubrid/functions/cubrid-col-get.xml
deleted file mode 100644
index 38c79b6190fb..000000000000
--- a/reference/cubrid/functions/cubrid-col-get.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-col-get">
- <refnamediv>
-  <refname>cubrid_col_get</refname>
-  <refpurpose>Get contents of collection type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_col_get</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_col_get</function> function is used to get contents
-    of the elements of the collection type (set, multiset, sequence) attribute
-    you requested as an array.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance that you want to read.</simpara></listitem>
- </varlistentry>
-  <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Attribute name that you want to read from the instance.</simpara></listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Array (0-based numerical array) containing the elements you requested,
-    when process is successful;
-  </simpara>
-    <simpara>
-    &false; (to distinguish the error from the situation of attribute having
-    empty collection or NULL, in case of error, a warning message is shown; in
-    such case you can check the error by using
-    <function>cubrid_error_code</function>), when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_col_get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-$size = cubrid_col_size($conn, $oid, "b");
-var_dump($size);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-int(3)
-]]>
-   </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/cubrid/functions/cubrid-col-size.xml b/reference/cubrid/functions/cubrid-col-size.xml
deleted file mode 100644
index 63b49ada757a..000000000000
--- a/reference/cubrid/functions/cubrid-col-size.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-col-size">
- <refnamediv>
-  <refname>cubrid_col_size</refname>
-  <refpurpose>Get the number of elements in collection type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_col_size</methodname>
-       <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-       <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-       <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_col_size</function> function is used to get the
-    number of elements in a collection type (set, multiset, sequence)
-    attribute.
-  </simpara>
- </refsect1>
-
-   <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID the instance that you want to work with.</simpara></listitem>
- </varlistentry>
-  <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute that you want to work with.</simpara></listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Number of elements, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-<refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.3.1</entry>
-      <entry>
-       Change return value: when process is unsuccessful, return false, not -1.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_col_size</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-$size = cubrid_col_size($conn, $oid, "b");
-var_dump($size);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-int(3)
-]]>
-   </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/cubrid/functions/cubrid-column-names.xml b/reference/cubrid/functions/cubrid-column-names.xml
deleted file mode 100644
index 0fb8a37de1ab..000000000000
--- a/reference/cubrid/functions/cubrid-column-names.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-column-names">
- <refnamediv>
-  <refname>cubrid_column_names</refname>
-  <refpurpose>Get the column names in result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_column_names</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_column_names</function> function is used to get the
-    column names of the query result by using <parameter>req_identifier</parameter>.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Array of string values containing the column names, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_column_names</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$column_names = cubrid_column_names($result);
-$column_types = cubrid_column_types($result);
-
-printf("%-30s %-30s %-15s\n", "Column Names", "Column Types", "Column Maxlen");
-for($i = 0, $size = count($column_names); $i < $size; $i++) {
-    $column_len = cubrid_field_len($result, $i);
-    printf("%-30s %-30s %-15s\n", $column_names[$i], $column_types[$i], $column_len);
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Column Names                   Column Types                   Column Maxlen
-host_year                      integer                        11
-event_code                     integer                        11
-athlete_code                   integer                        11
-stadium_code                   integer                        11
-nation_code                    char                           3
-medal                          char                           1
-game_date                      date                           10
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_prepare</function></member>
-   <member><function>cubrid_execute</function></member>
-   <member><function>cubrid_column_types</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/cubrid/functions/cubrid-column-types.xml b/reference/cubrid/functions/cubrid-column-types.xml
deleted file mode 100644
index 7431f6ffda8a..000000000000
--- a/reference/cubrid/functions/cubrid-column-types.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-column-types">
- <refnamediv>
-  <refname>cubrid_column_types</refname>
-  <refpurpose>Get column types in result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_column_types</methodname>
-    <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_column_types</function> function gets column types of
-    query results by using <parameter>req_identifier</parameter>.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>req_identifier</parameter></term>
-   <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Array of string values containing the column types, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_column_types</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-$result = cubrid_execute($conn, "SELECT * FROM game WHERE host_year=2004 AND nation_code='AUS' AND medal='G'");
-
-$column_names = cubrid_column_names($result);
-$column_types = cubrid_column_types($result);
-
-printf("%-30s %-30s %-15s\n", "Column Names", "Column Types", "Column Maxlen");
-for($i = 0, $size = count($column_names); $i < $size; $i++) {
-    $column_len = cubrid_field_len($result, $i);
-    printf("%-30s %-30s %-15s\n", $column_names[$i], $column_types[$i], $column_len);
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Column Names                   Column Types                   Column Maxlen
-host_year                      integer                        11
-event_code                     integer                        11
-athlete_code                   integer                        11
-stadium_code                   integer                        11
-nation_code                    char                           3
-medal                          char                           1
-game_date                      date                           10
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-    <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_column_names</function></member>
-   <member><function>cubrid_prepare</function></member>
-   <member><function>cubrid_execute</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/cubrid/functions/cubrid-commit.xml b/reference/cubrid/functions/cubrid-commit.xml
deleted file mode 100644
index 90055a29fe08..000000000000
--- a/reference/cubrid/functions/cubrid-commit.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-commit">
- <refnamediv>
-  <refname>cubrid_commit</refname>
-  <refpurpose>Commit a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_commit</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam></methodsynopsis>
-  <simpara>
-    The <function>cubrid_commit</function> function is used to execute commit
-    on the transaction pointed by <parameter>conn_identifier</parameter>,
-    currently in progress. Connection to the server is closed after the
-    <function>cubrid_commit</function> function is called; However,
-    the connection handle is still valid.
-  </simpara>
-  <simpara>
-   In CUBRID PHP, auto-commit mode is disabled by default for transaction management.
-   You can set it by using <function>cubrid_set_autocommit</function>.
-   You can get its status by using <function>cubrid_get_autocommit</function>. Before you start a transaction,
-   remember to disable the auto-commit mode.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
-    <term><parameter>conn_identifier</parameter></term>
-    <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_commit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE publishers");
-
-$sql = <<<EOD
-CREATE TABLE publishers(
-pub_id CHAR(3),
-pub_name VARCHAR(20),
-city VARCHAR(15),
-state CHAR(2),
-country VARCHAR(15)
-)
-EOD;
-cubrid_set_autocommit($conn,false);
-if (!cubrid_execute($conn, $sql)) {
-    printf("Error facility: %d\nError code: %d\nError msg: %s\n", cubrid_error_code_facility(), cubrid_error_code(), cubrid_error_msg());
-
-    cubrid_disconnect($conn);
-    exit;
-}
-
-$req = cubrid_prepare($conn, "INSERT INTO publishers VALUES(?, ?, ?, ?, ?)");
-
-$id_list = array("P01", "P02", "P03", "P04");
-$name_list = array("Abatis Publishers", "Core Dump Books", "Schadenfreude Press", "Tenterhooks Press");
-$city_list = array("New York", "San Francisco", "Hamburg", "Berkeley");
-$state_list = array("NY", "CA", NULL, "CA");
-$country_list = array("USA", "USA", "Germany", "USA");
-
-for ($i = 0, $size = count($id_list); $i < $size; $i++) {
-    cubrid_bind($req, 1, $id_list[$i]);
-    cubrid_bind($req, 2, $name_list[$i]);
-    cubrid_bind($req, 3, $city_list[$i]);
-    cubrid_bind($req, 4, $state_list[$i]);
-    cubrid_bind($req, 5, $country_list[$i]);
-
-    if (!($ret = cubrid_execute($req))) {
-        break;
-    }
-}
-
-if (!$ret) {
-    cubrid_rollback($conn);
-} else {
-    cubrid_commit($conn);
-
-    $req = cubrid_execute($conn, "SELECT * FROM publishers");
-    while ($result = cubrid_fetch_assoc($req)) {
-        printf("%-3s %-20s %-15s %-3s %-15s\n",
-            $result["pub_id"], $result["pub_name"], $result["city"], $result["state"], $result["country"]);
-    }
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-P01 Abatis Publishers    New York        NY  USA
-P02 Core Dump Books      San Francisco   CA  USA
-P03 Schadenfreude Press  Hamburg             Germany
-P04 Tenterhooks Press    Berkeley        CA  USA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_rollback</function></member>
-  <member><function>cubrid_get_autocommit</function></member>
-  <member><function>cubrid_set_autocommit</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/cubrid/functions/cubrid-connect-with-url.xml b/reference/cubrid/functions/cubrid-connect-with-url.xml
deleted file mode 100644
index 89583b17915a..000000000000
--- a/reference/cubrid/functions/cubrid-connect-with-url.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-connect-with-url">
- <refnamediv>
-  <refname>cubrid_connect_with_url</refname>
-  <refpurpose>Establish the environment for connecting to CUBRID server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_connect_with_url</methodname>
-   <methodparam><type>string</type><parameter>conn_url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>userid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_connect_with_url</function> function is used to
-   establish the environment for connecting to your server by using connection
-   information passed with an url string argument. If the HA feature is
-   enabled in CUBRID, you must specify the connection information of the
-   standby server, which is used for failover when failure occurs, in the url
-   string argument of this function. If the user name and password is not
-   given, then the "PUBLIC" connection will be made by default.
-  </simpara>
-  <simpara>
-   &lt;url&gt; ::= CUBRID:&lt;host&gt;:&lt;db_name&gt;:&lt;db_user&gt;:&lt;db_password&gt;:[?&lt;properties&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= &lt;property&gt; [&amp;&lt;property&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= alhosts=&lt;alternative_hosts&gt;[ &amp;rctime=&lt;time&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= login_timeout=&lt;milli_sec&gt;
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= query_timeout=&lt;milli_sec&gt;
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= disconnect_on_query_timeout=true|false
-  </simpara>
-  <simpara>
-   &lt;alternative_hosts&gt; ::= &lt;standby_broker1_host&gt;:&lt;port&gt; [,&lt;standby_broker2_host&gt;:&lt;port&gt;]
-  </simpara>
-  <simpara>
-   &lt;host&gt; := HOSTNAME | IP_ADDR
-  </simpara>
-  <simpara>
-   &lt;time&gt; := SECOND
-  </simpara>
-  <simpara>
-   &lt;milli_sec&gt; := MILLI SECOND
-  </simpara>
-  <simplelist>
-   <member>host : A host name or IP address of the master database</member>
-   <member>db_name : A name of the database</member>
-   <member>db_user : A name of the database user</member>
-   <member>db_password : A database user password</member>
-   <member>
-    alhosts : Specifies the broker information of the standby server, which is
-    used for failover when it is impossible to connect to the active server.
-    You can specify multiple brokers for failover, and the connection to the brokers
-    is attempted in the order listed in alhosts</member>
-   <member>
-    rctime : An interval between the attempts to connect to the active broker in
-    which failure occurred. After a failure occurs, the system connects to the
-    broker specified by althosts (failover), terminates the transaction, and then
-    attempts to connect to the active broker of the master database at every rctime.
-    The default value is 600 seconds.</member>
-   <member>
-    login_timeout : Timeout value (unit: msec.) for database login. The default
-    value is 0, which means infinite postponement.
-   </member>
-   <member>
-    query_timeout : Timeout value (unit: msec.) for query request. Upon timeout,
-    a message to cancel the requested query is sent to the server. The return
-    value can depend on the disconnect_on_query_timeout configuration; even though the
-    message to cancel a request is sent to server, that request may succeed.
-   </member>
-   <member>
-    disconnect_on_query_timeout : Configures a value whether to immediately return
-    an error of function being executed upon timeout. The default value is false.
-   </member>
-  </simplelist>
-  <note>
-   <simpara>
-    <literal>?</literal> and <literal>:</literal> that are used as identifiers
-    in PHP connection URL can't be included in the password. The following is
-    an example of a password that is invalid to use as connection URL because it contains
-    "<literal>?:</literal>".
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:tdb:dba:12?:?login_timeout=100";
-   </simpara>
-   <simpara>
-    Passwords that contain <literal>?</literal> or <literal>:</literal>
-    may be passed as a separate parameter.
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:tbd:::?login_timeout=100";
-   </simpara>
-   <simpara>
-    $conn = cubrid_connect_with_url($url, "dba", "12?");
-   </simpara>
-   <simpara>
-    If user or password is empty,you can't delete "<literal>:</literal>",the following is
-    an example.
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:demodb:::";
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn_url</parameter></term>
-    <listitem><simpara>A character string that contains server connection information.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>userid</parameter></term>
-    <listitem><simpara>User name for the database.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passwd</parameter></term>
-    <listitem><simpara>User password.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_link</parameter></term>
-    <listitem><simpara>If a second call is made to
-      <function>cubrid_connect_with_url</function> with the same arguments,
-      no new connection will be established, but instead, the connection
-      identifier of the already opened connection will be returned. The
-      <parameter>new_link</parameter> parameter modifies this behavior and
-      makes <function>cubrid_connect_with_url</function> always open a new
-      connection, even if <function>cubrid_connect_with_url</function> was
-      called before with the same parameters.</simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Connection identifier, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_connect_with_url</function> url without properties example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn_url = "CUBRID:localhost:33000:demodb:dba::";
-$con = cubrid_connect_with_url($conn_url);
-
-if ($con) {
-   echo "connected successfully";
-   cubrid_execute($con, "create table person(id int,name char(16))");
-   $req =cubrid_execute($con, "insert into person values(1,'James')");
-
-   if ($req) {
-      cubrid_close_request($req);
-      cubrid_commit($con);
-   } else {
-      cubrid_rollback($con);
-   }
-   cubrid_disconnect($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>cubrid_connect_with_url</function> url with properties example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn_url = "CUBRID:127.0.0.1:33000:demodb:dba::?login_timeout=100";
-$con = cubrid_connect_with_url ($conn_url);
-
-if ($con) {
-   echo "connected successfully";
-   cubrid_execute($con, "create table person(id int,name char(16))");
-   $req =cubrid_execute($con, "insert into person values(1,'James')");
-
-   if ($req) {
-      cubrid_close_request($req);
-      cubrid_commit($con);
-   } else {
-      cubrid_rollback($con);
-   }
-   cubrid_disconnect($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_connect</function></member>
-   <member><function>cubrid_pconnect</function></member>
-   <member><function>cubrid_pconnect_with_url</function></member>
-   <member><function>cubrid_disconnect</function></member>
-   <member><function>cubrid_close</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/cubrid/functions/cubrid-connect.xml b/reference/cubrid/functions/cubrid-connect.xml
deleted file mode 100644
index 4e7107b1b7f4..000000000000
--- a/reference/cubrid/functions/cubrid-connect.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-connect">
- <refnamediv>
-  <refname>cubrid_connect</refname>
-  <refpurpose>Open a connection to a CUBRID Server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>userid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_connect</function> function is used to establish the
-    environment for connecting to your server by using your server address,
-    port number, database name, user name, and password. If the user name and
-    password is not given, then the "PUBLIC" connection will be made by
-    default.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>host</parameter></term>
-   <listitem><simpara>Host name or IP address of CUBRID CAS server.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>port</parameter></term>
-   <listitem><simpara>Port number of CUBRID CAS server (BROKER_PORT configured in $CUBRID/conf/cubrid_broker.conf).</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>dbname</parameter></term>
-   <listitem><simpara>Name of database.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>userid</parameter></term>
-   <listitem><simpara>User name for the database. If not given, the default
-     value is "public".</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>passwd</parameter></term>
-   <listitem><simpara>User password. If not given, the default value is "".</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>new_link</parameter></term>
-   <listitem><simpara>If a second call is made to
-     <function>cubrid_connect</function> with the same arguments, no new
-     connection will be established, but instead, the connection identifier
-     of the already opened connection will be returned. The
-     <parameter>new_link</parameter> parameter modifies this behavior and
-     makes <function>cubrid_connect</function> always open a new connection,
-     even if <function>cubrid_connect</function> was called before with the
-     same parameters.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Connection identifier, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_connect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_pconnect</function></member>
-  <member><function>cubrid_connect_with_url</function></member>
-  <member><function>cubrid_pconnect_with_url</function></member>
-  <member><function>cubrid_disconnect</function></member>
-  <member><function>cubrid_close</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/cubrid/functions/cubrid-current-oid.xml b/reference/cubrid/functions/cubrid-current-oid.xml
deleted file mode 100644
index c4de97d3576d..000000000000
--- a/reference/cubrid/functions/cubrid-current-oid.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-current-oid">
- <refnamediv>
-  <refname>cubrid_current_oid</refname>
-  <refpurpose>Get OID of the current cursor location</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_current_oid</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    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 <constant>CUBRID_INCLUDE_OID</constant> option must be included during
-    the query execution.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>req_identifier</parameter></term>
-   <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Oid of current cursor location, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_current_oid</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$req = cubrid_execute($conn, "SELECT * FROM code", CUBRID_INCLUDE_OID);
-$oid = cubrid_current_oid($req);
-$res = cubrid_get($conn, $oid);
-
-print_r($res);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [s_name] => X
-    [f_name] => Mixed
-)
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
-    <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</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/cubrid/functions/cubrid-disconnect.xml b/reference/cubrid/functions/cubrid-disconnect.xml
deleted file mode 100644
index 730a5874f58b..000000000000
--- a/reference/cubrid/functions/cubrid-disconnect.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-disconnect">
- <refnamediv>
-  <refname>cubrid_disconnect</refname>
-  <refpurpose>Close a database connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_disconnect</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_disconnect</function> function closes the connection
-    handle and disconnects from server. If any request handle is not closed at this point,
-    it will be closed. It is similar to the CUBRID MySQL compatible function <function>cubrid_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_disconnect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = cubrid_connect ("localhost", 33000, "demodb");
-if ($con) {
-   echo "connected successfully";
-
-   $req = cubrid_execute( $con, "create table person(id int,name char(10))");
-   if ($req) {
-      cubrid_close_request($req);
-      cubrid_commit($con);
-   } else {
-      cubrid_rollback($con);
-   }
-
-   $req = cubrid_execute( $con, "insert into person values(1,'James')");
-   if ($req) {
-      cubrid_close_request($req);
-      cubrid_commit($con);
-   } else {
-      cubrid_rollback($con);
-   }
-   cubrid_disconnect($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_close</function></member>
-  <member><function>cubrid_connect</function></member>
-  <member><function>cubrid_connect_with_url</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/cubrid/functions/cubrid-drop.xml b/reference/cubrid/functions/cubrid-drop.xml
deleted file mode 100644
index 53b5564915a1..000000000000
--- a/reference/cubrid/functions/cubrid-drop.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-drop">
- <refnamediv>
-  <refname>cubrid_drop</refname>
-  <refpurpose>Delete an instance using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_drop</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_drop</function> function is used to delete an
-    instance from database by using the <parameter>oid</parameter> of the instance.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>Oid of the instance that you want to delete.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_drop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(2, {4,5,7}, {44,55,66,666}, 'b')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-printf("--- Before Drop: ---\n");
-$attr = cubrid_get($conn, $oid);
-var_dump($attr);
-
-if (cubrid_drop($conn, $oid)) {
-    cubrid_commit($conn);
-} else {
-    cubrid_rollback($conn);
-}
-
-cubrid_close_request($req);
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-printf("\n--- After Drop: ---\n");
-$attr = cubrid_get($conn, $oid);
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
---- Before Drop: ---
-array(4) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  array(3) {
-    [0]=>
-    string(1) "1"
-    [1]=>
-    string(1) "2"
-    [2]=>
-    string(1) "3"
-  }
-  ["c"]=>
-  array(4) {
-    [0]=>
-    string(2) "11"
-    [1]=>
-    string(2) "22"
-    [2]=>
-    string(2) "33"
-    [3]=>
-    string(3) "333"
-  }
-  ["d"]=>
-  string(10) "a         "
-}
-
---- After Drop: ---
-array(4) {
-  ["a"]=>
-  string(1) "2"
-  ["b"]=>
-  array(3) {
-    [0]=>
-    string(1) "4"
-    [1]=>
-    string(1) "5"
-    [2]=>
-    string(1) "7"
-  }
-  ["c"]=>
-  array(4) {
-    [0]=>
-    string(2) "44"
-    [1]=>
-    string(2) "55"
-    [2]=>
-    string(2) "66"
-    [3]=>
-    string(3) "666"
-  }
-  ["d"]=>
-  string(10) "b         "
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_is_instance</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/cubrid/functions/cubrid-error-code-facility.xml b/reference/cubrid/functions/cubrid-error-code-facility.xml
deleted file mode 100644
index 0c5682431b69..000000000000
--- a/reference/cubrid/functions/cubrid-error-code-facility.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-error-code-facility">
- <refnamediv>
-  <refname>cubrid_error_code_facility</refname>
-  <refpurpose>Get the facility code of error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_error_code_facility</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_error_code_facility</function> function is used to
-    get the facility code (level in which the error occurred) from the error
-    code of the error that occurred during the API execution. Usually, you can
-    get the error code when API returns false as its return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_error_code_facility</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = @cubrid_execute($conn, "SELECT * FROM unknown");
-if (!$req) {
-    printf("Error facility: %d\nError code: %d\nError msg: %s\n",
-        cubrid_error_code_facility(), cubrid_error_code(), cubrid_error_msg());
-
-    cubrid_disconnect($conn);
-    exit;
-}
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Error facility: 1
-Error code: -493
-Error msg: Syntax: In line 1, column 15 before END OF STATEMENT
-Syntax error: unexpected 'unknown'
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_error_code</function></member>
-  <member><function>cubrid_error_msg</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/cubrid/functions/cubrid-error-code.xml b/reference/cubrid/functions/cubrid-error-code.xml
deleted file mode 100644
index 7989641374dc..000000000000
--- a/reference/cubrid/functions/cubrid-error-code.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-error-code">
- <refnamediv>
-  <refname>cubrid_error_code</refname>
-  <refpurpose>Get error code for the most recent function call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_error_code</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_error_code</function> function is used to get the
-    error code of the error that occurred during the API execution. Usually,
-    it gets the error code when API returns false as its return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Error code of the error that occurred, or <literal>0</literal> (zero) if no
-   error occurred.
-  </simpara>
-  <simpara/>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_error_code</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_prepare($conn , "SELECT * FROM code WHERE s_name=?");
-
-$req = @cubrid_execute($req);
-if (!$req) {
-    printf("Error facility: %d\nError code: %d\nError msg: %s\n",
-        cubrid_error_code_facility(), cubrid_error_code(), cubrid_error_msg());
-
-    cubrid_disconnect($conn);
-    exit;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-    <screen>
-<![CDATA[
-Error facility: 4
-Error code: -30015
-Error msg: Some parameter not binded
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-<refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_error_code_facility</function></member>
-  <member><function>cubrid_error_msg</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/cubrid/functions/cubrid-error-msg.xml b/reference/cubrid/functions/cubrid-error-msg.xml
deleted file mode 100644
index c2b5498ec984..000000000000
--- a/reference/cubrid/functions/cubrid-error-msg.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-error-msg">
- <refnamediv>
-  <refname>cubrid_error_msg</refname>
-  <refpurpose>Get last error message for the most recent function call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_error_msg</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_error_msg</function> function is used to get the
-    error message that occurred during the use of CUBRID API. Usually, it gets
-    error message when API returns false as its return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Error message that occurred.
-  </simpara>
-  <simpara/>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_error_msg</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-if (!@cubrid_schema($conn, 100000)) {
-    printf("Error facility: %d\nError code: %d\nError msg: %s\n",
-        cubrid_error_code_facility(), cubrid_error_code(), cubrid_error_msg());
-
-    cubrid_disconnect($conn);
-    exit;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-    <screen>
-<![CDATA[
-Error facility: 2
-Error code: -10015
-Error msg: Invalid T_CCI_SCH_TYPE value
-]]>
-   </screen>
-
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_error_code</function></member>
-  <member><function>cubrid_error_code_facility</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/cubrid/functions/cubrid-execute.xml b/reference/cubrid/functions/cubrid-execute.xml
deleted file mode 100644
index 3148a966a056..000000000000
--- a/reference/cubrid/functions/cubrid-execute.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-execute">
- <refnamediv>
-  <refname>cubrid_execute</refname>
-  <refpurpose>Execute a prepared SQL statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_execute</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>option</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_execute</methodname>
-   <methodparam><type>resource</type><parameter>request_identifier</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>option</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-    <simpara>
-      The <function>cubrid_execute</function> function is used to execute the
-      given SQL statement. It executes the query by using
-      <parameter>conn_identifier</parameter> and SQL, and then returns the
-      request identifier created. It is used for simple execution of query,
-      where the parameter binding is not needed. In addition, the
-      <function>cubrid_execute</function> function is used to execute the
-      prepared statement by means of <function>cubrid_prepare</function> and
-      <function>cubrid_bind</function>. At this time, you need to specify
-      arguments of <parameter>request_identifier</parameter> and
-      <parameter>option</parameter>.
-    </simpara>
-    <simpara>
-     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. <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 is selected. 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:
-    </simpara>
-    <simplelist>
-     <member>The return value is the result of the first query.</member>
-     <member>
-      If an error occurs in any query, the execution is processed as a
-      failure.
-     </member>
-     <member>
-      In a query composed of q1 q2 q3, if an error
-      occurs in q2 after q1 succeeds the execution, the result of q1 remains
-      valid. That is, the previous successful query executions are not rolled
-      back when an error occurs.
-     </member>
-     <member>
-      If a query is executed successfully, the result of the second query can
-      be obtained using <function>cubrid_next_result</function>.
-     </member>
-    </simplelist>
-    <simpara>
-     If the first argument is <parameter>request_identifier</parameter> to
-     execute the <function>cubrid_prepare</function> function, you can specify
-     an option, <constant>CUBRID_ASYNC</constant> only.
-    </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-       <varlistentry>
-     <term><parameter>conn_identifier</parameter></term>
-     <listitem><simpara>Connection identifier.</simpara></listitem>
-      </varlistentry>
-      <varlistentry>
-     <term><parameter>sql</parameter></term>
-     <listitem><simpara>SQL to be executed.</simpara></listitem>
-      </varlistentry>
-      <varlistentry>
-     <term><parameter>option</parameter></term>
-       <listitem><simpara>Query execution option <constant>CUBRID_INCLUDE_OID</constant>, <constant>CUBRID_ASYNC</constant>, <constant>CUBRID_EXEC_QUERY_ALL</constant>.</simpara></listitem>
-      </varlistentry>
-       <varlistentry>
-     <term><parameter>request_identifier</parameter></term>
-     <listitem><simpara><function>cubrid_prepare</function> identifier.</simpara></listitem>
-      </varlistentry>
-     </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Request identifier, when process is successful and first param is
-    conn_identifier; &true;, when process is successful and first argument is
-    request_identifier,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Add new option <constant>CUBRID_EXEC_QUERY_ALL</constant>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$result = cubrid_execute($conn, "SELECT code FROM event WHERE name='100m Butterfly' and gender='M'", CUBRID_ASYNC);
-$row = cubrid_fetch_array($result, CUBRID_ASSOC);
-$event_code = $row["code"];
-
-cubrid_close_request($result);
-
-$history_req = cubrid_prepare($conn, "SELECT * FROM history WHERE event_code=?");
-cubrid_bind($history_req, 1, $event_code, "number");
-cubrid_execute($history_req);
-
-printf("%-20s %-9s %-10s %-5s\n", "athlete", "host_year", "score", "unit");
-while ($row = cubrid_fetch_array($history_req, CUBRID_ASSOC)) {
-    printf("%-20s %-9s %-10s %-5s\n",
-        $row["athlete"], $row["host_year"], $row["score"], $row["unit"]);
-}
-
-cubrid_close_request($history_req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-athlete              host_year score      unit
-Phelps Michael       2004      51.25      time
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_prepare</function></member>
-  <member><function>cubrid_bind</function></member>
-  <member><function>cubrid_next_result</function></member>
-  <member><function>cubrid_close_request</function></member>
-  <member><function>cubrid_commit</function></member>
-  <member><function>cubrid_rollback</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/cubrid/functions/cubrid-fetch.xml b/reference/cubrid/functions/cubrid-fetch.xml
deleted file mode 100644
index 4ae412bf7374..000000000000
--- a/reference/cubrid/functions/cubrid-fetch.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-fetch">
- <refnamediv>
-  <refname>cubrid_fetch</refname>
-  <refpurpose>Fetch the next row from a result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>cubrid_fetch</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>CUBRID_BOTH</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_fetch</function> function is used to get a single row from the query result.  The cursor automatically moves to the next row after getting the result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>result</parameter></term>
- <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>type</parameter></term>
- <listitem><simpara>Array type of the fetched result CUBRID_NUM, CUBRID_ASSOC,
-   CUBRID_BOTH, CUBRID_OBJECT. If you want to operate the lob object, you can
-   use CUBRID_LOB.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>Result array or object, when process is successful.</simpara>
-  <simpara>&false;, when there are no more rows; NULL, when process is unsuccessful.</simpara>
-  <simpara>The result can be received either as an array or as an object, and you can decide which data type to use by setting the <parameter>type</parameter> argument. The <parameter>type</parameter> variable can be set to one of the following values:</simpara>
-    <simplelist>
-        <member>CUBRID_NUM : Numerical array (0-based)</member>
-        <member>CUBRID_ASSOC : Associative array</member>
-        <member>CUBRID_BOTH : Numerical &amp; Associative array (default)</member>
-        <member>CUBRID_OBJECT : object that has the attribute name as the column name of query result</member>
-    </simplelist>
-  <simpara>When <parameter>type</parameter> argument is omitted, the result will be received using CUBRID_BOTH option as default. When you want to receive query result in object data type, the column name of the result must obey the naming rules for identifiers in PHP.  For example, column name such as "count(*)" cannot be received in object type.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_fetch</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-$req = cubrid_execute($conn, "SELECT * FROM stadium WHERE nation_code='GRE' AND seats > 10000");
-
-printf("%-40s %-10s %-6s %-20s\n", "name", "area", "seats", "address");
-while ($row = cubrid_fetch($req)) {
-    printf("%-40s %-10s %-6s %-20s\n",
-        $row["name"], $row["area"], $row["seats"], $row["address"]);
-}
-
-// if you want to operate lob object, you can use cubrid_fetch($req, CUBRID_LOB)
-
-cubrid_close_request($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-name                                     area       seats  address
-Panathinaiko Stadium                     86300.00   50000  Athens, Greece
-Olympic Stadium                          54700.00   13000  Athens, Greece
-Olympic Indoor Hall                      34100.00   18800  Athens, Greece
-Olympic Hall                             52400.00   21000  Athens, Greece
-Olympic Aquatic Centre                   42500.00   11500  Athens, Greece
-Markopoulo Olympic Equestrian Centre     64000.00   15000  Markopoulo, Athens, Greece
-Faliro Coastal Zone Olympic Complex      34650.00   12171  Faliro, Athens, Greece
-Athens Olympic Stadium                   120400.00  71030  Maroussi, Athens, Greece
-Ano Liossia                              34000.00   12000  Ano Liosia, Athens, Greece
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-    <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</function></member>
-  <member><function>cubrid_fetch_array</function></member>
-  <member><function>cubrid_fetch_row</function></member>
-  <member><function>cubrid_fetch_assoc</function></member>
-  <member><function>cubrid_fetch_object</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/cubrid/functions/cubrid-free-result.xml b/reference/cubrid/functions/cubrid-free-result.xml
deleted file mode 100644
index 83ec6e82b291..000000000000
--- a/reference/cubrid/functions/cubrid-free-result.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-free-result">
- <refnamediv>
-  <refname>cubrid_free_result</refname>
-  <refpurpose>Free the memory occupied by the result data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_free_result</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    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
-    client fetch buffer now, and if you want free all memory, use function
-    <function>cubrid_close_request</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>This is the request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_free_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$req = cubrid_execute($conn, "SELECT * FROM history WHERE host_year=2004 ORDER BY event_code");
-$row = cubrid_fetch_assoc($req);
-var_dump($row);
-
-cubrid_free_result($req);
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(5) {
-  ["event_code"]=>
-  string(5) "20005"
-  ["athlete"]=>
-  string(12) "Hayes Joanna"
-  ["host_year"]=>
-  string(4) "2004"
-  ["score"]=>
-  string(5) "12.37"
-  ["unit"]=>
-  string(4) "time"
-}
-]]>
-    </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/cubrid/functions/cubrid-get-autocommit.xml b/reference/cubrid/functions/cubrid-get-autocommit.xml
deleted file mode 100644
index 3ab793ca62ad..000000000000
--- a/reference/cubrid/functions/cubrid-get-autocommit.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-autocommit">
- <refnamediv>
-  <refname>cubrid_get_autocommit</refname>
-  <refpurpose>Get auto-commit mode of the connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_get_autocommit</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_get_autocommit</function> function is used to get the status of CUBRID
-   database connection auto-commit mode.
-  </simpara>
-  <simpara>
-   For CUBRID 8.4.0, auto-commit mode is disabled by default for transaction
-   management.
-  </simpara>
-  <simpara>
-   For CUBRID 8.4.1, auto-commit mode is enabled by default for transaction
-   management.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &true;, when auto-commit is on.
-  </simpara>
-  <simpara>
-   &false;, when auto-commit is off.
-  </simpara>
-  <simpara>
-   &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_set_autocommit</function></member>
-  <member><function>cubrid_commit</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/cubrid/functions/cubrid-get-charset.xml b/reference/cubrid/functions/cubrid-get-charset.xml
deleted file mode 100644
index 2aad500fd6a8..000000000000
--- a/reference/cubrid/functions/cubrid-get-charset.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-charset">
- <refnamediv>
-  <refname>cubrid_get_charset</refname>
-  <refpurpose>Return the current CUBRID connection charset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_get_charset</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the current CUBRID connection charset and is similar
-   to the CUBRID MySQL compatible function
-   <function>cubrid_client_encoding</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>The CUBRID connection.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string that represents the CUBRID connection charset on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_charset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$con = cubrid_connect("localhost", 33000, "demodb");
-if (!$con)
-{
-    die('Could not connect.');
-}
-
-printf("CUBRID current charset: %s\n", cubrid_get_charset($con));
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID current charset: iso8859-1
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_client_encoding</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/cubrid/functions/cubrid-get-class-name.xml b/reference/cubrid/functions/cubrid-get-class-name.xml
deleted file mode 100644
index e9b09a5fc137..000000000000
--- a/reference/cubrid/functions/cubrid-get-class-name.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-class-name">
- <refnamediv>
-  <refname>cubrid_get_class_name</refname>
-  <refpurpose>Get the class name using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_get_class_name</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_get_class_name</function> function is used to get the
-    class name from <parameter>oid</parameter>. It doesn't work when selecting data from the system tables,
-    for example db_class.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>oid</parameter></term>
-   <listitem><simpara>OID of the instance that you want to check the existence.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Class name when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_class_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$req = cubrid_execute($conn, "SELECT * FROM code", CUBRID_INCLUDE_OID);
-$oid = cubrid_current_oid($req);
-$class_name = cubrid_get_class_name($conn, $oid);
-
-print_r($class_name);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-code
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_is_instance</function></member>
-  <member><function>cubrid_drop</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/cubrid/functions/cubrid-get-client-info.xml b/reference/cubrid/functions/cubrid-get-client-info.xml
deleted file mode 100644
index 5dff1dea5e40..000000000000
--- a/reference/cubrid/functions/cubrid-get-client-info.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-client-info">
- <refnamediv>
-  <refname>cubrid_get_client_info</refname>
-  <refpurpose>Return the client library version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_get_client_info</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    This function returns a string that represents the client library version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string that represents the client library version on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_client_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_connect("localhost", 33088, "demodb");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-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/cubrid/functions/cubrid-get-db-parameter.xml b/reference/cubrid/functions/cubrid-get-db-parameter.xml
deleted file mode 100644
index 5337b2af6e34..000000000000
--- a/reference/cubrid/functions/cubrid-get-db-parameter.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-db-parameter">
- <refnamediv>
-  <refname>cubrid_get_db_parameter</refname>
-  <refpurpose>Returns the CUBRID database parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_get_db_parameter</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the CUBRID database parameters,&return.falseforfailure;.
-   It returns an associative array with the values for the following parameters:
-  </simpara>
-  <simplelist>
-  <member><constant>PARAM_ISOLATION_LEVEL</constant></member>
-  <member><constant>PARAM_LOCK_TIMEOUT</constant></member>
-  <member><constant>PARAM_MAX_STRING_LENGTH</constant></member>
-  <member><constant>PARAM_AUTO_COMMIT</constant></member>
- </simplelist>
-  <table>
-  <title>Database parameters</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Parameter</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PARAM_ISOLATION_LEVEL</entry>
-      <entry>The transaction isolation level.</entry>
-     </row>
-     <row>
-      <entry>LOCK_TIMEOUT</entry>
-      <entry>CUBRID provides the lock timeout feature, which sets the waiting
-       time (in seconds) for the lock until the transaction lock setting is
-       allowed. The default value of the lock_timeout_in_secs parameter is
-       -1, which means the application client will wait indefinitely until
-       the transaction lock is allowed.
-      </entry>
-     </row>
-     <row>
-      <entry>PARAM_AUTO_COMMIT</entry>
-      <entry>In CUBRID PHP, auto-commit mode is disabled by default for
-       transaction management. It can be set by using
-       <function>cubrid_set_autocommit</function>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <para>
-   The following table shows the isolation levels from 1 to 6. It consists of
-   table schema (row) and isolation level:
-  <table>
-   <title>Levels of Isolation Supported by CUBRID</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>SERIALIZABLE (6)</entry>
-       <entry>In this isolation level, problems concerning concurrency (e.g.
-        dirty read, non-repeatable read, phantom read, etc.) do not
-        occur.</entry>
-      </row>
-      <row>
-       <entry>REPEATABLE READ CLASS with REPEATABLE READ INSTANCES (5)</entry>
-       <entry>Another transaction T2 cannot update the schema of table A while
-        transaction T1 is viewing table A.
-       Transaction T1 may experience phantom read for the record R that was
-       inserted by another transaction T2 when it is repeatedly retrieving a
-       specific record.</entry>
-      </row>
-      <row>
-       <entry>REPEATABLE READ CLASS with READ COMMITTED INSTANCES (or CURSOR STABILITY) (4)</entry>
-       <entry>Another transaction T2 cannot update the schema of table A while
-        transaction T1 is viewing table A.
-       Transaction T1 may experience R read (non-repeatable read) that was
-       updated and committed by another transaction T2 when it is repeatedly
-       retrieving the record R.</entry>
-      </row>
-      <row>
-       <entry>REPEATABLE READ CLASS with READ UNCOMMITTED INSTANCES (3)</entry>
-       <entry>Default isolation level.  Another transaction T2 cannot update
-        the schema of table A  while transaction T1 is viewing table A.
-        Transaction T1 may experience R' read (dirty read) for the record that
-        was updated but not committed by another transaction T2.</entry>
-      </row>
-      <row>
-       <entry>READ COMMITTED CLASS with READ COMMITTED INSTANCES (2)</entry>
-       <entry>Transaction T1 may experience A' read (non-repeatable read) for
-        the table that was updated and committed by another transaction  T2
-        while it is viewing table A repeatedly.  Transaction T1 may experience
-        R' read (non-repeatable read) for the record that was updated and
-        committed by another transaction T2 while it is retrieving the record
-        R repeatedly.</entry>
-      </row>
-      <row>
-       <entry>READ COMMITTED CLASS with READ UNCOMMITTED INSTANCES (1)</entry>
-       <entry>Transaction T1 may experience A' read (non-repeatable read) for
-        the table that was updated and committed by another transaction T2
-        while it is repeatedly viewing table A.  Transaction T1 may experience
-        R' read (dirty read) for the record that was updated but not committed
-        by another transaction T2.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>
-     The CUBRID connection. If the connection identifier is not specified,
-     the last link opened by <function>cubrid_connect</function> is assumed.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An associative array with CUBRID database parameters; on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Change LOCK_TIMEOUT to PARAM_LOCK_TIMEOUT, and MAX_STRING_LENGTH to
-       PARAM_MAX_STRING_LENGTH in result.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_db_parameter</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_connect("localhost", 33088, "demodb");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-1
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_set_db_parameter</function></member>
-   <member><function>cubrid_get_autocommit</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/cubrid/functions/cubrid-get-query-timeout.xml b/reference/cubrid/functions/cubrid-get-query-timeout.xml
deleted file mode 100644
index dbe24d024d46..000000000000
--- a/reference/cubrid/functions/cubrid-get-query-timeout.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-query-timeout">
- <refnamediv>
-  <refname>cubrid_get_query_timeout</refname>
-  <refpurpose>Get the query timeout value of the request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_get_query_timeout</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_get_query_timeout</function> function is used to get
-   the query timeout of the request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the query timeout value in milliseconds of the current request on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_query_timeout</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$host = "localhost";
-$port = 33000;
-$db = "demodb";
-
-$conn =
-cubrid_connect_with_url("CUBRID:$host:$port:$db:::?login_timeout=50000&query_timeout=5000&disconnect_on_query_timeout=yes");
-
-$req = cubrid_prepare($conn, "SELECT * FROM code");
-
-$timeout = cubrid_get_query_timeout($req);
-var_dump($timeout);
-
-cubrid_set_query_timeout($req, 1000);
-$timeout = cubrid_get_query_timeout($req);
-var_dump($timeout);
-
-cubrid_close($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(5000)
-int(1000)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_set_query_timeout</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/cubrid/functions/cubrid-get-server-info.xml b/reference/cubrid/functions/cubrid-get-server-info.xml
deleted file mode 100644
index 81741e70c97e..000000000000
--- a/reference/cubrid/functions/cubrid-get-server-info.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get-server-info">
- <refnamediv>
-  <refname>cubrid_get_server_info</refname>
-  <refpurpose>Return the CUBRID server version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_get_server_info</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    This function returns a string that represents the CUBRID server version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>The CUBRID connection.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string that represents the CUBRID server version on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_server_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_connect("localhost", 33088, "demodb");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-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/cubrid/functions/cubrid-get.xml b/reference/cubrid/functions/cubrid-get.xml
deleted file mode 100644
index d91f6f203d28..000000000000
--- a/reference/cubrid/functions/cubrid-get.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-get">
- <refnamediv>
-  <refname>cubrid_get</refname>
-  <refpurpose>Get a column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>cubrid_get</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>attr</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_get</function> function is used to get the attribute
-    of the instance of the given <parameter>oid</parameter>.  You can get
-    single attribute by using string data type for the
-    <parameter>attr</parameter> argument, or many attributes by using array
-    data type for the <parameter>attr</parameter> argument.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance that you want to read.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>attr</parameter></term>
- <listitem><simpara>Name of the attribute that you want to read.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Content of the requested attribute, when process is successful; When
-   <parameter>attr</parameter> is set with string data type, the result is
-   returned as a string; when <parameter>attr</parameter> is set with array
-   data type (0-based numerical array), then the result is returned in
-   associative array. When <parameter>attr</parameter> is omitted, then all
-   attributes are received in array form.
-  </simpara>
-  <simpara>
-   &false; when process is unsuccessful or result is NULL (If error occurs to
-   distinguish empty string from NULL, then it prints the warning message.
-   You can check the error by using <function>cubrid_error_code</function>)
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(2, {4,5,7}, {44,55,66,666}, 'b')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_get($conn, $oid, "b");
-var_dump($attr);
-
-$attr = cubrid_get($conn, $oid);
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(9) "{1, 2, 3}"
-array(4) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  array(3) {
-    [0]=>
-    string(1) "1"
-    [1]=>
-    string(1) "2"
-    [2]=>
-    string(1) "3"
-  }
-  ["c"]=>
-  array(4) {
-    [0]=>
-    string(2) "11"
-    [1]=>
-    string(2) "22"
-    [2]=>
-    string(2) "33"
-    [3]=>
-    string(3) "333"
-  }
-  ["d"]=>
-  string(10) "a         "
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_put</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/cubrid/functions/cubrid-insert-id.xml b/reference/cubrid/functions/cubrid-insert-id.xml
deleted file mode 100644
index c1e992ee89cc..000000000000
--- a/reference/cubrid/functions/cubrid-insert-id.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-insert-id">
- <refnamediv>
-  <refname>cubrid_insert_id</refname>
-  <refpurpose>Return the ID generated for the last updated <constant>AUTO_INCREMENT</constant> column</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_insert_id</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_insert_id</function> function retrieves the ID
-   generated for the AUTO_INCREMENT column which is updated by the previous
-   INSERT query. It returns 0 if the previous query does not generate new
-   rows, or FALSE on failure.
-  </simpara>
-
-  <note>
-   <simpara>
-    CUBRID supports AUTO_INCREMENT for more than one columns in a table. In
-    most cases, there will be a single AUTO_INCREMENT column in a table. If
-    there are multiple AUTO_INCREMENT columns, this function should not be
-    used even if it will return a value.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>
-     The connection identifier previously obtained by a call to
-     <function>cubrid_connect</function>.
-   </simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string representing the ID generated for an AUTO_INCREMENT column by the
-   previous query, on success.
-  </simpara>
-  <simpara>
-   0, if the previous query does not generate new rows.
-  </simpara>
-  <simpara>
-    &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Change the return value from an array to string; Remove the first
-       parameter class_name.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_insert_id</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-@cubrid_execute($conn, "DROP TABLE cubrid_test");
-cubrid_execute($conn, "CREATE TABLE cubrid_test (d int AUTO_INCREMENT(1, 2), t varchar)");
-
-for ($i = 0; $i < 10; $i++) {
-    cubrid_execute($conn, "INSERT INTO cubrid_test(t) VALUES('cubrid_test')");
-}
-
-$id = cubrid_insert_id();
-var_dump($id);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(2) "19"
-]]>
-    </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/cubrid/functions/cubrid-is-instance.xml b/reference/cubrid/functions/cubrid-is-instance.xml
deleted file mode 100644
index c9e68d0af4a7..000000000000
--- a/reference/cubrid/functions/cubrid-is-instance.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-is-instance">
- <refnamediv>
-  <refname>cubrid_is_instance</refname>
-  <refpurpose>Check whether the instance pointed by OID exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_is_instance</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_is_instance</function> function is used to check
-    whether the instance pointed by the given <parameter>oid</parameter>
-    exists or not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance that you want to check the existence.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    1, if such instance exists;
-  </simpara>
-    <simpara>
-    0, if such instance does not exist;
-  </simpara>
-    <simpara>
-    -1, in case of error
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_is_instance</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$sql = <<<EOD
-SELECT host_year, medal, game_date
-FROM game
-WHERE athlete_code IN
-    (SELECT code FROM athlete WHERE name='Thorpe Ian');
-EOD;
-
-$req = cubrid_execute($conn, $sql, CUBRID_INCLUDE_OID);
-$oid = cubrid_current_oid($req);
-
-$res = cubrid_is_instance ($conn, $oid);
-if ($res == 1) {
-    echo "Instance pointed by $oid exists.\n";
-} else if ($res == 0){
-    echo "Instance pointed by $oid doesn't exist.\n";
-} else {
-    echo "error\n";
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Instance pointed by @0|0|0 doesn't exist.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_drop</function></member>
-  <member><function>cubrid_get_class_name</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/cubrid/functions/cubrid-lob-close.xml b/reference/cubrid/functions/cubrid-lob-close.xml
deleted file mode 100644
index 0648917e1f77..000000000000
--- a/reference/cubrid/functions/cubrid-lob-close.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob-close">
- <refnamediv>
-  <refname>cubrid_lob_close</refname>
-  <refpurpose>Close BLOB/CLOB data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob_close</methodname>
-   <methodparam><type>array</type><parameter>lob_identifier_array</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_lob_close</function> is used to close all BLOB/CLOB
-   returned from <function>cubrid_lob_get</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>lob_identifier_array</parameter></term>
- <listitem><simpara>LOB identifier array returned from <function>cubrid_lob_get</function>.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob_close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect ("localhost", 33000, "demodb", "dba");
-
-cubrid_execute($conn,"DROP TABLE if exists doc");
-cubrid_execute($conn,"CREATE TABLE doc (id INT, doc_content CLOB)");
-cubrid_execute($conn,"INSERT INTO doc VALUES (5,'hello,cubrid')");
-
-$lobs = cubrid_lob_get($conn, "SELECT doc_content FROM doc WHERE id=5");
-echo "Doc size: ".cubrid_lob_size($lobs[0])." bytes";
-cubrid_lob_export($conn, $lobs[0], "doc_5.txt");
-cubrid_lob_close($lobs);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_lob_get</function></member>
-   <member><function>cubrid_lob_size</function></member>
-   <member><function>cubrid_lob_export</function></member>
-   <member><function>cubrid_lob_send</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/cubrid/functions/cubrid-lob-export.xml b/reference/cubrid/functions/cubrid-lob-export.xml
deleted file mode 100644
index 5d8406d43c41..000000000000
--- a/reference/cubrid/functions/cubrid-lob-export.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob-export">
- <refnamediv>
-  <refname>cubrid_lob_export</refname>
-  <refpurpose>Export BLOB/CLOB data to file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob_export</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_lob_export</function> is used to get BLOB/CLOB data from CUBRID database, and saves its contents to a file.
-   To use this function, you must use <function>cubrid_lob_get</function> first to get BLOB/CLOB info from CUBRID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem><simpara>LOB identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>path_name</parameter></term>
- <listitem><simpara>Path name of the file.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob_export</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect ("localhost", 33000, "demodb", "dba");
-
-cubrid_execute($conn,"DROP TABLE if exists doc");
-cubrid_execute($conn,"CREATE TABLE doc (id INT, doc_content CLOB)");
-cubrid_execute($conn,"INSERT INTO doc VALUES (5,'hello,cubrid')");
-
-$lobs = cubrid_lob_get($conn, "SELECT doc_content FROM doc WHERE id=5");
-echo "Doc size: ".cubrid_lob_size($lobs[0])." bytes";
-cubrid_lob_export($conn, $lobs[0], "doc_5.txt");
-cubrid_lob_close($lobs);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_lob_get</function></member>
-   <member><function>cubrid_lob_close</function></member>
-   <member><function>cubrid_lob_size</function></member>
-   <member><function>cubrid_lob_send</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/cubrid/functions/cubrid-lob-get.xml b/reference/cubrid/functions/cubrid-lob-get.xml
deleted file mode 100644
index 6faf6d2bdcf7..000000000000
--- a/reference/cubrid/functions/cubrid-lob-get.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob-get">
- <refnamediv>
-  <refname>cubrid_lob_get</refname>
-  <refpurpose>Get BLOB/CLOB data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_lob_get</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_lob_get</function> is used to get BLOB/CLOB meta info from CUBRID database,
-   CUBRID gets BLOB/CLOB by executing the SQL statement, and returns all LOBs as a resource array.
-   Be sure that the SQL retrieves only one column and its data type is BLOB or CLOB.
-  </simpara>
-  <simpara>
-   Remember to use <function>cubrid_lob_close</function> to release the LOBs if you don't need it any more.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>sql</parameter></term>
- <listitem><simpara>SQL statement to be executed.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Return an array of LOB resources, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob_get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect ("localhost", 33000, "demodb", "dba");
-
-cubrid_execute($conn,"DROP TABLE if exists doc");
-cubrid_execute($conn,"CREATE TABLE doc (id INT, doc_content CLOB)");
-cubrid_execute($conn,"INSERT INTO doc VALUES (5,'hello,cubrid')");
-
-$lobs = cubrid_lob_get($conn, "SELECT doc_content FROM doc WHERE id=5");
-echo "Doc size: ".cubrid_lob_size($lobs[0])." bytes";
-cubrid_lob_export($conn, $lobs[0], "doc_5.txt");
-cubrid_lob_close($lobs);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_lob_close</function></member>
-   <member><function>cubrid_lob_size</function></member>
-   <member><function>cubrid_lob_export</function></member>
-   <member><function>cubrid_lob_send</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/cubrid/functions/cubrid-lob-send.xml b/reference/cubrid/functions/cubrid-lob-send.xml
deleted file mode 100644
index 0220f7ec6a82..000000000000
--- a/reference/cubrid/functions/cubrid-lob-send.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob-send">
- <refnamediv>
-  <refname>cubrid_lob_send</refname>
-  <refpurpose>Read BLOB/CLOB data and send straight to browser</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob_send</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_lob_send</function> reads BLOB/CLOB data and passes it straight through to the browser.
-   To use this function, you must use <function>cubrid_lob_get</function> first to get BLOB/CLOB info from CUBRID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem><simpara>LOB identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob_send</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect ("localhost", 33000, "demodb", "dba");
-
-cubrid_execute($conn,"DROP TABLE if exists doc");
-cubrid_execute($conn,"CREATE TABLE doc (id INT, doc_content CLOB)");
-cubrid_execute($conn,"INSERT INTO doc VALUES (5,'hello,cubrid')");
-
-$lobs = cubrid_lob_get($conn, "SELECT doc_content FROM doc WHERE id=5");
-
-cubrid_lob_send($conn, $lobs[0]);
-cubrid_lob_close($lobs);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_lob_get</function></member>
-   <member><function>cubrid_lob_close</function></member>
-   <member><function>cubrid_lob_size</function></member>
-   <member><function>cubrid_lob_export</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/cubrid/functions/cubrid-lob-size.xml b/reference/cubrid/functions/cubrid-lob-size.xml
deleted file mode 100644
index ab7261770ad7..000000000000
--- a/reference/cubrid/functions/cubrid-lob-size.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob-size">
- <refnamediv>
-  <refname>cubrid_lob_size</refname>
-  <refpurpose>Get BLOB/CLOB data size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_lob_size</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>cubrid_lob_size</function> is used to get BLOB/CLOB data size.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lob_identifier</parameter></term>
-    <listitem><simpara>LOB identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A string representing LOB data size, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.4.0</entry>
-      <entry>
-       Change return value type from int to string.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob_size</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lobs = cubrid_lob_get($con, "SELECT doc_content FROM doc WHERE doc_id=5");
-echo "Doc size:".cubrid_lob_size($lobs[0]);
-cubrid_lob_export($conn, $lobs[0], "doc_5.txt");
-cubrid_lob_close($lobs);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_lob_get</function></member>
-   <member><function>cubrid_lob_close</function></member>
-   <member><function>cubrid_lob_export</function></member>
-   <member><function>cubrid_lob_send</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/cubrid/functions/cubrid-lob2-bind.xml b/reference/cubrid/functions/cubrid-lob2-bind.xml
deleted file mode 100644
index d79c6015724e..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-bind.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-bind">
- <refnamediv>
-  <refname>cubrid_lob2_bind</refname>
-  <refpurpose>Bind a lob object or a string as a lob object to a prepared statement as parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_bind</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bind_index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>bind_value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>bind_value_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_bind</function> function is used to bind BLOB/CLOB datas
-   to a corresponding question mark placeholder in the SQL statement that was passed
-   to <function>cubrid_prepare</function>. If <parameter>bind_value_type</parameter>
-   is not given, string will be "BLOB" as the default. But if you use
-   <function>cubrid_lob2_new</function> before, <parameter>bind_value_type</parameter>
-   will be consistent with <parameter>type</parameter> in <function>cubrid_lob2_new</function> as the default.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>req_identifier</parameter></term>
-   <listitem>
-    <simpara>Request identifier as a result of <function>cubrid_prepare</function>.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>bind_index</parameter></term>
-   <listitem>
-    <simpara>Location of binding parameters. It starts with 1.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>bind_value</parameter></term>
-   <listitem>
-    <simpara>Actual value for binding.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>bind_value_type</parameter></term>
-   <listitem>
-    <simpara>It must be "BLOB" or "CLOB" and it won't be case-sensitive. If it not be given, the default value is "BLOB".</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Table: test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES (?, ?)");
-
-cubrid_bind($req,1, 3);
-
-$lob = cubrid_lob2_new($conn, 'CLOB');
-cubrid_lob2_bind($req, 2, $lob);
-
-cubrid_execute($req);
-
-cubrid_bind($req, 1, 4);
-
-cubrid_lob2_bind($req, 2, 'CUBRID LOB2 TEST', 'CLOB');
-
-cubrid_execute($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_new</function></member>
-  <member><function>cubrid_lob2_close</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/cubrid/functions/cubrid-lob2-close.xml b/reference/cubrid/functions/cubrid-lob2-close.xml
deleted file mode 100644
index 85bd9b233cb1..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-close.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-close">
- <refnamediv>
-  <refname>cubrid_lob2_close</refname>
-  <refpurpose>Close LOB object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_close</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_close</function> function is used to close LOB object
-   returned from <function>cubrid_lob2_new</function> or got from the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_new</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/cubrid/functions/cubrid-lob2-export.xml b/reference/cubrid/functions/cubrid-lob2-export.xml
deleted file mode 100644
index 278c0491d1d9..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-export.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-export">
- <refnamediv>
-  <refname>cubrid_lob2_export</refname>
-  <refpurpose>Export the lob object to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_export</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_export</function> function is used to save the
-   contents of BLOB/CLOB data to a file. To use this function, you must use
-   <function>cubrid_lob2_new</function> or fetch a lob object from CUBRID
-   database first. If the file already exists, the operation will fail.
-   This function will not influence the cursor position of the lob object.
-   It operates the entire lob object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>filename</parameter></term>
-   <listitem>
-    <simpara>File name you want to store BLOB/CLOB data. It also supports the path of the file.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_export</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Table: test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists doc");
-cubrid_execute($conn,"CREATE TABLE doc (id INT, doc_content CLOB)");
-cubrid_execute($conn,"INSERT INTO doc VALUES (5,'hello,cubrid')");
-
-$req = cubrid_prepare($conn, "select * from doc");
-
-cubrid_execute($req);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-
-$row = cubrid_fetch($req, CUBRID_NUM | CUBRID_LOB);
-
-cubrid_lob2_export($row[1], "doc_3.txt");
-
-cubrid_lob2_close($row[1]);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_new</function></member>
-  <member><function>cubrid_lob2_close</function></member>
-  <member><function>cubrid_lob2_import</function></member>
-  <member><function>cubrid_lob2_bind</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/cubrid/functions/cubrid-lob2-import.xml b/reference/cubrid/functions/cubrid-lob2-import.xml
deleted file mode 100644
index 0e837f17085a..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-import.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-import">
- <refnamediv>
-  <refname>cubrid_lob2_import</refname>
-  <refpurpose>Import BLOB/CLOB data from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_import</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_import</function> function is used to save the
-   contents of BLOB/CLOB data from a file. To use this function, you must use
-   <function>cubrid_lob2_new</function> or fetch a lob object from CUBRID database
-   first. If the file does not exist, the operation will fail.
-   This function will not influence the cursor position of the lob object.
-   It operates the entire lob object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>filename</parameter></term>
-   <listitem>
-    <simpara>File name you want to import BLOB/CLOB data. It also supports the path of the file.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_export</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES (?, ?)");
-cubrid_bind($req, 1, 1);
-
-$lob = cubrid_lob2_new($conn, "clob");
-cubrid_lob2_import($lob, "doc_1.txt");
-cubrid_lob2_bind($req, 2, $lob, 'CLOB'); // or cubrid_lob2_bind($req, 2, $lob);
-
-cubrid_execute($req);
-
-cubrid_lob2_close($lob);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_new</function></member>
-  <member><function>cubrid_lob2_close</function></member>
-  <member><function>cubrid_lob2_export</function></member>
-  <member><function>cubrid_lob2_bind</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/cubrid/functions/cubrid-lob2-new.xml b/reference/cubrid/functions/cubrid-lob2-new.xml
deleted file mode 100644
index 12f6a7b53637..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-new.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-new">
- <refnamediv>
-  <refname>cubrid_lob2_new</refname>
-  <refpurpose>Create a lob object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_lob2_new</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>"BLOB"</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_new</function> function is used to create a lob object (both BLOB and CLOB).
-   This function should be used before you bind a lob object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem>
-    <simpara>Connection identifier. If the connection identifier is not specified,
-     the last connection opened by <function>cubrid_connect</function> or
-     <function>cubrid_connect_with_url</function> is assumed.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>type</parameter></term>
-   <listitem>
-    <simpara>It may be "BLOB" or "CLOB", it won't be case-sensitive. The default value is "BLOB".</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Lob identifier when it is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_close</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/cubrid/functions/cubrid-lob2-read.xml b/reference/cubrid/functions/cubrid-lob2-read.xml
deleted file mode 100644
index 1c2c05fda076..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-read.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-read">
- <refnamediv>
-  <refname>cubrid_lob2_read</refname>
-  <refpurpose>Read from BLOB/CLOB data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_lob2_read</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_read</function> function reads <parameter>len</parameter> bytes from the
-   LOB data and returns the bytes read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>len</parameter></term>
-   <listitem>
-    <simpara>Length from buffer you want to read from the lob data.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns the contents as a string, &false; when there is no more data, or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_read</function> example 1</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "public", "");
-
-$req = cubrid_execute($conn, "select * from test_lob");
-
-$row = cubrid_fetch_row($req, CUBRID_LOB);
-
-print "position now is " . cubrid_lob2_tell($row[1]) . "\n";
-
-cubrid_lob2_seek($row[1], 10, CUBRID_CURSOR_FIRST);
-
-print "\nposition after moving farword is " . cubrid_lob2_tell($row[1]) . "\n";
-
-$data = cubrid_lob2_read($row[1], 12);
-
-print "\nposition after reading is " . cubrid_lob2_tell($row[1]) . "\n";
-
-print $data . "\n";
-
-cubrid_lob2_seek($row[1], 5, CUBRID_CURSOR_CURRENT);
-
-print "\nposition after moving again is " . cubrid_lob2_tell($row[1]) . "\n";
-
-$data = cubrid_lob2_read($row[1], 20);
-print $data . "\n";
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>cubrid_lob2_read</function> example 2</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-$req = cubrid_execute($conn, "select * from test_lob");
-
-$row = cubrid_fetch_row($req, CUBRID_LOB);
-
-while (true) {
-    if ($data = cubrid_lob2_read($row[1], 1024)) {
-        print $data . "\n";
-    }
-    elseif ($data === false) {
-        print "There is no more data\n";
-        break;
-    }
-    else {
-        print "There must some errors\n";
-        break;
-    }
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-seek.xml b/reference/cubrid/functions/cubrid-lob2-seek.xml
deleted file mode 100644
index 3af4192ea5a3..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-seek.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-seek">
- <refnamediv>
-  <refname>cubrid_lob2_seek</refname>
-  <refpurpose>Move the cursor of a lob object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_seek</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>origin</parameter><initializer>CUBRID_CURSOR_CURRENT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_seek</function> function is used to move the cursor
-   position of a lob object by the value set in the <parameter>offset</parameter>
-   argument, to the direction set in the <parameter>origin</parameter> argument.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>offset</parameter></term>
-   <listitem>
-    <simpara>Number of units you want to move the cursor.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>origin</parameter></term>
-   <listitem>
-    <simpara>This parameter can be the following values:</simpara>
-    <simpara>CUBRID_CURSOR_FIRST: move forward from the first beginning.</simpara>
-    <simpara>CUBRID_CURSOR_CURRENT: move forward or backward from the current position.</simpara>
-    <simpara>CUBRID_CURSOR_LAST: move backward at the end of LOB object.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_seek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES(2, ?)");
-
-$lob = cubrid_lob2_new($conn, 'CLOB');
-$len = cubrid_lob2_write($lob, "Hello world");
-
-cubrid_lob2_seek($lob, 0, CUBRID_CURSOR_LAST);
-cubrid_lob2_write($lob, "beautiful");
-
-cubrid_lob2_seek($lob, 15, CUBRID_CURSOR_FIRST);
-$data = cubrid_lob2_read($lob, 5);
-
-echo $data."\n";
-
-cubrid_lob2_bind($req, 1, $lob);
-cubrid_execute($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-seek64.xml b/reference/cubrid/functions/cubrid-lob2-seek64.xml
deleted file mode 100644
index 9561317d7ea1..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-seek64.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-seek64">
- <refnamediv>
-  <refname>cubrid_lob2_seek64</refname>
-  <refpurpose>Move the cursor of a lob object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_seek64</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>origin</parameter><initializer>CUBRID_CURSOR_CURRENT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_seek64</function> function is used to move the cursor
-   position of a lob object by the value set in the <parameter>offset</parameter>
-   argument, to the direction set in the <parameter>origin</parameter> argument.
-   If the <parameter>offset</parameter> you want to move is larger than an integer
-   data can be stored, you can use this function.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <note>
-  <simpara>
-   If you use this function to move the cursor position of the lob object, you should pass <parameter>offset</parameter> as a string.
-  </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>offset</parameter></term>
-   <listitem>
-    <simpara>Number of units you want to move the cursor.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>origin</parameter></term>
-   <listitem>
-    <simpara>This parameter can be the following values:</simpara>
-    <simpara>CUBRID_CURSOR_FIRST: move forward from the first beginning.</simpara>
-    <simpara>CUBRID_CURSOR_CURRENT: move forward or backward from the current position.</simpara>
-    <simpara>CUBRID_CURSOR_LAST: move backward at the end of LOB object.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_seek64</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-// Data length of doc_1.txt should be greater than 20101029056306120215.
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES (?, ?)");
-cubrid_bind($req, 1, 1);
-
-$lob = cubrid_lob2_new($conn, "clob");
-cubrid_lob2_import($lob, "doc_1.txt");
-cubrid_lob2_bind($req, 2, $lob, 'CLOB'); // or cubrid_lob2_bind($req, 2, $lob);
-
-cubrid_execute($req);
-
-cubrid_lob2_close($lob);
-
-$req = cubrid_execute($conn, "select * from test_lob");
-$row = cubrid_fetch_row($req, CUBRID_LOB);
-$lob = $row[1];
-
-cubrid_lob2_seek64($lob, "20101029056306120215", CUBRID_CURSOR_FIRST);
-$data = cubrid_lob2_read($lob, 20);
-echo $data."\n";
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-size.xml b/reference/cubrid/functions/cubrid-lob2-size.xml
deleted file mode 100644
index 183d27f72fda..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-size.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-size">
- <refnamediv>
-  <refname>cubrid_lob2_size</refname>
-  <refpurpose>Get a lob object's size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_lob2_size</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_size</function> function is used to get the size of a lob object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   It will return the size of the LOB object when it processes successfully,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-size64.xml b/reference/cubrid/functions/cubrid-lob2-size64.xml
deleted file mode 100644
index 7f0b966ab2ae..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-size64.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-size64">
- <refnamediv>
-  <refname>cubrid_lob2_size64</refname>
-  <refpurpose>Get a lob object's size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_lob2_size64</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_size64</function> function is used to get the
-   size of a lob object.  If the size of a lob object is larger than an
-   integer data can be stored, you can use this function and it will return
-   the size as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   It will return the size of the LOB object as a string when it processes successfully,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</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/cubrid/functions/cubrid-lob2-tell.xml b/reference/cubrid/functions/cubrid-lob2-tell.xml
deleted file mode 100644
index ddf413fb2403..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-tell.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-tell">
- <refnamediv>
-  <refname>cubrid_lob2_tell</refname>
-  <refpurpose>Tell the cursor position of the LOB object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_lob2_tell</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_tell</function> function is used to tell the cursor position of the LOB object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    It will return the cursor position on the LOB object when it processes successfully,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-tell64.xml b/reference/cubrid/functions/cubrid-lob2-tell64.xml
deleted file mode 100644
index 224a46ae55de..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-tell64.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-tell64">
- <refnamediv>
-  <refname>cubrid_lob2_tell64</refname>
-  <refpurpose>Tell the cursor position of the LOB object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_lob2_tell64</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_tell64</function> function is used to tell the
-   cursor position of the LOB object. If the size of a lob object is larger
-   than an integer data can be stored, you can use this function and it will
-   return the position information as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    It will return the cursor position on the LOB object as a string when it processes successfully,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_write</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lob2-write.xml b/reference/cubrid/functions/cubrid-lob2-write.xml
deleted file mode 100644
index 2383fd6946ed..000000000000
--- a/reference/cubrid/functions/cubrid-lob2-write.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lob2-write">
- <refnamediv>
-  <refname>cubrid_lob2_write</refname>
-  <refpurpose>Write to a lob object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lob2_write</methodname>
-   <methodparam><type>resource</type><parameter>lob_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>buf</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_lob2_write</function> function reads as much as data
-   from <parameter>buf</parameter> and stores it to the LOB object. Note that
-   this function can only append characters now.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>lob_identifier</parameter></term>
-   <listitem>
-    <simpara>Lob identifier as a result of <function>cubrid_lob2_new</function> or get from the result set.</simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>buf</parameter></term>
-   <listitem>
-    <simpara>Data that need to be written to the lob object.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lob2_write</function> example 1</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES(2, ?)");
-
-$lob = cubrid_lob2_new($conn, 'CLOB');
-$len = cubrid_lob2_write($lob, "Hello world");
-
-cubrid_lob2_bind($req, 1, $lob);
-cubrid_execute($req);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>cubrid_lob2_write</function> example 2</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// test_lob (id INT, contents CLOB)
-
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba", "");
-
-cubrid_execute($conn,"DROP TABLE if exists test_lob");
-cubrid_execute($conn,"CREATE TABLE test_lob (id INT, contents CLOB)");
-
-$req = cubrid_prepare($conn, "INSERT INTO test_lob VALUES(1, ?)");
-$lob1 = cubrid_lob2_new($conn, 'CLOB');
-$len = cubrid_lob2_write($lob1, "cubrid php driver");
-cubrid_lob2_bind($req, 1, $lob1);
-cubrid_execute($req);
-
-$req = cubrid_execute($conn, "select * from test_lob");
-
-$row = cubrid_fetch_row($req, CUBRID_LOB);
-$lob2 = $row[1];
-cubrid_lob2_seek($lob2, 0, CUBRID_CURSOR_LAST);
-
-$pos = cubrid_lob2_tell($lob2);
-print "pos before write: $pos\n";
-
-cubrid_lob2_write($lob2, "Hello world");
-
-$pos = cubrid_lob2_tell($lob2);
-print "pos after write: $pos\n";
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lob2_read</function></member>
-  <member><function>cubrid_lob2_seek</function></member>
-  <member><function>cubrid_lob2_seek64</function></member>
-  <member><function>cubrid_lob2_tell</function></member>
-  <member><function>cubrid_lob2_tell64</function></member>
-  <member><function>cubrid_lob2_size</function></member>
-  <member><function>cubrid_lob2_size64</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/cubrid/functions/cubrid-lock-read.xml b/reference/cubrid/functions/cubrid-lock-read.xml
deleted file mode 100644
index 5c820a05d0b0..000000000000
--- a/reference/cubrid/functions/cubrid-lock-read.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lock-read">
- <refnamediv>
-  <refname>cubrid_lock_read</refname>
-  <refpurpose>Set a read lock on the given OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lock_read</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_lock_read</function> function is used to put read
-    lock on the instance pointed by given <parameter>oid</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance that you want to put read lock on.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lock_read</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(2, {4,5,7}, {44,55,66,666}, 'b')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-cubrid_lock_read($conn, $oid);
-
-$attr = cubrid_get($conn, $oid, "b");
-var_dump($attr);
-
-$attr = cubrid_get($conn, $oid);
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-string(9) "{1, 2, 3}"
-array(4) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  array(3) {
-    [0]=>
-    string(1) "1"
-    [1]=>
-    string(1) "2"
-    [2]=>
-    string(1) "3"
-  }
-  ["c"]=>
-  array(4) {
-    [0]=>
-    string(2) "11"
-    [1]=>
-    string(2) "22"
-    [2]=>
-    string(2) "33"
-    [3]=>
-    string(3) "333"
-  }
-  ["d"]=>
-  string(10) "a         "
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lock_write</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/cubrid/functions/cubrid-lock-write.xml b/reference/cubrid/functions/cubrid-lock-write.xml
deleted file mode 100644
index a141af74c23e..000000000000
--- a/reference/cubrid/functions/cubrid-lock-write.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-lock-write">
- <refnamediv>
-  <refname>cubrid_lock_write</refname>
-  <refpurpose>Set a write lock on the given OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_lock_write</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_lock_write</function> function is used to put write
-    lock on the instance pointed by the given <parameter>oid</parameter>.
-  </simpara>
-</refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance that you want to put write lock on.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_lock_write</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(2, {4,5,7}, {44,55,66,666}, 'b')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-cubrid_lock_write($conn, $oid);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_put($conn, $oid, "b", array(2, 4, 8));
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-array(3) {
-  [0]=>
-  string(1) "2"
-  [1]=>
-  string(1) "4"
-  [2]=>
-  string(1) "8"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_lock_read</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/cubrid/functions/cubrid-move-cursor.xml b/reference/cubrid/functions/cubrid-move-cursor.xml
deleted file mode 100644
index 217faa8be594..000000000000
--- a/reference/cubrid/functions/cubrid-move-cursor.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-move-cursor">
- <refnamediv>
-  <refname>cubrid_move_cursor</refname>
-  <refpurpose>Move the cursor in the result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_move_cursor</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>origin</parameter><initializer>CUBRID_CURSOR_CURRENT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_move_cursor</function> function is used to move the
-    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 <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.
-  </simpara>
-  <simpara>
-    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 <constant>CUBRID_NO_MORE_DATA</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>req_identifier</parameter></term>
- <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>offset</parameter></term>
- <listitem><simpara>Number of units you want to move the cursor.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>origin</parameter></term>
- <listitem><simpara>Location where you want to move the cursor from <constant>CUBRID_CURSOR_FIRST</constant>, <constant>CUBRID_CURSOR_CURRENT</constant>, <constant>CUBRID_CURSOR_LAST</constant>.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_move_cursor</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("127.0.0.1", 33000, "demodb", "dba");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_LAST);
-
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_CURRENT);
-$result = cubrid_fetch_row($req);
-var_dump($result);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  string(1) "G"
-  [1]=>
-  string(4) "Gold"
-}
-array(2) {
-  [0]=>
-  string(1) "X"
-  [1]=>
-  string(5) "Mixed"
-}
-array(2) {
-  [0]=>
-  string(1) "M"
-  [1]=>
-  string(3) "Man"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</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/cubrid/functions/cubrid-next-result.xml b/reference/cubrid/functions/cubrid-next-result.xml
deleted file mode 100644
index e66ce0f5e54e..000000000000
--- a/reference/cubrid/functions/cubrid-next-result.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-next-result">
- <refnamediv>
-  <refname>cubrid_next_result</refname>
-  <refpurpose>Get result of next query when executing multiple SQL statements</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_next_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_next_result</function> function is used to get
-    results of next query if multiple SQL statements are executed and
-   <constant>CUBRID_EXEC_QUERY_ALL</constant> flag is set upon
-    <function>cubrid_execute</function>.
-   </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>result</parameter></term>
- <listitem><simpara><parameter>result</parameter> comes from a call to <function>cubrid_execute</function></simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_next_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("127.0.0.1", 33000, "demodb", "dba");
-
-$sql_stmt = "SELECT * FROM code; SELECT * FROM history WHERE host_year=2004 AND event_code=20281";
-$res = cubrid_execute($conn, $sql_stmt, CUBRID_EXEC_QUERY_ALL);
-
-get_result_info($res);
-cubrid_next_result($res);
-get_result_info($res);
-
-function get_result_info($req)
-{
-    printf("\n------------ get_result_info --------------------\n");
-
-    $row_num = cubrid_num_rows($req);
-    $col_num = cubrid_num_cols($req);
-
-    $column_name_list = cubrid_column_names($req);
-    $column_type_list = cubrid_column_types($req);
-
-    $column_last_name = cubrid_field_name($req, $col_num - 1);
-    $column_last_table = cubrid_field_table($req, $col_num - 1);
-
-    $column_last_type = cubrid_field_type($req, $col_num - 1);
-    $column_last_len = cubrid_field_len($req, $col_num - 1);
-
-    $column_1_flags = cubrid_field_flags($req, 1);
-
-    printf("%-30s %d\n", "Row count:", $row_num);
-    printf("%-30s %d\n", "Column count:", $col_num);
-    printf("\n");
-
-    printf("%-30s %-30s %-15s\n", "Column Names", "Column Types", "Column Len");
-    printf("------------------------------------------------------------------------------\n");
-
-    $size = count($column_name_list);
-    for($i = 0; $i < $size; $i++) {
-        $column_len = cubrid_field_len($req, $i);
-        printf("%-30s %-30s %-15s\n", $column_name_list[$i], $column_type_list[$i], $column_len);
-    }
-    printf("\n\n");
-
-    printf("%-30s %s\n", "Last Column Name:", $column_last_name);
-    printf("%-30s %s\n", "Last Column Table:", $column_last_table);
-    printf("%-30s %s\n", "Last Column Type:", $column_last_type);
-    printf("%-30s %d\n", "Last Column Len:", $column_last_len);
-    printf("%-30s %s\n", "Second Column Flags:", $column_1_flags);
-
-    printf("\n\n");
-}
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
------------- get_result_info --------------------
-Row count:                     6
-Column count:                  2
-
-Column Names                   Column Types                   Column Len
-------------------------------------------------------------------------------
-s_name                         char                           1
-f_name                         varchar                        6
-
-
-Last Column Name:              f_name
-Last Column Table:             code
-Last Column Type:              varchar
-Last Column Len:               6
-Second Column Flags:
-
-
-
------------- get_result_info --------------------
-Row count:                     4
-Column count:                  5
-
-Column Names                   Column Types                   Column Len
-------------------------------------------------------------------------------
-event_code                     integer                        11
-athlete                        varchar                        40
-host_year                      integer                        11
-score                          varchar                        10
-unit                           varchar                        5
-
-
-Last Column Name:              unit
-Last Column Table:             history
-Last Column Type:              varchar
-Last Column Len:               5
-Second Column Flags:           not_null primary_key unique_key
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-    <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_execute</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/cubrid/functions/cubrid-num-cols.xml b/reference/cubrid/functions/cubrid-num-cols.xml
deleted file mode 100644
index abd1ec83c1bc..000000000000
--- a/reference/cubrid/functions/cubrid-num-cols.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-num-cols">
- <refnamediv>
-  <refname>cubrid_num_cols</refname>
-  <refpurpose>Return the number of columns in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_num_cols</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    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 <literal>SELECT</literal> statement.
-  </simpara>
-</refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>result</parameter></term>
- <listitem><simpara>Result.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Number of columns, when process is successful.
-  </simpara>
-  <simpara>
-    &false;, if SQL statement is not SELECT.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_num_cols</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-
-$row_num = cubrid_num_rows($req);
-$col_num = cubrid_num_cols($req);
-
-printf("Row Num: %d\nColumn Num: %d\n", $row_num, $col_num);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Row Num: 6
-Column Num: 2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_execute</function></member>
-   <member><function>cubrid_num_rows</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/cubrid/functions/cubrid-num-rows.xml b/reference/cubrid/functions/cubrid-num-rows.xml
deleted file mode 100644
index 632c3cf2de7a..000000000000
--- a/reference/cubrid/functions/cubrid-num-rows.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-num-rows">
- <refnamediv>
-  <refname>cubrid_num_rows</refname>
-  <refpurpose>Get the number of rows in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   Note: The <function>cubrid_num_rows</function> function can only be used
-   for synchronous query; it returns 0 when it is used for asynchronous query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>result</parameter></term>
- <listitem><simpara><parameter>result</parameter> comes from a call to
-   <function>cubrid_execute</function>, <function>cubrid_query</function> and
-   <function>cubrid_prepare</function></simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Number of rows, when process is successful.
-  </simpara>
-  <simpara>
-    0 when the query was done in async mode.
-  </simpara>
-  <simpara>
-    -1, if SQL statement is not SELECT.
-  </simpara>
-  <simpara>
-   &false; when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_num_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$req = cubrid_execute($conn, "SELECT * FROM code");
-
-$row_num = cubrid_num_rows($req);
-$col_num = cubrid_num_cols($req);
-
-printf("Row Num: %d\nColumn Num: %d\n", $row_num, $col_num);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Row Num: 6
-Column Num: 2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-    <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_execute</function></member>
-   <member><function>cubrid_num_cols</function></member>
-   <member><function>cubrid_affected_rows</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/cubrid/functions/cubrid-pconnect-with-url.xml b/reference/cubrid/functions/cubrid-pconnect-with-url.xml
deleted file mode 100644
index 1dc7e387386e..000000000000
--- a/reference/cubrid/functions/cubrid-pconnect-with-url.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-pconnect-with-url">
- <refnamediv>
-  <refname>cubrid_pconnect_with_url</refname>
-  <refpurpose>Open a persistent connection to CUBRID server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_pconnect_with_url</methodname>
-   <methodparam><type>string</type><parameter>conn_url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>userid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Establishes a persistent connection to a CUBRID server.
-  </simpara>
-  <simpara>
-   <function>cubrid_pconnect_with_url</function> acts very much like
-   <function>cubrid_connect_with_url</function> with two major differences.
-  </simpara>
-  <simpara>
-   First, when connecting, the function would first try to find a (persistent)
-   link that's already open with the same host, port, dbname and userid. If
-   one is found, an identifier for it will be returned instead of opening a
-   new connection.
-  </simpara>
-  <simpara>
-   Second, the connection to the SQL server will not be closed when the
-   execution of the script ends.  Instead, the link will remain open for
-   future use (<function>cubrid_close</function> or
-   <function>cubrid_disconnect</function> will not close links established by
-   <function>cubrid_pconnect_with_url</function>).
-  </simpara>
-  <simpara>
-   This type of link is therefore called 'persistent'.
-  </simpara>
-  <simpara>
-   &lt;url&gt; ::= CUBRID:&lt;host&gt;:&lt;db_name&gt;:&lt;db_user&gt;:&lt;db_password&gt;:[?&lt;properties&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= &lt;property&gt; [&amp;&lt;property&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= alhosts=&lt;alternative_hosts&gt;[ &amp;rctime=&lt;time&gt;]
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= login_timeout=&lt;milli_sec&gt;
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= query_timeout=&lt;milli_sec&gt;
-  </simpara>
-  <simpara>
-   &lt;properties&gt; ::= disconnect_on_query_timeout=true|false
-  </simpara>
-  <simpara>
-   &lt;alternative_hosts&gt; ::= &lt;standby_broker1_host&gt;:&lt;port&gt; [,&lt;standby_broker2_host&gt;:&lt;port&gt;]
-  </simpara>
-  <simpara>
-   &lt;host&gt; := HOSTNAME | IP_ADDR
-  </simpara>
-  <simpara>
-   &lt;time&gt; := SECOND
-  </simpara>
-  <simpara>
-   &lt;milli_sec&gt; := MILLI SECOND
-  </simpara>
-  <simplelist>
-   <member>host : A host name or IP address of the master database</member>
-   <member>db_name : A name of the database</member>
-   <member>db_user : A name of the database user</member>
-   <member>db_password : A database user password</member>
-   <member>
-    alhosts : Specifies the broker information of the standby server, which is
-    used for failover when it is impossible to connect to the active server.
-    You can specify multiple brokers for failover, and the connection to the brokers
-    is attempted in the order listed in alhosts</member>
-   <member>
-    rctime : An interval between the attempts to connect to the active broker in
-    which failure occurred. After a failure occurs, the system connects to the
-    broker specified by althosts (failover), terminates the transaction, and then
-    attempts to connect to the active broker of the master database at every rctime.
-    The default value is 600 seconds.</member>
-   <member>
-    login_timeout : Timeout value (unit: msec.) for database login. The default
-    value is 0, which means infinite postponement.
-   </member>
-   <member>
-    query_timeout : Timeout value (unit: msec.) for query request. Upon timeout,
-    a message to cancel requesting a query transferred to server is sent. The return
-    value can depend on the disconnect_on_query_timeout configuration; even though the
-    message to cancel a request is sent to server, that request may succeed.
-   </member>
-   <member>
-    disconnect_on_query_timeout : Configures a value whether to immediately return
-    an error of function being executed upon timeout. The default value is false.
-   </member>
-  </simplelist>
-  <note>
-   <simpara>
-    <literal>?</literal> and <literal>:</literal> that are used as identifiers
-    in PHP connection URL can't be included in the password. The following is
-    an example of a password that is invalid to use as connection URL because it contains
-    "<literal>?:</literal>".
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:tdb:dba:12?:?login_timeout=100";
-   </simpara>
-   <simpara>
-    Passwords that contain <literal>?</literal> or <literal>:</literal> may be
-    passed as a separate parameter.
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:tbd:::?login_timeout=100";
-   </simpara>
-   <simpara>
-    $conn = cubrid_pconnect_with_url ($url, "dba", "12?");
-   </simpara>
-   <simpara>
-    If user or password is empty,you can't delete "<literal>:</literal>",the following is
-    an example.
-   </simpara>
-   <simpara>
-    $url = "CUBRID:localhost:33000:demodb:::";
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn_url</parameter></term>
-    <listitem><simpara>A character string that contains server connection information.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>userid</parameter></term>
-    <listitem><simpara>User name for the database.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passwd</parameter></term>
-    <listitem><simpara>User password.</simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Connection identifier, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_pconnect_with_url</function> url without properties example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn_url = "CUBRID:127.0.0.1:33000:demodb:dba::";
-$con = cubrid_pconnect_with_url ($conn_url);
-
-if ($con) {
-   echo "connected successfully";
-   cubrid_execute($con, "create table person(id int,name char(16))");
-   $req =cubrid_execute($con, "insert into person values(1,'James')");
-
-   if ($req) {
-      cubrid_close_request ($req);
-      cubrid_commit ($con);
-   } else {
-      cubrid_rollback ($con);
-   }
-   cubrid_disconnect ($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>cubrid_pconnect_with_url</function> url with properties example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn_url = "CUBRID:127.0.0.1:33000:demodb:dba::?althost=10.34.63.132:33088&rctime=100";
-$con = cubrid_pconnect_with_url ($conn_url);
-
-if ($con) {
-   echo "connected successfully";
-   $req =cubrid_execute($con, "insert into person values(1,'James')");
-
-   if ($req) {
-      cubrid_close_request ($req);
-      cubrid_commit ($con);
-   } else {
-      cubrid_rollback ($con);
-   }
-   cubrid_disconnect ($con);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_connect</function></member>
-   <member><function>cubrid_connect_with_url</function></member>
-   <member><function>cubrid_pconnect</function></member>
-   <member><function>cubrid_disconnect</function></member>
-   <member><function>cubrid_close</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/cubrid/functions/cubrid-pconnect.xml b/reference/cubrid/functions/cubrid-pconnect.xml
deleted file mode 100644
index 84b9bf239f8e..000000000000
--- a/reference/cubrid/functions/cubrid-pconnect.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-pconnect">
- <refnamediv>
-  <refname>cubrid_pconnect</refname>
-  <refpurpose>Open a persistent connection to a CUBRID server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_pconnect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dbname</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>userid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passwd</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Establishes a persistent connection to a CUBRID server.
-  </simpara>
-  <simpara>
-   <function>cubrid_pconnect</function> acts very much like
-   <function>cubrid_connect</function> with two major differences.
-  </simpara>
-  <simpara>
-   First, when connecting, the function would first try to find a (persistent)
-   link that's already open with the same host, port, dbname and userid. If
-   one is found, an identifier for it will be returned instead of opening a
-   new connection.
-  </simpara>
-  <simpara>
-   Second, the connection to the SQL server will not be closed when the
-   execution of the script ends.  Instead, the link will remain open for
-   future use (<function>cubrid_close</function> or
-   <function>cubrid_disconnect</function> will not close links established by
-   <function>cubrid_pconnect</function>).
-  </simpara>
-  <simpara>
-   This type of link is therefore called 'persistent'.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>host</parameter></term>
-   <listitem><simpara>Host name or IP address of CUBRID CAS server.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>port</parameter></term>
-   <listitem><simpara>Port number of CUBRID CAS server (BROKER_PORT configured in $CUBRID/conf/cubrid_broker.conf).</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>dbname</parameter></term>
-   <listitem><simpara>Name of database.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>userid</parameter></term>
-   <listitem><simpara>User name for the database.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>passwd</parameter></term>
-   <listitem><simpara>User password.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Connection identifier, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_pconnect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_pconnect("localhost", 33000, "demodb", "dba");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_connect</function></member>
-  <member><function>cubrid_connect_with_url</function></member>
-  <member><function>cubrid_pconnect_with_url</function></member>
-  <member><function>cubrid_disconnect</function></member>
-  <member><function>cubrid_close</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/cubrid/functions/cubrid-prepare.xml b/reference/cubrid/functions/cubrid-prepare.xml
deleted file mode 100644
index ed9878f97cf8..000000000000
--- a/reference/cubrid/functions/cubrid-prepare.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-prepare">
- <refnamediv>
-  <refname>cubrid_prepare</refname>
-  <refpurpose>Prepare a SQL statement for execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>cubrid_prepare</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>prepare_stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>option</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-      The <function>cubrid_prepare</function> function compiles a SQL statement for a given
-      connection handle and returns a handle that represents the pre-compiled statement.
-  </simpara>
-  <simpara>
-      A prepared statement can be executed several times, which is efficient for repeated
-      execution or for processing long data. Only a single statement can be used, and a
-      parameter can be marked with a question mark (<literal>?</literal>) at the appropriate
-      place in the SQL statement. Add a parameter when binding a value in the
-      <literal>VALUES</literal> clause of an <literal>INSERT</literal> statement or in the
-      <literal>WHERE</literal> clause. Note that a value can be bound to a parameter only by
-      using the <function>cubrid_bind</function> function.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>prepare_stmt</parameter></term>
- <listitem><simpara>Prepare query.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>option</parameter></term>
-   <listitem><simpara>OID return option <constant>CUBRID_INCLUDE_OID</constant>.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Request identifier, if process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_prepare</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb");
-
-$sql = <<<EOD
-SELECT g.event_code, e.name
-FROM game g
-JOIN event e ON g.event_code=e.code
-WHERE host_year = ? AND event_code NOT IN (SELECT event_code FROM game WHERE host_year=?) GROUP BY event_code;
-EOD;
-
-$req = cubrid_prepare($conn, $sql);
-
-cubrid_bind($req, 1, 2004);
-cubrid_bind($req, 2, 2000);
-cubrid_execute($req);
-
-$row_num = cubrid_num_rows($req);
-printf("There are %d event that exits in 2004 olympic but not in 2000. For example:\n\n", $row_num);
-
-printf("%-15s %s\n", "Event_code", "Event_name");
-printf("----------------------------\n");
-
-$row = cubrid_fetch_assoc($req);
-printf("%-15d %s\n", $row["event_code"], $row["name"]);
-$row = cubrid_fetch_assoc($req);
-printf("%-15d %s\n", $row["event_code"], $row["name"]);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-There are 27 event that exits in 2004 olympic but not in 2000. For example:
-
-Event_code      Event_name
-----------------------------
-20063           +91kg
-20070           64kg
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_execute</function></member>
-   <member><function>cubrid_bind</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/cubrid/functions/cubrid-put.xml b/reference/cubrid/functions/cubrid-put.xml
deleted file mode 100644
index a8bb2a9a706c..000000000000
--- a/reference/cubrid/functions/cubrid-put.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-put">
- <refnamediv>
-  <refname>cubrid_put</refname>
-  <refpurpose>Update a column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_put</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>attr</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-      The <function>cubrid_put</function> function is used to update an
-      attribute of the instance of the given <parameter>oid</parameter>.
-  </simpara>
-  <simpara>
-      You can update single attribute by using string data type to set
-      <parameter>attr</parameter>.  In such case, you can use integer,
-      floating point or string type data for the <parameter>value</parameter>
-      argument. To update multiple number of attributes, you can disregard the
-      <parameter>attr</parameter> argument, and set
-      <parameter>value</parameter> argument with associative array data type.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>oid</parameter></term>
-   <listitem><simpara>OID of the instance that you want to update.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>attr</parameter></term>
-   <listitem><simpara>Name of the attribute that you want to update.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>value</parameter></term>
-   <listitem><simpara>New value that you want to assign to the attribute.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_put</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(2, {4,5,7}, {44,55,66,666}, 'b')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_put($conn, $oid, "b", array(2, 4, 8));
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-array(3) {
-  [0]=>
-  string(1) "2"
-  [1]=>
-  string(1) "4"
-  [2]=>
-  string(1) "8"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_get</function></member>
-   <member><function>cubrid_set_add</function></member>
-   <member><function>cubrid_set_drop</function></member>
-   <member><function>cubrid_seq_insert</function></member>
-   <member><function>cubrid_seq_drop</function></member>
-   <member><function>cubrid_seq_put</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/cubrid/functions/cubrid-rollback.xml b/reference/cubrid/functions/cubrid-rollback.xml
deleted file mode 100644
index ba2d08998dab..000000000000
--- a/reference/cubrid/functions/cubrid-rollback.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-rollback">
- <refnamediv>
-  <refname>cubrid_rollback</refname>
-  <refpurpose>Roll back a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_rollback</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_rollback</function> function executes rollback on the
-    transaction pointed by <parameter>conn_identifier</parameter>, currently in
-    progress.
-  </simpara>
-  <simpara>
-    Connection to server is closed after calling
-    <function>cubrid_rollback</function>. Connection handle, however, is
-    still valid.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_rollback</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("127.0.0.1", 33000, "demodb", "dba");
-cubrid_set_autocommit($conn,false);
-
-@cubrid_execute($conn, "DROP TABLE publishers");
-
-$sql = <<<EOD
-CREATE TABLE publishers(
-pub_id CHAR(3),
-pub_name VARCHAR(20),
-city VARCHAR(15),
-state CHAR(2),
-country VARCHAR(15)
-)
-EOD;
-
-if (!cubrid_execute($conn, $sql)) {
-    printf("Error facility: %d\nError code: %d\nError msg: %s\n", cubrid_error_code_facility(), cubrid_error_code(), cubrid_error_msg());
-
-    cubrid_disconnect($conn);
-    exit;
-}
-
-$req = cubrid_prepare($conn, "INSERT INTO publishers VALUES(?, ?, ?, ?, ?)");
-
-$id_list = array("P01", "P02", "P03", "P04");
-$name_list = array("Abatis Publishers", "Core Dump Books", "Schadenfreude Press", "Tenterhooks Press");
-$city_list = array("New York", "San Francisco", "Hamburg", "Berkeley");
-$state_list = array("NY", "CA", NULL, "CA");
-$country_list = array("USA", "USA", "Germany", "USA");
-
-for ($i = 0, $size = count($id_list); $i < $size; $i++) {
-    cubrid_bind($req, 1, $id_list[$i]);
-    cubrid_bind($req, 2, $name_list[$i]);
-    cubrid_bind($req, 3, $city_list[$i]);
-    cubrid_bind($req, 4, $state_list[$i]);
-    cubrid_bind($req, 5, $country_list[$i]);
-
-    if (!($ret = cubrid_execute($req))) {
-        break;
-    }
-}
-
-if (!$ret) {
-    cubrid_rollback($conn);
-} else {
-    cubrid_commit($conn);
-
-    $req = cubrid_execute($conn, "SELECT * FROM publishers");
-    while ($result = cubrid_fetch_assoc($req)) {
-        printf("%-3s %-20s %-15s %-3s %-15s\n",
-            $result["pub_id"], $result["pub_name"], $result["city"], $result["state"], $result["country"]);
-    }
-}
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-P01 Abatis Publishers    New York        NY  USA
-P02 Core Dump Books      San Francisco   CA  USA
-P03 Schadenfreude Press  Hamburg             Germany
-P04 Tenterhooks Press    Berkeley        CA  USA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-   <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_commit</function></member>
-   <member><function>cubrid_disconnect</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/cubrid/functions/cubrid-schema.xml b/reference/cubrid/functions/cubrid-schema.xml
deleted file mode 100644
index 036862df0256..000000000000
--- a/reference/cubrid/functions/cubrid-schema.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-schema">
- <refnamediv>
-  <refname>cubrid_schema</refname>
-  <refpurpose>Get the requested schema information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>cubrid_schema</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>schema_type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>attr_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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>.
-  </simpara>
-
-  <simpara>
-  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.
-  </simpara>
-
-  <table>
-  <title>Result Composition of Each Type</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>Schema</entry>
-      <entry>Column Number</entry>
-      <entry>Column Name</entry>
-      <entry>Value</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>CUBRID_SCH_CLASS</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>0:system class 1:vclass 2:class</entry>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_VCLASS</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>1:vclass</entry>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_QUERY_SPEC</entry>
-      <entry>1</entry>
-      <entry>QUERY_SPEC</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_ATTRIBUTE / CUBRID_SCH_CLASS_ATTRIBUTE</entry>
-      <entry>1</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>DOMAIN</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>SCALE</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>PRECISION</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>INDEXED</entry>
-      <entry>1:indexed</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>NOT NULL</entry>
-      <entry>1:not null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>SHARED</entry>
-      <entry>1:shared</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>UNIQUE</entry>
-      <entry>1:unique</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>DEFAULT</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>10</entry>
-      <entry>ATTR_ORDER</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>11</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>12</entry>
-      <entry>SOURCE_CLASS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>13</entry>
-      <entry>IS_KEY</entry>
-      <entry>1:key</entry>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_METHOD / CUBRID_SCH_CLASS_METHOD</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>RET_DOMAIN</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>ARG_DOMAIN</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_METHOD_FILE</entry>
-      <entry>1</entry>
-      <entry>METHOD_FILE</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_SUPERCLASS / CUBRID_SCH_DIRECT_SUPER_CLASS / CUBRID_SCH_SUBCLASS</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>0:system class 1:vclass 2:class</entry>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_CONSTRAINT</entry>
-      <entry>1</entry>
-      <entry>TYPE</entry>
-      <entry>0:unique 1:index 2:reverse unique 3:reverse index</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>NUM_PAGES</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>NUM_KEYS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>PRIMARY_KEY</entry>
-      <entry>1:primary key</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>KEY_ORDER</entry>
-      <entry>base:1</entry>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_TRIGGER</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>STATUS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>EVENT</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>TARGET_CLASS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>TARGET_ATTR</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>ACTION_TIME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>ACTION</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>PRIORITY</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>CONDITION_TIME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>10</entry>
-      <entry>CONDITION</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_CLASS_PRIVILEGE / CUBRID_SCH_ATTR_PRIVILEGE</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME / ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>PRIVILEGE</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>GRANTABLE</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_PRIMARY_KEY</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>KEY_SEQ</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>KEY_NAME</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>CUBRID_SCH_IMPORTED_KEYS / CUBRID_SCH_EXPORTED_KEYS / CUBRID_SCH_CROSS_REFERENCE</entry>
-      <entry>1</entry>
-      <entry>PKTABLE_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>PKCOLUMN_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>FKTABLE_NAME</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>FKCOLUMN_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>KEY_SEQ</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>UPDATE_ACTION</entry>
-      <entry>0:cascade 1:restrict 2:no action 3:set null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>DELETE_ACTION</entry>
-      <entry>0:cascade 1:restrict 2:no action 3:set null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>FK_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>PK_NAME</entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>schema_type</parameter></term>
- <listitem><simpara>Schema data that you want to know.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>class_name</parameter></term>
- <listitem><simpara>Class you want to know the schema of.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Attribute you want to know the schema of.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Array containing the schema information, when process is successful,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.3.1</entry>
-      <entry>
-       Change return value: when process is unsuccessful, return false, not -1.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_schema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-printf("\n--- Primary Key ---\n");
-$pk = cubrid_schema($conn, CUBRID_SCH_PRIMARY_KEY, "game");
-var_dump($pk);
-
-printf("\n--- Foreign Keys ---\n");
-$fk = cubrid_schema($conn, CUBRID_SCH_IMPORTED_KEYS, "game");
-var_dump($fk);
-
-printf("\n--- Column Attribute ---\n");
-$attr = cubrid_schema($conn, CUBRID_SCH_ATTRIBUTE, "stadium", "area");
-var_dump($attr);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-
---- Primary Key ---
-array(3) {
-  [0]=>
-  array(4) {
-    ["CLASS_NAME"]=>
-    string(4) "game"
-    ["ATTR_NAME"]=>
-    string(12) "athlete_code"
-    ["KEY_SEQ"]=>
-    string(1) "3"
-    ["KEY_NAME"]=>
-    string(41) "pk_game_host_year_event_code_athlete_code"
-  }
-  [1]=>
-  array(4) {
-    ["CLASS_NAME"]=>
-    string(4) "game"
-    ["ATTR_NAME"]=>
-    string(10) "event_code"
-    ["KEY_SEQ"]=>
-    string(1) "2"
-    ["KEY_NAME"]=>
-    string(41) "pk_game_host_year_event_code_athlete_code"
-  }
-  [2]=>
-  array(4) {
-    ["CLASS_NAME"]=>
-    string(4) "game"
-    ["ATTR_NAME"]=>
-    string(9) "host_year"
-    ["KEY_SEQ"]=>
-    string(1) "1"
-    ["KEY_NAME"]=>
-    string(41) "pk_game_host_year_event_code_athlete_code"
-  }
-}
-
---- Foreign Keys ---
-array(2) {
-  [0]=>
-  array(9) {
-    ["PKTABLE_NAME"]=>
-    string(7) "athlete"
-    ["PKCOLUMN_NAME"]=>
-    string(4) "code"
-    ["FKTABLE_NAME"]=>
-    string(4) "game"
-    ["FKCOLUMN_NAME"]=>
-    string(12) "athlete_code"
-    ["KEY_SEQ"]=>
-    string(1) "1"
-    ["UPDATE_RULE"]=>
-    string(1) "1"
-    ["DELETE_RULE"]=>
-    string(1) "1"
-    ["FK_NAME"]=>
-    string(20) "fk_game_athlete_code"
-    ["PK_NAME"]=>
-    string(15) "pk_athlete_code"
-  }
-  [1]=>
-  array(9) {
-    ["PKTABLE_NAME"]=>
-    string(5) "event"
-    ["PKCOLUMN_NAME"]=>
-    string(4) "code"
-    ["FKTABLE_NAME"]=>
-    string(4) "game"
-    ["FKCOLUMN_NAME"]=>
-    string(10) "event_code"
-    ["KEY_SEQ"]=>
-    string(1) "1"
-    ["UPDATE_RULE"]=>
-    string(1) "1"
-    ["DELETE_RULE"]=>
-    string(1) "1"
-    ["FK_NAME"]=>
-    string(18) "fk_game_event_code"
-    ["PK_NAME"]=>
-    string(13) "pk_event_code"
-  }
-}
-
---- Column Attribute ---
-array(1) {
-  [0]=>
-  array(13) {
-    ["ATTR_NAME"]=>
-    string(4) "area"
-    ["DOMAIN"]=>
-    string(1) "7"
-    ["SCALE"]=>
-    string(1) "2"
-    ["PRECISION"]=>
-    string(2) "10"
-    ["INDEXED"]=>
-    string(1) "0"
-    ["NON_NULL"]=>
-    string(1) "0"
-    ["SHARED"]=>
-    string(1) "0"
-    ["UNIQUE"]=>
-    string(1) "0"
-    ["DEFAULT"]=>
-    NULL
-    ["ATTR_ORDER"]=>
-    string(1) "4"
-    ["CLASS_NAME"]=>
-    string(7) "stadium"
-    ["SOURCE_CLASS"]=>
-    string(7) "stadium"
-    ["IS_KEY"]=>
-    string(1) "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/cubrid/functions/cubrid-seq-drop.xml b/reference/cubrid/functions/cubrid-seq-drop.xml
deleted file mode 100644
index b281c0a0f2b8..000000000000
--- a/reference/cubrid/functions/cubrid-seq-drop.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-seq-drop">
- <refnamediv>
-  <refname>cubrid_seq_drop</refname>
-  <refpurpose>Delete an element from sequence type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_seq_drop</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_seq_drop</function> function is used to delete an
-    element you request from the given sequence type attribute in the
-    database.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance you want to work with.</simpara></listitem>
-  </varlistentry>
-      <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute that you want to delete an element from.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>index</parameter></term>
- <listitem><simpara>Index of the element that you want to delete (1-based).</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_seq_drop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c sequence(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_seq_drop($conn, $oid, "c", 4);
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  string(2) "11"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-  [3]=>
-  string(3) "333"
-}
-array(3) {
-  [0]=>
-  string(2) "11"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_seq_insert</function></member>
-   <member><function>cubrid_seq_put</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/cubrid/functions/cubrid-seq-insert.xml b/reference/cubrid/functions/cubrid-seq-insert.xml
deleted file mode 100644
index 62e0ab25aa21..000000000000
--- a/reference/cubrid/functions/cubrid-seq-insert.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-seq-insert">
- <refnamediv>
-  <refname>cubrid_seq_insert</refname>
-  <refpurpose>Insert an element to a sequence type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_seq_insert</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>string</type><parameter>seq_element</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_seq_insert</function> function is used to insert an
-    element to a sequence type attribute in a requested location.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance you want to work with.</simpara></listitem>
-  </varlistentry>
-      <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute you want to insert an instance to.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>index</parameter></term>
- <listitem><simpara>Location of the element, you want to insert the element to (1-based).</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>seq_element</parameter></term>
- <listitem><simpara>Content of the element that you want to insert.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_seq_insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c sequence(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_seq_insert($conn, $oid, "c", 5, "44");
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  string(2) "11"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-  [3]=>
-  string(3) "333"
-}
-array(5) {
-  [0]=>
-  string(2) "11"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-  [3]=>
-  string(3) "333"
-  [4]=>
-  string(2) "44"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_seq_drop</function></member>
-   <member><function>cubrid_seq_put</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/cubrid/functions/cubrid-seq-put.xml b/reference/cubrid/functions/cubrid-seq-put.xml
deleted file mode 100644
index 7349e0b3fd0d..000000000000
--- a/reference/cubrid/functions/cubrid-seq-put.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-seq-put">
- <refnamediv>
-  <refname>cubrid_seq_put</refname>
-  <refpurpose>Update the element value of sequence type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_seq_put</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>string</type><parameter>seq_element</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_seq_put</function> function is used to update the
-    content of the requested element in a sequent type attribute using OID.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance you want to work with.</simpara></listitem>
-  </varlistentry>
-      <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute that you want to update an element.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>index</parameter></term>
- <listitem><simpara>Index (1-based) of the element that you want to update.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>seq_element</parameter></term>
- <listitem><simpara>New content that you want to use for the update.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_seq_put</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c sequence(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_seq_put($conn, $oid, "c", 1, "111");
-
-$attr = cubrid_col_get($conn, $oid, "c");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  [0]=>
-  string(2) "11"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-  [3]=>
-  string(3) "333"
-}
-array(4) {
-  [0]=>
-  string(3) "111"
-  [1]=>
-  string(2) "22"
-  [2]=>
-  string(2) "33"
-  [3]=>
-  string(3) "333"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_seq_drop</function></member>
-   <member><function>cubrid_seq_insert</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/cubrid/functions/cubrid-set-add.xml b/reference/cubrid/functions/cubrid-set-add.xml
deleted file mode 100644
index df5333fb3781..000000000000
--- a/reference/cubrid/functions/cubrid-set-add.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-set-add">
- <refnamediv>
-  <refname>cubrid_set_add</refname>
-  <refpurpose>Insert a single element to set type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_set_add</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>set_element</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_set_add</function> function is used to insert a
-    single element to a set type attribute (set, multiset, sequence) you
-    requested.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance you want to work with.</simpara></listitem>
-  </varlistentry>
-      <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute you want to insert an element.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>set_element</parameter></term>
- <listitem><simpara>Content of the element you want to insert.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_set_add</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_set_add($conn, $oid, "b", "4");
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-array(4) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-  [3]=>
-  string(1) "4"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_seq_drop</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/cubrid/functions/cubrid-set-autocommit.xml b/reference/cubrid/functions/cubrid-set-autocommit.xml
deleted file mode 100644
index 0a13502f8717..000000000000
--- a/reference/cubrid/functions/cubrid-set-autocommit.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-set-autocommit">
- <refnamediv>
-  <refname>cubrid_set_autocommit</refname>
-  <refpurpose>Set autocommit mode of the connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_set_autocommit</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_set_autocommit</function> function is used to set the
-   CUBRID database auto-commit mode of the current database connection.
-  </simpara>
-  <simpara>
-   In CUBRID PHP, auto-commit mode is disabled by default for transaction
-   management. When auto-commit mode is turned from off to on, any pending work is
-   automatically committed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-   <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>mode</parameter></term>
-   <listitem>
-    <simpara>Auto-commit mode. The following constants can be used:</simpara>
-    <simplelist>
-     <member><constant>CUBRID_AUTOCOMMIT_FALSE</constant></member>
-     <member><constant>CUBRID_AUTOCOMMIT_TRUE</constant></member>
-   </simplelist>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_get_autocommit</function></member>
-  <member><function>cubrid_commit</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/cubrid/functions/cubrid-set-db-parameter.xml b/reference/cubrid/functions/cubrid-set-db-parameter.xml
deleted file mode 100644
index 79bc0e07d6c9..000000000000
--- a/reference/cubrid/functions/cubrid-set-db-parameter.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-set-db-parameter">
- <refnamediv>
-  <refname>cubrid_set_db_parameter</refname>
-  <refpurpose>Sets the CUBRID database parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_set_db_parameter</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>param_type</parameter></methodparam>
-   <methodparam><type>int</type><parameter>param_value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_set_db_parameter</function> function is used to set
-   the CUBRID database parameters. It can set the following CUBRID database
-   parameters:
-  </simpara>
-  <simplelist>
-   <member><constant>PARAM_ISOLATION_LEVEL</constant></member>
-   <member><constant>PARAM_LOCK_TIMEOUT</constant></member>
-  </simplelist>
-
-  <note>
-   <simpara>
-    The auto-commit mode can be set by using
-    <function>cubrid_set_autocommit</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>conn_identifier</parameter></term>
-    <listitem><simpara>
-     The CUBRID connection. If the connection identifier is not specified,
-     the last link opened by <function>cubrid_connect</function> is assumed.
-    </simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>param_type</parameter></term>
-   <listitem><simpara>Database parameter type.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>param_value</parameter></term>
-   <listitem><simpara>Isolation level value (1-6) or lock timeout (in seconds) value.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_get_db_parameter</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-$params = cubrid_get_db_parameter($conn);
-var_dump($params);
-
-cubrid_set_autocommit($conn, CUBRID_AUTOCOMMIT_TRUE);
-cubrid_set_db_parameter($conn, CUBRID_PARAM_ISOLATION_LEVEL, 2);
-
-$params_new = cubrid_get_db_parameter($conn);
-var_dump($params_new);
-
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  ["PARAM_ISOLATION_LEVEL"]=>
-  int(3)
-  ["PARAM_LOCK_TIMEOUT"]=>
-  int(-1)
-  ["PARAM_MAX_STRING_LENGTH"]=>
-  int(1073741823)
-  ["PARAM_AUTO_COMMIT"]=>
-  int(0)
-}
-array(4) {
-  ["PARAM_ISOLATION_LEVEL"]=>
-  int(2)
-  ["PARAM_LOCK_TIMEOUT"]=>
-  int(-1)
-  ["PARAM_MAX_STRING_LENGTH"]=>
-  int(1073741823)
-  ["PARAM_AUTO_COMMIT"]=>
-  int(1)
-}
-]]>
-    </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_get_db_parameter</function></member>
-   <member><function>cubrid_set_autocommit</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/cubrid/functions/cubrid-set-drop.xml b/reference/cubrid/functions/cubrid-set-drop.xml
deleted file mode 100644
index 64c3449fc12d..000000000000
--- a/reference/cubrid/functions/cubrid-set-drop.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-set-drop">
- <refnamediv>
-  <refname>cubrid_set_drop</refname>
-  <refpurpose>Delete an element from set type column using OID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_set_drop</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>attr_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>set_element</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_set_drop</function> function is used to delete an
-    element that you request from the given set type (set, multiset) attribute
-    of the database.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>OID of the instance you want to work with.</simpara></listitem>
-  </varlistentry>
-      <varlistentry>
- <term><parameter>attr_name</parameter></term>
- <listitem><simpara>Name of the attribute you want to delete an element from.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>set_element</parameter></term>
- <listitem><simpara>Content of the element you want to delete.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_set_drop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = cubrid_connect("localhost", 33000, "demodb", "dba");
-
-@cubrid_execute($conn, "DROP TABLE foo");
-cubrid_execute($conn, "CREATE TABLE foo(a int AUTO_INCREMENT, b set(int), c list(int), d char(10))");
-cubrid_execute($conn, "INSERT INTO foo(a, b, c, d) VALUES(1, {1,2,3}, {11,22,33,333}, 'a')");
-
-$req = cubrid_execute($conn, "SELECT * FROM foo", CUBRID_INCLUDE_OID);
-
-cubrid_move_cursor($req, 1, CUBRID_CURSOR_FIRST);
-$oid = cubrid_current_oid($req);
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_set_drop($conn, $oid, "b", "1");
-
-$attr = cubrid_col_get($conn, $oid, "b");
-var_dump($attr);
-
-cubrid_close_request($req);
-cubrid_disconnect($conn);
-?>
-]]>
-   </programlisting>
-&example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-array(2) {
-  [0]=>
-  string(1) "2"
-  [1]=>
-  string(1) "3"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_set_add</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/cubrid/functions/cubrid-set-query-timeout.xml b/reference/cubrid/functions/cubrid-set-query-timeout.xml
deleted file mode 100644
index 5c53b6971076..000000000000
--- a/reference/cubrid/functions/cubrid-set-query-timeout.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-set-query-timeout">
- <refnamediv>
-  <refname>cubrid_set_query_timeout</refname>
-  <refpurpose>Set the timeout time of query execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>cubrid_set_query_timeout</methodname>
-   <methodparam><type>resource</type><parameter>req_identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>cubrid_set_query_timeout</function> function is used to set
-   the timeout time of query execution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
- &reftitle.parameters;
- <variablelist>
-  <varlistentry>
-   <term><parameter>req_identifier</parameter></term>
-   <listitem><simpara>Request identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>timeout</parameter></term>
-   <listitem>
-    <simpara>Timeout time in milliseconds.</simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_get_query_timeout</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/cubrid/functions/cubrid-version.xml b/reference/cubrid/functions/cubrid-version.xml
deleted file mode 100644
index b0ddb26615a3..000000000000
--- a/reference/cubrid/functions/cubrid-version.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-version">
- <refnamediv>
-  <refname>cubrid_version</refname>
-  <refpurpose>Get the CUBRID PHP module's version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_version</function> function is used to get the CUBRID
-    PHP module's version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Version information (eg. "8.3.1.0001").
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_version</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("%-30s %s\n", "CUBRID PHP Version:", cubrid_version());
-
-printf("\n");
-
-$conn = cubrid_connect("localhost", 33088, "demodb", "dba");
-
-if (!$conn) {
-    die('Connect Error ('. cubrid_error_code() .')' . cubrid_error_msg());
-}
-
-$db_params = cubrid_get_db_parameter($conn);
-
-while (list($param_name, $param_value) = each($db_params)) {
-    printf("%-30s %s\n", $param_name, $param_value);
-}
-
-printf("\n");
-
-$server_info = cubrid_get_server_info($conn);
-$client_info = cubrid_get_client_info();
-
-printf("%-30s %s\n", "Server Info:", $server_info);
-printf("%-30s %s\n", "Client Info:", $client_info);
-
-printf("\n");
-
-$charset = cubrid_get_charset($conn);
-
-printf("%-30s %s\n", "CUBRID Charset:", $charset);
-
-cubrid_disconnect($conn);
-
-?>
-]]>
-   </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-CUBRID PHP Version:            9.1.0.0001
-
-PARAM_ISOLATION_LEVEL          3
-LOCK_TIMEOUT                   -1
-MAX_STRING_LENGTH              1073741823
-PARAM_AUTO_COMMIT              1
-
-Server Info:                   9.1.0.0212
-Client Info:                   9.1.0
-
-CUBRID Charset:                iso8859-1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_error_code</function></member>
-   <member><function>cubrid_error_code_facility</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/cubrid/oldaliases/cubrid-load-from-glo.xml b/reference/cubrid/oldaliases/cubrid-load-from-glo.xml
deleted file mode 100644
index 19f93760840a..000000000000
--- a/reference/cubrid/oldaliases/cubrid-load-from-glo.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-load-from-glo">
- <refnamediv>
-  <refname>cubrid_load_from_glo</refname>
-  <refpurpose>Read data from a GLO instance and save it in a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_load_from_glo</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_load_from_glo</function> function is used to read a
-    data from a glo instance, and saves it in a designated file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>Oid of the glo instance that you want to read the data from.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>file_name</parameter></term>
- <listitem><simpara>Name of the file where you want to save the data in.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &true;, when process is successful.
-  </simpara>
-  <simpara>
-    &false;, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_load_from_glo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$req = cubrid_execute ($con, "select image from person where id=1");
-if ($req) {
-   list ($oid) = cubrid_fetch($req);
-   cubrid_close_request($req);
-   $res = cubrid_load_from_glo ($con, $oid, "output.jpg");
-   if ($res) {
-      echo "image changed successfully";
-   }
-}
-?>
-]]>
-   </programlisting>
-   </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>cubrid_load_from_glo</function>
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function is removed from CUBRID 3.1.
-   </simpara>
-  </note>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-  <member><function>cubrid_new_glo</function></member>
-  <member><function>cubrid_save_to_glo</function></member>
-  <member><function>cubrid_send_glo</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/cubrid/oldaliases/cubrid-new-glo.xml b/reference/cubrid/oldaliases/cubrid-new-glo.xml
deleted file mode 100644
index 176a5d1befb8..000000000000
--- a/reference/cubrid/oldaliases/cubrid-new-glo.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-new-glo">
- <refnamediv>
-  <refname>cubrid_new_glo</refname>
-  <refpurpose>Create a glo instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>cubrid_new_glo</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_new_glo</function> function is used to create a glo instance in the requested class (glo class).  The glo created is a LO type, and is stored in the <parameter>file_name</parameter> file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>class_name</parameter></term>
- <listitem><simpara>Name of the class that you want to create a glo in.</simpara></listitem>
-  </varlistentry>
- <varlistentry>
- <term><parameter>file_name</parameter></term>
- <listitem><simpara>The file name that you want to save in the newly created glo.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Oid of the instance created, when process is successful.
-  </simpara>
-    <simpara>
-    &false;, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_new_glo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$oid = cubrid_new_glo ($con, "glo", "input.jpg");
-if ($oid){
-   // the type of column "image" is "object"
-   $req = cubrid_execute ($con, "insert into person(image) values($oid)");
-   if ($req) {
-      echo "image inserted successfully";
-      cubrid_close_request ($req);
-      cubrid_commit($con);
-   }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>cubrid_new_glo</function>
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function is removed from CUBRID 3.1.
-   </simpara>
-  </note>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_save_to_glo</function></member>
-   <member><function>cubrid_load_from_glo</function></member>
-   <member><function>cubrid_send_glo</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/cubrid/oldaliases/cubrid-save-to-glo.xml b/reference/cubrid/oldaliases/cubrid-save-to-glo.xml
deleted file mode 100644
index d9ccfff66a61..000000000000
--- a/reference/cubrid/oldaliases/cubrid-save-to-glo.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-save-to-glo">
- <refnamediv>
-  <refname>cubrid_save_to_glo</refname>
-  <refpurpose>Save requested file in a GLO instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_save_to_glo</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_save_to_glo</function> function is used to save requested file in a glo instance.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>Oid of the glo instance that you want to save a file in.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>file_name</parameter></term>
- <listitem><simpara>The name of the file that you want to save.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &true;, when process is successful.
-  </simpara>
-  <simpara>
-    &false;, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_save_to_glo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$req = cubrid_execute ($con, "select image from person where id=1");
-if ($req) {
-   list ($oid) = cubrid_fetch($req);
-   cubrid_close_request($req);
-   $res = cubrid_save_to_glo ($con, $oid, "input.jpg");
-   if ($res) {
-      echo "image changed successfully";
-   }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>cubrid_save_to_glo</function>
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function is removed from CUBRID 3.1.
-   </simpara>
-  </note>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_new_glo</function></member>
-   <member><function>cubrid_load_from_glo</function></member>
-   <member><function>cubrid_send_glo</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/cubrid/oldaliases/cubrid-send-glo.xml b/reference/cubrid/oldaliases/cubrid-send-glo.xml
deleted file mode 100644
index 9ecce71bf440..000000000000
--- a/reference/cubrid/oldaliases/cubrid-send-glo.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.cubrid-send-glo">
- <refnamediv>
-  <refname>cubrid_send_glo</refname>
-  <refpurpose>Read data from glo and send it to std output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>cubrid_send_glo</methodname>
-   <methodparam><type>resource</type><parameter>conn_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>oid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The <function>cubrid_send_glo</function> function is used to read data from glo instance and sends it to the PHP standard output.
-  </simpara>
- </refsect1>
-
-<refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
- <term><parameter>conn_identifier</parameter></term>
- <listitem><simpara>Connection identifier.</simpara></listitem>
-  </varlistentry>
-  <varlistentry>
- <term><parameter>oid</parameter></term>
- <listitem><simpara>Oid of the glo instance that you want to read data from.</simpara></listitem>
-  </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &true;, when process is successful.
-  </simpara>
-  <simpara>
-    &false;, when process is unsuccessful.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>cubrid_send_glo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$req = cubrid_execute ($con, "select image from person where id =1");
-if ($req) {
-  list ($oid) = cubrid_fetch($req);
-  cubrid_close_request($req);
-  Header ("Content-type: image/jpeg");
-  cubrid_send_glo ($con, $oid);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>cubrid_send_glo</function>
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function is removed from CUBRID 3.1.
-   </simpara>
-  </note>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>cubrid_new_glo</function></member>
-   <member><function>cubrid_save_to_glo</function></member>
-   <member><function>cubrid_load_from_glo</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/cubrid/reference.xml b/reference/cubrid/reference.xml
deleted file mode 100644
index 33fee516325d..000000000000
--- a/reference/cubrid/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.cubrid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>CUBRID &Functions;</title>
-
- &reference.cubrid.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/cubrid/setup.xml b/reference/cubrid/setup.xml
deleted file mode 100644
index bce5962b35de..000000000000
--- a/reference/cubrid/setup.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="cubrid.setup">
- &reftitle.setup;
-
- <section xmlns="http://docbook.org/ns/docbook" xml:id="cubrid.requirements">
- &reftitle.required;
-  <simpara>
-    In order to have these functions available, you must install CUBRID, and compile CUBRID PHP Library with CUBRID support.
-  </simpara>
-</section>
-
- &reference.cubrid.configure;
-
- <section xml:id="cubrid.configuration">
-  &reftitle.runtime;
-  <simpara>
-    There is no runtime configuration now.
-  </simpara>
- </section>
-
- <section xml:id="cubrid.resources">
-  &reftitle.resources;
-  <simpara>
-   There are four resource types used in CUBRID. The first one is the link
-   identifier for a database connection, the second is the resource which
-   holds the result of a query, and the last two a resource which holds the
-   query results of BLOB/CLOB data types.
-  </simpara>
-  <section xml:id="cubrid.resources.connection-identifier">
-  <title>connection identifier</title>
-   <simpara>
-    A connection identifier returned by <function>cubrid_connect</function>,
-    <function>cubrid_connect_with_url</function>,
-    <function>cubrid_pconnect</function> and
-    <function>cubrid_pconnect_with_url</function>.
-   </simpara>
-  </section>
-  <section xml:id="cubrid.resources.request-identifier">
-  <title>request identifier</title>
-   <simpara>
-    A request identifier returned by <function>cubrid_prepare</function> and <function>cubrid_execute</function>.
-   </simpara>
-  </section>
-  <section xml:id="cubrid.resources.lob-identifier">
-  <title>LOB identifier</title>
-   <simpara>
-    A LOB identifier returned by <function>cubrid_lob_get</function>.
-   </simpara>
-  </section>
-  <section xml:id="cubrid.resources.lob2-identifier">
-  <title>LOB2 identifier</title>
-   <simpara>
-    A LOB identifier returned by <function>cubrid_lob2_new</function> or get
-    from the result set.
-   </simpara>
-  </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/cubrid/versions.xml b/reference/cubrid/versions.xml
deleted file mode 100644
index 5f36e4e9505a..000000000000
--- a/reference/cubrid/versions.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<!--
- NOTE: Version info for the cubrid PECL Extension (1.0) is
-       considered irrelevant so is not listed here.
--->
-
-<versions>
- <function name='cubrid' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_affected_rows' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_bind' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_client_encoding' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_close' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_close_prepare' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_close_request' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_col_get' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_col_size' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_column_names' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_column_types' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_commit' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_connect' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_connect-with-url' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_current_oid' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_data_seek' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_db_name' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_disconnect' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_drop' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_errno' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_error' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_error_code_facility' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_error_code' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_error_msg' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_execute' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_fetch' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_fetch_array' from='PECL CUBRID &gt;=8.3.0'/>
- <function name='cubrid_fetch_assoc' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_fetch_field' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_fetch_lengths' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_fetch_object' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_fetch_row' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_flags' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_len' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_name' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_seek' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_table' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_field_type' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_free_result' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get_autocommit' from='PECL CUBRID &gt;= 8.4.0'/>
- <function name='cubrid_get_charset' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get_class_name' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get_client_info' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get_db_parameter' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_get_server_info' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_insert_id' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_is_instance' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_list_dbs' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_load_from_glo' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_lob_close' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_lob_export' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_lob_get' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_lob_send' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_lob_size' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_lob2_new' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_bind' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_export' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_import' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_read' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_write' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_tell' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_tell64' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_seek' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_seek64' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_size' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_size64' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lob2_close' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_lock_read' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_lock_write' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_move_cursor' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_new_glo' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_next_result' from='PECL CUBRID &gt;= 8.4.0'/>
- <function name='cubrid_num_cols' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_num_fields' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_num_rows' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_ping' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_prepare' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_put' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_query' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_real_escape_string' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_result' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_rollback' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_save_to_glo' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_schema' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_send_glo' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_seq_drop' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_seq_insert' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_seq_put' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_set_add' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_set_autocommit' from='PECL CUBRID &gt;= 8.4.0'/>
- <function name='cubrid_set_db_parameter' from='PECL CUBRID &gt;= 8.4.0'/>
- <function name='cubrid_set_drop' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_unbuffered_query' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_version' from='PECL CUBRID &gt;= 8.3.0'/>
- <function name='cubrid_pconnect' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_pconnect_with_url' from='PECL CUBRID &gt;= 8.3.1'/>
- <function name='cubrid_set_query_timeout' from='PECL CUBRID &gt;= 8.4.1'/>
- <function name='cubrid_get_query_timeout' from='PECL CUBRID &gt;= 8.4.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
--->
diff --git a/reference/dbase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/dbase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/dbase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/dbase/book.xml b/reference/dbase/book.xml
deleted file mode 100644
index 4ec110cf4032..000000000000
--- a/reference/dbase/book.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
- 
-<book xml:id="book.dbase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>dBase</title>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.dbase">
-  &reftitle.intro;
-  <note>
-   <para>
-    &pecl.moved-ver;5.3.0.
-   </para>
-  </note>
-  <para>
-   These functions allow you to access records stored in dBase-format
-   (dbf) databases.
-  </para>
-  <warning>
-   <para>
-    We recommend against using dBase files as your production
-    database. Use <link xlink:href="&url.sqlite;">SQLite</link> or choose any real SQL server instead; <link 
-    xlink:href="&url.mysql;">MySQL</link> or <link xlink:href="&url.pgsql;">Postgres</link>
-    are common choices with PHP. dBase support is here to allow you to
-    import and export data to and from your web database, because the
-    file format is commonly understood by Windows spreadsheets and
-    organizers.
-   </para>
-  </warning>
-  <caution>
-   <para>
-    As of dbase 7.0.0 the databases are automatically locked via
-    <function>flock</function>. There has been no support for locking earlier,
-    so two concurrent web server processes modifying the same dBase file would
-    have very likely ruined your database. This can happen even with dbase
-    7.0.0+ on systems which implement the locks at the process level with
-    multithreaded SAPIs.
-   </para>
-  </caution>
-  <para>
-   dBase files are simple sequential files of fixed length records. 
-   Records are appended to the end of the file and deleted records are
-   kept until you call <function>dbase_pack</function>.
-  </para>
-  <para>
-   Only dbf file levels 3 (dBASE III+) - 5 (dBASE V) are supported.
-   The types of dBase fields available are:
-   <table>
-    <title>Available types of fields</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Field</entry>
-       <entry>dBase Type</entry>
-       <entry>Format</entry>
-       <entry>Additional information</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><literal>M</literal></entry>
-       <entry>Memo</entry>
-       <entry>n/a</entry>
-       <entry>This type is not supported by PHP, such field will be ignored</entry>
-      </row>
-      <row>
-       <entry><literal>D</literal></entry>
-       <entry>Date</entry>
-       <entry><literal>YYYYMMDD</literal></entry>
-       <entry>The field length is limited to 8</entry>
-      </row>
-      <row>
-       <entry><literal>T</literal></entry>
-       <entry>DateTime</entry>
-       <entry><literal>YYYYMMDDhhmmss.uuu</literal></entry>
-       <entry>(FoxPro) No validity checks are done. Available as of dbase 7.0.0.</entry>
-      </row>
-      <row>
-       <entry><literal>N</literal></entry>
-       <entry>Number</entry>
-       <entry>A number</entry>
-       <entry>
-        You must declare a length and a precision (the number of digits
-        after the decimal point).
-       </entry>
-      </row>
-      <row>
-       <entry><literal>F</literal></entry>
-       <entry>Float</entry>
-       <entry>A float number</entry>
-       <entry>Same as <literal>N</literal>.</entry>
-      </row>
-      <row>
-       <entry><literal>C</literal></entry>
-       <entry>String</entry>
-       <entry>A string</entry>
-       <entry>You must declare a length. When retrieving data, the string
-       will be right-padded with spaces to fit the declared length. Overlong
-       strings will be silently truncated when storing data.</entry>
-      </row>
-      <row>
-       <entry><literal>L</literal></entry>
-       <entry>Boolean</entry>
-       <entry>
-        <literal>T</literal> or <literal>Y</literal> for &true;, 
-        <literal>F</literal> or <literal>N</literal> for &false;,
-        <literal>?</literal> for uninitialized.
-       </entry>
-       <entry>
-        As of dbase 7.0.0, returned as a <type>bool</type> (&true; or &false;),
-        or &null; for uninitialized fields.
-        Formerly, returned as an <type>int</type> (<literal>1</literal> or <literal>0</literal>).
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <note>
-   <para>
-    As of dbase 7.0.0 nullable fields are supported for
-    <constant>DBASE_TYPE_FOXPRO</constant> databases. If a field is nullable,
-    passing &null; will set the respective flag, and on later retrieval the field
-    value will be &null;.
-   </para>
-  </note>
-  <note>
-   <para>
-    There is no support for indexes or memo fields.
-   </para>
-  </note>
- </preface>
- <!-- }}} -->
- 
- &reference.dbase.setup;
- &reference.dbase.constants;
- &reference.dbase.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/dbase/configure.xml b/reference/dbase/configure.xml
deleted file mode 100644
index 50dd3a3bd1c0..000000000000
--- a/reference/dbase/configure.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="dbase.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;dbase">&url.pecl.package;dbase</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/dbase/constants.xml b/reference/dbase/constants.xml
deleted file mode 100644
index e8d2275ef393..000000000000
--- a/reference/dbase/constants.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="dbase.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.dbase-version">
-   <term>
-    <constant>DBASE_VERSION</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The extension version.
-     (Available as of dbase 7.0.0)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.dbase-rdonly">
-   <term>
-    <constant>DBASE_RDONLY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Open database for reading only. Used with <function>dbase_open</function>.
-     (Available as of dbase 7.0.0)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.dbase-rdwr">
-   <term>
-    <constant>DBASE_RDWR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Open database for reading and writing. Used with <function>dbase_open</function>.
-     (Available as of dbase 7.0.0)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.dbase-type-dbase">
-   <term>
-    <constant>DBASE_TYPE_DBASE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Create dBASE style database. Used with <function>dbase_create</function>.
-     (Available as of dbase 7.0.0)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.dbase-type-foxpro">
-   <term>
-    <constant>DBASE_TYPE_FOXPRO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Create FoxPro style database. Used with <function>dbase_create</function>.
-     (Available as of dbase 7.0.0)
-    </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/dbase/functions/dbase-add-record.xml b/reference/dbase/functions/dbase-add-record.xml
deleted file mode 100644
index 2e3727b6afc4..000000000000
--- a/reference/dbase/functions/dbase-add-record.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-add-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_add_record</refname>
-  <refpurpose>Adds a record to a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dbase_add_record</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds the given data to the database. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       An indexed array of data. The number of items must be equal to the number of 
-       fields in the database, otherwise <function>dbase_add_record</function>
-       will fail.
-      </para>
-      <note>
-       <para>
-        If you're using <function>dbase_get_record</function> return value for this
-        parameter, remember to reset the key named <literal>deleted</literal>.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Inserting a record in a dBase database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-write mode
-$db = dbase_open('/tmp/test.dbf', 2);
-
-if ($db) {
-  dbase_add_record($db, array(
-      date('Ymd'), 
-      'Maxim Topolov', 
-      '23', 
-      'max@example.com',
-      'T'));   
-  dbase_close($db);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_delete_record</function></member>
-    <member><function>dbase_replace_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/dbase/functions/dbase-close.xml b/reference/dbase/functions/dbase-close.xml
deleted file mode 100644
index d34a26ede123..000000000000
--- a/reference/dbase/functions/dbase-close.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_close</refname>
-  <refpurpose>Closes a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dbase_close</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes the given database resource.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Closing a dBase database file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-only mode
-$db = dbase_open('/tmp/test.dbf', 0);
-
-if ($db) {
-  // read some data ..
-  
-  dbase_close($db);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_open</function></member>
-    <member><function>dbase_create</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/dbase/functions/dbase-create.xml b/reference/dbase/functions/dbase-create.xml
deleted file mode 100644
index c2a0b102d1d7..000000000000
--- a/reference/dbase/functions/dbase-create.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-create" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_create</refname>
-  <refpurpose>Creates a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dbase_create</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>array</type><parameter>fields</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>DBASE_TYPE_DBASE</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbase_create</function> creates a dBase database with the given
-   definition.
-   If the file already exists, it is not truncated.
-   <function>dbase_pack</function> can be called to force truncation.
-  </para>
-  &note.open-basedir.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>path</parameter></term>
-     <listitem>
-      <para>
-       The path of the database. It can be a relative or absolute path to
-       the file where dBase will store your data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fields</parameter></term>
-     <listitem>
-      <para>
-       An array of arrays, each array describing the format of one field of the
-       database. Each field consists of a name, a character indicating the field
-       type, and optionally, a length, a precision and a nullable flag.
-       The supported field types are listed in the <link
-       linkend="intro.dbase">introduction section</link>.
-      </para>
-      <note>
-       <para>
-        The fieldnames are limited in length and must not exceed 10 chars.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of database to be created. Either
-       <constant>DBASE_TYPE_DBASE</constant> or
-       <constant>DBASE_TYPE_FOXPRO</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a database resource if the database is successfully created,
-   or &false; if an error occurred.
-  </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 dbase 7.0.0</entry>
-      <entry>
-       The <parameter>type</parameter> parameter has been added.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL dbase 7.0.0</entry>
-      <entry>
-       The return value is now a <type>resource</type> instead of an
-       <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating a dBase database file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// database "definition"
-$def = array(
-  array("date",     "D"),
-  array("name",     "C",  50),
-  array("age",      "N",   3, 0),
-  array("email",    "C", 128),
-  array("ismember", "L")
-);
-
-// creation
-if (!dbase_create('/tmp/test.dbf', $def)) {
-  echo "Error, can't create the database\n";
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_open</function></member>
-    <member><function>dbase_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/dbase/functions/dbase-delete-record.xml b/reference/dbase/functions/dbase-delete-record.xml
deleted file mode 100644
index f182afc525f4..000000000000
--- a/reference/dbase/functions/dbase-delete-record.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-delete-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_delete_record</refname>
-  <refpurpose>Deletes a record from a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dbase_delete_record</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Marks the given record to be deleted from the database.
-  </para>
-  <note>
-   <para>
-    To actually remove the record from the database, you must also call
-    <function>dbase_pack</function>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>number</parameter></term>
-     <listitem>
-      <para>
-       An integer which spans from 1 to the number of records in the database
-       (as returned by <function>dbase_numrecords</function>).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_add_record</function></member>
-    <member><function>dbase_replace_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/dbase/functions/dbase-get-header-info.xml b/reference/dbase/functions/dbase-get-header-info.xml
deleted file mode 100644
index 727276fa955c..000000000000
--- a/reference/dbase/functions/dbase-get-header-info.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-get-header-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_get_header_info</refname>
-  <refpurpose>Gets the header info of a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>dbase_get_header_info</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns information on the column structure of the given database resource.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An indexed array with an entry for each column in the database. The array index
-   starts at 0.
-  </para>
-  <para>
-   Each array element contains an associative array of column information, as
-   described here:
-   <variablelist>
-    <varlistentry>
-     <term>name</term>
-     <listitem>
-      <simpara>
-       The name of the column
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>type</term>
-     <listitem>
-      <simpara>
-       The human-readable name for the dbase type of the column (i.e. date,
-       boolean, etc.)
-       The supported field types are listed in the <link
-       linkend="intro.dbase">introduction section</link>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>length</term>
-     <listitem>
-      <simpara>
-       The number of bytes this column can hold
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>precision</term>
-     <listitem>
-      <simpara>
-       The number of digits of decimal precision for the column
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>format</term>
-     <listitem>
-      <simpara>
-       A suggested <function>printf</function> format specifier for the column
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>offset</term>
-     <listitem>
-      <simpara>
-       The byte offset of the column from the start of the row
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-  <para>
-   If the database header information cannot be read, &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>
-     <row>
-      <entry>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Showing header information for a dBase database file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Path to dbase file
-$db_path = "/tmp/test.dbf";
-
-// Open dbase file
-$dbh = dbase_open($db_path, 0)
-  or die("Error! Could not open dbase database file '$db_path'.");
-
-// Get column information
-$column_info = dbase_get_header_info($dbh);
-
-// Display information
-print_r($column_info);
-?>
-]]>
-    </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/dbase/functions/dbase-get-record-with-names.xml b/reference/dbase/functions/dbase-get-record-with-names.xml
deleted file mode 100644
index 4a09d0a58a9a..000000000000
--- a/reference/dbase/functions/dbase-get-record-with-names.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-get-record-with-names" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_get_record_with_names</refname>
-  <refpurpose>
-   Gets a record from a database as an associative array
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>dbase_get_record_with_names</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a record from a dBase database as an associative array.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>number</parameter></term>
-     <listitem>
-      <para>
-       The index of the record between <literal>1</literal> and
-       <literal>dbase_numrecords($dbase_identifier)</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An associative array with the record. This will also include a key named
-   <literal>deleted</literal> which is set to 1 if the record has been marked
-   for deletion (see <function>dbase_delete_record</function>).
-   Therefore it is not possible to retrieve the value of a field named
-   <literal>deleted</literal> with this function.
-  </para>
-  &dbase.type-conversion;
-  <para>
-   On error, <function>dbase_get_record_with_names</function> will return &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Listing all the registered members in the database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// open in read-only mode
-$db = dbase_open('/tmp/test.dbf', 0);
-
-if ($db) {
-  $record_numbers = dbase_numrecords($db);
-  for ($i = 1; $i <= $record_numbers; $i++) {
-      $row = dbase_get_record_with_names($db, $i);
-      if ($row['ismember'] == 1) {
-          echo "Member #$i: " . trim($row['name']) . "\n";
-      }
-  }
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_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/dbase/functions/dbase-get-record.xml b/reference/dbase/functions/dbase-get-record.xml
deleted file mode 100644
index 8eeb77f96a6e..000000000000
--- a/reference/dbase/functions/dbase-get-record.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-get-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_get_record</refname>
-  <refpurpose>
-   Gets a record from a database as an indexed array
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>dbase_get_record</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a record from a database as an indexed array.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>number</parameter></term>
-     <listitem>
-      <para>
-       The index of the record between <literal>1</literal> and
-       <literal>dbase_numrecords($dbase_identifier)</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An indexed array with the record. This array will also include an associative
-   key named <literal>deleted</literal> which is set to 1 if the record has been 
-   marked for deletion (see <function>dbase_delete_record</function>).
-  </para>
-  &dbase.type-conversion;
-  <para>
-   On error, <function>dbase_get_record</function> will return &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_get_record_with_names</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/dbase/functions/dbase-numfields.xml b/reference/dbase/functions/dbase-numfields.xml
deleted file mode 100644
index dea9110acfd8..000000000000
--- a/reference/dbase/functions/dbase-numfields.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-numfields" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_numfields</refname>
-  <refpurpose>Gets the number of fields of a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbase_numfields</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the number of fields (columns) in the specified database. 
-  </para>
-  <note>
-   <para>
-    Field numbers are between 0 and <literal>dbase_numfields($db)-1</literal>,
-    while record numbers are between 1 and <literal>dbase_numrecords($db)</literal>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of fields in the database, or &false; if an error occurs.
-  </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 dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>dbase_numfields</function> Example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$rec = dbase_get_record($db, $recno);
-$nf  = dbase_numfields($db);
-for ($i = 0; $i < $nf; $i++) {
-  echo $rec[$i], "\n";
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_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/dbase/functions/dbase-numrecords.xml b/reference/dbase/functions/dbase-numrecords.xml
deleted file mode 100644
index dd06db7be052..000000000000
--- a/reference/dbase/functions/dbase-numrecords.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-numrecords" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_numrecords</refname>
-  <refpurpose>Gets the number of records in a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dbase_numrecords</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the number of records (rows) in the specified database.
-  </para>
-  <note>
-   <para>
-    Records which are marked as deleted are counted as well.
-   </para>
-  </note>
-  <note>
-   <para>
-    Record numbers are between 1 and <literal>dbase_numrecords($db)</literal>,
-    while field numbers are between 0 and <literal>dbase_numfields($db)-1</literal>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of records in the database, or &false; if an error occurs.
-  </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 dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Looping over all the records of the database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-only mode
-$db = dbase_open('/tmp/test.dbf', 0);
-
-if ($db) {
-  $record_numbers = dbase_numrecords($db);
-  for ($i = 1; $i <= $record_numbers; $i++) {
-      $record = dbase_get_record($db, $i);
-      if (!$record['deleted']) {
-          // do something with the $record
-      } else {
-          // do something with the deleted $record or ignore it
-      }
-  }
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_numfields</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/dbase/functions/dbase-open.xml b/reference/dbase/functions/dbase-open.xml
deleted file mode 100644
index d1a2277b009e..000000000000
--- a/reference/dbase/functions/dbase-open.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-open" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_open</refname>
-  <refpurpose>Opens a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>dbase_open</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dbase_open</function> opens a dBase database with the given
-   access mode.
-  </para>
-  &note.open-basedir.func;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>path</parameter></term>
-     <listitem>
-      <para>
-       The path of the database. It can be a relative or absolute path to
-       the file where dBase will store your data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       An integer which correspond to those for the <command>open()</command> 
-       system call (Typically 0 means read-only, 1 means write-only, and 2 
-       means read and write).
-      </para>
-      <note>
-       <para>
-        You can't open a dBase file in write-only mode as the function will
-        fail to read the headers information and thus you can't use 1 as
-        <parameter>mode</parameter>.
-       </para>
-      </note>
-      <para>
-       As of dbase 7.0.0 you can use <constant>DBASE_RDONLY</constant>
-       and <constant>DBASE_RDWR</constant>, respectively, to specify the
-       <parameter>mode</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a database resource 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>PECL dbase 7.0.0</entry>
-      <entry>
-       The return value is now a <type>resource</type> instead of an
-       <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Opening a dBase database file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-only mode
-$db = dbase_open('/tmp/test.dbf', 0);
-
-if ($db) {
-  // read some data ..
-  
-  dbase_close($db);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_create</function></member>
-    <member><function>dbase_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/dbase/functions/dbase-pack.xml b/reference/dbase/functions/dbase-pack.xml
deleted file mode 100644
index 7b0ef21cb209..000000000000
--- a/reference/dbase/functions/dbase-pack.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-pack" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_pack</refname>
-  <refpurpose>Packs a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dbase_pack</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Packs the specified database by permanently deleting all records marked
-   for deletion using <function>dbase_delete_record</function>.
-   Note that the file will be truncated after successful packing (contrary to
-   dBASE III's PACK command).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Emptying a dBase database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-write mode
-$db = dbase_open('/tmp/test.dbf', 2);
-
-if ($db) {
-  $record_numbers = dbase_numrecords($db);
-  for ($i = 1; $i <= $record_numbers; $i++) {
-      dbase_delete_record($db, $i);
-  }
-  // expunge the database
-  dbase_pack($db);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_delete_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/dbase/functions/dbase-replace-record.xml b/reference/dbase/functions/dbase-replace-record.xml
deleted file mode 100644
index 6fd18f56891d..000000000000
--- a/reference/dbase/functions/dbase-replace-record.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dbase-replace-record" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dbase_replace_record</refname>
-  <refpurpose>Replaces a record in a database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dbase_replace_record</methodname>
-   <methodparam><type>resource</type><parameter>database</parameter></methodparam>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Replaces the given record in the database with the given data.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>database</parameter></term>
-     <listitem>
-      <para>
-       The database resource, returned by <function>dbase_open</function>
-       or <function>dbase_create</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       An indexed array of data. The number of items must be equal to the
-       number of fields in the database, otherwise
-       <function>dbase_replace_record</function> will fail.
-      </para>
-      <note>
-       <para>
-        If you're using <function>dbase_get_record</function> return value for this
-        parameter, remember to reset the key named <literal>deleted</literal>.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>number</parameter></term>
-     <listitem>
-      <para>
-       An integer which spans from 1 to the number of records in the database
-       (as returned by <function>dbase_numrecords</function>).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL dbase 7.0.0</entry>
-      <entry>
-       <parameter>database</parameter> is now a <type>resource</type>
-       instead of an <type>int</type>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Updating a record in the database</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// open in read-write mode
-$db = dbase_open('/tmp/test.dbf', 2);
-
-if ($db) {
-  // gets the old row
-  $row = dbase_get_record_with_names($db, 1);
-  
-  // remove the 'deleted' entry
-  unset($row['deleted']);
-  
-  // Update the date field with the current timestamp
-  $row['date'] = date('Ymd');
-  
-  // convert the row to an indexed array
-  $row = array_values($row);
-
-  // Replace the record
-  dbase_replace_record($db, $row, 1);
-  dbase_close($db);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes"><!-- {{{ -->
-  &reftitle.notes;
-  <note>
-   <para>
-    Boolean fields result in an <type>int</type> element value
-    (<literal>0</literal> or <literal>1</literal>) when retrieved via
-    <function>dbase_get_record</function> or
-    <function>dbase_get_record_with_names</function>. If they are written back,
-    this results in the value becoming <literal>0</literal>, so care has to be
-    taken to properly adjust the values.
-   </para>
-  </note>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dbase_add_record</function></member>
-    <member><function>dbase_delete_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/dbase/reference.xml b/reference/dbase/reference.xml
deleted file mode 100644
index c65b48a54c92..000000000000
--- a/reference/dbase/reference.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <reference xml:id="ref.dbase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>dBase &Functions;</title>
-
-  <partintro>
-   <section xml:id="dbase.examples.note">
-    &reftitle.examples;
-    <para>
-     Many examples in this reference require a dBase database. We will use 
-     <filename>/tmp/test.dbf</filename> that will be created in the example of
-     <function>dbase_create</function>.
-    </para>
-   </section>
-   
-  </partintro>
-
-&reference.dbase.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/dbase/setup.xml b/reference/dbase/setup.xml
deleted file mode 100644
index 47b5c33b6168..000000000000
--- a/reference/dbase/setup.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="dbase.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.dbase.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="dbase.resources">
-  &reftitle.resources;
-  <para>
-   As of dbase 7.0.0, the resource type <literal>dbase</literal> is defined,
-   which is returned by <function>dbase_open</function> and
-   <function>dbase_create</function>.
-  </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/dbase/versions.xml b/reference/dbase/versions.xml
deleted file mode 100644
index 5e70c5301ab9..000000000000
--- a/reference/dbase/versions.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='dbase_add_record' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_close' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_create' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_delete_record' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_get_header_info' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_get_record' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_get_record_with_names' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_numfields' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_numrecords' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_open' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_pack' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
- <function name='dbase_replace_record' from='PHP 5 &lt; 5.3.0, dbase 5, dbase 7'/>
-</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/dio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/dio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/dio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/dio/book.xml b/reference/dio/book.xml
deleted file mode 100644
index 07c04ac32305..000000000000
--- a/reference/dio/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.dio">
-  &reftitle.intro;
-  <para>
-   PHP supports the direct io functions as described in the Posix
-   Standard (Section 6) for performing I/O functions at a lower
-   level than the C-Language stream I/O functions
-   (<function>fopen</function>, <function>fread</function>,..).  The use
-   of the DIO functions should be considered only when direct 
-   control of a device is needed.  In all other cases, the standard
-   <link linkend="book.filesystem">filesystem</link> functions are more
-   than adequate. 
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.dio.setup;
- &reference.dio.constants;
- &reference.dio.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/dio/configure.xml b/reference/dio/configure.xml
deleted file mode 100644
index 80064e8d1d81..000000000000
--- a/reference/dio/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="dio.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;dio">&url.pecl.package;dio</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/dio/constants.xml b/reference/dio/constants.xml
deleted file mode 100644
index 0626639d50d1..000000000000
--- a/reference/dio/constants.xml
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="dio.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.f-dupfd">
-   <term>
-    <constant>F_DUPFD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-getfd">
-   <term>
-    <constant>F_GETFD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-getfl">
-   <term>
-    <constant>F_GETFL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-getlk">
-   <term>
-    <constant>F_GETLK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-getown">
-   <term>
-    <constant>F_GETOWN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-rdlck">
-   <term>
-    <constant>F_RDLCK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-setfl">
-   <term>
-    <constant>F_SETFL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-setlk">
-   <term>
-    <constant>F_SETLK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-setlkw">
-   <term>
-    <constant>F_SETLKW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-setown">
-   <term>
-    <constant>F_SETOWN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-unlck">
-   <term>
-    <constant>F_UNLCK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.f-wrlck">
-   <term>
-    <constant>F_WRLCK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-append">
-   <term>
-    <constant>O_APPEND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-async">
-   <term>
-    <constant>O_ASYNC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-creat">
-   <term>
-    <constant>O_CREAT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-excl">
-   <term>
-    <constant>O_EXCL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-ndelay">
-   <term>
-    <constant>O_NDELAY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-noctty">
-   <term>
-    <constant>O_NOCTTY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-nonblock">
-   <term>
-    <constant>O_NONBLOCK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-rdonly">
-   <term>
-    <constant>O_RDONLY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-rdwr">
-   <term>
-    <constant>O_RDWR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-sync">
-   <term>
-    <constant>O_SYNC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-trunc">
-   <term>
-    <constant>O_TRUNC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.o-wronly">
-   <term>
-    <constant>O_WRONLY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-irgrp">
-   <term>
-    <constant>S_IRGRP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-iroth">
-   <term>
-    <constant>S_IROTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-irusr">
-   <term>
-    <constant>S_IRUSR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-irwxg">
-   <term>
-    <constant>S_IRWXG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-irwxo">
-   <term>
-    <constant>S_IRWXO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-irwxu">
-   <term>
-    <constant>S_IRWXU</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-iwgrp">
-   <term>
-    <constant>S_IWGRP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-iwoth">
-   <term>
-    <constant>S_IWOTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-iwusr">
-   <term>
-    <constant>S_IWUSR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-ixgrp">
-   <term>
-    <constant>S_IXGRP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-ixoth">
-   <term>
-    <constant>S_IXOTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.s-ixusr">
-   <term>
-    <constant>S_IXUSR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <para></para>
-   </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/dio/functions/dio-close.xml b/reference/dio/functions/dio-close.xml
deleted file mode 100644
index de19f640f815..000000000000
--- a/reference/dio/functions/dio-close.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_close</refname>
-  <refpurpose>Closes the file descriptor given by fd</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>dio_close</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The function <function>dio_close</function> closes the file descriptor
-   <parameter>fd</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Closing an open file descriptor</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$fd = dio_open('/dev/ttyS0', O_RDWR);
-
-dio_close($fd);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dio_open</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/dio/functions/dio-fcntl.xml b/reference/dio/functions/dio-fcntl.xml
deleted file mode 100644
index 74c60f5520a5..000000000000
--- a/reference/dio/functions/dio-fcntl.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-fcntl" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_fcntl</refname>
-  <refpurpose>Performs a c library fcntl on fd</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>dio_fcntl</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cmd</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The <function>dio_fcntl</function> function performs the
-   operation specified by <parameter>cmd</parameter> on the file
-   descriptor <parameter>fd</parameter>. Some commands require
-   additional arguments <parameter>args</parameter> to be supplied.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cmd</parameter></term>
-     <listitem>
-      <para>
-       Can be one of the following operations:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <constant>F_SETLK</constant> - Lock is set or cleared. If the lock
-          is held by someone else <function>dio_fcntl</function> returns
-          -1.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>F_SETLKW</constant> - like <constant>F_SETLK</constant>,
-          but in case the lock is held by someone else, 
-          <function>dio_fcntl</function> waits until the lock is released.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>F_GETLK</constant> - <function>dio_fcntl</function> 
-          returns an associative array (as described below) if someone else
-          prevents lock. If there is no obstruction key "type" will set
-          to <constant>F_UNLCK</constant>.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>F_DUPFD</constant> - finds the lowest numbered available
-          file descriptor greater than or equal to <parameter>args</parameter>
-          and returns them.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>F_SETFL</constant> - Sets the file descriptors flags to 
-          the value specified by <parameter>args</parameter>, which can be
-          <constant>O_APPEND</constant>, <constant>O_NONBLOCK</constant> or 
-          <constant>O_ASYNC</constant>. To use <constant>O_ASYNC</constant> 
-          you will need to use the <link linkend="ref.pcntl">PCNTL</link> 
-          extension.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       <parameter>args</parameter> is an associative array, when
-       <parameter>cmd</parameter> is <constant>F_SETLK</constant> or
-       <constant>F_SETLKW</constant>, with the following keys:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>start</literal> - offset where lock begins
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>length</literal> - size of locked area. zero means to end
-          of file
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>whence</literal> - Where l_start is relative to: can be 
-          <constant>SEEK_SET</constant>,
-          <constant>SEEK_END</constant> and <constant>SEEK_CUR</constant>
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <literal>type</literal> - type of lock: can be
-          <constant>F_RDLCK</constant> (read lock),
-          <constant>F_WRLCK</constant> (write lock) or
-          <constant>F_UNLCK</constant> (unlock)
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the result of the C call.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Setting and clearing a lock</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$fd = dio_open('/dev/ttyS0', O_RDWR);
-
-if (dio_fcntl($fd, F_SETLK, Array("type"=>F_WRLCK)) == -1) {
-   // the file descriptor appears locked
-   echo "The lock can not be cleared. It is held by someone else.";
-} else {
-   echo "Lock successfully set/cleared";
-}
-
-dio_close($fd);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.no-windows;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dio/functions/dio-open.xml b/reference/dio/functions/dio-open.xml
deleted file mode 100644
index 5738b9bd974c..000000000000
--- a/reference/dio/functions/dio-open.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-open" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_open</refname>
-  <refpurpose>
-   Opens a file (creating it if necessary) at a lower level than the
-   C library input/output stream functions allow
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>dio_open</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-   </methodsynopsis>
-  <para>
-   <function>dio_open</function> opens a file and returns a new file
-   descriptor for it.  
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The pathname of the file to open.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>flags</parameter> parameter is a bitwise-ORed
-       value comprising flags from the following list. This value
-       <emphasis>must</emphasis> include one of
-       <constant>O_RDONLY</constant>, <constant>O_WRONLY</constant>,
-       or <constant>O_RDWR</constant>. Additionally, it may include
-       any combination of the other flags from this list.
-       <itemizedlist>
-        <listitem>
-         <para>
-          <constant>O_RDONLY</constant> - opens the file for read access.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_WRONLY</constant> - opens the file for write access.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_RDWR</constant> - opens the file for both reading and
-          writing.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_CREAT</constant> - creates the file, if it doesn't
-          already exist.
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <constant>O_EXCL</constant> - if both <constant>O_CREAT</constant>
-          and <constant>O_EXCL</constant> are set and the file already
-          exists, <function>dio_open</function> will fail.
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <constant>O_TRUNC</constant> - if the file exists and is opened 
-          for write access, the file will be truncated to zero length.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_APPEND</constant> - write operations write data at the
-          end of the file.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_NONBLOCK</constant> - sets non blocking mode.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>O_NOCTTY</constant> - prevent the OS from
-          assigning the opened file as the process's controlling
-          terminal when opening a TTY device file.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>flags</parameter> contains
-       <constant>O_CREAT</constant>, <parameter>mode</parameter> will
-       set the permissions of the file (creation
-       permissions). <parameter>mode</parameter> is required for
-       correct operation when <constant>O_CREAT</constant> is
-       specified in <parameter>flags</parameter> and is ignored
-       otherwise.
-      </para>
-      <para>
-       The actual permissions assigned to the created file will be
-       affected by the process's <emphasis>umask</emphasis> setting as
-       per usual.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A file descriptor or &false; on error.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Opening a file descriptor</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$fd = dio_open('/dev/ttyS0', O_RDWR | O_NOCTTY | O_NONBLOCK);
-
-dio_close($fd);
-?>
-]]>
-   </programlisting>
-  </example>    
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dio_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/dio/functions/dio-read.xml b/reference/dio/functions/dio-read.xml
deleted file mode 100644
index 7b5da60a7c0c..000000000000
--- a/reference/dio/functions/dio-read.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-read" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_read</refname>
-  <refpurpose>Reads bytes from a file descriptor</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>dio_read</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>1024</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   The function <function>dio_read</function> reads and returns
-   <parameter>len</parameter> bytes from file with descriptor
-   <parameter>fd</parameter>. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>len</parameter></term>
-     <listitem>
-      <para>
-       The number of bytes to read. If not specified,
-       <function>dio_read</function> reads 1K sized block.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The bytes read from <parameter>fd</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dio_write</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/dio/functions/dio-seek.xml b/reference/dio/functions/dio-seek.xml
deleted file mode 100644
index b7401722eeee..000000000000
--- a/reference/dio/functions/dio-seek.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-seek" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_seek</refname>
-  <refpurpose>Seeks to pos on fd from whence</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dio_seek</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pos</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>whence</parameter><initializer>SEEK_SET</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   The function <function>dio_seek</function> is used to change the
-   file position of the given file descriptor.  
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pos</parameter></term>
-     <listitem>
-      <para>
-       The new position.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>whence</parameter></term>
-     <listitem>
-      <para>
-       Specifies how the position <parameter>pos</parameter> should be 
-       interpreted:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <constant>SEEK_SET</constant> (default) - specifies that 
-          <parameter>pos</parameter> is specified from the beginning of the 
-          file.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>SEEK_CUR</constant> - Specifies that 
-          <parameter>pos</parameter> is a count of characters from the current
-          file position. This count may be positive or negative.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>SEEK_END</constant> - Specifies that 
-          <parameter>pos</parameter> is a count of characters from the end of
-          the file. A negative count specifies a position within the current 
-          extent of the file; a positive count specifies a position past the 
-          current end. If you set the position past the current end, and 
-          actually write data, you will extend the file with zeros up to that
-          position.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Positioning in a file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$fd = dio_open('/dev/ttyS0', O_RDWR);
-
-dio_seek($fd, 10, SEEK_SET);
-// position is now at 10 characters from the start of the file
-
-dio_seek($fd, -2, SEEK_CUR);
-// position is now at 8 characters from the start of the file
-
-dio_seek($fd, -5, SEEK_END);
-// position is now at 5 characters from the end of the file
-
-dio_seek($fd, 10, SEEK_END);
-// position is now at 10 characters past the end of the file. 
-// The 10 characters between the end of the file and the current
-// position are filled with zeros.
-
-dio_close($fd);
-?>
-]]>
-    </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/dio/functions/dio-stat.xml b/reference/dio/functions/dio-stat.xml
deleted file mode 100644
index ec71b73727e0..000000000000
--- a/reference/dio/functions/dio-stat.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-stat" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_stat</refname>
-  <refpurpose>
-   Gets stat information about the file descriptor fd
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>dio_stat</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dio_stat</function> returns information about the given file
-   descriptor.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array with the following keys:
-   <itemizedlist>
-    <listitem>
-     <para>
-      "device" - device
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "inode" - inode
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "mode" - mode
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "nlink" - number of hard links
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "uid" - user id
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "gid" - group id
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "device_type" - device type (if inode device)
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "size" - total size in bytes
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "blocksize" - blocksize
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "blocks" - number of blocks allocated
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "atime" - time of last access
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "mtime" - time of last modification
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      "ctime" - time of last change
-     </para>
-    </listitem>
-   </itemizedlist>
-   On error <function>dio_stat</function> returns &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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dio/functions/dio-tcsetattr.xml b/reference/dio/functions/dio-tcsetattr.xml
deleted file mode 100644
index f89a453d2f93..000000000000
--- a/reference/dio/functions/dio-tcsetattr.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-tcsetattr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_tcsetattr</refname>
-  <refpurpose>
-   Sets terminal attributes and baud rate for a serial port
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dio_tcsetattr</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dio_tcsetattr</function> sets the terminal attributes and baud
-   rate of the open <parameter>fd</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       The currently available options are: 
-       <itemizedlist>
-        <listitem>
-         <para>
-          'baud' - baud rate of the port - can be 38400,19200,9600,4800,2400,1800,
-          1200,600,300,200,150,134,110,75 or 50, default value is 9600.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          'bits' - data bits - can be 8,7,6 or 5. Default value is 8.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          'stop' - stop bits - can be 1 or 2. Default value is 1.
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          'parity' - can be 0,1 or 2. Default value is 0.
-         </para>
-        </listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Setting the baud rate on a serial port</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$fd = dio_open('/dev/ttyS0', O_RDWR | O_NOCTTY | O_NONBLOCK);
-
-dio_fcntl($fd, F_SETFL, O_SYNC);
-
-dio_tcsetattr($fd, array(
-    'baud' => 9600,
-    'bits' => 8,
-    'stop'  => 1,
-    'parity' => 0
-)); 
-
-while (true) {
-    $data = dio_read($fd, 256);
-    if ($data !== null && $data !== '') {
-        echo $data;
-    }
-} 
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.no-windows;
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dio/functions/dio-truncate.xml b/reference/dio/functions/dio-truncate.xml
deleted file mode 100644
index 092263246c18..000000000000
--- a/reference/dio/functions/dio-truncate.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-truncate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_truncate</refname>
-  <refpurpose>
-   Truncates file descriptor fd to offset bytes 
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>dio_truncate</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dio_truncate</function> truncates a file to at most 
-   <parameter>offset</parameter> bytes in size.
-  </para>
-  <para>
-   If the file previously was larger than this size, the extra data is 
-   lost. If the file previously was shorter, it is unspecified whether the
-   file is left unchanged or is extended. In the latter case the extended 
-   part reads as zero bytes.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The offset in bytes.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.no-windows;
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/dio/functions/dio-write.xml b/reference/dio/functions/dio-write.xml
deleted file mode 100644
index 5d579e3fb837..000000000000
--- a/reference/dio/functions/dio-write.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.dio-write" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>dio_write</refname>
-  <refpurpose>
-   Writes data to fd with optional truncation at length 
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>dio_write</methodname>
-   <methodparam><type>resource</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>len</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>dio_write</function> writes up to <parameter>len</parameter> 
-   bytes from <parameter>data</parameter> to file <parameter>fd</parameter>. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fd</parameter></term>
-     <listitem>
-      <para>
-       The file descriptor returned by <function>dio_open</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       The written data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>len</parameter></term>
-     <listitem>
-      <para>
-       The length of data to write in bytes. If not specified, the 
-       function writes all the data to the specified file.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes written to <parameter>fd</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>dio_read</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/dio/reference.xml b/reference/dio/reference.xml
deleted file mode 100644
index f61fe3fcd136..000000000000
--- a/reference/dio/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.dio" xmlns="http://docbook.org/ns/docbook">
- <title>Direct IO &Functions;</title>
-
- &reference.dio.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/dio/setup.xml b/reference/dio/setup.xml
deleted file mode 100644
index 5f843158f4b8..000000000000
--- a/reference/dio/setup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="dio.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.dio.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="dio.resources">
-  &reftitle.resources;
-  <para>
-   One resource type is defined by this extension:
-   a file descriptor returned by <function>dio_open</function>.
-  </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/dio/versions.xml b/reference/dio/versions.xml
deleted file mode 100644
index 7216f1279548..000000000000
--- a/reference/dio/versions.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='dio_close' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_fcntl' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_open' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_read' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_seek' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_stat' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_tcsetattr' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_truncate' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.1.0'/>
- <function name='dio_write' from='PHP 4 &gt;= 4.2.0, PHP 5 &lt; 5.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/ds/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ds/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ds/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ds/book.xml b/reference/ds/book.xml
deleted file mode 100644
index 4a6d5f5db18e..000000000000
--- a/reference/ds/book.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.ds">
-  &reftitle.intro;
-  <para>
-    Efficient data structures for PHP 7, provided as an alternative to the &array;.
-  </para>
-  <para>
-    See <link xlink:href="&url.blog.data.structures;">this blog post</link>
-    for benchmarks, discussion and frequently asked questions.
-  </para>
- </preface>
-
- &reference.ds.setup;
- &reference.ds.examples;
-
- &reference.ds.ds.collection;
- &reference.ds.ds.hashable;
-
- &reference.ds.ds.sequence;
- &reference.ds.ds.vector;
- &reference.ds.ds.deque;
-
- &reference.ds.ds.map;
- &reference.ds.ds.pair;
- &reference.ds.ds.set;
- &reference.ds.ds.stack;
- &reference.ds.ds.queue;
- &reference.ds.ds.priorityqueue;
-
-</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/ds/ds.collection.xml b/reference/ds/ds.collection.xml
deleted file mode 100644
index 734f2d939222..000000000000
--- a/reference/ds/ds.collection.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-collection" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Collection interface</title>
- <titleabbrev>Ds\Collection</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-collection.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Collection</classname> is the base interface which covers functionality
-    common to all the data structures in this library. It guarantees that all structures
-    are traversable, countable, and can be converted to json using <function>json_encode</function>.
-   </simpara>
-  </section>
-
-  <section xml:id="ds-collection.synopsis">
-   &reftitle.interfacesynopsis;
-
-   <classsynopsis class="interface">
-    <oointerface><interfacename>Ds\Collection</interfacename></oointerface>
-
-    <oointerface>
-     <modifier>extends</modifier>
-     <interfacename>Countable</interfacename>
-    </oointerface>
-    <oointerface>
-     <interfacename>IteratorAggregate</interfacename>
-    </oointerface>
-    <oointerface>
-     <interfacename>JsonSerializable</interfacename>
-    </oointerface>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-collection')/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.countable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iteratoraggregate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.jsonserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-
-   </classsynopsis>
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL ds 1.4.0</entry>
-       <entry>
-        <classname>Collection</classname> implements
-        <interfacename>IteratorAggregate</interfacename> now instead of just <interfacename>Traversable</interfacename>. (This change came to the polyfill in 1.4.1.)
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.collection;
-
-</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/ds/ds.deque.xml b/reference/ds/ds.deque.xml
deleted file mode 100644
index badebc0db79f..000000000000
--- a/reference/ds/ds.deque.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-deque" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Deque class</title>
- <titleabbrev>Ds\Deque</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-deque.intro">
-   &reftitle.intro;
-   <para>
-    A Deque (pronounced “deck”) is a sequence of values
-    in a contiguous buffer that grows and shrinks automatically.
-    The name is a common abbreviation of “double-ended queue” and is used
-    internally by <classname>Ds\Queue</classname>.
-   </para>
-   <para>
-    Two pointers are used to keep track of a head and a tail. The pointers can
-    “wrap around” the end of the buffer, which avoids the need to move other
-    values around to make room. This makes shift and unshift very fast — 
-    something a <classname>Ds\Vector</classname> can’t compete with.
-   </para>
-   <para>
-    Accessing a value by index requires a translation between the index and its
-    corresponding position in the buffer: <code>((head + position) % capacity)</code>.
-   </para>
-  </section>
-
-<section xml:id="ds-deque.strengths">
-    <title xmlns="http://docbook.org/ns/docbook">Strengths</title>
-    <para>
-        <simplelist>
-            <member>Supports array syntax (square brackets).</member>
-            <member>Uses less overall memory than an &array; for the same number of values.</member>
-            <member>Automatically frees allocated memory when its size drops low enough.</member>
-            <member>
-                <function>get</function>,
-                <function>set</function>,
-                <function>push</function>,
-                <function>pop</function>,
-                <function>shift</function>, and
-                <function>unshift</function> are all O(1).
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-<section xml:id="ds-deque.weaknesses">
-    <title xmlns="http://docbook.org/ns/docbook">Weaknesses</title>
-    <para>
-        <simplelist>
-            <member>Capacity must be a power of 2.</member>
-            <member>
-                <function>insert</function> and
-                <function>remove</function> are O(n).
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-  <section xml:id="ds-deque.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Deque</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Deque</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Sequence</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-deque.constants.min-capacity">Ds\Deque::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-deque')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-deque.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-deque.constants.min-capacity">
-     <term><constant>Ds\Deque::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.deque;
-
-</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/ds/ds.hashable.xml b/reference/ds/ds.hashable.xml
deleted file mode 100644
index 18beecd152ef..000000000000
--- a/reference/ds/ds.hashable.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-hashable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Hashable interface</title>
- <titleabbrev>Ds\Hashable</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-hashable.intro">
-   &reftitle.intro;
-   <simpara>
-        Hashable is an interface which allows objects to be used as keys.
-        It’s an alternative to <function>spl_object_hash</function>,
-        which determines an object’s hash based on its handle:
-        this means that two objects that are considered equal by an implicit
-        definition would not be treated as equal because they are not the same instance.
-   </simpara>
-   <simpara>
-        <function>hash</function> is used to return a scalar value to be used as
-        the object's hash value, which determines where it goes in the hash table.
-        While this value does not have to be unique, objects which are equal must
-        have the same hash value.
-    </simpara>
-    <simpara>
-        <function>equals</function> is used to determine if two objects are equal.
-        It's guaranteed that the comparing object will be an instance of the same class
-        as the subject.
-    </simpara>
-
-  </section>
-
-  <section xml:id="ds-hashable.synopsis">
-   &reftitle.interfacesynopsis;
-
-   <classsynopsis class="interface">
-    <oointerface><interfacename>Ds\Hashable</interfacename></oointerface>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-hashable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.hashable;
-
-</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/ds/ds.map.xml b/reference/ds/ds.map.xml
deleted file mode 100644
index d98861711672..000000000000
--- a/reference/ds/ds.map.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-map" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Map class</title>
- <titleabbrev>Ds\Map</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-map.intro">
-   &reftitle.intro;
-   <para>
-    A Map is a sequential collection of key-value pairs, almost identical to an
-    &array; used in a similar context. Keys can be any type, but must be unique.
-    Values are replaced if added to the map using the same key.
-   </para>
-  </section>
-
-
-
-<section xml:id="ds-map.strengths">
-    <title xmlns="http://docbook.org/ns/docbook">Strengths</title>
-    <para>
-        <simplelist>
-            <member>Keys and values can be any type, including objects.</member>
-            <member>Supports array syntax (square brackets).</member>
-            <member>Insertion order is preserved.</member>
-            <member>Performance and memory efficiency is very similar to an &array;.</member>
-            <member>Automatically frees allocated memory when its size drops low enough.</member>
-        </simplelist>
-   </para>
-</section>
-
-<section xml:id="ds-map.weaknesses">
-    <title xmlns="http://docbook.org/ns/docbook">Weaknesses</title>
-    <para>
-        <simplelist>
-            <member>Can’t be converted to an array when objects are used as keys.</member>
-        </simplelist>
-   </para>
-</section>
-
-
-  <section xml:id="ds-map.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Map</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Map</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Collection</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-map.constants.min-capacity">Ds\Map::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-map')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-map.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-map.constants.min-capacity">
-     <term><constant>Ds\Map::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-       <row>
-        <entry>PECL ds 1.2.0</entry>
-        <entry>
-         <constant>Ds\Map::MIN_CAPACITY</constant> changed from 16 to 8.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.map;
-
-</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/ds/ds.pair.xml b/reference/ds/ds.pair.xml
deleted file mode 100644
index a70f9d8e7b88..000000000000
--- a/reference/ds/ds.pair.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-pair" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Pair class</title>
- <titleabbrev>Ds\Pair</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-pair.intro">
-   &reftitle.intro;
-   <simpara>
-    A pair is used by <classname>Ds\Map</classname> to pair keys with values.
-   </simpara>
-  </section>
-
-  <section xml:id="ds-pair.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Pair</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Pair</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-pair')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis)"/>
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-pair')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-    </classsynopsis>
-
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.pair;
-
-</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/ds/ds.priorityqueue.xml b/reference/ds/ds.priorityqueue.xml
deleted file mode 100644
index bc41929b8abd..000000000000
--- a/reference/ds/ds.priorityqueue.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-priorityqueue" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The PriorityQueue class</title>
- <titleabbrev>Ds\PriorityQueue</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-priorityqueue.intro">
-   &reftitle.intro;
-   <para>
-    A PriorityQueue is very similar to a Queue. Values are pushed into the queue
-    with an assigned priority, and the value with the highest priority will
-    always be at the front of the queue.
-   </para>
-   <para>
-        Implemented using a max heap.
-   </para>
-   <note>
-        <para>
-            "First in, first out" ordering is preserved for values with the same priority.
-        </para>
-   </note>
-   <note>
-        <para>
-            Iterating over a PriorityQueue is destructive, equivalent to successive pop operations until the queue is empty.
-        </para>
-   </note>
-  </section>
-
-  <section xml:id="ds-priorityqueue.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\PriorityQueue</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\PriorityQueue</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Collection</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-priorityqueue.constants.min-capacity">Ds\PriorityQueue::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-priorityqueue')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-priorityqueue.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-priorityqueue.constants.min-capacity">
-     <term><constant>Ds\PriorityQueue::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.priorityqueue;
-
-</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/ds/ds.queue.xml b/reference/ds/ds.queue.xml
deleted file mode 100644
index eba8c6f4e5ad..000000000000
--- a/reference/ds/ds.queue.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-queue" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Queue class</title>
- <titleabbrev>Ds\Queue</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-queue.intro">
-   &reftitle.intro;
-   <para>
-    A Queue is a “first in, first out” or “FIFO” collection that only allows
-    access to the value at the front of the queue and iterates in that order,
-    destructively.
-   </para>
-  </section>
-
-  <section xml:id="ds-queue.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Queue</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Queue</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Collection</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-queue.constants.min-capacity">Ds\Queue::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-queue')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-queue.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-queue.constants.min-capacity">
-     <term><constant>Ds\Queue::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.queue;
-
-</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/ds/ds.sequence.xml b/reference/ds/ds.sequence.xml
deleted file mode 100644
index 098b3289cde1..000000000000
--- a/reference/ds/ds.sequence.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-sequence" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Sequence interface</title>
- <titleabbrev>Ds\Sequence</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-sequence.intro">
-   &reftitle.intro;
-   <para>
-        A Sequence describes the behaviour of values arranged in a single, linear dimension.
-        Some languages refer to this as a "List". It’s similar to an array that uses
-        incremental integer keys, with the exception of a few characteristics:
-        <simplelist>
-            <member>Values will always be indexed as [0, 1, 2, …, size - 1].</member>
-            <member>Only allowed to access values by index in the range [0, size - 1].</member>
-        </simplelist>
-    </para>
-    <para>
-        Use cases:
-        <simplelist>
-            <member>Wherever you would use an array as a list (not concerned with keys).</member>
-            <member>A more efficient alternative to
-                <classname>SplDoublyLinkedList</classname> and
-                <classname>SplFixedArray</classname>.
-            </member>
-        </simplelist>
-   </para>
-  </section>
-
-  <section xml:id="ds-sequence.synopsis">
-   &reftitle.interfacesynopsis;
-
-   <classsynopsis class="interface">
-    <oointerface><interfacename>Ds\Sequence</interfacename></oointerface>
-
-    <oointerface>
-     <modifier>extends</modifier>
-     <interfacename>Ds\Collection</interfacename>
-    </oointerface>
-    <oointerface>
-     <interfacename>ArrayAccess</interfacename>
-    </oointerface>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-sequence')/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.ds-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.countable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.iteratoraggregate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.jsonserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.arrayaccess')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural') and not(modifier='private')])"/>
-
-   </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 ds 1.3.0</entry>
-        <entry>
-         The interface now extends <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.sequence;
-
-</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/ds/ds.set.xml b/reference/ds/ds.set.xml
deleted file mode 100644
index b85ef9161ea0..000000000000
--- a/reference/ds/ds.set.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-set" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Set class</title>
- <titleabbrev>Ds\Set</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-set.intro">
-   &reftitle.intro;
-   <para>
-    A Set is a sequence of unique values. This implementation uses the same hash
-    table as <classname>Ds\Map</classname>, where values are used as keys and the
-    mapped value is ignored.
-   </para>
-  </section>
-
-<section xml:id="ds-set.strengths">
-    <title xmlns="http://docbook.org/ns/docbook">Strengths</title>
-    <para>
-        <simplelist>
-            <member>Values can be any type, including objects.</member>
-            <member>Supports array syntax (square brackets).</member>
-            <member>Insertion order is preserved.</member>
-            <member>Automatically frees allocated memory when its size drops low enough.</member>
-            <member>
-                <function>add</function>,
-                <function>remove</function> and
-                <function>contains</function> are all O(1).
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-<section xml:id="ds-set.weaknesses">
-    <title xmlns="http://docbook.org/ns/docbook">Weaknesses</title>
-    <para>
-        <simplelist>
-            <member>Doesn’t support
-                <function>push</function>,
-                <function>pop</function>,
-                <function>insert</function>,
-                <function>shift</function>, or
-                <function>unshift</function>.
-            </member>
-            <member>
-                <function>get</function> is O(n) if there are deleted values
-                in the buffer before the accessed index, O(1) otherwise.
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-  <section xml:id="ds-set.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Set</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Set</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Collection</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-set.constants.min-capacity">Ds\Set::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-set')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-set.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-set.constants.min-capacity">
-     <term><constant>Ds\Set::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-       <row>
-        <entry>PECL ds 1.2.7</entry>
-        <entry>
-         Added the <methodname>Ds\Set::map</methodname> method.
-        </entry>
-       </row>
-       <row>
-        <entry>PECL ds 1.2.0</entry>
-        <entry>
-         <constant>Ds\Set::MIN_CAPACITY</constant> changed from 16 to 8.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.set;
-
-</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/ds/ds.stack.xml b/reference/ds/ds.stack.xml
deleted file mode 100644
index 8d2a21f4bda5..000000000000
--- a/reference/ds/ds.stack.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-stack" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Stack class</title>
- <titleabbrev>Ds\Stack</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-stack.intro">
-   &reftitle.intro;
-   <simpara>
-    A Stack is a “last in, first out” or “LIFO” collection that only allows
-    access to the value at the top of the structure and iterates in that order,
-    destructively.
-   </simpara>
-   <simpara>
-    Uses a <classname>Ds\Vector</classname> internally.
-   </simpara>
-  </section>
-
-  <section xml:id="ds-stack.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Ds\Stack</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Ds\Stack</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Ds\Collection</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-stack')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.stack;
-
-</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/ds/ds.vector.xml b/reference/ds/ds.vector.xml
deleted file mode 100644
index 9594effcd6b7..000000000000
--- a/reference/ds/ds.vector.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ds-vector" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Vector class</title>
- <titleabbrev>Ds\Vector</titleabbrev>
-
- <partintro>
-
-  <section xml:id="ds-vector.intro">
-   &reftitle.intro;
-   <para>
-    A Vector is a sequence of values in a contiguous buffer that grows and
-    shrinks automatically. It’s the most efficient sequential structure because
-    a value’s index is a direct mapping to its index in the buffer, and the
-    growth factor isn't bound to a specific multiple or exponent.
-   </para>
-  </section>
-
-<section xml:id="ds-vector.strengths">
-    <title xmlns="http://docbook.org/ns/docbook">Strengths</title>
-    <para>
-        <simplelist>
-            <member>Supports array syntax (square brackets).</member>
-            <member>Uses less overall memory than an &array; for the same number of values.</member>
-            <member>Automatically frees allocated memory when its size drops low enough.</member>
-            <member>Capacity does not have to be a power of 2.</member>
-            <member>
-                <function>get</function>,
-                <function>set</function>,
-                <function>push</function>,
-                <function>pop</function> are all O(1).
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-<section xml:id="ds-vector.weaknesses">
-    <title xmlns="http://docbook.org/ns/docbook">Weaknesses</title>
-    <para>
-        <simplelist>
-            <member>
-                <function>shift</function>,
-                <function>unshift</function>,
-                <function>insert</function> and
-                <function>remove</function> are all O(n).
-            </member>
-        </simplelist>
-   </para>
-</section>
-
-  <section xml:id="ds-vector.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass>
-        <classname>Ds\Vector</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-
-    <ooclass><classname>Ds\Vector</classname></ooclass>
-    <oointerface><interfacename>Ds\Sequence</interfacename></oointerface>
-    <oointerface><interfacename>ArrayAccess</interfacename></oointerface>
-
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ds-vector.constants.min-capacity">Ds\Vector::MIN_CAPACITY</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ds-vector')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ds-vector.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ds-vector.constants.min-capacity">
-     <term><constant>Ds\Vector::MIN_CAPACITY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </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 ds 1.3.0</entry>
-        <entry>
-         The class now implements <classname>ArrayAccess</classname>.
-        </entry>
-       </row>
-       <row>
-        <entry>PECL ds 1.2.0</entry>
-        <entry>
-         <constant>Ds\Vector::MIN_CAPACITY</constant> changed from 10 to 8.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ds.ds.entities.vector;
-
-</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/ds/ds/collection/clear.xml b/reference/ds/ds/collection/clear.xml
deleted file mode 100644
index 4c07cf06ec9b..000000000000
--- a/reference/ds/ds/collection/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-collection.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Collection::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Collection::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the collection.
-  </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;
-  <example>
-   <title><function>Ds\Collection::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$collection = new \Ds\Vector([1, 2, 3]);
-print_r($collection);
-
-$collection->clear();
-print_r($collection);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Vector Object
-(
-)
-]]>
-   </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/ds/ds/collection/copy.xml b/reference/ds/ds/collection/copy.xml
deleted file mode 100644
index ea4af34fb08d..000000000000
--- a/reference/ds/ds/collection/copy.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-collection.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Collection::copy</refname>
-  <refpurpose>Returns a shallow copy of the collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Collection</type><methodname>Ds\Collection::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Collection::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Vector([1, 2, 3]);
-$b = $a->copy();
-
-$b->push(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-)
-]]>
-   </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/ds/ds/collection/isempty.xml b/reference/ds/ds/collection/isempty.xml
deleted file mode 100644
index 418d0e292afd..000000000000
--- a/reference/ds/ds/collection/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-collection.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Collection::isEmpty</refname>
-  <refpurpose>Returns whether the collection is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Collection::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the collection is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the collection is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Collection::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Vector([1, 2, 3]);
-$b = new \Ds\Vector();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/collection/toarray.xml b/reference/ds/ds/collection/toarray.xml
deleted file mode 100644
index 44b782af7bc3..000000000000
--- a/reference/ds/ds/collection/toarray.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-collection.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Collection::toArray</refname>
-  <refpurpose>
-    Converts the collection to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Collection::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the collection to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Collection::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$collection = new \Ds\Vector([1, 2, 3]);
-
-var_dump($collection->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/deque/allocate.xml b/reference/ds/ds/deque/allocate.xml
deleted file mode 100644
index be614818cede..000000000000
--- a/reference/ds/ds/deque/allocate.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-    </note>
-    <note>
-        <para>
-            Capacity will always be rounded up to the nearest power of 2.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque();
-var_dump($deque->capacity());
-
-$deque->allocate(100);
-var_dump($deque->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-int(128)
-]]>
-   </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/ds/ds/deque/apply.xml b/reference/ds/ds/deque/apply.xml
deleted file mode 100644
index 8d39690988e1..000000000000
--- a/reference/ds/ds/deque/apply.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.apply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::apply</refname>
-  <refpurpose>Updates all values by applying a callback function to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::apply</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Updates all values by applying a <parameter>callback</parameter> function to
-    each value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-        </para>
-        <para>
-            A <type>callable</type> to apply to each value in the deque.
-        </para>
-
-        <para>
-            The callback should return what the value should be replaced by.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::apply</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-$deque->apply(function($value) { return $value * 2; });
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-]]>
-   </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/ds/ds/deque/capacity.xml b/reference/ds/ds/deque/capacity.xml
deleted file mode 100644
index 3672eda1af38..000000000000
--- a/reference/ds/ds/deque/capacity.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Deque::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque();
-var_dump($deque->capacity());
-
-$deque->push(...range(1, 50));
-var_dump($deque->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-int(64)
-]]>
-   </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/ds/ds/deque/clear.xml b/reference/ds/ds/deque/clear.xml
deleted file mode 100644
index 742018dbc911..000000000000
--- a/reference/ds/ds/deque/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::clear</refname>
-  <refpurpose>Removes all values from the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the deque.
-  </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;
-  <example>
-   <title><function>Ds\Deque::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-print_r($deque);
-
-$deque->clear();
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Deque Object
-(
-)
-]]>
-   </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/ds/ds/deque/construct.xml b/reference/ds/ds/deque/construct.xml
deleted file mode 100644
index 9579cc6b1c5d..000000000000
--- a/reference/ds/ds/deque/construct.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Deque::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-      A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Deque::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque();
-var_dump($deque);
-
-$deque = new \Ds\Deque([1, 2, 3]);
-var_dump($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Deque)#2 (0) {
-}
-object(Ds\Deque)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/deque/contains.xml b/reference/ds/ds/deque/contains.xml
deleted file mode 100644
index 878ec0320e25..000000000000
--- a/reference/ds/ds/deque/contains.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.contains" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::contains</refname>
-  <refpurpose>Determines if the deque contains given values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Deque::contains</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines if the deque contains all values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        Values to check.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &false; if any of the provided <parameter>values</parameter> are not in the
-    deque, &true; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::contains</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(['a', 'b', 'c', 1, 2, 3]);
-
-var_dump($deque->contains('a'));                // true
-var_dump($deque->contains('a', 'b'));           // true
-var_dump($deque->contains('c', 'd'));           // false
-
-var_dump($deque->contains(...['c', 'b', 'a'])); // true
-
-// Always strict
-var_dump($deque->contains(1));                  // true
-var_dump($deque->contains('1'));                // false
-
-var_dump($deque->contains(...[]));                 // true
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-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/ds/ds/deque/copy.xml b/reference/ds/ds/deque/copy.xml
deleted file mode 100644
index 49cfb60adba7..000000000000
--- a/reference/ds/ds/deque/copy.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::copy</refname>
-  <refpurpose>Returns a shallow copy of the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A shallow copy of the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Deque([1, 2, 3]);
-$b = $a->copy();
-
-$b->push(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-)
-]]>
-   </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/ds/ds/deque/count.xml b/reference/ds/ds/deque/count.xml
deleted file mode 100644
index a374bdfc4a00..000000000000
--- a/reference/ds/ds/deque/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::count</refname>
-  <refpurpose>Returns the number of values in the collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/deque/filter.xml b/reference/ds/ds/deque/filter.xml
deleted file mode 100644
index b61b5934f738..000000000000
--- a/reference/ds/ds/deque/filter.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::filter</refname>
-  <refpurpose>
-    Creates a new deque using a <type>callable</type> to
-    determine which values to include
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::filter</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new deque using a <type>callable</type> to
-    determine which values to include.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
- <variablelist>
-
-    <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>bool</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-            </methodsynopsis>
-        </para>
-        <para>
-            Optional <type>callable</type> which returns &true; if the value should be included, &false; otherwise.
-        </para>
-        <para>
-            If a callback is not provided, only values which are &true;
-            (see <link linkend="language.types.boolean.casting">converting to boolean</link>)
-            will be included.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A new deque containing all the values for which
-    either the <parameter>callback</parameter> returned &true;, or all values that
-    convert to &true; if a <parameter>callback</parameter> was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::filter</function> example using callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3, 4, 5]);
-
-var_dump($deque->filter(function($value) {
-    return $value % 2 == 0;
-}));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Deque)#3 (2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(4)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::filter</function> example without a callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([0, 1, 'a', true, false]);
-
-var_dump($deque->filter());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Deque)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  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/ds/ds/deque/find.xml b/reference/ds/ds/deque/find.xml
deleted file mode 100644
index dfab9c66c009..000000000000
--- a/reference/ds/ds/deque/find.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::find</refname>
-  <refpurpose>
-    Attempts to find a value's index
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::find</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the index of the <parameter>value</parameter>, or &false; if not found.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value to find.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The index of the value, or &false; if not found.
-  </para>
-  <note>
-        <para>
-            Values will be compared by value and by type.
-        </para>
-    </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::find</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", 1, true]);
-
-var_dump($deque->find("a")); // 0
-var_dump($deque->find("b")); // false
-var_dump($deque->find("1")); // false
-var_dump($deque->find(1));   // 1
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(0)
-bool(false)
-bool(false)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/deque/first.xml b/reference/ds/ds/deque/first.xml
deleted file mode 100644
index f3837b3ccaba..000000000000
--- a/reference/ds/ds/deque/first.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::first</refname>
-  <refpurpose>Returns the first value in the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::first</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the first value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-var_dump($deque->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/deque/get.xml b/reference/ds/ds/deque/get.xml
deleted file mode 100644
index 374a3738380e..000000000000
--- a/reference/ds/ds/deque/get.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::get</refname>
-  <refpurpose>Returns the value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::get</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the value at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index to access, starting at 0.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the requested index.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-var_dump($deque->get(0));
-var_dump($deque->get(1));
-var_dump($deque->get(2));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::get</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-var_dump($deque[0]);
-var_dump($deque[1]);
-var_dump($deque[2]);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/deque/insert.xml b/reference/ds/ds/deque/insert.xml
deleted file mode 100644
index 136ec85ce9cb..000000000000
--- a/reference/ds/ds/deque/insert.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::insert</refname>
-  <refpurpose>Inserts values at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::insert</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Inserts values into the deque at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index at which to insert. <code>0 &lt;= index &lt;= count</code>
-     </para>
-     <note>
-        <para>
-            You can insert at the index equal to the number of values.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The value or values to insert.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
-<refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque();
-
-$deque->insert(0, "e");             // [e]
-$deque->insert(1, "f");             // [e, f]
-$deque->insert(2, "g");             // [e, f, g]
-$deque->insert(0, "a", "b");        // [a, b, e, f, g]
-$deque->insert(2, ...["c", "d"]);   // [a, b, c, d, e, f, g]
-
-var_dump($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Deque)#1 (7) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-}
-]]>
-   </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/ds/ds/deque/isempty.xml b/reference/ds/ds/deque/isempty.xml
deleted file mode 100644
index 8fcf23f7eeea..000000000000
--- a/reference/ds/ds/deque/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::isEmpty</refname>
-  <refpurpose>Returns whether the deque is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Deque::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the deque is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the deque is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Deque([1, 2, 3]);
-$b = new \Ds\Deque();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/deque/join.xml b/reference/ds/ds/deque/join.xml
deleted file mode 100644
index 6eef2d348814..000000000000
--- a/reference/ds/ds/deque/join.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.join" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::join</refname>
-  <refpurpose>Joins all values together as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Ds\Deque::join</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>glue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Joins all values together as a string using an optional separator between each value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>glue</parameter></term>
-    <listitem>
-     <para>
-        An optional string to separate each value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    All values of the deque joined together as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::join</function> example using a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c", 1, 2, 3]);
-
-var_dump($deque->join("|"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "a|b|c|1|2|3"
-]]>
-   </screen>
-  </example>
-  <example>
- <title><function>Ds\Deque::join</function> example without a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c", 1, 2, 3]);
-
-var_dump($deque->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "abc123"
-]]>
-   </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/ds/ds/deque/jsonserialize.xml b/reference/ds/ds/deque/jsonserialize.xml
deleted file mode 100644
index d3be59b2044f..000000000000
--- a/reference/ds/ds/deque/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/deque/last.xml b/reference/ds/ds/deque/last.xml
deleted file mode 100644
index 8718c8041505..000000000000
--- a/reference/ds/ds/deque/last.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::last</refname>
-  <refpurpose>Returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::last</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the last value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The last value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::last</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-var_dump($deque->last());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/ds/ds/deque/map.xml b/reference/ds/ds/deque/map.xml
deleted file mode 100644
index def1d450e67e..000000000000
--- a/reference/ds/ds/deque/map.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.map" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::map</refname>
-  <refpurpose>Returns the result of applying a callback to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of applying a <parameter>callback</parameter> function to
-    each value in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-         </para>
-         <para>
-            A <type>callable</type> to apply to each value in the deque.
-         </para>
-
-         <para>
-            The callable should return what the new value will be in the new deque.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of applying a <parameter>callback</parameter> to each value in
-    the deque.
-  </para>
-  <note>
-    <para>
-        The values of the current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::map</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-print_r($deque->map(function($value) { return $value * 2; }));
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-]]>
-   </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/ds/ds/deque/merge.xml b/reference/ds/ds/deque/merge.xml
deleted file mode 100644
index 02412b276f02..000000000000
--- a/reference/ds/ds/deque/merge.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::merge</refname>
-  <refpurpose>Returns the result of adding all given values to the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::merge</methodname>
-   <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of adding all given values to the deque.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A <classname>traversable</classname> object or an &array;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of adding all given values to the deque,
-    effectively the same as adding the values to a copy, then returning that copy.
-  </para>
-  <note>
-    <para>
-        The current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::merge</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-var_dump($deque->merge([4, 5, 6]));
-var_dump($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Deque)#2 (6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-object(Ds\Deque)#1 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/deque/pop.xml b/reference/ds/ds/deque/pop.xml
deleted file mode 100644
index 44960b60dac0..000000000000
--- a/reference/ds/ds/deque/pop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::pop</refname>
-  <refpurpose>Removes and returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the last value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The removed last value.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-var_dump($deque->pop());
-var_dump($deque->pop());
-var_dump($deque->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(2)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/deque/push.xml b/reference/ds/ds/deque/push.xml
deleted file mode 100644
index f42c6bccb36b..000000000000
--- a/reference/ds/ds/deque/push.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::push</refname>
-  <refpurpose>Adds values to the end of the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::push</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds values to the end of the deque.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to add.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque();
-
-$deque->push("a");
-$deque->push("b");
-$deque->push("c", "d");
-$deque->push(...["e", "f"]);
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-    [4] => e
-    [5] => f
-)
-]]>
-   </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/ds/ds/deque/reduce.xml b/reference/ds/ds/deque/reduce.xml
deleted file mode 100644
index 745bcf683fb4..000000000000
--- a/reference/ds/ds/deque/reduce.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.reduce" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::reduce</refname>
-  <refpurpose>Reduces the deque to a single value using a callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::reduce</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>initial</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Reduces the deque to a single value using a callback function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>carry</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>carry</parameter></term>
-        <listitem>
-         <para>
-          The return value of the previous callback, or <parameter>initial</parameter> if
-          it's the first iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>value</parameter></term>
-        <listitem>
-         <para>
-          The value of the current iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initial</parameter></term>
-    <listitem>
-     <para>
-        The initial value of the carry value. Can be &null;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The return value of the final callback.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::reduce</function> with initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-$callback = function($carry, $value) {
-    return $carry * $value;
-};
-
-var_dump($deque->reduce($callback, 5));
-
-// Iterations:
-//
-// $carry = $initial = 5
-//
-// $carry = $carry * 1 =  5
-// $carry = $carry * 2 = 10
-// $carry = $carry * 3 = 30
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(30)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::reduce</function> without an initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-var_dump($deque->reduce(function($carry, $value) {
-    return $carry + $value + 5;
-}));
-
-// Iterations:
-//
-// $carry = $initial = null
-//
-// $carry = $carry + 1 + 5 =  6
-// $carry = $carry + 2 + 5 = 13
-// $carry = $carry + 3 + 5 = 21
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(21)
-]]>
-   </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/ds/ds/deque/remove.xml b/reference/ds/ds/deque/remove.xml
deleted file mode 100644
index 100470a89dff..000000000000
--- a/reference/ds/ds/deque/remove.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::remove</refname>
-  <refpurpose>Removes and returns a value by index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::remove</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes and returns a value by index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index of the value to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value that was removed.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-var_dump($deque->remove(1));
-var_dump($deque->remove(0));
-var_dump($deque->remove(0));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "b"
-string(1) "a"
-string(1) "c"
-]]>
-   </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/ds/ds/deque/reverse.xml b/reference/ds/ds/deque/reverse.xml
deleted file mode 100644
index c530d5176a23..000000000000
--- a/reference/ds/ds/deque/reverse.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.reverse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::reverse</refname>
-  <refpurpose>
-    Reverses the deque in-place
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::reverse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Reverses the deque in-place.
-  </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;
-  <example>
-   <title><function>Ds\Deque::reverse</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-$deque->reverse();
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-]]>
-   </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/ds/ds/deque/reversed.xml b/reference/ds/ds/deque/reversed.xml
deleted file mode 100644
index f08000242a3e..000000000000
--- a/reference/ds/ds/deque/reversed.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.reversed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::reversed</refname>
-  <refpurpose>Returns a reversed copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::reversed</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a reversed copy of the deque.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A reversed copy of the deque.
-
-    <note>
-        <para>
-            The current instance is not affected.
-        </para>
-    </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::reversed</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-print_r($deque->reversed());
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-Ds\Deque Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-)
-]]>
-   </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/ds/ds/deque/rotate.xml b/reference/ds/ds/deque/rotate.xml
deleted file mode 100644
index dce00cbcea33..000000000000
--- a/reference/ds/ds/deque/rotate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.rotate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::rotate</refname>
-  <refpurpose>Rotates the deque by a given number of rotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::rotate</methodname>
-   <methodparam><type>int</type><parameter>rotations</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Rotates the deque by a given number of rotations, which is equivalent
-    to successively calling <code>$deque-&gt;push($deque-&gt;shift())</code> if the number
-    of rotations is positive, or <code>$deque-&gt;unshift($deque-&gt;pop())</code> if negative.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rotations</parameter></term>
-    <listitem>
-     <para>
-        The number of times the deque should be rotated.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;. The deque of the current instance will be rotated.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::rotate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c", "d"]);
-
-$deque->rotate(1);  // "a" is shifted, then pushed.
-print_r($deque);
-
-$deque->rotate(2);  // "b" and "c" are both shifted, then pushed.
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => a
-)
-Ds\Deque Object
-(
-    [0] => d
-    [1] => a
-    [2] => b
-    [3] => c
-)
-]]>
-   </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/ds/ds/deque/set.xml b/reference/ds/ds/deque/set.xml
deleted file mode 100644
index 1555e6951a8f..000000000000
--- a/reference/ds/ds/deque/set.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::set</refname>
-  <refpurpose>Updates a value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::set</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Updates a value at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index of the value to update.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The new value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-    &reftitle.returnvalues;
-    <para>
-        &return.void;
-    </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::set</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-$deque->set(1, "_");
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::set</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-$deque[1] = "_";
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </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/ds/ds/deque/shift.xml b/reference/ds/ds/deque/shift.xml
deleted file mode 100644
index ad76fb929a03..000000000000
--- a/reference/ds/ds/deque/shift.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::shift</refname>
-  <refpurpose>Removes and returns the first value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Deque::shift</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the first value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first value, which was removed.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::shift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c"]);
-
-var_dump($deque->shift());
-var_dump($deque->shift());
-var_dump($deque->shift());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/deque/slice.xml b/reference/ds/ds/deque/slice.xml
deleted file mode 100644
index f8191128f8fd..000000000000
--- a/reference/ds/ds/deque/slice.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.slice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::slice</refname>
-  <refpurpose>
-   Returns a sub-deque of a given range
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::slice</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a sub-deque of a given range.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-        <para>
-            The index at which the sub-deque starts.
-        </para>
-        <para>
-            If positive, the deque will start at that index in the deque.
-            If negative, the deque will start that far from the end.
-        </para>
-    </listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-        If a length is given and is positive, the resulting
-        deque will have up to that many values in it.
-
-        If the length results in an overflow, only
-        values up to the end of the deque will be included.
-
-        If a length is given and is negative, the deque
-        will stop that many values from the end.
-
-        If a length is not provided, the resulting deque
-        will contain all values between the index and the
-        end of the deque.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A sub-deque of the given range.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::slice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque(["a", "b", "c", "d", "e"]);
-
-// Slice from 2 onwards
-print_r($deque->slice(2));
-
-// Slice from 1, for a length of 3
-print_r($deque->slice(1, 3));
-
-// Slice from 1 onwards
-print_r($deque->slice(1));
-
-// Slice from 2 from the end onwards
-print_r($deque->slice(-2));
-
-// Slice from 1 to 1 from the end
-print_r($deque->slice(1, -1));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => c
-    [1] => d
-    [2] => e
-)
-Ds\Deque Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-Ds\Deque Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => e
-)
-Ds\Deque Object
-(
-    [0] => d
-    [1] => e
-)
-Ds\Deque Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-
-]]>
-   </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/ds/ds/deque/sort.xml b/reference/ds/ds/deque/sort.xml
deleted file mode 100644
index b50d2c2fdab6..000000000000
--- a/reference/ds/ds/deque/sort.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::sort</refname>
-  <refpurpose>
-    Sorts the deque in-place
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::sort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sorts the deque in-place, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([4, 5, 1, 3, 2]);
-$deque->sort();
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([4, 5, 1, 3, 2]);
-
-$deque->sort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/deque/sorted.xml b/reference/ds/ds/deque/sorted.xml
deleted file mode 100644
index 93241d67bcba..000000000000
--- a/reference/ds/ds/deque/sorted.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.sorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::sorted</refname>
-  <refpurpose>Returns a sorted copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Deque</type><methodname>Ds\Deque::sorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a sorted copy, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns a sorted copy of the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::sorted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([4, 5, 1, 3, 2]);
-
-print_r($deque->sorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::sorted</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([4, 5, 1, 3, 2]);
-
-$sorted = $deque->sorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/deque/sum.xml b/reference/ds/ds/deque/sum.xml
deleted file mode 100644
index 5ae0a7135f6a..000000000000
--- a/reference/ds/ds/deque/sum.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::sum</refname>
-  <refpurpose>Returns the sum of all values in the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>Ds\Deque::sum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the sum of all values in the deque.
-  </para>
-  <note>
-    <para>
-        Arrays and objects are considered equal to zero when calculating the sum.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The sum of all the values in the deque as either a <type>float</type> or <type>int</type>
-    depending on the values in the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::sum</function> integer example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-var_dump($deque->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(6)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Deque::sum</function> float example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2.5, 3]);
-var_dump($deque->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-float(6.5)
-]]>
-   </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/ds/ds/deque/toarray.xml b/reference/ds/ds/deque/toarray.xml
deleted file mode 100644
index 6fba07034307..000000000000
--- a/reference/ds/ds/deque/toarray.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::toArray</refname>
-  <refpurpose>
-    Converts the deque to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Deque::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the deque to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the deque.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-var_dump($deque->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/deque/unshift.xml b/reference/ds/ds/deque/unshift.xml
deleted file mode 100644
index 7618263ce2d2..000000000000
--- a/reference/ds/ds/deque/unshift.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-deque.unshift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Deque::unshift</refname>
-  <refpurpose>Adds values to the front of the deque</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Deque::unshift</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds values to the front of the deque, moving all the current
-    values forward to make room for the new values.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to add to the front of the deque.
-        <note>
-            <para>
-                Multiple values will be added in the same order that they are
-                passed.
-            </para>
-        </note>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Deque::unshift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$deque = new \Ds\Deque([1, 2, 3]);
-
-$deque->unshift("a");
-$deque->unshift("b", "c");
-
-print_r($deque);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Deque Object
-(
-    [0] => b
-    [1] => c
-    [2] => a
-    [3] => 1
-    [4] => 2
-    [5] => 3
-)
-]]>
-   </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/ds/ds/hashable/equals.xml b/reference/ds/ds/hashable/equals.xml
deleted file mode 100644
index e2c56f21724f..000000000000
--- a/reference/ds/ds/hashable/equals.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-hashable.equals" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Hashable::equals</refname>
-  <refpurpose>Determines whether an object is equal to the current instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Ds\Hashable::equals</methodname>
-   <methodparam><type>object</type><parameter>obj</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines whether another object is equal to the current instance.
-  </para>
-
-  <para>
-    This method allows objects to be used as keys in structures such as
-    <classname>Ds\Map</classname> and <classname>Ds\Set</classname>, or any
-    other lookup structure that honors this interface.
-  </para>
-
-  <note>
-    <para>
-        It's guaranteed that <parameter>obj</parameter> is an instance of the same class.
-    </para>
-  </note>
-
-  <caution>
-    <para>
-        It's important that objects which are equal also have the same hash value.
-        See <function>Ds\Hashable::hash</function>.
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>obj</parameter></term>
-    <listitem>
-     <para>
-        The object to compare the current instance to, which is always an instance of
-        the same class.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &true; if equal, &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/ds/ds/hashable/hash.xml b/reference/ds/ds/hashable/hash.xml
deleted file mode 100644
index 386c85e05816..000000000000
--- a/reference/ds/ds/hashable/hash.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-hashable.hash" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Hashable::hash</refname>
-  <refpurpose>Returns a scalar value to be used as a hash value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Hashable::hash</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a scalar value to be used as the hash value of the objects.
-  </para>
-  <para>
-    While the hash value does not define equality, all objects that are equal according to <function>Ds\Hashable::equals</function>
-    must have the same hash value. Hash values of equal objects don't have to be unique, for example
-    you could just return &true; for all objects and nothing would break - the only
-    implication would be that hash tables then turn into linked lists because all
-    your objects will be hashed to the same bucket. It's therefore very important
-    that you pick a good hash value, such as an ID or email address.
- </para>
-
-  <para>
-    This method allows objects to be used as keys in structures such as
-    <classname>Ds\Map</classname> and <classname>Ds\Set</classname>, or any
-    other lookup structure that honors this interface.
-  </para>
-
-  <caution>
-    <para>
-        Do not pick a value that might change within the object, such as a public
-        property. Hash table lookups would fail because the hash has changed.
-    </para>
-  </caution>
-
-  <caution>
-    <para>
-        All objects that are equal must have the same hash value.
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A scalar value to be used as this object's hash value.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Hashable::hash</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class HashableObject implements \Ds\Hashable
-{
-    private $name;
-    private $email;
-
-    public function __construct($name, $email)
-    {
-        $this->name  = $name;
-        $this->email = $email;
-    }
-
-    /**
-     * Should return the same value for all equal objects, but doesn't have to
-     * be unique. This value will not be used to determine equality.
-     */
-    public function hash()
-    {
-        return $this->email;
-    }
-
-    /**
-     * This determines equality, usually during a hash table lookup to determine
-     * if the bucket's key matches the lookup key. The hash has to be equal if
-     * the objects are equal, otherwise this determination wouldn't be reached.
-     */
-    public function equals($obj): bool
-    {
-        return $this->name  === $obj->name
-            && $this->email === $obj->email;
-    }
-}
-?>
-]]>
-   </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/ds/ds/map/allocate.xml b/reference/ds/ds/map/allocate.xml
deleted file mode 100644
index ad645579f163..000000000000
--- a/reference/ds/ds/map/allocate.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Allocates enough memory for a required capacity.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-     </note>
-     <note>
-        <para>
-            Capacity will always be rounded up to the nearest power of 2.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map();
-var_dump($map->capacity());
-
-$map->allocate(100);
-var_dump($map->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(16)
-int(128)
-]]>
-   </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/ds/ds/map/apply.xml b/reference/ds/ds/map/apply.xml
deleted file mode 100644
index 03dbb4ca967a..000000000000
--- a/reference/ds/ds/map/apply.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.apply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::apply</refname>
-  <refpurpose>Updates all values by applying a callback function to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::apply</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Updates all values by applying a <parameter>callback</parameter> function to
-    each value in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-        </para>
-        <para>
-            A <type>callable</type> to apply to each value in the map.
-        </para>
-
-        <para>
-            The callback should return what the value should be replaced by.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::apply</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$map->apply(function($key, $value) { return $value * 2; });
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 4
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 6
-        )
-
-)
-]]>
-   </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/ds/ds/map/capacity.xml b/reference/ds/ds/map/capacity.xml
deleted file mode 100644
index 4f65668a1e49..000000000000
--- a/reference/ds/ds/map/capacity.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Map::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map();
-var_dump($map->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(16)
-]]>
-   </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/ds/ds/map/clear.xml b/reference/ds/ds/map/clear.xml
deleted file mode 100644
index 0e2cb991fa50..000000000000
--- a/reference/ds/ds/map/clear.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the map.
-  </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;
-  <example>
-   <title><function>Ds\Map::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map([
-    "a" => 1,
-    "b" => 2,
-    "c" => 3,
-]);
-print_r($map);
-
-$map->clear();
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-Ds\Map Object
-(
-)
-]]>
-   </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/ds/ds/map/construct.xml b/reference/ds/ds/map/construct.xml
deleted file mode 100644
index ecd58f298c80..000000000000
--- a/reference/ds/ds/map/construct.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Map::__construct</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Map::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map();
-var_dump($map);
-
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#1 (0) {
-}
-object(Ds\Map)#2 (3) {
-  [0]=>
-  object(Ds\Pair)#1 (2) {
-    ["key"]=>
-    string(1) "a"
-    ["value"]=>
-    int(1)
-  }
-  [1]=>
-  object(Ds\Pair)#3 (2) {
-    ["key"]=>
-    string(1) "b"
-    ["value"]=>
-    int(2)
-  }
-  [2]=>
-  object(Ds\Pair)#4 (2) {
-    ["key"]=>
-    string(1) "c"
-    ["value"]=>
-    int(3)
-  }
-}
-]]>
-   </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/ds/ds/map/copy.xml b/reference/ds/ds/map/copy.xml
deleted file mode 100644
index 2fbc8c4b3fc1..000000000000
--- a/reference/ds/ds/map/copy.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::copy</refname>
-  <refpurpose>Returns a shallow copy of the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map([
-    "a" => 1,
-    "b" => 2,
-    "c" => 3,
-]);
-
-print_r($map->copy());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </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/ds/ds/map/count.xml b/reference/ds/ds/map/count.xml
deleted file mode 100644
index b04276e12f43..000000000000
--- a/reference/ds/ds/map/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::count</refname>
-  <refpurpose>Returns the number of values in the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/map/diff.xml b/reference/ds/ds/map/diff.xml
deleted file mode 100644
index 92c11bdbff46..000000000000
--- a/reference/ds/ds/map/diff.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::diff</refname>
-  <refpurpose>Creates a new map using keys that aren't in another map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::diff</methodname>
-   <methodparam><type>Ds\Map</type><parameter>map</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of removing all keys from the current instance that are
-    present in a given <parameter>map</parameter>.
-  </para>
-  <para>
-    <code>A \ B = {x ∈ A | x ∉ B}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>map</parameter></term>
-    <listitem>
-     <para>
-        The map containing the keys to exclude in the resulting map.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of removing all keys from the current instance that are
-    present in a given <parameter>map</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.complement;">Complement</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::diff</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$b = new \Ds\Map(["b" => 4, "c" => 5, "d" => 6]);
-
-var_dump($a->diff($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#3 (1) {
-  [0]=>
-  object(Ds\Pair)#4 (2) {
-    ["key"]=>
-    string(1) "a"
-    ["value"]=>
-    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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/map/filter.xml b/reference/ds/ds/map/filter.xml
deleted file mode 100644
index da1bbd53848b..000000000000
--- a/reference/ds/ds/map/filter.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::filter</refname>
-  <refpurpose>
-    Creates a new map using a <type>callable</type> to determine which pairs to include
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::filter</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new map using a <type>callable</type> to determine which pairs to include.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>bool</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-            </methodsynopsis>
-        </para>
-        <para>
-            Optional <type>callable</type> which returns &true; if the pair should be included, &false; otherwise.
-        </para>
-        <para>
-            If a callback is not provided, only values which are &true;
-            (see <link linkend="language.types.boolean.casting">converting to boolean</link>)
-            will be included.
-        </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A new map containing all the pairs for which
-    either the <parameter>callback</parameter> returned &true;, or all values that
-    convert to &true; if a <parameter>callback</parameter> was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::filter</function> example using callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a", "b", "c", "d", "e"]);
-
-var_dump($map->filter(function($key, $value) {
-    return $key % 2 == 0;
-}));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#3 (3) {
-  [0]=>
-  object(Ds\Pair)#2 (2) {
-    ["key"]=>
-    int(0)
-    ["value"]=>
-    string(1) "a"
-  }
-  [1]=>
-  object(Ds\Pair)#4 (2) {
-    ["key"]=>
-    int(2)
-    ["value"]=>
-    string(1) "c"
-  }
-  [2]=>
-  object(Ds\Pair)#5 (2) {
-    ["key"]=>
-    int(4)
-    ["value"]=>
-    string(1) "e"
-  }
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::filter</function> example without a callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 0, "b" => 1, "c" => true, "d" => false]);
-
-var_dump($map->filter());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  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/ds/ds/map/first.xml b/reference/ds/ds/map/first.xml
deleted file mode 100644
index 4434e5348605..000000000000
--- a/reference/ds/ds/map/first.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::first</refname>
-  <refpurpose>Returns the first pair in the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Pair</type><methodname>Ds\Map::first</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the first pair in the map.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first pair in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Pair)#2 (2) {
-  ["key"]=>
-  string(1) "a"
-  ["value"]=>
-  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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/map/get.xml b/reference/ds/ds/map/get.xml
deleted file mode 100644
index 835e43f8e34a..000000000000
--- a/reference/ds/ds/map/get.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::get</refname>
-  <refpurpose>Returns the value for a given key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Map::get</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the value for a given key, or an optional default value if the key
-    could not be found.
-  </para>
-
-  <note>
-    <para>
-        Keys of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-
-  <note>
-    <para>
-        You can also use array syntax to access values by key, eg. <code>$map["key"]</code>.
-    </para>
-  </note>
-
-  <caution>
-    <para>
-        Be careful when using array syntax. Scalar keys will be coerced to
-        integers by the engine. For example, <code>$map["1"]</code> will attempt
-        to access <code>int(1)</code>, while <code>$map-&gt;get("1")</code> will
-        correctly look up the string key.
-    </para>
-    <para>
-        See <link linkend="language.types.array">Arrays</link>.
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-        The key to look up.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-     <para>
-        The optional default value, returned if the key could not be found.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value mapped to the given <parameter>key</parameter>, or the <parameter>default</parameter>
-    value if provided and the key could not be found in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfBoundsException</classname> if the key could not be found
-   and a default value was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->get("a"));       // 1
-var_dump($map->get("d", 10));   // 10 (default used)
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(1)
-int(10)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::get</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map["a"]); // 1
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/map/haskey.xml b/reference/ds/ds/map/haskey.xml
deleted file mode 100644
index 30982c250315..000000000000
--- a/reference/ds/ds/map/haskey.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.haskey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::hasKey</refname>
-  <refpurpose>Determines whether the map contains a given key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Map::hasKey</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines whether the map contains a given key.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-        The key to look for.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns &true; if the key could be found, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::hasKey</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->hasKey("a")); // true
-var_dump($map->hasKey("e")); // false
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </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/ds/ds/map/hasvalue.xml b/reference/ds/ds/map/hasvalue.xml
deleted file mode 100644
index 9c8e301c1d2b..000000000000
--- a/reference/ds/ds/map/hasvalue.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.hasvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::hasValue</refname>
-  <refpurpose>Determines whether the map contains a given value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Map::hasValue</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines whether the map contains a given value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value to look for.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns &true; if the value could be found, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::hasValue</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->hasValue(1)); // true
-var_dump($map->hasValue(4)); // false
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </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/ds/ds/map/intersect.xml b/reference/ds/ds/map/intersect.xml
deleted file mode 100644
index 96170889cc0c..000000000000
--- a/reference/ds/ds/map/intersect.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.intersect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::intersect</refname>
-  <refpurpose>Creates a new map by intersecting keys with another map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::intersect</methodname>
-   <methodparam><type>Ds\Map</type><parameter>map</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new map containing the pairs of the current instance whose keys
-    are also present in the given <parameter>map</parameter>.
-
-    In other words, returns a copy of the current instance with all keys removed that
-    are not also in the other <parameter>map</parameter>.
-  </para>
-  <para>
-    <code>A ∩ B = {x : x ∈ A ∧ x ∈ B}</code>
-  </para>
-
-  <note>
-    <para>
-        Values from the current instance will be kept.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>map</parameter></term>
-    <listitem>
-     <para>
-        The other map, containing the keys to intersect with.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-    The key intersection of the current instance and another <parameter>map</parameter>.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.intersection;">Intersection</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::intersect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$b = new \Ds\Map(["b" => 4, "c" => 5, "d" => 6]);
-
-var_dump($a->intersect($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#3 (2) {
-  [0]=>
-  object(Ds\Pair)#4 (2) {
-    ["key"]=>
-    string(1) "b"
-    ["value"]=>
-    int(2)
-  }
-  [1]=>
-  object(Ds\Pair)#5 (2) {
-    ["key"]=>
-    string(1) "c"
-    ["value"]=>
-    int(3)
-  }
-}
-]]>
-   </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/ds/ds/map/isempty.xml b/reference/ds/ds/map/isempty.xml
deleted file mode 100644
index 71b3bf0557df..000000000000
--- a/reference/ds/ds/map/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::isEmpty</refname>
-  <refpurpose>Returns whether the map is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Map::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the map is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the map is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$b = new \Ds\Map();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/map/jsonserialize.xml b/reference/ds/ds/map/jsonserialize.xml
deleted file mode 100644
index 0da6deb87e96..000000000000
--- a/reference/ds/ds/map/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/map/keys.xml b/reference/ds/ds/map/keys.xml
deleted file mode 100644
index 9878196d74ec..000000000000
--- a/reference/ds/ds/map/keys.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.keys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::keys</refname>
-  <refpurpose>Returns a set of the map's keys</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Map::keys</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a set containing all the keys of the map, in the same order.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A <classname>Ds\Set</classname> containing all the keys of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::keys</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map->keys());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#2 (3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-]]>
-   </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/ds/ds/map/ksort.xml b/reference/ds/ds/map/ksort.xml
deleted file mode 100644
index c5614fce1460..000000000000
--- a/reference/ds/ds/map/ksort.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.ksort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::ksort</refname>
-  <refpurpose>
-    Sorts the map in-place by key
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::ksort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Sorts the map in-place by key, using an optional <parameter>comparator</parameter> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::ksort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["b" => 2, "c" => 3, "a" => 1]);
-$map->ksort();
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::ksort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map([1 => "x", 2 => "y", 0 => "z"]);
-
-// Reverse
-$map->ksort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => 2
-            [value] => y
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => 1
-            [value] => x
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => 0
-            [value] => z
-        )
-
-)
-]]>
-   </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/ds/ds/map/ksorted.xml b/reference/ds/ds/map/ksorted.xml
deleted file mode 100644
index dc12b7be4b6c..000000000000
--- a/reference/ds/ds/map/ksorted.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.ksorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::ksorted</refname>
-  <refpurpose>Returns a copy, sorted by key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::ksorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns a copy sorted by key, using an optional <parameter>comparator</parameter> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns a copy of the map, sorted by key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::ksorted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["b" => 2, "c" => 3, "a" => 1]);
-
-print_r($map->ksorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::ksorted</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map([1 => "x", 2 => "y", 0 => "z"]);
-
-// Reverse
-$sorted = $map->ksorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => 2
-            [value] => y
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => 1
-            [value] => x
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => 0
-            [value] => z
-        )
-
-)
-]]>
-   </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/ds/ds/map/last.xml b/reference/ds/ds/map/last.xml
deleted file mode 100644
index 2b53f5bc7c54..000000000000
--- a/reference/ds/ds/map/last.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::last</refname>
-  <refpurpose>Returns the last pair of the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Pair</type><methodname>Ds\Map::last</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the last pair of the map.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The last pair of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::last</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map->last());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Pair)#2 (2) {
-  ["key"]=>
-  string(1) "c"
-  ["value"]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/map/map.xml b/reference/ds/ds/map/map.xml
deleted file mode 100644
index 91c02ff65c97..000000000000
--- a/reference/ds/ds/map/map.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.map" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::map</refname>
-  <refpurpose>Returns the result of applying a callback to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of applying a <parameter>callback</parameter> function to
-    each value of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-         </para>
-         <para>
-            A <type>callable</type> to apply to each value in the map.
-         </para>
-
-         <para>
-            The callable should return what the key will be mapped to in the
-            resulting map.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of applying a <parameter>callback</parameter> to each value in
-    the map.
-  </para>
-  <note>
-    <para>
-        The keys and values of the current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::map</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-print_r($map->map(function($key, $value) { return $value * 2; }));
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 4
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 6
-        )
-
-)
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </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/ds/ds/map/merge.xml b/reference/ds/ds/map/merge.xml
deleted file mode 100644
index a21cc75bffd7..000000000000
--- a/reference/ds/ds/map/merge.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::merge</refname>
-  <refpurpose>Returns the result of adding all given associations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::merge</methodname>
-   <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of associating all keys of a given <classname>traversable</classname>
-    object or &array; with their corresponding values, combined with the current instance.
-  </para>
-
-  <note>
-    <para>
-        Values of the current instance will be overwritten by those provided where keys are equal.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A <classname>traversable</classname> object or an &array;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of associating all keys of a given <classname>traversable</classname>
-    object or &array; with their corresponding values, combined with the current instance.
-  </para>
-  <note>
-    <para>
-        The current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::merge</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-print_r($map->merge(["a" => 10, "e" => 50]));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 10
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-    [3] => Ds\Pair Object
-        (
-            [key] => e
-            [value] => 50
-        )
-
-)
-]]>
-   </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/ds/ds/map/pairs.xml b/reference/ds/ds/map/pairs.xml
deleted file mode 100644
index c34a0749af8d..000000000000
--- a/reference/ds/ds/map/pairs.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.pairs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::pairs</refname>
-  <refpurpose>Returns a sequence containing all the pairs of the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Map::pairs</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a <classname>Ds\Sequence</classname> containing all the pairs of the map.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    <classname>Ds\Sequence</classname> containing all the pairs of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::pairs</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->pairs());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#8 (3) {
-  [0]=>
-  object(Ds\Pair)#5 (2) {
-    ["key"]=>
-    string(1) "a"
-    ["value"]=>
-    int(1)
-  }
-  [1]=>
-  object(Ds\Pair)#6 (2) {
-    ["key"]=>
-    string(1) "b"
-    ["value"]=>
-    int(2)
-  }
-  [2]=>
-  object(Ds\Pair)#7 (2) {
-    ["key"]=>
-    string(1) "c"
-    ["value"]=>
-    int(3)
-  }
-}
-]]>
-   </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/ds/ds/map/put.xml b/reference/ds/ds/map/put.xml
deleted file mode 100644
index 78504d2711f9..000000000000
--- a/reference/ds/ds/map/put.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.put" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::put</refname>
-  <refpurpose>Associates a key with a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::put</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Associates a <parameter>key</parameter> with a <parameter>value</parameter>,
-    overwriting a previous association if one exists.
-  </para>
-
-  <note>
-    <para>
-        Keys of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-
-  <note>
-    <para>
-        You can also use array syntax to associate values by key, eg. <code>$map["key"] = $value</code>.
-    </para>
-  </note>
-
-  <caution>
-    <para>
-        Be careful when using array syntax. Scalar keys will be coerced to
-        integers by the engine. For example, <code>$map["1"]</code> will attempt
-        to access <code>int(1)</code>, while <code>$map-&gt;get("1")</code> will
-        correctly look up the string key.
-    </para>
-    <para>
-        See <link linkend="language.types.array">Arrays</link>.
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-        The key to associate the value with.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value to be associated with the key.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::put</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map();
-
-$map->put("a", 1);
-$map->put("b", 2);
-$map->put("c", 3);
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::put</function> example using objects as keys</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class HashableObject implements \Ds\Hashable
-{
-    /**
-     * An arbitrary value to use as the hash value. Does not define equality.
-     */
-    private $value;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function hash()
-    {
-        return $this->value;
-    }
-
-    public function equals($obj): bool
-    {
-        return $this->value === $obj->value;
-    }
-}
-
-$map = new \Ds\Map();
-
-$obj = new \ArrayIterator([]);
-
-// Using the same instance multiple times will overwrite the previous value.
-$map->put($obj, 1);
-$map->put($obj, 2);
-
-// Using multiple instances of the same object will create new associations.
-$map->put(new \stdClass(), 3);
-$map->put(new \stdClass(), 4);
-
-// Using multiple instances of equal hashable objects will overwrite previous values.
-$map->put(new \HashableObject(1), 5);
-$map->put(new \HashableObject(1), 6);
-$map->put(new \HashableObject(2), 7);
-$map->put(new \HashableObject(2), 8);
-
-var_dump($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Map)#1 (5) {
-  [0]=>
-  object(Ds\Pair)#7 (2) {
-    ["key"]=>
-    object(ArrayIterator)#2 (1) {
-      ["storage":"ArrayIterator":private]=>
-      array(0) {
-      }
-    }
-    ["value"]=>
-    int(2)
-  }
-  [1]=>
-  object(Ds\Pair)#8 (2) {
-    ["key"]=>
-    object(stdClass)#3 (0) {
-    }
-    ["value"]=>
-    int(3)
-  }
-  [2]=>
-  object(Ds\Pair)#9 (2) {
-    ["key"]=>
-    object(stdClass)#4 (0) {
-    }
-    ["value"]=>
-    int(4)
-  }
-  [3]=>
-  object(Ds\Pair)#10 (2) {
-    ["key"]=>
-    object(HashableObject)#5 (1) {
-      ["value":"HashableObject":private]=>
-      int(1)
-    }
-    ["value"]=>
-    int(6)
-  }
-  [4]=>
-  object(Ds\Pair)#11 (2) {
-    ["key"]=>
-    object(HashableObject)#6 (1) {
-      ["value":"HashableObject":private]=>
-      int(2)
-    }
-    ["value"]=>
-    int(8)
-  }
-}
-]]>
-   </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/ds/ds/map/putAll.xml b/reference/ds/ds/map/putAll.xml
deleted file mode 100644
index 1f4a613db37c..000000000000
--- a/reference/ds/ds/map/putAll.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.putall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::putAll</refname>
-  <refpurpose>Associates all key-value pairs of a traversable object or array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::putAll</methodname>
-   <methodparam><type>mixed</type><parameter>pairs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Associates all key-value <parameter>pairs</parameter> of a <classname>traversable</classname> object or &array;.
-  </para>
-
-  <note>
-    <para>
-        Keys of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pairs</parameter></term>
-    <listitem>
-     <para>
-        <classname>traversable</classname> object or &array;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::putAll</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map();
-
-$map->putAll([
-    "a" => 1,
-    "b" => 2,
-    "c" => 3,
-]);
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-   </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/ds/ds/map/reduce.xml b/reference/ds/ds/map/reduce.xml
deleted file mode 100644
index a8f4d466be2b..000000000000
--- a/reference/ds/ds/map/reduce.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.reduce" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::reduce</refname>
-  <refpurpose>Reduces the map to a single value using a callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Map::reduce</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>initial</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Reduces the map to a single value using a callback function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>carry</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>carry</parameter></term>
-        <listitem>
-         <para>
-          The return value of the previous callback, or <parameter>initial</parameter> if
-          it's the first iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>key</parameter></term>
-        <listitem>
-         <para>
-          The key of the current iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>value</parameter></term>
-        <listitem>
-         <para>
-          The value of the current iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initial</parameter></term>
-    <listitem>
-     <para>
-        The initial value of the carry value. Can be &null;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The return value of the final callback.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::reduce</function> with initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-$callback = function($carry, $key, $value) {
-    return $carry * $value;
-};
-
-var_dump($map->reduce($callback, 5));
-
-// Iterations:
-//
-// $carry = $initial = 5
-//
-// $carry = $carry * 1 =  5
-// $carry = $carry * 2 = 10
-// $carry = $carry * 3 = 30
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(30)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::reduce</function> without an initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->reduce(function($carry, $key, $value) {
-    return $carry + $value + 5;
-}));
-
-// Iterations:
-//
-// $carry = $initial = null
-//
-// $carry = $carry + 1 + 5 =  6
-// $carry = $carry + 2 + 5 = 13
-// $carry = $carry + 3 + 5 = 21
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(21)
-]]>
-   </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/ds/ds/map/remove.xml b/reference/ds/ds/map/remove.xml
deleted file mode 100644
index 71d8cd3bc171..000000000000
--- a/reference/ds/ds/map/remove.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::remove</refname>
-  <refpurpose>Removes and returns a value by key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Map::remove</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes and returns a value by key, or return an optional default value if the key
-    could not be found.
-  </para>
-
-  <note>
-    <para>
-        Keys of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-
-  <note>
-    <para>
-        You can also use array syntax to access values by key, eg. <code>$map["key"]</code>.
-    </para>
-  </note>
-
-  <caution>
-    <para>
-        Be careful when using array syntax. Scalar keys will be coerced to
-        integers by the engine. For example, <code>$map["1"]</code> will attempt
-        to access <code>int(1)</code>, while <code>$map-&gt;get("1")</code> will
-        correctly look up the string key.
-    </para>
-    <para>
-        See <link linkend="language.types.array">Arrays</link>.
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-        The key to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-     <para>
-        The optional default value, returned if the key could not be found.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value that was removed, or the <parameter>default</parameter>
-    value if provided and the <parameter>key</parameter> could not be found in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfBoundsException</classname> if the key could not be found
-   and a default value was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->remove("a"));      //  1
-var_dump($map->remove("e", 10));  // 10 (default used)
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(1)
-int(10)
-]]>
-   </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/ds/ds/map/reverse.xml b/reference/ds/ds/map/reverse.xml
deleted file mode 100644
index ca144d868c4d..000000000000
--- a/reference/ds/ds/map/reverse.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.reverse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::reverse</refname>
-  <refpurpose>
-    Reverses the map in-place
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::reverse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Reverses the map in-place.
-  </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;
-  <example>
-   <title><function>Ds\Map::reverse</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$map->reverse();
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 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/ds/ds/map/reversed.xml b/reference/ds/ds/map/reversed.xml
deleted file mode 100644
index 097c3e8d3429..000000000000
--- a/reference/ds/ds/map/reversed.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.reversed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::reversed</refname>
-  <refpurpose>Returns a reversed copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::reversed</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a reversed copy of the map.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A reversed copy of the map.
-
-    <note>
-        <para>
-            The current instance is not affected.
-        </para>
-    </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::reversed</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-print_r($map->reversed());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 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/ds/ds/map/skip.xml b/reference/ds/ds/map/skip.xml
deleted file mode 100644
index 1cddb5db5029..000000000000
--- a/reference/ds/ds/map/skip.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.skip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::skip</refname>
-  <refpurpose>Returns the pair at a given positional index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Pair</type><methodname>Ds\Map::skip</methodname>
-   <methodparam><type>int</type><parameter>position</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the pair at a given zero-based <parameter>position</parameter>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-        The zero-based positional index to return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns the <classname>Ds\Pair</classname> at the given <parameter>position</parameter>.
-  </para>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the position is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::skip</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-
-var_dump($map->skip(1));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Pair)#2 (2) {
-  ["key"]=>
-  string(1) "b"
-  ["value"]=>
-  int(2)
-}
-]]>
-   </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/ds/ds/map/slice.xml b/reference/ds/ds/map/slice.xml
deleted file mode 100644
index 901059a9eef7..000000000000
--- a/reference/ds/ds/map/slice.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.slice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::slice</refname>
-  <refpurpose>
-   Returns a subset of the map defined by a starting index and length
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::slice</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a subset of the map defined by a starting <parameter>index</parameter> and <parameter>length</parameter>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-        <para>
-            The index at which the range starts.
-        </para>
-        <para>
-            If positive, the range will start at that index in the map.
-            If negative, the range will start that far from the end.
-        </para>
-    </listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-        If a length is given and is positive, the resulting
-        map will have up to that many pairs in it.
-
-        If a length is given and is negative, the range
-        will stop that many pairs from the end.
-
-        If the length results in an overflow, only
-        pairs up to the end of the map will be included.
-
-        If a length is not provided, the resulting map
-        will contain all pairs between the index and the
-        end of the map.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A subset of the map defined by a starting index and length.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::slice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3, "d" => 4, "e" => 5]);
-
-// Slice from 2 onwards
-print_r($map->slice(2)->toArray());
-
-// Slice from 1, for a length of 3
-print_r($map->slice(1, 3)->toArray());
-
-// Slice from 1 onwards
-print_r($map->slice(1)->toArray());
-
-// Slice from 2 from the end onwards
-print_r($map->slice(-2)->toArray());
-
-// Slice from 1 to 1 from the end
-print_r($map->slice(1, -1)->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [c] => 3
-    [d] => 4
-    [e] => 5
-)
-Array
-(
-    [b] => 2
-    [c] => 3
-    [d] => 4
-)
-Array
-(
-    [b] => 2
-    [c] => 3
-    [d] => 4
-    [e] => 5
-)
-Array
-(
-    [d] => 4
-    [e] => 5
-)
-Array
-(
-    [b] => 2
-    [c] => 3
-    [d] => 4
-)
-]]>
-   </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/ds/ds/map/sort.xml b/reference/ds/ds/map/sort.xml
deleted file mode 100644
index 723f6274d7fb..000000000000
--- a/reference/ds/ds/map/sort.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::sort</refname>
-  <refpurpose>
-    Sorts the map in-place by value
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Map::sort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sorts the map in-place by value, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 2, "b" => 3, "c" => 1]);
-$map->sort();
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 3
-        )
-
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 2, "b" => 3, "c" => 1]);
-
-$map->sort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($map);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 3
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 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/ds/ds/map/sorted.xml b/reference/ds/ds/map/sorted.xml
deleted file mode 100644
index f02d6cedeb78..000000000000
--- a/reference/ds/ds/map/sorted.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.sorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::sorted</refname>
-  <refpurpose>Returns a copy, sorted by value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::sorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a copy, sorted by value using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns a copy of the map, sorted by value.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 2, "b" => 3, "c" => 1]);
-
-print_r($map->sorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 3
-        )
-
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 2, "b" => 3, "c" => 1]);
-
-// Reverse
-$sorted = $map->sorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 3
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 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/ds/ds/map/sum.xml b/reference/ds/ds/map/sum.xml
deleted file mode 100644
index 9bf04d890e5d..000000000000
--- a/reference/ds/ds/map/sum.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::sum</refname>
-  <refpurpose>Returns the sum of all values in the map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>Ds\Map::sum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the sum of all values in the map.
-  </para>
-  <note>
-    <para>
-        Arrays and objects are considered equal to zero when calculating the sum.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The sum of all the values in the map as either a <type>float</type> or <type>int</type>
-    depending on the values in the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::sum</function> integer example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(6)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Map::sum</function> float example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2.5, "c" => 3]);
-var_dump($map->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-float(6.5)
-]]>
-   </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/ds/ds/map/toarray.xml b/reference/ds/ds/map/toarray.xml
deleted file mode 100644
index 4b30278d641a..000000000000
--- a/reference/ds/ds/map/toarray.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::toArray</refname>
-  <refpurpose>
-    Converts the map to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Map::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the map to an &array;.
-  </para>
-  <caution>
-        <simpara>
-            Maps with non-scalar keys can't be converted to an &array;.
-        </simpara>
-    </caution>
-    <caution>
-        <para>
-            An &array; will treat all numeric keys as integers,
-            eg. <code>"1"</code> and <code>1</code> as keys in the map
-            will only result in <code>1</code> being included in the array.
-        </para>
-    </caution>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map([
-    "a" => 1,
-    "b" => 2,
-    "c" => 3,
-]);
-
-var_dump($map->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/map/union.xml b/reference/ds/ds/map/union.xml
deleted file mode 100644
index f5064677a288..000000000000
--- a/reference/ds/ds/map/union.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.union" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::union</refname>
-  <refpurpose>Creates a new map using values from the current instance and another map</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::union</methodname>
-   <methodparam><type>Ds\Map</type><parameter>map</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new map that contains the pairs of the current instance as well as the
-    pairs of another <parameter>map</parameter>.
-  </para>
-  <para>
-    <code>A ∪ B = {x: x ∈ A ∨ x ∈ B}</code>
-  </para>
-
-  <note>
-    <para>
-        Values of the current instance will be overwritten by those provided where keys are equal.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>map</parameter></term>
-    <listitem>
-     <para>
-        The other map, to combine with the current instance.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-    A new map containing all the pairs of the current instance as well as another <parameter>map</parameter>.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.union.set;">Union</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::union</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$b = new \Ds\Map(["b" => 3, "c" => 4, "d" => 5]);
-
-print_r($a->union($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 3
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 4
-        )
-
-    [3] => Ds\Pair Object
-        (
-            [key] => d
-            [value] => 5
-        )
-
-)
-]]>
-   </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/ds/ds/map/values.xml b/reference/ds/ds/map/values.xml
deleted file mode 100644
index bf14f0206a5f..000000000000
--- a/reference/ds/ds/map/values.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.values" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::values</refname>
-  <refpurpose>Returns a sequence of the map's values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Map::values</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a sequence containing all the values of the map, in the same order.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A <classname>Ds\Sequence</classname> containing all the values of the map.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::values</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$map = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-var_dump($map->values());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/map/xor.xml b/reference/ds/ds/map/xor.xml
deleted file mode 100644
index 53c60982cb79..000000000000
--- a/reference/ds/ds/map/xor.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-map.xor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Map::xor</refname>
-  <refpurpose>Creates a new map using keys of either the current instance or of another map, but not of both</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Map</type><methodname>Ds\Map::xor</methodname>
-   <methodparam><type>Ds\Map</type><parameter>map</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new map containing keys of the current instance as well as another <parameter>map</parameter>,
-    but not of both.
-  </para>
-  <para>
-    <code>A ⊖ B = {x : x ∈ (A \ B) ∪ (B \ A)}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>map</parameter></term>
-    <listitem>
-     <para>
-        The other map.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-        A new map containing keys in the current instance as well as another <parameter>map</parameter>,
-        but not in both.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.symmetric.difference;">Symmetric Difference</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Map::xor</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Map(["a" => 1, "b" => 2, "c" => 3]);
-$b = new \Ds\Map(["b" => 4, "c" => 5, "d" => 6]);
-
-print_r($a->xor($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => d
-            [value] => 6
-        )
-
-)
-]]>
-   </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/ds/ds/pair/clear.xml b/reference/ds/ds/pair/clear.xml
deleted file mode 100644
index 37651d88c694..000000000000
--- a/reference/ds/ds/pair/clear.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Pair::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the pair.
-  </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;
-  <example>
-   <title><function>Ds\Pair::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pair = new \Ds\Pair("a", 1);
-print_r($pair);
-
-$pair->clear();
-print_r($pair);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Pair Object
-(
-    [key] => a
-    [value] => 1
-)
-Ds\Pair Object
-(
-)
-]]>
-   </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/ds/ds/pair/construct.xml b/reference/ds/ds/pair/construct.xml
deleted file mode 100644
index 723822a21484..000000000000
--- a/reference/ds/ds/pair/construct.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Pair::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>value</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance using a given <parameter>key</parameter> and <parameter>value</parameter>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-        The key.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/pair/copy.xml b/reference/ds/ds/pair/copy.xml
deleted file mode 100644
index f2b8481072be..000000000000
--- a/reference/ds/ds/pair/copy.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::copy</refname>
-  <refpurpose>Returns a shallow copy of the pair</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Pair</type><methodname>Ds\Pair::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the pair.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the pair.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Pair::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Pair("a", 1);
-$b = $a->copy();
-
-$a->key = "x";
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Pair Object
-(
-    [key] => x
-    [value] => 1
-)
-Ds\Pair Object
-(
-    [key] => a
-    [value] => 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/ds/ds/pair/isempty.xml b/reference/ds/ds/pair/isempty.xml
deleted file mode 100644
index 240f54c7b928..000000000000
--- a/reference/ds/ds/pair/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::isEmpty</refname>
-  <refpurpose>Returns whether the pair is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Pair::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the pair is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the pair is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Pair::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Pair("a", 1);
-$b = new \Ds\Pair();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/pair/jsonserialize.xml b/reference/ds/ds/pair/jsonserialize.xml
deleted file mode 100644
index 1f778e0d0905..000000000000
--- a/reference/ds/ds/pair/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/pair/toarray.xml b/reference/ds/ds/pair/toarray.xml
deleted file mode 100644
index d7ef6383996e..000000000000
--- a/reference/ds/ds/pair/toarray.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-pair.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Pair::toArray</refname>
-  <refpurpose>
-    Converts the pair to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Pair::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the pair to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the pair.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Pair::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pair = new \Ds\Pair("a", 1);
-
-var_dump($pair->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["key"]=>
-  string(1) "a"
-  ["value"]=>
-  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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/priorityqueue/allocate.xml b/reference/ds/ds/priorityqueue/allocate.xml
deleted file mode 100644
index 30e71e0623ed..000000000000
--- a/reference/ds/ds/priorityqueue/allocate.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\PriorityQueue::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-    </note>
-    <note>
-        <para>
-            Capacity will always be rounded up to the nearest power of 2.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-var_dump($queue->capacity());
-
-$queue->allocate(100);
-var_dump($queue->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-int(128)
-]]>
-   </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/ds/ds/priorityqueue/capacity.xml b/reference/ds/ds/priorityqueue/capacity.xml
deleted file mode 100644
index 65e343f3542b..000000000000
--- a/reference/ds/ds/priorityqueue/capacity.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\PriorityQueue::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-var_dump($queue->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-]]>
-   </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/ds/ds/priorityqueue/clear.xml b/reference/ds/ds/priorityqueue/clear.xml
deleted file mode 100644
index 326a08f377aa..000000000000
--- a/reference/ds/ds/priorityqueue/clear.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\PriorityQueue::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the queue.
-  </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;
-  <example>
-   <title><function>Ds\PriorityQueue::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-$queue->clear();
-print_r($queue);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\PriorityQueue Object
-(
-)
-]]>
-   </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/ds/ds/priorityqueue/construct.xml b/reference/ds/ds/priorityqueue/construct.xml
deleted file mode 100644
index bdd9a49b6a2d..000000000000
--- a/reference/ds/ds/priorityqueue/construct.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\PriorityQueue::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance.
-  </para>
- </refsect1>
-<!--
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter></parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\PriorityQueue::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-var_dump($queue);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\PriorityQueue)#1 (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/ds/ds/priorityqueue/copy.xml b/reference/ds/ds/priorityqueue/copy.xml
deleted file mode 100644
index 559bacdb299f..000000000000
--- a/reference/ds/ds/priorityqueue/copy.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::copy</refname>
-  <refpurpose>Returns a shallow copy of the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\PriorityQueue</type><methodname>Ds\PriorityQueue::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-print_r($queue->copy());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\PriorityQueue Object
-(
-    [0] => b
-    [1] => c
-    [2] => a
-)
-]]>
-   </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/ds/ds/priorityqueue/count.xml b/reference/ds/ds/priorityqueue/count.xml
deleted file mode 100644
index 0899f775af23..000000000000
--- a/reference/ds/ds/priorityqueue/count.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::count</refname>
-  <refpurpose>Returns the number of values in the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/priorityqueue/isempty.xml b/reference/ds/ds/priorityqueue/isempty.xml
deleted file mode 100644
index b8f39f9f8794..000000000000
--- a/reference/ds/ds/priorityqueue/isempty.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::isEmpty</refname>
-  <refpurpose>Returns whether the queue is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\PriorityQueue::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the queue is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the queue is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\PriorityQueue();
-$b = new \Ds\PriorityQueue();
-
-$a->push("a",  5);
-$a->push("b", 15);
-$a->push("c", 10);
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/priorityqueue/jsonserialize.xml b/reference/ds/ds/priorityqueue/jsonserialize.xml
deleted file mode 100644
index f2bbd4d2c58f..000000000000
--- a/reference/ds/ds/priorityqueue/jsonserialize.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/priorityqueue/peek.xml b/reference/ds/ds/priorityqueue/peek.xml
deleted file mode 100644
index aaad62faf226..000000000000
--- a/reference/ds/ds/priorityqueue/peek.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.peek" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::peek</refname>
-  <refpurpose>Returns the value at the front of the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\PriorityQueue::peek</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the value at the front of the queue, but does not remove it.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the front of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::peek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-var_dump($queue->peek());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "b"
-]]>
-   </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/ds/ds/priorityqueue/pop.xml b/reference/ds/ds/priorityqueue/pop.xml
deleted file mode 100644
index b7050f106080..000000000000
--- a/reference/ds/ds/priorityqueue/pop.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::pop</refname>
-  <refpurpose>Removes and returns the value with the highest priority</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\PriorityQueue::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the value at the front of the queue, ie. the value
-    with the highest priority.
-  </para>
-  <note>
-     <para>
-        Values with equal priority fall back to FIFO (first in first out).
-     </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The removed value which was at the front of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-print_r($queue->pop());
-print_r($queue->pop());
-print_r($queue->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/priorityqueue/push.xml b/reference/ds/ds/priorityqueue/push.xml
deleted file mode 100644
index f16171d87c26..000000000000
--- a/reference/ds/ds/priorityqueue/push.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::push</refname>
-  <refpurpose>Pushes values into the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\PriorityQueue::push</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam><type>int</type><parameter>priority</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Pushes a <parameter>value</parameter> with a given <parameter>priority</parameter> into the queue.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value to push into the queue.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>priority</parameter></term>
-    <listitem>
-     <para>
-        The priority associated with the value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-print_r($queue->pop());
-print_r($queue->pop());
-print_r($queue->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "b"
-string(1) "c"
-string(1) "a"
-]]>
-   </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/ds/ds/priorityqueue/toarray.xml b/reference/ds/ds/priorityqueue/toarray.xml
deleted file mode 100644
index f38b60466c94..000000000000
--- a/reference/ds/ds/priorityqueue/toarray.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-priorityqueue.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\PriorityQueue::toArray</refname>
-  <refpurpose>
-    Converts the queue to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\PriorityQueue::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the queue to an &array;.
-  </para>
-  <note>
-    <para>
-        This method is not destructive.
-    </para>
-  </note>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\PriorityQueue::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\PriorityQueue();
-
-$queue->push("a",  5);
-$queue->push("b", 15);
-$queue->push("c", 10);
-
-var_dump($queue->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(1) "b"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(1) "a"
-}
-]]>
-   </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/ds/ds/queue/allocate.xml b/reference/ds/ds/queue/allocate.xml
deleted file mode 100644
index 976a84600aa4..000000000000
--- a/reference/ds/ds/queue/allocate.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Queue::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
-  <note>
-    <para>
-        Capacity will always be rounded up to the nearest power of 2.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-    </note>
-    <note>
-        <para>
-            Capacity will always be rounded up to the nearest power of 2.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-var_dump($queue->capacity());
-
-$queue->allocate(100);
-var_dump($queue->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-int(128)
-]]>
-   </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/ds/ds/queue/capacity.xml b/reference/ds/ds/queue/capacity.xml
deleted file mode 100644
index d1ab1de10fc4..000000000000
--- a/reference/ds/ds/queue/capacity.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Queue::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-var_dump($queue->capacity());
-
-$queue->push(...range(1, 50));
-var_dump($queue->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(8)
-int(64)
-]]>
-   </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/ds/ds/queue/clear.xml b/reference/ds/ds/queue/clear.xml
deleted file mode 100644
index 9dfcda362e6d..000000000000
--- a/reference/ds/ds/queue/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Queue::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the queue.
-  </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;
-  <example>
-   <title><function>Ds\Queue::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue([1, 2, 3]);
-print_r($queue);
-
-$queue->clear();
-print_r($queue);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Queue Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Queue Object
-(
-)
-]]>
-   </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/ds/ds/queue/construct.xml b/reference/ds/ds/queue/construct.xml
deleted file mode 100644
index 51d59eef4a43..000000000000
--- a/reference/ds/ds/queue/construct.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Queue::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-      A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Queue::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-var_dump($queue);
-
-
-$queue = new \Ds\Queue([1, 2, 3]);
-var_dump($queue);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Queue)#2 (0) {
-}
-object(Ds\Queue)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/queue/copy.xml b/reference/ds/ds/queue/copy.xml
deleted file mode 100644
index 11489c17344d..000000000000
--- a/reference/ds/ds/queue/copy.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::copy</refname>
-  <refpurpose>Returns a shallow copy of the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Queue</type><methodname>Ds\Queue::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Queue([1, 2, 3]);
-$b = $a->copy();
-
-// Updating the copy doesn't affect the original
-$b->push(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Queue Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Queue Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-)
-]]>
-   </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/ds/ds/queue/count.xml b/reference/ds/ds/queue/count.xml
deleted file mode 100644
index 1ec916c88320..000000000000
--- a/reference/ds/ds/queue/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::count</refname>
-  <refpurpose>Returns the number of values in the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/queue/isempty.xml b/reference/ds/ds/queue/isempty.xml
deleted file mode 100644
index a8a1d0ce798a..000000000000
--- a/reference/ds/ds/queue/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::isEmpty</refname>
-  <refpurpose>Returns whether the queue is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Queue::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the queue is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the queue is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Queue([1, 2, 3]);
-$b = new \Ds\Queue();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/queue/jsonserialize.xml b/reference/ds/ds/queue/jsonserialize.xml
deleted file mode 100644
index 26513d0511a7..000000000000
--- a/reference/ds/ds/queue/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/queue/peek.xml b/reference/ds/ds/queue/peek.xml
deleted file mode 100644
index 57371f8febce..000000000000
--- a/reference/ds/ds/queue/peek.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.peek" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::peek</refname>
-  <refpurpose>Returns the value at the front of the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Queue::peek</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the value at the front of the queue, but does not remove it.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the front of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::peek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-
-$queue->push("a");
-$queue->push("b");
-$queue->push("c");
-
-var_dump($queue->peek());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-]]>
-   </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/ds/ds/queue/pop.xml b/reference/ds/ds/queue/pop.xml
deleted file mode 100644
index 3d098b733605..000000000000
--- a/reference/ds/ds/queue/pop.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::pop</refname>
-  <refpurpose>Removes and returns the value at the front of the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Queue::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the value at the front of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The removed value which was at the front of the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-
-$queue->push("a");
-$queue->push("b");
-$queue->push("c");
-
-var_dump($queue->pop());
-var_dump($queue->pop());
-var_dump($queue->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/queue/push.xml b/reference/ds/ds/queue/push.xml
deleted file mode 100644
index 759df53ec3b1..000000000000
--- a/reference/ds/ds/queue/push.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::push</refname>
-  <refpurpose>Pushes values into the queue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Queue::push</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Pushes <parameter>values</parameter> into the queue.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to push into the queue.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue();
-
-$queue->push("a");
-$queue->push("b");
-$queue->push("c", "d");
-$queue->push(...["e", "f"]);
-
-print_r($queue);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Queue Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-    [4] => e
-    [5] => f
-)
-]]>
-   </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/ds/ds/queue/toarray.xml b/reference/ds/ds/queue/toarray.xml
deleted file mode 100644
index 2da9aa766bc9..000000000000
--- a/reference/ds/ds/queue/toarray.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-queue.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Queue::toArray</refname>
-  <refpurpose>
-    Converts the queue to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Queue::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the queue to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-  <note>
-    <para>
-        This method is not destructive.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the queue.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Queue::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$queue = new \Ds\Queue([1, 2, 3]);
-
-var_dump($queue->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/sequence/allocate.xml b/reference/ds/ds/sequence/allocate.xml
deleted file mode 100644
index 98b6aff42bdf..000000000000
--- a/reference/ds/ds/sequence/allocate.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <simpara>
-        The number of values for which capacity should be allocated.
-     </simpara>
-     <note>
-        <simpara>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </simpara>
-    </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector();
-var_dump($sequence->capacity());
-
-$vector->allocate(100);
-var_dump($sequence->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(100)
-]]>
-   </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/ds/ds/sequence/apply.xml b/reference/ds/ds/sequence/apply.xml
deleted file mode 100644
index 4d67a5f45fda..000000000000
--- a/reference/ds/ds/sequence/apply.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.apply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::apply</refname>
-  <refpurpose>Updates all values by applying a callback function to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::apply</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Updates all values by applying a <parameter>callback</parameter> function to
-    each value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-        </para>
-        <simpara>
-            A <type>callable</type> to apply to each value in the sequence.
-        </simpara>
-
-        <simpara>
-            The callback should return what the value should be replaced by.
-        </simpara>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::apply</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-$sequence->apply(function($value) { return $value * 2; });
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-]]>
-   </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/ds/ds/sequence/capacity.xml b/reference/ds/ds/sequence/capacity.xml
deleted file mode 100644
index 521d832f5a5c..000000000000
--- a/reference/ds/ds/sequence/capacity.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>Ds\Sequence::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Returns the current capacity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The current capacity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector();
-var_dump($sequence->capacity());
-
-$sequence->push(...range(1, 50));
-var_dump($sequence->capacity());
-
-$sequence[] = "a";
-var_dump($sequence->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(50)
-int(75)
-]]>
-   </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/ds/ds/sequence/contains.xml b/reference/ds/ds/sequence/contains.xml
deleted file mode 100644
index 56ec838c1ea7..000000000000
--- a/reference/ds/ds/sequence/contains.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.contains" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::contains</refname>
-  <refpurpose>Determines if the sequence contains given values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Ds\Sequence::contains</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Determines if the sequence contains all values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-        Values to check.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &false; if any of the provided <parameter>values</parameter> are not in the
-    sequence, &true; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::contains</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(['a', 'b', 'c', 1, 2, 3]);
-
-var_dump($sequence->contains('a'));                // true
-var_dump($sequence->contains('a', 'b'));           // true
-var_dump($sequence->contains('c', 'd'));           // false
-
-var_dump($sequence->contains(...['c', 'b', 'a'])); // true
-
-// Always strict
-var_dump($sequence->contains(1));                  // true
-var_dump($sequence->contains('1'));                // false
-
-var_dump($sequence->contains(...[]));               // true
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-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/ds/ds/sequence/filter.xml b/reference/ds/ds/sequence/filter.xml
deleted file mode 100644
index 502854b595c4..000000000000
--- a/reference/ds/ds/sequence/filter.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::filter</refname>
-  <refpurpose>
-    Creates a new sequence using a <type>callable</type> to
-    determine which values to include
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::filter</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Creates a new sequence using a <type>callable</type> to
-    determine which values to include.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
- <variablelist>
-
-    <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>bool</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-            </methodsynopsis>
-        </para>
-        <simpara>
-            Optional <type>callable</type> which returns &true; if the value should be included, &false; otherwise.
-        </simpara>
-        <simpara>
-            If a callback is not provided, only values which are &true;
-            (see <link linkend="language.types.boolean.casting">converting to boolean</link>)
-            will be included.
-        </simpara>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A new sequence containing all the values for which
-    either the <parameter>callback</parameter> returned &true;, or all values that
-    convert to &true; if a <parameter>callback</parameter> was not provided.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::filter</function> example using callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3, 4, 5]);
-
-var_dump($sequence->filter(function($value) {
-    return $value % 2 == 0;
-}));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#3 (2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(4)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::filter</function> example without a callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([0, 1, 'a', true, false]);
-
-var_dump($sequence->filter());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  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/ds/ds/sequence/find.xml b/reference/ds/ds/sequence/find.xml
deleted file mode 100644
index 7991f9d01a27..000000000000
--- a/reference/ds/ds/sequence/find.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::find</refname>
-  <refpurpose>
-    Attempts to find a value's index
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::find</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns the index of the <parameter>value</parameter>, or &false; if not found.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-        The value to find.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The index of the value, or &false; if not found.
-  </simpara>
-  <note>
-        <simpara>
-            Values will be compared by value and by type.
-        </simpara>
-    </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::find</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", 1, true]);
-
-var_dump($sequence->find("a")); // 0
-var_dump($sequence->find("b")); // false
-var_dump($sequence->find("1")); // false
-var_dump($sequence->find(1));   // 1
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(0)
-bool(false)
-bool(false)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/sequence/first.xml b/reference/ds/ds/sequence/first.xml
deleted file mode 100644
index e7322c7e02a9..000000000000
--- a/reference/ds/ds/sequence/first.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::first</refname>
-  <refpurpose>Returns the first value in the sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::first</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Returns the first value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The first value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-var_dump($sequence->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/sequence/get.xml b/reference/ds/ds/sequence/get.xml
deleted file mode 100644
index 51e8df0cb380..000000000000
--- a/reference/ds/ds/sequence/get.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::get</refname>
-  <refpurpose>Returns the value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::get</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns the value at a given index.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <simpara>
-        The index to access, starting at 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The value at the requested index.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($sequence->get(0));
-var_dump($sequence->get(1));
-var_dump($sequence->get(2));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::get</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($sequence[0]);
-var_dump($sequence[1]);
-var_dump($sequence[2]);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/sequence/insert.xml b/reference/ds/ds/sequence/insert.xml
deleted file mode 100644
index 32cc7d0ed41a..000000000000
--- a/reference/ds/ds/sequence/insert.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::insert</refname>
-  <refpurpose>Inserts values at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::insert</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Inserts values into the sequence at a given index.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index at which to insert. <code>0 &lt;= index &lt;= count</code>
-     </para>
-     <note>
-        <simpara>
-            You can insert at the index equal to the number of values.
-        </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-        The value or values to insert.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
-<refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector();
-
-$sequence->insert(0, "e");             // [e]
-$sequence->insert(1, "f");             // [e, f]
-$sequence->insert(2, "g");             // [e, f, g]
-$sequence->insert(0, "a", "b");        // [a, b, e, f, g]
-$sequence->insert(2, ...["c", "d"]);   // [a, b, c, d, e, f, g]
-
-var_dump($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#1 (7) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-}
-]]>
-   </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/ds/ds/sequence/join.xml b/reference/ds/ds/sequence/join.xml
deleted file mode 100644
index 57b63cda3076..000000000000
--- a/reference/ds/ds/sequence/join.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.join" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::join</refname>
-  <refpurpose>Joins all values together as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Ds\Sequence::join</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>glue</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Joins all values together as a string using an optional separator between each value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>glue</parameter></term>
-    <listitem>
-     <simpara>
-        An optional string to separate each value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    All values of the sequence joined together as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::join</function> example using a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c", 1, 2, 3]);
-
-var_dump($sequence->join("|"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "a|b|c|1|2|3"
-]]>
-   </screen>
-  </example>
-  <example>
- <title><function>Ds\Sequence::join</function> example without a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c", 1, 2, 3]);
-
-var_dump($sequence->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "abc123"
-]]>
-   </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/ds/ds/sequence/last.xml b/reference/ds/ds/sequence/last.xml
deleted file mode 100644
index 90a7431115b6..000000000000
--- a/reference/ds/ds/sequence/last.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::last</refname>
-  <refpurpose>Returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::last</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Returns the last value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The last value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::last</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-var_dump($sequence->last());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/ds/ds/sequence/map.xml b/reference/ds/ds/sequence/map.xml
deleted file mode 100644
index 644c973b2699..000000000000
--- a/reference/ds/ds/sequence/map.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.map" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::map</refname>
-  <refpurpose>Returns the result of applying a callback to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns the result of applying a <parameter>callback</parameter> function to
-    each value in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-         </para>
-         <simpara>
-            A <type>callable</type> to apply to each value in the sequence.
-         </simpara>
-
-         <simpara>
-            The callable should return what the new value will be in the new sequence.
-        </simpara>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The result of applying a <parameter>callback</parameter> to each value in
-    the sequence.
-  </simpara>
-  <note>
-    <simpara>
-        The values of the current instance won't be affected.
-    </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::map</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-print_r($sequence->map(function($value) { return $value * 2; }));
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-]]>
-   </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/ds/ds/sequence/merge.xml b/reference/ds/ds/sequence/merge.xml
deleted file mode 100644
index 689af930591a..000000000000
--- a/reference/ds/ds/sequence/merge.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::merge</refname>
-  <refpurpose>Returns the result of adding all given values to the sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::merge</methodname>
-   <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns the result of adding all given values to the sequence.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-        A <classname>traversable</classname> object or an &array;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The result of adding all given values to the sequence,
-    effectively the same as adding the values to a copy, then returning that copy.
-  </simpara>
-  <note>
-    <simpara>
-        The current instance won't be affected.
-    </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::merge</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-var_dump($sequence->merge([4, 5, 6]));
-var_dump($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-object(Ds\Vector)#1 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/sequence/pop.xml b/reference/ds/ds/sequence/pop.xml
deleted file mode 100644
index 86fe364a3b11..000000000000
--- a/reference/ds/ds/sequence/pop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::pop</refname>
-  <refpurpose>Removes and returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Removes and returns the last value.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The removed last value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-var_dump($sequence->pop());
-var_dump($sequence->pop());
-var_dump($sequence->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(2)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/sequence/push.xml b/reference/ds/ds/sequence/push.xml
deleted file mode 100644
index a0b9232a7a52..000000000000
--- a/reference/ds/ds/sequence/push.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::push</refname>
-  <refpurpose>Adds values to the end of the sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::push</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Adds values to the end of the sequence.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-        The values to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector();
-
-$sequence->push("a");
-$sequence->push("b");
-$sequence->push("c", "d");
-$sequence->push(...["e", "f"]);
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-    [4] => e
-    [5] => f
-)
-]]>
-   </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/ds/ds/sequence/reduce.xml b/reference/ds/ds/sequence/reduce.xml
deleted file mode 100644
index 6ae1fbb02e2c..000000000000
--- a/reference/ds/ds/sequence/reduce.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.reduce" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::reduce</refname>
-  <refpurpose>Reduces the sequence to a single value using a callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::reduce</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>initial</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Reduces the sequence to a single value using a callback function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>carry</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>carry</parameter></term>
-        <listitem>
-         <simpara>
-          The return value of the previous callback, or <parameter>initial</parameter> if
-          it's the first iteration.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>value</parameter></term>
-        <listitem>
-         <simpara>
-          The value of the current iteration.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initial</parameter></term>
-    <listitem>
-     <simpara>
-        The initial value of the carry value. Can be &null;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The return value of the final callback.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::reduce</function> with initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-$callback = function($carry, $value) {
-    return $carry * $value;
-};
-
-var_dump($sequence->reduce($callback, 5));
-
-// Iterations:
-//
-// $carry = $initial = 5
-//
-// $carry = $carry * 1 =  5
-// $carry = $carry * 2 = 10
-// $carry = $carry * 3 = 30
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(30)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::reduce</function> without an initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-var_dump($sequence->reduce(function($carry, $value) {
-    return $carry + $value + 5;
-}));
-
-// Iterations:
-//
-// $carry = $initial = null
-//
-// $carry = $carry + 1 + 5 =  6
-// $carry = $carry + 2 + 5 = 13
-// $carry = $carry + 3 + 5 = 21
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(21)
-]]>
-   </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/ds/ds/sequence/remove.xml b/reference/ds/ds/sequence/remove.xml
deleted file mode 100644
index 5406876fb7fb..000000000000
--- a/reference/ds/ds/sequence/remove.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::remove</refname>
-  <refpurpose>Removes and returns a value by index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::remove</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Removes and returns a value by index.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <simpara>
-        The index of the value to remove.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The value that was removed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($sequence->remove(1));
-var_dump($sequence->remove(0));
-var_dump($sequence->remove(0));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "b"
-string(1) "a"
-string(1) "c"
-]]>
-   </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/ds/ds/sequence/reverse.xml b/reference/ds/ds/sequence/reverse.xml
deleted file mode 100644
index d72348279510..000000000000
--- a/reference/ds/ds/sequence/reverse.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.reverse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::reverse</refname>
-  <refpurpose>
-    Reverses the sequence in-place
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::reverse</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Reverses the sequence in-place.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::reverse</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-$sequence->reverse();
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-]]>
-   </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/ds/ds/sequence/reversed.xml b/reference/ds/ds/sequence/reversed.xml
deleted file mode 100644
index e5a88b8aa1cd..000000000000
--- a/reference/ds/ds/sequence/reversed.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.reversed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::reversed</refname>
-  <refpurpose>Returns a reversed copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::reversed</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Returns a reversed copy of the sequence.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A reversed copy of the sequence.
-
-    <note>
-        <simpara>
-            The current instance is not affected.
-        </simpara>
-    </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::reversed</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-print_r($sequence->reversed());
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-Ds\Vector Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-)
-]]>
-   </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/ds/ds/sequence/rotate.xml b/reference/ds/ds/sequence/rotate.xml
deleted file mode 100644
index aec884376937..000000000000
--- a/reference/ds/ds/sequence/rotate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.rotate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::rotate</refname>
-  <refpurpose>Rotates the sequence by a given number of rotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::rotate</methodname>
-   <methodparam><type>int</type><parameter>rotations</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Rotates the sequence by a given number of rotations, which is equivalent
-    to successively calling <code>$sequence-&gt;push($sequence-&gt;shift())</code> if the number
-    of rotations is positive, or <code>$sequence-&gt;unshift($sequence-&gt;pop())</code> if negative.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rotations</parameter></term>
-    <listitem>
-     <simpara>
-        The number of times the sequence should be rotated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;. The sequence of the current instance will be rotated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::rotate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c", "d"]);
-
-$sequence->rotate(1);  // "a" is shifted, then pushed.
-print_r($sequence);
-
-$sequence->rotate(2);  // "b" and "c" are both shifted, then pushed.
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => a
-)
-Ds\Vector Object
-(
-    [0] => d
-    [1] => a
-    [2] => b
-    [3] => c
-)
-]]>
-   </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/ds/ds/sequence/set.xml b/reference/ds/ds/sequence/set.xml
deleted file mode 100644
index c3528241869d..000000000000
--- a/reference/ds/ds/sequence/set.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::set</refname>
-  <refpurpose>Updates a value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::set</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Updates a value at a given index.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <simpara>
-        The index of the value to update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-        The new value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-    &reftitle.returnvalues;
-    <simpara>
-        &return.void;
-    </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>OutOfRangeException</exceptionname> if the index is not valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::set</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-$sequence->set(1, "_");
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::set</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-$sequence[1] = "_";
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </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/ds/ds/sequence/shift.xml b/reference/ds/ds/sequence/shift.xml
deleted file mode 100644
index 0ab932ee4555..000000000000
--- a/reference/ds/ds/sequence/shift.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::shift</refname>
-  <refpurpose>Removes and returns the first value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>Ds\Sequence::shift</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Removes and returns the first value.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The first value, which was removed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   <exceptionname>UnderflowException</exceptionname> if empty.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::shift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($sequence->shift());
-var_dump($sequence->shift());
-var_dump($sequence->shift());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/sequence/slice.xml b/reference/ds/ds/sequence/slice.xml
deleted file mode 100644
index 5a577eea0607..000000000000
--- a/reference/ds/ds/sequence/slice.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.slice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::slice</refname>
-  <refpurpose>
-   Returns a sub-sequence of a given range
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::slice</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Creates a sub-sequence of a given range.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-        <simpara>
-            The index at which the sub-sequence starts.
-        </simpara>
-        <simpara>
-            If positive, the sequence will start at that index in the sequence.
-            If negative, the sequence will start that far from the end.
-        </simpara>
-    </listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-        If a length is given and is positive, the resulting
-        sequence will have up to that many values in it.
-
-        If the length results in an overflow, only
-        values up to the end of the sequence will be included.
-
-        If a length is given and is negative, the sequence
-        will stop that many values from the end.
-
-        If a length is not provided, the resulting sequence
-        will contain all values between the index and the
-        end of the sequence.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    A sub-sequence of the given range.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::slice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector(["a", "b", "c", "d", "e"]);
-
-// Slice from 2 onwards
-print_r($sequence->slice(2));
-
-// Slice from 1, for a length of 3
-print_r($sequence->slice(1, 3));
-
-// Slice from 1 onwards
-print_r($sequence->slice(1));
-
-// Slice from 2 from the end onwards
-print_r($sequence->slice(-2));
-
-// Slice from 1 to 1 from the end
-print_r($sequence->slice(1, -1));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => d
-    [2] => e
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => e
-)
-Ds\Vector Object
-(
-    [0] => d
-    [1] => e
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-
-]]>
-   </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/ds/ds/sequence/sort.xml b/reference/ds/ds/sequence/sort.xml
deleted file mode 100644
index 984d7a2e49fc..000000000000
--- a/reference/ds/ds/sequence/sort.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::sort</refname>
-  <refpurpose>
-    Sorts the sequence in-place
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::sort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Sorts the sequence in-place, using an optional <parameter>comparator</parameter> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([4, 5, 1, 3, 2]);
-$sequence->sort();
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-$sequence->sort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/sequence/sorted.xml b/reference/ds/ds/sequence/sorted.xml
deleted file mode 100644
index 87cc1edb0565..000000000000
--- a/reference/ds/ds/sequence/sorted.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.sorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::sorted</refname>
-  <refpurpose>Returns a sorted copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Ds\Sequence</type><methodname>Ds\Sequence::sorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns a sorted copy, using an optional <parameter>comparator</parameter> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns a sorted copy of the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::sorted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-print_r($sequence->sorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::sorted</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-$sorted = $sequence->sorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/sequence/sum.xml b/reference/ds/ds/sequence/sum.xml
deleted file mode 100644
index d780a4d320a5..000000000000
--- a/reference/ds/ds/sequence/sum.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::sum</refname>
-  <refpurpose>Returns the sum of all values in the sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>Ds\Sequence::sum</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Returns the sum of all values in the sequence.
-  </simpara>
-  <note>
-    <simpara>
-        Arrays and objects are considered equal to zero when calculating the sum.
-    </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The sum of all the values in the sequence as either a <type>float</type> or <type>int</type>
-    depending on the values in the sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::sum</function> integer example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-var_dump($sequence->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(6)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Sequence::sum</function> float example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2.5, 3]);
-var_dump($sequence->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-float(6.5)
-]]>
-   </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/ds/ds/sequence/unshift.xml b/reference/ds/ds/sequence/unshift.xml
deleted file mode 100644
index 58e1f7a9ce5c..000000000000
--- a/reference/ds/ds/sequence/unshift.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-sequence.unshift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Sequence::unshift</refname>
-  <refpurpose>Adds values to the front of the sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>Ds\Sequence::unshift</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Adds values to the front of the sequence, moving all the current
-    values forward to make room for the new values.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to add to the front of the sequence.
-        <note>
-            <simpara>
-                Multiple values will be added in the same order that they are
-                passed.
-            </simpara>
-        </note>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Sequence::unshift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sequence = new \Ds\Vector([1, 2, 3]);
-
-$sequence->unshift("a");
-$sequence->unshift("b", "c");
-
-print_r($sequence);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => a
-    [3] => 1
-    [4] => 2
-    [5] => 3
-)
-]]>
-   </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/ds/ds/set/add.xml b/reference/ds/ds/set/add.xml
deleted file mode 100644
index fb373ffd13dd..000000000000
--- a/reference/ds/ds/set/add.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::add</refname>
-  <refpurpose>Adds values to the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::add</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds all given values to the set that haven't already been added.
-  </para>
-  <note>
-    <para>
-        Values of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-  <caution>
-    <para>
-        All comparisons are strict (type and value).
-    </para>
-  </caution>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        Values to add to the set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::add</function> example using integers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set();
-
-$set->add(1);
-$set->add(1);
-$set->add(2);
-$set->add(3);
-
-// Strict comparison would not treat these the same as int(1)
-$set->add("1");
-$set->add(true);
-
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#1 (5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  string(1) "1"
-  [4]=>
-  bool(true)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::add</function> example using objects</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class HashableObject implements \Ds\Hashable
-{
-    /**
-     * An arbitrary value to use as the hash value. Does not define equality.
-     */
-    private $value;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function hash()
-    {
-        return $this->value;
-    }
-
-    public function equals($obj): bool
-    {
-        return $this->value === $obj->value;
-    }
-}
-
-$set = new \Ds\Set();
-
-$obj = new \ArrayIterator([]);
-
-// Adding the same instance multiple times will only add the first.
-$set->add($obj);
-$set->add($obj);
-
-// Adding multiple instances of the same object will add them all.
-$set->add(new \stdClass());
-$set->add(new \stdClass());
-
-// Adding multiple instances of equal hashable objects will only add the first.
-$set->add(new \HashableObject(1));
-$set->add(new \HashableObject(1));
-$set->add(new \HashableObject(2));
-$set->add(new \HashableObject(2));
-
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#1 (5) {
-  [0]=>
-  object(ArrayIterator)#2 (1) {
-    ["storage":"ArrayIterator":private]=>
-    array(0) {
-    }
-  }
-  [1]=>
-  object(stdClass)#3 (0) {
-  }
-  [2]=>
-  object(stdClass)#4 (0) {
-  }
-  [3]=>
-  object(HashableObject)#5 (1) {
-    ["value":"HashableObject":private]=>
-    int(1)
-  }
-  [4]=>
-  object(HashableObject)#6 (1) {
-    ["value":"HashableObject":private]=>
-    int(2)
-  }
-}
-]]>
-   </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/ds/ds/set/allocate.xml b/reference/ds/ds/set/allocate.xml
deleted file mode 100644
index c74c70d6c56a..000000000000
--- a/reference/ds/ds/set/allocate.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Allocates enough memory for a required capacity.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-     </note>
-     <note>
-        <para>
-            Capacity will always be rounded up to the nearest power of 2.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set();
-var_dump($set->capacity());
-
-$set->allocate(100);
-var_dump($set->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(16)
-int(128)
-]]>
-   </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/ds/ds/set/capacity.xml b/reference/ds/ds/set/capacity.xml
deleted file mode 100644
index 84be7eb3122c..000000000000
--- a/reference/ds/ds/set/capacity.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Set::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set();
-var_dump($set->capacity());
-
-$set->add(...range(1, 50));
-var_dump($set->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(16)
-int(64)
-]]>
-   </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/ds/ds/set/clear.xml b/reference/ds/ds/set/clear.xml
deleted file mode 100644
index 051e84e4fce1..000000000000
--- a/reference/ds/ds/set/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the set.
-  </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;
-  <example>
-   <title><function>Ds\Set::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-print_r($set);
-
-$set->clear();
-print_r($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Set Object
-(
-)
-]]>
-   </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/ds/ds/set/construct.xml b/reference/ds/ds/set/construct.xml
deleted file mode 100644
index a8701a7968b5..000000000000
--- a/reference/ds/ds/set/construct.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Set::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter><initializer>[]</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Set::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set();
-var_dump($set);
-
-$set = new \Ds\Set([1, 2, 3]);
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#1 (0) {
-}
-object(Ds\Set)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/set/contains.xml b/reference/ds/ds/set/contains.xml
deleted file mode 100644
index 96d21898500f..000000000000
--- a/reference/ds/ds/set/contains.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.contains" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::contains</refname>
-  <refpurpose>Determines if the set contains all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Set::contains</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines if the set contains all values.
-  </para>
-
-  <note>
-    <para>
-        Values of type <type>object</type> are supported.
-
-        If an object implements <classname>Ds\Hashable</classname>,
-        equality will be determined by the object's <code>equals</code> function.
-
-        If an object does not implement <classname>Ds\Hashable</classname>,
-        objects must be references to the same instance to be considered equal.
-    </para>
-  </note>
-  <caution>
-    <para>
-        All comparisons are strict (type and value).
-    </para>
-  </caution>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        Values to check.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &false; if any of the provided <parameter>values</parameter> are not in the
-    set, &true; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::contains</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-var_dump($set->contains(1));                // true
-var_dump($set->contains(1, 2));             // true
-var_dump($set->contains(...[1, 2]));        // true
-
-var_dump($set->contains("1"));              // false
-var_dump($set->contains(...[1, 2, 3, 4]));  // false
-
-var_dump($set->contains(...[]));            // true
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-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/ds/ds/set/copy.xml b/reference/ds/ds/set/copy.xml
deleted file mode 100644
index f6e2730a1f8e..000000000000
--- a/reference/ds/ds/set/copy.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::copy</refname>
-  <refpurpose>Returns a shallow copy of the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = $a->copy();
-
-// Updating the copy doesn't affect the original
-$b->add(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Set Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-)
-]]>
-   </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/ds/ds/set/count.xml b/reference/ds/ds/set/count.xml
deleted file mode 100644
index 4d97b717cc75..000000000000
--- a/reference/ds/ds/set/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::count</refname>
-  <refpurpose>Returns the number of values in the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/set/diff.xml b/reference/ds/ds/set/diff.xml
deleted file mode 100644
index ddc1635d1209..000000000000
--- a/reference/ds/ds/set/diff.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::diff</refname>
-  <refpurpose>Creates a new set using values that aren't in another set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::diff</methodname>
-   <methodparam><type>Ds\Set</type><parameter>set</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new set using values that aren't in another set.
-  </para>
-  <para>
-    <code>A \ B = {x ∈ A | x ∉ B}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>set</parameter></term>
-    <listitem>
-     <para>
-        Set containing the values to exclude.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A new set containing all values that were not in the other <parameter>set</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.complement;">Complement</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::diff</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = new \Ds\Set([3, 4, 5]);
-
-var_dump($a->diff($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-]]>
-   </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/ds/ds/set/filter.xml b/reference/ds/ds/set/filter.xml
deleted file mode 100644
index 953edd7acd41..000000000000
--- a/reference/ds/ds/set/filter.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::filter</refname>
-  <refpurpose>
-    Creates a new set using a <type>callable</type> to
-    determine which values to include
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::filter</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new set using a <type>callable</type> to
-    determine which values to include.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>bool</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-            </methodsynopsis>
-        </para>
-        <para>
-            Optional <type>callable</type> which returns &true; if the value should be included, &false; otherwise.
-        </para>
-        <para>
-            If a callback is not provided, only values which are &true;
-            (see <link linkend="language.types.boolean.casting">converting to boolean</link>)
-            will be included.
-        </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A new set containing all the values for which
-    either the <parameter>callback</parameter> returned &true;, or all values that
-    convert to &true; if a <parameter>callback</parameter> was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::filter</function> example using callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3, 4, 5]);
-
-var_dump($set->filter(function($value) {
-    return $value % 2 == 0;
-}));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(4)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::filter</function> example without a callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([0, 1, 'a', true, false]);
-
-var_dump($set->filter());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  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/ds/ds/set/first.xml b/reference/ds/ds/set/first.xml
deleted file mode 100644
index da39b797938a..000000000000
--- a/reference/ds/ds/set/first.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::first</refname>
-  <refpurpose>Returns the first value in the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Set::first</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the first value in the set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first value in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-var_dump($set->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/set/get.xml b/reference/ds/ds/set/get.xml
deleted file mode 100644
index b52a5b6237ca..000000000000
--- a/reference/ds/ds/set/get.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::get</refname>
-  <refpurpose>Returns the value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Set::get</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the value at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index to access, starting at 0.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the requested index.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c"]);
-
-var_dump($set->get(0));
-var_dump($set->get(1));
-var_dump($set->get(2));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::get</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c"]);
-
-var_dump($set[0]);
-var_dump($set[1]);
-var_dump($set[2]);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/set/intersect.xml b/reference/ds/ds/set/intersect.xml
deleted file mode 100644
index 9ea56e010349..000000000000
--- a/reference/ds/ds/set/intersect.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.intersect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::intersect</refname>
-  <refpurpose>Creates a new set by intersecting values with another set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::intersect</methodname>
-   <methodparam><type>Ds\Set</type><parameter>set</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new set using values common to both the current instance and another <parameter>set</parameter>.
-
-    In other words, returns a copy of the current instance with all values removed that
-    are not in the other <parameter>set</parameter>.
-  </para>
-  <para>
-    <code>A ∩ B = {x : x ∈ A ∧ x ∈ B}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>set</parameter></term>
-    <listitem>
-     <para>
-        The other set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-    The intersection of the current instance and another <parameter>set</parameter>.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.intersection;">Intersection</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::intersect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = new \Ds\Set([3, 4, 5]);
-
-var_dump($a->intersect($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (1) {
-  [0]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/set/isempty.xml b/reference/ds/ds/set/isempty.xml
deleted file mode 100644
index 652e453bb7d3..000000000000
--- a/reference/ds/ds/set/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::isEmpty</refname>
-  <refpurpose>Returns whether the set is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Set::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the set is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the set is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = new \Ds\Set();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/set/join.xml b/reference/ds/ds/set/join.xml
deleted file mode 100644
index 1966f32c3a52..000000000000
--- a/reference/ds/ds/set/join.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.join" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::join</refname>
-  <refpurpose>Joins all values together as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Ds\Set::join</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>glue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Joins all values together as a string using an optional separator between each value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>glue</parameter></term>
-    <listitem>
-     <para>
-        An optional string to separate each value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    All values of the set joined together as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::join</function> example using a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c", 1, 2, 3]);
-
-var_dump($set->join("|"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "a|b|c|1|2|3"
-]]>
-   </screen>
-  </example>
-  <example>
- <title><function>Ds\Set::join</function> example without a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c", 1, 2, 3]);
-
-var_dump($set->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "abc123"
-]]>
-   </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/ds/ds/set/jsonserialize.xml b/reference/ds/ds/set/jsonserialize.xml
deleted file mode 100644
index b3cb4f267cd3..000000000000
--- a/reference/ds/ds/set/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/set/last.xml b/reference/ds/ds/set/last.xml
deleted file mode 100644
index de41141ec40a..000000000000
--- a/reference/ds/ds/set/last.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::last</refname>
-  <refpurpose>Returns the last value in the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Set::last</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the last value in the set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The last value in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::last</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-var_dump($set->last());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/ds/ds/set/map.xml b/reference/ds/ds/set/map.xml
deleted file mode 100644
index ae1a1e821ad9..000000000000
--- a/reference/ds/ds/set/map.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="ds-set.map" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Ds\Set::map</refname>
-  <refpurpose>Returns the result of applying a callback to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the result of applying a <parameter>callback</parameter> function to
-   each value in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      The callback to apply to each value in the set must have the following signature:
-      <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-       <type>mixed</type>
-       <methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new <classname>Ds\Set</classname> instance where each value
-   is the result of applying the <parameter>callback</parameter> to each value
-   of the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Ds\Set::map</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-var_dump($set->map(function($value) { return $value * 2; }));
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(4)
-  [2]=>
-  int(6)
-}
-object(Ds\Set)#1 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/set/merge.xml b/reference/ds/ds/set/merge.xml
deleted file mode 100644
index 277b085207b6..000000000000
--- a/reference/ds/ds/set/merge.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::merge</refname>
-  <refpurpose>Returns the result of adding all given values to the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::merge</methodname>
-   <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of adding all given values to the set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A <classname>traversable</classname> object or an &array;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of adding all given values to the set,
-    effectively the same as adding the values to a copy, then returning that copy.
-  </para>
-  <note>
-    <para>
-        The current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::merge</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-var_dump($set->merge([3, 4, 5]));
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#2 (6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-object(Ds\Set)#1 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/set/reduce.xml b/reference/ds/ds/set/reduce.xml
deleted file mode 100644
index 31b19b238f0c..000000000000
--- a/reference/ds/ds/set/reduce.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.reduce" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::reduce</refname>
-  <refpurpose>Reduces the set to a single value using a callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Set::reduce</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>initial</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Reduces the set to a single value using a callback function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>carry</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>carry</parameter></term>
-        <listitem>
-         <para>
-          The return value of the previous callback, or <parameter>initial</parameter> if
-          it's the first iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>value</parameter></term>
-        <listitem>
-         <para>
-          The value of the current iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initial</parameter></term>
-    <listitem>
-     <para>
-        The initial value of the carry value. Can be &null;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The return value of the final callback.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::reduce</function> with initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-$callback = function($carry, $value) {
-    return $carry * $value;
-};
-
-var_dump($set->reduce($callback, 5));
-
-// Iterations:
-//
-// $carry = $initial = 5
-//
-// $carry = $carry * 1 =  5
-// $carry = $carry * 2 = 10
-// $carry = $carry * 3 = 30
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(30)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::reduce</function> without an initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-var_dump($set->reduce(function($carry, $value) {
-    return $carry + $value + 5;
-}));
-
-// Iterations:
-//
-// $carry = $initial = null
-//
-// $carry = $carry + 1 + 5 =  6
-// $carry = $carry + 2 + 5 = 13
-// $carry = $carry + 3 + 5 = 21
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(21)
-]]>
-   </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/ds/ds/set/remove.xml b/reference/ds/ds/set/remove.xml
deleted file mode 100644
index 274f2880c0ba..000000000000
--- a/reference/ds/ds/set/remove.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::remove</refname>
-  <refpurpose>Removes all given values from the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::remove</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes all given <parameter>values</parameter> from the set, ignoring any that are not in the set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3, 4, 5]);
-
-$set->remove(1);            // Remove 1
-$set->remove(1, 2);         // Can't find 1, but remove 2
-$set->remove(...[3, 4]);    // Remove 3 and 4
-
-var_dump($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#1 (1) {
-  [0]=>
-  int(5)
-}
-]]>
-   </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/ds/ds/set/reverse.xml b/reference/ds/ds/set/reverse.xml
deleted file mode 100644
index 979dea166105..000000000000
--- a/reference/ds/ds/set/reverse.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.reverse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::reverse</refname>
-  <refpurpose>
-    Reverses the set in-place
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::reverse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Reverses the set in-place.
-  </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;
-  <example>
-   <title><function>Ds\Set::reverse</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c"]);
-$set->reverse();
-
-print_r($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-]]>
-   </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/ds/ds/set/reversed.xml b/reference/ds/ds/set/reversed.xml
deleted file mode 100644
index 5bbd84f1814a..000000000000
--- a/reference/ds/ds/set/reversed.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.reversed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::reversed</refname>
-  <refpurpose>Returns a reversed copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::reversed</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a reversed copy of the set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A reversed copy of the set.
-
-    <note>
-        <para>
-            The current instance is not affected.
-        </para>
-    </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::reversed</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c"]);
-
-print_r($set->reversed());
-print_r($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-Ds\Set Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-)
-]]>
-   </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/ds/ds/set/slice.xml b/reference/ds/ds/set/slice.xml
deleted file mode 100644
index 9e48c8003beb..000000000000
--- a/reference/ds/ds/set/slice.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.slice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::slice</refname>
-  <refpurpose>
-   Returns a sub-set of a given range
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::slice</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a sub-set of a given range.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-        <para>
-            The index at which the sub-set starts.
-        </para>
-        <para>
-            If positive, the set will start at that index in the set.
-            If negative, the set will start that far from the end.
-        </para>
-    </listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-        If a length is given and is positive, the resulting
-        set will have up to that many values in it.
-
-        If the length results in an overflow, only
-        values up to the end of the set will be included.
-
-        If a length is given and is negative, the set
-        will stop that many values from the end.
-
-        If a length is not provided, the resulting set
-        will contain all values between the index and the
-        end of the set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A sub-set of the given range.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::slice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set(["a", "b", "c", "d", "e"]);
-
-// Slice from 2 onwards
-print_r($set->slice(2));
-
-// Slice from 1, for a length of 3
-print_r($set->slice(1, 3));
-
-// Slice from 1 onwards
-print_r($set->slice(1));
-
-// Slice from 2 from the end onwards
-print_r($set->slice(-2));
-
-// Slice from 1 to 1 from the end
-print_r($set->slice(1, -1));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => c
-    [1] => d
-    [2] => e
-)
-Ds\Set Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-Ds\Set Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => e
-)
-Ds\Set Object
-(
-    [0] => d
-    [1] => e
-)
-Ds\Set Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-
-]]>
-   </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/ds/ds/set/sort.xml b/reference/ds/ds/set/sort.xml
deleted file mode 100644
index 8c4ce725cb9f..000000000000
--- a/reference/ds/ds/set/sort.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::sort</refname>
-  <refpurpose>
-    Sorts the set in-place
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Set::sort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sorts the set in-place, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([4, 5, 1, 3, 2]);
-$set->sort();
-
-print_r($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([4, 5, 1, 3, 2]);
-
-$set->sort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($set);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/set/sorted.xml b/reference/ds/ds/set/sorted.xml
deleted file mode 100644
index 1540319889fa..000000000000
--- a/reference/ds/ds/set/sorted.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.sorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::sorted</refname>
-  <refpurpose>Returns a sorted copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::sorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a sorted copy, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns a sorted copy of the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::sorted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([4, 5, 1, 3, 2]);
-
-print_r($set->sorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::sorted</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([4, 5, 1, 3, 2]);
-
-$sorted = $set->sorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Set Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/set/sum.xml b/reference/ds/ds/set/sum.xml
deleted file mode 100644
index d58d2e756309..000000000000
--- a/reference/ds/ds/set/sum.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::sum</refname>
-  <refpurpose>Returns the sum of all values in the set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>Ds\Set::sum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the sum of all values in the set.
-  </para>
-  <note>
-    <para>
-        Arrays and objects are considered equal to zero when calculating the sum.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The sum of all the values in the set as either a <type>float</type> or <type>int</type>
-    depending on the values in the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::sum</function> integer example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-var_dump($set->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(6)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Set::sum</function> float example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2.5, 3]);
-var_dump($set->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-float(6.5)
-]]>
-   </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/ds/ds/set/toarray.xml b/reference/ds/ds/set/toarray.xml
deleted file mode 100644
index f87ec4a2876a..000000000000
--- a/reference/ds/ds/set/toarray.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::toArray</refname>
-  <refpurpose>
-    Converts the set to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Set::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the set to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$set = new \Ds\Set([1, 2, 3]);
-
-var_dump($set->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/set/union.xml b/reference/ds/ds/set/union.xml
deleted file mode 100644
index 1094db761e97..000000000000
--- a/reference/ds/ds/set/union.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.union" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::union</refname>
-  <refpurpose>Creates a new set using values from the current instance and another set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::union</methodname>
-   <methodparam><type>Ds\Set</type><parameter>set</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new set that contains the values of the current instance as well as the
-    values of another <parameter>set</parameter>.
-  </para>
-  <para>
-    <code>A ∪ B = {x: x ∈ A ∨ x ∈ B}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>set</parameter></term>
-    <listitem>
-     <para>
-        The other set, to combine with the current instance.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-    A new set containing all the values of the current instance as well as another <parameter>set</parameter>.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.union.set;">Union</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::union</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = new \Ds\Set([3, 4, 5]);
-
-var_dump($a->union($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-]]>
-   </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/ds/ds/set/xor.xml b/reference/ds/ds/set/xor.xml
deleted file mode 100644
index 1b64dbbae8ff..000000000000
--- a/reference/ds/ds/set/xor.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-set.xor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Set::xor</refname>
-  <refpurpose>Creates a new set using values in either the current instance or in another set, but not in both</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Set</type><methodname>Ds\Set::xor</methodname>
-   <methodparam><type>Ds\Set</type><parameter>set</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new set containing values in the current instance as well as another <parameter>set</parameter>,
-    but not in both.
-  </para>
-  <para>
-    <code>A ⊖ B = {x : x ∈ (A \ B) ∪ (B \ A)}</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>set</parameter></term>
-    <listitem>
-     <para>
-        The other set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-    <para>
-        A new set containing values in the current instance as well as another <parameter>set</parameter>,
-        but not in both.
-    </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link xlink:href="&url.wiki.symmetric.difference;">Symmetric Difference</link> on Wikipedia</member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Set::xor</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Set([1, 2, 3]);
-$b = new \Ds\Set([3, 4, 5]);
-
-var_dump($a->xor($b));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Set)#3 (4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-]]>
-   </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/ds/ds/stack/allocate.xml b/reference/ds/ds/stack/allocate.xml
deleted file mode 100644
index 646a7faac9e8..000000000000
--- a/reference/ds/ds/stack/allocate.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Stack::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-    </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-<!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-var_dump($stack->capacity());
-
-$stack->allocate(100);
-var_dump($stack->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(100)
-]]>
-   </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/ds/ds/stack/capacity.xml b/reference/ds/ds/stack/capacity.xml
deleted file mode 100644
index a793e68167fb..000000000000
--- a/reference/ds/ds/stack/capacity.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Stack::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-<!--
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-var_dump($stack->capacity());
-
-$stack->push(...range(1, 50));
-var_dump($stack->capacity());
-
-$stack[] = "a";
-var_dump($stack->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(50)
-int(75)
-]]>
-   </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/ds/ds/stack/clear.xml b/reference/ds/ds/stack/clear.xml
deleted file mode 100644
index d02e578f3e02..000000000000
--- a/reference/ds/ds/stack/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Stack::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the stack.
-  </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;
-  <example>
-   <title><function>Ds\Stack::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack([1, 2, 3]);
-print_r($stack);
-
-$stack->clear();
-print_r($stack);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Stack Object
-(
-    [0] => 3
-    [1] => 2
-    [2] => 1
-)
-Ds\Stack Object
-(
-)
-]]>
-   </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/ds/ds/stack/construct.xml b/reference/ds/ds/stack/construct.xml
deleted file mode 100644
index 7554d18b4f44..000000000000
--- a/reference/ds/ds/stack/construct.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Stack::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-      A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Stack::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-print_r($stack);
-
-$stack = new \Ds\Stack([1, 2, 3]);
-print_r($stack);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Stack Object
-(
-)
-Ds\Stack Object
-(
-    [0] => 3
-    [1] => 2
-    [2] => 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/ds/ds/stack/copy.xml b/reference/ds/ds/stack/copy.xml
deleted file mode 100644
index 10ac257b0f01..000000000000
--- a/reference/ds/ds/stack/copy.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::copy</refname>
-  <refpurpose>Returns a shallow copy of the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Stack</type><methodname>Ds\Stack::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Stack([1, 2, 3]);
-$b = $a->copy();
-
-// Updating the copy doesn't affect the original
-$b->push(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Stack Object
-(
-    [0] => 3
-    [1] => 2
-    [2] => 1
-)
-Ds\Stack Object
-(
-    [0] => 4
-    [1] => 3
-    [2] => 2
-    [3] => 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/ds/ds/stack/count.xml b/reference/ds/ds/stack/count.xml
deleted file mode 100644
index 4ff7fd78de16..000000000000
--- a/reference/ds/ds/stack/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::count</refname>
-  <refpurpose>Returns the number of values in the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/stack/isempty.xml b/reference/ds/ds/stack/isempty.xml
deleted file mode 100644
index 09287137b26c..000000000000
--- a/reference/ds/ds/stack/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::isEmpty</refname>
-  <refpurpose>Returns whether the stack is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Stack::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the stack is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the stack is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Stack([1, 2, 3]);
-$b = new \Ds\Stack();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/stack/jsonserialize.xml b/reference/ds/ds/stack/jsonserialize.xml
deleted file mode 100644
index 6c8d8a17f8b5..000000000000
--- a/reference/ds/ds/stack/jsonserialize.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/stack/peek.xml b/reference/ds/ds/stack/peek.xml
deleted file mode 100644
index 183e5dccf3a3..000000000000
--- a/reference/ds/ds/stack/peek.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.peek" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::peek</refname>
-  <refpurpose>Returns the value at the top of the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Stack::peek</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the value at the top of the stack, but does not remove it.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the top of the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::peek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-
-$stack->push("a");
-$stack->push("b");
-$stack->push("c");
-
-var_dump($stack->peek());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "c"
-]]>
-   </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/ds/ds/stack/pop.xml b/reference/ds/ds/stack/pop.xml
deleted file mode 100644
index df040a7881cd..000000000000
--- a/reference/ds/ds/stack/pop.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::pop</refname>
-  <refpurpose>Removes and returns the value at the top of the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Stack::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the value at the top of the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The removed value which was at the top of the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-
-$stack->push("a");
-$stack->push("b");
-$stack->push("c");
-
-var_dump($stack->pop());
-var_dump($stack->pop());
-var_dump($stack->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "c"
-string(1) "b"
-string(1) "a"
-]]>
-   </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/ds/ds/stack/push.xml b/reference/ds/ds/stack/push.xml
deleted file mode 100644
index e00ba4c5d58b..000000000000
--- a/reference/ds/ds/stack/push.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::push</refname>
-  <refpurpose>Pushes values onto the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Stack::push</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Pushes <parameter>values</parameter> onto the stack.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to push onto the stack.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack();
-
-$stack->push("a");
-$stack->push("b");
-$stack->push("c", "d");
-$stack->push(...["e", "f"]);
-
-print_r($stack);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Stack Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-    [4] => e
-    [5] => f
-)
-]]>
-   </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/ds/ds/stack/toarray.xml b/reference/ds/ds/stack/toarray.xml
deleted file mode 100644
index 7c408173769b..000000000000
--- a/reference/ds/ds/stack/toarray.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-stack.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Stack::toArray</refname>
-  <refpurpose>
-    Converts the stack to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Stack::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the stack to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Stack::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$stack = new \Ds\Stack([1, 2, 3]);
-
-var_dump($stack->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(3)
-  [1]=>
-  int(2)
-  [2]=>
-  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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/vector/allocate.xml b/reference/ds/ds/vector/allocate.xml
deleted file mode 100644
index 9b6e1772ec63..000000000000
--- a/reference/ds/ds/vector/allocate.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.allocate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::allocate</refname>
-  <refpurpose>Allocates enough memory for a required capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::allocate</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Ensures that enough memory is allocated for a required capacity.
-    This removes the need to reallocate the internal buffer as values are added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <para>
-        The number of values for which capacity should be allocated.
-     </para>
-     <note>
-        <para>
-            Capacity will stay the same if this value is less than or equal to the
-            current capacity.
-        </para>
-    </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::allocate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector();
-var_dump($vector->capacity());
-
-$vector->allocate(100);
-var_dump($vector->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(100)
-]]>
-   </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/ds/ds/vector/apply.xml b/reference/ds/ds/vector/apply.xml
deleted file mode 100644
index 64c8b61fd73e..000000000000
--- a/reference/ds/ds/vector/apply.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.apply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::apply</refname>
-  <refpurpose>Updates all values by applying a callback function to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::apply</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Updates all values by applying a <parameter>callback</parameter> function to
-    each value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-        </para>
-        <para>
-            A <type>callable</type> to apply to each value in the vector.
-        </para>
-
-        <para>
-            The callback should return what the value should be replaced by.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::apply</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-$vector->apply(function($value) { return $value * 2; });
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-]]>
-   </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/ds/ds/vector/capacity.xml b/reference/ds/ds/vector/capacity.xml
deleted file mode 100644
index 4a43128dfe18..000000000000
--- a/reference/ds/ds/vector/capacity.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.capacity" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::capacity</refname>
-  <refpurpose>Returns the current capacity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Ds\Vector::capacity</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current capacity.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::capacity</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector();
-var_dump($vector->capacity());
-
-$vector->push(...range(1, 50));
-var_dump($vector->capacity());
-
-$vector[] = "a";
-var_dump($vector->capacity());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(50)
-int(75)
-]]>
-   </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/ds/ds/vector/clear.xml b/reference/ds/ds/vector/clear.xml
deleted file mode 100644
index 0960f80a2c24..000000000000
--- a/reference/ds/ds/vector/clear.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::clear</refname>
-  <refpurpose>Removes all values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes all values from the vector.
-  </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;
-  <example>
-   <title><function>Ds\Vector::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-print_r($vector);
-
-$vector->clear();
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Vector Object
-(
-)
-]]>
-   </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/ds/ds/vector/construct.xml b/reference/ds/ds/vector/construct.xml
deleted file mode 100644
index fb9e4d703baf..000000000000
--- a/reference/ds/ds/vector/construct.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::__construct</refname>
-  <refpurpose>Creates a new instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Ds\Vector::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Creates a new instance, using either a <classname>traversable</classname>
-    object or an &array; for the initial <parameter>values</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-      A traversable object or an &array; to use for the initial values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Ds\Vector::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector();
-var_dump($vector);
-
-
-$vector = new \Ds\Vector([1, 2, 3]);
-var_dump($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (0) {
-}
-object(Ds\Vector)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/vector/contains.xml b/reference/ds/ds/vector/contains.xml
deleted file mode 100644
index 061669bf8b54..000000000000
--- a/reference/ds/ds/vector/contains.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.contains" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::contains</refname>
-  <refpurpose>Determines if the vector contains given values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Vector::contains</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines if the vector contains all values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        Values to check.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &false; if any of the provided <parameter>values</parameter> are not in the
-    vector, &true; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::contains</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(['a', 'b', 'c', 1, 2, 3]);
-
-var_dump($vector->contains('a'));                // true
-var_dump($vector->contains('a', 'b'));           // true
-var_dump($vector->contains('c', 'd'));           // false
-
-var_dump($vector->contains(...['c', 'b', 'a'])); // true
-
-// Always strict
-var_dump($vector->contains(1));                  // true
-var_dump($vector->contains('1'));                // false
-
-var_dump($vector->contains(...[]));                // true
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-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/ds/ds/vector/copy.xml b/reference/ds/ds/vector/copy.xml
deleted file mode 100644
index e002980c5d2b..000000000000
--- a/reference/ds/ds/vector/copy.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::copy</refname>
-  <refpurpose>Returns a shallow copy of the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::copy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a shallow copy of the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a shallow copy of the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Vector([1, 2, 3]);
-$b = $a->copy();
-
-// Updating the copy doesn't affect the original
-$b->push(4);
-
-print_r($a);
-print_r($b);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-)
-]]>
-   </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/ds/ds/vector/count.xml b/reference/ds/ds/vector/count.xml
deleted file mode 100644
index e2eced61ad30..000000000000
--- a/reference/ds/ds/vector/count.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::count</refname>
-  <refpurpose>Returns the number of values in the collection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>Countable::count</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/ds/ds/vector/filter.xml b/reference/ds/ds/vector/filter.xml
deleted file mode 100644
index 4e26f00bd1fc..000000000000
--- a/reference/ds/ds/vector/filter.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::filter</refname>
-  <refpurpose>
-    Creates a new vector using a <type>callable</type> to
-    determine which values to include
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::filter</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new vector using a <type>callable</type> to
-    determine which values to include.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
- <variablelist>
-
-    <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>bool</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-            </methodsynopsis>
-        </para>
-        <para>
-            Optional <type>callable</type> which returns &true; if the value should be included, &false; otherwise.
-        </para>
-        <para>
-            If a callback is not provided, only values which are &true;
-            (see <link linkend="language.types.boolean.casting">converting to boolean</link>)
-            will be included.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A new vector containing all the values for which
-    either the <parameter>callback</parameter> returned &true;, or all values that
-    convert to &true; if a <parameter>callback</parameter> was not provided.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::filter</function> example using callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3, 4, 5]);
-
-var_dump($vector->filter(function($value) {
-    return $value % 2 == 0;
-}));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#3 (2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(4)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::filter</function> example without a callback function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([0, 1, 'a', true, false]);
-
-var_dump($vector->filter());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  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/ds/ds/vector/find.xml b/reference/ds/ds/vector/find.xml
deleted file mode 100644
index 3678176bf9fb..000000000000
--- a/reference/ds/ds/vector/find.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::find</refname>
-  <refpurpose>
-    Attempts to find a value's index
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::find</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the index of the <parameter>value</parameter>, or &false; if not found.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The value to find.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The index of the value, or &false; if not found.
-  </para>
-  <note>
-        <para>
-            Values will be compared by value and by type.
-        </para>
-    </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::find</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", 1, true]);
-
-var_dump($vector->find("a")); // 0
-var_dump($vector->find("b")); // false
-var_dump($vector->find("1")); // false
-var_dump($vector->find(1));   // 1
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(0)
-bool(false)
-bool(false)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/vector/first.xml b/reference/ds/ds/vector/first.xml
deleted file mode 100644
index 799f99847fd7..000000000000
--- a/reference/ds/ds/vector/first.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.first" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::first</refname>
-  <refpurpose>Returns the first value in the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::first</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the first value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-var_dump($vector->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/vector/get.xml b/reference/ds/ds/vector/get.xml
deleted file mode 100644
index 178423cf4d3d..000000000000
--- a/reference/ds/ds/vector/get.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::get</refname>
-  <refpurpose>Returns the value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::get</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the value at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index to access, starting at 0.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value at the requested index.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($vector->get(0));
-var_dump($vector->get(1));
-var_dump($vector->get(2));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::get</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($vector[0]);
-var_dump($vector[1]);
-var_dump($vector[2]);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/vector/insert.xml b/reference/ds/ds/vector/insert.xml
deleted file mode 100644
index 2f1c67a7fd26..000000000000
--- a/reference/ds/ds/vector/insert.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::insert</refname>
-  <refpurpose>Inserts values at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::insert</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Inserts values into the vector at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index at which to insert. <code>0 &lt;= index &lt;= count</code>
-     </para>
-     <note>
-        <para>
-            You can insert at the index equal to the number of values.
-        </para>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The value or values to insert.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
-<refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector();
-
-$vector->insert(0, "e");             // [e]
-$vector->insert(1, "f");             // [e, f]
-$vector->insert(2, "g");             // [e, f, g]
-$vector->insert(0, "a", "b");        // [a, b, e, f, g]
-$vector->insert(2, ...["c", "d"]);   // [a, b, c, d, e, f, g]
-
-var_dump($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#1 (7) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-}
-]]>
-   </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/ds/ds/vector/isempty.xml b/reference/ds/ds/vector/isempty.xml
deleted file mode 100644
index 22e301628b52..000000000000
--- a/reference/ds/ds/vector/isempty.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.isempty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::isEmpty</refname>
-  <refpurpose>Returns whether the vector is empty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Ds\Vector::isEmpty</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns whether the vector is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the vector is empty, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::isEmpty</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new \Ds\Vector([1, 2, 3]);
-$b = new \Ds\Vector();
-
-var_dump($a->isEmpty());
-var_dump($b->isEmpty());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-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/ds/ds/vector/join.xml b/reference/ds/ds/vector/join.xml
deleted file mode 100644
index 2d07479405d0..000000000000
--- a/reference/ds/ds/vector/join.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.join" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::join</refname>
-  <refpurpose>Joins all values together as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Ds\Vector::join</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>glue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Joins all values together as a string using an optional separator between each value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>glue</parameter></term>
-    <listitem>
-     <para>
-        An optional string to separate each value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    All values of the vector joined together as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::join</function> example using a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c", 1, 2, 3]);
-
-var_dump($vector->join("|"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "a|b|c|1|2|3"
-]]>
-   </screen>
-  </example>
-  <example>
- <title><function>Ds\Vector::join</function> example without a separator string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c", 1, 2, 3]);
-
-var_dump($vector->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(6) "abc123"
-]]>
-   </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/ds/ds/vector/jsonserialize.xml b/reference/ds/ds/vector/jsonserialize.xml
deleted file mode 100644
index f28047ed39be..000000000000
--- a/reference/ds/ds/vector/jsonserialize.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   See <function>JsonSerializable::jsonSerialize</function>
-  </para>
-  <note>
-   <para>
-    You should never need to call this directly.
-   </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/ds/ds/vector/last.xml b/reference/ds/ds/vector/last.xml
deleted file mode 100644
index b8d6b68465cf..000000000000
--- a/reference/ds/ds/vector/last.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.last" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::last</refname>
-  <refpurpose>Returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::last</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the last value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The last value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::last</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-var_dump($vector->last());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/ds/ds/vector/map.xml b/reference/ds/ds/vector/map.xml
deleted file mode 100644
index 9664ccd64a38..000000000000
--- a/reference/ds/ds/vector/map.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.map" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::map</refname>
-  <refpurpose>Returns the result of applying a callback to each value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::map</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of applying a <parameter>callback</parameter> function to
-    each value in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-        <para>
-            <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-                <type>mixed</type>
-                <methodname><replaceable>callback</replaceable></methodname>
-                <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-             </methodsynopsis>
-         </para>
-         <para>
-            A <type>callable</type> to apply to each value in the vector.
-         </para>
-
-         <para>
-            The callable should return what the new value will be in the new vector.
-        </para>
-    </listitem>
-
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of applying a <parameter>callback</parameter> to each value in
-    the vector.
-  </para>
-  <note>
-    <para>
-        The values of the current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::map</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-print_r($vector->map(function($value) { return $value * 2; }));
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 2
-    [1] => 4
-    [2] => 6
-)
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-)
-]]>
-   </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/ds/ds/vector/merge.xml b/reference/ds/ds/vector/merge.xml
deleted file mode 100644
index 955ad6bdde0e..000000000000
--- a/reference/ds/ds/vector/merge.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::merge</refname>
-  <refpurpose>Returns the result of adding all given values to the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::merge</methodname>
-   <methodparam><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns the result of adding all given values to the vector.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        A <classname>traversable</classname> object or an &array;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The result of adding all given values to the vector,
-    effectively the same as adding the values to a copy, then returning that copy.
-  </para>
-  <note>
-    <para>
-        The current instance won't be affected.
-    </para>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::merge</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-var_dump($vector->merge([4, 5, 6]));
-var_dump($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Ds\Vector)#2 (6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-object(Ds\Vector)#1 (3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/vector/pop.xml b/reference/ds/ds/vector/pop.xml
deleted file mode 100644
index 545d16b0630d..000000000000
--- a/reference/ds/ds/vector/pop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::pop</refname>
-  <refpurpose>Removes and returns the last value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the last value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The removed last value.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::pop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-var_dump($vector->pop());
-var_dump($vector->pop());
-var_dump($vector->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(2)
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ds/ds/vector/push.xml b/reference/ds/ds/vector/push.xml
deleted file mode 100644
index 248b9ebca859..000000000000
--- a/reference/ds/ds/vector/push.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::push</refname>
-  <refpurpose>Adds values to the end of the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::push</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds values to the end of the vector.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to add.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::push</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector();
-
-$vector->push("a");
-$vector->push("b");
-$vector->push("c", "d");
-$vector->push(...["e", "f"]);
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-    [4] => e
-    [5] => f
-)
-]]>
-   </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/ds/ds/vector/reduce.xml b/reference/ds/ds/vector/reduce.xml
deleted file mode 100644
index a5a400ed826c..000000000000
--- a/reference/ds/ds/vector/reduce.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.reduce" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::reduce</refname>
-  <refpurpose>Reduces the vector to a single value using a callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::reduce</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>initial</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Reduces the vector to a single value using a callback function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>mixed</type><parameter>carry</parameter></methodparam>
-       <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>carry</parameter></term>
-        <listitem>
-         <para>
-          The return value of the previous callback, or <parameter>initial</parameter> if
-          it's the first iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>value</parameter></term>
-        <listitem>
-         <para>
-          The value of the current iteration.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initial</parameter></term>
-    <listitem>
-     <para>
-        The initial value of the carry value. Can be &null;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The return value of the final callback.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::reduce</function> with initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-$callback = function($carry, $value) {
-    return $carry * $value;
-};
-
-var_dump($vector->reduce($callback, 5));
-
-// Iterations:
-//
-// $carry = $initial = 5
-//
-// $carry = $carry * 1 =  5
-// $carry = $carry * 2 = 10
-// $carry = $carry * 3 = 30
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(30)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::reduce</function> without an initial value example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-var_dump($vector->reduce(function($carry, $value) {
-    return $carry + $value + 5;
-}));
-
-// Iterations:
-//
-// $carry = $initial = null
-//
-// $carry = $carry + 1 + 5 =  6
-// $carry = $carry + 2 + 5 = 13
-// $carry = $carry + 3 + 5 = 21
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(21)
-]]>
-   </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/ds/ds/vector/remove.xml b/reference/ds/ds/vector/remove.xml
deleted file mode 100644
index b15f809cfe1d..000000000000
--- a/reference/ds/ds/vector/remove.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::remove</refname>
-  <refpurpose>Removes and returns a value by index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::remove</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes and returns a value by index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index of the value to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The value that was removed.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($vector->remove(1));
-var_dump($vector->remove(0));
-var_dump($vector->remove(0));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "b"
-string(1) "a"
-string(1) "c"
-]]>
-   </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/ds/ds/vector/reverse.xml b/reference/ds/ds/vector/reverse.xml
deleted file mode 100644
index 2162bfc99355..000000000000
--- a/reference/ds/ds/vector/reverse.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.reverse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::reverse</refname>
-  <refpurpose>
-    Reverses the vector in-place
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::reverse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Reverses the vector in-place.
-  </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;
-  <example>
-   <title><function>Ds\Vector::reverse</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-$vector->reverse();
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-]]>
-   </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/ds/ds/vector/reversed.xml b/reference/ds/ds/vector/reversed.xml
deleted file mode 100644
index cca3679a82fc..000000000000
--- a/reference/ds/ds/vector/reversed.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.reversed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::reversed</refname>
-  <refpurpose>Returns a reversed copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::reversed</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a reversed copy of the vector.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A reversed copy of the vector.
-
-    <note>
-        <para>
-            The current instance is not affected.
-        </para>
-    </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::reversed</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-print_r($vector->reversed());
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => b
-    [2] => a
-)
-Ds\Vector Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-)
-]]>
-   </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/ds/ds/vector/rotate.xml b/reference/ds/ds/vector/rotate.xml
deleted file mode 100644
index c3282e59ea92..000000000000
--- a/reference/ds/ds/vector/rotate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.rotate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::rotate</refname>
-  <refpurpose>Rotates the vector by a given number of rotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::rotate</methodname>
-   <methodparam><type>int</type><parameter>rotations</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Rotates the vector by a given number of rotations, which is equivalent
-    to successively calling <code>$vector-&gt;push($vector-&gt;shift())</code> if the number
-    of rotations is positive, or <code>$vector-&gt;unshift($vector-&gt;pop())</code> if negative.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rotations</parameter></term>
-    <listitem>
-     <para>
-        The number of times the vector should be rotated.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;. The vector of the current instance will be rotated.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::rotate</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c", "d"]);
-
-$vector->rotate(1);  // "a" is shifted, then pushed.
-print_r($vector);
-
-$vector->rotate(2);  // "b" and "c" are both shifted, then pushed.
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => a
-)
-Ds\Vector Object
-(
-    [0] => d
-    [1] => a
-    [2] => b
-    [3] => c
-)
-]]>
-   </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/ds/ds/vector/set.xml b/reference/ds/ds/vector/set.xml
deleted file mode 100644
index 848b73a87d7b..000000000000
--- a/reference/ds/ds/vector/set.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::set</refname>
-  <refpurpose>Updates a value at a given index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::set</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Updates a value at a given index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-        The index of the value to update.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-        The new value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-    &reftitle.returnvalues;
-    <para>
-        &return.void;
-    </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>OutOfRangeException</classname> if the index is not valid.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::set</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-$vector->set(1, "_");
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::set</function> example using array syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-$vector[1] = "_";
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => _
-    [2] => c
-)
-]]>
-   </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/ds/ds/vector/shift.xml b/reference/ds/ds/vector/shift.xml
deleted file mode 100644
index f4facb9657c0..000000000000
--- a/reference/ds/ds/vector/shift.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::shift</refname>
-  <refpurpose>Removes and returns the first value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Ds\Vector::shift</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Removes and returns the first value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The first value, which was removed.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <classname>UnderflowException</classname> if empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::shift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c"]);
-
-var_dump($vector->shift());
-var_dump($vector->shift());
-var_dump($vector->shift());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "a"
-string(1) "b"
-string(1) "c"
-]]>
-   </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/ds/ds/vector/slice.xml b/reference/ds/ds/vector/slice.xml
deleted file mode 100644
index 15c94e0d6b39..000000000000
--- a/reference/ds/ds/vector/slice.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.slice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::slice</refname>
-  <refpurpose>
-   Returns a sub-vector of a given range
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::slice</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a sub-vector of a given range.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-        <para>
-            The index at which the sub-vector starts.
-        </para>
-        <para>
-            If positive, the vector will start at that index in the vector.
-            If negative, the vector will start that far from the end.
-        </para>
-    </listitem>
-    </varlistentry>
-    <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-        If a length is given and is positive, the resulting
-        vector will have up to that many values in it.
-
-        If the length results in an overflow, only
-        values up to the end of the vector will be included.
-
-        If a length is given and is negative, the vector
-        will stop that many values from the end.
-
-        If a length is not provided, the resulting vector
-        will contain all values between the index and the
-        end of the vector.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A sub-vector of the given range.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::slice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector(["a", "b", "c", "d", "e"]);
-
-// Slice from 2 onwards
-print_r($vector->slice(2));
-
-// Slice from 1, for a length of 3
-print_r($vector->slice(1, 3));
-
-// Slice from 1 onwards
-print_r($vector->slice(1));
-
-// Slice from 2 from the end onwards
-print_r($vector->slice(-2));
-
-// Slice from 1 to 1 from the end
-print_r($vector->slice(1, -1));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => c
-    [1] => d
-    [2] => e
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-    [3] => e
-)
-Ds\Vector Object
-(
-    [0] => d
-    [1] => e
-)
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => d
-)
-
-]]>
-   </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/ds/ds/vector/sort.xml b/reference/ds/ds/vector/sort.xml
deleted file mode 100644
index cb0c0949b100..000000000000
--- a/reference/ds/ds/vector/sort.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::sort</refname>
-  <refpurpose>
-    Sorts the vector in-place
- </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::sort</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sorts the vector in-place, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([4, 5, 1, 3, 2]);
-$vector->sort();
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::sort</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-$vector->sort(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/vector/sorted.xml b/reference/ds/ds/vector/sorted.xml
deleted file mode 100644
index 8f99f36d022d..000000000000
--- a/reference/ds/ds/vector/sorted.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.sorted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::sorted</refname>
-  <refpurpose>Returns a sorted copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Ds\Vector</type><methodname>Ds\Vector::sorted</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>comparator</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Returns a sorted copy, using an optional <parameter>comparator</parameter> function.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-     <term><parameter>comparator</parameter></term>
-     <listitem>
-      &sort.callback.description;
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns a sorted copy of the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::sorted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-print_r($vector->sorted());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::sorted</function> example using a comparator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([4, 5, 1, 3, 2]);
-
-$sorted = $vector->sorted(function($a, $b) {
-    return $b <=> $a;
-});
-
-print_r($sorted);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => 5
-    [1] => 4
-    [2] => 3
-    [3] => 2
-    [4] => 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/ds/ds/vector/sum.xml b/reference/ds/ds/vector/sum.xml
deleted file mode 100644
index 8480fa1469d9..000000000000
--- a/reference/ds/ds/vector/sum.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::sum</refname>
-  <refpurpose>Returns the sum of all values in the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>Ds\Vector::sum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the sum of all values in the vector.
-  </para>
-  <note>
-    <para>
-        Arrays and objects are considered equal to zero when calculating the sum.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The sum of all the values in the vector as either a <type>float</type> or <type>int</type>
-    depending on the values in the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::sum</function> integer example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-var_dump($vector->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(6)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Ds\Vector::sum</function> float example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2.5, 3]);
-var_dump($vector->sum());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-float(6.5)
-]]>
-   </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/ds/ds/vector/toarray.xml b/reference/ds/ds/vector/toarray.xml
deleted file mode 100644
index e2126f8dc30c..000000000000
--- a/reference/ds/ds/vector/toarray.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::toArray</refname>
-  <refpurpose>
-    Converts the vector to an &array;
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Ds\Vector::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Converts the vector to an &array;.
-  </para>
-  <note>
-    <para>
-        Casting to an &array; is not supported yet.
-    </para>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    An &array; containing all the values in the same order as the vector.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-var_dump($vector->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-]]>
-   </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/ds/ds/vector/unshift.xml b/reference/ds/ds/vector/unshift.xml
deleted file mode 100644
index 20a3e8ab2afa..000000000000
--- a/reference/ds/ds/vector/unshift.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ds-vector.unshift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Ds\Vector::unshift</refname>
-  <refpurpose>Adds values to the front of the vector</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Ds\Vector::unshift</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds values to the front of the vector, moving all the current
-    values forward to make room for the new values.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <para>
-        The values to add to the front of the vector.
-        <note>
-            <para>
-                Multiple values will be added in the same order that they are
-                passed.
-            </para>
-        </note>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Ds\Vector::unshift</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$vector = new \Ds\Vector([1, 2, 3]);
-
-$vector->unshift("a");
-$vector->unshift("b", "c");
-
-print_r($vector);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => b
-    [1] => c
-    [2] => a
-    [3] => 1
-    [4] => 2
-    [5] => 3
-)
-]]>
-   </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/ds/examples.xml b/reference/ds/examples.xml
deleted file mode 100644
index 6b593e38f6fd..000000000000
--- a/reference/ds/examples.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ds.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Vector</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$vector = new \Ds\Vector();
-
-$vector->push('a');
-$vector->push('b', 'c');
-
-$vector[] = 'd';
-
-print_r($vector);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-Ds\Vector Object
-(
-    [0] => a
-    [1] => b
-    [2] => c
-    [3] => d
-)
-]]>
-  </screen>
- </example>
- <example>
-  <title>Map</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$map = new \Ds\Map();
-
-$map->put('a', 1);
-$map->put('b', 2);
-
-$map['c'] = 3;
-
-print_r($map);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-Ds\Map Object
-(
-    [0] => Ds\Pair Object
-        (
-            [key] => a
-            [value] => 1
-        )
-
-    [1] => Ds\Pair Object
-        (
-            [key] => b
-            [value] => 2
-        )
-
-    [2] => Ds\Pair Object
-        (
-            [key] => c
-            [value] => 3
-        )
-
-)
-]]>
-  </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/ds/setup.xml b/reference/ds/setup.xml
deleted file mode 100644
index 66f0fb9923bf..000000000000
--- a/reference/ds/setup.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ds.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="ds.requirements">
-  &reftitle.required;
-  <para>
-    PHP 7 is required by both the extension and the compatibility polyfill.
-  </para>
- </section>
-
- <section xml:id="ds.installation">
-  &reftitle.install;
-  <para>
-     The easiest way to install the extension is via <link xlink:href="&url.pecl.package;ds">PECL</link>
-   <screen>
-<![CDATA[
-pecl install ds
-]]>
-   </screen>
-</para>
-
-   <para>
-     You can also build directly from source:
-
-    <screen>
-<![CDATA[
-# Dependencies you might need to install
-# sudo apt-get install git build-essential php7.0-dev
-
-git clone https://github.com/php-ds/extension "php-ds"
-cd php-ds
-
-# Build and install the extension
-phpize
-./configure
-make
-make install
-
-# Clean up the build files
-make clean
-phpize --clean
-]]>
-   </screen>
-
-  </para>
-
-  <note>
-    <para>
-        If you're using Composer, it's highly recommended that you include
-        <link xlink:href="&url.packagist.package;php-ds/php-ds">php-ds/php-ds</link>
-        in your project so that your code is still functional in an environment where the
-        extension is not installed. The extension will take priority if installed.
-    </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/ds/versions.xml b/reference/ds/versions.xml
deleted file mode 100644
index 654ca032c278..000000000000
--- a/reference/ds/versions.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='ds\hashable' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\hashable::hash' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\hashable::equals' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\collection' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\collection::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\sequence' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::apply' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::contains' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::filter' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::find' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::first' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::get' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::insert' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::join' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::last' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::map' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::merge' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::reduce' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::remove' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::reverse' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::reversed' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::rotate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::set' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::shift' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::slice' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::sort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::sorted' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::sum' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\sequence::unshift' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\vector' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::apply' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::contains' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::filter' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::find' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::first' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::get' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::insert' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::join' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::last' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::map' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::merge' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::reduce' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::remove' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::reverse' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::reversed' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::rotate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::set' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::shift' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::slice' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::sort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::sorted' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::sum' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\vector::unshift' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\deque' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::apply' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::contains' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::filter' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::find' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::first' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::get' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::insert' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::join' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::last' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::map' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::merge' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::reduce' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::remove' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::reverse' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::reversed' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::rotate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::set' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::shift' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::slice' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::sort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::sorted' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::sum' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\deque::unshift' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\stack' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::peek' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\stack::toarray' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\queue' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::peek' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\queue::toarray' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\map' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::apply' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::diff' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::filter' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::first' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::get' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::haskey' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::hasvalue' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::intersect' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::keys' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::ksort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::last' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::map' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::merge' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::pairs' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::put' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::putAll' from='PECL ds &gt;= 1.0.2'/>
- <function name='ds\map::reduce' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::remove' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::reverse' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::reversed' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::skip' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::slice' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::sort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::sorted' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::union' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::values' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\map::xor' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\set' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::add' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::contains' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::diff' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::filter' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::first' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::get' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::intersect' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::join' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::last' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::map' from='PECL ds &gt;= 1.2.7'/>
- <function name='ds\set::merge' from='PECL ds &gt;= 1.0.3'/>
- <function name='ds\set::reduce' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::remove' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::reverse' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::reversed' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::slice' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::sort' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::sorted' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::sum' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::toarray' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::union' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\set::xor' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\priorityqueue' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::allocate' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::capacity' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::peek' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::pop' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::push' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::clear' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::copy' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::count' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::isempty' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\priorityqueue::toarray' from='PECL ds &gt;= 1.0.0'/>
-
- <function name='ds\pair' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\pair::__construct' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\pair::jsonserialize' from='PECL ds &gt;= 1.0.0'/>
- <function name='ds\pair::toarray' from='PECL ds &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/eio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/eio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/eio/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/eio/book.xml b/reference/eio/book.xml
deleted file mode 100644
index 2cb3732439a1..000000000000
--- a/reference/eio/book.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 xml:id="intro.eio">
-  &reftitle.intro;
-  <simpara>
-   This extension provides asynchronous POSIX I/O by means of <link xlink:href="&url.eio.libeio;">libeio</link> C
-   library written by Marc Lehmann.
-  </simpara>
-
-  &note.no-windows.extension;
-
-  <para>
-
-  <warning>
-  <simpara>
-  It is important to be aware that each request is executed in a thread, and the
-  order of execution of continuously queued requests basically is
-  unpredictable. For instance, the following piece of code is incorrect.
-  </simpara>
-  </warning>
-
-  <example>
-  <title>Incorrect requests</title>
-  <programlisting role="php"><![CDATA[
-<?php
-// Request to create symlink of $filename to $link
-eio_symlink($filename, $link);
-
-// Request to move $filename to $new_filename
-eio_rename($filename, $new_filename);
-
-// Process requests
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   </example>
-
-   In the example above <function>eio_rename</function> request may finish
-   before <function>eio_symlink</function>. To fix it you might call <function>eio_rename</function>
-   in the callback of <function>eio_symlink</function>:
-  <example>
-   <title>Calling request from a request callback</title>
-   <programlisting role="php"><![CDATA[
-<?php
-function my_symlink_done($filename, $result) {
- // Request to move $filename to $new_filename
- eio_rename($filename, "/path/to/new-name");
-
- // Process requests
- eio_event_loop();
-}
-
-// Request to create symlink of $filename to $link
-eio_symlink($filename, $link, EIO_PRI_DEFAULT, "my_symlink_done", $filename);
-
-// Process requests
-eio_event_loop();
-?>
-   ]]>
-   </programlisting>
-  </example>
-
-  Alternatively, you might want to create a request group:
-
-  <example>
-   <title>Calling request from a request callback</title>
-   <programlisting role="php"><![CDATA[
-<?php
-/* Is called when the group requests are done */
-function my_grp_done($data, $result) {
- // ...
-}
-
-function my_symlink_done($filename, $result) {
- // Create eio_rename request and add it to the group
- $req = eio_rename($filename, "/path/to/new-name");
- eio_grp_add($grp, $req);
- // You might want to add more requests...
-}
-
-// Create a request group
-$grp = eio_grp("my_grp_done", "my_grp_data");
-
-// Create eio_symlink request and add it to the group
-// Pass $filename to the callback
-$req = eio_symlink($filename, $link,
-  EIO_PRI_DEFAULT, "my_symlink_done", $filename);
-eio_grp_add($grp, $req);
-
-// Process requests
-eio_event_loop();
-?>
-]]></programlisting>
-  </example>
-
-  Group is a special kind of request that could accumulate a set of regular
-  <emphasis>eio</emphasis> requests. This could be used to create a complex
-  request that opens, reads and closes a file.
-  </para>
-  <para>
-  Since version 0.3.0 alpha, a variable used in communications with libeio
-  internally, could be retrieved with
-  <function>eio_get_event_stream</function>. The variable could be used
-  to bind to an event loop supported by some other extension. You might
-  organize a simple event loop where eio and libevent work together:
-  <example>
-   <title>Using eio with libevent</title>
-   <programlisting role="php"><![CDATA[
-<?php
-function my_eio_poll($fd, $events, $arg) {
-    /* Some libevent regulation might go here .. */
-    if (eio_nreqs()) {
-        eio_poll();
-    }
-    /* .. and here */
-}
-
-function my_res_cb($d, $r) {
-    var_dump($r); var_dump($d);
-}
-
-$base = event_base_new();
-$event = event_new();
-
-// This stream is used to bind with libevent
-$fd = eio_get_event_stream();
-
-eio_nop(EIO_PRI_DEFAULT, "my_res_cb", "nop data");
-eio_mkdir("/tmp/abc-eio-temp", 0750, EIO_PRI_DEFAULT, "my_res_cb", "mkdir data");
-/* some other eio_* calls here ... */
-
-
-// set event flags
-event_set($event, $fd, EV_READ /*| EV_PERSIST*/, "my_eio_poll", array($event, $base));
-
-// set event base
-event_base_set($event, $base);
-
-// enable event
-event_add($event);
-
-// start event loop
-event_base_loop($base);
-
-/* The same will be available via buffered libevent interface */
-?>
-]]></programlisting>
-  </example>
-
-  </para>
- </preface>
-
- &reference.eio.setup;
- &reference.eio.constants;
- &reference.eio.examples;
- &reference.eio.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 fdm=marker
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/configure.xml b/reference/eio/configure.xml
deleted file mode 100644
index 4f9fdc444b43..000000000000
--- a/reference/eio/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eio.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;eio">&url.pecl.package;eio</link>.
- </simpara>
- <simpara>
-  For information about manual installation, please
-  read the file <filename>INSTALL</filename> included in the package.
- </simpara>
-
-</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/eio/constants.xml b/reference/eio/constants.xml
deleted file mode 100644
index 04009193a62c..000000000000
--- a/reference/eio/constants.xml
+++ /dev/null
@@ -1,663 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="eio.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-
- <para>Request priority constants:
-  <variablelist>
-   <varlistentry xml:id="constant.eio-pri-min">
-    <term>
-     <constant>EIO_PRI_MIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Request minimal priority.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-pri-default">
-    <term>
-     <constant>EIO_PRI_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Request default priority.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-pri-max">
-    <term>
-     <constant>EIO_PRI_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Request maximal priority.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para><function>eio_seek</function> <parameter>whence</parameter> argument:
-  <variablelist>
-   <varlistentry xml:id="constant.eio-seek-set">
-    <term>
-     <constant>EIO_SEEK_SET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The offset is set to specified number of bytes (<parameter>offset</parameter>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-seek-cur">
-    <term>
-     <constant>EIO_SEEK_CUR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The offset is set to its current location plus <parameter>offset</parameter> bytes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-seek-end">
-    <term>
-     <constant>EIO_SEEK_END</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The offset is set to the size of the file plus <parameter>offset</parameter> bytes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
-
- <para>
-  Flags used with <function>eio_readdir</function>:
-  <variablelist>
-
-   <varlistentry xml:id="constant.eio-readdir-dents">
-    <term>
-     <constant>EIO_READDIR_DENTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      <function>eio_readdir</function> flag. If specified, the result argument of the callback
-      becomes an array with the following keys:
-      <literal>'names'</literal> - array of directory names
-      <literal>'dents'</literal> - array of <literal>struct eio_dirent</literal>-like
-      arrays having the following keys each:
-      <literal>'name'</literal> - the directory name;
-      <literal>'type'</literal> - one of <emphasis>EIO_DT_*</emphasis>
-      constants;
-      <literal>'inode'</literal> - the inode number, if available, otherwise
-      unspecified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-readdir-dirs-first">
-    <term>
-     <constant>EIO_READDIR_DIRS_FIRST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      When this flag is specified, the names will be returned in an order
-      where likely directories come first, in optimal stat order.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-readdir-stat-order">
-    <term>
-     <constant>EIO_READDIR_STAT_ORDER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      When this flag is specified, then the names will be returned in an order
-      suitable for <literal>stat</literal>'ing each one. When planning to
-      <function>stat</function> all files in the given directory, the
-      returned order will likely be
-      fastest.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-readdir-found-unknown">
-    <term>
-     <constant>EIO_READDIR_FOUND_UNKNOWN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="constant.eio-dt-unknown">
-    <term>
-     <constant>EIO_DT_UNKNOWN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unknown node type (very common). Further <function>stat</function> needed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-fifo">
-    <term>
-     <constant>EIO_DT_FIFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      FIFO node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-chr">
-    <term>
-     <constant>EIO_DT_CHR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-mpc">
-    <term>
-     <constant>EIO_DT_MPC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Multiplexed char device (v7+coherent) node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-dir">
-    <term>
-     <constant>EIO_DT_DIR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Directory node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-nam">
-    <term>
-     <constant>EIO_DT_NAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Xenix special named file node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-blk">
-    <term>
-     <constant>EIO_DT_BLK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-mpb">
-    <term>
-     <constant>EIO_DT_MPB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Multiplexed block device (v7+coherent).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-reg">
-    <term>
-     <constant>EIO_DT_REG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-nwk">
-    <term>
-     <constant>EIO_DT_NWK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-cmp">
-    <term>
-     <constant>EIO_DT_CMP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HP-UX network special node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-lnk">
-    <term>
-     <constant>EIO_DT_LNK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Link node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-sock">
-    <term>
-     <constant>EIO_DT_SOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socket node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-door">
-    <term>
-     <constant>EIO_DT_DOOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Solaris door node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-wht">
-    <term>
-     <constant>EIO_DT_WHT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Node type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-dt-max">
-    <term>
-     <constant>EIO_DT_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Highest node type value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
- <para>
-  Access modes for <function>eio_open</function> <parameter>flags</parameter>
-  argument:
-  <variablelist>
-
-   <varlistentry xml:id="constant.eio-o-rdonly">
-    <term>
-     <constant>EIO_O_RDONLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-wronly">
-    <term>
-     <constant>EIO_O_WRONLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-rdwr">
-    <term>
-     <constant>EIO_O_RDWR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-nonblock">
-    <term>
-     <constant>EIO_O_NONBLOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-append">
-    <term>
-     <constant>EIO_O_APPEND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-creat">
-    <term>
-     <constant>EIO_O_CREAT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-trunc">
-    <term>
-     <constant>EIO_O_TRUNC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-excl">
-    <term>
-     <constant>EIO_O_EXCL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-o-fsync">
-    <term>
-     <constant>EIO_O_FSYNC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
- <para>
-  <parameter>mode</parameter> argument flags for <function>eio_open</function>:
-  <variablelist>
-
-   <varlistentry xml:id="constant.eio-s-irusr">
-    <term>
-     <constant>EIO_S_IRUSR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-iwusr">
-    <term>
-     <constant>EIO_S_IWUSR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ixusr">
-    <term>
-     <constant>EIO_S_IXUSR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-irgrp">
-    <term>
-     <constant>EIO_S_IRGRP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-iwgrp">
-    <term>
-     <constant>EIO_S_IWGRP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ixgrp">
-    <term>
-     <constant>EIO_S_IXGRP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-iroth">
-    <term>
-     <constant>EIO_S_IROTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-iwoth">
-    <term>
-     <constant>EIO_S_IWOTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ixoth">
-    <term>
-     <constant>EIO_S_IXOTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ifreg">
-    <term>
-     <constant>EIO_S_IFREG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ifchr">
-    <term>
-     <constant>EIO_S_IFCHR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ifblk">
-    <term>
-     <constant>EIO_S_IFBLK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ififo">
-    <term>
-     <constant>EIO_S_IFIFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-s-ifsock">
-    <term>
-     <constant>EIO_S_IFSOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
- <para>
-  <function>eio_sync_file_range</function> flags:
-  <variablelist>
-
-   <varlistentry xml:id="constant.eio-sync-file-range-wait-before">
-    <term>
-     <constant>EIO_SYNC_FILE_RANGE_WAIT_BEFORE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-sync-file-range-write">
-    <term>
-     <constant>EIO_SYNC_FILE_RANGE_WRITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.eio-sync-file-range-wait-after">
-    <term>
-     <constant>EIO_SYNC_FILE_RANGE_WAIT_AFTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
- <para>
-  <function>eio_fallocate</function> flags:
-  <variablelist>
-
-   <varlistentry xml:id="constant.eio-falloc-fl-keep-size">
-    <term>
-     <constant>EIO_FALLOC_FL_KEEP_SIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </para>
-
- <note xmlns="http://docbook.org/ns/docbook">
-  <simpara>
-   <emphasis>EIO_S_I*</emphasis> constants have the same meaning as their
-   <emphasis>S_I*</emphasis> POSIX counterparts.
-  </simpara>
- </note>
-
- <note xmlns="http://docbook.org/ns/docbook">
-  <simpara>
-   <emphasis>EIO_SYNC_FILE_*</emphasis> constants have the same meaning as their
-   <emphasis>SYNC_FILE_**</emphasis> counterparts.
-  </simpara>
- </note>
-
- <note xmlns="http://docbook.org/ns/docbook">
-  <simpara>
-   <emphasis>EIO_O_*</emphasis> constants have the same meaning as their
-   <emphasis>O_*</emphasis> POSIX counterparts.
-  </simpara>
- </note>
-</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/eio/examples.xml b/reference/eio/examples.xml
deleted file mode 100644
index 8560167c2187..000000000000
--- a/reference/eio/examples.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eio.examples">
- &reftitle.examples;
- <example>
-<title>Cancelling a request</title>
-<programlisting role="php">
-<![CDATA[
- <?php
- /* Is called when eio_nop() finished */
- function my_nop_cb($data, $result) {
-  echo "my_nop ", $data, "\n";
- }
-
-// This eio_nop() call will be cancelled
-$req = eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "1");
-var_dump($req);
-eio_cancel($req);
-
-// This time eio_nop() will be processed
-eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "2");
-
-// Process requests
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
-<![CDATA[
-resource(4) of type (EIO Request Descriptor)
-my_nop 2
- ]]>
-</screen>
-</example>
-
- <example>
-<title>Calling <function>eio_chmod</function></title>
-<programlisting role="php">
-<![CDATA[
-<?php
-$temp_filename = dirname(__FILE__) ."/eio-temp-file.tmp";
-touch($temp_filename);
-
-/* Is called when eio_chmod() finished */
-function my_chmod_callback($data, $result) {
-    global $temp_filename;
-
-    if ($result == 0 && !is_readable($temp_filename) && is_writable($temp_filename)) {
-        echo "eio_chmod_ok";
-    }
-
-    @unlink($temp_filename);
-}
-
-eio_chmod($temp_filename, 0200, EIO_PRI_DEFAULT, "my_chmod_callback");
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
-<![CDATA[
-eio_chmod_ok
- ]]>
-</screen>
-</example>
-
- <example>
-<title>Making a custom request</title>
-<programlisting role="php">
-<![CDATA[
-<?php
-/* Callback for the custom callback */
-function my_custom_callback($data, $result) {
-    var_dump($data);
-    var_dump(count($result));
-    var_dump($result['data_modified']);
-    var_dump($result['result']);
-}
-
-/* The custom request */
-function my_custom($data) {
-    var_dump($data);
-
-    $result  = array(
-        'result'        => 1001,
-        'data_modified' => "my custom data",
-    );
-
-    return $result;
-}
-
-$data = "my_custom_data";
-$req = eio_custom("my_custom", EIO_PRI_DEFAULT, "my_custom_callback", $data);
-var_dump($req);
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
-<![CDATA[
-resource(4) of type (EIO Request Descriptor)
-string(14) "my_custom_data"
-string(14) "my_custom_data"
-int(2)
-string(14) "my custom data"
-int(1001)
- ]]>
-</screen>
-</example>
-
- <para>
- <example>
- <title>Grouping requests</title>
- <programlisting role="php">
- <![CDATA[
-<?php
-/*
- * Create a group request to open, read and close a file
- */
-
-$temp_filename = dirname(__FILE__) ."/eio-file.tmp";
-$fp = fopen($temp_filename, "w");
-fwrite($fp, "some data");
-fclose($fp);
-
-/* Is called when the group requests are done */
-function my_grp_done($data, $result) {
- global $temp_filename;
- var_dump($result == 0);
- @unlink($temp_filename);
-}
-
-/* Is called when eio_open() done */
-function my_grp_file_opened_callback($data, $result) {
- global $my_file_fd, $grp;
-
- $my_file_fd = $result;
-
- var_dump($result > 0);
-
- // Create eio_read() request and add it to the group
- $req = eio_read($my_file_fd, 4, 0, EIO_PRI_DEFAULT, "my_grp_file_read_callback");
- eio_grp_add($grp, $req);
-}
-
-/* Is called when eio_read() done */
-function my_grp_file_read_callback($data, $result) {
- global $my_file_fd, $grp;
-
- var_dump($result);
-
- // Create eio_close() request and add it to the group
- $req = eio_close($my_file_fd);
- eio_grp_add($grp, $req);
-}
-
-$grp = eio_grp("my_grp_done", "my_grp_data");
-
-// Create eio_open() request and add it to the group
-$req = eio_open($temp_filename, EIO_O_RDWR | EIO_O_APPEND , NULL,
-  EIO_PRI_DEFAULT, "my_grp_file_opened_callback", NULL);
-eio_grp_add($grp, $req);
-var_dump($grp);
-
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
- <![CDATA[
-resource(6) of type (EIO Group Descriptor)
-bool(true)
-string(4) "some"
-bool(true)
- ]]>
- </screen>
- </example>
- </para>
-
-<example>
-  <title>Using eio with libevent extension</title>
-  <programlisting role="php"><![CDATA[
-<?php
-function my_eio_poll($fd, $events, $arg) {
-    /* Some libevent regulation might go here .. */
-    if (eio_nreqs()) {
-        eio_poll();
-    }
-    /* .. and here */
-}
-
-function my_nop_cb($d, $r) {
-    var_dump($r); var_dump($d);
-}
-
-$base = event_base_new();
-$event = event_new();
-
-$fd = eio_get_event_stream();
-var_dump($fd);
-
-eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "nop data");
-eio_mkdir("/tmp/abc-eio-temp", 0750, EIO_PRI_DEFAULT, "my_nop_cb", "nop data");
-/* some other eio_* calls here ... */
-
-
-// set event flags
-event_set($event, $fd, EV_READ /*| EV_PERSIST*/, "my_eio_poll", array($event, $base));
-
-// set event base
-event_base_set($event, $base);
-
-// enable event
-event_add($event);
-
-// start event loop
-event_base_loop($base);
-
-/* The same will be available via buffered libevent interface */
-?>
-]]></programlisting>
-
-&example.outputs.similar;
-<screen>
-<![CDATA[
-int(3)
-int(0)
-string(8) "nop data"
-int(0)
-string(10) "mkdir data"
- ]]>
-</screen>
-</example>
-
-<example>
-  <title>Using eio with event extension</title>
-  <programlisting role="php"><![CDATA[
-<?php
-$base = new EventBase();
-
-// Retrieve eio polling stream.
-// Note, this variable should be alive as long as the event loop is running.
-$eio_stream = eio_get_event_stream();
-
-// Bind eio polling stream to the event loop.
-$poll_event = new Event($base, $eio_stream, Event::READ, function () {
-  if (eio_nreqs()) {
-    eio_poll();
-  }
-});
-$poll_event->add();
-
-// Add eio jobs
-eio_nop(EIO_PRI_DEFAULT, function () {
-  echo "eio_nop\n";
-});
-
-// Add events
-$timer = Event::timer($base, function () {
-  echo "2 seconds elapsed\n";
-});
-$timer->add(2);
-
-// Dispatch events.
-$base->dispatch();
-?>
-]]></programlisting>
-
-&example.outputs.similar;
-<screen>
-<![CDATA[
-eio_nop
-2 seconds elapsed
- ]]>
-</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/eio/functions/eio-busy.xml b/reference/eio/functions/eio-busy.xml
deleted file mode 100644
index e0af433ed4bb..000000000000
--- a/reference/eio/functions/eio-busy.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-busy">
- <refnamediv>
-  <refname>eio_busy</refname>
-  <refpurpose>Artificially increase load. Could be useful in tests,
-  benchmarking</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_busy</methodname>
-   <methodparam><type>int</type><parameter>delay</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_busy</function> artificially increases load taking
-  <parameter>delay</parameter> seconds to execute. May be used for debugging,
-  or benchmarking.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>delay</parameter></term>
-    <listitem>
-     <simpara>
-     Delay in seconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-    <simpara>
-    This callback is called when all the group requests are done.
-    </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
- &reftitle.returnvalues;
-  <simpara>
-   <function>eio_busy</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso"> &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nop</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/eio/functions/eio-cancel.xml b/reference/eio/functions/eio-cancel.xml
deleted file mode 100644
index 20a593731dba..000000000000
--- a/reference/eio/functions/eio-cancel.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-cancel">
- <refnamediv>
-  <refname>eio_cancel</refname>
-  <refpurpose>Cancels a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_cancel</methodname>
-   <methodparam><type>resource</type><parameter>req</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_cancel</function> cancels a request specified by
-   <parameter>req</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>req</parameter></term>
-    <listitem>
-     <simpara>
-     The request resource
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_cancel</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
- /* Is called when eio_nop() finished */
- function my_nop_cb($data, $result) {
-  echo "my_nop ", $data, "\n";
- }
-
-// This eio_nop() call will be cancelled
-$req = eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "1");
-var_dump($req);
-eio_cancel($req);
-
-// This time eio_nop() will be processed
-eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "2");
-
-// Process requests
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-resource(4) of type (EIO Request Descriptor)
-my_nop 2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_grp_cancel</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/eio/functions/eio-chmod.xml b/reference/eio/functions/eio-chmod.xml
deleted file mode 100644
index 7dc60befc842..000000000000
--- a/reference/eio/functions/eio-chmod.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-chmod">
- <refnamediv>
-  <refname>eio_chmod</refname>
-  <refpurpose>Change file/directory permissions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_chmod</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_chmod</function> changes file, or directory permissions. The
-  new permissions are specified by <parameter>mode</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the target file or directory
-     </simpara>
-     &eio.warn.relpath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-     The new permissions. E.g. <literal>0644</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_chmod</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_chown</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/eio/functions/eio-chown.xml b/reference/eio/functions/eio-chown.xml
deleted file mode 100644
index 324ee6c962f0..000000000000
--- a/reference/eio/functions/eio-chown.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-chown">
- <refnamediv>
-  <refname>eio_chown</refname>
-  <refpurpose>Change file/directory ownership</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_chown</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>uid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>gid</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_chown</function> changes ownership of a file, or directory. The
-  new owner is specified by <parameter>uid</parameter>, and the group by
-  <parameter>gid</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path to file or directory.
-     </simpara>
-     &eio.warn.relpath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>uid</parameter></term>
-    <listitem>
-     <simpara>
-     User ID. Is ignored when equal to -1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gid</parameter></term>
-    <listitem>
-     <simpara>
-     Group ID. Is ignored when equal to -1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_chown</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_chmod</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/eio/functions/eio-close.xml b/reference/eio/functions/eio-close.xml
deleted file mode 100644
index e2487180e040..000000000000
--- a/reference/eio/functions/eio-close.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-close">
- <refnamediv>
-  <refname>eio_close</refname>
-  <refpurpose>Close file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_close</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_close</function> closes file specified by
-  <parameter>fd</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-      Stream, Socket resource, or numeric file descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_close</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_open</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/eio/functions/eio-custom.xml b/reference/eio/functions/eio-custom.xml
deleted file mode 100644
index 4c077a1ff0a5..000000000000
--- a/reference/eio/functions/eio-custom.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-custom">
- <refnamediv>
-  <refname>eio_custom</refname>
-  <refpurpose>Execute custom request like any other <emphasis>eio_*</emphasis> call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_custom</methodname>
-   <methodparam><type>callable</type><parameter>execute</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_custom</function> executes custom function specified by
-   <parameter>execute</parameter> processing it just like any other <emphasis>eio_*</emphasis> call.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>execute</parameter></term>
-    <listitem>
-     <para>
-      Specifies the request function that should match the following prototype:
-
-      <programlisting><![CDATA[
-      mixed execute(mixed data);
-      ]]></programlisting>
-      <parameter>callback</parameter> is event completion callback that should match the following
-      prototype:
-      <programlisting><![CDATA[
-      void callback(mixed data, mixed result);
-      ]]></programlisting>
-
-     <parameter>data</parameter> is the data passed to
-     <parameter>execute</parameter> via <parameter>data</parameter> argument
-      without modifications
-      <parameter>result</parameter> value returned by <parameter>execute</parameter>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_custom</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_custom</function> example</title>
- <programlisting role="php">
- <![CDATA[
-<?php
-/* Callback for the custom callback */
-function my_custom_callback($data, $result) {
-    var_dump($data);
-    var_dump(count($result));
-    var_dump($result['data_modified']);
-    var_dump($result['result']);
-}
-
-/* The custom request */
-function my_custom($data) {
-    var_dump($data);
-
-    $result  = array(
-        'result'        => 1001,
-        'data_modified' => "my custom data",
-    );
-
-    return $result;
-}
-
-$data = "my_custom_data";
-$req = eio_custom("my_custom", EIO_PRI_DEFAULT, "my_custom_callback", $data);
-var_dump($req);
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
- <![CDATA[
-resource(4) of type (EIO Request Descriptor)
-string(14) "my_custom_data"
-string(14) "my_custom_data"
-int(2)
-string(14) "my custom data"
-int(1001)
- ]]>
- </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/eio/functions/eio-dup2.xml b/reference/eio/functions/eio-dup2.xml
deleted file mode 100644
index 3c7ede8f9d5e..000000000000
--- a/reference/eio/functions/eio-dup2.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-dup2">
- <refnamediv>
-  <refname>eio_dup2</refname>
-  <refpurpose>Duplicate a file descriptor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_dup2</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>fd2</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-
-  </methodsynopsis>
-  <simpara>
-  <function>eio_dup2</function> duplicates file descriptor.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Source stream, Socket resource, or numeric file descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fd2</parameter></term>
-    <listitem>
-     <simpara>
-     Target stream, Socket resource, or numeric file descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_dup2</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-event-loop.xml b/reference/eio/functions/eio-event-loop.xml
deleted file mode 100644
index fd273c22237c..000000000000
--- a/reference/eio/functions/eio-event-loop.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-event-loop">
- <refnamediv>
-  <refname>eio_event_loop</refname>
-  <refpurpose>Polls libeio until all requests proceeded</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>eio_event_loop</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_event_loop</function> polls libeio until all requests proceeded.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_event_loop</function> returns &true; on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
- <title><function>eio_event_loop</function> example</title>
- <programlisting role="php">
- <![CDATA[
-<?php
-$temp_filename = "eio-temp-file.tmp";
-touch($temp_filename);
-
-/* Is called when eio_chmod() finished */
-function my_chmod_callback($data, $result) {
-    global $temp_filename;
-
-    if ($result == 0 && !is_readable($temp_filename) && is_writable($temp_filename)) {
-        echo "eio_chmod_ok";
-    }
-
-    @unlink($temp_filename);
-}
-
-eio_chmod($temp_filename, 0200, EIO_PRI_DEFAULT, "my_chmod_callback");
-eio_event_loop();
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
- <![CDATA[
-eio_chmod_ok
- ]]>
- </screen>
- </example>
-
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_poll</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/eio/functions/eio-fallocate.xml b/reference/eio/functions/eio-fallocate.xml
deleted file mode 100644
index eac03109017c..000000000000
--- a/reference/eio/functions/eio-fallocate.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fallocate">
- <refnamediv>
-  <refname>eio_fallocate</refname>
-  <refpurpose>Allows the caller to directly manipulate the allocated disk
-  space for a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fallocate</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-
-  </methodsynopsis>
-
-  <simpara>
-  <function>eio_fallocate</function> allows the caller to directly manipulate the allocated disk space for the
-  file specified by <parameter>fd</parameter> file descriptor for the byte
-  range starting at <parameter>offset</parameter> and continuing for
-  <parameter>length</parameter> bytes.
-  </simpara>
-
-  <note xmlns="http://docbook.org/ns/docbook">
-  <title>File should be opened for writing</title>
-  <simpara><constant>EIO_O_CREAT</constant> should be logically
-      <emphasis>OR</emphasis>'d with <constant>EIO_O_WRONLY</constant>, or
-      <constant>EIO_O_RDWR</constant>
-  </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor, e.g. returned by <function>eio_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>Currently only one flag is supported for mode:
-     <constant>EIO_FALLOC_FL_KEEP_SIZE</constant> (the same as POSIX constant
-       <constant>FALLOC_FL_KEEP_SIZE</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Specifies start of the byte range.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-     Specifies length of the byte range.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fallocate</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-fchmod.xml b/reference/eio/functions/eio-fchmod.xml
deleted file mode 100644
index 245e81312af7..000000000000
--- a/reference/eio/functions/eio-fchmod.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fchmod">
- <refnamediv>
-  <refname>eio_fchmod</refname>
-  <refpurpose>Change file permissions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fchmod</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_fchmod</function> changes permissions for the file specified
-  by <parameter>fd</parameter> file descriptor.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor, e.g. returned by <function>eio_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-     The new permissions. E.g. 0644.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fchmod</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_fchown</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/eio/functions/eio-fchown.xml b/reference/eio/functions/eio-fchown.xml
deleted file mode 100644
index 9b10af704d1d..000000000000
--- a/reference/eio/functions/eio-fchown.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fchown">
- <refnamediv>
-  <refname>eio_fchown</refname>
-  <refpurpose>Change file ownership</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fchown</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>uid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>gid</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_fchown</function> changes ownership of the file specified by
-   <parameter>fd</parameter> file descriptor.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>uid</parameter></term>
-    <listitem>
-     <simpara>
-     User ID. Is ignored when equal to -1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gid</parameter></term>
-    <listitem>
-     <simpara>
-     Group ID. Is ignored when equal to -1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fchown</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_fchmod</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/eio/functions/eio-fdatasync.xml b/reference/eio/functions/eio-fdatasync.xml
deleted file mode 100644
index 750773a7c7f5..000000000000
--- a/reference/eio/functions/eio-fdatasync.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fdatasync">
- <refnamediv>
-  <refname>eio_fdatasync</refname>
-  <refpurpose>Synchronize a file's in-core state with storage device</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fdatasync</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_fdatasync</function> synchronizes a file's in-core state with storage device.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor, e.g. returned by <function>eio_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fdatasync</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-fstat.xml b/reference/eio/functions/eio-fstat.xml
deleted file mode 100644
index eeb7d9933861..000000000000
--- a/reference/eio/functions/eio-fstat.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fstat">
- <refnamediv>
-  <refname>eio_fstat</refname>
-   <refpurpose>Get file status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fstat</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_fstat</function> returns file status information in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fstat</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_fstat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Create temporary file
-$tmp_filename = dirname(__FILE__) ."/eio-file.tmp";
-touch($tmp_filename);
-
-/* Is called when eio_fstat() done */
-function my_res_cb($data, $result) {
- // Should output array with stat info
- var_dump($result);
-
- if ($data['fd']) {
-  // Close temporary file
-  eio_close($data['fd']);
-  eio_event_loop();
- }
- // Remove temporary file
- @unlink($data['file']);
-}
-
-/* Is called when eio_open() done */
-function my_open_cb($data, $result) {
- // Prepare data for callback
- $d = array(
-  'fd'  => $result,
-  'file'=> $data
- );
- // Request stat info
- eio_fstat($result, EIO_PRI_DEFAULT, "my_res_cb", $d);
- // Process request(s)
- eio_event_loop();
-}
-
-// Open temporary file
-eio_open($tmp_filename, EIO_O_RDONLY, NULL, EIO_PRI_DEFAULT,
-  "my_open_cb", $tmp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(12) {
- ["st_dev"]=>
-  int(2050)
-  ["st_ino"]=>
-  int(2489159)
-  ["st_mode"]=>
-  int(33188)
-  ["st_nlink"]=>
-  int(1)
-  ["st_uid"]=>
-  int(1000)
-  ["st_gid"]=>
-  int(100)
-  ["st_rdev"]=>
-  int(0)
-  ["st_blksize"]=>
-  int(4096)
-  ["st_blocks"]=>
-  int(0)
-  ["st_atime"]=>
-  int(1318239506)
-  ["st_mtime"]=>
-  int(1318239506)
-  ["st_ctime"]=>
-  int(1318239506)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_lstat</function></member>
-   <member><function>eio_stat</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/eio/functions/eio-fstatvfs.xml b/reference/eio/functions/eio-fstatvfs.xml
deleted file mode 100644
index 3ac7291cda9f..000000000000
--- a/reference/eio/functions/eio-fstatvfs.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fstatvfs">
- <refnamediv>
-  <refname>eio_fstatvfs</refname>
-  <refpurpose>Get file system statistics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fstatvfs</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_fstatvfs</function> returns file system statistics in
-  <parameter>result</parameter> of <parameter>callback</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     A file descriptor of a file within the mounted file system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fstatvfs</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_statvfs</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/eio/functions/eio-fsync.xml b/reference/eio/functions/eio-fsync.xml
deleted file mode 100644
index 814b356f1947..000000000000
--- a/reference/eio/functions/eio-fsync.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-fsync">
- <refnamediv>
-  <refname>eio_fsync</refname>
-  <refpurpose>Synchronize a file's in-core state with storage device</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_fsync</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Synchronize a file's in-core state with storage device
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_fsync</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_sync</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/eio/functions/eio-ftruncate.xml b/reference/eio/functions/eio-ftruncate.xml
deleted file mode 100644
index d09569560e51..000000000000
--- a/reference/eio/functions/eio-ftruncate.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-ftruncate">
- <refnamediv>
-  <refname>eio_ftruncate</refname>
-  <refpurpose>Truncate a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_ftruncate</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_ftruncate</function> causes a regular file referenced by
-  <parameter>fd</parameter> file descriptor to be truncated to precisely
-  <parameter>length</parameter> bytes.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Offset from beginning of the file
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_ftruncate</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_truncate</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/eio/functions/eio-futime.xml b/reference/eio/functions/eio-futime.xml
deleted file mode 100644
index ace349fa0649..000000000000
--- a/reference/eio/functions/eio-futime.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-futime">
- <refnamediv>
-  <refname>eio_futime</refname>
-  <refpurpose>Change file last access and modification times</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_futime</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>float</type><parameter>atime</parameter></methodparam>
-   <methodparam><type>float</type><parameter>mtime</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-
-  </methodsynopsis>
-  <simpara>
-   <function>eio_futime</function> changes file last access and modification
-   times.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor, e.g. returned by <function>eio_open</function>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>atime</parameter></term>
-    <listitem>
-     <simpara>
-     Access time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mtime</parameter></term>
-    <listitem>
-     <simpara>
-     Modification time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_futime</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_utime</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/eio/functions/eio-get-event-stream.xml b/reference/eio/functions/eio-get-event-stream.xml
deleted file mode 100644
index 6ad5aa773343..000000000000
--- a/reference/eio/functions/eio-get-event-stream.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-get-event-stream">
- <refnamediv>
-  <refname>eio_get_event_stream</refname>
-  <refpurpose>Get stream representing a variable used in internal communications with libeio</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>eio_get_event_stream</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_get_event_stream</function> acquires stream representing a
-   variable used in internal communications with libeio. Could be used to bind
-   with some event loop provided by other PECL extension, for example
-   libevent.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_get_event_stream</function> returns stream on success;
-   otherwise, &null;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Using eio with libevent</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function my_eio_poll($fd, $events, $arg) {
-    /* Some libevent regulation might go here .. */
-    if (eio_nreqs()) {
-        eio_poll();
-    }
-    /* .. and here */
-}
-
-function my_res_cb($d, $r) {
-    var_dump($r); var_dump($d);
-}
-
-$base = event_base_new();
-$event = event_new();
-
-$fd = eio_get_event_stream();
-var_dump($fd);
-
-eio_nop(EIO_PRI_DEFAULT, "my_res_cb", "nop data");
-eio_mkdir("/tmp/abc-eio-temp", 0750, EIO_PRI_DEFAULT, "my_res_cb", "mkdir data");
-/* some other eio_* calls here ... */
-
-
-// set event flags
-event_set($event, $fd, EV_READ /*| EV_PERSIST*/, "my_eio_poll", array($event, $base));
-
-// set event base
-event_base_set($event, $base);
-
-// enable event
-event_add($event);
-
-// start event loop
-event_base_loop($base);
-
-/* The same will be available via buffered libevent interface */
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(0)
-string(8) "nop data"
-int(0)
-string(10) "mkdir data"
-]]>
-   </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/eio/functions/eio-get-last-error.xml b/reference/eio/functions/eio-get-last-error.xml
deleted file mode 100644
index 2ee1de8b2ec6..000000000000
--- a/reference/eio/functions/eio-get-last-error.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-get-last-error">
- <refnamediv>
-  <refname>eio_get_last_error</refname>
-  <refpurpose>Returns string describing the last error associated with a request resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>eio_get_last_error</methodname>
-   <methodparam><type>resource</type><parameter>req</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_get_last_error</function> returns string describing the last error associated with <parameter>req</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>req</parameter></term>
-    <listitem>
-     <simpara>
-     The request resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_get_last_error</function> returns string describing the last error associated with the request resource specified by <parameter>req</parameter>.
-  </simpara>
-  &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/eio/functions/eio-grp-add.xml b/reference/eio/functions/eio-grp-add.xml
deleted file mode 100644
index e7453b58a84a..000000000000
--- a/reference/eio/functions/eio-grp-add.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-grp-add">
- <refnamediv>
-  <refname>eio_grp_add</refname>
-  <refpurpose>Adds a request to the request group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_grp_add</methodname>
-   <methodparam><type>resource</type><parameter>grp</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>req</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_grp_add</function> adds a request to the request group.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>grp</parameter></term>
-    <listitem>
-     <simpara>
-     The request group resource returned by <function>eio_grp</function>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>req</parameter></term>
-    <listitem>
-     <simpara>
-     The request resource
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-  <title>Grouping requests</title>
-  <programlisting role="php"><![CDATA[
-<?php
-/*
- * Create a group request to open, read and close a file
- */
-
-// Create temporary file and write some bytes to it
-$temp_filename = dirname(__FILE__) ."/eio-file.tmp";
-$fp = fopen($temp_filename, "w");
-fwrite($fp, "some data");
-fclose($fp);
-
-/* Is called when the group requests are done */
-function my_grp_done($data, $result) {
- var_dump($result == 0);
- @unlink($data);
-}
-
-/* Is called when eio_open() done */
-function my_grp_file_opened_callback($data, $result) {
- global $grp;
-
- // $result should contain the file descriptor
- var_dump($result > 0);
-
- // Create eio_read() request and add it to the group
- // Pass file descriptor to the callback
- $req = eio_read($result, 4, 0,
-   EIO_PRI_DEFAULT, "my_grp_file_read_callback", $result);
- eio_grp_add($grp, $req);
-}
-
-/* Is called when eio_read() done */
-function my_grp_file_read_callback($data, $result) {
- global $grp;
-
- // Read bytes
- var_dump($result);
-
- // Create eio_close() request and add it to the group
- // $data should contain the file descriptor
- $req = eio_close($data);
- eio_grp_add($grp, $req);
-}
-
-// Create request group
-$grp = eio_grp("my_grp_done", $temp_filename);
-var_dump($grp);
-
-// Create eio_open() request and add it to the group
-$req = eio_open($temp_filename, EIO_O_RDWR | EIO_O_APPEND , NULL,
-  EIO_PRI_DEFAULT, "my_grp_file_opened_callback", NULL);
-eio_grp_add($grp, $req);
-
-// Process requests
-eio_event_loop();
-?>
-]]></programlisting>
-  &example.outputs.similar;
- <screen><![CDATA[
-resource(6) of type (EIO Group Descriptor)
-bool(true)
-string(4) "some"
-bool(true)
-]]></screen>
- </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_grp</function></member>
-   <member><function>eio_grp_cancel</function></member>
-   <member><function>eio_grp_limit</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/eio/functions/eio-grp-cancel.xml b/reference/eio/functions/eio-grp-cancel.xml
deleted file mode 100644
index d1258a2e5759..000000000000
--- a/reference/eio/functions/eio-grp-cancel.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-grp-cancel">
- <refnamediv>
-  <refname>eio_grp_cancel</refname>
-  <refpurpose>Cancels a request group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_grp_cancel</methodname>
-   <methodparam><type>resource</type><parameter>grp</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_grp_cancel</function> cancels a group request specified by
-  <parameter>grp</parameter> request group resource.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>grp</parameter></term>
-    <listitem>
-     <simpara>
-     The request group resource returned by <function>eio_grp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_grp</function></member>
-   <member><function>eio_grp_add</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/eio/functions/eio-grp-limit.xml b/reference/eio/functions/eio-grp-limit.xml
deleted file mode 100644
index 5b8712aaf2b9..000000000000
--- a/reference/eio/functions/eio-grp-limit.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-grp-limit">
- <refnamediv>
-  <refname>eio_grp_limit</refname>
-  <refpurpose>Set group limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_grp_limit</methodname>
-   <methodparam><type>resource</type><parameter>grp</parameter></methodparam>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Limit number of requests in the request group.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>grp</parameter></term>
-    <listitem>
-     <simpara>
-     The request group resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-     Number of requests in the group.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_grp_add</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/eio/functions/eio-grp.xml b/reference/eio/functions/eio-grp.xml
deleted file mode 100644
index 943f28caddc1..000000000000
--- a/reference/eio/functions/eio-grp.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-grp">
- <refnamediv>
-  <refname>eio_grp</refname>
-  <refpurpose>Creates a request group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_grp</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_grp</function> creates a request group.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_grp</function> returns request group resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_grp</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$temp_filename = dirname(__FILE__) ."/eio-file.tmp";
-$fp = fopen($temp_filename, "w");
-fwrite($fp, "some data");
-fclose($fp);
-$my_file_fd = NULL;
-
-/* Is called when the group requests are done */
-function my_grp_done($data, $result) {
- // Remove the file, if it still exists
- @unlink($data);
-}
-
-/* Is called when the temporary file is opened */
-function my_grp_file_opened_callback($data, $result) {
- global $my_file_fd, $grp;
-
- $my_file_fd = $result;
-
- $req = eio_read($my_file_fd, 4, 0,
-   EIO_PRI_DEFAULT, "my_grp_file_read_callback");
- eio_grp_add($grp, $req);
-}
-
-/* Is called when the file is read */
-function my_grp_file_read_callback($data, $result) {
- global $my_file_fd, $grp;
-
- var_dump($result);
-
- // Create request to close the file
- $req = eio_close($my_file_fd);
-
- // Add request to the group
- eio_grp_add($grp, $req);
-}
-
-// Create request group
-$grp = eio_grp("my_grp_done", $temp_filename);
-
-// Create request
-$req = eio_open($temp_filename, EIO_O_RDWR | EIO_O_APPEND , NULL,
-  EIO_PRI_DEFAULT, "my_grp_file_opened_callback", NULL);
-
-// Add request to the group
-eio_grp_add($grp, $req);
-
-// Process requests
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(4) "some"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_grp_cancel</function></member>
-   <member><function>eio_grp_add</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/eio/functions/eio-init.xml b/reference/eio/functions/eio-init.xml
deleted file mode 100644
index ad1398bb236e..000000000000
--- a/reference/eio/functions/eio-init.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-init">
- <refnamediv>
-  <refname>eio_init</refname>
-  <refpurpose>(Re-)initialize Eio</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_init</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <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.
-  </simpara>
-  <note>
-   <simpara>
-    This function was removed in version 3.0.0RC1 of the eio extension for PHP version 8 and higher.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-link.xml b/reference/eio/functions/eio-link.xml
deleted file mode 100644
index cf46db78ee50..000000000000
--- a/reference/eio/functions/eio-link.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-link">
- <refnamediv>
-  <refname>eio_link</refname>
-  <refpurpose>Create a hardlink for file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_link</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_link</function> creates a hardlink
-  <parameter>new_path</parameter> for a file specified by
-  <parameter>path</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Source file path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_path</parameter></term>
-    <listitem>
-     <simpara>
-     Target file path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_link</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$filename = dirname(__FILE__)."/symlink.dat";
-touch($filename);
-$link = dirname(__FILE__)."/symlink.link";
-$hardlink = dirname(__FILE__)."/hardlink.link";
-
-function my_hardlink_cb($data, $result) {
-    global $link, $filename;
-    var_dump(file_exists($data) && !is_link($data));
-    @unlink($data);
-
-    eio_symlink($filename, $link, EIO_PRI_DEFAULT, "my_symlink_cb", $link);
-}
-
-function my_symlink_cb($data, $result) {
-    global $link, $filename;
-    var_dump(file_exists($data) && is_link($data));
-
-    if (!eio_readlink($data, EIO_PRI_DEFAULT, "my_readlink_cb", NULL)) {
-        @unlink($link);
-        @unlink($filename);
-    }
-}
-
-function my_readlink_cb($data, $result) {
-    global $filename, $link;
-    var_dump($result);
-
-    @unlink($link);
-    @unlink($filename);
-}
-
-eio_link($filename, $hardlink, EIO_PRI_DEFAULT, "my_hardlink_cb", $hardlink);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-string(%d) "%ssymlink.dat"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_symlink</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/eio/functions/eio-lstat.xml b/reference/eio/functions/eio-lstat.xml
deleted file mode 100644
index 85525cf16a5a..000000000000
--- a/reference/eio/functions/eio-lstat.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-lstat">
- <refnamediv>
-  <refname>eio_lstat</refname>
-  <refpurpose>Get file status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_lstat</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_lstat</function> returns file status information in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     The file path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_lstat</function> returns request resource on success or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_lstat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$tmp_filename = dirname(__FILE__). "/eio-file.tmp";
-touch($tmp_filename);
-
-function my_res_cb($data, $result) {
-    var_dump($data);
-    var_dump($result);
-}
-
-function my_open_cb($data, $result) {
-    eio_close($result);
-    eio_event_loop();
-
-    @unlink($data);
-}
-
-eio_lstat($tmp_filename, EIO_PRI_DEFAULT, "my_res_cb", "eio_lstat");
-eio_open($tmp_filename, EIO_O_RDONLY, NULL,
- EIO_PRI_DEFAULT, "my_open_cb", $tmp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(9) "eio_lstat"
-array(12) {
- ["st_dev"]=>
-  int(2050)
-  ["st_ino"]=>
-  int(2099197)
-  ["st_mode"]=>
-  int(33188)
-  ["st_nlink"]=>
-  int(1)
-  ["st_uid"]=>
-  int(1000)
-  ["st_gid"]=>
-  int(100)
-  ["st_rdev"]=>
-  int(0)
-  ["st_blksize"]=>
-  int(4096)
-  ["st_blocks"]=>
-  int(0)
-  ["st_atime"]=>
-  int(1318235777)
-  ["st_mtime"]=>
-  int(1318235777)
-  ["st_ctime"]=>
-  int(1318235777)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_stat</function></member>
-   <member><function>eio_fstat</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/eio/functions/eio-mkdir.xml b/reference/eio/functions/eio-mkdir.xml
deleted file mode 100644
index 18eaeb33c309..000000000000
--- a/reference/eio/functions/eio-mkdir.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-mkdir">
- <refnamediv>
-  <refname>eio_mkdir</refname>
-  <refpurpose>Create directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_mkdir</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_mkdir</function> creates directory with specified access
-  <parameter>mode</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Path for the new directory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-     Access mode, e.g. 0755
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_mkdir</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_mkdir</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$temp_dirname = "eio-temp-dir";
-
-/* Is called when eio_mkdir() finishes */
-function my_mkdir_callback($data, $result) {
- if ($result == 0 && is_dir($temp_dirname)
-   && !is_readable($temp_dirname)
-   && is_writable($temp_dirname)) {
-  echo "eio_mkdir_ok";
- }
-
- // Remove directory
-    if (file_exists($data))
-        rmdir($temp_dirname);
-}
-
-// Create directory with access mode 0300
-eio_mkdir($temp_dirname, 0300, EIO_PRI_DEFAULT, "my_mkdir_callback", $temp_dirname);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-eio_mkdir_ok
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_rmdir</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/eio/functions/eio-mknod.xml b/reference/eio/functions/eio-mknod.xml
deleted file mode 100644
index e9716ae927f7..000000000000
--- a/reference/eio/functions/eio-mknod.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-mknod">
- <refnamediv>
-  <refname>eio_mknod</refname>
-  <refpurpose>Create a special or ordinary file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_mknod</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>int</type><parameter>dev</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-
-  </methodsynopsis>
-  <simpara>
-  <function>eio_mknod</function> creates ordinary or special(often) file.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Path for the new node(file).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies both the permissions to use and the type of node to be
-      created. It should be a combination (using bitwise OR) of one of the
-      file types listed below and the permissions for the new node(e.g. 0640).
-
-      Possible file types are: <constant>EIO_S_IFREG</constant>(regular file),
-      <constant>EIO_S_IFCHR</constant>(character file),
-      <constant>EIO_S_IFBLK</constant>(block special file),
-      <constant>EIO_S_IFIFO</constant>(FIFO - named pipe) and
-      <constant>EIO_S_IFSOCK</constant>(UNIX domain socket).
-
-      To specify permissions <emphasis>EIO_S_I*</emphasis> constants could be
-      used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dev</parameter></term>
-    <listitem>
-     <simpara>
-     If  the  file type is <constant>EIO_S_IFCHR</constant> or
-     <constant>EIO_S_IFBLK</constant> then dev specifies the major and minor
-     numbers of the newly created device special file. Otherwise
-     <parameter>dev</parameter> ignored. See <emphasis>mknod(2) man page for
-     details</emphasis>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_mknod</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_mknod</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-
-<?php
-// FIFO name
-$temp_filename = "/tmp/eio-temp-fifo";
-
-/* Is called when eio_mknod() finishes */
-function my_mknod_callback($data, $result) {
-    $s = stat($data);
-    var_dump($s);
-
-    if ($result == 0) {
-        echo "eio_mknod_ok";
-    }
-
-    @unlink($data);
-}
-
-eio_mknod($temp_filename, EIO_S_IFIFO, 0,
-    EIO_PRI_DEFAULT, "my_mknod_callback", $temp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(26) {
-  [0]=>
-  int(17)
-  [1]=>
-  int(2337608)
-  [2]=>
-  int(4096)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1000)
-  [5]=>
-  int(100)
-  [6]=>
-  int(0)
-  [7]=>
-  int(0)
-  [8]=>
-  int(1318241261)
-  [9]=>
-  int(1318241261)
-  [10]=>
-  int(1318241261)
-  [11]=>
-  int(4096)
-  [12]=>
-  int(0)
-  ["dev"]=>
-  int(17)
-  ["ino"]=>
-  int(2337608)
-  ["mode"]=>
-  int(4096)
-  ["nlink"]=>
-  int(1)
-  ["uid"]=>
-  int(1000)
-  ["gid"]=>
-  int(100)
-  ["rdev"]=>
-  int(0)
-  ["size"]=>
-  int(0)
-  ["atime"]=>
-  int(1318241261)
-  ["mtime"]=>
-  int(1318241261)
-  ["ctime"]=>
-  int(1318241261)
-  ["blksize"]=>
-  int(4096)
-  ["blocks"]=>
-  int(0)
-}
-eio_mknod_ok
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_open</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/eio/functions/eio-nop.xml b/reference/eio/functions/eio-nop.xml
deleted file mode 100644
index 1dc6499f68b1..000000000000
--- a/reference/eio/functions/eio-nop.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-nop">
- <refnamediv>
-  <refname>eio_nop</refname>
-  <refpurpose>Does nothing, except go through the whole request cycle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_nop</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_nop</function> does nothing, except go through the whole
-   request cycle. Could be useful in debugging.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_nop</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_busy</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/eio/functions/eio-npending.xml b/reference/eio/functions/eio-npending.xml
deleted file mode 100644
index 8494dbced4ad..000000000000
--- a/reference/eio/functions/eio-npending.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-npending">
- <refnamediv>
-  <refname>eio_npending</refname>
-  <refpurpose>Returns number of finished, but unhandled requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eio_npending</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_npending</function> returns number of finished, but unhandled requests
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_npending</function> returns number of finished, but unhandled
-   requests.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nreqs</function></member>
-   <member><function>eio_nready</function></member>
-   <member><function>eio_nthreads</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/eio/functions/eio-nready.xml b/reference/eio/functions/eio-nready.xml
deleted file mode 100644
index 7758d28304c9..000000000000
--- a/reference/eio/functions/eio-nready.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-nready">
- <refnamediv>
-  <refname>eio_nready</refname>
-  <refpurpose>Returns number of not-yet handled requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eio_nready</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_nready</function> returns number of not-yet handled requests
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nreqs</function></member>
-   <member><function>eio_nthreads</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/eio/functions/eio-nreqs.xml b/reference/eio/functions/eio-nreqs.xml
deleted file mode 100644
index a3749848c328..000000000000
--- a/reference/eio/functions/eio-nreqs.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-nreqs">
- <refnamediv>
-  <refname>eio_nreqs</refname>
-  <refpurpose>Returns number of requests to be processed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eio_nreqs</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_nreqs</function> could be called in a custom loop calling
-   <function>eio_poll</function>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_nreqs</function> returns number of requests to be processed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_nreqs</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function res_cb($data, $result) {
-    var_dump($data);
-    var_dump($result);
-}
-
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "1");
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "2");
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "3");
-
-while (eio_nreqs()) {
-    eio_poll();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "1"
-int(0)
-string(1) "3"
-int(0)
-string(1) "2"
-int(0)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_poll</function></member>
-   <member><function>eio_nready</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/eio/functions/eio-nthreads.xml b/reference/eio/functions/eio-nthreads.xml
deleted file mode 100644
index 8d9af66b394b..000000000000
--- a/reference/eio/functions/eio-nthreads.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-nthreads">
- <refnamediv>
-  <refname>eio_nthreads</refname>
-  <refpurpose>Returns number of threads currently in use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eio_nthreads</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_nthreads</function> returns number of threads currently in
-   use.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_npending</function></member>
-   <member><function>eio_nready</function></member>
-   <member><function>eio_nreqs</function></member>
-   <member><function>eio_set_max_idle</function></member>
-   <member><function>eio_set_max_parallel</function></member>
-   <member><function>eio_set_min_parallel</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/eio/functions/eio-open.xml b/reference/eio/functions/eio-open.xml
deleted file mode 100644
index 9c13904ee7f3..000000000000
--- a/reference/eio/functions/eio-open.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-open">
- <refnamediv>
-  <refname>eio_open</refname>
-  <refpurpose>Opens a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_open</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_open</function> opens file specified by
-  <parameter>path</parameter> in access mode <parameter>mode</parameter> with the
-  given <parameter>flags</parameter>.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-     Path of the file to be opened.
-     <warning><simpara>
-     In some SAPIs(e.g. <emphasis>PHP-FPM</emphasis>) it could fail, if you
-     don't specify full path.
-     </simpara></warning>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-    <simpara>One of <emphasis>EIO_O_*</emphasis> constants, or their
-    combinations. <emphasis>EIO_O_*</emphasis> constants have the same
-    meaning, as their corresponding <emphasis>O_*</emphasis> counterparts
-    defined in <literal>fnctl.h</literal> C header file. Default is
-    <constant>EIO_O_RDWR</constant>.
-    </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-    <simpara>One of <emphasis>EIO_S_I*</emphasis> constants, or their combination
-    (via bitwise OR operator). The constants have the same meaning as their
-    <emphasis>S_I*</emphasis> counterparts defined in <link xlink:href="&url.sys.stat.header;">sys/stat.h</link>
-    C header file. Required, if a file is created. Otherwise ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_open</function> returns file descriptor in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>
-   on success; otherwise, <parameter>result</parameter> is equal to <constant>-1</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_open</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$temp_filename = "eio-temp-file.tmp";
-
-/* Is called when eio_close() finishes */
-function my_close_cb($data, $result) {
- // Zero indicates success
-    var_dump($result == 0);
- @unlink($data);
-}
-
-/* Is called when eio_open() finishes */
-function my_file_opened_callback($data, $result) {
- // $result should contain the file descriptor
-    var_dump($result > 0);
-
-    if ($result > 0) {
-  // Close the file
-        eio_close($result, EIO_PRI_DEFAULT, "my_close_cb", $data);
-        eio_event_loop();
-    }
-}
-
-// Create new file for reading and writing
-// Deny group and others to do anything with that file
-eio_open($temp_filename, EIO_O_CREAT | EIO_O_RDWR, EIO_S_IRUSR | EIO_S_IWUSR,
-  EIO_PRI_DEFAULT, "my_file_opened_callback", $temp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_mknod</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/eio/functions/eio-poll.xml b/reference/eio/functions/eio-poll.xml
deleted file mode 100644
index abfd44abe4a9..000000000000
--- a/reference/eio/functions/eio-poll.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-poll">
- <refnamediv>
-  <refname>eio_poll</refname>
-  <refpurpose>Can be called whenever there are pending requests that need finishing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>eio_poll</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_poll</function> can be used to implement special event loop.
-  For this <function>eio_nreqs</function> could be used to test if there are
-  unprocessed requests.
-  </simpara>
-
-  <note><simpara>Applicable only when implementing userspace event loop.</simpara></note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  If any request invocation returns a non-zero value, returns that value.
-  Otherwise, it returns <literal>0</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_poll</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function res_cb($data, $result) {
-    var_dump($data);
-    var_dump($result);
-}
-
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "1");
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "2");
-eio_nop(EIO_PRI_DEFAULT, "res_cb", "3");
-
-while (eio_nreqs()) {
-    // Some specific IPC or so
-    eio_poll();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "1"
-int(0)
-string(1) "3"
-int(0)
-string(1) "2"
-int(0)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nreqs</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/eio/functions/eio-read.xml b/reference/eio/functions/eio-read.xml
deleted file mode 100644
index b183e18ddae8..000000000000
--- a/reference/eio/functions/eio-read.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-read">
- <refnamediv>
-  <refname>eio_read</refname>
-  <refpurpose>Read from a file descriptor at given offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_read</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_read</function> reads up to <parameter>length</parameter>
-   bytes from <parameter>fd</parameter> file descriptor at
-   <parameter>offset</parameter>. The read bytes are stored in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-     Maximum number of bytes to read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Offset within the file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  <function>eio_read</function> stores read bytes in
-  <parameter>result</parameter> argument of <parameter>callback</parameter>
-  function.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_read</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Open a temporary file and write some bytes there
-$temp_filename = "eio-temp-file.tmp";
-$fp = fopen($temp_filename, "w");
-fwrite($fp, "1234567890");
-fclose($fp);
-
-/* Is called when eio_read() is done */
-function my_read_cb($data, $result) {
-    global $temp_filename;
-
- // Output read bytes
-    var_dump($result);
-
- // Close file
-    eio_close($data);
-    eio_event_loop();
-
- // Remove temporary file
-    @unlink($temp_filename);
-}
-
-/* Is called when eio_open() is done */
-function my_file_opened_callback($data, $result) {
- // $result should contain the file descriptor
-    if ($result > 0) {
-  // Read 5 bytes starting from third
-        eio_read($result, 5, 2, EIO_PRI_DEFAULT, "my_read_cb", $result);
-        eio_event_loop();
-    } else {
-  // eio_open() failed
-        unlink($data);
-    }
-}
-
-// Open the file for reading and writing
-eio_open($temp_filename, EIO_O_RDWR, NULL,
-    EIO_PRI_DEFAULT, "my_file_opened_callback", $temp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "34567"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_open</function></member>
-   <member><function>eio_write</function></member>
-   <member><function>eio_close</function></member>
-   <member><function>eio_event_loop</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/eio/functions/eio-readahead.xml b/reference/eio/functions/eio-readahead.xml
deleted file mode 100644
index 7bc10d0e896c..000000000000
--- a/reference/eio/functions/eio-readahead.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-readahead">
- <refnamediv>
-  <refname>eio_readahead</refname>
-  <refpurpose>Perform file readahead into page cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_readahead</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_readahead</function> populates the page cache with data from a file so that subsequent reads from
-  that file will not block on disk I/O. See <literal>READAHEAD(2)</literal> man page for details.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Starting point from which data is to be read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-     Number of bytes to be read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_readahead</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-readdir.xml b/reference/eio/functions/eio-readdir.xml
deleted file mode 100644
index bfd34a63f781..000000000000
--- a/reference/eio/functions/eio-readdir.xml
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.eio-readdir" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>eio_readdir</refname>
-  <refpurpose>Reads through a whole directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_readdir</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads through a whole directory(via the <literal>opendir</literal>, <literal>readdir</literal> and
-   <literal>closedir</literal> system calls) and returns either the names or an array in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>
-   function, depending on the <parameter>flags</parameter> argument.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Directory path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Combination of <emphasis>EIO_READDIR_*</emphasis> constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-      &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <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>:
-  </simpara>
-
-  <variablelist>
-
-   <varlistentry>
-    <term>
-     <constant>EIO_READDIR_DENTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      <function>eio_readdir</function> flag. If specified, the result argument of the callback
-      becomes an array with the following keys:
-      <literal>'names'</literal> - array of directory names
-      <literal>'dents'</literal> - array of <literal>struct
-      eio_dirent</literal>-like arrays having the following keys each:
-      <literal>'name'</literal> - the directory name;
-      <literal>'type'</literal> - one of <emphasis>EIO_DT_*</emphasis>
-      constants;
-      <literal>'inode'</literal> - the inode number, if available, otherwise
-      unspecified;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <constant>EIO_READDIR_DIRS_FIRST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     When this flag is specified, the names will be returned in an order
-     where likely directories come first, in optimal stat order.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <constant>EIO_READDIR_STAT_ORDER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     When this flag is specified, then the names will be returned in an order
-     suitable for <literal>stat</literal>'ing each one. When planning to
-     <function>stat</function> all files in the given directory, the
-     returned order will likely be
-     fastest.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <constant>EIO_READDIR_FOUND_UNKNOWN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
-
-  <para>Node types:
-   <variablelist>
-
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_UNKNOWN</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Unknown node type(very common). Further <function>stat</function> needed.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_FIFO</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      FIFO node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_CHR</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_MPC</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Multiplexed char device (v7+coherent) node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_DIR</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Directory node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_NAM</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Xenix special named file node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_BLK</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_MPB</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Multiplexed block device (v7+coherent)
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_REG</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_NWK</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_CMP</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      HP-UX network special node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_LNK</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Link node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_SOCK</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Socket node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_DOOR</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Solaris door node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_WHT</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Node type
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term>
-      <constant>EIO_DT_MAX</constant>
-      (<type>int</type>)
-     </term>
-     <listitem>
-      <simpara>
-      Highest node type value
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_readdir</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Is called when eio_readdir() finishes */
-function my_readdir_callback($data, $result) {
-    echo __FUNCTION__, " called\n";
-    echo "data: "; var_dump($data);
-    echo "result: "; var_dump($result);
-    echo "\n";
-}
-
-eio_readdir("/var/spool/news", EIO_READDIR_STAT_ORDER | EIO_READDIR_DIRS_FIRST,
-  EIO_PRI_DEFAULT, "my_readdir_callback");
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-my_readdir_callback called
-data: NULL
-result: array(2) {
- ["names"]=>
-  array(7) {
-   [0]=>
-    string(7) "archive"
-    [1]=>
-    string(8) "articles"
-    [2]=>
-    string(8) "incoming"
-    [3]=>
-    string(7) "innfeed"
-    [4]=>
-    string(8) "outgoing"
-    [5]=>
-    string(8) "overview"
-    [6]=>
-    string(3) "tmp"
-  }
- ["dents"]=>
-  array(7) {
-   [0]=>
-    array(3)
-    {
-     ["name"]=>
-      string(7)
-      "archive"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393265)
-    }
-   [1]=>
-    array(3)
-    {
-     ["name"]=>
-      string(8)
-      "articles"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393266)
-    }
-   [2]=>
-    array(3)
-    {
-     ["name"]=>
-      string(8)
-      "incoming"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393267)
-    }
-   [3]=>
-    array(3)
-    {
-     ["name"]=>
-      string(7)
-      "innfeed"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393269)
-    }
-   [4]=>
-    array(3)
-    {
-     ["name"]=>
-      string(8)
-      "outgoing"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393270)
-    }
-   [5]=>
-    array(3)
-    {
-     ["name"]=>
-      string(8)
-      "overview"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393271)
-    }
-   [6]=>
-    array(3)
-    {
-     ["name"]=>
-      string(3)
-      "tmp"
-      ["type"]=>
-      int(4)
-      ["inode"]=>
-      int(393272)
-    }
-  }
-}
-]]>
-   </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/eio/functions/eio-readlink.xml b/reference/eio/functions/eio-readlink.xml
deleted file mode 100644
index b4b750ed8f8d..000000000000
--- a/reference/eio/functions/eio-readlink.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-readlink">
- <refnamediv>
-  <refname>eio_readlink</refname>
-  <refpurpose>Read value of a symbolic link</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_readlink</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Source symbolic link path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_readlink</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_readlink</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$filename = dirname(__FILE__)."/symlink.dat";
-touch($filename);
-$link = dirname(__FILE__)."/symlink.link";
-$hardlink = dirname(__FILE__)."/hardlink.link";
-
-function my_hardlink_cb($data, $result) {
-    global $link, $filename;
-    var_dump(file_exists($data) && !is_link($data));
-    @unlink($data);
-
-    eio_symlink($filename, $link, EIO_PRI_DEFAULT, "my_symlink_cb", $link);
-}
-
-function my_symlink_cb($data, $result) {
-    global $link, $filename;
-    var_dump(file_exists($data) && is_link($data));
-
-    if (!eio_readlink($data, EIO_PRI_DEFAULT, "my_readlink_cb", NULL)) {
-        @unlink($link);
-        @unlink($filename);
-    }
-}
-
-function my_readlink_cb($data, $result) {
-    global $filename, $link;
-    var_dump($result);
-
-    @unlink($link);
-    @unlink($filename);
-}
-
-eio_link($filename, $hardlink, EIO_PRI_DEFAULT, "my_hardlink_cb", $hardlink);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-string(16) "/tmp/symlink.dat"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_symlink</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/eio/functions/eio-realpath.xml b/reference/eio/functions/eio-realpath.xml
deleted file mode 100644
index f886fdad672c..000000000000
--- a/reference/eio/functions/eio-realpath.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-realpath">
- <refnamediv>
-  <refname>eio_realpath</refname>
-  <refpurpose>Get the canonicalized absolute pathname</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_realpath</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_realpath</function> returns the canonicalized absolute
-  pathname in <parameter>result</parameter> argument of
-  <parameter>callback</parameter> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Short pathname
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_realpath</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(getcwd());
-
-function my_realpath_callback($data, $result) {
-    var_dump($result);
-}
-
-eio_realpath("../", EIO_PRI_DEFAULT, "my_realpath_callback");
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(12) "/home/ruslan"
-string(5) "/home"
-]]>
-   </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/eio/functions/eio-rename.xml b/reference/eio/functions/eio-rename.xml
deleted file mode 100644
index ac997884b790..000000000000
--- a/reference/eio/functions/eio-rename.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-rename">
- <refnamediv>
-  <refname>eio_rename</refname>
-  <refpurpose>Change the name or location of a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_rename</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_rename</function> renames or moves a file to new location.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Source path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_path</parameter></term>
-    <listitem>
-     <simpara>
-     Target path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_rename</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_rename</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$filename = dirname(__FILE__)."/eio-temp-file.dat";
-touch($filename);
-$new_filename = dirname(__FILE__)."/eio-temp-file-new.dat";
-
-function my_rename_cb($data, $result) {
-    global $filename, $new_filename;
-
-    if ($result == 0 && !file_exists($filename) && file_exists($new_filename)) {
-        @unlink($new_filename);
-        echo "eio_rename_ok";
-    } else {
-        @unlink($filename);
-    }
-}
-
-eio_rename($filename, $new_filename, EIO_PRI_DEFAULT, "my_rename_cb", $filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-eio_rename_ok
-]]>
-   </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/eio/functions/eio-rmdir.xml b/reference/eio/functions/eio-rmdir.xml
deleted file mode 100644
index 83c5e613efa7..000000000000
--- a/reference/eio/functions/eio-rmdir.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-rmdir">
- <refnamediv>
-  <refname>eio_rmdir</refname>
-  <refpurpose>Remove a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_rmdir</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_rmdir</function> removes a directory.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Directory path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_rmdir</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_rmdir</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$temp_dirname = "eio-temp-dir";
-mkdir($temp_dirname);
-
-function my_rmdir_callback($data, $result) {
-    if ($result == 0 && !file_exists($data)) {
-        echo "eio_rmdir_ok";
-    } else if (file_exists($data)) {
-        rmdir($data);
-    }
-}
-
-
-eio_rmdir($temp_dirname, EIO_PRI_DEFAULT, "my_rmdir_callback", $temp_dirname);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-eio_rmdir_ok
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_mkdir</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/eio/functions/eio-seek.xml b/reference/eio/functions/eio-seek.xml
deleted file mode 100644
index c1c670a57e81..000000000000
--- a/reference/eio/functions/eio-seek.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-seek">
- <refnamediv>
-  <refname>eio_seek</refname>
-  <refpurpose>Seek to a position</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_seek</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>whence</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_seek</function> repositions the offset of the open file associated with
-   stream, <classname>Socket</classname> instance, or file descriptor specified by <parameter>fd</parameter> to
-   the argument <parameter>offset</parameter> according to
-   the directive <parameter>whence</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, <classname>Socket</classname> instance, or numeric file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Starting point from which data is to be read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>whence</parameter></term>
-    <listitem>
-     <para>
-       <parameter>whence</parameter> values are:
-       <simplelist>
-        <member><constant>EIO_SEEK_SET</constant> - Set position equal to <parameter>offset</parameter> bytes.</member>
-        <member><constant>EIO_SEEK_CUR</constant> - Set position to current location plus <parameter>offset</parameter>.</member>
-        <member><constant>EIO_SEEK_END</constant> - Set position to end-of-file plus <parameter>offset</parameter>.</member>
-       </simplelist>
-      </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_seek</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-sendfile.xml b/reference/eio/functions/eio-sendfile.xml
deleted file mode 100644
index 2679b1d7e9a6..000000000000
--- a/reference/eio/functions/eio-sendfile.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-sendfile">
- <refnamediv>
-  <refname>eio_sendfile</refname>
-  <refpurpose>Transfer data between file descriptors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_sendfile</methodname>
-   <methodparam><type>mixed</type><parameter>out_fd</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>in_fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_sendfile</function> copies  data between one file descriptor
-   and another. See <literal>SENDFILE(2)</literal> man page for details.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>out_fd</parameter></term>
-    <listitem>
-     <simpara>
-     Output stream, Socket resource, or file descriptor. Should be opened for writing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>in_fd</parameter></term>
-    <listitem>
-     <simpara>
-     Input stream, Socket resource, or file descriptor. Should be opened for reading.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Offset within the source file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-     Number of bytes to copy.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_sendfile</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-set-max-idle.xml b/reference/eio/functions/eio-set-max-idle.xml
deleted file mode 100644
index 8c99ed90419a..000000000000
--- a/reference/eio/functions/eio-set-max-idle.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-set-max-idle">
- <refnamediv>
-  <refname>eio_set_max_idle</refname>
-  <refpurpose>Set maximum number of idle threads</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_set_max_idle</methodname>
-   <methodparam><type>int</type><parameter>nthreads</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nthreads</parameter></term>
-    <listitem>
-     <simpara>
-     Number of idle threads.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nthreads</function></member>
-   <member><function>eio_set_min_parallel</function></member>
-   <member><function>eio_set_max_parallel</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/eio/functions/eio-set-max-parallel.xml b/reference/eio/functions/eio-set-max-parallel.xml
deleted file mode 100644
index 45aae2e122fd..000000000000
--- a/reference/eio/functions/eio-set-max-parallel.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-set-max-parallel">
- <refnamediv>
-  <refname>eio_set_max_parallel</refname>
-  <refpurpose>Set maximum parallel threads</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_set_max_parallel</methodname>
-   <methodparam><type>int</type><parameter>nthreads</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nthreads</parameter></term>
-    <listitem>
-     <simpara>
-     Number of parallel threads
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nthreads</function></member>
-   <member><function>eio_set_max_idle</function></member>
-   <member><function>eio_set_min_parallel</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/eio/functions/eio-set-max-poll-reqs.xml b/reference/eio/functions/eio-set-max-poll-reqs.xml
deleted file mode 100644
index d6fa6bb3caf1..000000000000
--- a/reference/eio/functions/eio-set-max-poll-reqs.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-set-max-poll-reqs">
- <refnamediv>
-  <refname>eio_set_max_poll_reqs</refname>
-  <refpurpose>Set maximum number of requests processed in a poll</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_set_max_poll_reqs</methodname>
-   <methodparam><type>int</type><parameter>nreqs</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nreqs</parameter></term>
-    <listitem>
-     <simpara>
-     Number of requests
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-set-max-poll-time.xml b/reference/eio/functions/eio-set-max-poll-time.xml
deleted file mode 100644
index f68dcfb80ebf..000000000000
--- a/reference/eio/functions/eio-set-max-poll-time.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-set-max-poll-time">
- <refnamediv>
-  <refname>eio_set_max_poll_time</refname>
-  <refpurpose>Set maximum poll time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_set_max_poll_time</methodname>
-   <methodparam><type>float</type><parameter>nseconds</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Polling stops, if poll took longer than <parameter>nseconds</parameter>
-  seconds.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nseconds</parameter></term>
-    <listitem>
-     <simpara>
-     Number of seconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-set-min-parallel.xml b/reference/eio/functions/eio-set-min-parallel.xml
deleted file mode 100644
index 72a51ef951bf..000000000000
--- a/reference/eio/functions/eio-set-min-parallel.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-set-min-parallel">
- <refnamediv>
-  <refname>eio_set_min_parallel</refname>
-  <refpurpose>Set minimum parallel thread number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>eio_set_min_parallel</methodname>
-   <methodparam><type>string</type><parameter>nthreads</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nthreads</parameter></term>
-    <listitem>
-     <simpara>
-     Number of parallel threads.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_nthreads</function></member>
-   <member><function>eio_set_max_idle</function></member>
-   <member><function>eio_set_max_parallel</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/eio/functions/eio-stat.xml b/reference/eio/functions/eio-stat.xml
deleted file mode 100644
index abedfc5ef004..000000000000
--- a/reference/eio/functions/eio-stat.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-stat">
- <refnamediv>
-  <refname>eio_stat</refname>
-  <refpurpose>Get file status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_stat</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_stat</function> returns file status information in
-   <parameter>result</parameter> argument of <parameter>callback</parameter>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     The file path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_stat</function> returns request resource on success or
-   &false; on error. On success assigns <parameter>result</parameter> argument of
-   <parameter>callback</parameter> to an array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_stat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$tmp_filename = "eio-file.tmp";
-touch($tmp_filename);
-
-function my_res_cb($data, $result) {
-    var_dump($data);
-    var_dump($result);
-}
-
-function my_open_cb($data, $result) {
-    eio_close($result);
-    eio_event_loop();
-
-    @unlink($data);
-}
-
-eio_stat($tmp_filename, EIO_PRI_DEFAULT, "my_res_cb", "eio_stat");
-eio_open($tmp_filename, EIO_O_RDONLY, NULL,
- EIO_PRI_DEFAULT, "my_open_cb", $tmp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(8) "eio_stat"
-array(12) {
-  ["st_dev"]=>
-  int(2050)
-  ["st_ino"]=>
-  int(2489173)
-  ["st_mode"]=>
-  int(33188)
-  ["st_nlink"]=>
-  int(1)
-  ["st_uid"]=>
-  int(1000)
-  ["st_gid"]=>
-  int(100)
-  ["st_rdev"]=>
-  int(0)
-  ["st_blksize"]=>
-  int(4096)
-  ["st_blocks"]=>
-  int(0)
-  ["st_atime"]=>
-  int(1318250380)
-  ["st_mtime"]=>
-  int(1318250380)
-  ["st_ctime"]=>
-  int(1318250380)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_lstat</function></member>
-   <member><function>eio_fstat</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/eio/functions/eio-statvfs.xml b/reference/eio/functions/eio-statvfs.xml
deleted file mode 100644
index dfd0b43f8984..000000000000
--- a/reference/eio/functions/eio-statvfs.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-statvfs">
- <refnamediv>
-  <refname>eio_statvfs</refname>
-  <refpurpose>Get file system statistics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_statvfs</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pri</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_statvfs</function> returns file system statistics information in
-  <parameter>result</parameter> argument of <parameter>callback</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Pathname of any file within the mounted file system
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-     &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  <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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_statvfs</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$tmp_filename = '/tmp/eio-file.tmp';
-touch($tmp_filename);
-
-function my_statvfs_callback($data, $result) {
-    var_dump($data);
-    var_dump($result);
-
- @unlink($data);
-}
-
-eio_statvfs($tmp_filename, EIO_PRI_DEFAULT, "my_statvfs_callback", $tmp_filename);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(17) "/tmp/eio-file.tmp"
-array(11) {
-  ["f_bsize"]=>
-  int(4096)
-  ["f_frsize"]=>
-  int(4096)
-  ["f_blocks"]=>
-  int(262144)
-  ["f_bfree"]=>
-  int(262111)
-  ["f_bavail"]=>
-  int(262111)
-  ["f_files"]=>
-  int(1540815)
-  ["f_ffree"]=>
-  int(1540743)
-  ["f_favail"]=>
-  int(1540743)
-  ["f_fsid"]=>
-  int(0)
-  ["f_flag"]=>
-  int(4102)
-  ["f_namemax"]=>
-  int(255)
-}
-]]>
-   </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/eio/functions/eio-symlink.xml b/reference/eio/functions/eio-symlink.xml
deleted file mode 100644
index ba147b08ed76..000000000000
--- a/reference/eio/functions/eio-symlink.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-symlink">
- <refnamediv>
-  <refname>eio_symlink</refname>
-  <refpurpose>Create a symbolic link</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_symlink</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-
-  </methodsynopsis>
-  <simpara>
-  <function>eio_symlink</function> creates a symbolic link
-  <parameter>new_path</parameter> to <parameter>path</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Source path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_path</parameter></term>
-    <listitem>
-     <simpara>
-     Target path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_symlink</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>eio_symlink</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$filename = dirname(__FILE__)."/symlink.dat";
-touch($filename);
-$link = dirname(__FILE__)."/symlink.link";
-
-function my_symlink_cb($data, $result) {
-    global $link, $filename;
-    var_dump(file_exists($data) && is_link($data));
-
-    if (!eio_readlink($data, EIO_PRI_DEFAULT, "my_readlink_cb", NULL)) {
-        @unlink($link);
-        @unlink($filename);
-    }
-}
-
-function my_readlink_cb($data, $result) {
-    global $filename, $link;
-    var_dump($result);
-
-    @unlink($link);
-    @unlink($filename);
-}
-
-eio_symlink($filename, $link, EIO_PRI_DEFAULT, "my_symlink_cb", $link);
-eio_event_loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(16) "/tmp/symlink.dat"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_link</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/eio/functions/eio-sync-file-range.xml b/reference/eio/functions/eio-sync-file-range.xml
deleted file mode 100644
index a987a15793a1..000000000000
--- a/reference/eio/functions/eio-sync-file-range.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-sync-file-range">
- <refnamediv>
-  <refname>eio_sync_file_range</refname>
-  <refpurpose>Sync a file segment with disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_sync_file_range</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>nbytes</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>eio_sync_file_range</function> permits fine control when synchronizing the open file referred to by the file
- descriptor <parameter>fd</parameter> with disk.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     File descriptor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     The starting byte of the file range to be synchronized
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nbytes</parameter></term>
-    <listitem>
-     <simpara>
-     Specifies the length of the range to be synchronized, in bytes. If
-     <parameter>nbytes</parameter> is zero, then all bytes from <parameter>offset</parameter> through
-     to the end of file are synchronized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-     A bit-mask. Can include any of the following values:
-     <constant>EIO_SYNC_FILE_RANGE_WAIT_BEFORE</constant>,
-     <constant>EIO_SYNC_FILE_RANGE_WRITE</constant>,
-     <constant>EIO_SYNC_FILE_RANGE_WAIT_AFTER</constant>. These flags have
-     the same meaning as their <emphasis>SYNC_FILE_RANGE_*</emphasis>
-     counterparts(see <literal>SYNC_FILE_RANGE(2)</literal> man page).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_sync_file_range</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-sync.xml b/reference/eio/functions/eio-sync.xml
deleted file mode 100644
index 873ebf616656..000000000000
--- a/reference/eio/functions/eio-sync.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-sync">
- <refnamediv>
-  <refname>eio_sync</refname>
-  <refpurpose>Commit buffer cache to disk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_sync</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_sync</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-syncfs.xml b/reference/eio/functions/eio-syncfs.xml
deleted file mode 100644
index 82c76fe0baa3..000000000000
--- a/reference/eio/functions/eio-syncfs.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-syncfs">
- <refnamediv>
-  <refname>eio_syncfs</refname>
-  <refpurpose>Calls Linux' syncfs syscall, if available</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_syncfs</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     File descriptor
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_syncfs</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-truncate.xml b/reference/eio/functions/eio-truncate.xml
deleted file mode 100644
index b7819a4fa9dc..000000000000
--- a/reference/eio/functions/eio-truncate.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-truncate">
- <refnamediv>
-  <refname>eio_truncate</refname>
-  <refpurpose>Truncate a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_truncate</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_truncate</function> causes the regular file named by <parameter>path</parameter> to be truncated to
-  a size of precisely <parameter>length</parameter> bytes
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     File path
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Offset from beginning of the file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_truncate</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_ftruncate</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/eio/functions/eio-unlink.xml b/reference/eio/functions/eio-unlink.xml
deleted file mode 100644
index 78b300a3c90a..000000000000
--- a/reference/eio/functions/eio-unlink.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-unlink">
- <refnamediv>
-  <refname>eio_unlink</refname>
-  <refpurpose>Delete a name and possibly the file it refers to</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_unlink</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_unlink</function> deletes  a  name from the file system.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Path to file
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_unlink</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/functions/eio-utime.xml b/reference/eio/functions/eio-utime.xml
deleted file mode 100644
index 9c4cb17e8478..000000000000
--- a/reference/eio/functions/eio-utime.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-utime">
- <refnamediv>
-  <refname>eio_utime</refname>
-  <refpurpose>Change file last access and modification times</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_utime</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>float</type><parameter>atime</parameter></methodparam>
-   <methodparam><type>float</type><parameter>mtime</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     Path to the file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>atime</parameter></term>
-    <listitem>
-     <simpara>
-     Access time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mtime</parameter></term>
-    <listitem>
-     <simpara>
-     Modification time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_utime</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_futime</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/eio/functions/eio-write.xml b/reference/eio/functions/eio-write.xml
deleted file mode 100644
index 8c5b5050652b..000000000000
--- a/reference/eio/functions/eio-write.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.eio-write">
- <refnamediv>
-  <refname>eio_write</refname>
-  <refpurpose>Write to file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>eio_write</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pri</parameter><initializer>EIO_PRI_DEFAULT</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>data</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-  <function>eio_write</function> writes up to <parameter>length</parameter>
-  bytes from <parameter>str</parameter> at <parameter>offset</parameter>
-  offset from the beginning of the file.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-     Stream, Socket resource, or numeric file descriptor, e.g. returned by <function>eio_open</function>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>str</parameter></term>
-    <listitem>
-     <simpara>
-     Source string
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-     Maximum number of bytes to write.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-     Offset from the beginning of file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pri</parameter></term>
-    <listitem>
-    &eio.request.pri.values;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     &eio.callback.proto;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     Arbitrary variable passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>eio_write</function> returns request resource on success,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>eio_open</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/eio/reference.xml b/reference/eio/reference.xml
deleted file mode 100644
index 5d0865305fe9..000000000000
--- a/reference/eio/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.eio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Eio &Functions;</title>
-
- &reference.eio.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/eio/setup.xml b/reference/eio/setup.xml
deleted file mode 100644
index 3668e9dfbf48..000000000000
--- a/reference/eio/setup.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="eio.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="eio.requirements">
-  &reftitle.required;
-  <simpara>
-  This extension has <link xlink:href="&url.eio.libeio;">libeio</link>
-  library embedded. So you do NOT need to install libeio separately.
-  </simpara>
- </section>
-
- <!--{{{ Installation -->
- &reference.eio.configure;
-
-   <section xml:id="eio.resources">
-    &reftitle.resources;
-    <simpara>
-    There are two resource types in this extension: request and request group.
-    </simpara>
-   </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 fdm=marker
-vi: ts=1 sw=1
--->
diff --git a/reference/eio/versions.xml b/reference/eio/versions.xml
deleted file mode 100644
index f132ce1ae95f..000000000000
--- a/reference/eio/versions.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='eio_busy' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_cancel' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_chmod' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_chown' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_close' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_custom' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_dup2' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_event_loop' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fallocate' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fchmod' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fchown' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fdatasync' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fstat' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fstatvfs' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_fsync' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_ftruncate' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_futime' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_get_event_stream' from='PECL eio &gt;= 0.3.1b'/>
- <function name='eio_get_last_error' from='PECL eio &gt;= 1.0.0'/>
- <function name='eio_grp' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_grp_add' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_grp_cancel' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_grp_limit' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_init' from='PECL eio = 1.0.0'/>
- <function name='eio_link' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_lstat' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_mkdir' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_mknod' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_nop' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_npending' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_nready' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_nreqs' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_nthreads' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_open' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_poll' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_read' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_readahead' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_readdir' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_readlink' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_realpath' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_rename' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_rmdir' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_seek' from='PECL eio &gt;= 0.5.0b'/>
- <function name='eio_sendfile' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_set_max_idle' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_set_max_parallel' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_set_max_poll_reqs' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_set_max_poll_time' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_set_min_parallel' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_stat' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_statvfs' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_symlink' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_sync' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_sync_file_range' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_syncfs' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_truncate' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_unlink' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_utime' from='PECL eio &gt;= 0.0.1dev'/>
- <function name='eio_write' from='PECL eio &gt;= 0.0.1dev'/>
-</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/ev/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ev/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ev/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ev/book.xml b/reference/ev/book.xml
deleted file mode 100644
index 6ffe59ebbb85..000000000000
--- a/reference/ev/book.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ev">
- <?phpdoc extension-membership="pecl" ?>
- <title>Ev</title>
- <titleabbrev>Ev</titleabbrev>
- <preface xml:id="intro.ev">
-  &reftitle.intro;
-  <simpara>
-   This extension provides interface to
-   <link xlink:href="&url.libev;">libev</link>
-   library - a high performance full-featured event loop written in C.
-  </simpara>
-
-  &note.no-windows.extension;
-
- <simpara>
-   <emphasis>Libev</emphasis>
-   is an event loop: one registers interest in certain events (such as a file
-   descriptor being readable or a timeout occurring), and it will manage these
-   event sources and provide the program with events.
-  </simpara>
-  <simpara>
-   To do this, it must take more or less complete control over the process (or
-   thread) by executing the event loop handler, and will then communicate
-   events via a callback mechanism.
-  </simpara>
-  <simpara>
-   You register interest in certain events by registering so-called event
-   watchers, and then hand it over to libev by starting the watcher.
-  </simpara>
-  <simpara>
-   For details refer to the
-   <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod">documentation of libev</link>.
-  </simpara>
- </preface>
-
- &reference.ev.setup;
- &reference.ev.examples;
- &reference.ev.watchers;
- &reference.ev.watcher-callbacks;
- &reference.ev.periodic-modes;
- &reference.ev.ev;
- &reference.ev.evcheck;
- &reference.ev.evchild;
- &reference.ev.evembed;
- &reference.ev.evfork;
- &reference.ev.evidle;
- &reference.ev.evio;
- &reference.ev.evloop;
- &reference.ev.evperiodic;
- &reference.ev.evprepare;
- &reference.ev.evsignal;
- &reference.ev.evstat;
- &reference.ev.evtimer;
- &reference.ev.evwatcher;
-
-</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/ev/configure.xml b/reference/ev/configure.xml
deleted file mode 100644
index 7bf61d39e70d..000000000000
--- a/reference/ev/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;ev">&url.pecl.package;ev</link>
- </simpara>
- <simpara>
-  For information about manual installation, please read the file
-  <filename>INSTALL.md</filename>
-  included in the package source.
- </simpara>
-</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/ev/ev.xml b/reference/ev/ev.xml
deleted file mode 100644
index aed606241278..000000000000
--- a/reference/ev/ev.xml
+++ /dev/null
@@ -1,821 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.ev" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" role="class">
- <title>The Ev class</title>
- <titleabbrev>Ev</titleabbrev>
- <partintro>
-  <section xml:id="ev.intro">
-   &reftitle.intro;
-   <simpara>
-    Ev is a static class providing access to the default loop and to some common
-    operations.
-   </simpara>
-  </section>
-
-  <section xml:id="ev.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass>
-     <classname>Ev</classname>
-    </ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Ev</classname>
-     </ooclass>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-auto">Ev::FLAG_AUTO</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-noenv">Ev::FLAG_NOENV</varname>
-     <initializer>16777216</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-forkcheck">Ev::FLAG_FORKCHECK</varname>
-     <initializer>33554432</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-noinotify">Ev::FLAG_NOINOTIFY</varname>
-     <initializer>1048576</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-signalfd">Ev::FLAG_SIGNALFD</varname>
-     <initializer>2097152</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.flag-nosigmask">Ev::FLAG_NOSIGMASK</varname>
-     <initializer>4194304</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.run-nowait">Ev::RUN_NOWAIT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.run-once">Ev::RUN_ONCE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.break-cancel">Ev::BREAK_CANCEL</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.break-one">Ev::BREAK_ONE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.break-all">Ev::BREAK_ALL</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.minpri">Ev::MINPRI</varname>
-     <initializer>-2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.maxpri">Ev::MAXPRI</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.read">Ev::READ</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.write">Ev::WRITE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.timer">Ev::TIMER</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.periodic">Ev::PERIODIC</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.signal">Ev::SIGNAL</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.child">Ev::CHILD</varname>
-     <initializer>2048</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.stat">Ev::STAT</varname>
-     <initializer>4096</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.idle">Ev::IDLE</varname>
-     <initializer>8192</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.prepare">Ev::PREPARE</varname>
-     <initializer>16384</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.check">Ev::CHECK</varname>
-     <initializer>32768</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.embed">Ev::EMBED</varname>
-     <initializer>65536</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.custom">Ev::CUSTOM</varname>
-     <initializer>16777216</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.error">Ev::ERROR</varname>
-     <initializer>2147483648</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-select">Ev::BACKEND_SELECT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-poll">Ev::BACKEND_POLL</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-epoll">Ev::BACKEND_EPOLL</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-kqueue">Ev::BACKEND_KQUEUE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-devpoll">Ev::BACKEND_DEVPOLL</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-port">Ev::BACKEND_PORT</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-all">Ev::BACKEND_ALL</varname>
-     <initializer>63</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ev.constants.backend-mask">Ev::BACKEND_MASK</varname>
-     <initializer>65535</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ev')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="ev.constants">
-   &reftitle.constants;
-
-  <para xml:id="ev.constants.loop-flags">
-    Flags passed to create a loop:
-
-    <variablelist>
-     <varlistentry xml:id="ev.constants.flag-auto">
-      <term>
-       <constant>Ev::FLAG_AUTO</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The default flags value
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.flag-noenv">
-      <term>
-       <constant>Ev::FLAG_NOENV</constant>
-      </term>
-      <listitem>
-       <simpara>
-        If this flag used(or the program runs setuid or setgid),
-        <literal>libev</literal>
-        won't look at the environment variable
-        <varname>LIBEV_FLAGS</varname>.
-        Otherwise(by default),
-        <varname>LIBEV_FLAGS</varname>
-        will override the flags completely if it is found. Useful for
-        performance tests and searching for bugs.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.flag-forkcheck">
-      <term>
-       <constant>Ev::FLAG_FORKCHECK</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Makes libev check for a fork in each iteration, instead of calling
-        <methodname>EvLoop::fork</methodname>
-        manually. This works by calling
-        <literal>getpid()</literal>
-        on every iteration of the loop, and thus this might slow down the
-        event loop with lots of loop iterations, but usually is not
-        noticeable. This flag setting cannot be overridden or specified in the
-        <varname>LIBEV_FLAGS</varname>
-        environment variable.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.flag-noinotify">
-      <term>
-       <constant>Ev::FLAG_NOINOTIFY</constant>
-      </term>
-      <listitem>
-       <simpara>
-        When this flag is specified,
-        <literal>libev</literal>
-        won't attempt to use the
-        <literal>inotify</literal>
-        API for its
-        <link xlink:href="&url.ev.stat;">ev_stat</link>
-        watchers. The flag can be useful to conserve inotify file descriptors,
-        as otherwise each loop using
-        <literal>ev_stat</literal>
-        watchers consumes one
-        <literal>inotify</literal>
-        handle.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.flag-signalfd">
-      <term>
-       <constant>Ev::FLAG_SIGNALFD</constant>
-      </term>
-      <listitem>
-       <simpara>
-        When this flag is specified,
-        <literal>libev</literal>
-        will attempt to use the
-        <literal>signalfd</literal>
-        API for its
-        <link xlink:href="&url.ev.signal;">ev_signal</link>
-        (and
-        <link xlink:href="&url.ev.child;">ev_child</link>)
-        watchers. This API delivers signals synchronously, which makes it
-        both faster and might make it possible to get the queued signal data.
-        It can also simplify signal handling with threads, as long as signals
-        are properly blocked in threads.
-        <literal>Signalfd</literal>
-        will not be used by default.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.flag-nosigmask">
-      <term>
-       <constant>Ev::FLAG_NOSIGMASK</constant>
-      </term>
-      <listitem>
-       <simpara>
-        When this flag is specified,
-        <literal>libev</literal>
-        will avoid to modify the signal mask. Specifically, this means having
-        to make sure signals are unblocked before receiving them.
-       </simpara>
-       <simpara>
-        This behaviour is useful for custom signal handling, or handling
-        signals only in specific threads.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para xml:id="ev.constants.run-flags">
-    Flags passed to
-    <methodname>Ev::run</methodname>,
-    or
-    <methodname>EvLoop::run</methodname>
-
-    <variablelist>
-     <varlistentry xml:id="ev.constants.run-nowait">
-      <term>
-       <constant>Ev::RUN_NOWAIT</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Means that event loop will look for new events, will handle those
-        events and any already outstanding ones, but will not wait and block
-        the process in case there are no events and will return after one
-        iteration of the loop. This is sometimes useful to poll and handle new
-        events while doing lengthy calculations, to keep the program
-        responsive.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.run-once">
-      <term>
-       <constant>Ev::RUN_ONCE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Means that event loop will look for new events (waiting if necessary)
-        and will handle those and any already outstanding ones. It will block
-        the process until at least one new event arrives (which could be an
-        event internal to libev itself, so there is no guarantee that a
-        user-registered callback will be called), and will return after one
-        iteration of the loop.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para xml:id="ev.constants.break-flags">
-    Flags passed to
-    <methodname>Ev::stop</methodname>,
-    or
-    <methodname>EvLoop::stop</methodname>
-
-    <variablelist>
-     <varlistentry xml:id="ev.constants.break-cancel">
-      <term>
-       <constant>Ev::BREAK_CANCEL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Cancel the break operation.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.break-one">
-      <term>
-       <constant>Ev::BREAK_ONE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Makes the innermost
-        <methodname>Ev::run</methodname>
-        (or
-        <methodname>EvLoop::run</methodname>)
-        call return.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.break-all">
-      <term>
-       <constant>Ev::BREAK_ALL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Makes all nested
-        <methodname>Ev::run</methodname>
-        (or
-        <methodname>EvLoop::run</methodname>)
-        calls return.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para xml:id="ev.constants.watcher-pri">
-    Watcher priorities:
-    <variablelist>
-     <varlistentry xml:id="ev.constants.minpri">
-      <term>
-       <constant>Ev::MINPRI</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Minimum allowed watcher priority.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.maxpri">
-      <term>
-       <constant>Ev::MAXPRI</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Maximum allowed watcher priority.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para xml:id="ev.constants.watcher-revents">
-    Bit masks of (received) events:
-    <variablelist>
-     <varlistentry xml:id="ev.constants.read">
-      <term>
-       <constant>Ev::READ</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The file descriptor in the
-        <classname>EvIo</classname>
-        watcher has become readable.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.write">
-      <term>
-       <constant>Ev::WRITE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The file descriptor in the
-        <classname>EvIo</classname>
-        watcher has become writable.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.timer">
-      <term>
-       <constant>Ev::TIMER</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <classname>EvTimer</classname>
-        watcher has been timed out.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.periodic">
-      <term>
-       <constant>Ev::PERIODIC</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <classname>EvPeriodic</classname>
-        watcher has been timed out.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.signal">
-      <term>
-       <constant>Ev::SIGNAL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        A signal specified in
-        <methodname>EvSignal::__construct</methodname>
-        has been received.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.child">
-      <term>
-       <constant>Ev::CHILD</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The
-        <parameter>pid</parameter>
-        specified in
-        <methodname>EvChild::__construct</methodname>
-        has received a status change.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.stat">
-      <term>
-       <constant>Ev::STAT</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The path specified in
-        <classname>EvStat</classname>
-        watcher changed its attributes.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.idle">
-      <term>
-       <constant>Ev::IDLE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <classname>EvIdle</classname>
-        watcher works when there is nothing to do with other watchers.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.prepare">
-      <term>
-       <constant>Ev::PREPARE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        All
-        <classname>EvPrepare</classname>
-        watchers are invoked just before
-        <methodname>Ev::run</methodname>
-        starts. Thus,
-        <classname>EvPrepare</classname>
-        watchers are the last watchers invoked before the event loop sleeps or
-        polls for new events.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.check">
-      <term>
-       <constant>Ev::CHECK</constant>
-      </term>
-      <listitem>
-       <simpara>
-        All
-        <classname>EvCheck</classname>
-        watchers are queued just after
-        <methodname>Ev::run</methodname>
-        has gathered the new events, but before it queues any callbacks for
-        any received events. Thus,
-        <classname>EvCheck</classname>
-        watchers will be invoked before any other watchers of the same or
-        lower priority within an event loop iteration.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.embed">
-      <term>
-       <constant>Ev::EMBED</constant>
-      </term>
-      <listitem>
-       <simpara>
-        The embedded event loop specified in the
-        <classname>EvEmbed</classname>
-        watcher needs attention.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.custom">
-      <term>
-       <constant>Ev::CUSTOM</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Not ever sent(or otherwise used) by
-        <literal>libev</literal>
-        itself, but can be freely used by
-        <literal>libev</literal>
-        users to signal watchers (e.g. via
-        <methodname>EvWatcher::feed</methodname>
-        ).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.error">
-      <term>
-       <constant>Ev::ERROR</constant>
-      </term>
-      <listitem>
-       <simpara>
-        An unspecified error has occurred, the watcher has been stopped. This
-        might happen because the watcher could not be properly started because
-        <literal>libev</literal>
-        ran out of memory, a file descriptor was found to be closed or any
-        other problem.
-        <literal>Libev</literal>
-        considers these application bugs. See also
-        <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#ANATOMY_OF_A_WATCHER_CONTENT">ANATOMY
-    OF A WATCHER</link>
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para xml:id="ev.constants.watcher-backends">
-    Backend flags:
-    <variablelist>
-     <varlistentry xml:id="ev.constants.backend-select">
-      <term>
-       <constant>Ev::BACKEND_SELECT</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <literal>select(2) backend</literal>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-poll">
-      <term>
-       <constant>Ev::BACKEND_POLL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <literal>poll(2) backend</literal>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-epoll">
-      <term>
-       <constant>Ev::BACKEND_EPOLL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Linux-specific
-        <literal>epoll(7)</literal>
-        backend for both pre- and post-2.6.9 kernels
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-kqueue">
-      <term>
-       <constant>Ev::BACKEND_KQUEUE</constant>
-      </term>
-      <listitem>
-       <simpara>
-        <literal>kqueue</literal>
-        backend used on most BSD systems.
-        <classname>EvEmbed</classname>
-        watcher could be used to embed one loop(with kqueue backend) into
-        another. For instance, one can try to create an event loop with
-        <literal>kqueue</literal>
-        backend and use it for sockets only.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-devpoll">
-      <term>
-       <constant>Ev::BACKEND_DEVPOLL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Solaris 8 backend. This is not implemented yet.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-port">
-      <term>
-       <constant>Ev::BACKEND_PORT</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Solaris 10 event port mechanism with a good scaling.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-all">
-      <term>
-       <constant>Ev::BACKEND_ALL</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Try all backends(even corrupted ones). It's not recommended to use it
-        explicitly. Bitwise operators should be applied here(e.g.
-        <constant>Ev::BACKEND_ALL</constant>
-        &amp; ~
-        <constant>Ev::BACKEND_KQUEUE</constant>)
-        Use
-        <methodname>Ev::recommendedBackends</methodname>,
-        or don't specify any backends at all.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="ev.constants.backend-mask">
-      <term>
-       <constant>Ev::BACKEND_MASK</constant>
-      </term>
-      <listitem>
-       <simpara>
-        Not a backend, but a mask to select all backend bits from
-        <parameter>flags</parameter>
-        value to mask out any backends(e.g. when modifying the
-        <varname>LIBEV_FLAGS</varname>
-        environment variable).
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <note xmlns="http://docbook.org/ns/docbook">
-    <simpara>
-     For the default loop during module initialization phase
-     <literal>Ev</literal>
-     registers
-     <link xlink:href="&url.ev.loop;">ev_loop_fork</link>
-     call by means of
-     <literal>pthread_atfork</literal>
-     (if available).
-    </simpara>
-   </note>
-   <note xmlns="http://docbook.org/ns/docbook">
-    <simpara>
-     There are methods providing access to the
-     <emphasis>default event
-   loop</emphasis>
-     in
-     <classname>Ev</classname>
-     class(e.g.
-     <methodname>Ev::iteration</methodname>,
-     <methodname>Ev::depth</methodname>
-     etc.) For
-     <emphasis>custom loops</emphasis>
-     (created with
-     <methodname>EvLoop::__construct</methodname>)
-     these values may be accessed via corresponding properties and methods
-     of the
-     <classname>EvLoop</classname>
-     class.
-    </simpara>
-    <simpara>
-     The instance of the default event loop itself can be fetched by means of
-     <methodname>EvLoop::defaultLoop</methodname>
-     method.
-    </simpara>
-   </note>
-  </section>
-
- </partintro>
-
- &reference.ev.entities.ev;
-
-</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/ev/ev/backend.xml b/reference/ev/ev/backend.xml
deleted file mode 100644
index 202675315864..000000000000
--- a/reference/ev/ev/backend.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.backend">
- <refnamediv>
-  <refname>Ev::backend</refname>
-  <refpurpose>Returns an integer describing the backend used by libev</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::backend</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns an integer describing the backend used by
-   <emphasis>libev</emphasis>.
-   See
-   <link linkend="ev.constants.watcher-backends">Backend flags</link>
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer(bit mask) describing the backend used by
-   <emphasis>libev</emphasis>.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvEmbed</classname>
-   </member>
-   <member>
-    <methodname>Ev::embeddableBackends</methodname>
-   </member>
-   <member>
-    <methodname>Ev::recommendedBackends</methodname>
-   </member>
-   <member>
-    <methodname>Ev::supportedBackends</methodname>
-   </member>
-   <member>
-    <link linkend="ev.constants.watcher-backends">Backend flags</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/ev/ev/depth.xml b/reference/ev/ev/depth.xml
deleted file mode 100644
index 0c8842237685..000000000000
--- a/reference/ev/ev/depth.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.depth">
- <refnamediv>
-  <refname>Ev::depth</refname>
-  <refpurpose>Returns recursion depth</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::depth</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   The number of times
-   <methodname>Ev::run</methodname>
-   was entered minus the number of times
-   <methodname>Ev::run</methodname>
-   was exited normally, in other words, the recursion depth. Outside
-   <methodname>Ev::run</methodname>,
-   this number is
-   <literal>0</literal>.
-   In a callback, this number is
-   <literal>1</literal>,
-   unless
-   <methodname>Ev::run</methodname>
-   was invoked recursively (or from another thread), in which case it is
-   higher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>ev_depth</function>
-   returns recursion depth of the default loop.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::iteration</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/ev/ev/embeddablebackends.xml b/reference/ev/ev/embeddablebackends.xml
deleted file mode 100644
index 2049eb00c35b..000000000000
--- a/reference/ev/ev/embeddablebackends.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.embeddablebackends">
- <refnamediv>
-  <refname>Ev::embeddableBackends</refname>
-  <refpurpose>Returns the set of backends that are embeddable in other event loops</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::embeddableBackends</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the set of backends that are embeddable in other event loops.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a bit mask which can containing
-   <link linkend="ev.constants.watcher-backends">backend flags</link>
-   combined using bitwise
-   <emphasis>OR</emphasis>
-   operator.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Embedding loop created with kqueue backend into the default loop</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
-* Check if kqueue is available but not recommended and create a kqueue backend
-* for use with sockets (which usually work with any kqueue implementation).
-* Store the kqueue/socket-only event loop in loop_socket. (One might optionally
-* use EVFLAG_NOENV, too)
-*
-* Example borrowed from
-* http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
-*/
-$loop        = EvLoop::defaultLoop();
-$socket_loop = NULL;
-$embed       = NULL;
-
-if (Ev::supportedBackends() & ~Ev::recommendedBackends() & Ev::BACKEND_KQUEUE) {
- if (($socket_loop = new EvLoop(Ev::BACKEND_KQUEUE))) {
-  $embed = new EvEmbed($loop);
- }
-}
-
-if (!$socket_loop) {
- $socket_loop = $loop;
-}
-
-// Now use $socket_loop for all sockets, and $loop for anything else
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvEmbed</classname>
-   </member>
-   <member>
-    <methodname>Ev::recommendedBackends</methodname>
-   </member>
-   <member>
-    <methodname>Ev::supportedBackends</methodname>
-   </member>
-   <member>
-    <link linkend="ev.constants.watcher-backends">Backend flags</link>
-   </member>
-   <member>
-    <link linkend="ev.examples">Examples</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/ev/ev/feedsignal.xml b/reference/ev/ev/feedsignal.xml
deleted file mode 100644
index 36dfbe862dd6..000000000000
--- a/reference/ev/ev/feedsignal.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.feedsignal">
- <refnamediv>
-  <refname>Ev::feedSignal</refname>
-  <refpurpose>Feed a signal event into Ev</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::feedSignal</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Simulates a signal receive. It is safe to call this function at any time,
-   from any context, including signal handlers or random threads. Its main use
-   is to customise signal handling in the process.
-  </simpara>
-  <simpara>
-   Unlike
-   <methodname>Ev::feedSignalEvent</methodname>,
-   this works regardless of which loop has registered the signal.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Signal number. See
-      <literal>signal(7)</literal>
-      man page for details. You can use constants exported by
-      <literal>pcntl</literal>
-      extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::feedSignalEvent</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/ev/ev/feedsignalevent.xml b/reference/ev/ev/feedsignalevent.xml
deleted file mode 100644
index b1c0f604ee37..000000000000
--- a/reference/ev/ev/feedsignalevent.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.feedsignalevent">
- <refnamediv>
-  <refname>Ev::feedSignalEvent</refname>
-  <refpurpose>Feed signal event into the default loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::feedSignalEvent</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Feed signal event into the default loop. Ev will react to this call as if
-   the signal specified by
-   <parameter>signal</parameter>
-   had occurred.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Signal number. See
-      <literal>signal(7)</literal>
-      man page for details. See also constants exported by
-      <literal>pcntl</literal>
-      extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::feedSignal</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/ev/ev/iteration.xml b/reference/ev/ev/iteration.xml
deleted file mode 100644
index 59eb9bc597ca..000000000000
--- a/reference/ev/ev/iteration.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.iteration">
- <refnamediv>
-  <refname>Ev::iteration</refname>
-  <refpurpose>Return the number of times the default event loop has polled for new
-  events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::iteration</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Return the number of times the event loop has polled for new events.
-   Sometimes useful as a generation counter.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns number of polls of the default event loop.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::depth</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/ev/ev/now.xml b/reference/ev/ev/now.xml
deleted file mode 100644
index 13bdac16c255..000000000000
--- a/reference/ev/ev/now.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.now">
- <refnamediv>
-  <refname>Ev::now</refname>
-  <refpurpose>Returns the time when the last iteration of the default event
-  loop has started</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>float</type>
-   <methodname>Ev::now</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the time when the last iteration of the default event loop has
-   started. This is the time that timers(
-   <classname>EvTimer</classname>
-   and
-   <classname>EvPeriodic</classname>)
-   are based on, and referring to it is usually faster than calling
-   <methodname>Ev::time</methodname>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns number of seconds(fractional) representing the time when the last
-   iteration of the default event loop has started.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::nowUpdate</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/ev/ev/nowupdate.xml b/reference/ev/ev/nowupdate.xml
deleted file mode 100644
index 05695ec9cf22..000000000000
--- a/reference/ev/ev/nowupdate.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.nowupdate">
- <refnamediv>
-  <refname>Ev::nowUpdate</refname>
-  <refpurpose>Establishes the current time by querying the kernel, updating the time
-    returned by Ev::now in the progress</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::nowUpdate</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Establishes the current time by querying the kernel, updating the time
-   returned by
-   <methodname>Ev::now</methodname>
-   in the progress. This is a costly operation and is usually done
-   automatically within
-   <methodname>Ev::run</methodname>.
-  </simpara>
-  <simpara>
-   This method is rarely useful, but when some event callback runs for a very
-   long time without entering the event loop, updating
-   <emphasis>libev</emphasis>
-   's consideration of the current time is a good idea.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::now</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/ev/ev/recommendedbackends.xml b/reference/ev/ev/recommendedbackends.xml
deleted file mode 100644
index daabb3af9ddd..000000000000
--- a/reference/ev/ev/recommendedbackends.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.recommendedbackends">
- <refnamediv>
-  <refname>Ev::recommendedBackends</refname>
-  <refpurpose>Returns a bit mask of recommended backends for current
-  platform</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::recommendedBackends</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the set of all backends compiled into this binary of
-   <literal>libev</literal>
-   and also recommended for this platform, meaning it will work for most file
-   descriptor types. This set is often smaller than the one returned by
-   <function>ev_supported_backends</function>,
-   as for example
-   <literal>kqueue</literal>
-   is broken on most
-   <literal>BSD</literal>
-   systems and will not be auto-detected unless it is requested explicitly.
-   This is the set of backends that
-   <literal>libev</literal>
-   will probe when no backends are specified explicitly.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a bit mask which can containing
-   <link linkend="ev.constants.watcher-backends">backend flags</link>
-   combined using bitwise
-   <emphasis>OR</emphasis>
-   operator.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Embedding one loop into another</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
-* Try to get an embeddable event loop and embed it into the default event loop.
-* If it is impossible, use the default
-* loop. The default loop is stored in $loop_hi, while the embeddable loop is
-* stored in $loop_lo(which is $loop_hi in the case no embeddable loop can be
-* used).
-*
-* Sample translated to PHP
-* http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
-*/
-$loop_hi = EvLoop::defaultLoop();
-$loop_lo = NULL;
-$embed   = NULL;
-
-/*
-* See if there is a chance of getting one that works
-* (flags' value of 0 means autodetection)
-*/
-$loop_lo = Ev::embeddableBackends() & Ev::recommendedBackends()
- ? new EvLoop(Ev::embeddableBackends() & Ev::recommendedBackends())
- : 0;
-
-if ($loop_lo) {
- $embed = new EvEmbed($loop_lo, function () {});
-} else {
- $loop_lo = $loop_hi;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvEmbed</classname>
-   </member>
-   <member>
-    <methodname>Ev::embeddableBackends</methodname>
-   </member>
-   <member>
-    <methodname>Ev::supportedBackends</methodname>
-   </member>
-   <member>
-    <link linkend="ev.constants.watcher-backends">Backend flags</link>
-   </member>
-   <member>
-    <link linkend="ev.examples">Examples</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/ev/ev/resume.xml b/reference/ev/ev/resume.xml
deleted file mode 100644
index dfeb9f355912..000000000000
--- a/reference/ev/ev/resume.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.resume">
- <refnamediv>
-  <refname>Ev::resume</refname>
-  <refpurpose>Resume previously suspended default event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::resume</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>Ev::suspend</methodname>
-   and
-   <methodname>Ev::resume</methodname>
-   methods suspend and resume a loop correspondingly.
-  </simpara>
-  <simpara>
-   All timer watchers will be delayed by the time spent between
-   <emphasis>suspend</emphasis>
-   and
-   <emphasis>resume</emphasis>,
-   and all
-   <emphasis>periodic</emphasis>
-   watchers will be rescheduled(that is, they will lose any events that would
-   have occurred while suspended).
-  </simpara>
-  <simpara>
-   After calling
-   <methodname>Ev::suspend</methodname>
-   it is not allowed to call any function on the given loop other than
-   <methodname>Ev::resume</methodname>.
-   Also it is not allowed to call
-   <methodname>Ev::resume</methodname>
-   without a previous call to
-   <methodname>Ev::suspend</methodname>.
-  </simpara>
-  <simpara>
-   Calling
-   <emphasis>suspend</emphasis>
-   /
-   <emphasis>resume</emphasis>
-   has the side effect of updating the event loop time(see
-   <methodname>Ev::nowUpdate</methodname>
-   ).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::suspend</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/ev/ev/run.xml b/reference/ev/ev/run.xml
deleted file mode 100644
index 599aa46bf7a9..000000000000
--- a/reference/ev/ev/run.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.run">
- <refnamediv>
-  <refname>Ev::run</refname>
-  <refpurpose>Begin checking for events and calling callbacks for the default
-  loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::run</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Begin checking for events and calling callbacks
-   <emphasis>for the default loop</emphasis>.
-   Returns when a callback calls
-   <methodname>Ev::stop</methodname>
-   method, or the flags are nonzero(in which case the return value is true) or
-   when there are no active watchers which reference the loop(
-   <methodname>EvWatcher::keepalive</methodname>
-   is &true;), in which case the return value will be &false;. The return
-   value can generally be interpreted as
-   <emphasis>if &true;, there is more work left to
-  do</emphasis>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      Optional parameter
-      <parameter>flags</parameter>
-      can be one of the following:
-      <table>
-       <title>
-         List for possible values of <parameter>flags</parameter>
-       </title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>
-           <parameter>flags</parameter>
-          </entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>0</literal>
-          </entry>
-          <entry>The default behavior described above</entry>
-         </row>
-         <row>
-          <entry>
-           <constant>Ev::RUN_ONCE</constant>
-          </entry>
-          <entry>Block at most one(wait, but don't loop)</entry>
-         </row>
-         <row>
-          <entry>
-           <constant>Ev::RUN_NOWAIT</constant>
-          </entry>
-          <entry>Don't block at all(fetch/handle events, but don't wait)</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     <simpara>
-      See
-      <link linkend="ev.constants.run-flags">the run flag
-       constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::stop</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::run</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/ev/ev/sleep.xml b/reference/ev/ev/sleep.xml
deleted file mode 100644
index 8f5cd2b87838..000000000000
--- a/reference/ev/ev/sleep.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.sleep">
- <refnamediv>
-  <refname>Ev::sleep</refname>
-  <refpurpose>Block the process for the given number of seconds</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::sleep</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>seconds</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Block the process for the given number of seconds.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>seconds</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Fractional number of seconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/ev/stop.xml b/reference/ev/ev/stop.xml
deleted file mode 100644
index a5d27f4bf849..000000000000
--- a/reference/ev/ev/stop.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.stop">
- <refnamediv>
-  <refname>Ev::stop</refname>
-  <refpurpose>Stops the default event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::stop</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>how</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stops the default event loop
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>how</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      One of
-      <emphasis>Ev::BREAK_*</emphasis>
-      <link linkend="ev.constants.break-flags">constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::run</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/ev/ev/supportedbackends.xml b/reference/ev/ev/supportedbackends.xml
deleted file mode 100644
index 696141ab3e68..000000000000
--- a/reference/ev/ev/supportedbackends.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.supportedbackends">
- <refnamediv>
-  <refname>Ev::supportedBackends</refname>
-  <refpurpose>Returns the set of backends supported by current libev
-  configuration</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>Ev::supportedBackends</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the set of backends supported by current libev configuration.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a bit mask which can containing
-   <link linkend="ev.constants.watcher-backends">backend flags</link>
-   combined using bitwise
-   <emphasis>OR</emphasis>
-   operator.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Embedding loop created with kqueue backend into the default loop</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
-* Check if kqueue is available but not recommended and create a kqueue backend
-* for use with sockets (which usually work with any kqueue implementation).
-* Store the kqueue/socket-only event loop in loop_socket. (One might optionally
-* use EVFLAG_NOENV, too)
-*
-* Example borrowed from
-* http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
-*/
-$loop        = EvLoop::defaultLoop();
-$socket_loop = NULL;
-$embed       = NULL;
-
-if (Ev::supportedBackends() & ~Ev::recommendedBackends() & Ev::BACKEND_KQUEUE) {
- if (($socket_loop = new EvLoop(Ev::BACKEND_KQUEUE))) {
-  $embed = new EvEmbed($loop);
- }
-}
-
-if (!$socket_loop) {
- $socket_loop = $loop;
-}
-
-// Now use $socket_loop for all sockets, and $loop for anything else
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvEmbed</classname>
-   </member>
-   <member>
-    <methodname>Ev::recommendedBackends</methodname>
-   </member>
-   <member>
-    <methodname>Ev::embeddableBackends</methodname>
-   </member>
-   <member>
-    <link linkend="ev.constants.watcher-backends">Backend flags</link>
-   </member>
-   <member>
-    <link linkend="ev.examples">Examples</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/ev/ev/suspend.xml b/reference/ev/ev/suspend.xml
deleted file mode 100644
index 71a1e8e441d6..000000000000
--- a/reference/ev/ev/suspend.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.suspend">
- <refnamediv>
-  <refname>Ev::suspend</refname>
-  <refpurpose>Suspend the default event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::suspend</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>Ev::suspend</methodname>
-   and
-   <methodname>Ev::resume</methodname>
-   methods suspend and resume the default loop correspondingly.
-  </simpara>
-  <simpara>
-   All timer watchers will be delayed by the time spent between
-   <emphasis>suspend</emphasis>
-   and
-   <emphasis>resume</emphasis>,
-   and all
-   <emphasis>periodic</emphasis>
-   watchers will be rescheduled(that is, they will lose any events that would
-   have occurred while suspended).
-  </simpara>
-  <simpara>
-   After calling
-   <methodname>Ev::suspend</methodname>
-   it is not allowed to call any function on the given loop other than
-   <methodname>Ev::resume</methodname>.
-   Also it is not allowed to call
-   <methodname>Ev::resume</methodname>
-   without a previous call to
-   <methodname>Ev::suspend</methodname>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::resume</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/ev/ev/time.xml b/reference/ev/ev/time.xml
deleted file mode 100644
index 31dffd083f32..000000000000
--- a/reference/ev/ev/time.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.time">
- <refnamediv>
-  <refname>Ev::time</refname>
-  <refpurpose>Returns the current time in fractional seconds since the epoch</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>float</type>
-   <methodname>Ev::time</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the current time in fractional seconds since the epoch. Consider
-   using
-   <methodname>Ev::now</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current time in fractional seconds since the epoch.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::now</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/ev/ev/verify.xml b/reference/ev/ev/verify.xml
deleted file mode 100644
index b4ef7411cabd..000000000000
--- a/reference/ev/ev/verify.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.verify">
- <refnamediv>
-  <refname>Ev::verify</refname>
-  <refpurpose>Performs internal consistency checks(for debugging)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>Ev::verify</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Performs internal consistency checks(for debugging
-   <emphasis>libev</emphasis>)
-   and abort the program if any data structures were found to be corrupted.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evcheck.xml b/reference/ev/evcheck.xml
deleted file mode 100644
index 83af918a27f9..000000000000
--- a/reference/ev/evcheck.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evcheck" role="class">
- <title>The EvCheck class</title>
- <titleabbrev>EvCheck</titleabbrev>
- <partintro>
-<!-- {{{ EvCheck intro -->
-  <section xml:id="evcheck.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvPrepare</classname>
-    and
-    <classname>EvCheck</classname>
-    watchers are usually used in pairs.
-    <classname>EvPrepare</classname>
-    watchers get invoked before the process blocks,
-    <classname>EvCheck</classname>
-    afterwards.
-   </simpara>
-   <simpara>
-    It is not allowed to call
-    <methodname>EvLoop::run</methodname>
-    or similar methods or functions that enter the current event loop from
-    either
-    <classname>EvPrepare</classname>
-    or
-    <classname>EvCheck</classname>
-    watchers. Other loops than the current one are fine, however. The
-    rationale behind this is that one don&apos;t need to check for recursion
-    in those watchers, i.e. the sequence will always be:
-    <classname>EvPrepare</classname>
-    -&gt; blocking -&gt;
-    <classname>EvCheck</classname>,
-    so having a watcher of each kind they will always be called in pairs
-    bracketing the blocking call.
-   </simpara>
-   <simpara>
-    The main purpose is to integrate other event mechanisms into
-    <emphasis>libev</emphasis>
-    and their use is somewhat advanced. They could be used, for example, to
-    track variable changes, implement custom watchers, integrate net-snmp or a
-    coroutine library and lots more. They are also occasionally useful to
-    cache some data and want to flush it before blocking.
-   </simpara>
-   <simpara>
-    It is recommended to give
-    <classname>EvCheck</classname>
-    watchers highest(
-    <constant>Ev::MAXPRI</constant>)
-    priority, to ensure that they are being run before any other watchers
-    after the poll (this doesn’t matter for
-    <classname>EvPrepare</classname>
-    watchers).
-   </simpara>
-   <simpara>
-    Also,
-    <classname>EvCheck</classname>
-    watchers should not activate/feed events. While
-    <emphasis>libev</emphasis>
-    fully supports this, they might get executed before other
-    <classname>EvCheck</classname>
-    watchers did their job.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evcheck.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvCheck</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvCheck</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-<!--<classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>-->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evcheck')/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.evcheck')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
- &reference.ev.entities.evcheck;
-
-</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/ev/evcheck/construct.xml b/reference/ev/evcheck/construct.xml
deleted file mode 100644
index 9b070b0aebdb..000000000000
--- a/reference/ev/evcheck/construct.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evcheck.construct">
- <refnamediv>
-  <refname>EvCheck::__construct</refname>
-  <refpurpose>Constructs the EvCheck watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvCheck::__construct</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs the
-   <classname>EvCheck</classname>
-   watcher object.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvPrepare</classname>
-   </member>
-   <member>
-    <methodname>EvLoop::check</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/ev/evcheck/createstopped.xml b/reference/ev/evcheck/createstopped.xml
deleted file mode 100644
index eb622b67c0e1..000000000000
--- a/reference/ev/evcheck/createstopped.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evcheck.createstopped">
- <refnamediv>
-  <refname>EvCheck::createStopped</refname>
-  <refpurpose>Create instance of a stopped EvCheck watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>object</type>
-   <methodname>EvCheck::createStopped</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Create instance of a stopped EvCheck watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvCheck object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvPrepare</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/ev/evchild.xml b/reference/ev/evchild.xml
deleted file mode 100644
index 6de0cfa6230c..000000000000
--- a/reference/ev/evchild.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evchild" role="class">
- <title>The EvChild class</title>
- <titleabbrev>EvChild</titleabbrev>
- <partintro>
-<!-- {{{ EvChild intro -->
-  <section xml:id="evchild.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvChild</classname>
-    watchers trigger when the process receives a
-    <constant>SIGCHLD</constant>
-    in response to some child status changes (most typically when a child dies
-    or exits). It is permissible to install an
-    <constant>EvChild</constant>
-    watcher after the child has been forked(which implies it might have
-    already exited), as long as the event loop isn't entered(or is continued
-    from a watcher), i.e. forking and then immediately registering a watcher
-    for the child is fine, but forking and registering a watcher a few event
-    loop iterations later or in the next callback invocation is not.
-   </simpara>
-   <simpara>
-    It is allowed to register
-    <classname>EvChild</classname>
-    watchers in the
-    <emphasis>default loop</emphasis>
-    only.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evchild.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvChild</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvChild</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evchild.props.pid">pid</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evchild.props.rpid">rpid</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evchild.props.rstatus">rstatus</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evchild')/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.evchild')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvChild properties -->
-  <section xml:id="evchild.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evchild.props.pid">
-     <term>
-      <varname>pid</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       The process ID this watcher watches out for, or
-       <literal>0</literal>,
-       meaning any process ID.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evchild.props.rpid">
-     <term>
-      <varname>rpid</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>
-       .The process ID that detected a status change.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evchild.props.rstatus">
-     <term>
-      <varname>rstatus</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       The process exit status caused by
-       <varname>rpid</varname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evchild;
-
-</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/ev/evchild/construct.xml b/reference/ev/evchild/construct.xml
deleted file mode 100644
index 897061b45628..000000000000
--- a/reference/ev/evchild/construct.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evchild.construct">
- <refnamediv>
-  <refname>EvChild::__construct</refname>
-  <refpurpose>Constructs the EvChild watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvChild::__construct</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>pid</parameter>
-   </methodparam>
-   <methodparam>
-    <type>bool</type>
-    <parameter>trace</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs the
-   <classname>EvChild</classname>
-   watcher object.
-  </simpara>
-  <simpara>
-   Call the callback when a status change for process ID
-   <parameter>pid</parameter>
-   (or any
-   <emphasis>PID</emphasis>
-   if
-   <parameter>pid</parameter>
-   is
-   <literal>0</literal>)
-   has been received(a status change happens when the process terminates or
-   is killed, or, when
-   <parameter>trace</parameter>
-   is &true;, additionally when it is stopped or continued). In other words,
-   when the process receives a
-   <constant>SIGCHLD</constant>,
-   <emphasis>Ev</emphasis>
-   will fetch the outstanding exit/wait status for all changed/zombie children
-   and call the callback.
-  </simpara>
-  <simpara>
-   It is valid to install a child watcher after an
-   <classname>EvChild</classname>
-   has exited but before the event loop has started its next iteration. For
-   example, first one calls
-   <literal>fork</literal>,
-   then the new child process might exit, and only then an
-   <classname>EvChild</classname>
-   watcher is installed in the parent for the new
-   <emphasis>PID</emphasis>.
-  </simpara>
-  <simpara>
-   You can access both exit/tracing status and
-   <parameter>pid</parameter>
-   by using the
-   <varname>rstatus</varname>
-   and
-   <varname>rpid</varname>
-   properties of the watcher object.
-  </simpara>
-  <simpara>
-   The number of
-   <emphasis>PID</emphasis>
-   watchers per
-   <emphasis>PID</emphasis>
-   is unlimited. All of them will be called.
-  </simpara>
-  <simpara>
-   The
-   <methodname>EvChild::createStopped</methodname>
-   method doesn&apos;t start(activate) the newly created watcher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>pid</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Wait for status changes of process PID(or any process if PID is
-      specified as
-      <literal>0</literal>
-      ).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>trace</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      If &false;, only activate the watcher when the process terminates.
-      Otherwise(&true;) additionally activate the watcher when the process is
-      stopped or continued.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::child</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/ev/evchild/createstopped.xml b/reference/ev/evchild/createstopped.xml
deleted file mode 100644
index fe3cf440311d..000000000000
--- a/reference/ev/evchild/createstopped.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evchild.createstopped">
- <refnamediv>
-  <refname>EvChild::createStopped</refname>
-  <refpurpose>Create instance of a stopped EvChild watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>object</type>
-   <methodname>EvChild::createStopped</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>pid</parameter>
-   </methodparam>
-   <methodparam>
-    <type>bool</type>
-    <parameter>trace</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>EvChild::__construct</methodname>,
-   but doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>pid</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvChild::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>trace</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvChild::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara/>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvChild::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::child</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/ev/evchild/set.xml b/reference/ev/evchild/set.xml
deleted file mode 100644
index 70e4af1d376e..000000000000
--- a/reference/ev/evchild/set.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evchild.set">
- <refnamediv>
-  <refname>EvChild::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvChild::set</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>pid</parameter>
-   </methodparam>
-   <methodparam>
-    <type>bool</type>
-    <parameter>trace</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara/>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>pid</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvChild::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>trace</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvChild::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvChild::__construct</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/ev/evembed.xml b/reference/ev/evembed.xml
deleted file mode 100644
index e3457554866d..000000000000
--- a/reference/ev/evembed.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evembed" role="class">
- <title>The EvEmbed class</title>
- <titleabbrev>EvEmbed</titleabbrev>
- <partintro>
-<!-- {{{ EvEmbed intro -->
-  <section xml:id="evembed.intro">
-   &reftitle.intro;
-   <simpara>
-    Used to embed one event loop into another.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evembed.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvEmbed</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvEmbed</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evembed.props.embed">embed</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evembed')/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.evembed')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvEmbed properties -->
-  <section xml:id="evembed.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evembed.props.is-active">
-     <term>
-      <varname>is_active</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evembed.props.data">
-     <term>
-      <varname>data</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evembed.props.is-pending">
-     <term>
-      <varname>is_pending</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evembed.props.priority">
-     <term>
-      <varname>priority</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evembed.props.embed">
-     <term>
-      <varname>embed</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evembed;
-
-</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/ev/evembed/construct.xml b/reference/ev/evembed/construct.xml
deleted file mode 100644
index 7522a988f78c..000000000000
--- a/reference/ev/evembed/construct.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evembed.construct">
- <refnamediv>
-  <refname>EvEmbed::__construct</refname>
-  <refpurpose>Constructs the EvEmbed object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvEmbed::__construct</methodname>
-   <methodparam>
-    <type>object</type>
-    <parameter>other</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   This is a rather advanced watcher type that lets to embed one event loop
-   into another(currently only IO events are supported in the embedded loop,
-   other types of watchers might be handled in a delayed or incorrect fashion
-   and must not be used).
-  </simpara>
-  <simpara>
-   See
-   <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#code_ev_embed_code_when_one_backend_">the
-  libev documentation</link>
-   for details.
-  </simpara>
-  <simpara>
-   This watcher is most useful on
-   <emphasis>BSD</emphasis>
-   systems without working
-   <literal>kqueue</literal>
-   to still be able to handle a large number of sockets. See example below.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>other</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Instance of
-      <classname>EvLoop</classname>.
-      The loop to embed, this loop must be embeddable(see
-      <methodname>Ev::embeddableBackends</methodname>
-      ).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Embedding loop created with kqueue backend into the default loop</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Check if kqueue is available but not recommended and create a kqueue backend
- * for use with sockets (which usually work with any kqueue implementation).
- * Store the kqueue/socket-only event loop in loop_socket. (One might optionally
- * use EVFLAG_NOENV, too)
- *
- * Example borrowed from
- * http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
- */
-$loop        = EvLoop::defaultLoop();
-$socket_loop = NULL;
-$embed       = NULL;
-
-if (Ev::supportedBackends() & ~Ev::recommendedBackends() & Ev::BACKEND_KQUEUE) {
-    if (($socket_loop = new EvLoop(Ev::BACKEND_KQUEUE))) {
-        $embed = new EvEmbed($loop);
-    }
-}
-
-if (!$socket_loop) {
-    $socket_loop = $loop;
-}
-
-// Now use $socket_loop for all sockets, and $loop for anything else
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::embeddableBackends</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/ev/evembed/createstopped.xml b/reference/ev/evembed/createstopped.xml
deleted file mode 100644
index 7c52ec8155fe..000000000000
--- a/reference/ev/evembed/createstopped.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evembed.createstopped">
- <refnamediv>
-  <refname>EvEmbed::createStopped</refname>
-  <refpurpose>Create stopped EvEmbed watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>EvEmbed::createStopped</methodname>
-   <methodparam>
-    <type>object</type>
-    <parameter>other</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>EvEmbed::__construct</methodname>,
-   but doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>other</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvEmbed::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns stopped EvEmbed object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvEmbed::__construct</methodname>
-   </member>
-   <member>
-    <methodname>Ev::embeddableBackends</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/ev/evembed/set.xml b/reference/ev/evembed/set.xml
deleted file mode 100644
index c4ff6b72d8d4..000000000000
--- a/reference/ev/evembed/set.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evembed.set">
- <refnamediv>
-  <refname>EvEmbed::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvEmbed::set</methodname>
-   <methodparam>
-    <type>object</type>
-    <parameter>other</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures the watcher to use
-   <parameter>other</parameter>
-   event loop object.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>other</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvEmbed::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evembed/sweep.xml b/reference/ev/evembed/sweep.xml
deleted file mode 100644
index b5902670c92e..000000000000
--- a/reference/ev/evembed/sweep.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evembed.sweep">
- <refnamediv>
-  <refname>EvEmbed::sweep</refname>
-  <refpurpose>Make a single, non-blocking sweep over the embedded loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvEmbed::sweep</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Make a single, non-blocking sweep over the embedded loop. Works similarly
-   to the following, but in the most appropriate way for embedded loops:
-   <programlisting role="php">
-<![CDATA[
-<?php
-$other->start(Ev::RUN_NOWAIT);
-?>
-]]>
-   </programlisting>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvWatcher::start</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/ev/evfork.xml b/reference/ev/evfork.xml
deleted file mode 100644
index 5539e3be1396..000000000000
--- a/reference/ev/evfork.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evfork" role="class">
- <title>The EvFork class</title>
- <titleabbrev>EvFork</titleabbrev>
- <partintro>
-<!-- {{{ EvFork intro -->
-  <section xml:id="evfork.intro">
-   &reftitle.intro;
-   <simpara>
-    Fork watchers are called when a
-    <literal>fork()</literal>
-    was detected (usually because whoever signalled
-    <emphasis>libev</emphasis>
-    about it by calling
-    <methodname>EvLoop::fork</methodname>
-    ). The invocation is done before the event loop blocks next and before
-    <classname>EvCheck</classname>
-    watchers are being called, and only in the child after the fork. Note,
-    that if whoever calling
-    <methodname>EvLoop::fork</methodname>
-    calls it in the wrong process, the fork handlers will be invoked, too.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evfork.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvFork</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvFork</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-<!--<classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>-->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evfork')/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.evfork')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
- &reference.ev.entities.evfork;
-
-</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/ev/evfork/construct.xml b/reference/ev/evfork/construct.xml
deleted file mode 100644
index 8f2b845facf2..000000000000
--- a/reference/ev/evfork/construct.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evfork.construct">
- <refnamediv>
-  <refname>EvFork::__construct</refname>
-  <refpurpose>Constructs the EvFork watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvFork::__construct</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs the EvFork watcher object and starts the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::fork</methodname>
-   </member>
-   <member>
-    <classname>EvCheck</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/ev/evfork/createstopped.xml b/reference/ev/evfork/createstopped.xml
deleted file mode 100644
index bdb0bdfa835e..000000000000
--- a/reference/ev/evfork/createstopped.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evfork.createstopped">
- <refnamediv>
-  <refname>EvFork::createStopped</refname>
-  <refpurpose>Creates a stopped instance of EvFork watcher class</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>object</type>
-   <methodname>EvFork::createStopped</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>EvFork::__construct</methodname>,
-   but doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvFork(stopped) object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvFork::__construct</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/ev/evidle.xml b/reference/ev/evidle.xml
deleted file mode 100644
index 9461ad985d34..000000000000
--- a/reference/ev/evidle.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evidle" role="class">
- <title>The EvIdle class</title>
- <titleabbrev>EvIdle</titleabbrev>
- <partintro>
-<!-- {{{ EvIdle intro -->
-  <section xml:id="evidle.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvIdle</classname>
-    watchers trigger events when no other events of the same or higher
-    priority are pending (
-    <classname>EvPrepare</classname>,
-    <classname>EvCheck</classname>
-    and other
-    <classname>EvIdle</classname>
-    watchers do not count as receiving
-    <emphasis>events</emphasis>
-    ).
-   </simpara>
-   <simpara>
-    Thus, as long as the process is busy handling sockets or timeouts(or even
-    signals) of the same or higher priority it will not be triggered. But when
-    the process is in idle(or only lower-priority watchers are pending), the
-    <classname>EvIdle</classname>
-    watchers are being called once per event loop iteration - until stopped,
-    that is, or the process receives more events and becomes busy again with
-    higher priority stuff.
-   </simpara>
-   <simpara>
-    Apart from keeping the process non-blocking(which is a useful on its own
-    sometimes),
-    <classname>EvIdle</classname>
-    watchers are a good place to do
-    <emphasis>"pseudo-background processing"</emphasis>,
-    or delay processing stuff to after the event loop has handled all
-    outstanding events.
-   </simpara>
-   <simpara>
-    The most noticeable effect is that as long as any
-    <emphasis>idle</emphasis>
-    watchers are active, the process will
-    <emphasis>not</emphasis>
-    block when waiting for new events.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evidle.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvIdle</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvIdle</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-<!--<classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>-->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evidle')/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.evidle')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evidle;
-
-</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/ev/evidle/construct.xml b/reference/ev/evidle/construct.xml
deleted file mode 100644
index 487c5a2af6f6..000000000000
--- a/reference/ev/evidle/construct.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evidle.construct">
- <refnamediv>
-  <refname>EvIdle::__construct</refname>
-  <refpurpose>Constructs the EvIdle watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvIdle::__construct</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs the EvIdle watcher object and starts the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIdle::createStopped</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::idle</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/ev/evidle/createstopped.xml b/reference/ev/evidle/createstopped.xml
deleted file mode 100644
index 9ddb7683209b..000000000000
--- a/reference/ev/evidle/createstopped.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evidle.createstopped">
- <refnamediv>
-  <refname>EvIdle::createStopped</refname>
-  <refpurpose>Creates instance of a stopped EvIdle watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>object</type>
-   <methodname>EvIdle::createStopped</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>EvIdle::__construct</methodname>,
-   but doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvIdle object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIdle::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::idle</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/ev/evio.xml b/reference/ev/evio.xml
deleted file mode 100644
index 3357cb6622db..000000000000
--- a/reference/ev/evio.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.evio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" role="class">
- <title>The EvIo class</title>
- <titleabbrev>EvIo</titleabbrev>
- <partintro>
-  <section xml:id="evio.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvIo</classname>
-    watchers check whether a file descriptor(or socket, or a stream castable
-    to numeric file descriptor) is readable or writable in each iteration of
-    the event loop, or, more precisely, when reading would not block the
-    process and writing would at least be able to write some data. This
-    behaviour is called
-    <emphasis>level-triggering</emphasis>
-    because events are kept receiving as long as the condition persists. To
-    stop receiving events just stop the watcher.
-   </simpara>
-   <simpara>
-    The number of read and/or write event watchers per
-    <parameter>fd</parameter>
-    is unlimited. Setting all file descriptors to non-blocking mode is also
-    usually a good idea(but not required).
-   </simpara>
-   <simpara>
-    Another thing to watch out for is that it is quite easy to receive false
-    readiness notifications, i.e. the callback might be called with
-    <constant>Ev::READ</constant>
-    but a subsequent
-    <emphasis>read()</emphasis>
-    will actually block because there is no data. It is very easy to get into
-    this situation. Thus it is best to always use non-blocking I/O: An extra
-    <emphasis>read()</emphasis>
-    returning
-    <constant>EAGAIN</constant>
-    (or similar) is far preferable to a program hanging until some data
-    arrives.
-   </simpara>
-   <simpara>
-    If for some reason it is impossible to run the
-    <parameter>fd</parameter>
-    in non-blocking mode, then separately re-test whether a file descriptor is
-    really ready. Some people additionally use
-    <constant>SIGALRM</constant>
-    and an interval timer, just to be sure they won't block infinitely.
-   </simpara>
-   <simpara>
-    Always consider using non-blocking mode.
-   </simpara>
-  </section>
-
-  <section xml:id="evio.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass>
-     <classname>EvIo</classname>
-    </ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvIo</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evio.props.fd">fd</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evio.props.events">events</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evio')/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.evio')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-
-  </section>
-  <section xml:id="evio.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evio.props.fd">
-     <term>
-      <varname>fd</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evio.props.events">
-     <term>
-      <varname>events</varname>
-     </term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
- </partintro>
-
- &reference.ev.entities.evio;
-
-</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/ev/evio/construct.xml b/reference/ev/evio/construct.xml
deleted file mode 100644
index 3e8c480335c3..000000000000
--- a/reference/ev/evio/construct.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evio.construct">
- <refnamediv>
-  <refname>EvIo::__construct</refname>
-  <refpurpose>Constructs EvIo watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvIo::__construct</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs EvIo watcher object and starts the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Can be a stream opened with
-      <function>fopen</function>
-      or similar functions, numeric file descriptor, or socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <constant>Ev::READ</constant>
-      and/or
-      <constant>Ev::WRITE</constant>.
-      See
-      <link linkend="ev.constants.watcher-revents">the bit masks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIo::createStopped</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::io</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/ev/evio/createstopped.xml b/reference/ev/evio/createstopped.xml
deleted file mode 100644
index fc8de557c439..000000000000
--- a/reference/ev/evio/createstopped.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evio.createstopped">
- <refnamediv>
-  <refname>EvIo::createStopped</refname>
-  <refpurpose>Create stopped EvIo watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvIo</type>
-   <methodname>EvIo::createStopped</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>EvIo::__construct</methodname>,
-   but doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvIo::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvIo::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvIo object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIo::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvLoop::io</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/ev/evio/set.xml b/reference/ev/evio/set.xml
deleted file mode 100644
index 42d150e46a5a..000000000000
--- a/reference/ev/evio/set.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evio.set">
- <refnamediv>
-  <refname>EvIo::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvIo::set</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures the EvIo watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvIo::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same as for
-      <methodname>EvIo::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evloop.xml b/reference/ev/evloop.xml
deleted file mode 100644
index 16d6f8b8e278..000000000000
--- a/reference/ev/evloop.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evloop" role="class">
- <title>The EvLoop class</title>
- <titleabbrev>EvLoop</titleabbrev>
- <partintro>
-<!-- {{{ EvLoop intro -->
-  <section xml:id="evloop.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents an event loop that is always distinct from the
-    <emphasis>default
-    loop</emphasis>.
-    Unlike the
-    <emphasis>default loop</emphasis>,
-    it cannot handle
-    <classname>EvChild</classname>
-    watchers.
-   </simpara>
-   <simpara>
-    Having threads we have to create a loop per thread, and use the
-    <emphasis>default loop</emphasis>
-    in the parent thread.
-   </simpara>
-   <simpara>
-    The
-    <emphasis>default event loop</emphasis>
-    is initialized automatically by
-    <emphasis>Ev</emphasis>.
-    It is accessible via methods of the
-    <classname>Ev</classname>
-    class, or via
-    <methodname>EvLoop::defaultLoop</methodname>
-    method.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evloop.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvLoop</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EvLoop</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.data">data</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.backend">backend</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.is-default-loop">is_default_loop</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.iteration">iteration</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.pending">pending</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.io-interval">io_interval</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.timeout-interval">timeout_interval</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evloop.props.depth">depth</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evloop')/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.evloop')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvLoop properties -->
-  <section xml:id="evloop.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evloop.props.data">
-     <term>
-      <varname>data</varname>
-     </term>
-     <listitem>
-      <simpara>
-       Custom data attached to loop
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.backend">
-     <term>
-      <varname>backend</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       The
-       <link linkend="ev.constants.watcher-backends">backend flags</link>
-       indicating the event backend in use.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.is-default-loop">
-     <term>
-      <varname>is_default_loop</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       &true; if it is the default event loop.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.iteration">
-     <term>
-      <varname>iteration</varname>
-     </term>
-     <listitem>
-      <simpara>
-       The current iteration count of the loop. See
-       <methodname>Ev::iteration</methodname>
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.pending">
-     <term>
-      <varname>pending</varname>
-     </term>
-     <listitem>
-      <simpara>
-       The number of pending watchers.
-       <literal>0</literal>
-       indicates that there are no watchers pending.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.io-interval">
-     <term>
-      <varname>io_interval</varname>
-     </term>
-     <listitem>
-      <simpara>
-       Higher
-       <varname>io_interval</varname>
-       allows
-       <emphasis>libev</emphasis>
-       to spend more time collecting
-       <classname>EvIo</classname>
-       events, so more events can be handled per iteration, at the cost of
-       increasing latency. Timeouts (both
-       <classname>EvPeriodic</classname>
-       and
-       <classname>EvTimer</classname>)
-       will not be affected. Setting this to a non-zero value will introduce
-       an additional
-       <literal>sleep()</literal>
-       call into most loop iterations. The sleep time ensures that
-       <emphasis>libev</emphasis>
-       will not poll for
-       <classname>EvIo</classname>
-       events more often than once per this interval, on average. Many
-       programs can usually benefit by setting the
-       <varname>io_interval</varname>
-       to a value near
-       <literal>0.1</literal>,
-       which is often enough for interactive servers(not for games). It
-       usually doesn't make much sense to set it to a lower value than
-       <literal>0.01</literal>,
-       as this approaches the timing granularity of most systems.
-      </simpara>
-      <simpara>
-       See also
-       <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#FUNCTIONS_CONTROLLING_EVENT_LOOPS">FUNCTIONS
-      CONTROLLING EVENT LOOPS</link>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.timeout-interval">
-     <term>
-      <varname>timeout_interval</varname>
-     </term>
-     <listitem>
-      <simpara>
-       Higher
-       <varname>timeout_interval</varname>
-       allows
-       <emphasis>libev</emphasis>
-       to spend more time collecting timeouts, at the expense of increased
-       latency/jitter/inexactness(the watcher callback will be called later).
-       <classname>EvIo</classname>
-       watchers will not be affected. Setting this to a non-null value will
-       not introduce any overhead in
-       <emphasis>libev</emphasis>.
-       See also
-       <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#FUNCTIONS_CONTROLLING_EVENT_LOOPS">FUNCTIONS
-      CONTROLLING EVENT LOOPS</link>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evloop.props.depth">
-     <term>
-      <varname>depth</varname>
-     </term>
-     <listitem>
-      <simpara>
-       The recursion depth. See
-       <methodname>Ev::depth</methodname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evloop;
-
-</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/ev/evloop/backend.xml b/reference/ev/evloop/backend.xml
deleted file mode 100644
index b33378d9b074..000000000000
--- a/reference/ev/evloop/backend.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.backend">
- <refnamediv>
-  <refname>EvLoop::backend</refname>
-  <refpurpose>Returns an integer describing the backend used by libev</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EvLoop::backend</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   The same as
-   <methodname>Ev::backend</methodname>,
-   but for the loop instance.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer describing the backend used by libev. See
-   <methodname>Ev::backend</methodname>.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::backend</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/ev/evloop/check.xml b/reference/ev/evloop/check.xml
deleted file mode 100644
index 974b4a66f4f4..000000000000
--- a/reference/ev/evloop/check.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.check">
- <refnamediv>
-  <refname>EvLoop::check</refname>
-  <refpurpose>Creates EvCheck object associated with the current event loop
-  instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvCheck</type>
-   <methodname>EvLoop::check</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvCheck object associated with the current event loop instance.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvCheck::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvCheck object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvCheck::__construct</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/ev/evloop/child.xml b/reference/ev/evloop/child.xml
deleted file mode 100644
index c0fce351476e..000000000000
--- a/reference/ev/evloop/child.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.child">
- <refnamediv>
-  <refname>EvLoop::child</refname>
-  <refpurpose>Creates EvChild object associated with the current event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvChild</type>
-   <methodname>EvLoop::child</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>pid</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>trace</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvChild object associated with the current event loop.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvChild::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvChild object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvChild::__construct</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/ev/evloop/construct.xml b/reference/ev/evloop/construct.xml
deleted file mode 100644
index aefec801fafa..000000000000
--- a/reference/ev/evloop/construct.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.construct">
- <refnamediv>
-  <refname>EvLoop::__construct</refname>
-  <refpurpose>Constructs the event loop object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvLoop::__construct</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>NULL</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>io_interval</parameter>
-    <initializer>0.0</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>timeout_interval</parameter>
-    <initializer>0.0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs the event loop object.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      One of the
-      <link linkend="ev.constants.loop-flags">event loop flags</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the loop.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>io_interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="evloop.props.io-interval">io_interval</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>timeout_interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="evloop.props.timeout-interval">timeout_interval</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::defaultLoop</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/ev/evloop/defaultloop.xml b/reference/ev/evloop/defaultloop.xml
deleted file mode 100644
index b8b33a0bfcf5..000000000000
--- a/reference/ev/evloop/defaultloop.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.defaultloop">
- <refnamediv>
-  <refname>EvLoop::defaultLoop</refname>
-  <refpurpose>Returns or creates the default event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvLoop</type>
-   <methodname>EvLoop::defaultLoop</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>flags</parameter>
-    <initializer>Ev::FLAG_AUTO</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>NULL</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>io_interval</parameter>
-    <initializer>0.</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>timeout_interval</parameter>
-    <initializer>0.</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the default event loop is not created,
-   <methodname>EvLoop::defaultLoop</methodname>
-   creates it with the specified parameters. Otherwise, it just returns the
-   object representing previously created instance ignoring all the
-   parameters.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      One of the
-      <link linkend="ev.constants.loop-flags">event loop flags</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data to associate with the loop.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>io_collect_interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="evloop.props.io-interval">io_interval</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>timeout_collect_interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="evloop.props.timeout-interval">timeout_interval</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvLoop object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::__construct</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/ev/evloop/embed.xml b/reference/ev/evloop/embed.xml
deleted file mode 100644
index 2381fde9cafc..000000000000
--- a/reference/ev/evloop/embed.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.embed">
- <refnamediv>
-  <refname>EvLoop::embed</refname>
-  <refpurpose>Creates an instance of EvEmbed watcher associated
-  with the current EvLoop object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvEmbed</type>
-   <methodname>EvLoop::embed</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>other</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates an instance of
-   <classname>EvEmbed</classname>
-   watcher associated with the current
-   <classname>EvLoop</classname>
-   object.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvEmbed::__construct</methodname>.
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvEmbed object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvEmbed::__construct</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/ev/evloop/fork.xml b/reference/ev/evloop/fork.xml
deleted file mode 100644
index 469fe23889b2..000000000000
--- a/reference/ev/evloop/fork.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.fork">
- <refnamediv>
-  <refname>EvLoop::fork</refname>
-  <refpurpose>Creates EvFork watcher object associated with the current event
-  loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvFork</type>
-   <methodname>EvLoop::fork</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvFork watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvFork::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvFork object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvFork::__construct</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/ev/evloop/idle.xml b/reference/ev/evloop/idle.xml
deleted file mode 100644
index b24a239681ad..000000000000
--- a/reference/ev/evloop/idle.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.idle">
- <refnamediv>
-  <refname>EvLoop::idle</refname>
-  <refpurpose>Creates EvIdle watcher object associated with the current event
-  loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvIdle</type>
-   <methodname>EvLoop::idle</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvIdle watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All the parameters have the same meaning as for
-   <methodname>EvIdle::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvIdle object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIdle::__construct</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/ev/evloop/invokepending.xml b/reference/ev/evloop/invokepending.xml
deleted file mode 100644
index 3958e7e49bb6..000000000000
--- a/reference/ev/evloop/invokepending.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.invokepending">
- <refnamediv>
-  <refname>EvLoop::invokePending</refname>
-  <refpurpose>Invoke all pending watchers while resetting their pending state</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::invokePending</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Invoke all pending watchers while resetting their pending state.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evloop/io.xml b/reference/ev/evloop/io.xml
deleted file mode 100644
index 7d00537600b4..000000000000
--- a/reference/ev/evloop/io.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.io">
- <refnamediv>
-  <refname>EvLoop::io</refname>
-  <refpurpose>Create EvIo watcher object associated with the current event
-  loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvIo</type>
-   <methodname>EvLoop::io</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Create EvIo watcher object associated with the current event loop instance.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvIo::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvIo object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvIo::__construct</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/ev/evloop/loopfork.xml b/reference/ev/evloop/loopfork.xml
deleted file mode 100644
index 9606fb19c392..000000000000
--- a/reference/ev/evloop/loopfork.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.loopfork">
- <refnamediv>
-  <refname>EvLoop::loopFork</refname>
-  <refpurpose>Must be called after a fork</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::loopFork</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Must be called after a
-   <emphasis>fork</emphasis>
-   in the child, before entering or continuing the event loop. An alternative
-   is to use
-   <constant>Ev::FLAG_FORKCHECK</constant>
-   which calls this function automatically, at some performance loss (refer to
-   the
-   <link xlink:href="http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#FUNCTIONS_CONTROLLING_EVENT_LOOPS">libev
-  documentation</link>
-   ).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evloop/now.xml b/reference/ev/evloop/now.xml
deleted file mode 100644
index f56958642b6d..000000000000
--- a/reference/ev/evloop/now.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.now">
- <refnamediv>
-  <refname>EvLoop::now</refname>
-  <refpurpose>Returns the current "event loop time"</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>float</type>
-   <methodname>EvLoop::now</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the current "event loop time", which is the time the event loop
-   received events and started processing them. This timestamp does not change
-   as long as callbacks are being processed, and this is also the base time
-   used for relative timers. You can treat it as the timestamp of the event
-   occurring(or more correctly, libev finding out about it).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns time of the event loop in (fractional) seconds.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::now</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/ev/evloop/nowupdate.xml b/reference/ev/evloop/nowupdate.xml
deleted file mode 100644
index c74694feaddc..000000000000
--- a/reference/ev/evloop/nowupdate.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.nowupdate">
- <refnamediv>
-  <refname>EvLoop::nowUpdate</refname>
-  <refpurpose>Establishes the current time by querying the kernel, updating the time
-    returned by EvLoop::now in the progress</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::nowUpdate</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Establishes the current time by querying the kernel, updating the time
-   returned by
-   <methodname>EvLoop::now</methodname>
-   in the progress. This is a costly operation and is usually done
-   automatically within
-   <methodname>EvLoop::run</methodname>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::now</methodname>
-   </member>
-   <member>
-    <methodname>Ev::nowUpdate</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/ev/evloop/periodic.xml b/reference/ev/evloop/periodic.xml
deleted file mode 100644
index 0b043ccfbbed..000000000000
--- a/reference/ev/evloop/periodic.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.periodic">
- <refnamediv>
-  <refname>EvLoop::periodic</refname>
-  <refpurpose>Creates EvPeriodic watcher object associated with the current
-  event loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvPeriodic</type>
-   <methodname>EvLoop::periodic</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>offset</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvPeriodic watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvPeriodic::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvPeriodic object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvPeriodic::__construct</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/ev/evloop/prepare.xml b/reference/ev/evloop/prepare.xml
deleted file mode 100644
index cae9278deff9..000000000000
--- a/reference/ev/evloop/prepare.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.prepare">
- <refnamediv>
-  <refname>EvLoop::prepare</refname>
-  <refpurpose>Creates EvPrepare watcher object associated with the current
-  event loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvPrepare</type>
-   <methodname>EvLoop::prepare</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvPrepare watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvPrepare</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvPrepare object on success
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvPrepare::__construct</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/ev/evloop/resume.xml b/reference/ev/evloop/resume.xml
deleted file mode 100644
index d1e6f65cbdce..000000000000
--- a/reference/ev/evloop/resume.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.resume">
- <refnamediv>
-  <refname>EvLoop::resume</refname>
-  <refpurpose>Resume previously suspended default event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::resume</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>EvLoop::suspend</methodname>
-   and
-   <methodname>EvLoop::resume</methodname>
-   methods suspend and resume a loop correspondingly.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::suspend</methodname>
-   </member>
-   <member>
-    <methodname>Ev::resume</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/ev/evloop/run.xml b/reference/ev/evloop/run.xml
deleted file mode 100644
index ddf0a96649f6..000000000000
--- a/reference/ev/evloop/run.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.run">
- <refnamediv>
-  <refname>EvLoop::run</refname>
-  <refpurpose>Begin checking for events and calling callbacks for the loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::run</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>flags</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Begin checking for events and calling callbacks for the current event loop.
-   Returns when a callback calls
-   <methodname>Ev::stop</methodname>
-   method, or the flags are nonzero(in which case the return value is true) or
-   when there are no active watchers which reference the loop(
-   <methodname>EvWatcher::keepalive</methodname>
-   is &true;), in which case the return value will be &false;. The return
-   value can generally be interpreted as
-   <emphasis>if &true;, there is more work left
-  to do</emphasis>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      Optional parameter
-      <parameter>flags</parameter>
-      can be one of the following:
-      <table>
-       <title>
-         List for possible values of <parameter>flags</parameter>
-       </title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>
-           <parameter>flags</parameter>
-          </entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>0</literal>
-          </entry>
-          <entry>The default behavior described above</entry>
-         </row>
-         <row>
-          <entry>
-           <constant>Ev::RUN_ONCE</constant>
-          </entry>
-          <entry>Block at most one(wait, but don't loop)</entry>
-         </row>
-         <row>
-          <entry>
-           <constant>Ev::RUN_NOWAIT</constant>
-          </entry>
-          <entry>Don't block at all(fetch/handle events, but don't wait)</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     <simpara>
-      See
-      <link linkend="ev.constants.run-flags">the run flag
-       constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::stop</methodname>
-   </member>
-   <member>
-    <methodname>Ev::run</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/ev/evloop/signal.xml b/reference/ev/evloop/signal.xml
deleted file mode 100644
index 7fc7bef27892..000000000000
--- a/reference/ev/evloop/signal.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.signal">
- <refnamediv>
-  <refname>EvLoop::signal</refname>
-  <refpurpose>Creates EvSignal watcher object associated with the current
-  event loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvSignal</type>
-   <methodname>EvLoop::signal</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvSignal watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvSignal::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvSignal object on success
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvSignal::__construct</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/ev/evloop/stat.xml b/reference/ev/evloop/stat.xml
deleted file mode 100644
index fec53ab33af8..000000000000
--- a/reference/ev/evloop/stat.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.stat">
- <refnamediv>
-  <refname>EvLoop::stat</refname>
-  <refpurpose>Creates EvStat watcher object associated with the current event
-  loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvStat</type>
-   <methodname>EvLoop::stat</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>path</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvStat watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvSignal::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvStat object on success
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvSignal::__construct</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/ev/evloop/stop.xml b/reference/ev/evloop/stop.xml
deleted file mode 100644
index ccda96df3296..000000000000
--- a/reference/ev/evloop/stop.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.stop">
- <refnamediv>
-  <refname>EvLoop::stop</refname>
-  <refpurpose>Stops the event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::stop</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>how</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stops the event loop
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>how</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      One of
-      <emphasis>Ev::BREAK_*</emphasis>
-      <link linkend="ev.constants.break-flags">constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::run</methodname>
-   </member>
-   <member>
-    <methodname>Ev::stop</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/ev/evloop/suspend.xml b/reference/ev/evloop/suspend.xml
deleted file mode 100644
index 729e2da69064..000000000000
--- a/reference/ev/evloop/suspend.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.suspend">
- <refnamediv>
-  <refname>EvLoop::suspend</refname>
-  <refpurpose>Suspend the loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::suspend</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>EvLoop::suspend</methodname>
-   and
-   <methodname>EvLoop::resume</methodname>
-   methods suspend and resume a loop correspondingly.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvLoop::resume</methodname>
-   </member>
-   <member>
-    <methodname>Ev::suspend</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/ev/evloop/timer.xml b/reference/ev/evloop/timer.xml
deleted file mode 100644
index d52d2c7b4024..000000000000
--- a/reference/ev/evloop/timer.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.timer">
- <refnamediv>
-  <refname>EvLoop::timer</refname>
-  <refpurpose>Creates EvTimer watcher object associated with the current event
-  loop instance</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <type>EvTimer</type>
-   <methodname>EvLoop::timer</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>after</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>repeat</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvTimer watcher object associated with the current event loop
-   instance
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <simpara>
-   All parameters have the same meaning as for
-   <methodname>EvTimer::__construct</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvTimer object on success
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvTimer::__construct</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/ev/evloop/verify.xml b/reference/ev/evloop/verify.xml
deleted file mode 100644
index 1d353260b36b..000000000000
--- a/reference/ev/evloop/verify.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evloop.verify">
- <refnamediv>
-  <refname>EvLoop::verify</refname>
-  <refpurpose>Performs internal consistency checks(for debugging)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvLoop::verify</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Performs internal consistency checks(for debugging
-   <emphasis>libev</emphasis>)
-   and abort the program if any data structures were found to be corrupted.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Ev::verify</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/ev/evperiodic.xml b/reference/ev/evperiodic.xml
deleted file mode 100644
index a254c4547f0d..000000000000
--- a/reference/ev/evperiodic.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evperiodic" role="class">
- <title>The EvPeriodic class</title>
- <titleabbrev>EvPeriodic</titleabbrev>
- <partintro>
-<!-- {{{ EvPeriodic intro -->
-  <section xml:id="evperiodic.intro">
-   &reftitle.intro;
-  <simpara>
-    Periodic watchers are also timers of a kind, but they are very versatile.
-   </simpara>
-   <simpara>
-    Unlike
-    <classname>EvTimer</classname>,
-    <classname>EvPeriodic</classname>
-    watchers are not based on real time(or relative time, the physical time
-    that passes) but on wall clock time(absolute time, calendar or clock). The
-    difference is that wall clock time can run faster or slower than real
-    time, and time jumps are not uncommon(e.g. when adjusting it).
-   </simpara>
-   <simpara>
-    <classname>EvPeriodic</classname>
-    watcher can be configured to trigger after some specific point in time.
-    For example, if an
-    <classname>EvPeriodic</classname>
-    watcher is configured to trigger
-    <emphasis>"in 10 seconds"</emphasis>
-    (e.g.
-    <methodname>EvLoop::now</methodname>
-    +
-    <literal>10.0</literal>,
-    i.e. an absolute time, not a delay), and the system clock is reset to
-    <emphasis>January of the previous year</emphasis>,
-    then it will take a year or more to trigger the event (unlike an
-    <classname>EvTimer</classname>,
-    which would still trigger roughly
-    <literal>10</literal>
-    seconds after starting it as it uses a relative timeout).
-   </simpara>
-   <simpara>
-    As with timers, the callback is guaranteed to be invoked only when the
-    point in time where it is supposed to trigger has passed. If multiple
-    timers become ready during the same loop iteration then the ones with
-    earlier time-out values are invoked before ones with later time-out values
-    (but this is no longer true when a callback calls
-    <methodname>EvLoop::run</methodname>
-    recursively).
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evperiodic.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvPeriodic</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvPeriodic</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evperiodic.props.offset">offset</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evperiodic.props.interval">interval</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evperiodic')/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.evperiodic')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvPeriodic properties -->
-  <section xml:id="evperiodic.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evperiodic.props.offset">
-     <term>
-      <varname>offset</varname>
-     </term>
-     <listitem>
-      <simpara>
-       When repeating, this contains the offset value, otherwise this is the
-       absolute point in time(the offset value passed to
-       <methodname>EvPeriodic::set</methodname>,
-       although
-       <emphasis>libev</emphasis>
-       might modify this value for better numerical stability).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evperiodic.props.interval">
-     <term>
-      <varname>interval</varname>
-     </term>
-     <listitem>
-      <simpara>
-       The current interval value. Can be modified any time, but changes only
-       take effect when the periodic timer fires or
-       <methodname>EvPeriodic::again</methodname>
-       is being called.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evperiodic;
-
-</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/ev/evperiodic/again.xml b/reference/ev/evperiodic/again.xml
deleted file mode 100644
index 1722165b3be7..000000000000
--- a/reference/ev/evperiodic/again.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evperiodic.again">
- <refnamediv>
-  <refname>EvPeriodic::again</refname>
-  <refpurpose>Simply stops and restarts the periodic watcher again</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvPeriodic::again</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Simply stops and restarts the periodic watcher again. This is only useful
-   when attributes are changed.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvTimer::again</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/ev/evperiodic/at.xml b/reference/ev/evperiodic/at.xml
deleted file mode 100644
index bd7432c2a27a..000000000000
--- a/reference/ev/evperiodic/at.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evperiodic.at">
- <refnamediv>
-  <refname>EvPeriodic::at</refname>
-  <refpurpose>Returns the absolute time that this
-  watcher is supposed to trigger next</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>float</type>
-   <methodname>EvPeriodic::at</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   When the watcher is active, returns the absolute time that this watcher is
-   supposed to trigger next. This is not the same as the offset argument to
-   <methodname>EvPeriodic::set</methodname>
-   or
-   <methodname>EvPeriodic::__construct</methodname>,
-   but indeed works even in interval mode.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the absolute time this watcher is supposed to trigger next in
-   seconds.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evperiodic/construct.xml b/reference/ev/evperiodic/construct.xml
deleted file mode 100644
index 81cfc7f86166..000000000000
--- a/reference/ev/evperiodic/construct.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evperiodic.construct">
- <refnamediv>
-  <refname>EvPeriodic::__construct</refname>
-  <refpurpose>Constructs EvPeriodic watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvPeriodic::__construct</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>offset</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>reschedule_cb</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs EvPeriodic watcher object and starts it automatically.
-   <methodname>EvPeriodic::createStopped</methodname>
-   method creates stopped periodic watcher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>offset</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reschedule_cb</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Reschedule callback. You can pass &null;. See
-      <link linkend="ev.periodic-modes">Periodic watcher operation
-     modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-
- <example>
-   <title>Periodic timer. Use reschedule callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Tick each 10.5 seconds
-
-function reschedule_cb ($watcher, $now) {
- return $now + (10.5 - fmod($now, 10.5));
-}
-
-$w = new EvPeriodic(0., 0., "reschedule_cb", function ($w, $revents) {
- echo time(), PHP_EOL;
-});
-Ev::run();
-?>
-
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Periodic timer. Tick every 10.5 seconds starting at now</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Tick every 10.5 seconds starting at now
-$w = new EvPeriodic(fmod(Ev::now(), 10.5), 10.5, NULL, function ($w, $revents) {
- echo time(), PHP_EOL;
-});
-Ev::run();
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Hourly watcher</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$hourly = EvPeriodic(0, 3600, NULL, function () {
- echo "once per hour\n";
-});
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-   </member>
-   <member>
-    <classname>EvTimer</classname>
-   </member>
-   <member>
-    <methodname>EvPeriodic::createStopped</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/ev/evperiodic/createstopped.xml b/reference/ev/evperiodic/createstopped.xml
deleted file mode 100644
index ffe4491d6021..000000000000
--- a/reference/ev/evperiodic/createstopped.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evperiodic.createstopped">
- <refnamediv>
-  <refname>EvPeriodic::createStopped</refname>
-  <refpurpose>Create a stopped EvPeriodic watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvPeriodic</type>
-   <methodname>EvPeriodic::createStopped</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>offset</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>reschedule_cb</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Create EvPeriodic object. Unlike
-   <methodname>EvPeriodic::__construct</methodname>
-   this method doesn&apos;t start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>offset</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reschedule_cb</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Reschedule callback. You can pass &null;. See
-      <link linkend="ev.periodic-modes">Periodic watcher operation
-     modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvPeriodic watcher object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvPeriodic::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvTimer::createStopped</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/ev/evperiodic/set.xml b/reference/ev/evperiodic/set.xml
deleted file mode 100644
index 152b2c2148e8..000000000000
--- a/reference/ev/evperiodic/set.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evperiodic.set">
- <refnamediv>
-  <refname>EvPeriodic::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvPeriodic::set</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>offset</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   (Re-)Configures EvPeriodic watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>offset</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same meaning as for
-      <methodname>EvPeriodic::__construct</methodname>.
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The same meaning as for
-      <methodname>EvPeriodic::__construct</methodname>.
-      See
-      <link linkend="ev.periodic-modes">Periodic watcher operation modes</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evprepare.xml b/reference/ev/evprepare.xml
deleted file mode 100644
index dbfc7b3fe12f..000000000000
--- a/reference/ev/evprepare.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.evprepare" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EvPrepare class</title>
- <titleabbrev>EvPrepare</titleabbrev>
- <partintro>
-<!-- {{{ EvPrepare intro -->
-  <section xml:id="evprepare.intro">
-   <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evcheck.intro')/*)" />
-  </section>
-<!-- }}} -->
-  <section xml:id="evprepare.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvPrepare</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvPrepare</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-<!--<classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>-->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)" />
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evprepare')/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.evprepare')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
- &reference.ev.entities.evprepare;
-
-</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/ev/evprepare/construct.xml b/reference/ev/evprepare/construct.xml
deleted file mode 100644
index c7f6f35a5d23..000000000000
--- a/reference/ev/evprepare/construct.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evprepare.construct">
- <refnamediv>
-  <refname>EvPrepare::__construct</refname>
-  <refpurpose>Constructs EvPrepare watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvPrepare::__construct</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs EvPrepare watcher object. And starts the watcher automatically.
-   If a stopped watcher is needed, consider using
-   <methodname>EvPrepare::createStopped</methodname>
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EvCheck</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/ev/evprepare/createstopped.xml b/reference/ev/evprepare/createstopped.xml
deleted file mode 100644
index 833f8235da70..000000000000
--- a/reference/ev/evprepare/createstopped.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evprepare.createstopped">
- <refnamediv>
-  <refname>EvPrepare::createStopped</refname>
-  <refpurpose>Creates a stopped instance of EvPrepare watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvPrepare</type>
-   <methodname>EvPrepare::createStopped</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a stopped instance of EvPrepare watcher. Unlike
-   <methodname>EvPrepare::__construct</methodname>,
-   this method doesn&apos;t start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvPrepare object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvPrepare::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvWatcher::start</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/ev/evsignal.xml b/reference/ev/evsignal.xml
deleted file mode 100644
index e7782ad09db3..000000000000
--- a/reference/ev/evsignal.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evsignal" role="class">
- <title>The EvSignal class</title>
- <titleabbrev>EvSignal</titleabbrev>
- <partintro>
-<!-- {{{ EvSignal intro -->
-  <section xml:id="evsignal.intro">
-   &reftitle.intro;
-  <simpara>
-    <classname>EvSignal</classname>
-    watchers will trigger an event when the process receives a specific signal
-    one or more times. Even though signals are very asynchronous,
-    <emphasis>libev</emphasis>
-    will try its best to deliver signals synchronously, i.e. as part of the
-    normal event processing, like any other event.
-   </simpara>
-   <simpara>
-    There is no limit for the number of watchers for the same signal, but only
-    within the same loop, i.e. one can watch for
-    <constant>SIGINT</constant>
-    in the default loop and for
-    <constant>SIGIO</constant>
-    in another loop, but it is not allowed to watch for
-    <constant>SIGINT</constant>
-    in both the default loop and another loop at the same time. At the moment,
-    <constant>SIGCHLD</constant>
-    is permanently tied to the default loop.
-   </simpara>
-   <simpara>
-    If possible and supported,
-    <emphasis>libev</emphasis>
-    will install its handlers with
-    <literal>SA_RESTART</literal>
-    (or equivalent) behaviour enabled, so system calls should not be unduly
-    interrupted. In case of a problem with system calls getting interrupted by
-    signals, all the signals can be blocked in an
-    <classname>EvCheck</classname>
-    watcher and unblocked in a
-    <classname>EvPrepare</classname>
-    watcher.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evsignal.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvSignal</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvSignal</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evsignal.props.signum">signum</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evsignal')/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.evsignal')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvSignal properties -->
-  <section xml:id="evsignal.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evsignal.props.signum">
-     <term>
-      <varname>signum</varname>
-     </term>
-     <listitem>
-      <simpara>
-       Signal number. See the constants exported by
-       <emphasis>pcntl</emphasis>
-       extension. See also
-       <literal>signal(7)</literal>
-       man page.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evsignal;
-
-</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/ev/evsignal/construct.xml b/reference/ev/evsignal/construct.xml
deleted file mode 100644
index ec996fb33cc0..000000000000
--- a/reference/ev/evsignal/construct.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evsignal.construct">
- <refnamediv>
-  <refname>EvSignal::__construct</refname>
-  <refpurpose>Constructs EvSignal watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvSignal::__construct</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs EvSignal watcher object and starts it automatically. For a
-   stopped signal watcher consider using
-   <methodname>EvSignal::createStopped</methodname>
-   method.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Signal number. See constants exported by
-      <emphasis>pcntl</emphasis>
-      extension. See also
-      <literal>signal(7)</literal>
-      man page.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Handle SIGTERM signal</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$w = new EvSignal(SIGTERM, function ($watcher) {
-    echo "SIGTERM received\n";
-    $watcher->stop();
-});
-
-Ev::run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvSignal::createStopped</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/ev/evsignal/createstopped.xml b/reference/ev/evsignal/createstopped.xml
deleted file mode 100644
index 8d3ea025f401..000000000000
--- a/reference/ev/evsignal/createstopped.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evsignal.createstopped">
- <refnamediv>
-  <refname>EvSignal::createStopped</refname>
-  <refpurpose>Create stopped EvSignal watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvSignal</type>
-   <methodname>EvSignal::createStopped</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Create stopped EvSignal watcher object. Unlike
-   <methodname>EvSignal::__construct</methodname>,
-   this method doesn&apos;t start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Signal number. See constants exported by
-      <emphasis>pcntl</emphasis>
-      extension. See also
-      <literal>signal(7)</literal>
-      man page.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvSignal object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvWatcher::start</methodname>
-   </member>
-   <member>
-    <methodname>EvSignal::__construct</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/ev/evsignal/set.xml b/reference/ev/evsignal/set.xml
deleted file mode 100644
index 5875cbf0d2f8..000000000000
--- a/reference/ev/evsignal/set.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evsignal.set">
- <refnamediv>
-  <refname>EvSignal::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvSignal::set</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures the watcher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Signal number. The same as for
-      <methodname>EvSignal::__construct</methodname>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evstat.xml b/reference/ev/evstat.xml
deleted file mode 100644
index 673aafe68da1..000000000000
--- a/reference/ev/evstat.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evstat" role="class">
- <title>The EvStat class</title>
- <titleabbrev>EvStat</titleabbrev>
- <partintro>
-<!-- {{{ EvStat intro -->
-  <section xml:id="evstat.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvStat</classname>
-    monitors a file system path for attribute changes. It calls
-    <emphasis>stat()</emphasis>
-    on that path in regular intervals (or when the OS signals it changed) and
-    sees if it changed compared to the last time, invoking the callback if it
-    did.
-   </simpara>
-   <simpara>
-    The path does not need to exist: changing from "path exists" to "path does
-    not exist" is a status change like any other. The condition "path does not
-    exist" is signified by the
-    <literal>'nlink'</literal>
-    item being 0(returned by
-    <methodname>EvStat::attr</methodname>
-    method).
-   </simpara>
-   <simpara>
-    The path must not end in a slash or contain special components such as
-    <literal>'.'</literal>
-    or
-    <literal>..</literal>.
-    The path should be absolute: if it is relative and the working directory
-    changes, then the behaviour is undefined.
-   </simpara>
-   <simpara>
-    Since there is no portable change notification interface available, the
-    portable implementation simply calls
-    <emphasis>stat()</emphasis>
-    regularly on the path to see if it changed somehow. For this case a
-    recommended polling interval can be specified. If one specifies a polling
-    interval of
-    <literal>0.0</literal>
-    (highly recommended) then a suitable, unspecified default value will be
-    used(which could be expected to be around 5 seconds, although this might
-    change dynamically).
-    <emphasis>libev</emphasis>
-    will also impose a minimum interval which is currently around
-    <literal>0.1</literal>,
-    but that’s usually overkill.
-   </simpara>
-   <simpara>
-    This watcher type is not meant for massive numbers of
-    <classname>EvStat</classname>
-    watchers, as even with OS-supported change notifications, this can be
-    resource-intensive.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evstat.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvStat</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvStat</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evstat.props.path">path</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evstat.props.interval">interval</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evstat')/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.evstat')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvStat properties -->
-  <section xml:id="evstat.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evstat.props.interval">
-     <term>
-      <varname>interval</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       Hint on how quickly a change is expected to be detected and should
-       normally be specified as
-       <literal>0.0</literal>
-       to let
-       <emphasis>libev</emphasis>
-       choose a suitable value.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evstat.props.path">
-     <term>
-      <varname>path</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       The path to wait for status changes on.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evstat;
-
-</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/ev/evstat/attr.xml b/reference/ev/evstat/attr.xml
deleted file mode 100644
index 2ef7d0272523..000000000000
--- a/reference/ev/evstat/attr.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.attr">
- <refnamediv>
-  <refname>EvStat::attr</refname>
-  <refpurpose>Returns the values most recently detected by Ev</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>array</type>
-   <methodname>EvStat::attr</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns array of the values most recently detected by Ev
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns array with the values most recently detect by Ev(without actual
-   <literal>stat</literal>
-   &apos;ing):
-   <table>
-    <title>
-    List for item keys of the array returned by <methodname>EvStat::attr</methodname>
-    </title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Key</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>
-        <literal>'dev'</literal>
-       </entry>
-       <entry>ID of device containing file</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'ino'</literal>
-       </entry>
-       <entry>inode number</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'mode'</literal>
-       </entry>
-       <entry>protection</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'nlink'</literal>
-       </entry>
-       <entry>number of hard links</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'uid'</literal>
-       </entry>
-       <entry>user ID of owner</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'size'</literal>
-       </entry>
-       <entry>total size, in bytes</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'gid'</literal>
-       </entry>
-       <entry>group ID of owner</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'rdev'</literal>
-       </entry>
-       <entry>device ID (if special file)</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'blksize'</literal>
-       </entry>
-       <entry>blocksize for file system I/O</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'blocks'</literal>
-       </entry>
-       <entry>number of 512B blocks allocated</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'atime'</literal>
-       </entry>
-       <entry>time of last access</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'ctime'</literal>
-       </entry>
-       <entry>time of last status change</entry>
-      </row>
-      <row>
-       <entry>
-        <literal>'mtime'</literal>
-       </entry>
-       <entry>time of last modification</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <simpara>
-   See
-   <literal>stat(2)</literal>
-   man page for details.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Monitor changes of /var/log/messages</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Use 10 second update interval.
-$w = new EvStat("/var/log/messages", 8, function ($w) {
-    echo "/var/log/messages changed\n";
-
-    $attr = $w->attr();
-
-    if ($attr['nlink']) {
-        printf("Current size: %ld\n", $attr['size']);
-        printf("Current atime: %ld\n", $attr['atime']);
-        printf("Current mtime: %ld\n", $attr['mtime']);
-    } else {
-        fprintf(STDERR, "`messages` file is not there!");
-        $w->stop();
-    }
-});
-
-Ev::run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvStat::prev</methodname>
-   </member>
-   <member>
-    <methodname>EvStat::stat</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/ev/evstat/construct.xml b/reference/ev/evstat/construct.xml
deleted file mode 100644
index cea9473da98d..000000000000
--- a/reference/ev/evstat/construct.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.construct">
- <refnamediv>
-  <refname>EvStat::__construct</refname>
-  <refpurpose>Constructs EvStat watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvStat::__construct</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>path</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs EvStat watcher object and starts the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>path</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The path to wait for status changes on.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Hint on how quickly a change is expected to be detected and should
-      normally be specified as
-      <literal>0.0</literal>
-      to let
-      <emphasis>libev</emphasis>
-      choose a suitable value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-
- <example>
-   <title>Monitor changes of /var/log/messages</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Use 10 second update interval.
-$w = new EvStat("/var/log/messages", 10, function ($w) {
-    echo "/var/log/messages changed\n";
-
-    $attr = $w->attr();
-
-    if ($attr['nlink']) {
-        printf("Current size: %ld\n", $attr['size']);
-        printf("Current atime: %ld\n", $attr['atime']);
-        printf("Current mtime: %ld\n", $attr['mtime']);
-    } else {
-        fprintf(STDERR, "`messages` file is not there!");
-        $w->stop();
-    }
-});
-
-?>
-]]>
-   </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/ev/evstat/createstopped.xml b/reference/ev/evstat/createstopped.xml
deleted file mode 100644
index b995d568e664..000000000000
--- a/reference/ev/evstat/createstopped.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.createstopped">
- <refnamediv>
-  <refname>EvStat::createStopped</refname>
-  <refpurpose>Create a stopped EvStat watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>EvStat::createStopped</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>path</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvStat watcher object, but doesn&apos;t start it
-   automatically(unlike
-   <methodname>EvStat::__construct</methodname>
-   ).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>path</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The path to wait for status changes on.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Hint on how quickly a change is expected to be detected and should
-      normally be specified as
-      <literal>0.0</literal>
-      to let
-      <emphasis>libev</emphasis>
-      choose a suitable value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a stopped EvStat watcher object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvStat::__construct</methodname>
-   </member>
-   <member>
-    <methodname>EvWatcher::start</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/ev/evstat/prev.xml b/reference/ev/evstat/prev.xml
deleted file mode 100644
index cca8ba36cd45..000000000000
--- a/reference/ev/evstat/prev.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.prev">
- <refnamediv>
-  <refname>EvStat::prev</refname>
-  <refpurpose>Returns the previous set of values returned by EvStat::attr</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvStat::prev</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Just like
-   <methodname>EvStat::attr</methodname>,
-   but returns the previous set of values.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the same structure as the array returned by
-   <methodname>EvStat::attr</methodname>.
-   The array contains previously detected values.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvStat::attr</methodname>
-   </member>
-   <member>
-    <methodname>EvStat::stat</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/ev/evstat/set.xml b/reference/ev/evstat/set.xml
deleted file mode 100644
index 5ccf10b13222..000000000000
--- a/reference/ev/evstat/set.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.set">
- <refnamediv>
-  <refname>EvStat::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvStat::set</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>path</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>interval</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures the watcher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>path</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The path to wait for status changes on.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>interval</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Hint on how quickly a change is expected to be detected and should
-      normally be specified as
-      <literal>0.0</literal>
-      to let
-      <emphasis>libev</emphasis>
-      choose a suitable value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evstat/stat.xml b/reference/ev/evstat/stat.xml
deleted file mode 100644
index 80e7cec6b703..000000000000
--- a/reference/ev/evstat/stat.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evstat.stat">
- <refnamediv>
-  <refname>EvStat::stat</refname>
-  <refpurpose>Initiates the stat call</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EvStat::stat</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Initiates the stat call(updates internal cache). It stats(using
-   <literal>lstat</literal>)
-   the
-   <varname>path</varname>
-   specified in the watcher and sets to the values found.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if
-   <varname>path</varname>
-   exists. Otherwise &false;.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvStat::attr</methodname>
-   </member>
-   <member>
-    <methodname>EvStat::prev</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/ev/evtimer.xml b/reference/ev/evtimer.xml
deleted file mode 100644
index 35bef355a551..000000000000
--- a/reference/ev/evtimer.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evtimer" role="class">
- <title>The EvTimer class</title>
- <titleabbrev>EvTimer</titleabbrev>
- <partintro>
-<!-- {{{ EvTimer intro -->
-  <section xml:id="evtimer.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvTimer</classname>
-    watchers are simple relative timers that generate an event after a given
-    time, and optionally repeating in regular intervals after that.
-   </simpara>
-   <simpara>
-    The timers are based on real time, that is, if one registers an event that
-    times out after an hour and resets the system clock to
-    <emphasis>January last year</emphasis>,
-    it will still time out after(roughly) one hour. "Roughly" because
-    detecting time jumps is hard, and some inaccuracies are unavoidable.
-   </simpara>
-   <simpara>
-    The callback is guaranteed to be invoked only after its timeout has passed
-    (not at, so on systems with very low-resolution clocks this might
-    introduce a small delay). If multiple timers become ready during the same
-    loop iteration then the ones with earlier time-out values are invoked
-    before ones of the same priority with later time-out values (but this is
-    no longer true when a callback calls
-    <methodname>EvLoop::run</methodname>
-    recursively).
-   </simpara>
-   <simpara>
-    The timer itself will do a best-effort at avoiding drift, that is, if a
-    timer is configured to trigger every
-    <literal>10</literal>
-    seconds, then it will normally trigger at exactly
-    <literal>10</literal>
-    second intervals. If, however, the script cannot keep up with the timer
-    because it takes longer than those
-    <literal>10</literal>
-    seconds to do) the timer will not fire more than once per event loop
-    iteration.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evtimer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvTimer</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EvTimer</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evtimer.props.repeat">repeat</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evtimer.props.remaining">remaining</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('evwatcher.synopsis')/descendant::db:fieldsynopsis)"/>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evtimer')/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.evtimer')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvTimer properties -->
-  <section xml:id="evtimer.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evtimer.props.repeat">
-     <term>
-      <varname>repeat</varname>
-     </term>
-     <listitem>
-      <simpara>
-       If repeat is
-       <literal>0.0</literal>,
-       then it will automatically be stopped once the timeout is reached. If
-       it is positive, then the timer will automatically be configured to
-       trigger again every repeat seconds later, until stopped manually.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evtimer.props.remaining">
-     <term>
-      <varname>remaining</varname>
-     </term>
-     <listitem>
-      <simpara>
-       Returns the remaining time until a timer fires. If the timer is active,
-       then this time is relative to the current event loop time, otherwise
-       it&apos;s the timeout value currently configured.
-      </simpara>
-      <simpara>
-       That is, after instantiating an
-       <classname>EvTimer</classname>
-       with an
-       <parameter>after</parameter>
-       value of
-       <literal>5.0</literal>
-       and
-       <parameter>repeat</parameter>
-       value of
-       <literal>7.0</literal>,
-       <varname>remaining</varname>
-       returns
-       <literal>5.0</literal>.
-       When the timer is started and one second passes,
-       <varname>remaining</varname>
-       will return
-       <literal>4.0</literal>.
-       When the timer expires and is restarted, it will return roughly
-       <literal>7.0</literal>
-       (likely slightly less as callback invocation takes some time too), and
-       so on.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evtimer;
-
-</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/ev/evtimer/again.xml b/reference/ev/evtimer/again.xml
deleted file mode 100644
index 44760fc25b75..000000000000
--- a/reference/ev/evtimer/again.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evtimer.again">
- <refnamediv>
-  <refname>EvTimer::again</refname>
-  <refpurpose>Restarts the timer watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvTimer::again</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   This will act as if the timer timed out and restart it again if it is
-   repeating. The exact semantics are:
-  </simpara>
-  <orderedlist>
-   <listitem>
-    <simpara>
-     if the timer is pending, its pending status is cleared.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     if the timer is started but non-repeating, stop it (as if it timed out).
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     if the timer is repeating, either start it if necessary (with the
-     <varname>repeat</varname>
-     value), or reset the running timer to the
-     <varname>repeat</varname>
-     value.
-    </simpara>
-   </listitem>
-  </orderedlist>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvWatcher::stop</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/ev/evtimer/construct.xml b/reference/ev/evtimer/construct.xml
deleted file mode 100644
index d788c1c50af3..000000000000
--- a/reference/ev/evtimer/construct.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evtimer.construct">
- <refnamediv>
-  <refname>EvTimer::__construct</refname>
-  <refpurpose>Constructs an EvTimer watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier>
-   <methodname>EvTimer::__construct</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>after</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>repeat</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs an EvTimer watcher object.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>after</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Configures the timer to trigger after
-      <parameter>after</parameter>
-      seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>repeat</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      If repeat is
-      <literal>0.0</literal>,
-      then it will automatically be stopped once the timeout is reached. If
-      it is positive, then the timer will automatically be configured to
-      trigger again every repeat seconds later, until stopped manually.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Simple timers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Create and start timer firing after 2 seconds
-$w1 = new EvTimer(2, 0, function () {
-    echo "2 seconds elapsed\n";
-});
-
-// Create and launch timer firing after 2 seconds repeating each second
-// until we manually stop it
-$w2 = new EvTimer(2, 1, function ($w) {
-    echo "is called every second, is launched after 2 seconds\n";
-    echo "iteration = ", Ev::iteration(), PHP_EOL;
-
-    // Stop the watcher after 5 iterations
-    Ev::iteration() == 5 and $w->stop();
-    // Stop the watcher if further calls cause more than 10 iterations
-    Ev::iteration() >= 10 and $w->stop();
-});
-
-// Create stopped timer. It will be inactive until we start it ourselves
-$w_stopped = EvTimer::createStopped(10, 5, function($w) {
-    echo "Callback of a timer created as stopped\n";
-
-    // Stop the watcher after 2 iterations
-    Ev::iteration() >= 2 and $w->stop();
-});
-
-// Loop until Ev::stop() is called or all of watchers stop
-Ev::run();
-
-// Start and look if it works
-$w_stopped->start();
-echo "Run single iteration\n";
-Ev::run(Ev::RUN_ONCE);
-
-echo "Restart the second watcher and try to handle the same events, but don't block\n";
-$w2->again();
-Ev::run(Ev::RUN_NOWAIT);
-
-$w = new EvTimer(10, 0, function() {});
-echo "Running a blocking loop\n";
-Ev::run();
-echo "END\n";
-?>
-]]>
-   </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-2 seconds elapsed
-is called every second, is launched after 2 seconds
-iteration = 1
-is called every second, is launched after 2 seconds
-iteration = 2
-is called every second, is launched after 2 seconds
-iteration = 3
-is called every second, is launched after 2 seconds
-iteration = 4
-is called every second, is launched after 2 seconds
-iteration = 5
-Run single iteration
-Callback of a timer created as stopped
-Restart the second watcher and try to handle the same events, but don't block
-Running a blocking loop
-is called every second, is launched after 2 seconds
-iteration = 8
-is called every second, is launched after 2 seconds
-iteration = 9
-is called every second, is launched after 2 seconds
-iteration = 10
-END
-]]>
-  </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvTimer::createStopped</methodname>
-   </member>
-   <member>
-    <classname>EvPeriodic</classname>
-   </member>
-   <member>
-    <link xlink:href="&url.ev.timer;">ev_timer - relative and optionally repeating timeouts</link>
-   </member>
-   <member>
-    <link xlink:href="&url.ev.timeouts;">Be smart about timeouts</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/ev/evtimer/createstopped.xml b/reference/ev/evtimer/createstopped.xml
deleted file mode 100644
index 691ddabda645..000000000000
--- a/reference/ev/evtimer/createstopped.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evtimer.createstopped">
- <refnamediv>
-  <refname>EvTimer::createStopped</refname>
-  <refpurpose>Creates EvTimer stopped watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EvTimer</type>
-   <methodname>EvTimer::createStopped</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>after</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>repeat</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>priority</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates EvTimer stopped watcher object. Unlike
-   <methodname>EvTimer::__construct</methodname>,
-   this method doesn't start the watcher automatically.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>after</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Configures the timer to trigger after
-      <parameter>after</parameter>
-      seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>repeat</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      If repeat is
-      <literal>0.0</literal>,
-      then it will automatically be stopped once the timeout is reached. If
-      it is positive, then the timer will automatically be configured to
-      trigger again every repeat seconds later, until stopped manually.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Custom data associated with the watcher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      <link linkend="ev.constants.watcher-pri">Watcher priority</link>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns EvTimer watcher object on success.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
- <example>
-   <title>Monitor changes of /var/log/messages. Avoid missing updates by means of one second delay</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$timer = EvTimer::createStopped(0., 1.02, function ($w) {
-    $w->stop();
-
-    $stat = $w->data;
-
-    // 1 second after the most recent change of the file
-    printf("Current size: %ld\n", $stat->attr()['size']);
-});
-
-$stat = new EvStat("/var/log/messages", 0., function () use ($timer) {
-    // Reset timer watcher
-    $timer->again();
-});
-
-$timer->data = $stat;
-
-Ev::run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvTimer::__construct</methodname>
-   </member>
-   <member>
-    <classname>EvPeriodic</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/ev/evtimer/set.xml b/reference/ev/evtimer/set.xml
deleted file mode 100644
index a32690104826..000000000000
--- a/reference/ev/evtimer/set.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evtimer.set">
- <refnamediv>
-  <refname>EvTimer::set</refname>
-  <refpurpose>Configures the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvTimer::set</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>after</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>repeat</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures the watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>after</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Configures the timer to trigger after
-      <parameter>after</parameter>
-      seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>repeat</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      If repeat is
-      <literal>0.0</literal>,
-      then it will automatically be stopped once the timeout is reached. If
-      it is positive, then the timer will automatically be configured to
-      trigger again every repeat seconds later, until stopped manually.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher.xml b/reference/ev/evwatcher.xml
deleted file mode 100644
index 785b45687d84..000000000000
--- a/reference/ev/evwatcher.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.evwatcher" role="class">
- <title>The EvWatcher class</title>
- <titleabbrev>EvWatcher</titleabbrev>
- <partintro>
-<!-- {{{ EvWatcher intro -->
-  <section xml:id="evwatcher.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EvWatcher</classname>
-    is a base class for all watchers(
-    <classname>EvCheck</classname>,
-    <classname>EvChild</classname>
-    etc.). Since
-    <classname>EvWatcher</classname>
-    &apos;s constructor is
-    <modifier>abstract</modifier>,
-    one can&apos;t(and don&apos;t need to) create EvWatcher objects
-    directly.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="evwatcher.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EvWatcher</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>EvWatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evwatcher.props.is-active">is_active</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evwatcher.props.data">data</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evwatcher.props.is-pending">is_pending</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="evwatcher.props.priority">priority</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.evwatcher')/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.evwatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EvWatcher properties -->
-  <section xml:id="evwatcher.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="evwatcher.props.is-active">
-     <term>
-      <varname>is_active</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>.
-       &true; if the watcher is active. &false; otherwise.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evwatcher.props.data">
-     <term>
-      <varname>data</varname>
-     </term>
-     <listitem>
-      <simpara>
-       User custom data associated with the watcher
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evwatcher.props.is-pending">
-     <term>
-      <varname>is_pending</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <emphasis>Readonly</emphasis>
-       .&true; if the watcher is pending, i.e. it has outstanding events, but
-       its callback has not yet been invoked. &false; otherwise. As long, as a
-       watcher is pending(but not active), one must
-       <emphasis>not</emphasis>
-       change its priority.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="evwatcher.props.priority">
-     <term>
-      <varname>priority</varname>
-     </term>
-     <listitem>
-      <simpara>
-       <type>int</type>
-       between
-       <constant>Ev::MINPRI</constant>
-       and
-       <constant>Ev::MAXPRI</constant>.
-       Pending watchers with higher priority will be invoked before watchers
-       with lower priority, but priority will not keep watchers from being
-       executed(except for
-       <classname>EvIdle</classname>
-       watchers).
-       <classname>EvIdle</classname>
-       watchers provide functionality to suppress invocation when higher
-       priority events are pending.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.ev.entities.evwatcher;
-
-</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/ev/evwatcher/clear.xml b/reference/ev/evwatcher/clear.xml
deleted file mode 100644
index 51cb3d6c4025..000000000000
--- a/reference/ev/evwatcher/clear.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.clear">
- <refnamediv>
-  <refname>EvWatcher::clear</refname>
-  <refpurpose>Clear watcher pending status</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EvWatcher::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   If the watcher is pending, this method clears its
-   <varname>pending</varname>
-   status and returns its
-   <varname>revents</varname>
-   bitset(as if its callback was invoked). If the watcher isn&apos;t pending
-   it does nothing and returns
-   <literal>0</literal>.
-  </simpara>
-  <simpara>
-   Sometimes it can be useful to "poll" a watcher instead of waiting for its
-   callback to be invoked, which can be accomplished with this function.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   In case if the watcher is pending, returns
-   <varname>revents</varname>
-   bitset as if the
-   <link linkend="ev.watcher-callbacks">watcher callback</link>
-   had been invoked. Otherwise returns
-   <literal>0</literal>.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher/construct.xml b/reference/ev/evwatcher/construct.xml
deleted file mode 100644
index b01c7dfc981f..000000000000
--- a/reference/ev/evwatcher/construct.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.construct">
- <refnamediv>
-  <refname>EvWatcher::__construct</refname>
-  <refpurpose>Abstract constructor of a watcher object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>abstract</modifier>
-   <modifier>public</modifier>
-   <methodname>EvWatcher::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   <methodname>EvWatcher::__construct</methodname>
-   is an abstract constructor of a watcher object implemented in the derived
-   classes.
-  </simpara>
- </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/ev/evwatcher/feed.xml b/reference/ev/evwatcher/feed.xml
deleted file mode 100644
index a4a65ccf6d6c..000000000000
--- a/reference/ev/evwatcher/feed.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.feed">
- <refnamediv>
-  <refname>EvWatcher::feed</refname>
-  <refpurpose>Feeds the given revents set into the event loop</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvWatcher::feed</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>revents</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Feeds the given revents set into the event loop, as if the specified event
-   had happened for the watcher.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>revents</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Bit mask of watcher
-      <link linkend="ev.constants.watcher-revents">received events</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher/getloop.xml b/reference/ev/evwatcher/getloop.xml
deleted file mode 100644
index 395dbe332971..000000000000
--- a/reference/ev/evwatcher/getloop.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.getloop">
- <refnamediv>
-  <refname>EvWatcher::getLoop</refname>
-  <refpurpose>Returns the loop responsible for the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EvLoop</type>
-   <methodname>EvWatcher::getLoop</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the loop responsible for the watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns
-   <classname>EvLoop</classname>
-   event loop object responsible for the watcher.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher/invoke.xml b/reference/ev/evwatcher/invoke.xml
deleted file mode 100644
index f680ab891c0b..000000000000
--- a/reference/ev/evwatcher/invoke.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.invoke">
- <refnamediv>
-  <refname>EvWatcher::invoke</refname>
-  <refpurpose>Invokes the watcher callback with the given received events bit
-  mask</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvWatcher::invoke</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>revents</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Invokes the watcher callback with the given received events bit mask.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>revents</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Bit mask of watcher
-      <link linkend="ev.constants.watcher-revents">received events</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher/keepalive.xml b/reference/ev/evwatcher/keepalive.xml
deleted file mode 100644
index 2fe7e384d27f..000000000000
--- a/reference/ev/evwatcher/keepalive.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.keepalive">
- <refnamediv>
-  <refname>EvWatcher::keepalive</refname>
-  <refpurpose>Configures whether to keep the loop from returning</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EvWatcher::keepalive</methodname>
-   <methodparam choice="opt">
-    <type>bool</type>
-    <parameter>value</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures whether to keep the loop from returning. With keepalive
-   <parameter>value</parameter>
-   set to &false; the watcher won&apos;t keep
-   <methodname>Ev::run</methodname>
-   /
-   <methodname>EvLoop::run</methodname>
-   from returning even though the watcher is active.
-  </simpara>
-  <simpara>
-   Watchers have keepalive
-   <parameter>value</parameter>
-   &true; by default.
-  </simpara>
-  <simpara>
-   Clearing keepalive status is useful when returning from
-   <methodname>Ev::run</methodname>
-   /
-   <methodname>EvLoop::run</methodname>
-   just because of the watcher is undesirable. It could be a long running UDP
-   socket watcher or so.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      With keepalive
-      <parameter>value</parameter>
-      set to &false; the watcher won&apos;t keep
-      <methodname>Ev::run</methodname>
-      /
-      <methodname>EvLoop::run</methodname>
-      from returning even though the watcher is active.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the previous state.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Register an I/O watcher for some UDP socket but do not keep the
-   event loop from running just because of that watcher.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$udp_socket = ...
-$udp_watcher = new EvIo($udp_socket, Ev::READ, function () { /* ... */ });
-$udp_watcher->keepalive(FALSE);
-?>
-]]>
-   </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/ev/evwatcher/setcallback.xml b/reference/ev/evwatcher/setcallback.xml
deleted file mode 100644
index d0725fe984f5..000000000000
--- a/reference/ev/evwatcher/setcallback.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.setcallback">
- <refnamediv>
-  <refname>EvWatcher::setCallback</refname>
-  <refpurpose>Sets new callback for the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvWatcher::setCallback</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets new callback for the watcher
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      See
-      <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ev/evwatcher/start.xml b/reference/ev/evwatcher/start.xml
deleted file mode 100644
index ea965ee9297f..000000000000
--- a/reference/ev/evwatcher/start.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.start">
- <refnamediv>
-  <refname>EvWatcher::start</refname>
-  <refpurpose>Starts the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvWatcher::start</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Marks the watcher as active. Note that only active watchers will receive
-   events.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvWatcher::stop</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/ev/evwatcher/stop.xml b/reference/ev/evwatcher/stop.xml
deleted file mode 100644
index a4bfe950e8d4..000000000000
--- a/reference/ev/evwatcher/stop.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="evwatcher.stop">
- <refnamediv>
-  <refname>EvWatcher::stop</refname>
-  <refpurpose>Stops the watcher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EvWatcher::stop</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Marks the watcher as inactive. Note that only active watchers will receive
-   events.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EvWatcher::start</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/ev/examples.xml b/reference/ev/examples.xml
deleted file mode 100644
index c318a11dc528..000000000000
--- a/reference/ev/examples.xml
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="ev.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Simple timers</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Create and start timer firing after 2 seconds
-$w1 = new EvTimer(2, 0, function () {
-    echo "2 seconds elapsed\n";
-});
-
-// Create and launch timer firing after 2 seconds repeating each second
-// until we manually stop it
-$w2 = new EvTimer(2, 1, function ($w) {
-    echo "is called every second, is launched after 2 seconds\n";
-    echo "iteration = ", Ev::iteration(), PHP_EOL;
-
-    // Stop the watcher after 5 iterations
-    Ev::iteration() == 5 and $w->stop();
-    // Stop the watcher if further calls cause more than 10 iterations
-    Ev::iteration() >= 10 and $w->stop();
-});
-
-// Create stopped timer. It will be inactive until we start it ourselves
-$w_stopped = EvTimer::createStopped(10, 5, function($w) {
-    echo "Callback of a timer created as stopped\n";
-
-    // Stop the watcher after 2 iterations
-    Ev::iteration() >= 2 and $w->stop();
-});
-
-// Loop until Ev::stop() is called or all of watchers stop
-Ev::run();
-
-// Start and look if it works
-$w_stopped->start();
-echo "Run single iteration\n";
-Ev::run(Ev::RUN_ONCE);
-
-echo "Restart the second watcher and try to handle the same events, but don't block\n";
-$w2->again();
-Ev::run(Ev::RUN_NOWAIT);
-
-$w = new EvTimer(10, 0, function() {});
-echo "Running a blocking loop\n";
-Ev::run();
-echo "END\n";
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-2 seconds elapsed
-is called every second, is launched after 2 seconds
-iteration = 1
-is called every second, is launched after 2 seconds
-iteration = 2
-is called every second, is launched after 2 seconds
-iteration = 3
-is called every second, is launched after 2 seconds
-iteration = 4
-is called every second, is launched after 2 seconds
-iteration = 5
-Run single iteration
-Callback of a timer created as stopped
-Restart the second watcher and try to handle the same events, but don't block
-Running a blocking loop
-is called every second, is launched after 2 seconds
-iteration = 8
-is called every second, is launched after 2 seconds
-iteration = 9
-is called every second, is launched after 2 seconds
-iteration = 10
-END
-]]>
-  </screen>
- </example>
- <example>
-  <title>Periodic timer. Tick each 10.5 seconds</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$w = new EvPeriodic(0., 10.5, NULL, function ($w, $revents) {
-    echo time(), PHP_EOL;
-});
-
-Ev::run();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Periodic timer. Use reschedule callback</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Tick each 10.5 seconds
-
-function reschedule_cb ($watcher, $now) {
-    return $now + (10.5. - fmod($now, 10.5));
-}
-
-$w = new EvPeriodic(0., 0., "reschedule_cb", function ($w, $revents) {
-    echo time(), PHP_EOL;
-});
-
-Ev::run();
-?>
-
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Periodic timer. Tick every 10.5 seconds starting at now</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Tick every 10.5 seconds starting at now
-$w = new EvPeriodic(fmod(Ev::now(), 10.5), 10.5, NULL, function ($w, $revents) {
-    echo time(), PHP_EOL;
-});
-
-Ev::run();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Wait until STDIN is readable</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Wait until STDIN is readable
-$w = new EvIo(STDIN, Ev::READ, function ($watcher, $revents) {
-    echo "STDIN is readable\n";
-});
-
-Ev::run(Ev::RUN_ONCE);
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Use some async I/O to access a socket</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/* Use some async I/O to access a socket */
-
-// `sockets' extension still logs warnings
-// for EINPROGRESS, EAGAIN/EWOULDBLOCK etc.
-error_reporting(E_ERROR);
-
-$e_nonblocking = array (/*EAGAIN or EWOULDBLOCK*/11, /*EINPROGRESS*/115);
-
-// Get the port for the WWW service
-$service_port = getservbyname('www', 'tcp');
-
-// Get the IP address for the target host
-$address = gethostbyname('google.co.uk');
-
-// Create a TCP/IP socket
-$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-if ($socket === FALSE) {
-    echo "socket_create() failed: reason: "
-        .socket_strerror(socket_last_error()) . "\n";
-}
-
-// Set O_NONBLOCK flag
-socket_set_nonblock($socket);
-
-// Abort on timeout
-$timeout_watcher = new EvTimer(10.0, 0., function () use ($socket) {
-    socket_close($socket);
-    Ev::stop(Ev::BREAK_ALL);
-});
-
-// Make HEAD request when the socket is writable
-$write_watcher = new EvIo($socket, Ev::WRITE, function ($w)
-    use ($socket, $timeout_watcher, $e_nonblocking)
-{
-    // Stop timeout watcher
-    $timeout_watcher->stop();
-    // Stop write watcher
-    $w->stop();
-
-    $in = "HEAD / HTTP/1.1\r\n";
-    $in .= "Host: google.co.uk\r\n";
-    $in .= "Connection: Close\r\n\r\n";
-
-    if (!socket_write($socket, $in, strlen($in))) {
-        trigger_error("Failed writing $in to socket", E_USER_ERROR);
-    }
-
-    $read_watcher = new EvIo($socket, Ev::READ, function ($w, $re)
-        use ($socket, $e_nonblocking)
-    {
-        // Socket is readable. recv() 20 bytes using non-blocking mode
-        $ret = socket_recv($socket, $out, 20, MSG_DONTWAIT);
-
-        if ($ret) {
-            echo $out;
-        } elseif ($ret === 0) {
-            // All read
-            $w->stop();
-            socket_close($socket);
-            return;
-        }
-
-        // Caught EINPROGRESS, EAGAIN, or EWOULDBLOCK
-        if (in_array(socket_last_error(), $e_nonblocking)) {
-            return;
-        }
-
-        $w->stop();
-        socket_close($socket);
-    });
-
-    Ev::run();
-});
-
-$result = socket_connect($socket, $address, $service_port);
-
-Ev::run();
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-HTTP/1.1 301 Moved Permanently
-Location: http://www.google.co.uk/
-Content-Type: text/html; charset=UTF-8
-Date: Sun, 23 Dec 2012 16:08:27 GMT
-Expires: Tue, 22 Jan 2013 16:08:27 GMT
-Cache-Control: public, max-age=2592000
-Server: gws
-Content-Length: 221
-X-XSS-Protection: 1; mode=block
-X-Frame-Options: SAMEORIGIN
-Connection: close
-
-
-]]>
-  </screen>
- </example>
- <example>
-  <title>Embedding one loop into another</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
-* Try to get an embeddable event loop and embed it into the default event loop.
-* If it is impossible, use the default
-* loop. The default loop is stored in $loop_hi, while the embeddable loop is
-* stored in $loop_lo(which is $loop_hi in the case no embeddable loop can be
-* used).
-*
-* Sample translated to PHP
-* http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
-*/
-$loop_hi = EvLoop::defaultLoop();
-$loop_lo = NULL;
-$embed   = NULL;
-
-/*
-* See if there is a chance of getting one that works
-* (flags' value of 0 means autodetection)
-*/
-$loop_lo = Ev::embeddableBackends() & Ev::recommendedBackends()
-    ? new EvLoop(Ev::embeddableBackends() & Ev::recommendedBackends())
-    : 0;
-
-if ($loop_lo) {
-    $embed = new EvEmbed($loop_lo, function () {});
-} else {
-    $loop_lo = $loop_hi;
-}
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Embedding loop created with kqueue backend into the default loop</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
-* Check if kqueue is available but not recommended and create a kqueue backend
-* for use with sockets (which usually work with any kqueue implementation).
-* Store the kqueue/socket-only event loop in loop_socket. (One might optionally
-* use EVFLAG_NOENV, too)
-*
-* Example borrowed from
-* http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#Examples_CONTENT-9
-*/
-$loop        = EvLoop::defaultLoop();
-$socket_loop = NULL;
-$embed       = NULL;
-
-if (Ev::supportedBackends() & ~Ev::recommendedBackends() & Ev::BACKEND_KQUEUE) {
-    if (($socket_loop = new EvLoop(Ev::BACKEND_KQUEUE))) {
-        $embed = new EvEmbed($loop);
-    }
-}
-
-if (!$socket_loop) {
-    $socket_loop = $loop;
-}
-
-// Now use $socket_loop for all sockets, and $loop for anything else
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Handle SIGTERM signal</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$w = new EvSignal(SIGTERM, function ($watcher) {
-    echo "SIGTERM received\n";
-    $watcher->stop();
-});
-
-Ev::run();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Monitor changes of /var/log/messages</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Use 10 second update interval.
-$w = new EvStat("/var/log/messages", 8, function ($w) {
-    echo "/var/log/messages changed\n";
-
-    $attr = $w->attr();
-
-    if ($attr['nlink']) {
-        printf("Current size: %ld\n", $attr['size']);
-        printf("Current atime: %ld\n", $attr['atime']);
-        printf("Current mtime: %ld\n", $attr['mtime']);
-    } else {
-        fprintf(STDERR, "`messages` file is not there!");
-        $w->stop();
-    }
-});
-
-Ev::run();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Monitor changes of /var/log/messages. Avoid missing updates by means of one second delay</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$timer = EvTimer::createStopped(0., 1.02, function ($w) {
-    $w->stop();
-
-    $stat = $w->data;
-
-    // 1 second after the most recent change of the file
-    printf("Current size: %ld\n", $stat->attr()['size']);
-});
-
-$stat = new EvStat("/var/log/messages", 0., function () use ($timer) {
-    // Reset timer watcher
-    $timer->again();
-});
-
-$timer->data = $stat;
-
-Ev::run();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Process status changes</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$pid = pcntl_fork();
-
-if ($pid == -1) {
-    fprintf(STDERR, "pcntl_fork failed\n");
-} elseif ($pid) {
-    $w = new EvChild($pid, FALSE, function ($w, $revents) {
-        $w->stop();
-
-        printf("Process %d exited with status %d\n", $w->rpid, $w->rstatus);
-    });
-
-    Ev::run();
-
-    // Protect against Zombies
-    pcntl_wait($status);
-} else {
-    //Forked child
-    exit(2);
-}
-?>
-]]>
-  </programlisting>
- </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/ev/periodic-modes.xml b/reference/ev/periodic-modes.xml
deleted file mode 100644
index 0388fbc04288..000000000000
--- a/reference/ev/periodic-modes.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.periodic-modes">
- <title>Periodic watcher operation modes</title>
- <simpara>
-  <classname>EvPeriodic</classname>
-  watcher works in different modes depending on the
-  <parameter>offset</parameter>,
-  <parameter>interval</parameter>
-  and
-  <parameter>reschedule_cb</parameter>
-  parameters.
- </simpara>
- <orderedlist>
-  <listitem>
-   <simpara>
-    <emphasis>Absolute timer</emphasis>.
-    In this mode
-    <parameter>interval</parameter>
-    =
-    <literal>0</literal>,
-    <parameter>reschedule_cb</parameter>
-    = &null;. This time simply fires at the wallclock time
-    <parameter>offset</parameter>
-    and doesn't repeat. It will not adjust when a time jump occurs, that is,
-    if it is to be run at
-    <emphasis>January
-   1st 2014</emphasis>
-    then it will run when the system time reaches or surpasses this time.
-   </simpara>
-  </listitem>
-  <listitem>
-   <simpara>
-    <emphasis>Repeating interval timer</emphasis>.
-    In this mode
-    <parameter>interval</parameter>
-    &gt;
-    <literal>0</literal>,
-    <parameter>reschedule_cb</parameter>
-    = &null;; the watcher will always be scheduled to timeout at the next
-    <parameter>offset</parameter>
-    +
-    <constant>N</constant>
-    *
-    <parameter>interval</parameter>
-    time(for some integer
-    <constant>N</constant>)
-    and then repeat, regardless of any time jumps.
-   </simpara>
-   <para>
-    This can be used to create timers that do not drift with respect to system
-    time:
-    <programlisting role="php">
-<![CDATA[
-<?php
-$hourly = EvPeriodic(0, 3600, NULL, function () {
-  echo "once per hour\n";
-});
-?>
-]]>
-    </programlisting>
-    That doesn't mean there will always be
-    <literal>3600</literal>
-    seconds in between triggers, but only that the callback will be called
-    when the system time shows a full hour(
-    <emphasis>UTC</emphasis>
-    ).
-   </para>
-   <simpara>
-    <classname>EvPeriodic</classname>
-    will try to run the callback in this mode at the next possible time where
-    <varname>time</varname>
-    =
-    <parameter>offset</parameter>
-    (
-    <literal>mod</literal>
-    <parameter>interval</parameter>
-    ), regardless of any time jumps.
-   </simpara>
-  </listitem>
-  <listitem>
-   <simpara>
-    <emphasis>Manual reschedule mode</emphasis>.
-    In this mode
-    <parameter>reschedule_cb</parameter>
-    is a
-    <type>callable</type>.
-   </simpara>
-   <simpara>
-    <parameter>interval</parameter>
-    and
-    <parameter>offset</parameter>
-    are both being ignored. Instead, each time the periodic watcher gets
-    scheduled, the reschedule callback (
-    <parameter>reschedule_cb</parameter>)
-    will be called with the watcher as first, and the current time as second
-    argument.
-   </simpara>
-   <simpara>
-    This callback
-    <emphasis>must not</emphasis>
-    stop or destroy this or any other periodic watchers, ever, and
-    <emphasis>must not</emphasis>
-    call any event loop functions or methods. To stop it return
-    <literal>1e30</literal>
-    and stop it afterwards. An
-    <classname>EvPrepare</classname>
-    watcher may be used for this task.
-   </simpara>
-   <simpara>
-    It must return the next time to trigger, based on the passed time value
-    (that is, the lowest time value larger than or equal to the second
-    argument). It will usually be called just before the callback will be
-    triggered, but might be called at other times, too.
-   </simpara>
-   <example>
-    <title>Using reschedule callback</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Tick each 10.5 seconds
-
-function reschedule_cb ($watcher, $now) {
-   return $now + (10.5. - fmod($now, 10.5));
-}
-
-$w = new EvPeriodic(0., 0., "reschedule_cb", function ($w, $revents) {
-   echo time(), PHP_EOL;
-});
-
-Ev::run();
-?>
-]]>
-    </programlisting>
-   </example>
-  </listitem>
- </orderedlist>
-</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/ev/setup.xml b/reference/ev/setup.xml
deleted file mode 100644
index e8f43d896e80..000000000000
--- a/reference/ev/setup.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.setup">
- &reftitle.setup;
-
- <section xml:id="ev.requirements">
-  &reftitle.required;
-  <simpara>
-   <literal>libev</literal>
-   library is embedded into this extension. You don't need to install it
-   separately.
-  </simpara>
- </section>
- <section xml:id="ev.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;ev">&url.pecl.package;ev</link>.
-  </simpara>
- </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/ev/versions.xml b/reference/ev/versions.xml
deleted file mode 100644
index 492e471d0de6..000000000000
--- a/reference/ev/versions.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Methods -->
-
- <function name='ev' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::supportedbackends' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::recommendedbackends' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::embeddablebackends' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::sleep' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::time' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::feedsignal' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::run' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::now' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::iteration' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::depth' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::verify' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::backend' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::nowupdate' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::suspend' from='PECL ev &gt;= 0.2.0'/>
- <function name='ev::resume' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::defaultloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::loopfork' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::verify' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::invokepending' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::nowupdate' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::suspend' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::resume' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::backend' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::now' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::run' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::feedsignalevent' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::io' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::timer' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::periodic' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::signal' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::child' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::stat' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::idle' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::check' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::prepare' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::embed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evloop::fork' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evwatcher' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evwatcher::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evio' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evio::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evtimer' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::again' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evtimer::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evperiodic' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::again' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::at' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evperiodic::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evsignal' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evsignal::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evchild' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evchild::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evstat' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::attr' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::prev' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::stat' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evstat::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evidle' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evidle::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evcheck' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evcheck::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evprepare' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evprepare::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evembed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::set' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::sweep' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evembed::setcallback' from='PECL ev &gt;= 0.2.0'/>
-
- <function name='evfork' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::__construct' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::createstopped' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::start' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::stop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::clear' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::invoke' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::feed' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::getloop' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::keepalive' from='PECL ev &gt;= 0.2.0'/>
- <function name='evfork::setcallback' from='PECL ev &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/ev/watcher-callbacks.xml b/reference/ev/watcher-callbacks.xml
deleted file mode 100644
index a533551b5b79..000000000000
--- a/reference/ev/watcher-callbacks.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.watcher-callbacks">
- <title>Watcher callbacks</title>
- <simpara>
-  All watchers can be active(waiting for events) or inactive(paused). Only
-  active watchers will have their callbacks invoked. All callbacks will be
-  called with at least two arguments:
-  <parameter>watcher</parameter>
-  - the watcher, and
-  <parameter>revents</parameter>
-  a bitmask of received events.
- </simpara>
- <simpara>
-  Watcher callbacks are passed to the watcher constructors (the classes derived
-  from
-  <classname>EvWatcher</classname>
-  -
-  <methodname>EvCheck::__construct</methodname>,
-  <methodname>EvChild::__construct</methodname>
-  etc.). A watcher callback should match the following prototype:
- </simpara>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>object</type>
-   <parameter>watcher</parameter>
-   <initializer>NULL</initializer>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>int</type>
-   <parameter>revents</parameter>
-   <initializer>NULL</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>watcher</parameter>
-   </term>
-   <listitem>
-    <simpara>
-     The watcher instance(of a class extending
-     <classname>EvWatcher</classname>
-     ).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>revents</parameter>
-   </term>
-   <listitem>
-    <simpara>
-     <link linkend="ev.constants.watcher-revents">Watcher received events</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <simpara>
-  Each watcher type has its associated bit in
-  <parameter>revents</parameter>,
-  so one can use the same callback for multiple watchers. The event mask is
-  named after the type, i.e.
-  <classname>EvChild</classname>
-  (or
-  <methodname>EvLoop::child</methodname>)
-  sets
-  <constant>Ev::CHILD</constant>,
-  <classname>EvPrepare</classname>
-  (or
-  <methodname>EvLoop::prepare</methodname>)
-  sets
-  <constant>Ev::PREPARE</constant>,
-  <classname>EvPeriodic</classname>
-  (or
-  <methodname>EvLoop::periodic</methodname>)
-  sets
-  <constant>Ev::PERIODIC</constant>
-  and so on, with the exception of I/O events (which can set both
-  <constant>Ev::READ</constant>
-  and
-  <constant>Ev::WRITE</constant>
-  bits).
- </simpara>
-</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/ev/watchers.xml b/reference/ev/watchers.xml
deleted file mode 100644
index c74e262566e5..000000000000
--- a/reference/ev/watchers.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ev.watchers">
- <title>Watchers</title>
- <para>
-  A watcher is an object that gets created to record interest in some event.
-  For instance, the following code waits for
-  <constant>STDIN</constant>
-  to become readable:
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Wait until STDIN is readable
-$w = new EvIo(STDIN, Ev::READ, function ($watcher, $revents) {
- echo "STDIN is readable\n";
-});
-Ev::run(Ev::RUN_ONCE);
-?>
-]]>
-  </programlisting>
- </para>
- <simpara>
-  All the watcher constructors automatically start the watchers.
-  <literal>createStopped</literal>
-  methods create stopped watchers(e.g.
-  <methodname>EvIo::createStopped</methodname>)
- </simpara>
- <simpara>
-  Note that a watcher will automatically be stopped when the watcher object is
-  destroyed. Therefore, the watcher objects returned by the constructors or
-  factory methods should be kept.
- </simpara>
- <simpara>
-  Note also that all methods changing some watcher property(
-  <emphasis>set</emphasis>,
-  <varname>priority</varname>
-  etc.) automatically stop and start it again if it is active, which means
-  pending events get lost.
- </simpara>
- <simpara>
-  See also:
-  <link linkend="ev.watcher-callbacks">Watcher callbacks</link>.
- </simpara>
-</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/event/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/event/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/event/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/event/book.xml b/reference/event/book.xml
deleted file mode 100644
index d6bd18e14f62..000000000000
--- a/reference/event/book.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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">
-  &reftitle.intro;
-  <para>
-   This is an extension to efficiently schedule I/O, time and signal based
-   events using the best I/O notification mechanism available for specific
-   platform. This is a port of libevent to the PHP infrastructure.
-  </para>
-  <note xmlns="http://docbook.org/ns/docbook">
-   <para>
-    Note, Windows support introduced in
-    <literal>event-1.9.0</literal>.
-   </para>
-  </note>
-  <para>
-   Version
-   <emphasis>1.0.0</emphasis>
-   introduces new object-oriented API (breaking backwards compatibility), and
-   support of libevent 2+ including HTTP, DNS, OpenSSL and the event listener.
-  </para>
-  <note xmlns="http://docbook.org/ns/docbook">
-   <para>
-    Note,
-    <literal>event-1.0.0</literal>
-    and greater is not compatible with previous versions.
-   </para>
-  </note>
- </preface>
- &reference.event.setup;
- &reference.event.examples;
- &reference.event.event.flags;
- &reference.event.event.persistence;
- &reference.event.event.callbacks;
- &reference.event.event.constructing.signal.events;
- &reference.event.event;
- &reference.event.eventbase;
- &reference.event.eventbuffer;
- &reference.event.eventbufferevent;
- &reference.event.eventbufferevent.about.callbacks;
- &reference.event.eventconfig;
- &reference.event.eventdnsbase;
- &reference.event.eventhttp;
- &reference.event.eventhttpconnection;
- &reference.event.eventhttprequest;
- &reference.event.eventlistener;
- &reference.event.eventsslcontext;
- &reference.event.eventutil;
- &reference.event.eventexception;
-
-</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/event/configure.xml b/reference/event/configure.xml
deleted file mode 100644
index 989ca6e81044..000000000000
--- a/reference/event/configure.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="event.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;event">&url.pecl.package;event</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/event/event.callbacks.xml b/reference/event/event.callbacks.xml
deleted file mode 100644
index c5017d8aeb4d..000000000000
--- a/reference/event/event.callbacks.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="event.callbacks">
- <title>Event callbacks</title>
- <para>
-  If a callback is registered for an event, it will be called when the event
-  becomes active. To associate a callback with event one can pass a
-  <type>callable</type>
-  to either
-  <methodname>Event::__construct</methodname>,
-  or
-  <methodname>Event::set</methodname>,
-  or one of the factory methods like
-  <methodname>Event::timer</methodname>.
- </para>
- <para>
-  An event callback should match the following prototype:
- </para>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>fd</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>int</type>
-   <parameter>what</parameter>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>arg</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>fd</parameter>
-   </term>
-   <listitem>
-    <para>
-     The file descriptor, stream resource or socket associated with the
-     event. For signal event
-     <parameter>fd</parameter>
-     is equal to the signal number.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>what</parameter>
-   </term>
-   <listitem>
-    <para>
-     Bit mask of
-     <emphasis>all</emphasis>
-     events triggered.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>arg</parameter>
-   </term>
-   <listitem>
-    <para>
-     User custom data.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <para>
-  <methodname>Event::timer</methodname>
-  expects the callback to match the following prototype:
- </para>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>arg</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>arg</parameter>
-   </term>
-   <listitem>
-    <para>
-     User custom data.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <para>
-  <methodname>Event::signal</methodname>
-  expects the callback to match the following prototype:
- </para>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>int</type>
-   <parameter>signum</parameter>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>arg</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>signum</parameter>
-   </term>
-   <listitem>
-    <para>
-     The number of the triggered signal(e.g.
-     <constant>SIGTERM</constant>
-     ).
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>arg</parameter>
-   </term>
-   <listitem>
-    <para>
-     User custom data.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</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/event/event.constructing.signal.events.xml b/reference/event/event.constructing.signal.events.xml
deleted file mode 100644
index 1e7b9e472ef8..000000000000
--- a/reference/event/event.constructing.signal.events.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter  xml:id="event.constructing.signal.events" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Constructing signal events</title>
- <para>
-  Event can also watch for POSIX-style signals. To construct a handler for a
-  signal, use
-  <methodname>Event::__construct</methodname>
-  constructor with
-  <constant>Event::SIGNAL</constant>
-  flag, or
-  <methodname>Event::signal</methodname>
-  factory method.
- </para>
- <example>
-  <title>Handling <literal>SIGTERM</literal> signal</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
-Launch it in a terminal window:
-
-$ php examples/signal.php
-
-In another terminal window find out the pid and send SIGTERM, e.g.:
-
-$ ps aux | grep examp
-ruslan    3976  0.2  0.0 139896 11256 pts/1    S+   10:25   0:00 php examples/signal.php
-ruslan    3978  0.0  0.0   9572   864 pts/2    S+   10:26   0:00 grep --color=auto examp
-$ kill -TERM 3976
-
-At the first terminal window you should catch the following:
-
-Caught signal 15
-*/
-class MyEventSignal {
-    private $base, $ev;
-
-    public function __construct($base) {
-        $this->base = $base;
-        $this->ev = Event::signal($base, SIGTERM, array($this, 'eventSighandler'));
-        $this->ev->add();
-    }
-
-    public function eventSighandler($no, $c) {
-        echo "Caught signal $no\n";
-        $this->base->exit();
-    }
-}
-
-$base = new EventBase();
-$c    = new MyEventSignal($base);
-
-$base->loop();
-?>
-]]>
-  </programlisting>
- </example>
- <para>
-  Note that signal callbacks are run in the event loop after the signal
-  occurs, so it is safe for them to call functions that you are not supposed
-  to call from a regular POSIX signal handler.
- </para>
- <para></para>
- <para>
-  See also
-  <link
- xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref4_event.html#_constructing_signal_events">Fast
- portable non-blocking network programming with Libevent, Constructing Signal
- Events</link>.
- </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/event/event.flags.xml b/reference/event/event.flags.xml
deleted file mode 100644
index 739220413c19..000000000000
--- a/reference/event/event.flags.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="event.flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Event flags</title>
- <para>
-  <constant>Event::READ</constant>
-  This flag indicates an event that becomes active when the provided file
-  descriptor (usually a stream resource, or socket) is ready for reading.
- </para>
- <para>
-  <constant>Event::WRITE</constant>
-  flag indicates an event that becomes active when the provided file
-  descriptor (usually a stream resource, or socket) is ready for writing.
- </para>
- <para>
-  <constant>Event::SIGNAL</constant>
-  used to implement signal detection. See "Constructing signal events" below.
- </para>
- <para>
-  <constant>Event::TIMEOUT</constant>
-  indicates an event that becomes active after a timeout elapses. The
-  <constant>Event::TIMEOUT</constant>
-  flag is ignored when constructing an event: one can either set a timeout
-  when event is
-  <emphasis>added</emphasis>,
-  or not. It is set in the
-  <literal>$what</literal>
-  argument to the callback function when a timeout has occurred.
- </para>
- <para>
-  See also
-  <link
- xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref4_event.html#_the_event_flags">Fast
- portable non-blocking network programming with Libevent, Working with events,
- Event flags</link>
- </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/event/event.persistence.xml b/reference/event/event.persistence.xml
deleted file mode 100644
index 648ef79c3640..000000000000
--- a/reference/event/event.persistence.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter  xml:id="event.persistence" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>About event persistence</title>
- <para>
-  By default, whenever a pending event becomes active (because its file
-  descriptor is ready to read or write, or because its timeout expires), it
-  becomes non-pending right before its callback is executed. Thus, to make the
-  event pending again one may call
-  <methodname>Event::add</methodname>
-  on it again from inside the callback function.
- </para>
- <para>
-  If the
-  <constant>Event::PERSIST</constant>
-  flag is set on an event, however, the event is
-  <emphasis>persistent</emphasis>.
-  This means that event remains pending even when its callback is activated.
-  <methodname>Event::del</methodname>
-  method can be called to make it non-pending.
- </para>
- <para>
-  The timeout on a persistent event resets whenever the event's callback runs.
-  Thus, if one has an event with flags
-  <constant>Event::READ</constant>
-  <literal>|</literal>
-  <constant>Event::PERSIST</constant>
-  and a timeout of five seconds, the event will become active:
- </para>
- <orderedlist>
-  <listitem>
-   <para>
-    Whenever the socket or file descriptor is ready for reading.
-   </para>
-  </listitem>
-  <listitem>
-   <para>
-    Whenever five seconds have passed since the event last became active.
-   </para>
-  </listitem>
- </orderedlist>
- <para>
-  See also
-  <link
- xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref4_event.html#_about_event_persistence">Fast
- portable non-blocking network programming with Libevent, About Event
- Persistence</link>
- </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/event/event.xml b/reference/event/event.xml
deleted file mode 100644
index 66ac882a1486..000000000000
--- a/reference/event/event.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.event" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The Event class</title>
- <titleabbrev>Event</titleabbrev>
- <partintro>
-<!-- {{{ Event intro -->
-  <section xml:id="event.intro">
-   &reftitle.intro;
-   <para>
-    <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 occurring; a
-    user-triggered event.
-   </para>
-   <para>
-    Every event is associated with
-    <classname>EventBase</classname>.
-    However, event will never fire until it is
-    <emphasis>added</emphasis>
-    (via
-    <methodname>Event::add</methodname>
-    ). An added event remains in
-    <emphasis>pending</emphasis>
-    state until the registered event occurs, thus turning it to
-    <emphasis>active</emphasis>
-    state. To handle events user may register a callback which is called when
-    event becomes active. If event is configured
-    <emphasis>persistent</emphasis>,
-    it remains pending. If it is not persistent, it stops being pending when
-    it's callback runs.
-    <methodname>Event::del</methodname>
-    method
-    <emphasis>deletes</emphasis>
-    event, thus making it non-pending. By means of
-    <methodname>Event::add</methodname>
-    method it could be added again.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="event.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>Event</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Event</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.et">Event::ET</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.persist">Event::PERSIST</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.read">Event::READ</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.write">Event::WRITE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.signal">Event::SIGNAL</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="event.constants.timeout">Event::TIMEOUT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>bool</type>
-     <varname linkend="event.props.pending">pending</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.event')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ Event properties -->
-  <section xml:id="event.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="event.props.pending">
-     <term>
-      <varname>pending</varname>
-     </term>
-     <listitem>
-      <para>
-       Whether event is pending. See
-       <link linkend="event.persistence">About event persistence</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-<!-- {{{ Event constants -->
-  <section xml:id="event.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="event.constants.et">
-     <term>
-      <constant>Event::ET</constant>
-     </term>
-     <listitem>
-      <para>
-       Indicates that the event should be edge-triggered, if the underlying
-       event base backend supports edge-triggered events. This affects the
-       semantics of
-       <constant>Event::READ</constant>
-       and
-       <constant>Event::WRITE</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="event.constants.persist">
-     <term>
-      <constant>Event::PERSIST</constant>
-     </term>
-     <listitem>
-      <para>
-       Indicates that the event is persistent. See
-       <link linkend="event.persistence">About event persistence</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="event.constants.read">
-     <term>
-      <constant>Event::READ</constant>
-     </term>
-     <listitem>
-      <para>
-       This flag indicates an event that becomes active when the provided file
-       descriptor(usually a stream resource, or socket) is ready for reading.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="event.constants.write">
-     <term>
-      <constant>Event::WRITE</constant>
-     </term>
-     <listitem>
-      <simpara>
-       This flag indicates an event that becomes active when the provided file
-       descriptor(usually a stream resource, or socket) is ready for writing.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="event.constants.signal">
-     <term>
-      <constant>Event::SIGNAL</constant>
-     </term>
-     <listitem>
-      <para>
-       Used to implement signal detection. See "Constructing signal events"
-       below.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="event.constants.timeout">
-     <term>
-      <constant>Event::TIMEOUT</constant>
-     </term>
-     <listitem>
-      <para>
-       This flag indicates an event that becomes active after a timeout
-       elapses.
-      </para>
-      <para>
-       The
-       <constant>Event::TIMEOUT</constant>
-       flag is ignored when constructing an event: one can either set a
-       timeout when event is
-       <emphasis>added</emphasis>,
-       or not. It is set in the
-       <literal>$what</literal>
-       argument to the callback function when a timeout has occurred.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.event;
-
-</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/event/event/add.xml b/reference/event/event/add.xml
deleted file mode 100644
index 2ae88e158a3d..000000000000
--- a/reference/event/event/add.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::add</refname>
-  <refpurpose>Makes event pending</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::add</methodname>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>timeout</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Marks event pending. Non-pending event will never occur, and the event
-   callback will never be called. In conjunction with
-   <methodname>Event::del</methodname>
-   an event could be re-scheduled by user at any time.
-  </para>
-  <para>
-   If
-   <methodname>Event::add</methodname>
-   is called on an already pending event, libevent will leave it pending and
-   re-schedule it with the given timeout(if specified). If in this case
-   timeout is not specified,
-   <methodname>Event::add</methodname>
-   has no effect.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>timeout</parameter>
-    </term>
-    <listitem>
-     <para>
-      Timeout in seconds.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Adding a custom signal</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-/*
-Launch it in a terminal window:
-
-$ php examples/signal.php
-
-In another terminal window find out the pid and send SIGTERM, e.g.:
-
-$ ps aux | grep examp
-ruslan    3976  0.2  0.0 139896 11256 pts/1    S+   10:25   0:00 php examples/signal.php
-ruslan    3978  0.0  0.0   9572   864 pts/2    S+   10:26   0:00 grep --color=auto examp
-$ kill -TERM 3976
-
-At the first terminal window you should catch the following:
-
-Caught signal 15
-*/
-class MyEventSignal {
-    private $base, $ev;
-
-    public function __construct($base) {
-        $this->base = $base;
-        $this->ev = Event::signal($base, SIGTERM, array($this, 'eventSighandler'));
-        $this->ev->add();
-    }
-
-    public function eventSighandler($no, $c) {
-        echo "Caught signal $no\n";
-        $this->base->exit();
-    }
-}
-
-$base = new EventBase();
-$c    = new MyEventSignal($base);
-
-$base->loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Caught signal 15
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Adding a timer</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-$base = new EventBase();
-$n = 2;
-$e = Event::timer($base, function($n) use (&$e) {
-    echo "$n seconds elapsed\n";
-    $e->delTimer();
-}, $n);
-$e->add($n);
-$base->loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-    <![CDATA[
-2 seconds elapsed
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Event::add</methodname></member>
-   <member><methodname>Event::del</methodname></member>
-   <member><methodname>Event::signal</methodname></member>
-   <member><methodname>Event::timer</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/event/addsignal.xml b/reference/event/event/addsignal.xml
deleted file mode 100644
index 0a6c27ec69a1..000000000000
--- a/reference/event/event/addsignal.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.addsignal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::addSignal</refname>
-  <refpurpose>&Alias; <methodname>Event::add</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   &info.method.alias; <methodname>Event::add</methodname>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/event/addtimer.xml b/reference/event/event/addtimer.xml
deleted file mode 100644
index 4da1df7fc033..000000000000
--- a/reference/event/event/addtimer.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.addtimer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::addTimer</refname>
-  <refpurpose>&Alias; <methodname>Event::add</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   &info.method.alias; <methodname>Event::add</methodname>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/event/construct.xml b/reference/event/event/construct.xml
deleted file mode 100644
index 0b3494f67a7a..000000000000
--- a/reference/event/event/construct.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::__construct</refname>
-  <refpurpose>Constructs Event object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>Event::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>what</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-    <initializer>NULL</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs Event object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event base to associate with.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <para>
-      stream resource, socket resource, or numeric file descriptor. For timer
-      events pass
-      <constant>-1</constant>.
-      For signal events pass the signal number, e.g.
-      <constant>SIGHUP</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>what</parameter>
-    </term>
-    <listitem>
-     <para>
-      Event flags. See
-      <link linkend="event.flags">Event flags</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event callback. See
-      <link linkend="event.callbacks">Event callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data. If specified, it will be passed to the callback when event
-      triggers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Event::signal</methodname>
-   </member>
-   <member>
-    <methodname>Event::timer</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/event/del.xml b/reference/event/event/del.xml
deleted file mode 100644
index 575446872fb4..000000000000
--- a/reference/event/event/del.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::del</refname>
-  <refpurpose>Makes event non-pending</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::del</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Removes an event from the set of monitored events, i.e. makes it
-   non-pending.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Event::add</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/event/delsignal.xml b/reference/event/event/delsignal.xml
deleted file mode 100644
index 0a4eca0a1ad6..000000000000
--- a/reference/event/event/delsignal.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.delsignal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::delSignal</refname>
-  <refpurpose>&Alias; <methodname>Event::del</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   &info.method.alias; <methodname>Event::del</methodname>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/event/deltimer.xml b/reference/event/event/deltimer.xml
deleted file mode 100644
index d4729f545b7c..000000000000
--- a/reference/event/event/deltimer.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.deltimer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::delTimer</refname>
-  <refpurpose>&Alias; <methodname>Event::del</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>
-   &info.method.alias; <methodname>Event::del</methodname>
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/event/free.xml b/reference/event/event/free.xml
deleted file mode 100644
index f365fb31d7fe..000000000000
--- a/reference/event/event/free.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.free" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::free</refname>
-  <refpurpose>Make event non-pending and free resources allocated for this
-  event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>Event::free</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Removes event from the list of events monitored by libevent, and free
-   resources allocated for the event.
-  </para>
-  <warning>
-   <para>
-    The
-    <methodname>Event::free</methodname>
-    method currently doesn't destruct the object itself. To destruct the
-    object completely call
-    <function>unset</function>,
-    or assign &null;.
-   </para>
-  </warning>
- </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;
-  <simplelist>
-   <member>
-    <methodname>Event::__construct</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/event/getsupportedmethods.xml b/reference/event/event/getsupportedmethods.xml
deleted file mode 100644
index a417247bd4a3..000000000000
--- a/reference/event/event/getsupportedmethods.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.getsupportedmethods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::getSupportedMethods</refname>
-  <refpurpose>Returns array of the names of the methods supported in this version of Libevent</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>array</type>
-   <methodname>Event::getSupportedMethods</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns array of the names of the methods(backends) supported in this
-   version of Libevent.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns array.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EventConfig</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/event/event/pending.xml b/reference/event/event/pending.xml
deleted file mode 100644
index a3e811a4f93d..000000000000
--- a/reference/event/event/pending.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.pending" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::pending</refname>
-  <refpurpose>Detects whether event is pending or scheduled</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::pending</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Detects whether event is pending or scheduled
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of, or a composition of the following constants:
-      <constant>Event::READ</constant>,
-      <constant>Event::WRITE</constant>,
-      <constant>Event::TIMEOUT</constant>,
-      <constant>Event::SIGNAL</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if event is pending or scheduled. 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/event/event/set.xml b/reference/event/event/set.xml
deleted file mode 100644
index b52ffb25b29d..000000000000
--- a/reference/event/event/set.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::set</refname>
-  <refpurpose>Re-configures event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::set</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>what</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Re-configures event. Note, this function doesn't invoke obsolete libevent's
-   event_set. It calls event_assign instead.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event base to associate the event with.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <para>
-      Stream resource, socket resource, or numeric file descriptor. For timer
-      events pass
-      <constant>-1</constant>.
-      For signal events pass the signal number, e.g.
-      <constant>SIGHUP</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>what</parameter>
-    </term>
-    <listitem>
-     <para>
-      See
-      <link linkend="event.flags">Event flags</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event callback. See
-      <link linkend="event.callbacks">Event callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data associated with the event. It will be passed to the callback
-      when the event becomes active.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/event/setpriority.xml b/reference/event/event/setpriority.xml
deleted file mode 100644
index 8de04b48c628..000000000000
--- a/reference/event/event/setpriority.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.setpriority" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::setPriority</refname>
-  <refpurpose>Set event priority</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::setPriority</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Set event priority.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event priority.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/event/settimer.xml b/reference/event/event/settimer.xml
deleted file mode 100644
index 3083fef92e1f..000000000000
--- a/reference/event/event/settimer.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.settimer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::setTimer</refname>
-  <refpurpose>Re-configures timer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>Event::setTimer</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Re-configures timer event. Note, this function doesn't invoke obsolete
-   libevent's
-   <literal>event_set</literal>.
-   It calls
-   <literal>event_assign</literal>
-   instead.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      The event base to associate with.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The timer event callback. See
-      <link linkend="event.callbacks">Event callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data. If specified, it will be passed to the callback when event
-      triggers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Event::__construct</methodname>
-   </member>
-   <member>
-    <methodname>Event::timer</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/event/signal.xml b/reference/event/event/signal.xml
deleted file mode 100644
index 62b101a780a1..000000000000
--- a/reference/event/event/signal.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.signal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::signal</refname>
-  <refpurpose>Constructs signal event object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>Event</type>
-   <methodname>Event::signal</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>signum</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs signal event object. This is a straightforward method to create
-   a signal event. Note, the generic
-   <methodname>Event::__construct</methodname>
-   method can contruct signal event objects too.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      The associated event base object.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>signum</parameter>
-    </term>
-    <listitem>
-     <para>
-      The signal number.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The signal event callback. See
-      <link linkend="event.callbacks">Event callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data. If specified, it will be passed to the callback when event
-      triggers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns Event object on success. Otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link linkend="event.constructing.signal.events">Constructing signal events</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/event/event/timer.xml b/reference/event/event/timer.xml
deleted file mode 100644
index d9e64bd10d30..000000000000
--- a/reference/event/event/timer.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="event.timer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Event::timer</refname>
-  <refpurpose>Constructs timer event object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>Event</type>
-   <methodname>Event::timer</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs timer event object. This is a straightforward method to create a
-   timer event. Note, the generic
-   <methodname>Event::__construct</methodname>
-   method can contruct signal event objects too.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      The associated event base object.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The signal event callback. See
-      <link linkend="event.callbacks">Event callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data. If specified, it will be passed to the callback when event
-      triggers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns Event object on success. 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/event/eventbase.xml b/reference/event/eventbase.xml
deleted file mode 100644
index 22c979b7aa26..000000000000
--- a/reference/event/eventbase.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventbase" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventBase class</title>
- <titleabbrev>EventBase</titleabbrev>
- <partintro>
-<!-- {{{ EventBase intro -->
-  <section xml:id="eventbase.intro">
-   &reftitle.intro;
-   <para>
-    <classname>EventBase</classname>
-    class represents libevent's event base structure. It holds a set of events
-    and can poll to determine which events are active.
-   </para>
-   <para>
-    Each event base has a
-    <emphasis>method</emphasis>,
-    or a
-    <emphasis>backend</emphasis>
-    that it uses to determine which events are ready. The recognized methods
-    are:
-    <literal>select</literal>,
-    <literal>poll</literal>,
-    <literal>epoll</literal>,
-    <literal>kqueue</literal>,
-    <literal>devpoll</literal>,
-    <literal>evport</literal>
-    and
-    <literal>win32</literal>.
-   </para>
-   <para>
-    To configure event base to use, or avoid specific backend
-    <classname>EventConfig</classname>
-    class can be used.
-   </para>
-   <warning xml:id="eventbase.object-dtor-warning">
-    <para>
-     Do
-     <emphasis>NOT</emphasis>
-     destroy the
-     <classname>EventBase</classname>
-     object as long as resources of the associated
-     <literal>Event</literal>
-     objects are not released. Otherwise, it will lead to unpredictable
-     results!
-    </para>
-   </warning>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventbase.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventBase</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventBase</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.loop-once">EventBase::LOOP_ONCE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.loop-nonblock">EventBase::LOOP_NONBLOCK</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.nolock">EventBase::NOLOCK</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.startup-iocp">EventBase::STARTUP_IOCP</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.no-cache-time">EventBase::NO_CACHE_TIME</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbase.constants.epoll-use-changelist">EventBase::EPOLL_USE_CHANGELIST</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventbase')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventBase constants -->
-  <section xml:id="eventbase.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventbase.constants.loop-once">
-     <term>
-      <constant>EventBase::LOOP_ONCE</constant>
-     </term>
-     <listitem>
-      <para>
-       Flag used with
-       <methodname>EventBase::loop</methodname>
-       method which means: "block until libevent has an active event, then
-       exit once all active events have had their callbacks run".
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbase.constants.loop-nonblock">
-     <term>
-      <constant>EventBase::LOOP_NONBLOCK</constant>
-     </term>
-     <listitem>
-      <para>
-       Flag used with
-       <methodname>EventBase::loop</methodname>
-       method which means: "do not block: see which events are ready now, run
-       the callbacks of the highest-priority ones, then exit".
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbase.constants.nolock">
-     <term>
-      <constant>EventBase::NOLOCK</constant>
-     </term>
-     <listitem>
-      <para>
-       Configuration flag. Do not allocate a lock for the event base, even if
-       we have locking set up".
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbase.constants.startup-iocp">
-     <term>
-      <constant>EventBase::STARTUP_IOCP</constant>
-     </term>
-     <listitem>
-      <para>
-       Windows-only configuration flag. Enables the IOCP dispatcher at
-       startup.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbase.constants.no-cache-time">
-     <term>
-      <constant>EventBase::NO_CACHE_TIME</constant>
-     </term>
-     <listitem>
-      <para>
-       Configuration flag. Instead of checking the current time every time the
-       event loop is ready to run timeout callbacks, check after each timeout
-       callback.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbase.constants.epoll-use-changelist">
-     <term>
-      <constant>EventBase::EPOLL_USE_CHANGELIST</constant>
-     </term>
-     <listitem>
-      <para>
-       If we are using the
-       <literal>epoll</literal>
-       backend, this flag says that it is safe to use Libevent's internal
-       change-list code to batch up adds and deletes in order to try to do as
-       few syscalls as possible.
-      </para>
-      <para>
-       Setting this flag can make code run faster, but it may trigger a Linux
-       bug: it is not safe to use this flag if one has any fds cloned by
-       dup(), or its variants. Doing so will produce strange and
-       hard-to-diagnose bugs.
-      </para>
-      <simpara>
-       This flag can also be activated by setting the
-       <literal>EVENT_EPOLL_USE_CHANGELIST</literal>
-       environment variable.
-      </simpara>
-      <para>
-       This flag has no effect if one winds up using a backend other than
-       <literal>epoll</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventbase;
-
-</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/event/eventbase/construct.xml b/reference/event/eventbase/construct.xml
deleted file mode 100644
index 6cdb680e2ba7..000000000000
--- a/reference/event/eventbase/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::__construct</refname>
-  <refpurpose>Constructs EventBase object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventBase::__construct</methodname>
-   <methodparam choice="opt">
-    <type>EventConfig</type>
-    <parameter>cfg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs EventBase object
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>cfg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Optional
-      <classname>EventConfig</classname>
-      object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   If <classname>EventBase</classname> cannot be constructed with the provided configuration,
-   a <classname>EventException</classname> will be thrown.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <classname>EventConfig</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/event/eventbase/dispatch.xml b/reference/event/eventbase/dispatch.xml
deleted file mode 100644
index bce4be7b960f..000000000000
--- a/reference/event/eventbase/dispatch.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="eventbase.dispatch">
- <refnamediv>
-  <refname>EventBase::dispatch</refname>
-  <refpurpose>Dispatch pending events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBase::dispatch</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Wait for events to become active, and run their callbacks. The same as
-   <methodname>EventBase::loop</methodname>
-   with no flags set.
-  </para>
-  <warning>
-   <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook)                           xpointer(id('eventbase.intro')/db:warning/db:para)"/>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::loop</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/eventbase/exit.xml b/reference/event/eventbase/exit.xml
deleted file mode 100644
index ef05e72fe052..000000000000
--- a/reference/event/eventbase/exit.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.exit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::exit</refname>
-  <refpurpose>Stop dispatching events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::exit</methodname>
-   <methodparam choice="opt">
-    <type>float</type>
-    <parameter>timeout</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Tells event base to stop optionally after given number of seconds.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>timeout</parameter>
-    </term>
-    <listitem>
-     <para>
-      Optional number of seconds after which the event base should stop
-      dispatching events.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::stop</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/eventbase/free.xml b/reference/event/eventbase/free.xml
deleted file mode 100644
index 21b8284e0694..000000000000
--- a/reference/event/eventbase/free.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.free" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::free</refname>
-  <refpurpose>Free resources allocated for this event base</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBase::free</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Deallocates resources allocated by libevent for the <classname>EventBase</classname> object.
-  </para>
-  <warning>
-   <para>
-    The
-    <methodname>EventBase::free</methodname>
-    method doesn't destruct the object itself. To destruct the
-    object completely call
-    <function>unset</function>,
-    or assign &null;.
-   </para>
-   <para>
-    This method does not deallocate or detach any of the events that are
-    currently associated with the <classname>EventBase</classname> object, or
-    close any of their sockets - beware.
-   </para>
-  </warning>
- </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;
-  <simplelist>
-   <member>
-    <methodname>EventBase::__construct</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/eventbase/getfeatures.xml b/reference/event/eventbase/getfeatures.xml
deleted file mode 100644
index 9824e6fddc08..000000000000
--- a/reference/event/eventbase/getfeatures.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.getfeatures" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::getFeatures</refname>
-  <refpurpose>Returns bitmask of features supported</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBase::getFeatures</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns bitmask of features supported.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns integer representing a bitmask of supported features. See
-   <link linkend="eventconfig.constants">EventConfig::FEATURE_* constants</link>.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBase::getFeatures</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Avoiding "select" method
-$cfg = new EventConfig();
-if ($cfg->avoidMethod("select")) {
-    echo "'select' method avoided\n";
-}
-
-$base = new EventBase($cfg);
-
-echo "Features:\n";
-$features = $base->getFeatures();
-($features & EventConfig::FEATURE_ET) and print "ET - edge-triggered IO\n";
-($features & EventConfig::FEATURE_O1) and print "O1 - O(1) operation for adding/deleting events\n";
-($features & EventConfig::FEATURE_FDS) and print "FDS - arbitrary file descriptor types, and not just sockets\n";
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::getMethod</methodname>
-   </member>
-   <member>
-    <classname>EventConfig</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/event/eventbase/getmethod.xml b/reference/event/eventbase/getmethod.xml
deleted file mode 100644
index 85ba6882751d..000000000000
--- a/reference/event/eventbase/getmethod.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.getmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::getMethod</refname>
-  <refpurpose>Returns event method in use</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBase::getMethod</methodname>
-   <void />
-  </methodsynopsis>
-  <para></para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String representing used event method(backend).
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBase::getMethod</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$cfg = new EventConfig();
-if ($cfg->avoidMethod("select")) {
-    echo "'select' method avoided\n";
-}
-
-// Create event_base associated with the config
-$base = new EventBase($cfg);
-echo "Event method used: ", $base->getMethod(), PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-`select' method avoided
-Event method used: epoll
-]]>
-   </screen>
-  </example>
- </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/eventbase/gettimeofdaycached.xml b/reference/event/eventbase/gettimeofdaycached.xml
deleted file mode 100644
index 30e0638f7a32..000000000000
--- a/reference/event/eventbase/gettimeofdaycached.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.gettimeofdaycached" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::getTimeOfDayCached</refname>
-  <refpurpose>Returns the current event base time</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>float</type>
-   <methodname>EventBase::getTimeOfDayCached</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   On success returns the current time(as returned by
-   <literal>gettimeofday()</literal>
-   ), looking at the cached value in
-   <emphasis>base</emphasis>
-   if possible, and calling
-   <literal>gettimeofday()</literal>
-   or
-   <literal>clock_gettime()</literal>
-   as appropriate if there is no cached time.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current
-   <emphasis>event base</emphasis>
-   time. On failure returns &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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventbase/gotexit.xml b/reference/event/eventbase/gotexit.xml
deleted file mode 100644
index b5caa3053e16..000000000000
--- a/reference/event/eventbase/gotexit.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.gotexit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::gotExit</refname>
-  <refpurpose>Checks if the event loop was told to exit</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::gotExit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the event loop was told to exit by
-   <methodname>EventBase::exit</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true;, event loop was told to exit by
-   <methodname>EventBase::exit</methodname>.
-   Otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::exit</methodname>
-   </member>
-   <member>
-    <methodname>EventBase::stop</methodname>
-   </member>
-   <member>
-    <methodname>EventBase::gotStop</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/eventbase/gotstop.xml b/reference/event/eventbase/gotstop.xml
deleted file mode 100644
index 3a58c448558c..000000000000
--- a/reference/event/eventbase/gotstop.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.gotstop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::gotStop</refname>
-  <refpurpose>Checks if the event loop was told to exit</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::gotStop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the event loop was told to exit by
-   <methodname>EventBase::stop</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true;, event loop was told to stop by
-   <methodname>EventBase::stop</methodname>.
-   Otherwise &false;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::exit</methodname>
-   </member>
-   <member>
-    <methodname>EventBase::stop</methodname>
-   </member>
-   <member>
-    <methodname>EventBase::gotExit</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/eventbase/loop.xml b/reference/event/eventbase/loop.xml
deleted file mode 100644
index 99c97aac5958..000000000000
--- a/reference/event/eventbase/loop.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="eventbase.loop">
- <refnamediv>
-  <refname>EventBase::loop</refname>
-  <refpurpose>Dispatch pending events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::loop</methodname>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Wait for events to become active, and run their callbacks.
-  </para>
-  <warning>
-   <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook)                           xpointer(id('eventbase.intro')/db:warning/db:para)"/>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      Optional flags. 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::dispatch</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/eventbase/priorityinit.xml b/reference/event/eventbase/priorityinit.xml
deleted file mode 100644
index 466f0e408a6e..000000000000
--- a/reference/event/eventbase/priorityinit.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.priorityinit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::priorityInit</refname>
-  <refpurpose>Sets number of priorities per event base</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::priorityInit</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>n_priorities</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets number of priorities per event base.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>n_priorities</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of priorities per event base.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>Event::setPriority</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/eventbase/reinit.xml b/reference/event/eventbase/reinit.xml
deleted file mode 100644
index ddbb9f80830f..000000000000
--- a/reference/event/eventbase/reinit.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.reinit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::reInit</refname>
-  <refpurpose>Re-initialize event base(after a fork)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::reInit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Re-initialize event base. Should be called after a fork.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/event/eventbase/stop.xml b/reference/event/eventbase/stop.xml
deleted file mode 100644
index b466e9e4928f..000000000000
--- a/reference/event/eventbase/stop.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbase.stop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBase::stop</refname>
-  <refpurpose>Tells event_base to stop dispatching events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBase::stop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Tells event_base to stop dispatching events
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::exit</methodname>
-   </member>
-   <member>
-    <methodname>EventBase::gotStop</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/eventbuffer.xml b/reference/event/eventbuffer.xml
deleted file mode 100644
index 1b4c35c41880..000000000000
--- a/reference/event/eventbuffer.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventbuffer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventBuffer class</title>
- <titleabbrev>EventBuffer</titleabbrev>
- <partintro>
-<!-- {{{ EventBuffer intro -->
-  <section xml:id="eventbuffer.intro">
-   &reftitle.intro;
-   <para>
-    <classname>EventBuffer</classname>
-    represents Libevent's "evbuffer", an utility functionality for buffered
-    I/O.
-   </para>
-   <para>
-    Event buffers are meant to be generally useful for doing the "buffer" part
-    of buffered network I/O.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventbuffer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventBuffer</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EventBuffer</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.eol-any">EventBuffer::EOL_ANY</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.eol-crlf">EventBuffer::EOL_CRLF</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.eol-crlf-strict">EventBuffer::EOL_CRLF_STRICT</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.eol-lf">EventBuffer::EOL_LF</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.ptr-set">EventBuffer::PTR_SET</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.constants.ptr-add">EventBuffer::PTR_ADD</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.props.length">length</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="eventbuffer.props.contiguous-space">contiguous_space</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventbuffer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventBuffer properties -->
-  <section xml:id="eventbuffer.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="eventbuffer.props.length">
-     <term>
-      <varname>length</varname>
-     </term>
-     <listitem>
-      <para>
-       The number of bytes stored in an event buffer.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.props.contiguous-space">
-     <term>
-      <varname>contiguous_space</varname>
-     </term>
-     <listitem>
-      <para>
-       The number of bytes stored contiguously at the front of the buffer. The
-       bytes in a buffer may be stored in multiple separate chunks of memory;
-       the property returns the number of bytes currently stored in the first
-       chunk.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-<!-- {{{ EventBuffer constants -->
-  <section xml:id="eventbuffer.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventbuffer.constants.eol-any">
-     <term>
-      <constant>EventBuffer::EOL_ANY</constant>
-     </term>
-     <listitem>
-      <para>
-       The end of line is any sequence of any number of carriage return and
-       linefeed characters. This format is not very useful; it exists mainly
-       for backward compatibility.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.constants.eol-crlf">
-     <term>
-      <constant>EventBuffer::EOL_CRLF</constant>
-     </term>
-     <listitem>
-      <para>
-       The end of the line is an optional carriage return, followed by a
-       linefeed. (In other words, it is either a
-       <literal>"\r\n"</literal>
-       or a
-       <literal>"\n"</literal>
-       .) This format is useful in parsing text-based Internet protocols,
-       since the standards generally prescribe a
-       <literal>"\r\n"</literal>
-       line-terminator, but nonconformant clients sometimes say just
-       <literal>"\n"</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.constants.eol-crlf-strict">
-     <term>
-      <constant>EventBuffer::EOL_CRLF_STRICT</constant>
-     </term>
-     <listitem>
-      <para>
-       The end of a line is a single carriage return, followed by a single
-       linefeed. (This is also known as
-       <literal>"\r\n"</literal>.
-       The ASCII values are
-       <literal>0x0D</literal>
-       <literal>0x0A</literal>
-       ).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.constants.eol-lf">
-     <term>
-      <constant>EventBuffer::EOL_LF</constant>
-     </term>
-     <listitem>
-      <para>
-       The end of a line is a single linefeed character. (This is also known
-       as
-       <literal>"\n"</literal>.
-       It is ASCII value is
-       <literal>0x0A</literal>
-       .)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.constants.ptr-set">
-     <term>
-      <constant>EventBuffer::PTR_SET</constant>
-     </term>
-     <listitem>
-      <para>
-       Flag used as argument of
-       <methodname>EventBuffer::setPosition</methodname>
-       method. If this flag specified, the position pointer is moved to an
-       absolute position within the buffer.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbuffer.constants.ptr-add">
-     <term>
-      <constant>EventBuffer::PTR_ADD</constant>
-     </term>
-     <listitem>
-      <para>
-       The same as
-       <constant>EventBuffer::PTR_SET</constant>,
-       except this flag causes
-       <methodname>EventBuffer::setPosition</methodname>
-       method to move position forward up to the specified number of
-       bytes(instead of setting absolute position).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventbuffer;
-
-</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/event/eventbuffer/add.xml b/reference/event/eventbuffer/add.xml
deleted file mode 100644
index ac232c362dce..000000000000
--- a/reference/event/eventbuffer/add.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::add</refname>
-  <refpurpose>Append data to the end of an event buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::add</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Append data to the end of an event buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      String to be appended to the end of the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::addBuffer</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/eventbuffer/addbuffer.xml b/reference/event/eventbuffer/addbuffer.xml
deleted file mode 100644
index bb0b8caf4cd5..000000000000
--- a/reference/event/eventbuffer/addbuffer.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.addbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::addBuffer</refname>
-  <refpurpose>Move all data from a buffer provided to the current instance of EventBuffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::addBuffer</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Move all data from the buffer provided in
-   <parameter>buf</parameter>
-   parameter to the end of current
-   <classname>EventBuffer</classname>.
-   This is a destructive add. The data from one buffer moves into the other
-   buffer. However, no unnecessary memory copies occur.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      The source EventBuffer object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::add</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/eventbuffer/appendfrom.xml b/reference/event/eventbuffer/appendfrom.xml
deleted file mode 100644
index f3792ee9cc66..000000000000
--- a/reference/event/eventbuffer/appendfrom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventbuffer.appendfrom">
- <refnamediv>
-  <refname>EventBuffer::appendFrom</refname>
-  <refpurpose>Moves the specified number of bytes from a source buffer to the
-  end of the current buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBuffer::appendFrom</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>len</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Moves the specified number of bytes from a source buffer to the end of the
-   current buffer. If there are fewer number of bytes, it moves all the bytes
-   available from the source buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      Source buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>len</parameter>
-    </term>
-    <listitem>
-     <para/>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes read.
-  </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 event 1.6.0</entry>
-      <entry>
-       Renamed <methodname>EventBuffer::appendFrom</methodname>(the old
-         method name) to <methodname>EventBuffer::appendFrom</methodname>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::copyout</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::drain</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::pullup</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::readLine</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::read</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/eventbuffer/construct.xml b/reference/event/eventbuffer/construct.xml
deleted file mode 100644
index d8d5c6318bc0..000000000000
--- a/reference/event/eventbuffer/construct.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::__construct</refname>
-  <refpurpose>Constructs EventBuffer object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventBuffer::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Constructs EventBuffer object
-  </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/event/eventbuffer/copyout.xml b/reference/event/eventbuffer/copyout.xml
deleted file mode 100644
index 5b440c52d192..000000000000
--- a/reference/event/eventbuffer/copyout.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.copyout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::copyout</refname>
-  <refpurpose>Copies out specified number of bytes from the front of the buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBuffer::copyout</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter role="reference">data</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>max_bytes</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Behaves just like
-   <methodname>EventBuffer::read</methodname>,
-   but does not drain any data from the buffer. I.e. it copies the first
-   <parameter>max_bytes</parameter>
-   bytes from the front of the buffer into
-   <parameter>data</parameter>.
-   If there are fewer than
-   <parameter>max_bytes</parameter>
-   bytes available, the function copies all the bytes there are.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      Output string.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>max_bytes</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of bytes to copy.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes copied, or
-   <constant>-1</constant>
-   on failure.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::read</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/drain.xml b/reference/event/eventbuffer/drain.xml
deleted file mode 100644
index beb303590a91..000000000000
--- a/reference/event/eventbuffer/drain.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.drain" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::drain</refname>
-  <refpurpose>Removes specified number of bytes from the front of the buffer
-  without copying it anywhere</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::drain</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>len</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Behaves as
-   <methodname>EventBuffer::read</methodname>,
-   except that it does not copy the data: it just removes it from the front
-   of the buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>len</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of bytes to remove from the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::read</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/enablelocking.xml b/reference/event/eventbuffer/enablelocking.xml
deleted file mode 100644
index 3aa585455612..000000000000
--- a/reference/event/eventbuffer/enablelocking.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.enablelocking" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::enableLocking</refname>
-  <refpurpose></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBuffer::enableLocking</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Enable locking on an
-   <classname>EventBuffer</classname>
-   so that it can safely be used by multiple threads at the same time. When
-   locking is enabled, the lock will be held when callbacks are invoked. This
-   could result in deadlock if you aren't careful. Plan accordingly!
-  </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;
-  <simplelist>
-   <member>
-    <link
-   xlink:href="&url.ev.buffers.threads;">Evbuffers and Thread-safety</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/event/eventbuffer/expand.xml b/reference/event/eventbuffer/expand.xml
deleted file mode 100644
index e0fcec65e836..000000000000
--- a/reference/event/eventbuffer/expand.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.expand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::expand</refname>
-  <refpurpose>Reserves space in buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::expand</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>len</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Alters the last chunk of memory in the buffer, or adds a new chunk, such
-   that the buffer is now large enough to contain
-   <parameter>len</parameter>
-   bytes without any further allocations.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>len</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of bytes to reserve for the buffer
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventbuffer/freeze.xml b/reference/event/eventbuffer/freeze.xml
deleted file mode 100644
index d93a0470515f..000000000000
--- a/reference/event/eventbuffer/freeze.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.freeze" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::freeze</refname>
-  <refpurpose>Prevent calls that modify an event buffer from succeeding</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::freeze</methodname>
-   <methodparam>
-    <type>bool</type>
-    <parameter>at_front</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Prevent calls that modify an event buffer from succeeding
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>at_front</parameter>
-    </term>
-    <listitem>
-     <para>
-      Whether to disable changes to the front or end of the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::unfreeze</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/eventbuffer/lock.xml b/reference/event/eventbuffer/lock.xml
deleted file mode 100644
index ecb65671f986..000000000000
--- a/reference/event/eventbuffer/lock.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.lock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::lock</refname>
-  <refpurpose>Acquires a lock on buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBuffer::lock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Acquires a lock on buffer. Can be used in pair with
-   <methodname>EventBuffer::unlock</methodname>
-   to make a set of operations atomic, i.e. thread-safe. Note, it is not
-   needed to lock buffers for
-   <emphasis>individual</emphasis>
-   operations. When locking is enabled(see
-   <methodname>EventBuffer::enableLocking</methodname>
-   ), individual operations on event buffers are already atomic.
-  </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;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::unlock</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/eventbuffer/prepend.xml b/reference/event/eventbuffer/prepend.xml
deleted file mode 100644
index 5984c6d07352..000000000000
--- a/reference/event/eventbuffer/prepend.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.prepend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::prepend</refname>
-  <refpurpose>Prepend data to the front of the buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::prepend</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Prepend data to the front of the buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      String to be prepended to the front of the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::prependBuffer</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::add</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::addBuffer</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/eventbuffer/prependbuffer.xml b/reference/event/eventbuffer/prependbuffer.xml
deleted file mode 100644
index 17729d86341a..000000000000
--- a/reference/event/eventbuffer/prependbuffer.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.prependbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::prependBuffer</refname>
-  <refpurpose>Moves all data from source buffer to the front of current buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::prependBuffer</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Behaves as
-   <methodname>EventBuffer::addBuffer</methodname>,
-   except that it moves data to the front of the buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      Source buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::add</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::addBuffer</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::prepend</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/eventbuffer/pullup.xml b/reference/event/eventbuffer/pullup.xml
deleted file mode 100644
index b6053e5acc50..000000000000
--- a/reference/event/eventbuffer/pullup.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.pullup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::pullup</refname>
-  <refpurpose>Linearizes data within buffer
-  and returns its contents as a string</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBuffer::pullup</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>size</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   "Linearizes" the first
-   <parameter>size</parameter>
-   bytes of the buffer, copying or moving them as needed to ensure that they
-   are all contiguous and occupying the same chunk of memory. If size is
-   negative, the function linearizes the entire buffer.
-  </para>
-  <warning>
-   <para>
-    Calling
-    <methodname>EventBuffer::pullup</methodname>
-    with a large size can be quite slow, since it potentially needs to copy
-    the entire buffer&apos;s contents.
-   </para>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>size</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of bytes required to be contiguous within the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If
-   <parameter>size</parameter>
-   is greater than the number of bytes in the buffer, the function returns
-   &null;. Otherwise,
-   <methodname>EventBuffer::pullup</methodname>
-   returns string.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::copyout</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::drain</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::read</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::readLine</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/read.xml b/reference/event/eventbuffer/read.xml
deleted file mode 100644
index c1ea5482ead4..000000000000
--- a/reference/event/eventbuffer/read.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventbuffer.read">
- <refnamediv>
-  <refname>EventBuffer::read</refname>
-  <refpurpose>Read data from an evbuffer and drain the bytes read</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBuffer::read</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>max_bytes</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Read the first
-   <parameter>max_bytes</parameter>
-   from the buffer and drain the bytes read. If more
-   <parameter>max_bytes</parameter>
-   are requested than are available in the buffer, it only extracts as many
-   bytes as available.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>max_bytes</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Maximum number of bytes to read from the buffer.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns string read, or &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>PECL event 1.6.0</entry>
-      <entry>
-       Renamed <methodname>EventBuffer::read</methodname>(the old method
-       name) to <methodname>EventBuffer::read</methodname>.
-       <methodname>EventBuffer::read</methodname> now takes only
-       <parameter>max_bytes</parameter> argument; returns string instead of
-       integer.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::copyout</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::drain</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::pullup</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::readLine</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/readfrom.xml b/reference/event/eventbuffer/readfrom.xml
deleted file mode 100644
index 5c07316f2ded..000000000000
--- a/reference/event/eventbuffer/readfrom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.readfrom" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::readFrom</refname>
-  <refpurpose>Read data from a file onto the end of the buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBuffer::read</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>howmuch</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Read data from the file specified by
-   <parameter>fd</parameter>
-   onto the end of the buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream, or numeric file descriptor.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>howmuch</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Maximum number of bytes to read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes read, or &false; on failure.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::copyout</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::drain</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::pullup</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::readLine</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/readline.xml b/reference/event/eventbuffer/readline.xml
deleted file mode 100644
index c953eaf20052..000000000000
--- a/reference/event/eventbuffer/readline.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.readline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::readLine</refname>
-  <refpurpose>Extracts a line from the front of the buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBuffer::readLine</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>eol_style</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Extracts a line from the front of the buffer and returns it in a newly
-   allocated string. If there is not a whole line to read, the function
-   returns &null;. The line terminator is not included in the copied string.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>eol_style</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventbuffer.constants">EventBuffer:EOL_* constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success returns the line read from the buffer, otherwise &null;.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::copyout</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::drain</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::pullup</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::read</methodname>
-   </member>
-   <member>
-    <methodname>EventBuffer::appendFrom</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/eventbuffer/search.xml b/reference/event/eventbuffer/search.xml
deleted file mode 100644
index 844e3f8b3757..000000000000
--- a/reference/event/eventbuffer/search.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.search" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::search</refname>
-  <refpurpose>Scans the buffer for an occurrence of a string</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>mixed</type>
-   <methodname>EventBuffer::search</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>what</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>int</type>
-    <parameter>start</parameter>
-    <initializer>-1</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>end</parameter>
-    <initializer>-1</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Scans the buffer for an occurrence of the string
-   <parameter>what</parameter>.
-   It returns numeric position of the string, or &false; if the string was
-   not found.
-  </para>
-  <para>
-   If the
-   <parameter>start</parameter>
-   argument is provided, it points to the position at which the search should
-   begin; otherwise, the search is performed from the start of the string. If
-   <parameter>end</parameter>
-   argument provided, the search is performed between start and end buffer
-   positions.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>what</parameter>
-    </term>
-    <listitem>
-     <para>
-      String to search.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>start</parameter>
-    </term>
-    <listitem>
-     <para>
-      Start search position.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>end</parameter>
-    </term>
-    <listitem>
-     <para>
-      End search position.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns numeric position of the first occurrence of the string in the
-   buffer, or &false; if string is not found.
-  </para>
-  &return.falseproblem;
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBuffer::search</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Count total occurrences of 'str' in 'buf'
-function count_instances($buf, $str) {
-    $total = 0;
-    $p     = 0;
-    $i     = 0;
-
-    while (1) {
-        $p = $buf->search($str, $p);
-        if ($p === FALSE) {
-            break;
-        }
-        ++$total;
-        ++$p;
-    }
-
-    return $total;
-}
-
-$buf = new EventBuffer();
-$buf->add("Some string within a string inside another string");
-var_dump(count_instances($buf, "str"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::searchEol</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/eventbuffer/searcheol.xml b/reference/event/eventbuffer/searcheol.xml
deleted file mode 100644
index 9493f4fd0eaa..000000000000
--- a/reference/event/eventbuffer/searcheol.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.searcheol" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::searchEol</refname>
-  <refpurpose>Scans the buffer for an occurrence of an end of line</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>mixed</type>
-   <methodname>EventBuffer::searchEol</methodname>
-   <methodparam
-   choice="opt">
-    <type>int</type>
-    <parameter>start</parameter>
-    <initializer>-1</initializer>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>eol_style</parameter>
-    <initializer>
-     <constant>EventBuffer::EOL_ANY</constant>
-    </initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Scans the buffer for an occurrence of an end of line specified by
-   <parameter>eol_style</parameter>
-   parameter . It returns numeric position of the string, or &false; if the
-   string was not found.
-  </para>
-  <para>
-   If the
-   <parameter>start</parameter>
-   argument is provided, it represents the position at which the search should
-   begin; otherwise, the search is performed from the start of the string. If
-   <parameter>end</parameter>
-   argument provided, the search is performed between start and end buffer
-   positions.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>start</parameter>
-    </term>
-    <listitem>
-     <para>
-      Start search position.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>eol_style</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventbuffer.constants">EventBuffer:EOL_* constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns numeric position of the first occurrence of end-of-line symbol in
-   the buffer, or &false; if not found.
-  </para>
-  &return.falseproblem;
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::search</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/eventbuffer/substr.xml b/reference/event/eventbuffer/substr.xml
deleted file mode 100644
index 0516b8f89a85..000000000000
--- a/reference/event/eventbuffer/substr.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.substr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::substr</refname>
-  <refpurpose>Subtracts a portion of the buffer data</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBuffer::substr</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>start</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>length</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Subtracts up to
-   <parameter>length</parameter>
-   bytes of the buffer data beginning at
-   <parameter>start</parameter>
-   position.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>start</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      The start position of data to be subtracted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>length</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Maximum number of bytes to subtract.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the data subtracted as a
-   <type>string</type>
-   on success, or &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::read</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/eventbuffer/unfreeze.xml b/reference/event/eventbuffer/unfreeze.xml
deleted file mode 100644
index 4e09c071e39f..000000000000
--- a/reference/event/eventbuffer/unfreeze.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.unfreeze" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::unfreeze</refname>
-  <refpurpose>Re-enable calls that modify an event buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::unfreeze</methodname>
-   <methodparam>
-    <type>bool</type>
-    <parameter>at_front</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Re-enable calls that modify an event buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>at_front</parameter>
-    </term>
-    <listitem>
-     <para>
-      Whether to enable events at the front or at the end of the buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::freeze</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/eventbuffer/unlock.xml b/reference/event/eventbuffer/unlock.xml
deleted file mode 100644
index fdbc74a61f2c..000000000000
--- a/reference/event/eventbuffer/unlock.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.unlock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::unlock</refname>
-  <refpurpose>Releases lock acquired by EventBuffer::lock</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBuffer::unlock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Releases lock acquired by
-   <methodname>EventBuffer::lock</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::lock</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/eventbuffer/write.xml b/reference/event/eventbuffer/write.xml
deleted file mode 100644
index f003ca65cc2f..000000000000
--- a/reference/event/eventbuffer/write.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbuffer.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBuffer::write</refname>
-  <refpurpose>Write contents of the buffer to a file or socket</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBuffer::write</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>fd</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>howmuch</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Write contents of the buffer to a file descriptor. The buffer will be
-   drained after the bytes have been successfully written.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>fd</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Socket resource, stream or numeric file descriptor normally
-      associated with a socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>howmuch</parameter>
-    </term>
-    <listitem>
-     <para>
-      The maximum number of bytes to write.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of bytes written, or &false; on error.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBuffer::read</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/eventbufferevent.about.callbacks.xml b/reference/event/eventbufferevent.about.callbacks.xml
deleted file mode 100644
index 5ef366d328e0..000000000000
--- a/reference/event/eventbufferevent.about.callbacks.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventbufferevent.about.callbacks">
- <title>About buffer event callbacks</title>
- <para>
-  An object of
-  <classname>EventBufferEvent</classname>
-  class represents a
-  <emphasis>buffer event</emphasis>.
-  The asynchronous nature of I/O performed by Libevent implies that a
-  socket(or other kind of file descriptor) is not always available. Event
-  invokes corresponding callbacks when the resource becomes available for
-  reading or writing, or when some event occurs(e.g. error, "end of line"
-  etc.).
- </para>
- <para>
-  Read and write callbacks should match the following prototype:
- </para>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>EventBufferEvent</type>
-   <parameter>bev</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>arg</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>bev</parameter>
-   </term>
-   <listitem>
-    <para>
-     Associated
-     <classname>EventBufferEvent</classname>
-     object.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>arg</parameter>
-   </term>
-   <listitem>
-    <para>
-     Custom variable attached to all callbacks via
-     <methodname>EventBufferEvent::__construct</methodname>,
-     or
-     <methodname>EventBufferEvent::setCallbacks</methodname>.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <para>
-  Event callback should match the following prototype:
- </para>
- <methodsynopsis>
-  <type>void</type>
-  <methodname>callback</methodname>
-  <methodparam choice="opt">
-   <type>EventBufferEvent</type>
-   <parameter>bev</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>int</type>
-   <parameter>events</parameter>
-   <initializer>0</initializer>
-  </methodparam>
-  <methodparam choice="opt">
-   <type>mixed</type>
-   <parameter>arg</parameter>
-   <initializer>&null;</initializer>
-  </methodparam>
- </methodsynopsis>
- <variablelist>
-  <varlistentry>
-   <term>
-    <parameter>bev</parameter>
-   </term>
-   <listitem>
-    <para>
-     Associated
-     <classname>EventBufferEvent</classname>
-     object.
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>events</parameter>
-   </term>
-   <listitem>
-    <para>
-     Bit mask of events:
-     <constant>EventBufferEvent::READING</constant>,
-     <constant>EventBufferEvent::WRITING</constant>,
-     <constant>EventBufferEvent::EOL</constant>,
-     <constant>EventBufferEvent::ERROR</constant>
-     and
-     <constant>EventBufferEvent::TIMEOUT</constant>.
-     See
-     <link linkend="eventbufferevent.constants">EventBufferEvent constants</link>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <parameter>arg</parameter>
-   </term>
-   <listitem>
-    <para>
-     Custom variable attached to all callbacks via
-     <methodname>EventBufferEvent::__construct</methodname>,
-     or
-     <methodname>EventBufferEvent::setCallbacks</methodname>.
-    </para>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</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/event/eventbufferevent.xml b/reference/event/eventbufferevent.xml
deleted file mode 100644
index 02696f7f462c..000000000000
--- a/reference/event/eventbufferevent.xml
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventbufferevent" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventBufferEvent class</title>
- <titleabbrev>EventBufferEvent</titleabbrev>
- <partintro>
-<!-- {{{ EventBufferEvent intro -->
-  <section xml:id="eventbufferevent.intro">
-   &reftitle.intro;
-   <para>
-    Represents Libevent&apos;s buffer event.
-   </para>
-   <para>
-    Usually an application wants to perform some amount of data buffering in
-    addition to just responding to events. When we want to write data, for
-    example, the usual pattern looks like:
-   </para>
-   <orderedlist>
-    <listitem>
-     <para>
-      Decide that we want to write some data to a connection; put that data in
-      a buffer.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Wait for the connection to become writable
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Write as much of the data as we can
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      Remember how much we wrote, and if we still have more data to write,
-      wait for the connection to become writable again.
-     </para>
-    </listitem>
-   </orderedlist>
-   <para>
-    This buffered I/O pattern is common enough that Libevent provides a
-    generic mechanism for it. A "buffer event" consists of an underlying
-    transport (like a socket), a read buffer, and a write buffer. Instead of
-    regular events, which give callbacks when the underlying transport is
-    ready to be read or written, a buffer event invokes its user-supplied
-    callbacks when it has read or written enough data.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventbufferevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventBufferEvent</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventBufferEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.reading">EventBufferEvent::READING</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.writing">EventBufferEvent::WRITING</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.eof">EventBufferEvent::EOF</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.error">EventBufferEvent::ERROR</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.timeout">EventBufferEvent::TIMEOUT</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.connected">EventBufferEvent::CONNECTED</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.opt-close-on-free">EventBufferEvent::OPT_CLOSE_ON_FREE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.opt-threadsafe">EventBufferEvent::OPT_THREADSAFE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.opt-defer-callbacks">EventBufferEvent::OPT_DEFER_CALLBACKS</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.opt-unlock-callbacks">EventBufferEvent::OPT_UNLOCK_CALLBACKS</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.ssl-open">EventBufferEvent::SSL_OPEN</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.ssl-connecting">EventBufferEvent::SSL_CONNECTING</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.constants.ssl-accepting">EventBufferEvent::SSL_ACCEPTING</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.props.fd">fd</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="eventbufferevent.props.priority">priority</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>EventBuffer</type>
-     <varname linkend="eventbufferevent.props.input">input</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>EventBuffer</type>
-     <varname linkend="eventbufferevent.props.output">output</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventbufferevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventBufferEvent properties -->
-  <section xml:id="eventbufferevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="eventbufferevent.props.fd">
-     <term>
-      <varname>fd</varname>
-     </term>
-     <listitem>
-      <para>
-       Numeric file descriptor associated with the buffer event. Normally
-       represents a bound socket. Equals to &null;, if there is no file
-       descriptor(socket) associated with the buffer event.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.props.priority">
-     <term>
-      <varname>priority</varname>
-     </term>
-     <listitem>
-      <para>
-       The priority of the events used to implement the buffer event.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.props.input">
-     <term>
-      <varname>input</varname>
-     </term>
-     <listitem>
-      <para>
-       Underlying input buffer object(
-       <classname>EventBuffer</classname>)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.props.output">
-     <term>
-      <varname>output</varname>
-     </term>
-     <listitem>
-      <para>
-       Underlying output buffer object(
-       <classname>EventBuffer</classname>)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-<!-- {{{ EventBufferEvent constants -->
-  <section xml:id="eventbufferevent.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventbufferevent.constants.reading">
-     <term>
-      <constant>EventBufferEvent::READING</constant>
-     </term>
-     <listitem>
-      <para>
-       An event occurred during a read operation on the bufferevent. See the
-       other flags for which event it was.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.writing">
-     <term>
-      <constant>EventBufferEvent::WRITING</constant>
-     </term>
-     <listitem>
-      <para>
-       An event occurred during a write operation on the bufferevent. See the
-       other flags for which event it was.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.eof">
-     <term>
-      <constant>EventBufferEvent::EOF</constant>
-     </term>
-     <listitem>
-      <para>
-       Got an end-of-file indication on the buffer event.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.error">
-     <term>
-      <constant>EventBufferEvent::ERROR</constant>
-     </term>
-     <listitem>
-      <para>
-       An error occurred during a bufferevent operation. For more information
-       on what the error was, call
-       <methodname>EventUtil::getLastSocketErrno</methodname>
-       and/or
-       <methodname>EventUtil::getLastSocketError</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.timeout">
-     <term>
-      <constant>EventBufferEvent::TIMEOUT</constant>
-     </term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.connected">
-     <term>
-      <constant>EventBufferEvent::CONNECTED</constant>
-     </term>
-     <listitem>
-      <para>
-       Finished a requested connection on the bufferevent.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.opt-close-on-free">
-     <term>
-      <constant>EventBufferEvent::OPT_CLOSE_ON_FREE</constant>
-     </term>
-     <listitem>
-      <para>
-       When the buffer event is freed, close the underlying transport. This
-       will close an underlying socket, free an underlying buffer event, etc.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.opt-threadsafe">
-     <term>
-      <constant>EventBufferEvent::OPT_THREADSAFE</constant>
-     </term>
-     <listitem>
-      <para>
-       Automatically allocate locks for the bufferevent, so that it’s safe
-       to use from multiple threads.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.opt-defer-callbacks">
-     <term>
-      <constant>EventBufferEvent::OPT_DEFER_CALLBACKS</constant>
-     </term>
-     <listitem>
-      <para>
-       When this flag is set, the bufferevent defers all of its callbacks. See
-       <link
-      xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref6_bufferevent.html#_deferred_callbacks">Fast
-      portable non-blocking network programming with Libevent, Deferred callbacks</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.opt-unlock-callbacks">
-     <term>
-      <constant>EventBufferEvent::OPT_UNLOCK_CALLBACKS</constant>
-     </term>
-     <listitem>
-      <para>
-       By default, when the bufferevent is set up to be threadsafe, the buffer
-       event’s locks are held whenever the any user-provided callback is
-       invoked. Setting this option makes Libevent release the buffer
-       event’s lock when it’s invoking the callbacks.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.ssl-open">
-     <term>
-      <constant>EventBufferEvent::SSL_OPEN</constant>
-     </term>
-     <listitem>
-      <para>
-       The SSL handshake is done
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.ssl-connecting">
-     <term>
-      <constant>EventBufferEvent::SSL_CONNECTING</constant>
-     </term>
-     <listitem>
-      <para>
-       SSL is currently performing negotiation as a client
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventbufferevent.constants.ssl-accepting">
-     <term>
-      <constant>EventBufferEvent::SSL_ACCEPTING</constant>
-     </term>
-     <listitem>
-      <para>
-       SSL is currently performing negotiation as a server
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventbufferevent;
-
-</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/event/eventbufferevent/close.xml b/reference/event/eventbufferevent/close.xml
deleted file mode 100644
index 914426a1c6b0..000000000000
--- a/reference/event/eventbufferevent/close.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::close</refname>
-  <refpurpose>Closes file descriptor associated with the current buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBufferEvent::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Closes file descriptor associated with the current buffer event.
-  </para>
-  <para>
-   This method may be used in cases when the
-   <constant>EventBufferEvent::OPT_CLOSE_ON_FREE</constant> option is not appropriate.
-  </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/event/eventbufferevent/connect.xml b/reference/event/eventbufferevent/connect.xml
deleted file mode 100644
index 5aa541314c0f..000000000000
--- a/reference/event/eventbufferevent/connect.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::connect</refname>
-  <refpurpose>Connect buffer event&apos;s file descriptor to given address or
-  UNIX socket</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::connect</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>addr</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Connect buffer event&apos;s file descriptor to given address(optionally
-   with port), or a UNIX domain socket.
-  </para>
-  <para>
-   If socket is not assigned to the buffer event, this function allocates a
-   new socket and makes it non-blocking internally.
-  </para>
-  <simpara>
-   To resolve DNS names(asynchronously), use
-   <methodname>EventBufferEvent::connectHost</methodname>
-   method.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>addr</parameter>
-    </term>
-    <listitem>
-     <para>
-      Should contain an IP address with optional port number, or a path to
-      UNIX domain socket. Recognized formats are:
-<screen>
-<![CDATA[
-[IPv6Address]:port
-[IPv6Address]
-IPv6Address
-IPv4Address:port
-IPv4Address
-unix:path
-]]>
-      </screen>
-      Note,
-      <literal>'unix:'</literal>
-      prefix is currently not case sensitive.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBufferEvent::connect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * 1. Connect to 127.0.0.1 at port 80
- * by means of EventBufferEvent::connect().
- *
- * 2. Request /index.cphp via HTTP/1.0
- * using the output buffer.
- *
- * 3. Asynchronously read the response and print it to stdout.
- */
-
-/* Read callback */
-function readcb($bev, $base) {
-    $input = $bev->getInput();
-
-    while (($n = $input->remove($buf, 1024)) > 0) {
-        echo $buf;
-    }
-}
-
-/* Event callback */
-function eventcb($bev, $events, $base) {
-    if ($events & EventBufferEvent::CONNECTED) {
-        echo "Connected.\n";
-    } elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "DNS error: ", $bev->getDnsErrorString(), PHP_EOL;
-        }
-
-        echo "Closing\n";
-        $base->exit();
-        exit("Done\n");
-    }
-}
-
-$base = new EventBase();
-
-echo "step 1\n";
-$bev = new EventBufferEvent($base, /* use internal socket */ NULL,
-    EventBufferEvent::OPT_CLOSE_ON_FREE | EventBufferEvent::OPT_DEFER_CALLBACKS);
-if (!$bev) {
-    exit("Failed creating bufferevent socket\n");
-}
-
-echo "step 2\n";
-$bev->setCallbacks("readcb", /* writecb */ NULL, "eventcb", $base);
-$bev->enable(Event::READ | Event::WRITE);
-
-echo "step 3\n";
-/* Send request */
-$output = $bev->getOutput();
-if (!$output->add(
-    "GET /index.cphp HTTP/1.0\r\n".
-    "Connection: Close\r\n\r\n"
-)) {
-    exit("Failed adding request to output buffer\n");
-}
-
-/* Connect to the host synchronously.
- * We know the IP, and don't need to resolve DNS. */
-if (!$bev->connect("127.0.0.1:80")) {
-    exit("Can't connect to host\n");
-}
-
-/* Dispatch pending events */
-$base->dispatch();
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-step 1
-step 2
-step 3
-Connected.
-HTTP/1.1 200 OK
-Server: nginx/1.2.6
-Date: Sat, 09 Mar 2013 10:06:58 GMT
-Content-Type: text/html; charset=utf-8
-Connection: close
-X-Powered-By: PHP/5.4.11--pl2-gentoo
-
-sdfsdfsf
-Closing
-Done
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Connect to UNIX domain socket which presumably is served by a server, read response from
-   the server and output it to the console</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyUnixSocketClient {
-    private $base, $bev;
-
-    function __construct($base, $sock_path) {
-        $this->base = $base;
-        $this->bev = new EventBufferEvent($base, NULL, EventBufferEvent::OPT_CLOSE_ON_FREE,
-            array ($this, "read_cb"), NULL, array ($this, "event_cb"));
-
-        if (!$this->bev->connect("unix:$sock_path")) {
-            trigger_error("Failed to connect to socket `$sock_path'", E_USER_ERROR);
-        }
-
-        $this->bev->enable(Event::READ);
-    }
-
-    function __destruct() {
-        if ($this->bev) {
-            $this->bev->free();
-            $this->bev = NULL;
-        }
-    }
-
-    function dispatch() {
-        $this->base->dispatch();
-    }
-
-    function read_cb($bev, $unused) {
-        $in = $bev->input;
-
-        printf("Received %ld bytes\n", $in->length);
-        printf("----- data ----\n");
-        printf("%ld:\t%s\n", (int) $in->length, $in->pullup(-1));
-
-        $this->bev->free();
-        $this->bev = NULL;
-        $this->base->exit(NULL);
-    }
-
-    function event_cb($bev, $events, $unused) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "Error from bufferevent\n";
-        }
-
-        if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-            $bev->free();
-            $bev = NULL;
-        } elseif ($events & EventBufferEvent::CONNECTED) {
-            $bev->output->add("test\n");
-        }
-    }
-}
-
-if ($argc <= 1) {
-    exit("Socket path is not provided\n");
-}
-$sock_path = $argv[1];
-
-$base = new EventBase();
-$cl = new MyUnixSocketClient($base, $sock_path);
-$cl->dispatch();
-?>
-
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Received 5 bytes
------ data ----
-5:  test
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::connectHost</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/eventbufferevent/connecthost.xml b/reference/event/eventbufferevent/connecthost.xml
deleted file mode 100644
index d177d6dba9cf..000000000000
--- a/reference/event/eventbufferevent/connecthost.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.connecthost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::connectHost</refname>
-  <refpurpose>Connects to a hostname with optionally asynchronous DNS resolving</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::connectHost</methodname>
-   <methodparam>
-    <type>EventDnsBase</type>
-    <parameter>dns_base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>hostname</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>port</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>int</type>
-    <parameter>family</parameter>
-    <initializer>EventUtil::AF_UNSPEC</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Resolves the DNS name hostname, looking for addresses of type
-   <parameter>family</parameter>
-   (
-   <literal>EventUtil::AF_*</literal>
-   constants). If the name resolution fails, it invokes the event callback
-   with an error event. If it succeeds, it launches a connection attempt just
-   as
-   <methodname>EventBufferEvent::connect</methodname>
-   would.
-  </para>
-  <simpara>
-   <parameter>dns_base</parameter>
-   is optional. May be &null;, or an object created with
-   <methodname>EventDnsBase::__construct</methodname>.
-   For asynchronous hostname resolving pass a valid event dns base resource.
-   Otherwise the hostname resolving will block.
-  </simpara>
-  <note>
-   <para>
-    <classname>EventDnsBase</classname>
-    is available only if
-    <literal>Event</literal>
-    configured
-    <option role="configure">--with-event-extra</option>
-    (
-    <literal>event_extra</literal>
-    library,
-    <emphasis>libevent protocol-specific functionality support including HTTP, DNS, and RPC</emphasis>
-    ).
-   </para>
-  </note>
-  <note>
-   <para>
-    <methodname>EventBufferEvent::connectHost</methodname>
-    requires
-    <literal>libevent-2.0.3-alpha</literal>
-    or greater.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>dns_base</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Object of
-      <classname>EventDnsBase</classname>
-      in case if DNS is to be resolved asynchronously. Otherwise &null;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hostname</parameter>
-    </term>
-    <listitem>
-     <para>
-      Hostname to connect to. Recognized formats are:
-<screen>
-<![CDATA[
- www.example.com (hostname)
- 1.2.3.4 (ipv4address)
- ::1 (ipv6address)
-[::1] ([ipv6address])
-]]>
-      </screen>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      Port number
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>family</parameter>
-    </term>
-    <listitem>
-     <para>
-      Address family.
-      <constant>EventUtil::AF_UNSPEC</constant>,
-      <constant>EventUtil::AF_INET</constant>,
-      or
-      <constant>EventUtil::AF_INET6</constant>.
-      See
-      <link linkend="eventutil.constants">EventUtil constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBufferEvent::connectHost</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Read callback */
-function readcb($bev, $base) {
-    //$input = $bev->input; //$bev->getInput();
-
-    //$pos = $input->search("TTP");
-    $pos = $bev->input->search("TTP");
-
-    while (($n = $bev->input->remove($buf, 1024)) > 0) {
-        echo $buf;
-    }
-}
-
-/* Event callback */
-function eventcb($bev, $events, $base) {
-    if ($events & EventBufferEvent::CONNECTED) {
-        echo "Connected.\n";
-    } elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "DNS error: ", $bev->getDnsErrorString(), PHP_EOL;
-        }
-
-        echo "Closing\n";
-        $base->exit();
-        exit("Done\n");
-    }
-}
-
-$base = new EventBase();
-
-$dns_base = new EventDnsBase($base, TRUE); // We'll use async DNS resolving
-if (!$dns_base) {
-    exit("Failed to init DNS Base\n");
-}
-
-$bev = new EventBufferEvent($base, /* use internal socket */ NULL,
-    EventBufferEvent::OPT_CLOSE_ON_FREE | EventBufferEvent::OPT_DEFER_CALLBACKS,
-    "readcb", /* writecb */ NULL, "eventcb", $base
-);
-if (!$bev) {
-    exit("Failed creating bufferevent socket\n");
-}
-
-//$bev->setCallbacks("readcb", /* writecb */ NULL, "eventcb", $base);
-$bev->enable(Event::READ | Event::WRITE);
-
-$output = $bev->output; //$bev->getOutput();
-if (!$output->add(
-    "GET {$argv[2]} HTTP/1.0\r\n".
-    "Host: {$argv[1]}\r\n".
-    "Connection: Close\r\n\r\n"
-)) {
-    exit("Failed adding request to output buffer\n");
-}
-
-if (!$bev->connectHost($dns_base, $argv[1], 80, EventUtil::AF_UNSPEC)) {
-    exit("Can't connect to host {$argv[1]}\n");
-}
-
-$base->dispatch();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Connected.
-HTTP/1.0 301 Moved Permanently
-Location: http://www.google.co.uk/
-Content-Type: text/html; charset=UTF-8
-Date: Sat, 09 Mar 2013 12:21:19 GMT
-Expires: Mon, 08 Apr 2013 12:21:19 GMT
-Cache-Control: public, max-age=2592000
-Server: gws
-Content-Length: 221
-X-XSS-Protection: 1; mode=block
-X-Frame-Options: SAMEORIGIN
-
-<HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
-<TITLE>301 Moved</TITLE></HEAD><BODY>
-<H1>301 Moved</H1>
-The document has moved
-<A HREF="http://www.google.co.uk/">here</A>.
-</BODY></HTML>
-Closing
-Done
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::connect</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/eventbufferevent/construct.xml b/reference/event/eventbufferevent/construct.xml
deleted file mode 100644
index ee70597f2857..000000000000
--- a/reference/event/eventbufferevent/construct.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::__construct</refname>
-  <refpurpose>Constructs EventBufferEvent object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventBufferEvent::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>mixed</type>
-    <parameter>socket</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>int</type>
-    <parameter>options</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>callable</type>
-    <parameter>readcb</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>callable</type>
-    <parameter>writecb</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>callable</type>
-    <parameter>eventcb</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Create a buffer event on a socket, stream or a file descriptor. Passing
-   &null; to
-   <parameter>socket</parameter>
-   means that the socket should be created later, e.g. by means of
-   <methodname>EventBufferEvent::connect</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Event base that should be associated with the new buffer event.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      May be created as a stream(not necessarily by means of
-      <literal>sockets</literal>
-      extension)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventbufferevent.constants">EventBufferEvent::OPT_*
-     constants</link>,
-      or
-      <literal>0</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>readcb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Read event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>writecb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Write event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>eventcb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Status-change event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      A variable that will be passed to all the callbacks.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::sslFilter</methodname>
-   </member>
-   <member>
-    <methodname>EventBufferEvent::sslSocket</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/eventbufferevent/createpair.xml b/reference/event/eventbufferevent/createpair.xml
deleted file mode 100644
index ad625897402f..000000000000
--- a/reference/event/eventbufferevent/createpair.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventbufferevent.createpair">
- <refnamediv>
-  <refname>EventBufferEvent::createPair</refname>
-  <refpurpose>Creates two buffer events connected to each other</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>array</type>
-   <methodname>EventBufferEvent::createPair</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>options</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Returns array of two
-   <classname>EventBufferEvent</classname>
-   objects connected to each other. All the usual options are supported,
-   except for
-   <constant>EventBufferEvent::OPT_CLOSE_ON_FREE</constant>,
-   which has no effect, and
-   <constant>EventBufferEvent::OPT_DEFER_CALLBACKS</constant>,
-   which is always on.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      <link>EventBufferEvent::OPT_* constants</link>
-      combined with bitwise
-      <literal>OR</literal>
-      operator.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns array of two
-   <classname>EventBufferEvent</classname>
-   objects connected to each other.
-  </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 event 1.9.0</entry>
-      <entry>
-       Method made static.
-      </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/event/eventbufferevent/disable.xml b/reference/event/eventbufferevent/disable.xml
deleted file mode 100644
index b7b50dbc842d..000000000000
--- a/reference/event/eventbufferevent/disable.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::disable</refname>
-  <refpurpose>Disable events read, write, or both on a buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::disable</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Disable events
-   <constant>Event::READ</constant>,
-   <constant>Event::WRITE</constant>,
-   or
-   <constant>Event::READ</constant>
-   <literal>|</literal>
-   <constant>Event::WRITE</constant>
-   on a buffer event.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <para></para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::enable</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/eventbufferevent/enable.xml b/reference/event/eventbufferevent/enable.xml
deleted file mode 100644
index 26bc794ce813..000000000000
--- a/reference/event/eventbufferevent/enable.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::enable</refname>
-  <refpurpose>Enable events read, write, or both on a buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::enable</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Enable events
-   <constant>Event::READ</constant>,
-   <constant>Event::WRITE</constant>,
-   or
-   <constant>Event::READ</constant>
-   <literal>|</literal>
-   <constant>Event::WRITE</constant>
-   on a buffer event.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <para>
-      <constant>Event::READ</constant>,
-      <constant>Event::WRITE</constant>,
-      or
-      <constant>Event::READ</constant>
-      <literal>|</literal>
-      <constant>Event::WRITE</constant>
-      on a buffer event.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::disable</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/eventbufferevent/free.xml b/reference/event/eventbufferevent/free.xml
deleted file mode 100644
index 8462ca361c68..000000000000
--- a/reference/event/eventbufferevent/free.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.free" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::free</refname>
-  <refpurpose>Free a buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBufferEvent::free</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Free resources allocated by buffer event.
-  </para>
-  <para>
-   Usually there is no need to call this method, since normally it is done
-   within internal object destructors. However, sometimes we have a long-time
-   script allocating lots of instances, or a script with a heavy memory usage,
-   where we need to free resources as soon as possible. In such cases
-   <methodname>EventBufferEvent::free</methodname>
-   may be used to protect the script against running up to the
-   <literal>memory_limit</literal>.
-  </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/event/eventbufferevent/getdnserrorstring.xml b/reference/event/eventbufferevent/getdnserrorstring.xml
deleted file mode 100644
index 31737418fc51..000000000000
--- a/reference/event/eventbufferevent/getdnserrorstring.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.getdnserrorstring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::getDnsErrorString</refname>
-  <refpurpose>Returns string describing the last failed DNS lookup attempt</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::getDnsErrorString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns string describing the last failed DNS lookup attempt made by
-   <methodname>EventBufferEvent::connectHost</methodname>,
-   or an empty string, if there is no DNS error detected.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string describing DNS lookup error, or an empty string for no
-   error.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::connectHost</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/eventbufferevent/getenabled.xml b/reference/event/eventbufferevent/getenabled.xml
deleted file mode 100644
index 2adfd24b3889..000000000000
--- a/reference/event/eventbufferevent/getenabled.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.getenabled" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::getEnabled</refname>
-  <refpurpose>Returns bitmask of events currently enabled on the buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventBufferEvent::getEnabled</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns bitmask of events currently enabled on the buffer event
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns integer representing a bitmask of events currently enabled on the
-   buffer event
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::enable</methodname>
-   </member>
-   <member>
-    <methodname>EventBufferEvent::disable</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/eventbufferevent/getinput.xml b/reference/event/eventbufferevent/getinput.xml
deleted file mode 100644
index 00f05a36a64d..000000000000
--- a/reference/event/eventbufferevent/getinput.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.getinput" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::getInput</refname>
-  <refpurpose>Returns underlying input buffer associated with current buffer
-  event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBuffer</type>
-   <methodname>EventBufferEvent::getInput</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns underlying input buffer associated with current buffer event. An
-   input buffer is a storage for data to read.
-  </para>
-  <para>
-   Note, there is also
-   <literal>
-    <link
-  linkend="eventbufferevent.props.input">input</link>
-   </literal>
-   property of
-   <classname>EventBufferEvent</classname>
-   class.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns instance of
-   <classname>EventBuffer</classname>
-   input buffer associated with current buffer event.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Buffer event's read callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function readcb($bev, $base) {
-    $input = $bev->input; //$bev->getInput();
-
-    while (($n = $input->remove($buf, 1024)) > 0) {
-        echo $buf;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::getOutput</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/eventbufferevent/getoutput.xml b/reference/event/eventbufferevent/getoutput.xml
deleted file mode 100644
index 1fe54065ea3b..000000000000
--- a/reference/event/eventbufferevent/getoutput.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.getoutput" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::getOutput</refname>
-  <refpurpose>Returns underlying output buffer associated with current buffer
-  event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBuffer</type>
-   <methodname>EventBufferEvent::getOutput</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns underlying output buffer associated with current buffer event. An
-   output buffer is a storage for data to be written.
-  </para>
-  <para>
-   Note, there is also
-   <literal>
-    <link
-  linkend="eventbufferevent.props.output">output</link>
-   </literal>
-   property of
-   <classname>EventBufferEvent</classname>
-   class.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns instance of
-   <classname>EventBuffer</classname>
-   output buffer associated with current buffer event.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBufferEvent::getOutput</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$base = new EventBase();
-
-$dns_base = new EventDnsBase($base, TRUE); // Use async DNS resolving
-if (!$dns_base) {
-    exit("Failed to init DNS Base\n");
-}
-
-$bev = new EventBufferEvent($base, /* use internal socket */ NULL,
-    EventBufferEvent::OPT_CLOSE_ON_FREE | EventBufferEvent::OPT_DEFER_CALLBACKS,
-    "readcb", /* writecb */ NULL, "eventcb", $base
-);
-if (!$bev) {
-    exit("Failed creating bufferevent socket\n");
-}
-
-$bev->enable(Event::READ | Event::WRITE);
-
-$output = $bev->getOutput();
-if (!$output->add(
-    "GET {$argv[2]} HTTP/1.0\r\n".
-    "Host: {$argv[1]}\r\n".
-    "Connection: Close\r\n\r\n"
-)) {
-    exit("Failed adding request to output buffer\n");
-}
-
-/* ... */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::getInput</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/eventbufferevent/read.xml b/reference/event/eventbufferevent/read.xml
deleted file mode 100644
index 6d4d8baa8ab2..000000000000
--- a/reference/event/eventbufferevent/read.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::read</refname>
-  <refpurpose>Read buffer&apos;s data</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::read</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>size</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Removes up to
-   <parameter>size</parameter>
-   bytes from the input buffer. Returns a string of data read from the input
-   buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>size</parameter>
-    </term>
-    <listitem>
-     <para>
-      Maximum number of bytes to read
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns string of data read from the input buffer.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::readBuffer</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/eventbufferevent/readbuffer.xml b/reference/event/eventbufferevent/readbuffer.xml
deleted file mode 100644
index c93ed8d1d96f..000000000000
--- a/reference/event/eventbufferevent/readbuffer.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.readbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::readBuffer</refname>
-  <refpurpose>Drains the entire contents of the input buffer and places them into buf</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::readBuffer</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Drains the entire contents of the input buffer and places them into
-   <parameter>buf</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      Target buffer
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::read</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/eventbufferevent/setcallbacks.xml b/reference/event/eventbufferevent/setcallbacks.xml
deleted file mode 100644
index 18ab8b5428d5..000000000000
--- a/reference/event/eventbufferevent/setcallbacks.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.setcallbacks" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::setCallbacks</refname>
-  <refpurpose>Assigns read, write and event(status) callbacks</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBufferEvent::setCallbacks</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>readcb</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>writecb</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>eventcb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Assigns read, write and event(status) callbacks.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>readcb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Read event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>writecb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Write event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>eventcb</parameter>
-    </term>
-    <listitem>
-     <para>
-      Status-change event callback. See
-      <link linkend="eventbufferevent.about.callbacks">About buffer event
-     callbacks</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      A variable that will be passed to all the callbacks.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::__construct</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/eventbufferevent/setpriority.xml b/reference/event/eventbufferevent/setpriority.xml
deleted file mode 100644
index 55b7549bad79..000000000000
--- a/reference/event/eventbufferevent/setpriority.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.setpriority" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::setPriority</refname>
-  <refpurpose>Assign a priority to a bufferevent</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::setPriority</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Assign a priority to a bufferevent
-  </para>
-  <warning>
-   <para>
-    Only supported for socket buffer events
-   </para>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>priority</parameter>
-    </term>
-    <listitem>
-     <para>
-      Priority value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventbufferevent/settimeouts.xml b/reference/event/eventbufferevent/settimeouts.xml
deleted file mode 100644
index 1436c22e393a..000000000000
--- a/reference/event/eventbufferevent/settimeouts.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.settimeouts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::setTimeouts</refname>
-  <refpurpose>Set the read and write timeout for a buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::setTimeouts</methodname>
-   <methodparam>
-    <type>float</type>
-    <parameter>timeout_read</parameter>
-   </methodparam>
-   <methodparam>
-    <type>float</type>
-    <parameter>timeout_write</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Set the read and write timeout for a buffer event
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>timeout_read</parameter>
-    </term>
-    <listitem>
-     <para>
-      Read timeout
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>timeout_write</parameter>
-    </term>
-    <listitem>
-     <para>
-      Write timeout
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventbufferevent/setwatermark.xml b/reference/event/eventbufferevent/setwatermark.xml
deleted file mode 100644
index 1b746ed412fd..000000000000
--- a/reference/event/eventbufferevent/setwatermark.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.setwatermark" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::setWatermark</refname>
-  <refpurpose>Adjusts read and/or write watermarks</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBufferEvent::setWatermark</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>events</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>lowmark</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>highmark</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adjusts the read watermarks, the write
-   <emphasis>watermarks</emphasis>,
-   or both, of a single buffer event.
-  </para>
-  <simpara>
-   A buffer event watermark is an edge, a value specifying number of bytes to
-   be read or written before callback is invoked. By default every read/write
-   event triggers a callback invocation. See
-   <link
-  xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref6_bufferevent.html#_callbacks_and_watermarks">Fast
- portable non-blocking network programming with Libevent: Callbacks and watermarks</link>
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>events</parameter>
-    </term>
-    <listitem>
-     <para>
-      Bitmask of
-      <constant>Event::READ</constant>,
-      <constant>Event::WRITE</constant>,
-      or both.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>lowmark</parameter>
-    </term>
-    <listitem>
-     <para>
-      Minimum watermark value.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>highmark</parameter>
-    </term>
-    <listitem>
-     <para>
-      Maximum watermark value.
-      <literal>0</literal>
-      means "unlimited".
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventbufferevent/sslerror.xml b/reference/event/eventbufferevent/sslerror.xml
deleted file mode 100644
index 24fcd1f253f6..000000000000
--- a/reference/event/eventbufferevent/sslerror.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslError</refname>
-  <refpurpose>Returns most recent OpenSSL error reported on the buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::sslError</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns most recent OpenSSL error reported on the buffer event.
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns OpenSSL error string reported on the buffer event, or &false;, if
-   there is no more error to return.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventBufferEvent::sslError</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// This callback is invoked when some event occurs on the event listener,
-// 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
-        while ($err = $bev->sslError()) {
-            fprintf(STDERR, "Bufferevent error %s.\n", $err);
-        }
-    }
-
-    if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-        $bev->free();
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::sslRenegotiate</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/eventbufferevent/sslfilter.xml b/reference/event/eventbufferevent/sslfilter.xml
deleted file mode 100644
index c3843ecf416a..000000000000
--- a/reference/event/eventbufferevent/sslfilter.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="eventbufferevent.sslfilter">
- <refnamediv>
-  <refname>EventBufferEvent::sslFilter</refname>
-  <refpurpose>Create a new SSL buffer event to send its data over another buffer event</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EventBufferEvent</type>
-   <methodname>EventBufferEvent::sslFilter</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>EventBufferEvent</type>
-    <parameter>underlying</parameter>
-   </methodparam>
-   <methodparam>
-    <type>EventSslContext</type>
-    <parameter>ctx</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>state</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>options</parameter>
-    <initializer>0</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Create a new SSL buffer event to send its data over another buffer event
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>underlying</parameter>
-    </term>
-    <listitem>
-     <para>
-      A socket buffer event to use for this SSL.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>ctx</parameter>
-    </term>
-    <listitem>
-     <para>
-      Object of
-      <classname>EventSslContext</classname>
-      class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>state</parameter>
-    </term>
-    <listitem>
-     <para>
-      The current state of SSL connection:
-      <constant>EventBufferEvent::SSL_OPEN</constant>,
-      <constant>EventBufferEvent::SSL_ACCEPTING</constant>
-      or
-      <constant>EventBufferEvent::SSL_CONNECTING</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      One or more buffer event options.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new SSL
-   <classname>EventBufferEvent</classname>
-   object.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook)                           xpointer(id('event.example.smtp')/*)"/>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::sslSocket</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/eventbufferevent/sslgetcipherinfo.xml b/reference/event/eventbufferevent/sslgetcipherinfo.xml
deleted file mode 100644
index 89ee4d12be9f..000000000000
--- a/reference/event/eventbufferevent/sslgetcipherinfo.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslgetcipherinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslGetCipherInfo</refname>
-  <refpurpose>Returns a textual description of the cipher</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::sslGetCipherInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves description of the current cipher by means of the
-   <literal>SSL_CIPHER_description</literal> SSL API function (see
-   <emphasis>SSL_CIPHER_get_name(3)</emphasis> man page).
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a textual description of the cipher on success, or &false; on error.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventbufferevent/sslgetciphername.xml b/reference/event/eventbufferevent/sslgetciphername.xml
deleted file mode 100644
index 878c629b68c9..000000000000
--- a/reference/event/eventbufferevent/sslgetciphername.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslgetciphername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslGetCipherName</refname>
-  <refpurpose>Returns the current cipher name of the SSL connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::sslGetCipherName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves name of cipher used by current SSL connection.
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current cipher name of the SSL connection, or &false; on error.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventbufferevent/sslgetcipherversion.xml b/reference/event/eventbufferevent/sslgetcipherversion.xml
deleted file mode 100644
index 1d25717b3b56..000000000000
--- a/reference/event/eventbufferevent/sslgetcipherversion.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslgetcipherversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslGetCipherVersion</refname>
-  <refpurpose>Returns version of cipher used by current SSL connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::sslGetCipherVersion</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves version of cipher used by current SSL connection.
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current cipher version of the SSL connection, or &false; on error.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventbufferevent/sslgetprotocol.xml b/reference/event/eventbufferevent/sslgetprotocol.xml
deleted file mode 100644
index a791185b2204..000000000000
--- a/reference/event/eventbufferevent/sslgetprotocol.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslgetprotocol" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslGetProtocol</refname>
-  <refpurpose>Returns the name of the protocol used for current SSL connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventBufferEvent::sslGetProtocol</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the name of the protocol used for current SSL connection.
-  </para>
-  <note>
-   <para>
-    This function is available only if
-    <literal>Event</literal>
-    is compiled with OpenSSL support.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the name of the protocol used for current SSL 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventbufferevent/sslrenegotiate.xml b/reference/event/eventbufferevent/sslrenegotiate.xml
deleted file mode 100644
index 113bb3742146..000000000000
--- a/reference/event/eventbufferevent/sslrenegotiate.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslrenegotiate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslRenegotiate</refname>
-  <refpurpose>Tells a bufferevent to begin SSL renegotiation</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventBufferEvent::sslRenegotiate</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Tells a bufferevent to begin SSL renegotiation.
-  </para>
-  <warning>
-   <para>
-    Calling this function tells the SSL to renegotiate, and the buffer event
-    to invoke appropriate callbacks. This is an advanced topic; this should be
-    generally avoided unless one really knows what he/she does, especially
-    since many SSL versions have had known security issues related to
-    renegotiation.
-   </para>
-  </warning>
- </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/event/eventbufferevent/sslsocket.xml b/reference/event/eventbufferevent/sslsocket.xml
deleted file mode 100644
index 6e54086a6d97..000000000000
--- a/reference/event/eventbufferevent/sslsocket.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.sslsocket" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::sslSocket</refname>
-  <refpurpose>Creates a new SSL buffer event to send its data over an SSL on a socket</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>EventBufferEvent</type>
-   <methodname>EventBufferEvent::sslSocket</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-   <methodparam>
-    <type>EventSslContext</type>
-    <parameter>ctx</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>state</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>int</type>
-    <parameter>options</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new SSL buffer event to send its data over an SSL on a socket.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket to use for this SSL. Can be stream or socket resource, numeric
-      file descriptor, or &null;. If
-      <parameter>socket</parameter>
-      is &null;, it is assumed that the file descriptor for the socket will be
-      assigned later, for instance, by means of
-      <methodname>EventBufferEvent::connectHost</methodname>
-      method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>ctx</parameter>
-    </term>
-    <listitem>
-     <para>
-      Object of
-      <classname>EventSslContext</classname>
-      class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>state</parameter>
-    </term>
-    <listitem>
-     <para>
-      The current state of SSL connection:
-      <constant>EventBufferEvent::SSL_OPEN</constant>,
-      <constant>EventBufferEvent::SSL_ACCEPTING</constant>
-      or
-      <constant>EventBufferEvent::SSL_CONNECTING</constant>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      The buffer event options.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns
-   <classname>EventBufferEvent</classname>
-   object.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::sslFilter</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/eventbufferevent/write.xml b/reference/event/eventbufferevent/write.xml
deleted file mode 100644
index c900eac2798f..000000000000
--- a/reference/event/eventbufferevent/write.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::write</refname>
-  <refpurpose>Adds data to a buffer event&apos;s output buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::write</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>data</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds
-   <parameter>data</parameter>
-   to a buffer event&apos;s output buffer
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      Data to be added to the underlying buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::writeBuffer</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/eventbufferevent/writebuffer.xml b/reference/event/eventbufferevent/writebuffer.xml
deleted file mode 100644
index 59e364feb5c1..000000000000
--- a/reference/event/eventbufferevent/writebuffer.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventbufferevent.writebuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventBufferEvent::writeBuffer</refname>
-  <refpurpose>Adds contents of the entire buffer to a buffer event&apos;s output
-  buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventBufferEvent::writeBuffer</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds contents of the entire buffer to a buffer event&apos;s output buffer
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      Source
-      <classname>EventBuffer</classname>
-      object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBufferEvent::write</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.xml b/reference/event/eventconfig.xml
deleted file mode 100644
index 12f4f566ac9f..000000000000
--- a/reference/event/eventconfig.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventconfig" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventConfig class</title>
- <titleabbrev>EventConfig</titleabbrev>
- <partintro>
-<!-- {{{ EventConfig intro -->
-  <section xml:id="eventconfig.intro">
-   &reftitle.intro;
-   <para>
-    Represents configuration structure which could be used in construction of
-    the
-    <classname>EventBase</classname>.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventconfig.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventConfig</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventConfig</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventconfig.constants.feature-et">EventConfig::FEATURE_ET</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventconfig.constants.feature-o1">EventConfig::FEATURE_O1</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventconfig.constants.feature-fds">EventConfig::FEATURE_FDS</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventconfig')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventConfig constants -->
-  <section xml:id="eventconfig.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventconfig.constants.feature-et">
-     <term>
-      <constant>EventConfig::FEATURE_ET</constant>
-     </term>
-     <listitem>
-      <para>
-       Requires a backend method that supports edge-triggered I/O.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventconfig.constants.feature-o1">
-     <term>
-      <constant>EventConfig::FEATURE_O1</constant>
-     </term>
-     <listitem>
-      <para>
-       Requires a backend method where adding or deleting a single event, or
-       having a single event become active, is an O(1) operation.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventconfig.constants.feature-fds">
-     <term>
-      <constant>EventConfig::FEATURE_FDS</constant>
-     </term>
-     <listitem>
-      <para>
-       Requires a backend method that can support arbitrary file descriptor
-       types, and not just sockets.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventconfig;
-
-</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/event/eventconfig/avoidmethod.xml b/reference/event/eventconfig/avoidmethod.xml
deleted file mode 100644
index 94ae9e10952a..000000000000
--- a/reference/event/eventconfig/avoidmethod.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventconfig.avoidmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventConfig::avoidMethod</refname>
-  <refpurpose>Tells libevent to avoid specific event method</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventConfig::avoidMethod</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>method</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Tells libevent to avoid specific event method(backend). See
-   <link
-  xlink:href="http://www.wangafu.net/~nickm/libevent-book/Ref2_eventbase.html#_creating_an_event_base">Creating
-  an event base</link>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>method</parameter>
-    </term>
-    <listitem>
-     <para>
-      The backend method to avoid. See
-      <link
-     linkend="eventconfig.constants">EventConfig constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventConfig::avoidMethod</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$cfg = new EventConfig();
-if ($cfg->avoidMethod("select")) {
-    echo "'select' method avoided\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::__construct</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/construct.xml b/reference/event/eventconfig/construct.xml
deleted file mode 100644
index b15d65d9a560..000000000000
--- a/reference/event/eventconfig/construct.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventconfig.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventConfig::__construct</refname>
-  <refpurpose>Constructs EventConfig object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventConfig::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Constructs EventConfig object which could be passed to
-   <methodname>EventBase::__construct</methodname>
-   constructor.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventConfig::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Avoiding "select" method
-$cfg = new EventConfig();
-if ($cfg->avoidMethod("select")) {
-    echo "'select' method avoided\n";
-}
-
-// Create event_base associated with the config
-$base = new EventBase($cfg);
-
-/* Now $base is configured to avoid select backend(method) */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventBase::__construct</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/requirefeatures.xml b/reference/event/eventconfig/requirefeatures.xml
deleted file mode 100644
index 57c61db4f3ff..000000000000
--- a/reference/event/eventconfig/requirefeatures.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventconfig.requirefeatures" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventConfig::requireFeatures</refname>
-  <refpurpose>Enters a required event method feature that the application demands</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventConfig::requireFeatures</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>feature</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Enters a required event method feature that the application demands
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>feature</parameter>
-    </term>
-    <listitem>
-     <para>
-      Bitmask of required features. See
-      <link
-     linkend="eventconfig.constants">
-       <literal>EventConfig::FEATURE_*</literal> constants</link>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventConfig::requireFeatures</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$cfg = new EventConfig();
-
-// Create event_base associated with the config
-$base = new EventBase($cfg);
-
-// Require FDS feature
-if ($cfg->requireFeatures(EventConfig::FEATURE_FDS)) {
-    echo "FDS feature is now required\n";
-
-    $base = new EventBase($cfg);
-    ($base->getFeatures() & EventConfig::FEATURE_FDS)
-        and print "FDS - arbitrary file descriptor types, and not just sockets\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-FDS feature is now required
-FDS - arbitrary file descriptor types, and not just sockets
-]]>
-   </screen>
-  </example>
- </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/setflags.xml b/reference/event/eventconfig/setflags.xml
deleted file mode 100644
index a499499403ef..000000000000
--- a/reference/event/eventconfig/setflags.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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 that configure how 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
deleted file mode 100644
index 34826bb1b65d..000000000000
--- a/reference/event/eventconfig/setmaxdispatchinterval.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventconfig.setmaxdispatchinterval" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventConfig::setMaxDispatchInterval</refname>
-  <refpurpose>Prevents priority inversion</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventConfig::setMaxDispatchInterval</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>max_interval</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>max_callbacks</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>min_priority</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Prevents priority inversion by limiting how many low-priority event
-   callbacks can be invoked before checking for more high-priority events.
-  </para>
-  <note>
-   <para>
-    Available since
-    <literal>libevent 2.1.0-alpha</literal>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>max_interval</parameter>
-    </term>
-    <listitem>
-     <para>
-      An interval after which Libevent should stop running callbacks and check
-      for more events, or
-      <literal>0</literal>,
-      if there should be no such interval.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>max_callbacks</parameter>
-    </term>
-    <listitem>
-     <para>
-      A number of callbacks after which Libevent should stop running callbacks
-      and check for more events, or
-      <constant>-1</constant>,
-      if there should be no such limit.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>min_priority</parameter>
-    </term>
-    <listitem>
-     <para>
-      A priority below which
-      <parameter>max_interval</parameter>
-      and
-      <parameter>max_callbacks</parameter>
-      should not be enforced. If this is set to
-      <literal>0</literal>,
-      they are enforced for events of every priority; if it&apos;s set to
-      <literal>1</literal>,
-      they&apos;re enforced for events of priority
-      <literal>1</literal>
-      and above, and so on.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase.xml b/reference/event/eventdnsbase.xml
deleted file mode 100644
index 7b91a22ec560..000000000000
--- a/reference/event/eventdnsbase.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventdnsbase" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventDnsBase class</title>
- <titleabbrev>EventDnsBase</titleabbrev>
- <partintro>
-<!-- {{{ EventDnsBase intro -->
-  <section xml:id="eventdnsbase.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents Libevent&apos;s DNS base structure. Used to resolve DNS
-    asynchronously, parse configuration files like resolv.conf etc.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventdnsbase.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventDnsBase</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventDnsBase</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.option-search">EventDnsBase::OPTION_SEARCH</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.option-nameservers">EventDnsBase::OPTION_NAMESERVERS</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.option-misc">EventDnsBase::OPTION_MISC</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.option-hostsfile">EventDnsBase::OPTION_HOSTSFILE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.options-all">EventDnsBase::OPTIONS_ALL</varname>
-     <initializer>15</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.disable-when-inactive">EventDnsBase::DISABLE_WHEN_INACTIVE</varname>
-     <initializer>32768</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.initialize-nameservers">EventDnsBase::INITIALIZE_NAMESERVERS</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventdnsbase.constants.nameservers-no-default">EventDnsBase::NAMESERVERS_NO_DEFAULT</varname>
-     <initializer>65536</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventdnsbase')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventdnsbase')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventDnsBase constants -->
-  <section xml:id="eventdnsbase.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventdnsbase.constants.option-search">
-     <term>
-      <constant>EventDnsBase::OPTION_SEARCH</constant>
-     </term>
-     <listitem>
-      <para>
-       Tells to read the domain and search fields from the
-       <literal>resolv.conf</literal>
-       file and the
-       <literal>ndots</literal>
-       option, and use them to decide which domains(if any) to search for
-       hostnames that aren’t fully-qualified.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.option-nameservers">
-     <term>
-      <constant>EventDnsBase::OPTION_NAMESERVERS</constant>
-     </term>
-     <listitem>
-      <para>
-       Tells to learn the nameservers from the
-       <literal>resolv.conf</literal>
-       file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.option-misc">
-     <term>
-      <constant>EventDnsBase::OPTION_MISC</constant>
-     </term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.option-hostsfile">
-     <term>
-      <constant>EventDnsBase::OPTION_HOSTSFILE</constant>
-     </term>
-     <listitem>
-      <para>
-       Tells to read a list of hosts from
-       <literal>/etc/hosts</literal>
-       as part of loading the
-       <literal>resolv.conf</literal>
-       file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.options-all">
-     <term>
-      <constant>EventDnsBase::OPTIONS_ALL</constant>
-     </term>
-     <listitem>
-      <para>
-       Tells to learn as much as it can from the
-       <literal>resolv.conf</literal>
-       file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.disable-when-inactive">
-     <term>
-      <constant>EventDnsBase::DISABLE_WHEN_INACTIVE</constant>
-     </term>
-     <listitem>
-      <para>
-       Do not prevent the libevent event loop from exiting when we have no active DNS requests.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.initialize-nameservers">
-     <term>
-      <constant>EventDnsBase::INITIALIZE_NAMESERVERS</constant>
-     </term>
-     <listitem>
-      <para>
-       Process the <literal>resolv.conf</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventdnsbase.constants.nameservers-no-default">
-     <term>
-      <constant>EventDnsBase::NAMESERVERS_NO_DEFAULT</constant>
-     </term>
-     <listitem>
-      <para>
-       Do not add default nameserver if there are no nameservers in the <literal>resolv.conf</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventdnsbase;
-
-</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/event/eventdnsbase/addnameserverip.xml b/reference/event/eventdnsbase/addnameserverip.xml
deleted file mode 100644
index 845068efc327..000000000000
--- a/reference/event/eventdnsbase/addnameserverip.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.addnameserverip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::addNameserverIp</refname>
-  <refpurpose>Adds a nameserver to the DNS base</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventDnsBase::addNameserverIp</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>ip</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a nameserver to the evdns_base.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ip</parameter>
-    </term>
-    <listitem>
-     <para>
-      The nameserver string, either as an IPv4 address, an IPv6 address, an
-      IPv4 address with a port (
-      <literal>IPv4:Port</literal>
-      ), or an IPv6 address with a port (
-      <literal>[IPv6]:Port</literal>
-      ).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase/addsearch.xml b/reference/event/eventdnsbase/addsearch.xml
deleted file mode 100644
index bc16dc412933..000000000000
--- a/reference/event/eventdnsbase/addsearch.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.addsearch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::addSearch</refname>
-  <refpurpose>Adds a domain to the list of search domains</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventDnsBase::addSearch</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>domain</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a domain to the list of search domains
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>domain</parameter>
-    </term>
-    <listitem>
-     <para>
-      Search domain.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase/clearsearch.xml b/reference/event/eventdnsbase/clearsearch.xml
deleted file mode 100644
index 1102322b5a73..000000000000
--- a/reference/event/eventdnsbase/clearsearch.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.clearsearch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::clearSearch</refname>
-  <refpurpose>Removes all current search suffixes</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventDnsBase::clearSearch</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Removes all current search suffixes from the DNS base; the
-   <methodname>EventDnsBase::addSearch</methodname>
-   function adds a suffix.
-  </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;
-  <simplelist>
-   <member>
-    <methodname>EventDnsBase::addSearch</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/eventdnsbase/construct.xml b/reference/event/eventdnsbase/construct.xml
deleted file mode 100644
index 04cf7a40d352..000000000000
--- a/reference/event/eventdnsbase/construct.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventdnsbase.construct">
- <refnamediv>
-  <refname>EventDnsBase::__construct</refname>
-  <refpurpose>Constructs EventDnsBase object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="EventDnsBase">
-   <modifier>public</modifier>
-   <methodname>EventDnsBase::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type class="union"><type>int</type><type>bool</type></type>
-    <parameter>initialize</parameter>
-   </methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructs EventDnsBase object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>initialize</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      If <parameter>initialize</parameter> is &true;,
-      it attempts to use the underlying operating system defaults to configure
-      the DNS base sensibly.
-      If it is &false;, the DNS base is left unconfigured, with no nameservers or options set.
-      In the latter case the DNS base should be configured manually, e.g. with
-      <methodname>EventDnsBase::parseResolvConf</methodname>.
-     </simpara>
-     <para>
-      If <parameter>initialize</parameter> is an integer, it must be one of the following flags:
-      <informaltable>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry valign="top">Flag</entry>
-          <entry valign="top">&Description;</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry valign="top"><constant>EventDnsBase::DISABLE_WHEN_INACTIVE</constant></entry>
-          <entry valign="top">
-           Do not prevent the libevent event loop from exiting when we have no active DNS requests.
-          </entry>
-         </row>
-         <row>
-          <entry valign="top"><constant>EventDnsBase::INITIALIZE_NAMESERVERS</constant></entry>
-          <entry valign="top">
-           Process the <literal>resolv.conf</literal>.
-          </entry>
-         </row>
-         <row>
-          <entry valign="top"><constant>EventDnsBase::NAMESERVERS_NO_DEFAULT</constant></entry>
-          <entry valign="top">
-           Do not add default nameserver if there are no nameservers in the <literal>resolv.conf</literal>.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   If <parameter>initialize</parameter> has a type other than
-   <type class="union"><type>int</type><type>bool</type></type>,
-   a <exceptionname>TypeError</exceptionname> is thrown.
-  </para>
-  <para>
-   If the value of <parameter>initialize</parameter> is invalid,
-   a <exceptionname>EventException</exceptionname> is thrown.
-  </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 event 3.1.3</entry>
-      <entry>
-       If <parameter>initialize</parameter> has a type other than
-       <type class="union"><type>int</type><type>bool</type></type>,
-       a <exceptionname>TypeError</exceptionname> is thrown.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL event 3.1.0RC1</entry>
-      <entry>
-       The type of the <parameter>initialize</parameter> parameter has been changed from <type>bool</type>
-       to <type>mixed</type>. The value can be either <type>bool</type> (preserving the previous meaning)
-       or one of the following constants:
-       <constant>EventDnsBase::DISABLE_WHEN_INACTIVE</constant>,
-       <constant>EventDnsBase::INITIALIZE_NAMESERVERS</constant>,
-       or <constant>EventDnsBase::NAMESERVERS_NO_DEFAULT</constant>.
-      </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/event/eventdnsbase/countnameservers.xml b/reference/event/eventdnsbase/countnameservers.xml
deleted file mode 100644
index 360e5b7987c2..000000000000
--- a/reference/event/eventdnsbase/countnameservers.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.countnameservers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::countNameservers</refname>
-  <refpurpose>Gets the number of configured nameservers</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventDnsBase::countNameservers</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the number of configured nameservers
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of configured nameservers(not necessarily the number of
-   running nameservers). This is useful for double-checking whether our calls
-   to the various nameserver configuration functions have been successful.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventdnsbase/loadhosts.xml b/reference/event/eventdnsbase/loadhosts.xml
deleted file mode 100644
index 50d906612505..000000000000
--- a/reference/event/eventdnsbase/loadhosts.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.loadhosts" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::loadHosts</refname>
-  <refpurpose>Loads a hosts file (in the same format as /etc/hosts) from hosts file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventDnsBase::loadHosts</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>hosts</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Loads a hosts file (in the same format as
-   <literal>/etc/hosts</literal>)
-   from hosts file.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hosts</parameter>
-    </term>
-    <listitem>
-     <para>
-      Path to the hosts' file.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase/parseresolvconf.xml b/reference/event/eventdnsbase/parseresolvconf.xml
deleted file mode 100644
index 6deeb787b7bc..000000000000
--- a/reference/event/eventdnsbase/parseresolvconf.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.parseresolvconf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::parseResolvConf</refname>
-  <refpurpose>Scans the resolv.conf-formatted file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventDnsBase::parseResolvConf</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>filename</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Scans the resolv.conf-formatted file stored in filename, and read in all
-   the options from it that are listed in flags
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      Determines what information is parsed from the
-      <literal>resolv.conf</literal>
-      file. See the man page for
-      <literal>resolv.conf</literal>
-      for the format of this file.
-     </para>
-     <para>
-      The following directives are not parsed from the file:
-      <literal>sortlist, rotate, no-check-names, inet6, debug</literal>.
-     </para>
-     <para>
-      If this function encounters an error, the possible return values are:
-      <simplelist>
-       <member>
-        <literal>1</literal> = failed to open file</member>
-       <member>
-        <literal>2</literal> = failed to stat file</member>
-       <member>
-        <literal>3</literal> = file too large</member>
-       <member>
-        <literal>4</literal> = out of memory</member>
-       <member>
-        <literal>5</literal> = short read from file</member>
-       <member>
-        <literal>6</literal> = no nameservers listed in the file</member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>filename</parameter>
-    </term>
-    <listitem>
-     <para>
-      Path to
-      <literal>resolv.conf</literal>
-      file.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase/setoption.xml b/reference/event/eventdnsbase/setoption.xml
deleted file mode 100644
index b49d8611626d..000000000000
--- a/reference/event/eventdnsbase/setoption.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.setoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::setOption</refname>
-  <refpurpose>Set the value of a configuration option</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventDnsBase::setOption</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>option</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>value</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Set the value of a configuration option.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>option</parameter>
-    </term>
-    <listitem>
-     <para>
-      The currently available configuration options are:
-      <literal>"ndots"</literal>,
-      <literal>"timeout"</literal>,
-      <literal>"max-timeouts"</literal>,
-      <literal>"max-inflight"</literal>,
-      and
-      <literal>"attempts"</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <para>
-      Option value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventdnsbase/setsearchndots.xml b/reference/event/eventdnsbase/setsearchndots.xml
deleted file mode 100644
index f71438df953f..000000000000
--- a/reference/event/eventdnsbase/setsearchndots.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventdnsbase.setsearchndots" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventDnsBase::setSearchNdots</refname>
-  <refpurpose>Set the 'ndots' parameter for searches</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventDnsBase::setSearchNdots</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>ndots</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Set the
-   <parameter>'ndots'</parameter>
-   parameter for searches. Sets the number of dots which, when found in a
-   name, causes the first query to be without any search domain.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>ndots</parameter>
-    </term>
-    <listitem>
-     <para>
-      The number of dots.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventexception.xml b/reference/event/eventexception.xml
deleted file mode 100644
index b956d4d3bc3d..000000000000
--- a/reference/event/eventexception.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventexception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventException class</title>
- <titleabbrev>EventException</titleabbrev>
- <partintro>
-<!-- {{{ EventException intro -->
-  <section xml:id="eventexception.intro">
-   &reftitle.intro;
-   <para>
-    A <classname>EventException</classname> is thrown when the Event extension methods
-    encounter invalid user input or identify an unrecoverable error. This exception
-    serves as a signal for developers to handle exceptional situations gracefully.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>EventException</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>RuntimeException</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])"/>
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
-</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/event/eventhttp.xml b/reference/event/eventhttp.xml
deleted file mode 100644
index 259fadeda98c..000000000000
--- a/reference/event/eventhttp.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventhttp" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventHttp class</title>
- <titleabbrev>EventHttp</titleabbrev>
- <partintro>
-<!-- {{{ EventHttp intro -->
-  <section xml:id="eventhttp.intro">
-   &reftitle.intro;
-   <para>
-    Represents HTTP server.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventhttp.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventHttp</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventHttp</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventhttp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
- &reference.event.entities.eventhttp;
-
-</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/event/eventhttp/accept.xml b/reference/event/eventhttp/accept.xml
deleted file mode 100644
index 2662c5bbb11e..000000000000
--- a/reference/event/eventhttp/accept.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.accept" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::accept</refname>
-  <refpurpose>Makes an HTTP server accept connections on the specified socket stream or resource</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventHttp::accept</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Makes an HTTP server accept connections on the specified socket stream or
-   resource. The socket should be ready to accept connections.
-  </para>
-  <para>
-   Can be called multiple times to accept connections on different sockets.
-  </para>
-  <note>
-   <para>
-    To bind a socket,
-    <literal>listen</literal>,
-    and
-    <literal>accept</literal>
-    connections on the socket in a single call use
-    <methodname>EventHttp::bind</methodname>.
-    <methodname>EventHttp::accept</methodname>
-    is needed only if one already has a socket ready to accept connections.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream or numeric file descriptor representing a socket
-      ready to accept connections.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttp::accept</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$addresses = [
-    8091 => "127.0.0.1",
-    8092 => "127.0.0.2",
-];
-$i = 0;
-
-$socket = array();
-
-foreach ($addresses as $port => $ip) {
-    echo $ip, " ", $port, PHP_EOL;
-    $socket[$i] = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-
-    if (!socket_bind($socket[$i], $ip, $port)) {
-        exit("socket_bind failed\n");
-    }
-
-    socket_listen($socket[$i], 0);
-    socket_set_nonblock($socket[$i]);
-
-    if (!$http->accept($socket[$i])) {
-        echo "Accept failed\n";
-        exit(1);
-    }
-
-    ++$i;
-}
-
-$http->setCallback("/some-page", function () {
-    echo "(some-page)\n";
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-});
-
-$http->setDefaultCallback(function ($req) {
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-});
-
-$signal = Event::signal($base, SIGINT, function () use ($base) {
-    echo "Caught SIGINT. Stopping...\n";
-    $base->stop();
-});
-$signal->add();
-
-$base->dispatch();
-echo "END\n";
-// We didn't close sockets, since Libevent already sets
-// CLOSE_ON_FREE and CLOSE_ON_EXEC flags on the file 
-// descriptor associated with the sockets.
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Client:
-$ nc 127.0.0.1 8091
-GET /about HTTP/1.0
-Connection: close
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-
-Server:
-127.0.0.1 8091
-127.0.0.2 8092
-URI: /about
-OK
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::bind</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/eventhttp/addserveralias.xml b/reference/event/eventhttp/addserveralias.xml
deleted file mode 100644
index 46cbeeedd0ed..000000000000
--- a/reference/event/eventhttp/addserveralias.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.addserveralias" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::addServerAlias</refname>
-  <refpurpose>Adds a server alias to the HTTP server object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventHttp::addServerAlias</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>alias</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a server alias to the HTTP server object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>alias</parameter>
-    </term>
-    <listitem>
-     <para>
-      The alias to add.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttp::addServerAlias</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-
-if (!$http->bind("127.0.0.1", 8088)) {
-    exit("bind(1) failed\n");
-};
-
-if (!$http->addServerAlias("local.net")) {
-    exit("Failed to add server alias\n");
-}
-
-$http->setCallback("/about", function($req) {
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    $req->sendReply(200, "OK");
-});
-$base->dispatch();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::removeServerAlias</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/eventhttp/bind.xml b/reference/event/eventhttp/bind.xml
deleted file mode 100644
index 741958ee3c1d..000000000000
--- a/reference/event/eventhttp/bind.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::bind</refname>
-  <refpurpose>Binds an HTTP server on the specified address and port</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::bind</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>address</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>port</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Binds an HTTP server on the specified address and port.
-  </para>
-  <para>
-   Can be called multiple times to bind the same HTTP server to multiple
-   different ports.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      A string containing the IP address to
-      <literal>listen(2)</literal>
-      on.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      The port number to listen on.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttp::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-
-if (!$http->bind("127.0.0.1", 8088)) {
-    exit("bind(1) failed\n");
-};
-if (!$http->bind("127.0.0.1", 8089)) {
-    exit("bind(2) failed\n");
-};
-
-$http->setCallback("/about", function($req) {
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-});
-
-$base->dispatch();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Client:
-
-$ nc 127.0.0.1 8088
-GET /about HTTP/1.0
-Connection: close
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-
-$ nc 127.0.0.1 8089
-GET /unknown HTTP/1.0
-Connection: close
-
-HTTP/1.1 404 Not Found
-Content-Type: text/html
-Date: Wed, 13 Mar 2013 04:14:41 GMT
-Content-Length: 149
-Connection: close
-
-<html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL /unknown was not found on this server.</p></body></html>
-
-Server:
-URI: /about
-OK
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::accept</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/eventhttp/construct.xml b/reference/event/eventhttp/construct.xml
deleted file mode 100644
index fb6c8d92a065..000000000000
--- a/reference/event/eventhttp/construct.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventhttp.construct">
- <refnamediv>
-  <refname>EventHttp::__construct</refname>
-  <refpurpose>Constructs EventHttp object (the HTTP server)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventHttp::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>EventSslContext</type>
-    <parameter>ctx</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs the HTTP server object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>ctx</parameter>
-    </term>
-    <listitem>
-     <para>
-      <classname>EventSslContext</classname>
-      class object. Turns plain HTTP server into HTTPS server. It means that
-      if
-      <parameter>ctx</parameter>
-      is configured correctly, then the underlying buffer events will be based
-      on OpenSSL sockets. Thus, all traffic will pass through the SSL or TLS.
-     </para>
-     <note>
-      <para>
-       This parameter is available only if
-       <literal>Event</literal>
-       is compiled with OpenSSL support and only with
-       <literal>Libevent
-        2.1.0-alpha</literal>
-       and higher.
-      </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </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 event 1.9.0</entry>
-      <entry>
-       OpenSSL support (<parameter>ctx</parameter>) added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Simple HTTP server</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple HTTP server.
- *
- * To test it:
- * 1) Run it on a port of your choice, e.g.:
- * $ php examples/http.php 8010
- * 2) In another terminal connect to some address on this port
- * and make GET or POST request(others are turned off here), e.g.:
- * $ nc -t 127.0.0.1 8010
- * POST /about HTTP/1.0
- * Content-Type: text/plain
- * Content-Length: 4
- * Connection: close
- * (press Enter)
- *
- * It will output
- * a=12
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- *
- * $ nc -t 127.0.0.1 8010
- * GET /dump HTTP/1.0
- * Content-Type: text/plain
- * Content-Encoding: UTF-8
- * Connection: close
- * (press Enter)
- *
- * It will output:
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- * (press Enter)
- *
- * $ nc -t 127.0.0.1 8010
- * GET /unknown HTTP/1.0
- * Connection: close
- *
- * It will output:
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- *
- * 3) See what the server outputs on the previous terminal window.
- */
-
-function _http_dump($req, $data) {
-    static $counter      = 0;
-    static $max_requests = 2;
-
-    if (++$counter >= $max_requests)  {
-        echo "Counter reached max requests $max_requests. Exiting\n";
-        exit();
-    }
-
-    echo __METHOD__, " called\n";
-    echo "request:"; var_dump($req);
-    echo "data:"; var_dump($data);
-
-    echo "\n===== DUMP =====\n";
-    echo "Command:", $req->getCommand(), PHP_EOL;
-    echo "URI:", $req->getUri(), PHP_EOL;
-    echo "Input headers:"; var_dump($req->getInputHeaders());
-    echo "Output headers:"; var_dump($req->getOutputHeaders());
-
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-
-    echo "\n >> Reading input buffer ...\n";
-    $buf = $req->getInputBuffer();
-    while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-        echo $s, PHP_EOL;
-    }
-    echo "No more data in the buffer\n";
-}
-
-function _http_about($req) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-function _http_default($req, $data) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-$port = 8010;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$base = new EventBase();
-$http = new EventHttp($base);
-$http->setAllowedMethods(EventHttpRequest::CMD_GET | EventHttpRequest::CMD_POST);
-
-$http->setCallback("/dump", "_http_dump", array(4, 8));
-$http->setCallback("/about", "_http_about");
-$http->setDefaultCallback("_http_default", "custom data value");
-
-$http->bind("0.0.0.0", 8010);
-$base->loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-a=12
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-(press Enter)
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-]]>
-   </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/event/eventhttp/removeserveralias.xml b/reference/event/eventhttp/removeserveralias.xml
deleted file mode 100644
index efe300a196ae..000000000000
--- a/reference/event/eventhttp/removeserveralias.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.removeserveralias" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::removeServerAlias</refname>
-  <refpurpose>Removes server alias</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventHttp::removeServerAlias</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>alias</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Removes server alias added with
-   <methodname>EventHttp::addServerAlias</methodname>
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>alias</parameter>
-    </term>
-    <listitem>
-     <para>
-      The alias to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::addServerAlias</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/eventhttp/setallowedmethods.xml b/reference/event/eventhttp/setallowedmethods.xml
deleted file mode 100644
index 780bf1ed3f61..000000000000
--- a/reference/event/eventhttp/setallowedmethods.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.setallowedmethods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::setAllowedMethods</refname>
-  <refpurpose>Sets which HTTP methods are supported in requests accepted by this server, and passed to user callbacks</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setAllowedMethods</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>methods</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets which HTTP methods are supported in requests accepted by this
-   server, and passed to user callbacks
-  </simpara>
-  <para>
-   If not supported they will generate a
-   <literal>"405 Method not
-  allowed"</literal>
-   response.
-  </para>
-  <para>
-   By default this includes the following methods:
-   <literal>GET</literal>,
-   <literal>POST</literal>,
-   <literal>HEAD</literal>,
-   <literal>PUT</literal>,
-   <literal>DELETE</literal>.
-   See
-   <literal>EventHttpRequest::CMD_*</literal>
-   constants.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>methods</parameter>
-    </term>
-    <listitem>
-     <para>
-      A bit mask of
-      <link
-     linkend="eventhttprequest.constants">
-       <literal>EventHttpRequest::CMD_*</literal>
-     constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventhttp/setcallback.xml b/reference/event/eventhttp/setcallback.xml
deleted file mode 100644
index 71626535760c..000000000000
--- a/reference/event/eventhttp/setcallback.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventhttp.setcallback">
- <refnamediv>
-  <refname>EventHttp::setCallback</refname>
-  <refpurpose>Sets a callback for specified URI</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setCallback</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>path</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a callback for specified URI.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>path</parameter>
-    </term>
-    <listitem>
-     <para>
-      The path for which to invoke the callback.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The callback
-      <type>callable</type>
-      that gets invoked on requested
-      <parameter>path</parameter>.
-      It should match the following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam choice="opt">
-       <type>EventHttpRequest</type>
-       <parameter>req</parameter>
-       <initializer>NULL</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>mixed</type>
-       <parameter>arg</parameter>
-       <initializer>NULL</initializer>
-      </methodparam>
-     </methodsynopsis>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <parameter>req</parameter>
-       </term>
-       <listitem>
-        <para>
-         <classname>EventHttpRequest</classname>
-         object.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>arg</parameter>
-       </term>
-       <listitem>
-        <para>
-         Custom data.
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttp::setCallback</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple HTTP server.
- *
- * To test it:
- * 1) Run it on a port of your choice, e.g.:
- * $ php examples/http.php 8010
- * 2) In another terminal connect to some address on this port
- * and make GET or POST request(others are turned off here), e.g.:
- * $ nc -t 127.0.0.1 8010
- * POST /about HTTP/1.0
- * Content-Type: text/plain
- * Content-Length: 4
- * Connection: close
- * (press Enter)
- *
- * It will output
- * a=12
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- *
- * 3) See what the server outputs on the previous terminal window.
- */
-
-function _http_dump($req, $data) {
-    static $counter      = 0;
-    static $max_requests = 2;
-
-    if (++$counter >= $max_requests)  {
-        echo "Counter reached max requests $max_requests. Exiting\n";
-        exit();
-    }
-
-    echo __METHOD__, " called\n";
-    echo "request:"; var_dump($req);
-    echo "data:"; var_dump($data);
-
-    echo "\n===== DUMP =====\n";
-    echo "Command:", $req->getCommand(), PHP_EOL;
-    echo "URI:", $req->getUri(), PHP_EOL;
-    echo "Input headers:"; var_dump($req->getInputHeaders());
-    echo "Output headers:"; var_dump($req->getOutputHeaders());
-
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-
-    echo "\n >> Reading input buffer ...\n";
-    $buf = $req->getInputBuffer();
-    while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-        echo $s, PHP_EOL;
-    }
-    echo "No more data in the buffer\n";
-}
-
-function _http_about($req) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-function _http_default($req, $data) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-$port = 8010;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$base = new EventBase();
-$http = new EventHttp($base);
-$http->setAllowedMethods(EventHttpRequest::CMD_GET | EventHttpRequest::CMD_POST);
-
-$http->setCallback("/dump", "_http_dump", array(4, 8));
-$http->setCallback("/about", "_http_about");
-$http->setDefaultCallback("_http_default", "custom data value");
-
-$http->bind("0.0.0.0", 8010);
-$base->loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-a=12
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::setDefaultCallback</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/eventhttp/setdefaultcallback.xml b/reference/event/eventhttp/setdefaultcallback.xml
deleted file mode 100644
index f6214c3c6e7c..000000000000
--- a/reference/event/eventhttp/setdefaultcallback.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventhttp.setdefaultcallback">
- <refnamediv>
-  <refname>EventHttp::setDefaultCallback</refname>
-  <refpurpose>Sets default callback to handle requests that are not caught by specific callbacks</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setDefaultCallback</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>string</type>
-    <parameter>arg</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets default callback to handle requests that are not caught by specific
-   callbacks
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The callback
-      <type>callable</type>.
-      It should match the following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam choice="opt">
-       <type>EventHttpRequest</type>
-       <parameter>req</parameter>
-       <initializer>NULL</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>mixed</type>
-       <parameter>arg</parameter>
-       <initializer>NULL</initializer>
-      </methodparam>
-     </methodsynopsis>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <parameter>req</parameter>
-       </term>
-       <listitem>
-        <para>
-         <classname>EventHttpRequest</classname>
-         object.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>arg</parameter>
-       </term>
-       <listitem>
-        <para>
-         Custom data.
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      User custom data passed to the callback.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttp::setDefaultCallback</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-
-if (!$http->bind("127.0.0.1", 8088)) {
-    exit("bind(1) failed\n");
-};
-
-$http->setDefaultCallback(function($req) {
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    $req->sendReply(200, "OK");
-});
-
-$base->dispatch();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::setCallback</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/eventhttp/setmaxbodysize.xml b/reference/event/eventhttp/setmaxbodysize.xml
deleted file mode 100644
index a6dc4a0b69d0..000000000000
--- a/reference/event/eventhttp/setmaxbodysize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.setmaxbodysize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::setMaxBodySize</refname>
-  <refpurpose>Sets maximum request body size</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setMaxBodySize</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>value</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets maximum request body size.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <para>
-      The body size in bytes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::setMaxHeadersSize</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/eventhttp/setmaxheaderssize.xml b/reference/event/eventhttp/setmaxheaderssize.xml
deleted file mode 100644
index 5a495361a625..000000000000
--- a/reference/event/eventhttp/setmaxheaderssize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.setmaxheaderssize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::setMaxHeadersSize</refname>
-  <refpurpose>Sets maximum HTTP header size</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setMaxHeadersSize</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>value</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets maximum HTTP header size.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <para>
-      The header size in bytes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttp::setMaxHeadersSize</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/eventhttp/settimeout.xml b/reference/event/eventhttp/settimeout.xml
deleted file mode 100644
index 57bf0ba1b2e2..000000000000
--- a/reference/event/eventhttp/settimeout.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttp.settimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttp::setTimeout</refname>
-  <refpurpose>Sets the timeout for an HTTP request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttp::setTimeout</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>value</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the timeout for an HTTP request.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <para>
-      The timeout in seconds.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventhttpconnection.xml b/reference/event/eventhttpconnection.xml
deleted file mode 100644
index 0bb34c4510be..000000000000
--- a/reference/event/eventhttpconnection.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventhttpconnection" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventHttpConnection class</title>
- <titleabbrev>EventHttpConnection</titleabbrev>
- <partintro>
-<!-- {{{ EventHttpConnection intro -->
-  <section xml:id="eventhttpconnection.intro">
-   &reftitle.intro;
-   <para>
-    Represents an HTTP connection.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventhttpconnection.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventHttpConnection</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EventHttpConnection</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventhttpconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
- </partintro>
-
- &reference.event.entities.eventhttpconnection;
-
-</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/event/eventhttpconnection/construct.xml b/reference/event/eventhttpconnection/construct.xml
deleted file mode 100644
index c4daf0498dce..000000000000
--- a/reference/event/eventhttpconnection/construct.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventhttpconnection.construct">
- <refnamediv>
-  <refname>EventHttpConnection::__construct</refname>
-  <refpurpose>Constructs EventHttpConnection object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventHttpConnection::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>EventDnsBase</type>
-    <parameter>dns_base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>address</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>port</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>EventSslContext</type>
-    <parameter>ctx</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs EventHttpConnection object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>dns_base</parameter>
-    </term>
-    <listitem>
-     <para>
-      If
-      <parameter>dns_base</parameter>
-      is &null;, hostname resolution will block.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      The address to connect to.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      The port to connect to.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>ctx</parameter>
-    </term>
-    <listitem>
-     <para>
-      <classname>EventSslContext</classname>
-      class object. Enables OpenSSL.
-     </para>
-     <note>
-      <para>
-       This parameter is available only if
-       <literal>Event</literal>
-       is compiled with OpenSSL support and only with
-       <literal>Libevent
-        2.1.0-alpha</literal>
-       and higher.
-      </para>
-     </note>
-    </listitem>
-   </varlistentry>
-  </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 event 1.9.0</entry>
-      <entry>
-       OpenSSL support (<parameter>ctx</parameter>) added.
-      </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/event/eventhttpconnection/getbase.xml b/reference/event/eventhttpconnection/getbase.xml
deleted file mode 100644
index af5b9a71e3ae..000000000000
--- a/reference/event/eventhttpconnection/getbase.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.getbase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::getBase</refname>
-  <refpurpose>Returns event base associated with the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBase</type>
-   <methodname>EventHttpConnection::getBase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns event base associated with the connection.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success returns
-   <classname>EventBase</classname>
-   object associated with the connection. 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/event/eventhttpconnection/getpeer.xml b/reference/event/eventhttpconnection/getpeer.xml
deleted file mode 100644
index a5169975692c..000000000000
--- a/reference/event/eventhttpconnection/getpeer.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.getpeer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::getPeer</refname>
-  <refpurpose>Gets the remote address and port associated with the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::getPeer</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter role="reference">address</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter role="reference">port</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the remote address and port associated with the connection
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      Address of the peer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      Port of the peer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventhttpconnection/makerequest.xml b/reference/event/eventhttpconnection/makerequest.xml
deleted file mode 100644
index 31748c8a2889..000000000000
--- a/reference/event/eventhttpconnection/makerequest.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.makerequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::makeRequest</refname>
-  <refpurpose>Makes an HTTP request over the specified connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventHttpConnection::makeRequest</methodname>
-   <methodparam>
-    <type>EventHttpRequest</type>
-    <parameter>req</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>type</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>uri</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Makes an HTTP request over the specified connection.
-   <parameter>type</parameter>
-   is one of
-   <literal>EventHttpRequest::CMD_*</literal>
-   constants.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>req</parameter>
-    </term>
-    <listitem>
-     <para>
-      The connection object over which to send the request.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>type</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventhttprequest.constants">
-       <literal>EventHttpRequest::CMD_*</literal> constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>uri</parameter>
-    </term>
-    <listitem>
-     <para>
-      The URI associated with the request.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttpConnection::makeRequest</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function _request_handler($req, $base) {
-    echo __FUNCTION__, PHP_EOL;
-
-    if (is_null($req)) {
-        echo "Timed out\n";
-    } else {
-        $response_code = $req->getResponseCode();
-
-        if ($response_code == 0) {
-            echo "Connection refused\n";
-        } elseif ($response_code != 200) {
-            echo "Unexpected response: $response_code\n";
-        } else {
-            echo "Success: $response_code\n";
-            $buf = $req->getInputBuffer();
-            echo "Body:\n";
-            while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-                echo $s, PHP_EOL;
-            }
-        }
-    }
-
-    $base->exit(NULL);
-}
-
-$address = "127.0.0.1";
-$port = 80;
-
-$base = new EventBase();
-$conn = new EventHttpConnection($base, NULL, $address, $port);
-$conn->setTimeout(5);
-$req = new EventHttpRequest("_request_handler", $base);
-
-$req->addHeader("Host", $address, EventHttpRequest::OUTPUT_HEADER);
-$req->addHeader("Content-Length", "0", EventHttpRequest::OUTPUT_HEADER);
-$conn->makeRequest($req, EventHttpRequest::CMD_GET, "/index.cphp");
-
-$base->loop();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-_request_handler
-Success: 200
-Body:
-PHP, date:
-2013-03-13T20:27:52+05:00
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::addHeader</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/eventhttpconnection/setclosecallback.xml b/reference/event/eventhttpconnection/setclosecallback.xml
deleted file mode 100644
index 8f7ce8990c06..000000000000
--- a/reference/event/eventhttpconnection/setclosecallback.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setclosecallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setCloseCallback</refname>
-  <refpurpose>Set callback for connection close</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setCloseCallback</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets callback for connection close.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <para>
-      Callback which is called when connection is closed. Should match the
-      following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam
-        choice="opt">
-       <type>EventHttpConnection</type>
-       <parameter>conn</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam
-        choice="opt">
-       <type>mixed</type>
-       <parameter>arg</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-     </methodsynopsis>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <methodname>EventHttpConnection::setCloseCallback</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Setting up close-connection callback
- *
- * The script handles closed connections using HTTP API.
- *
- * Usage:
- * 1) Launch the server:
- * $ php examples/http_closecb.php 4242
- *
- * 2) Launch a client in another terminal. Telnet-like
- * session should look like the following:
- *
- * $ nc -t 127.0.0.1 4242
- * GET / HTTP/1.0
- * Connection: close
- *
- * The server will output something similar to the following:
- *
- * HTTP/1.0 200 OK
- * Content-Type: multipart/x-mixed-replace;boundary=boundarydonotcross
- * Connection: close
- *
- * <html>
- *
- * 3) Terminate the client connection abruptly,
- * i.e. kill the process, or just press Ctrl-C.
- *
- * 4) Check if the server called _close_callback.
- * The script should output "_close_callback" string to standard output.
- *
- * 5) Check if the server's process has no orphaned connections,
- * e.g. with `lsof` utility.
- */
-
-function _close_callback($conn)
-{
-    echo __FUNCTION__, PHP_EOL;
-}
-
-function _http_default($req, $dummy)
-{
-    $conn = $req->getConnection();
-    $conn->setCloseCallback('_close_callback', NULL);
-
-    /*
-    By enabling Event::READ we protect the server against unclosed conections.
-    This is a peculiarity of Libevent. The library disables Event::READ events
-     on this connection, and the server is not notified about terminated
-    connections.
-
-    So each time client terminates connection abruptly, we get an orphaned
-    connection. For instance, the following is a part of `lsof -p $PID | grep TCP`
-    command after client has terminated connection:
-
-    57-php     15057 ruslan  6u  unix 0xffff8802fb59c780   0t0  125187 socket
-    58:php     15057 ruslan  7u  IPv4             125189   0t0     TCP *:4242 (LISTEN)
-    59:php     15057 ruslan  8u  IPv4             124342   0t0     TCP localhost:4242->localhost:37375 (CLOSE_WAIT)
-
-    where $PID is our process ID.
-
-    The following block of code fixes such kind of orphaned connections.
-     */
-    $bev = $req->getBufferEvent();
-    $bev->enable(Event::READ);
-
-    // We have to free it explicitly. See EventHttpRequest::getConnection
-    $bev->free(); // we have to free it explicitly
-
-    $req->addHeader(
-        'Content-Type',
-        'multipart/x-mixed-replace;boundary=boundarydonotcross',
-        EventHttpRequest::OUTPUT_HEADER
-    );
-
-    $buf = new EventBuffer();
-    $buf->add('<html>');
-
-    $req->sendReply(200, "OK");
-    $req->sendReplyChunk($buf);
-}
-
-$port = 4242;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$http->setDefaultCallback("_http_default", NULL);
-$http->bind("0.0.0.0", $port);
-$base->loop();
-
-?>
-]]>
-   </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/event/eventhttpconnection/setlocaladdress.xml b/reference/event/eventhttpconnection/setlocaladdress.xml
deleted file mode 100644
index 572c9dc7ea74..000000000000
--- a/reference/event/eventhttpconnection/setlocaladdress.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setlocaladdress" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setLocalAddress</refname>
-  <refpurpose>Sets the IP address from which HTTP connections are made</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setLocalAddress</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>address</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the IP address from which http connections are made.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      The IP address from which HTTP connections are made.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpConnection::setLocalPort</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/eventhttpconnection/setlocalport.xml b/reference/event/eventhttpconnection/setlocalport.xml
deleted file mode 100644
index fbbbe9a0d060..000000000000
--- a/reference/event/eventhttpconnection/setlocalport.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setlocalport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setLocalPort</refname>
-  <refpurpose>Sets the local port from which connections are made</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setLocalPort</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>port</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the local port from which connections are made.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      The port number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para></para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpConnection::setLocalAddress</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/eventhttpconnection/setmaxbodysize.xml b/reference/event/eventhttpconnection/setmaxbodysize.xml
deleted file mode 100644
index 2e29355cfcaf..000000000000
--- a/reference/event/eventhttpconnection/setmaxbodysize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setmaxbodysize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setMaxBodySize</refname>
-  <refpurpose>Sets maximum body size for the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setMaxBodySize</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>max_size</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets maximum body size for the connection.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>max_size</parameter>
-    </term>
-    <listitem>
-     <para>
-      The maximum body size in bytes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpConnection::setMaxHeadersSize</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/eventhttpconnection/setmaxheaderssize.xml b/reference/event/eventhttpconnection/setmaxheaderssize.xml
deleted file mode 100644
index d3d0ebe7eaff..000000000000
--- a/reference/event/eventhttpconnection/setmaxheaderssize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setmaxheaderssize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setMaxHeadersSize</refname>
-  <refpurpose>Sets maximum header size</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setMaxHeadersSize</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>max_size</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets maximum header size for the connection.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>max_size</parameter>
-    </term>
-    <listitem>
-     <para>
-      The maximum header size in bytes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpConnection::setMaxBodySize</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/eventhttpconnection/setretries.xml b/reference/event/eventhttpconnection/setretries.xml
deleted file mode 100644
index ecc7658f4bdf..000000000000
--- a/reference/event/eventhttpconnection/setretries.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.setretries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setRetries</refname>
-  <refpurpose>Sets the retry limit for the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setRetries</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>retries</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the retry limit for the connection
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>retries</parameter>
-    </term>
-    <listitem>
-     <para>
-      The retry limit.
-      <constant>-1</constant>
-      means infinity.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventhttpconnection/settimeout.xml b/reference/event/eventhttpconnection/settimeout.xml
deleted file mode 100644
index d35e955a49fa..000000000000
--- a/reference/event/eventhttpconnection/settimeout.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttpconnection.settimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpConnection::setTimeout</refname>
-  <refpurpose>Sets the timeout for the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpConnection::setTimeout</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>timeout</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the timeout for the connection
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>timeout</parameter>
-    </term>
-    <listitem>
-     <para>
-      Timeout in seconds.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventhttprequest.xml b/reference/event/eventhttprequest.xml
deleted file mode 100644
index dde0335758ca..000000000000
--- a/reference/event/eventhttprequest.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventhttprequest" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventHttpRequest class</title>
- <titleabbrev>EventHttpRequest</titleabbrev>
- <partintro>
-<!-- {{{ EventHttpRequest intro -->
-  <section xml:id="eventhttprequest.intro">
-   &reftitle.intro;
-   <para>
-    Represents an HTTP request.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventhttprequest.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventHttpRequest</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>EventHttpRequest</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-get">EventHttpRequest::CMD_GET</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-post">EventHttpRequest::CMD_POST</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-head">EventHttpRequest::CMD_HEAD</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-put">EventHttpRequest::CMD_PUT</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-delete">EventHttpRequest::CMD_DELETE</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-options">EventHttpRequest::CMD_OPTIONS</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-trace">EventHttpRequest::CMD_TRACE</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-connect">EventHttpRequest::CMD_CONNECT</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.cmd-patch">EventHttpRequest::CMD_PATCH</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.input-header">EventHttpRequest::INPUT_HEADER</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventhttprequest.constants.output-header">EventHttpRequest::OUTPUT_HEADER</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventhttprequest')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventHttpRequest constants -->
-  <section xml:id="eventhttprequest.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-get">
-     <term>
-      <constant>EventHttpRequest::CMD_GET</constant>
-     </term>
-     <listitem>
-      <para>
-       GET method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-post">
-     <term>
-      <constant>EventHttpRequest::CMD_POST</constant>
-     </term>
-     <listitem>
-      <para>
-       POST method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-head">
-     <term>
-      <constant>EventHttpRequest::CMD_HEAD</constant>
-     </term>
-     <listitem>
-      <para>
-       HEAD method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-put">
-     <term>
-      <constant>EventHttpRequest::CMD_PUT</constant>
-     </term>
-     <listitem>
-      <para>
-       PUT method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-delete">
-     <term>
-      <constant>EventHttpRequest::CMD_DELETE</constant>
-     </term>
-     <listitem>
-      <para>
-       DELETE command(method)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-options">
-     <term>
-      <constant>EventHttpRequest::CMD_OPTIONS</constant>
-     </term>
-     <listitem>
-      <para>
-       OPTIONS method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-trace">
-     <term>
-      <constant>EventHttpRequest::CMD_TRACE</constant>
-     </term>
-     <listitem>
-      <para>
-       TRACE method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-connect">
-     <term>
-      <constant>EventHttpRequest::CMD_CONNECT</constant>
-     </term>
-     <listitem>
-      <para>
-       CONNECT method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.cmd-patch">
-     <term>
-      <constant>EventHttpRequest::CMD_PATCH</constant>
-     </term>
-     <listitem>
-      <para>
-       PATCH method(command)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.input-header">
-     <term>
-      <constant>EventHttpRequest::INPUT_HEADER</constant>
-     </term>
-     <listitem>
-      <para>
-       Request input header type.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventhttprequest.constants.output-header">
-     <term>
-      <constant>EventHttpRequest::OUTPUT_HEADER</constant>
-     </term>
-     <listitem>
-      <para>
-       Request output header type.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventhttprequest;
-
-</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/event/eventhttprequest/addheader.xml b/reference/event/eventhttprequest/addheader.xml
deleted file mode 100644
index 87ab25beb537..000000000000
--- a/reference/event/eventhttprequest/addheader.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.addheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::addHeader</refname>
-  <refpurpose>Adds an HTTP header to the headers of the request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventHttpRequest::addHeader</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>key</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>value</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>type</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adds an HTTP header to the headers of the request.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>key</parameter>
-    </term>
-    <listitem>
-     <para>
-      Header name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>value</parameter>
-    </term>
-    <listitem>
-     <para>
-      Header value.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>type</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventhttprequest.constants">
-       <literal>EventHttpRequest::*_HEADER</literal> 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>EventHttpRequest::removeHeader</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/eventhttprequest/cancel.xml b/reference/event/eventhttprequest/cancel.xml
deleted file mode 100644
index 0c9caf495132..000000000000
--- a/reference/event/eventhttprequest/cancel.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.cancel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::cancel</refname>
-  <refpurpose>Cancels a pending HTTP request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::cancel</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Cancels a pending HTTP request.
-  </para>
-  <para>
-   Cancels an ongoing HTTP request. The callback associated with this request
-   is not executed and the request object is freed. If the request is
-   currently being processed, e.g. it is ongoing, the corresponding
-   <classname>EventHttpConnection</classname>
-   object is going to get reset.
-  </para>
-  <para>
-   A request cannot be canceled if its callback has executed already. A
-   request may be canceled reentrantly from its chunked callback.
-  </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/event/eventhttprequest/clearheaders.xml b/reference/event/eventhttprequest/clearheaders.xml
deleted file mode 100644
index 66cf80d5bb49..000000000000
--- a/reference/event/eventhttprequest/clearheaders.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.clearheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::clearHeaders</refname>
-  <refpurpose>Removes all output headers from the header list of the request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::clearHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Removes all output headers from the header list of the request.
-  </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;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::addHeader</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/eventhttprequest/closeconnection.xml b/reference/event/eventhttprequest/closeconnection.xml
deleted file mode 100644
index 9680738722c4..000000000000
--- a/reference/event/eventhttprequest/closeconnection.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.closeconnection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::closeConnection</refname>
-  <refpurpose>Closes associated HTTP connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::closeConnection</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Closes HTTP connection associated with the request.
-  </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/event/eventhttprequest/construct.xml b/reference/event/eventhttprequest/construct.xml
deleted file mode 100644
index 83197135ac45..000000000000
--- a/reference/event/eventhttprequest/construct.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::__construct</refname>
-  <refpurpose>Constructs EventHttpRequest object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventHttpRequest::__construct</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>callback</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>mixed</type>
-    <parameter>data</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs EventHttpRequest object.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>callback</parameter>
-    </term>
-    <listitem>
-     <para>
-      Gets invoked on requesting path. Should match the following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam
-        choice="opt">
-       <type>EventHttpRequest</type>
-       <parameter>req</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam
-        choice="opt">
-       <type>mixed</type>
-       <parameter>arg</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-     </methodsynopsis>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      User custom data passed to the callback.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttpRequest::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function _request_handler($req, $base) {
-    echo __FUNCTION__, PHP_EOL;
-
-    if (is_null($req)) {
-        echo "Timed out\n";
-    } else {
-        $response_code = $req->getResponseCode();
-
-        if ($response_code == 0) {
-            echo "Connection refused\n";
-        } elseif ($response_code != 200) {
-            echo "Unexpected response: $response_code\n";
-        } else {
-            echo "Success: $response_code\n";
-            $buf = $req->getInputBuffer();
-            echo "Body:\n";
-            while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-                echo $s, PHP_EOL;
-            }
-        }
-    }
-
-    $base->exit(NULL);
-}
-
-
-$address = "127.0.0.1";
-$port = 80;
-
-$base = new EventBase();
-$conn = new EventHttpConnection($base, NULL, $address, $port);
-$conn->setTimeout(5);
-$req = new EventHttpRequest("_request_handler", $base);
-
-$req->addHeader("Host", $address, EventHttpRequest::OUTPUT_HEADER);
-$req->addHeader("Content-Length", "0", EventHttpRequest::OUTPUT_HEADER);
-$conn->makeRequest($req, EventHttpRequest::CMD_GET, "/index.cphp");
-
-$base->loop();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::cancel</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::addHeader</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/eventhttprequest/findheader.xml b/reference/event/eventhttprequest/findheader.xml
deleted file mode 100644
index 2afca304bb78..000000000000
--- a/reference/event/eventhttprequest/findheader.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.findheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::findHeader</refname>
-  <refpurpose>Finds the value belonging to a header</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::findHeader</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>key</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>type</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Finds the value belonging to a header.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>key</parameter>
-    </term>
-    <listitem>
-     <para>
-      The header name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>type</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventhttprequest.constants">
-       <literal>EventHttpRequest::*_HEADER</literal> constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &null; if header not found.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::addHeader</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/eventhttprequest/free.xml b/reference/event/eventhttprequest/free.xml
deleted file mode 100644
index 195c02eb6ea7..000000000000
--- a/reference/event/eventhttprequest/free.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.free" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::free</refname>
-  <refpurpose>Frees the object and removes associated events</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::free</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Frees the object and removes associated events.
-  </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/event/eventhttprequest/getbufferevent.xml b/reference/event/eventhttprequest/getbufferevent.xml
deleted file mode 100644
index d2adb9b35276..000000000000
--- a/reference/event/eventhttprequest/getbufferevent.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getbufferevent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getBufferEvent</refname>
-  <refpurpose>Returns EventBufferEvent object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBufferEvent</type>
-   <methodname>EventHttpRequest::getBufferEvent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns
-   <classname>EventBufferEvent</classname>
-   object which represents buffer event that the connection is using.
-  </para>
-  <warning>
-   <para>
-    The reference counter of the returned object will be incremented by one to
-    protect internal structures against premature destruction when the method
-    is called from a user callback. So the
-    <classname>EventBufferEvent</classname> object should be freed explicitly
-    with <methodname>EventBufferEvent::free</methodname> method.
-    Otherwise memory will leak.
-   </para>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns
-   <classname>EventBufferEvent</classname>
-   object.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getConnection</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/eventhttprequest/getcommand.xml b/reference/event/eventhttprequest/getcommand.xml
deleted file mode 100644
index 751a66560c9e..000000000000
--- a/reference/event/eventhttprequest/getcommand.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getcommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getCommand</refname>
-  <refpurpose>Returns the request command(method)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::getCommand</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the request command, one of
-   <link
-  linkend="eventhttprequest.constants">
-    <literal>EventHttpRequest::CMD_*</literal>
-   </link>
-   constants.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the request command, one of
-   <link
-  linkend="eventhttprequest.constants">
-    <literal>EventHttpRequest::CMD_*</literal>
-   </link>
-   constants.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventhttprequest/getconnection.xml b/reference/event/eventhttprequest/getconnection.xml
deleted file mode 100644
index 550a54c55990..000000000000
--- a/reference/event/eventhttprequest/getconnection.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getconnection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getConnection</refname>
-  <refpurpose>Returns EventHttpConnection object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventHttpConnection</type>
-   <methodname>EventHttpRequest::closeConnection</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns
-   <classname>EventHttpConnection</classname>
-   object which represents HTTP connection associated with the request.
-  </para>
-  <warning>
-   <para>
-    Libevent API allows HTTP request objects to be not bound to any HTTP
-    connection. Therefore we can&apos;t unambiguously associate
-    <classname>EventHttpRequest</classname>
-    with
-    <classname>EventHttpConnection</classname>.
-    Thus, we construct
-    <classname>EventHttpConnection</classname>
-    object on-the-fly. Having no information about the event base, DNS base
-    and connection-close callback, we just leave these fields unset.
-   </para>
-  </warning>
-  <para>
-   <methodname>EventHttpRequest::getConnection</methodname>
-   method is usually useful when we need to set up a callback on connection
-   close. See
-   <methodname>EventHttpConnection::setCloseCallback</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns
-   <classname>EventHttpConnection</classname>
-   object.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpConnection::setCloseCallback</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getBufferEvent</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/eventhttprequest/gethost.xml b/reference/event/eventhttprequest/gethost.xml
deleted file mode 100644
index 5a0145d6fa3e..000000000000
--- a/reference/event/eventhttprequest/gethost.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getHost</refname>
-  <refpurpose>Returns the request host</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventHttpRequest::getHost</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the request host.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the request host.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getUri</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getCommand</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/eventhttprequest/getinputbuffer.xml b/reference/event/eventhttprequest/getinputbuffer.xml
deleted file mode 100644
index 7e74a94c47b4..000000000000
--- a/reference/event/eventhttprequest/getinputbuffer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getinputbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getInputBuffer</refname>
-  <refpurpose>Returns the input buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBuffer</type>
-   <methodname>EventHttpRequest::getInputBuffer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the input buffer.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the input buffer.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getOutputBuffer</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/eventhttprequest/getinputheaders.xml b/reference/event/eventhttprequest/getinputheaders.xml
deleted file mode 100644
index 3a649bb2afa0..000000000000
--- a/reference/event/eventhttprequest/getinputheaders.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getinputheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getInputHeaders</refname>
-  <refpurpose>Returns associative array of the input headers</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>array</type>
-   <methodname>EventHttpRequest::getInputHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns associative array of the input headers.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns associative array of the input headers.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getOutputHeaders</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/eventhttprequest/getoutputbuffer.xml b/reference/event/eventhttprequest/getoutputbuffer.xml
deleted file mode 100644
index 6917d66af816..000000000000
--- a/reference/event/eventhttprequest/getoutputbuffer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getoutputbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getOutputBuffer</refname>
-  <refpurpose>Returns the output buffer of the request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>EventBuffer</type>
-   <methodname>EventHttpRequest::getOutputBuffer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the output buffer of the request.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the output buffer of the request.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getInputBuffer</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/eventhttprequest/getoutputheaders.xml b/reference/event/eventhttprequest/getoutputheaders.xml
deleted file mode 100644
index df32a306616c..000000000000
--- a/reference/event/eventhttprequest/getoutputheaders.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getoutputheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getOutputHeaders</refname>
-  <refpurpose>Returns associative array of the output headers</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::getOutputHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns associative array of the output headers.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para></para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getInputHeaders</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/eventhttprequest/getresponsecode.xml b/reference/event/eventhttprequest/getresponsecode.xml
deleted file mode 100644
index c566243f46fc..000000000000
--- a/reference/event/eventhttprequest/getresponsecode.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.getresponsecode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getResponseCode</refname>
-  <refpurpose>Returns the response code</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>int</type>
-   <methodname>EventHttpRequest::getResponseCode</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the response code.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the response code of the request.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getCommand</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getHost</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getUri</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/eventhttprequest/geturi.xml b/reference/event/eventhttprequest/geturi.xml
deleted file mode 100644
index 8945815f47e6..000000000000
--- a/reference/event/eventhttprequest/geturi.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.geturi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::getUri</refname>
-  <refpurpose>Returns the request URI</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>string</type>
-   <methodname>EventHttpRequest::getUri</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the request URI
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the request URI
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::getCommand</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getHost</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::getResponseCode</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/eventhttprequest/removeheader.xml b/reference/event/eventhttprequest/removeheader.xml
deleted file mode 100644
index 8deb1275ddcd..000000000000
--- a/reference/event/eventhttprequest/removeheader.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.removeheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::removeHeader</refname>
-  <refpurpose>Removes an HTTP header from the headers of the request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::removeHeader</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>key</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>type</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Removes an HTTP header from the headers of the request.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>key</parameter>
-    </term>
-    <listitem>
-     <para>
-      The header name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>type</parameter>
-    </term>
-    <listitem>
-     <para>
-      <parameter>type</parameter>
-      is one of
-      <literal>EventHttpRequest::*_HEADER</literal>
-      constants.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Removes an HTTP header from the headers of the request.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::addHeader</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/eventhttprequest/senderror.xml b/reference/event/eventhttprequest/senderror.xml
deleted file mode 100644
index 44056d03a00b..000000000000
--- a/reference/event/eventhttprequest/senderror.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.senderror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::sendError</refname>
-  <refpurpose>Send an HTML error message to the client</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::sendError</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>error</parameter>
-   </methodparam>
-   <methodparam
-   choice="opt">
-    <type>string</type>
-    <parameter>reason</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Send an HTML error message to the client.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>error</parameter>
-    </term>
-    <listitem>
-     <para>
-      The HTTP error code.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      A brief explanation of the error. If &null;, the standard meaning of the
-      error code will be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventHttpRequest::sendError</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function _http_400($req) {
-    $req->sendError(400);
-}
-
-$base = new EventBase();
-$http = new EventHttp($base);
-
-$http->setCallback("/err400", "_http_400");
-
-$http->bind("0.0.0.0", 8010);
-$base->loop();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::sendReply</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/eventhttprequest/sendreply.xml b/reference/event/eventhttprequest/sendreply.xml
deleted file mode 100644
index 9054c9d83e20..000000000000
--- a/reference/event/eventhttprequest/sendreply.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.sendreply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::sendReply</refname>
-  <refpurpose>Send an HTML reply to the client</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::sendReply</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>code</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>reason</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Send an HTML reply to the client. The body of the reply consists of data in
-   optional
-   <parameter>buf</parameter>
-   parameter.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>code</parameter>
-    </term>
-    <listitem>
-     <para>
-      The HTTP response code to send.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <para>
-      A brief message to send with the response code.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      The body of the response.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::sendError</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::sendReplyChunk</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/eventhttprequest/sendreplychunk.xml b/reference/event/eventhttprequest/sendreplychunk.xml
deleted file mode 100644
index a326a8d96462..000000000000
--- a/reference/event/eventhttprequest/sendreplychunk.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.sendreplychunk" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::sendReplyChunk</refname>
-  <refpurpose>Send another data chunk as part of an ongoing chunked reply</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::sendReplyChunk</methodname>
-   <methodparam>
-    <type>EventBuffer</type>
-    <parameter>buf</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Send another data chunk as part of an ongoing chunked reply. After calling
-   this method
-   <parameter>buf</parameter>
-   will be empty.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>buf</parameter>
-    </term>
-    <listitem>
-     <para>
-      The data chunk to send as part of the reply.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::sendReplyStart</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::sendReplyEnd</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/eventhttprequest/sendreplyend.xml b/reference/event/eventhttprequest/sendreplyend.xml
deleted file mode 100644
index 232b3629710e..000000000000
--- a/reference/event/eventhttprequest/sendreplyend.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.sendreplyend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::sendReplyEnd</refname>
-  <refpurpose>Complete a chunked reply, freeing the request as appropriate</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::sendReplyEnd</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Complete a chunked reply, freeing the request as appropriate.
-  </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;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::sendReplyStart</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::sendReplyChunk</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/eventhttprequest/sendreplystart.xml b/reference/event/eventhttprequest/sendreplystart.xml
deleted file mode 100644
index 76bd61796a5f..000000000000
--- a/reference/event/eventhttprequest/sendreplystart.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventhttprequest.sendreplystart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventHttpRequest::sendReplyStart</refname>
-  <refpurpose>Initiate a chunked reply</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventHttpRequest::sendReplyStart</methodname>
-   <methodparam>
-    <type>int</type>
-    <parameter>code</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>reason</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Initiate a reply that uses
-   <literal>Transfer-Encoding</literal>
-   <literal>chunked</literal>.
-  </para>
-  <para>
-   This allows the caller to stream the reply back to the client and is useful
-   when either not all of the reply data is immediately available or when
-   sending very large replies.
-  </para>
-  <para>
-   The caller needs to supply data chunks with
-   <methodname>EventHttpRequest::sendReplyChunk</methodname>
-   and complete the reply by calling
-   <methodname>EventHttpRequest::sendReplyEnd</methodname>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>code</parameter>
-    </term>
-    <listitem>
-     <para>
-      The HTTP response code to send.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <para>
-      A brief message to send with the response code.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventHttpRequest::sendReplyChunk</methodname>
-   </member>
-   <member>
-    <methodname>EventHttpRequest::sendReplyEnd</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/eventlistener.xml b/reference/event/eventlistener.xml
deleted file mode 100644
index 273ebd25dadc..000000000000
--- a/reference/event/eventlistener.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventlistener" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventListener class</title>
- <titleabbrev>EventListener</titleabbrev>
- <partintro>
-<!-- {{{ EventListener intro -->
-  <section xml:id="eventlistener.intro">
-   &reftitle.intro;
-   <para>
-    Represents a connection listener.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventlistener.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventListener</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventListener</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.constants.opt-leave-sockets-blocking">EventListener::OPT_LEAVE_SOCKETS_BLOCKING</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.constants.opt-close-on-free">EventListener::OPT_CLOSE_ON_FREE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.constants.opt-close-on-exec">EventListener::OPT_CLOSE_ON_EXEC</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.constants.opt-reuseable">EventListener::OPT_REUSEABLE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.constants.opt-threadsafe">EventListener::OPT_THREADSAFE</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="eventlistener.props.fd">fd</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventlistener')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-  <section xml:id="eventlistener.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="eventlistener.props.fd">
-     <term>
-      <varname>fd</varname>
-     </term>
-     <listitem>
-      <para>
-       Numeric file descriptor of the underlying socket. (Added in
-       <literal>event-1.6.0</literal>
-       .)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- {{{ EventListener constants -->
-  <section xml:id="eventlistener.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventlistener.constants.opt-leave-sockets-blocking">
-     <term>
-      <constant>EventListener::OPT_LEAVE_SOCKETS_BLOCKING</constant>
-     </term>
-     <listitem>
-      <para>
-       By default Libevent turns underlying file descriptors, or sockets, to
-       non-blocking mode. This flag tells Libevent to leave them in blocking
-       mode.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventlistener.constants.opt-close-on-free">
-     <term>
-      <constant>EventListener::OPT_CLOSE_ON_FREE</constant>
-     </term>
-     <listitem>
-      <para>
-       If this option is set, the connection listener closes its underlying
-       socket when the
-       <classname>EventListener</classname>
-       object is freed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventlistener.constants.opt-close-on-exec">
-     <term>
-      <constant>EventListener::OPT_CLOSE_ON_EXEC</constant>
-     </term>
-     <listitem>
-      <para>
-       If this option is set, the connection listener sets the close-on-exec
-       flag on the underlying listener socket. See platform documentation for
-       <literal>fcntl</literal>
-       and
-       <constant>FD_CLOEXEC</constant>
-       for more information.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventlistener.constants.opt-reuseable">
-     <term>
-      <constant>EventListener::OPT_REUSEABLE</constant>
-     </term>
-     <listitem>
-      <para>
-       By default on some platforms, once a listener socket is closed, no
-       other socket can bind to the same port until a while has passed.
-       Setting this option makes Libevent mark the socket as reusable, so that
-       once it is closed, another socket can be opened to listen on the same
-       port.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventlistener.constants.opt-threadsafe">
-     <term>
-      <constant>EventListener::OPT_THREADSAFE</constant>
-     </term>
-     <listitem>
-      <para>
-       Allocate locks for the listener, so that it’s safe to use it from
-       multiple threads.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventlistener;
-
-</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/event/eventlistener/construct.xml b/reference/event/eventlistener/construct.xml
deleted file mode 100644
index af918584b540..000000000000
--- a/reference/event/eventlistener/construct.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventlistener.construct">
- <refnamediv>
-  <refname>EventListener::__construct</refname>
-  <refpurpose>Creates new connection listener associated with an event base</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventListener::__construct</methodname>
-   <methodparam>
-    <type>EventBase</type>
-    <parameter>base</parameter>
-   </methodparam>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>data</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>flags</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>backlog</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>target</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Creates new connection listener associated with an event base.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>base</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associated event base.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      A
-      <type>callable</type>
-      that will be invoked when new connection received.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom user data attached to
-      <parameter>cb</parameter>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>flags</parameter>
-    </term>
-    <listitem>
-     <para>
-      Bit mask of
-      <literal>EventListener::OPT_*</literal>
-      constants. See
-      <link linkend="eventlistener.constants">EventListener constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>backlog</parameter>
-    </term>
-    <listitem>
-     <para>
-      Controls the maximum number of pending connections that the network
-      stack should allow to wait in a not-yet-accepted state at any time; see
-      documentation for your system’s
-      <literal>listen</literal>
-      function for more details. If
-      <parameter>backlog</parameter>
-      is negative, Libevent tries to pick a good value for the
-      <parameter>backlog</parameter>
-      ; if it is zero, Event assumes that
-      <literal>listen</literal>
-      is already called on the socket (<parameter>target</parameter>).
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>target</parameter>
-    </term>
-    <listitem>
-     <para>
-      May be string, socket resource, or a stream associated with a socket. In
-      case if
-      <parameter>target</parameter>
-      is a string, the string will be parsed as network address. It will be
-      interpreted as a UNIX domain socket path, if prefixed with
-      <literal>'unix:'</literal>,
-      e.g.
-      <literal>'unix:/tmp/my.sock'</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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 event 1.5.0</entry>
-      <entry>
-       UNIX domain sockets&apos; support added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventListener::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple echo server based on libevent's connection listener.
- *
- * Usage:
- * 1) In one terminal window run:
- *
- * $ php listener.php 9881
- *
- * 2) In another terminal window open up connection, e.g.:
- *
- * $ nc 127.0.0.1 9881
- *
- * 3) start typing. The server should repeat the input.
- */
-
-class MyListenerConnection {
-    private $bev, $base;
-
-    public function __destruct() {
-        $this->bev->free();
-    }
-
-    public function __construct($base, $fd) {
-        $this->base = $base;
-
-        $this->bev = new EventBufferEvent($base, $fd, EventBufferEvent::OPT_CLOSE_ON_FREE);
-
-        $this->bev->setCallbacks(array($this, "echoReadCallback"), NULL,
-            array($this, "echoEventCallback"), NULL);
-
-        if (!$this->bev->enable(Event::READ)) {
-            echo "Failed to enable READ\n";
-            return;
-        }
-    }
-
-    public function echoReadCallback($bev, $ctx) {
-        // Copy all the data from the input buffer to the output buffer
-
-        // Variant #1
-        $bev->output->addBuffer($bev->input);
-
-        /* Variant #2 */
-        /*
-        $input    = $bev->getInput();
-        $output = $bev->getOutput();
-        $output->addBuffer($input);
-        */
-    }
-
-    public function echoEventCallback($bev, $events, $ctx) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "Error from bufferevent\n";
-        }
-
-        if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-            //$bev->free();
-            $this->__destruct();
-        }
-    }
-}
-
-class MyListener {
-    public $base,
-        $listener,
-        $socket;
-    private $conn = array();
-
-    public function __destruct() {
-        foreach ($this->conn as &$c) $c = NULL;
-    }
-
-    public function __construct($port) {
-        $this->base = new EventBase();
-        if (!$this->base) {
-            echo "Couldn't open event base";
-            exit(1);
-        }
-
-        // Variant #1
-        /*
-        $this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-        if (!socket_bind($this->socket, '0.0.0.0', $port)) {
-            echo "Unable to bind socket\n";
-            exit(1);
-        }
-        $this->listener = new EventListener($this->base,
-            array($this, "acceptConnCallback"), $this->base,
-            EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE,
-            -1, $this->socket);
-         */
-
-        // Variant #2
-         $this->listener = new EventListener($this->base,
-             array($this, "acceptConnCallback"), $this->base,
-             EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE, -1,
-             "0.0.0.0:$port");
-
-        if (!$this->listener) {
-            echo "Couldn't create listener";
-            exit(1);
-        }
-
-        $this->listener->setErrorCallback(array($this, "accept_error_cb"));
-    }
-
-    public function dispatch() {
-        $this->base->dispatch();
-    }
-
-    // This callback is invoked when there is data to read on $bev
-    public function acceptConnCallback($listener, $fd, $address, $ctx) {
-        // We got a new connection! Set up a bufferevent for it. */
-        $base = $this->base;
-        $this->conn[] = new MyListenerConnection($base, $fd);
-    }
-
-    public function accept_error_cb($listener, $ctx) {
-        $base = $this->base;
-
-        fprintf(STDERR, "Got an error %d (%s) on the listener. "
-            ."Shutting down.\n",
-            EventUtil::getLastSocketErrno(),
-            EventUtil::getLastSocketError());
-
-        $base->exit(NULL);
-    }
-}
-
-$port = 9808;
-
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$l = new MyListener($port);
-$l->dispatch();
-?>
-]]>
-   </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/event/eventlistener/disable.xml b/reference/event/eventlistener/disable.xml
deleted file mode 100644
index e39fe8efb43c..000000000000
--- a/reference/event/eventlistener/disable.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventlistener.disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventListener::disable</refname>
-  <refpurpose>Disables an event connect listener object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventListener::disable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Disables an event connect listener object
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventListener::enable</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/eventlistener/enable.xml b/reference/event/eventlistener/enable.xml
deleted file mode 100644
index 7ccfad89f10f..000000000000
--- a/reference/event/eventlistener/enable.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventlistener.enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventListener::enable</refname>
-  <refpurpose>Enables an event connect listener object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>bool</type>
-   <methodname>EventListener::enable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Enables an event connect listener object
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventListener::disable</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/eventlistener/getbase.xml b/reference/event/eventlistener/getbase.xml
deleted file mode 100644
index a59202d8b5f5..000000000000
--- a/reference/event/eventlistener/getbase.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventlistener.getbase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventListener::getBase</refname>
-  <refpurpose>Returns event base associated with the event listener</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventListener::getBase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns event base associated with the event listener.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns event base associated with the event listener.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventlistener/getsocketname.xml b/reference/event/eventlistener/getsocketname.xml
deleted file mode 100644
index fdeec7973603..000000000000
--- a/reference/event/eventlistener/getsocketname.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventlistener.getsocketname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventListener::getSocketName</refname>
-  <refpurpose>Retrieves the current address to which the
-  listener&apos;s socket is bound</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>bool</type>
-   <methodname>EventListener::getSocketName</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter role="reference">address</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter role="reference">port</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the current address to which the listener&apos;s socket is bound.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      Output parameter. IP-address depending on the socket address family.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      Output parameter. The port the socket is bound to.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventlistener/setcallback.xml b/reference/event/eventlistener/setcallback.xml
deleted file mode 100644
index f941b9e43a54..000000000000
--- a/reference/event/eventlistener/setcallback.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventlistener.setcallback">
- <refnamediv>
-  <refname>EventListener::setCallback</refname>
-  <refpurpose>The setCallback purpose</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventListener::setCallback</methodname>
-   <methodparam>
-    <type>callable</type>
-    <parameter>cb</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>arg</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Adjust event connect listener&apos;s callback and optionally the callback
-   argument.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The new callback for new connections. Ignored if &null;.
-     </para>
-     <para>
-      Should match the following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam choice="opt">
-       <type>EventListener</type>
-       <parameter>listener</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>mixed</type>
-       <parameter>fd</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>array</type>
-       <parameter>address</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>mixed</type>
-       <parameter>arg</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-     </methodsynopsis>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <parameter>listener</parameter>
-       </term>
-       <listitem>
-        <para>
-         The
-         <classname>EventListener</classname>
-         object.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>fd</parameter>
-       </term>
-       <listitem>
-        <para>
-         The file descriptor or a resource associated with the listener.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>address</parameter>
-       </term>
-       <listitem>
-        <para>
-         Array of two elements: IP address and the
-         <emphasis>server</emphasis>
-         port.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>arg</parameter>
-       </term>
-       <listitem>
-        <para>
-         User custom data attached to the callback.
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>arg</parameter>
-    </term>
-    <listitem>
-     <para>
-      Custom user data attached to the callback. Ignored if &null;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventlistener/seterrorcallback.xml b/reference/event/eventlistener/seterrorcallback.xml
deleted file mode 100644
index 49e728e58708..000000000000
--- a/reference/event/eventlistener/seterrorcallback.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="eventlistener.seterrorcallback">
- <refnamediv>
-  <refname>EventListener::setErrorCallback</refname>
-  <refpurpose>Set event listener's error callback</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <type>void</type>
-   <methodname>EventListener::setErrorCallback</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>cb</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Set event listener's error callback
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>cb</parameter>
-    </term>
-    <listitem>
-     <para>
-      The error callback. Should match the following prototype:
-     </para>
-     <methodsynopsis>
-      <type>void</type>
-      <methodname>callback</methodname>
-      <methodparam choice="opt">
-       <type>EventListener</type>
-       <parameter>listener</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-      <methodparam choice="opt">
-       <type>mixed</type>
-       <parameter>data</parameter>
-       <initializer>&null;</initializer>
-      </methodparam>
-     </methodsynopsis>
-     <variablelist>
-      <varlistentry>
-       <term>
-        <parameter>listener</parameter>
-       </term>
-       <listitem>
-        <para>
-         The
-         <classname>EventListener</classname>
-         object.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>
-        <parameter>data</parameter>
-       </term>
-       <listitem>
-        <para>
-         User custom data attached to the callback.
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para/>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventListener::setCallback</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/eventsslcontext.xml b/reference/event/eventsslcontext.xml
deleted file mode 100644
index 846b048bb0b0..000000000000
--- a/reference/event/eventsslcontext.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventsslcontext" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventSslContext class</title>
- <titleabbrev>EventSslContext</titleabbrev>
- <partintro>
-<!-- {{{ EventSslContext intro -->
-  <section xml:id="eventsslcontext.intro">
-   &reftitle.intro;
-   <para>
-    Represents
-    <literal>SSL_CTX</literal>
-    structure. Provides methods and properties to configure the SSL context.
-   </para>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventsslcontext.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventSslContext</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventSslContext</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv2-client-method">EventSslContext::SSLv2_CLIENT_METHOD</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv3-client-method">EventSslContext::SSLv3_CLIENT_METHOD</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv23-client-method">EventSslContext::SSLv23_CLIENT_METHOD</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.tls-client-method">EventSslContext::TLS_CLIENT_METHOD</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv2-server-method">EventSslContext::SSLv2_SERVER_METHOD</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv3-server-method">EventSslContext::SSLv3_SERVER_METHOD</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.sslv23-server-method">EventSslContext::SSLv23_SERVER_METHOD</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.tls-server-method">EventSslContext::TLS_SERVER_METHOD</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-local-cert">EventSslContext::OPT_LOCAL_CERT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-local-pk">EventSslContext::OPT_LOCAL_PK</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-passphrase">EventSslContext::OPT_PASSPHRASE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-ca-file">EventSslContext::OPT_CA_FILE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-ca-path">EventSslContext::OPT_CA_PATH</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-allow-self-signed">EventSslContext::OPT_ALLOW_SELF_SIGNED</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-verify-peer">EventSslContext::OPT_VERIFY_PEER</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-verify-depth">EventSslContext::OPT_VERIFY_DEPTH</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventsslcontext.constants.opt-ciphers">EventSslContext::OPT_CIPHERS</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="eventsslcontext.props.local-cert">local_cert</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="eventsslcontext.props.local-pk">local_pk</varname>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventsslcontext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventSslContext properties -->
-  <section xml:id="eventsslcontext.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="eventsslcontext.props.local-cert">
-     <term>
-      <varname>local_cert</varname>
-     </term>
-     <listitem>
-      <para>
-       Path to local certificate file on filesystem. It must be a <acronym>PEM</acronym>-encoded
-       file which contains certificate. It can optionally contain the
-       certificate chain of issuers.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.props.local-pk">
-     <term>
-      <varname>local_pk</varname>
-     </term>
-     <listitem>
-      <para>
-       Path to local private key file
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-<!-- {{{ EventSslContext constants -->
-  <section xml:id="eventsslcontext.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventsslcontext.constants.sslv2-client-method">
-     <term>
-      <constant>EventSslContext::SSLv2_CLIENT_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv2 client method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.sslv3-client-method">
-     <term>
-      <constant>EventSslContext::SSLv3_CLIENT_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv3 client method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.sslv23-client-method">
-     <term>
-      <constant>EventSslContext::SSLv23_CLIENT_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv23 client method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.tls-client-method">
-     <term>
-      <constant>EventSslContext::TLS_CLIENT_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       TLS client method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.sslv2-server-method">
-     <term>
-      <constant>EventSslContext::SSLv2_SERVER_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv2 server method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.sslv3-server-method">
-     <term>
-      <constant>EventSslContext::SSLv3_SERVER_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv3 server method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.sslv23-server-method">
-     <term>
-      <constant>EventSslContext::SSLv23_SERVER_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       SSLv23 server method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.tls-server-method">
-     <term>
-      <constant>EventSslContext::TLS_SERVER_METHOD</constant>
-     </term>
-     <listitem>
-      <para>
-       TLS server method. See
-       <literal>SSL_CTX_new(3)</literal>
-       man page.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-local-cert">
-     <term>
-      <constant>EventSslContext::OPT_LOCAL_CERT</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       The option points to path of local certificate.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-local-pk">
-     <term>
-      <constant>EventSslContext::OPT_LOCAL_PK</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       The option points to path of the private key.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-passphrase">
-     <term>
-      <constant>EventSslContext::OPT_PASSPHRASE</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents passphrase of the certificate.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-ca-file">
-     <term>
-      <constant>EventSslContext::OPT_CA_FILE</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents path of the certificate authority file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-ca-path">
-     <term>
-      <constant>EventSslContext::OPT_CA_PATH</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents path where the certificate authority file should be
-       searched for.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-allow-self-signed">
-     <term>
-      <constant>EventSslContext::OPT_ALLOW_SELF_SIGNED</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents option that allows self-signed certificates.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-verify-peer">
-     <term>
-      <constant>EventSslContext::OPT_VERIFY_PEER</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents option that tells Event to verify peer.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-verify-depth">
-     <term>
-      <constant>EventSslContext::OPT_VERIFY_DEPTH</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents maximum depth for the certificate chain verification that
-       shall be allowed for the SSL context.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventsslcontext.constants.opt-ciphers">
-     <term>
-      <constant>EventSslContext::OPT_CIPHERS</constant>
-     </term>
-     <listitem>
-      <para>
-       Key for an item of the options&apos; array used in
-       <methodname>EventSslContext::__construct</methodname>.
-       Represents the cipher list for the SSL context.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventsslcontext;
-
-</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/event/eventsslcontext/construct.xml b/reference/event/eventsslcontext/construct.xml
deleted file mode 100644
index 673c625256a5..000000000000
--- a/reference/event/eventsslcontext/construct.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventsslcontext.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventSslContext::__construct</refname>
-  <refpurpose>Constructs an OpenSSL context for use with Event classes</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <methodname>EventSslContext::__construct</methodname>
-   <methodparam>
-    <type>string</type>
-    <parameter>method</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter>options</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Creates SSL context holding pointer to
-   <literal>SSL_CTX</literal>
-   (see the system manual).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>method</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <link linkend="eventsslcontext.constants">
-       <literal>EventSslContext::*_METHOD</literal> constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <para>
-      Associative array of SSL context options One of
-      <link
-     linkend="eventsslcontext.constants">
-       <literal>EventSslContext::OPT_*</literal> constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>EventSslContext::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ctx = new EventSslContext(EventSslContext::SSLv3_SERVER_METHOD, array(
-     EventSslContext::OPT_LOCAL_CERT        => $local_cert,
-     EventSslContext::OPT_LOCAL_PK          => $local_pk,
-     EventSslContext::OPT_PASSPHRASE        => "echo server",
-     EventSslContext::OPT_VERIFY_PEER       => true,
-     EventSslContext::OPT_ALLOW_SELF_SIGNED => false,
-));
-?>
-]]>
-   </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/event/eventutil.xml b/reference/event/eventutil.xml
deleted file mode 100644
index a1ebca7255d5..000000000000
--- a/reference/event/eventutil.xml
+++ /dev/null
@@ -1,509 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.eventutil" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The EventUtil class</title>
- <titleabbrev>EventUtil</titleabbrev>
- <partintro>
-<!-- {{{ EventUtil intro -->
-  <section xml:id="eventutil.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>EventUtil</classname>
-    is a singleton with supplementary methods and constants.
-   </simpara>
-  </section>
-<!-- }}} -->
-  <section xml:id="eventutil.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>EventUtil</classname>
-    </ooclass>
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>EventUtil</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.af-inet">EventUtil::AF_INET</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.af-inet6">EventUtil::AF_INET6</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.af-unspec">EventUtil::AF_UNSPEC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.libevent-version-number">EventUtil::LIBEVENT_VERSION_NUMBER</varname>
-     <initializer>33559808</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-debug">EventUtil::SO_DEBUG</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-reuseaddr">EventUtil::SO_REUSEADDR</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-keepalive">EventUtil::SO_KEEPALIVE</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-dontroute">EventUtil::SO_DONTROUTE</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-linger">EventUtil::SO_LINGER</varname>
-     <initializer>13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-broadcast">EventUtil::SO_BROADCAST</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-oobinline">EventUtil::SO_OOBINLINE</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-sndbuf">EventUtil::SO_SNDBUF</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-rcvbuf">EventUtil::SO_RCVBUF</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-sndlowat">EventUtil::SO_SNDLOWAT</varname>
-     <initializer>19</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-rcvlowat">EventUtil::SO_RCVLOWAT</varname>
-     <initializer>18</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-sndtimeo">EventUtil::SO_SNDTIMEO</varname>
-     <initializer>21</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-rcvtimeo">EventUtil::SO_RCVTIMEO</varname>
-     <initializer>20</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-type">EventUtil::SO_TYPE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.so-error">EventUtil::SO_ERROR</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.sol-socket">EventUtil::SOL_SOCKET</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.sol-tcp">EventUtil::SOL_TCP</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.sol-udp">EventUtil::SOL_UDP</varname>
-     <initializer>17</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.ipproto-ip">EventUtil::IPPROTO_IP</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="eventutil.constants.ipproto-ipv6">EventUtil::IPPROTO_IPV6</varname>
-     <initializer>41</initializer>
-    </fieldsynopsis>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.eventutil')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-<!-- {{{ EventUtil constants -->
-  <section xml:id="eventutil.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="eventutil.constants.af-inet">
-     <term>
-      <constant>EventUtil::AF_INET</constant>
-     </term>
-     <listitem>
-      <para>
-       IPv4 address family
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.af-inet6">
-     <term>
-      <constant>EventUtil::AF_INET6</constant>
-     </term>
-     <listitem>
-      <para>
-       IPv6 address family
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.af-unspec">
-     <term>
-      <constant>EventUtil::AF_UNSPEC</constant>
-     </term>
-     <listitem>
-      <para>
-       Unspecified IP address family
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-debug">
-     <term>
-      <constant>EventUtil::SO_DEBUG</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. Enable socket debugging. Only allowed for processes with
-       the
-       <literal>CAP_NET_ADMIN</literal>
-       capability or an effective user ID of
-       <literal>0</literal>.
-       (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-reuseaddr">
-     <term>
-      <constant>EventUtil::SO_REUSEADDR</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. Indicates that the rules used in validating addresses
-       supplied in a
-       <literal>bind(2)</literal>
-       call should allow reuse of local addresses. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-keepalive">
-     <term>
-      <constant>EventUtil::SO_KEEPALIVE</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. Enable sending of keep-alive messages on
-       connection-oriented sockets. Expects an integer boolean flag. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-dontroute">
-     <term>
-      <constant>EventUtil::SO_DONTROUTE</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-linger">
-     <term>
-      <constant>EventUtil::SO_LINGER</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. When enabled, a
-       <literal>close(2)</literal>
-       or
-       <literal>shutdown(2)</literal>
-       will not return until all queued messages for the socket have been
-       successfully sent or the linger timeout has been reached. Otherwise,
-       the call returns immediately and the closing is done in the background.
-       See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-broadcast">
-     <term>
-      <constant>EventUtil::SO_BROADCAST</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. Reports whether transmission of broadcast messages is
-       supported. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-oobinline">
-     <term>
-      <constant>EventUtil::SO_OOBINLINE</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-sndbuf">
-     <term>
-      <constant>EventUtil::SO_SNDBUF</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-rcvbuf">
-     <term>
-      <constant>EventUtil::SO_RCVBUF</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-sndlowat">
-     <term>
-      <constant>EventUtil::SO_SNDLOWAT</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-rcvlowat">
-     <term>
-      <constant>EventUtil::SO_RCVLOWAT</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-sndtimeo">
-     <term>
-      <constant>EventUtil::SO_SNDTIMEO</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-rcvtimeo">
-     <term>
-      <constant>EventUtil::SO_RCVTIMEO</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-type">
-     <term>
-      <constant>EventUtil::SO_TYPE</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.so-error">
-     <term>
-      <constant>EventUtil::SO_ERROR</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.sol-socket">
-     <term>
-      <constant>EventUtil::SOL_SOCKET</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option level. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.sol-tcp">
-     <term>
-      <constant>EventUtil::SOL_TCP</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option level. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.sol-udp">
-     <term>
-      <constant>EventUtil::SOL_UDP</constant>
-     </term>
-     <listitem>
-      <para>
-       Socket option level. See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.ipproto-ip">
-     <term>
-      <constant>EventUtil::IPPROTO_IP</constant>
-     </term>
-     <listitem>
-      <para>
-       See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.ipproto-ipv6">
-     <term>
-      <constant>EventUtil::IPPROTO_IPV6</constant>
-     </term>
-     <listitem>
-      <para>
-       See the
-       <literal>socket(7)</literal>
-       manual page. (Added in event-1.6.0.)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="eventutil.constants.libevent-version-number">
-     <term>
-      <constant>EventUtil::LIBEVENT_VERSION_NUMBER</constant>
-     </term>
-     <listitem>
-      <para>
-       Libevent&apos; version number at the time when Event extension had been
-       compiled with the library.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
- &reference.event.entities.eventutil;
-
-</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/event/eventutil/construct.xml b/reference/event/eventutil/construct.xml
deleted file mode 100644
index b3a0d36e0e33..000000000000
--- a/reference/event/eventutil/construct.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::__construct</refname>
-  <refpurpose>The abstract constructor</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier>
-   <modifier>public</modifier>
-   <methodname>EventUtil::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   <classname>EventUtil</classname>
-   is a singleton. Therefore the constructor is abstract, and it is impossible
-   to create objects based on this class.
-  </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/event/eventutil/getlastsocketerrno.xml b/reference/event/eventutil/getlastsocketerrno.xml
deleted file mode 100644
index 5c6685bb9630..000000000000
--- a/reference/event/eventutil/getlastsocketerrno.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.getlastsocketerrno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::getLastSocketErrno</refname>
-  <refpurpose>Returns the most recent socket error number</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>EventUtil::getLastSocketErrno</methodname>
-   <methodparam
-   choice="opt">
-    <type>mixed</type>
-    <parameter>socket</parameter>
-    <initializer>&null;</initializer>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the most recent socket error number(
-   <literal>errno</literal>
-   ).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream or a file descriptor of a socket.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the most recent socket error number(
-   <literal>errno</literal>
-   ).
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventUtil::getLastSocketError</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/eventutil/getlastsocketerror.xml b/reference/event/eventutil/getlastsocketerror.xml
deleted file mode 100644
index 87e033b1cc20..000000000000
--- a/reference/event/eventutil/getlastsocketerror.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.getlastsocketerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::getLastSocketError</refname>
-  <refpurpose>Returns the most recent socket error</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>string</type>
-   <methodname>EventUtil::getLastSocketError</methodname>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the most recent socket error.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream or a file descriptor of a socket.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the most recent socket error.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <methodname>EventUtil::getLastSocketErrno</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/eventutil/getsocketfd.xml b/reference/event/eventutil/getsocketfd.xml
deleted file mode 100644
index 917f9c4c9cbc..000000000000
--- a/reference/event/eventutil/getsocketfd.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.getsocketfd" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::getSocketFd</refname>
-  <refpurpose>Returns numeric file descriptor of a socket, or stream</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>int</type>
-   <methodname>EventUtil::getSocketFd</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Returns numeric file descriptor of a socket or stream specified by
-   <parameter>socket</parameter>
-   argument just like the
-   <literal>Event</literal>
-   extension does it internally for all methods accepting socket resource or
-   stream.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource or stream.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns numeric file descriptor of a socket, or stream.
-   <methodname>EventUtil::getSocketFd</methodname>
-   returns &false; in case if it is whether failed to recognize the type of
-   the underlying file, or detected that the file descriptor associated with
-   <parameter>socket</parameter>
-   is not valid.
-  </para>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/eventutil/getsocketname.xml b/reference/event/eventutil/getsocketname.xml
deleted file mode 100644
index 7d633b8561aa..000000000000
--- a/reference/event/eventutil/getsocketname.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.getsocketname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::getSocketName</refname>
-  <refpurpose>Retrieves the current address to which the
-  socket is bound</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>bool</type>
-   <methodname>EventUtil::getSocketName</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type>
-    <parameter role="reference">address</parameter>
-   </methodparam>
-   <methodparam choice="opt">
-    <type>mixed</type>
-    <parameter role="reference">port</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the current address to which the
-   <parameter>socket</parameter>
-   is bound.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream or a file descriptor of a socket.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>address</parameter>
-    </term>
-    <listitem>
-     <para>
-      Output parameter. IP-address, or the UNIX domain socket path depending
-      on the socket address family.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>port</parameter>
-    </term>
-    <listitem>
-     <para>
-      Output parameter. The port the socket is bound to. Has no meaning for
-      UNIX domain sockets.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/event/eventutil/setsocketoption.xml b/reference/event/eventutil/setsocketoption.xml
deleted file mode 100644
index 795aee7f42b7..000000000000
--- a/reference/event/eventutil/setsocketoption.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.setsocketoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::setSocketOption</refname>
-  <refpurpose>Sets socket options</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>bool</type>
-   <methodname>EventUtil::setSocketOption</methodname>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>socket</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>level</parameter>
-   </methodparam>
-   <methodparam>
-    <type>int</type>
-    <parameter>optname</parameter>
-   </methodparam>
-   <methodparam>
-    <type>mixed</type>
-    <parameter>optval</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <para>
-   Sets socket options.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>socket</parameter>
-    </term>
-    <listitem>
-     <para>
-      Socket resource, stream, or numeric file descriptor associated with the
-      socket.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>level</parameter>
-    </term>
-    <listitem>
-     <para>
-      One of
-      <literal>EventUtil::SOL_*</literal>
-      constants. Specifies the protocol level at which the option resides. For
-      example, to retrieve options at the socket level, a
-      <parameter>level</parameter>
-      parameter of
-      <constant>EventUtil::SOL_SOCKET</constant>
-      would be used. Other levels, such as TCP, can be used by specifying the
-      protocol number of that level. Protocol numbers can be found by using
-      the
-      <function>getprotobyname</function>
-      function. See
-      <link linkend="eventutil.constants">EventUtil constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>optname</parameter>
-    </term>
-    <listitem>
-     <para>
-      Option name(type). Has the same meaning as corresponding parameter of
-      <function>socket_get_option</function>
-      function. See
-      <link linkend="eventutil.constants">EventUtil constants</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>optval</parameter>
-    </term>
-    <listitem>
-     <para>
-      Accepts the same values as
-      <parameter>optval</parameter>
-      parameter of the
-      <function>socket_get_option</function>
-      function.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <function>socket_get_option</function>
-   </member>
-   <member>
-    <function>socket_set_option</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/event/eventutil/sslrandpoll.xml b/reference/event/eventutil/sslrandpoll.xml
deleted file mode 100644
index 0841216285b0..000000000000
--- a/reference/event/eventutil/sslrandpoll.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="eventutil.sslrandpoll" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>EventUtil::sslRandPoll</refname>
-  <refpurpose>Generates entropy by means of OpenSSL's RAND_poll()</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>void</type>
-   <methodname>EventUtil::sslRandPoll</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Generates entropy by means of OpenSSL's
-   <literal>RAND_poll()</literal>
-   (see the system manual).
-  </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/event/examples.xml b/reference/event/examples.xml
deleted file mode 100644
index da10d4952446..000000000000
--- a/reference/event/examples.xml
+++ /dev/null
@@ -1,1317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="event.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Simple HTTP client</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Read callback
-function readcb($bev, $base) {
-    //$input = $bev->input; //$bev->getInput();
-
-    //$pos = $input->search("TTP");
-    $pos = $bev->input->search("TTP");
-
-    while (($n = $bev->input->remove($buf, 1024)) > 0) {
-        echo $buf;
-    }
-}
-
-// Event callback
-function eventcb($bev, $events, $base) {
-    if ($events & EventBufferEvent::CONNECTED) {
-        echo "Connected.\n";
-    } elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "DNS error: ", $bev->getDnsErrorString(), PHP_EOL;
-        }
-
-        echo "Closing\n";
-        $base->exit();
-        exit("Done\n");
-    }
-}
-
-if ($argc != 3) {
-    echo <<<EOS
-Trivial HTTP 0.x client
-Syntax: php {$argv[0]} [hostname] [resource]
-Example: php {$argv[0]} www.google.com /
-
-EOS;
-    exit();
-}
-
-$base = new EventBase();
-
-$dns_base = new EventDnsBase($base, TRUE); // We'll use async DNS resolving
-if (!$dns_base) {
-    exit("Failed to init DNS Base\n");
-}
-
-$bev = new EventBufferEvent($base, /* use internal socket */ NULL,
-    EventBufferEvent::OPT_CLOSE_ON_FREE | EventBufferEvent::OPT_DEFER_CALLBACKS,
-    "readcb", /* writecb */ NULL, "eventcb"
-);
-if (!$bev) {
-    exit("Failed creating bufferevent socket\n");
-}
-
-//$bev->setCallbacks("readcb", /* writecb */ NULL, "eventcb", $base);
-$bev->enable(Event::READ | Event::WRITE);
-
-$output = $bev->output; //$bev->getOutput();
-if (!$output->add(
-    "GET {$argv[2]} HTTP/1.0\r\n".
-    "Host: {$argv[1]}\r\n".
-    "Connection: Close\r\n\r\n"
-)) {
-    exit("Failed adding request to output buffer\n");
-}
-
-if (!$bev->connectHost($dns_base, $argv[1], 80, EventUtil::AF_UNSPEC)) {
-    exit("Can't connect to host {$argv[1]}\n");
-}
-
-$base->dispatch();
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-Connected.
-HTTP/1.1 301 Moved Permanently
-Date: Fri, 01 Mar 2013 18:47:48 GMT
-Location: http://www.google.co.uk/
-Content-Type: text/html; charset=UTF-8
-Cache-Control: public, max-age=2592000
-Server: gws
-Content-Length: 221
-X-XSS-Protection: 1; mode=block
-X-Frame-Options: SAMEORIGIN
-Age: 133438
-Expires: Sat, 30 Mar 2013 05:39:28 GMT
-Connection: close
-
-<HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
-<TITLE>301 Moved</TITLE></HEAD><BODY>
-<H1>301 Moved</H1>
-The document has moved
-<A HREF="http://www.google.co.uk/">here</A>.
-</BODY></HTML>
-Closing
-Done
-]]>
-  </screen>
- </example>
- <example>
-  <title>HTTP client using asynchronous DNS resolver</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * 1. Connect to 127.0.0.1 at port 80
- * by means of EventBufferEvent::connect().
- *
- * 2. Request /index.cphp via HTTP/1.0
- * using the output buffer.
- *
- * 3. Asynchronously read the response and print it to stdout.
- */
-
-// Read callback
-function readcb($bev, $base) {
-    $input = $bev->getInput();
-
-    while (($n = $input->remove($buf, 1024)) > 0) {
-        echo $buf;
-    }
-}
-
-// Event callback
-function eventcb($bev, $events, $base) {
-    if ($events & EventBufferEvent::CONNECTED) {
-        echo "Connected.\n";
-    } elseif ($events & (EventBufferEvent::ERROR | EventBufferEvent::EOF)) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "DNS error: ", $bev->getDnsErrorString(), PHP_EOL;
-        }
-
-        echo "Closing\n";
-        $base->exit();
-        exit("Done\n");
-    }
-}
-
-$base = new EventBase();
-
-echo "step 1\n";
-$bev = new EventBufferEvent($base, /* use internal socket */ NULL,
-    EventBufferEvent::OPT_CLOSE_ON_FREE | EventBufferEvent::OPT_DEFER_CALLBACKS);
-if (!$bev) {
-    exit("Failed creating bufferevent socket\n");
-}
-
-echo "step 2\n";
-$bev->setCallbacks("readcb", /* writecb */ NULL, "eventcb", $base);
-$bev->enable(Event::READ | Event::WRITE);
-
-echo "step 3\n";
-// Send request
-$output = $bev->getOutput();
-if (!$output->add(
-    "GET /index.cphp HTTP/1.0\r\n".
-    "Connection: Close\r\n\r\n"
-)) {
-    exit("Failed adding request to output buffer\n");
-}
-
-/* Connect to the host synchronously.
-We know the IP, and don't need to resolve DNS. */
-if (!$bev->connect("127.0.0.1:80")) {
-    exit("Can't connect to host\n");
-}
-
-// Dispatch pending events
-$base->dispatch();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Echo server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple echo server based on libevent's connection listener.
- *
- * Usage:
- * 1) In one terminal window run:
- *
- * $ php listener.php 9881
- *
- * 2) In another terminal window open up connection, e.g.:
- *
- * $ nc 127.0.0.1 9881
- *
- * 3) start typing. The server should repeat the input.
- */
-
-class MyListenerConnection {
-    private $bev, $base;
-
-    public function __destruct() {
-        $this->bev->free();
-    }
-
-    public function __construct($base, $fd) {
-        $this->base = $base;
-
-        $this->bev = new EventBufferEvent($base, $fd, EventBufferEvent::OPT_CLOSE_ON_FREE);
-
-        $this->bev->setCallbacks(array($this, "echoReadCallback"), NULL,
-            array($this, "echoEventCallback"), NULL);
-
-        if (!$this->bev->enable(Event::READ)) {
-            echo "Failed to enable READ\n";
-            return;
-        }
-    }
-
-    public function echoReadCallback($bev, $ctx) {
-        // Copy all the data from the input buffer to the output buffer
-
-        // Variant #1
-        $bev->output->addBuffer($bev->input);
-
-        /* Variant #2 */
-        /*
-        $input    = $bev->getInput();
-        $output = $bev->getOutput();
-        $output->addBuffer($input);
-        */
-    }
-
-    public function echoEventCallback($bev, $events, $ctx) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "Error from bufferevent\n";
-        }
-
-        if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-            //$bev->free();
-            $this->__destruct();
-        }
-    }
-}
-
-class MyListener {
-    public $base,
-        $listener,
-        $socket;
-    private $conn = array();
-
-    public function __destruct() {
-        foreach ($this->conn as &$c) $c = NULL;
-    }
-
-    public function __construct($port) {
-        $this->base = new EventBase();
-        if (!$this->base) {
-            echo "Couldn't open event base";
-            exit(1);
-        }
-
-        // Variant #1
-        /*
-        $this->socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-        if (!socket_bind($this->socket, '0.0.0.0', $port)) {
-            echo "Unable to bind socket\n";
-            exit(1);
-        }
-        $this->listener = new EventListener($this->base,
-            array($this, "acceptConnCallback"), $this->base,
-            EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE,
-            -1, $this->socket);
-         */
-
-        // Variant #2
-         $this->listener = new EventListener($this->base,
-             array($this, "acceptConnCallback"), $this->base,
-             EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE, -1,
-             "0.0.0.0:$port");
-
-        if (!$this->listener) {
-            echo "Couldn't create listener";
-            exit(1);
-        }
-
-        $this->listener->setErrorCallback(array($this, "accept_error_cb"));
-    }
-
-    public function dispatch() {
-        $this->base->dispatch();
-    }
-
-    // This callback is invoked when there is data to read on $bev
-    public function acceptConnCallback($listener, $fd, $address, $ctx) {
-        // We got a new connection! Set up a bufferevent for it. */
-        $base = $this->base;
-        $this->conn[] = new MyListenerConnection($base, $fd);
-    }
-
-    public function accept_error_cb($listener, $ctx) {
-        $base = $this->base;
-
-        fprintf(STDERR, "Got an error %d (%s) on the listener. "
-            ."Shutting down.\n",
-            EventUtil::getLastSocketErrno(),
-            EventUtil::getLastSocketError());
-
-        $base->exit(NULL);
-    }
-}
-
-$port = 9808;
-
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$l = new MyListener($port);
-$l->dispatch();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>SSL echo server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * SSL echo server
- *
- * To test:
- * 1) Run:
- * $ php examples/ssl-echo-server/server.php 9998
- *
- * 2) in another terminal window run:
- * $ socat - SSL:127.0.0.1:9998,verify=1,cafile=examples/ssl-echo-server/cert.pem
- */
-
-class MySslEchoServer {
-    public $port,
-        $base,
-        $bev,
-        $listener,
-        $ctx;
-
-    function __construct ($port, $host = "127.0.0.1") {
-        $this->port = $port;
-        $this->ctx = $this->init_ssl();
-        if (!$this->ctx) {
-            exit("Failed creating SSL context\n");
-        }
-
-        $this->base = new EventBase();
-        if (!$this->base) {
-            exit("Couldn't open event base\n");
-        }
-
-        $this->listener = new EventListener($this->base,
-            array($this, "ssl_accept_cb"), $this->ctx,
-            EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE,
-            -1, "$host:$port");
-        if (!$this->listener) {
-            exit("Couldn't create listener\n");
-        }
-
-        $this->listener->setErrorCallback(array($this, "accept_error_cb"));
-    }
-    function dispatch() {
-        $this->base->dispatch();
-    }
-
-    // This callback is invoked when there is data to read on $bev.
-    function ssl_read_cb($bev, $ctx) {
-        $in = $bev->input; //$bev->getInput();
-
-        printf("Received %zu bytes\n", $in->length);
-        printf("----- data ----\n");
-        printf("%ld:\t%s\n", (int) $in->length, $in->pullup(-1));
-
-        $bev->writeBuffer($in);
-    }
-
-    // This callback is invoked when some event occurs on the event listener,
-    // 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
-            while ($err = $bev->sslError()) {
-                fprintf(STDERR, "Bufferevent error %s.\n", $err);
-            }
-        }
-
-        if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-            $bev->free();
-        }
-    }
-
-    // This callback is invoked when a client accepts new connection
-    function ssl_accept_cb($listener, $fd, $address, $ctx) {
-        // We got a new connection! Set up a bufferevent for it.
-        $this->bev = EventBufferEvent::sslSocket($this->base, $fd, $this->ctx,
-            EventBufferEvent::SSL_ACCEPTING, EventBufferEvent::OPT_CLOSE_ON_FREE);
-
-        if (!$this->bev) {
-            echo "Failed creating ssl buffer\n";
-            $this->base->exit(NULL);
-            exit(1);
-        }
-
-        $this->bev->enable(Event::READ);
-        $this->bev->setCallbacks(array($this, "ssl_read_cb"), NULL,
-            array($this, "ssl_event_cb"), NULL);
-    }
-
-    // This callback is invoked when we failed to setup new connection for a client
-    function accept_error_cb($listener, $ctx) {
-        fprintf(STDERR, "Got an error %d (%s) on the listener. "
-            ."Shutting down.\n",
-            EventUtil::getLastSocketErrno(),
-            EventUtil::getLastSocketError());
-
-        $this->base->exit(NULL);
-    }
-
-    // Initialize SSL structures, create an EventSslContext
-    // Optionally create self-signed certificates
-    function init_ssl() {
-        // We *must* have entropy. Otherwise there's no point to crypto.
-        if (!EventUtil::sslRandPoll()) {
-            exit("EventUtil::sslRandPoll failed\n");
-        }
-
-        $local_cert = __DIR__."/cert.pem";
-        $local_pk   = __DIR__."/privkey.pem";
-
-        if (!file_exists($local_cert) || !file_exists($local_pk)) {
-            echo "Couldn't read $local_cert or $local_pk file.  To generate a key\n",
-                "and self-signed certificate, run:\n",
-                "  openssl genrsa -out $local_pk 2048\n",
-                "  openssl req -new -key $local_pk -out cert.req\n",
-                "  openssl x509 -req -days 365 -in cert.req -signkey $local_pk -out $local_cert\n";
-
-            return FALSE;
-        }
-
-        $ctx = new EventSslContext(EventSslContext::SSLv3_SERVER_METHOD, array (
-             EventSslContext::OPT_LOCAL_CERT  => $local_cert,
-             EventSslContext::OPT_LOCAL_PK    => $local_pk,
-             //EventSslContext::OPT_PASSPHRASE  => "echo server",
-             EventSslContext::OPT_VERIFY_PEER => true,
-             EventSslContext::OPT_ALLOW_SELF_SIGNED => false,
-        ));
-
-        return $ctx;
-    }
-}
-
-// Allow to override the port
-$port = 9999;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port\n");
-}
-
-
-$l = new MySslEchoServer($port);
-$l->dispatch();
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Signal handler</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
-Launch it in a terminal window:
-
-$ php examples/signal.php
-
-In another terminal window find out the pid and send SIGTERM, e.g.:
-
-$ ps aux | grep examp
-ruslan    3976  0.2  0.0 139896 11256 pts/1    S+   10:25   0:00 php examples/signal.php
-ruslan    3978  0.0  0.0   9572   864 pts/2    S+   10:26   0:00 grep --color=auto examp
-$ kill -TERM 3976
-
-At the first terminal window you should catch the following:
-
-Caught signal 15
-*/
-class MyEventSignal {
-    private $base;
-
-    function __construct($base) {
-        $this->base = $base;
-    }
-
-    function eventSighandler($no, $c) {
-        echo "Caught signal $no\n";
-        event_base_loopexit($c->base);
-    }
-}
-
-$base = event_base_new();
-$c    = new MyEventSignal($base);
-$no   = SIGTERM;
-$ev   = evsignal_new($base, $no, array($c,'eventSighandler'), $c);
-
-evsignal_add($ev);
-
-event_base_loop($base);
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Use libevent's loop to process requests of `eio' extension</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-// Callback for eio_nop()
-function my_nop_cb($d, $r) {
-    echo "step 6\n";
-}
-
-$dir = "/tmp/abc-eio-temp";
-if (file_exists($dir)) {
-    rmdir($dir);
-}
-
-echo "step 1\n";
-
-$base = new EventBase();
-
-echo "step 2\n";
-
-eio_init();
-
-eio_mkdir($dir, 0750, EIO_PRI_DEFAULT, "my_nop_cb");
-
-$event = new Event($base, eio_get_event_stream(),
-    Event::READ | Event::PERSIST, function ($fd, $events, $base) {
-    echo "step 5\n";
-
-    while (eio_nreqs()) {
-        eio_poll();
-    }
-
-    $base->stop();
-}, $base);
-
-echo "step 3\n";
-
-$event->add();
-
-echo "step 4\n";
-
-$base->dispatch();
-
-echo "Done\n";
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Miscellaneous</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/* {{{ Config & supported stuff */
-echo "Supported methods:\n";
-foreach (Event::getSupportedMethods() as $m) {
-    echo $m, PHP_EOL;
-}
-
-// Avoiding "select" method
-$cfg = new EventConfig();
-if ($cfg->avoidMethod("select")) {
-    echo "'select' method avoided\n";
-}
-
-// Create event_base associated with the config
-$base = new EventBase($cfg);
-echo "Event method used: ", $base->getMethod(), PHP_EOL;
-
-echo "Features:\n";
-$features = $base->getFeatures();
-($features & EventConfig::FEATURE_ET) and print "ET - edge-triggered IO\n";
-($features & EventConfig::FEATURE_O1) and print "O1 - O(1) operation for adding/deleting events\n";
-($features & EventConfig::FEATURE_FDS) and print "FDS - arbitrary file descriptor types, and not just sockets\n";
-
-// Require FDS feature
-if ($cfg->requireFeatures(EventConfig::FEATURE_FDS)) {
-    echo "FDS feature is now required\n";
-
-    $base = new EventBase($cfg);
-    ($base->getFeatures() & EventConfig::FEATURE_FDS)
-        and print "FDS - arbitrary file descriptor types, and not just sockets\n";
-}
-/* }}} */
-
-/* {{{ Base */
-$base = new EventBase();
-$event = new Event($base, STDIN, Event::READ | Event::PERSIST, function ($fd, $events, $arg) {
-    static $max_iterations = 0;
-
-    if (++$max_iterations >= 5) {
-        /* exit after 5 iterations with timeout of 2.33 seconds */
-        echo "Stopping...\n";
-        $arg[0]->exit(2.33);
-    }
-
-    echo fgets($fd);
-}, array (&$base));
-
-$event->add();
-$base->loop();
-/* Base }}} */
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>Simple HTTP server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple HTTP server.
- *
- * To test it:
- * 1) Run it on a port of your choice, e.g.:
- * $ php examples/http.php 8010
- * 2) In another terminal connect to some address on this port
- * and make GET or POST request(others are turned off here), e.g.:
- * $ nc -t 127.0.0.1 8010
- * POST /about HTTP/1.0
- * Content-Type: text/plain
- * Content-Length: 4
- * Connection: close
- * (press Enter)
- *
- * It will output
- * a=12
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- *
- * $ nc -t 127.0.0.1 8010
- * GET /dump HTTP/1.0
- * Content-Type: text/plain
- * Content-Encoding: UTF-8
- * Connection: close
- * (press Enter)
- *
- * It will output:
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- * (press Enter)
- *
- * $ nc -t 127.0.0.1 8010
- * GET /unknown HTTP/1.0
- * Connection: close
- *
- * It will output:
- * HTTP/1.0 200 OK
- * Content-Type: text/html; charset=ISO-8859-1
- * Connection: close
- *
- * 3) See what the server outputs on the previous terminal window.
- */
-
-function _http_dump($req, $data) {
-    static $counter      = 0;
-    static $max_requests = 2;
-
-    if (++$counter >= $max_requests)  {
-        echo "Counter reached max requests $max_requests. Exiting\n";
-        exit();
-    }
-
-    echo __METHOD__, " called\n";
-    echo "request:"; var_dump($req);
-    echo "data:"; var_dump($data);
-
-    echo "\n===== DUMP =====\n";
-    echo "Command:", $req->getCommand(), PHP_EOL;
-    echo "URI:", $req->getUri(), PHP_EOL;
-    echo "Input headers:"; var_dump($req->getInputHeaders());
-    echo "Output headers:"; var_dump($req->getOutputHeaders());
-
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-
-    echo "\n >> Reading input buffer ...\n";
-    $buf = $req->getInputBuffer();
-    while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-        echo $s, PHP_EOL;
-    }
-    echo "No more data in the buffer\n";
-}
-
-function _http_about($req) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-function _http_default($req, $data) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-$port = 8010;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-
-$base = new EventBase();
-$http = new EventHttp($base);
-$http->setAllowedMethods(EventHttpRequest::CMD_GET | EventHttpRequest::CMD_POST);
-
-$http->setCallback("/dump", "_http_dump", array(4, 8));
-$http->setCallback("/about", "_http_about");
-$http->setDefaultCallback("_http_default", "custom data value");
-
-$http->bind("0.0.0.0", 8010);
-$base->loop();
-?>
-]]>
-  </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-a=12
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-(press Enter)
-
-HTTP/1.0 200 OK
-Content-Type: text/html; charset=ISO-8859-1
-Connection: close
-]]>
-  </screen>
- </example>
- <example>
-  <title>Simple HTTPS server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple HTTPS server.
- *
- * 1) Run the server: `php examples/https.php 9999`
- * 2) Test it: `php examples/ssl-connection.php 9999`
- */
-
-function _http_dump($req, $data) {
-    static $counter      = 0;
-    static $max_requests = 200;
-
-    if (++$counter >= $max_requests)  {
-        echo "Counter reached max requests $max_requests. Exiting\n";
-        exit();
-    }
-
-    echo __METHOD__, " called\n";
-    echo "request:"; var_dump($req);
-    echo "data:"; var_dump($data);
-
-    echo "\n===== DUMP =====\n";
-    echo "Command:", $req->getCommand(), PHP_EOL;
-    echo "URI:", $req->getUri(), PHP_EOL;
-    echo "Input headers:"; var_dump($req->getInputHeaders());
-    echo "Output headers:"; var_dump($req->getOutputHeaders());
-
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-
-    $buf = $req->getInputBuffer();
-    echo "\n >> Reading input buffer (", $buf->length, ") ...\n";
-    while ($s = $buf->read(1024)) {
-        echo $s;
-    }
-    echo "\nNo more data in the buffer\n";
-}
-
-function _http_about($req) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-function _http_default($req, $data) {
-    echo __METHOD__, PHP_EOL;
-    echo "URI: ", $req->getUri(), PHP_EOL;
-    echo "\n >> Sending reply ...";
-    $req->sendReply(200, "OK");
-    echo "OK\n";
-}
-
-function _http_400($req) {
-    $req->sendError(400);
-}
-
-function _init_ssl() {
-    $local_cert = __DIR__."/ssl-echo-server/cert.pem";
-    $local_pk   = __DIR__."/ssl-echo-server/privkey.pem";
-
-    $ctx = new EventSslContext(EventSslContext::SSLv3_SERVER_METHOD, array (
-        EventSslContext::OPT_LOCAL_CERT  => $local_cert,
-        EventSslContext::OPT_LOCAL_PK    => $local_pk,
-        //EventSslContext::OPT_PASSPHRASE  => "test",
-        EventSslContext::OPT_ALLOW_SELF_SIGNED => true,
-    ));
-
-    return $ctx;
-}
-
-$port = 9999;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port");
-}
-$ip = '0.0.0.0';
-
-$base = new EventBase();
-$ctx  = _init_ssl();
-$http = new EventHttp($base, $ctx);
-$http->setAllowedMethods(EventHttpRequest::CMD_GET | EventHttpRequest::CMD_POST);
-
-$http->setCallback("/dump", "_http_dump", array(4, 8));
-$http->setCallback("/about", "_http_about");
-$http->setCallback("/err400", "_http_400");
-$http->setDefaultCallback("_http_default", "custom data value");
-
-$http->bind($ip, $port);
-$base->dispatch();
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>OpenSSL connection</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Sample OpenSSL client.
- *
- * Usage:
- * 1) Launch a server, e.g.:
- * $ php examples/https.php 9999
- *
- * 2) Launch the client in another terminal:
- * $ php examples/ssl-connection.php 9999
- */
-
-function _request_handler($req, $base) {
-    echo __FUNCTION__, PHP_EOL;
-
-    if (is_null($req)) {
-        echo "Timed out\n";
-    } else {
-        $response_code = $req->getResponseCode();
-
-        if ($response_code == 0) {
-            echo "Connection refused\n";
-        } elseif ($response_code != 200) {
-            echo "Unexpected response: $response_code\n";
-        } else {
-            echo "Success: $response_code\n";
-            $buf = $req->getInputBuffer();
-            echo "Body:\n";
-            while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-                echo $s, PHP_EOL;
-            }
-        }
-    }
-
-    $base->exit(NULL);
-}
-
-function _init_ssl() {
-    $ctx = new EventSslContext(EventSslContext::SSLv3_CLIENT_METHOD, array ());
-
-    return $ctx;
-}
-
-
-// Allow to override the port
-$port = 9999;
-if ($argc > 1) {
-    $port = (int) $argv[1];
-}
-if ($port <= 0 || $port > 65535) {
-    exit("Invalid port\n");
-}
-$host = '127.0.0.1';
-
-$ctx = _init_ssl();
-if (!$ctx) {
-    trigger_error("Failed creating SSL context", E_USER_ERROR);
-}
-
-$base = new EventBase();
-if (!$base) {
-    trigger_error("Failed to initialize event base", E_USER_ERROR);
-}
-
-$conn = new EventHttpConnection($base, NULL, $host, $port, $ctx);
-$conn->setTimeout(50);
-
-$req = new EventHttpRequest("_request_handler", $base);
-$req->addHeader("Host", $host, EventHttpRequest::OUTPUT_HEADER);
-$buf = $req->getOutputBuffer();
-$buf->add("<html>HTML TEST</html>");
-//$req->addHeader("Content-Length", $buf->length, EventHttpRequest::OUTPUT_HEADER);
-//$req->addHeader("Connection", "close", EventHttpRequest::OUTPUT_HEADER);
-$conn->makeRequest($req, EventHttpRequest::CMD_POST, "/dump");
-
-$base->dispatch();
-echo "END\n";
-?>
-]]>
-  </programlisting>
- </example>
- <example>
-  <title>
-   <function>EventHttpConnection::makeRequest</function> example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-function _request_handler($req, $base) {
-    echo __FUNCTION__, PHP_EOL;
-
-    if (is_null($req)) {
-        echo "Timed out\n";
-    } else {
-        $response_code = $req->getResponseCode();
-
-        if ($response_code == 0) {
-            echo "Connection refused\n";
-        } elseif ($response_code != 200) {
-            echo "Unexpected response: $response_code\n";
-        } else {
-            echo "Success: $response_code\n";
-            $buf = $req->getInputBuffer();
-            echo "Body:\n";
-            while ($s = $buf->readLine(EventBuffer::EOL_ANY)) {
-                echo $s, PHP_EOL;
-            }
-        }
-    }
-
-    $base->exit(NULL);
-}
-
-$address = "127.0.0.1";
-$port = 80;
-
-$base = new EventBase();
-$conn = new EventHttpConnection($base, NULL, $address, $port);
-$conn->setTimeout(5);
-$req = new EventHttpRequest("_request_handler", $base);
-
-$req->addHeader("Host", $address, EventHttpRequest::OUTPUT_HEADER);
-$req->addHeader("Content-Length", "0", EventHttpRequest::OUTPUT_HEADER);
-$conn->makeRequest($req, EventHttpRequest::CMD_GET, "/index.cphp");
-
-$base->loop();
-?>
-]]>
-  </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-_request_handler
-Success: 200
-Body:
-PHP, date:
-2013-03-13T20:27:52+05:00
-]]>
-  </screen>
- </example>
- <example>
-  <title>
-   Connection listener based on a UNIX domain socket</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * Simple echo server based on libevent's connection listener.
- *
- * Usage:
- * 1) In one terminal window run:
- *
- * $ php unix-domain-listener.php [path-to-socket]
- *
- * 2) In another terminal window open up connection
- * to the socket, e.g.:
- *
- * $ socat - GOPEN:/tmp/1.sock
- *
- * 3) Start typing. The server should repeat the input.
- */
-
-class MyListenerConnection {
-    private $bev, $base;
-
-    public function __destruct() {
-        if ($this->bev) {
-            $this->bev->free();
-        }
-    }
-
-    public function __construct($base, $fd) {
-        $this->base = $base;
-
-        $this->bev = new EventBufferEvent($base, $fd, EventBufferEvent::OPT_CLOSE_ON_FREE);
-
-        $this->bev->setCallbacks(array($this, "echoReadCallback"), NULL,
-            array($this, "echoEventCallback"), NULL);
-
-        if (!$this->bev->enable(Event::READ)) {
-            echo "Failed to enable READ\n";
-            return;
-        }
-    }
-
-    public function echoReadCallback($bev, $ctx) {
-        // Copy all the data from the input buffer to the output buffer
-        $bev->output->addBuffer($bev->input);
-    }
-
-    public function echoEventCallback($bev, $events, $ctx) {
-        if ($events & EventBufferEvent::ERROR) {
-            echo "Error from bufferevent\n";
-        }
-
-        if ($events & (EventBufferEvent::EOF | EventBufferEvent::ERROR)) {
-            $bev->free();
-            $bev = NULL;
-        }
-    }
-}
-
-class MyListener {
-    public $base,
-        $listener,
-        $socket;
-    private $conn = array();
-
-    public function __destruct() {
-        foreach ($this->conn as &$c) $c = NULL;
-    }
-
-    public function __construct($sock_path) {
-        $this->base = new EventBase();
-        if (!$this->base) {
-            echo "Couldn't open event base";
-            exit(1);
-        }
-
-        if (file_exists($sock_path)) {
-            unlink($sock_path);
-        }
-
-         $this->listener = new EventListener($this->base,
-             array($this, "acceptConnCallback"), $this->base,
-             EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE, -1,
-             "unix:$sock_path");
-
-        if (!$this->listener) {
-            trigger_error("Couldn't create listener", E_USER_ERROR);
-        }
-
-        $this->listener->setErrorCallback(array($this, "accept_error_cb"));
-    }
-
-    public function dispatch() {
-        $this->base->dispatch();
-    }
-
-    // This callback is invoked when there is data to read on $bev
-    public function acceptConnCallback($listener, $fd, $address, $ctx) {
-        // We got a new connection! Set up a bufferevent for it. */
-        $base = $this->base;
-        $this->conn[] = new MyListenerConnection($base, $fd);
-    }
-
-    public function accept_error_cb($listener, $ctx) {
-        $base = $this->base;
-
-        fprintf(STDERR, "Got an error %d (%s) on the listener. "
-            ."Shutting down.\n",
-            EventUtil::getLastSocketErrno(),
-            EventUtil::getLastSocketError());
-
-        $base->exit(NULL);
-    }
-}
-
-if ($argc <= 1) {
-    exit("Socket path is not provided\n");
-}
-$sock_path = $argv[1];
-
-$l = new MyListener($sock_path);
-$l->dispatch();
-?>
-]]>
-  </programlisting>
- </example>
- <example xml:id="event.example.smtp">
-  <title>Simple SMTP server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
- /*
- * Author: Andrew Rose <hello at andrewrose dot co dot uk>
- *
- * Usage:
- * 1) Prepare cert.pem certificate and privkey.pem private key files.
- * 2) Launch the server script
- * 3) Open TLS connection, e.g.:
- *      $ openssl s_client -connect localhost:25 -starttls smtp -crlf
- * 4) Start testing the commands listed in `cmd` method below.
- */
-
-class Handler {
-    public $domainName = FALSE;
-    public $connections = [];
-    public $buffers = [];
-    public $maxRead = 256000;
-
-    public function __construct() {
-        $this->ctx = new EventSslContext(EventSslContext::SSLv3_SERVER_METHOD, [
-            EventSslContext::OPT_LOCAL_CERT  => 'cert.pem',
-            EventSslContext::OPT_LOCAL_PK    => 'privkey.pem',
-            //EventSslContext::OPT_PASSPHRASE  => '',
-            EventSslContext::OPT_VERIFY_PEER => false, // change to true with authentic cert
-            EventSslContext::OPT_ALLOW_SELF_SIGNED => true // change to false with authentic cert
-        ]);
-
-        $this->base = new EventBase();
-        if (!$this->base) {
-            exit("Couldn't open event base\n");
-        }
-
-        if (!$this->listener = new EventListener($this->base,
-            [$this, 'ev_accept'],
-            $this->ctx,
-            EventListener::OPT_CLOSE_ON_FREE | EventListener::OPT_REUSEABLE,
-            -1,
-            '0.0.0.0:25'))
-        {
-            exit("Couldn't create listener\n");
-        }
-
-        $this->listener->setErrorCallback([$this, 'ev_error']);
-        $this->base->dispatch();
-    }
-
-    public function ev_accept($listener, $fd, $address, $ctx) {
-        static $id = 0;
-        $id += 1;
-
-        $this->connections[$id]['clientData'] = '';
-        $this->connections[$id]['cnx'] = new EventBufferEvent($this->base, $fd,
-            EventBufferEvent::OPT_CLOSE_ON_FREE);
-
-        if (!$this->connections[$id]['cnx']) {
-            echo "Failed creating buffer\n";
-            $this->base->exit(NULL);
-            exit(1);
-        }
-
-        $this->connections[$id]['cnx']->setCallbacks([$this, "ev_read"], NULL,
-            [$this, 'ev_error'], $id);
-        $this->connections[$id]['cnx']->enable(Event::READ | Event::WRITE);
-
-        $this->ev_write($id, '220 '.$this->domainName." wazzzap?\r\n");
-    }
-
-    function ev_error($listener, $ctx) {
-        $errno = EventUtil::getLastSocketErrno();
-
-        fprintf(STDERR, "Got an error %d (%s) on the listener. Shutting down.\n",
-            $errno, EventUtil::getLastSocketError());
-
-        if ($errno != 0) {
-            $this->base->exit(NULL);
-            exit();
-        }
-    }
-
-    public function ev_close($id) {
-        $this->connections[$id]['cnx']->disable(Event::READ | Event::WRITE);
-        unset($this->connections[$id]);
-    }
-
-    protected function ev_write($id, $string) {
-        echo 'S('.$id.'): '.$string;
-        $this->connections[$id]['cnx']->write($string);
-    }
-
-    public function ev_read($buffer, $id) {
-        while($buffer->input->length > 0) {
-            $this->connections[$id]['clientData'] .= $buffer->input->read($this->maxRead);
-            $clientDataLen = strlen($this->connections[$id]['clientData']);
-
-            if($this->connections[$id]['clientData'][$clientDataLen-1] == "\n"
-                && $this->connections[$id]['clientData'][$clientDataLen-2] == "\r")
-            {
-                // remove the trailing \r\n
-                $line = substr($this->connections[$id]['clientData'], 0,
-                    strlen($this->connections[$id]['clientData']) - 2);
-
-                $this->connections[$id]['clientData'] = '';
-                $this->cmd($buffer, $id, $line);
-            }
-        }
-    }
-
-    protected function cmd($buffer, $id, $line) {
-        switch ($line) {
-            case strncmp('EHLO ', $line, 4):
-                $this->ev_write($id, "250-STARTTLS\r\n");
-                $this->ev_write($id, "250 OK ehlo\r\n");
-                break;
-
-            case strncmp('HELO ', $line, 4):
-                $this->ev_write($id, "250-STARTTLS\r\n");
-                $this->ev_write($id, "250 OK helo\r\n");
-                break;
-
-            case strncmp('QUIT', $line, 3):
-                $this->ev_write($id, "250 OK quit\r\n");
-                $this->ev_close($id);
-                break;
-
-            case strncmp('STARTTLS', $line, 3):
-                $this->ev_write($id, "220 Ready to start TLS\r\n");
-                $this->connections[$id]['cnx'] = EventBufferEvent::sslFilter($this->base,
-                    $this->connections[$id]['cnx'], $this->ctx,
-                    EventBufferEvent::SSL_ACCEPTING,
-                    EventBufferEvent::OPT_CLOSE_ON_FREE);
-                $this->connections[$id]['cnx']->setCallbacks([$this, "ev_read"], NULL, [$this, 'ev_error'], $id);
-                $this->connections[$id]['cnx']->enable(Event::READ | Event::WRITE);
-                break;
-
-            default:
-                echo 'unknown command: '.$line."\n";
-                break;
-        }
-    }
-}
-
-new Handler();
-]]>
-  </programlisting>
- </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/event/setup.xml b/reference/event/setup.xml
deleted file mode 100644
index edeea97f7821..000000000000
--- a/reference/event/setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="event.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="event.requirements">
-  &reftitle.required;
-  <para>
-   This extension requires
-   <link
-  xlink:href="&url.libevent;">libevent</link>
-   library. Most modern distributions provide packages for libevent.
-  </para>
-  <para>
-   OpenSSL features require
-   <link
-  xlink:href="&url.openssl;">OpenSSL</link>
-   library.
-  </para>
- </section>
- <section xml:id="event.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;event">&url.pecl.package;event</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/event/versions.xml b/reference/event/versions.xml
deleted file mode 100644
index b20a410fd632..000000000000
--- a/reference/event/versions.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Methods -->
- <function name='event' from='PECL event &gt;= 1.2.6-beta'/>
- <function name="event::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::free" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::set" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::getsupportedmethods" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::add" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::del" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::setpriority" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::pending" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::timer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::settimer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::signal" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::addtimer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::deltimer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::addsignal" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="event::delsignal" from="PECL event &gt;= 1.2.6-beta"/>
- <function name='eventbase' from='PECL event &gt;= 1.2.6-beta'/>
- <function name="eventbase::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::free" from="PECL event &gt;= 1.10.0"/>
- <function name="eventbase::getmethod" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::getfeatures" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::priorityinit" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::loop" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::dispatch" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::exit" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::stop" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::gotstop" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::gotexit" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::gettimeofdaycached" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbase::reinit" from="PECL event &gt;= 1.2.6-beta"/>
- <function name='eventconfig' from='PECL event &gt;= 1.2.6-beta'/>
- <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"/>
- <function name="eventbufferevent::close" from="PECL event &gt;= 1.10.0"/>
- <function name="eventbufferevent::connect" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::connecthost" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::getdnserrorstring" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::setcallbacks" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::enable" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::disable" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::getenabled" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::getinput" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::getoutput" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::setwatermark" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::write" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::writebuffer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::read" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::readbuffer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::createpair" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::setpriority" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::settimeouts" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::sslfilter" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::sslsocket" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::sslerror" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::sslrenegotiate" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbufferevent::sslgetcipherinfo" from="PECL event &gt;= 1.10.0"/>
- <function name="eventbufferevent::sslgetciphername" from="PECL event &gt;= 1.10.0"/>
- <function name="eventbufferevent::sslgetcipherversion" from="PECL event &gt;= 1.10.0"/>
- <function name="eventbufferevent::sslgetprotocol" from="PECL event &gt;= 1.10.0"/>
- <function name='eventbuffer' from='PECL event &gt;= 1.5.0'/>
- <function name="eventbuffer::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::freeze" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::unfreeze" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::lock" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::unlock" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::enablelocking" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::add" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::addbuffer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::appendfrom" from="PECL event &gt;= 1.6.0"/>
- <function name="eventbuffer::read" from="PECL event &gt;= 1.6.0"/>
- <function name="eventbuffer::expand" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::prepend" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::prependbuffer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::drain" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::copyout" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::readline" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::readfrom" from="PECL event &gt;= 1.7.0"/>
- <function name="eventbuffer::search" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::searchEol" from="PECL event &gt;= 1.5.0"/>
- <function name="eventbuffer::pullup" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventbuffer::substr" from="PECL event &gt;= 1.6.0"/>
- <function name="eventbuffer::write" from="PECL event &gt;= 1.6.0"/>
- <function name='eventbufferposition' from='PECL event &gt;= 1.2.6-beta'/>
- <function name="eventbufferposition::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name='eventdnsbase' from='PECL event &gt;= 1.2.6-beta'/>
- <function name="eventdnsbase::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::parseresolvconf" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::addnameserverip" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::loadhosts" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::clearsearch" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::addsearch" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::setsearchndots" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::setoption" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventdnsbase::countnameservers" from="PECL event &gt;= 1.2.6-beta"/>
- <function name='eventlistener' from='PECL event &gt;= 1.5.0'/>
- <function name="eventlistener::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventlistener::enable" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventlistener::disable" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventlistener::getsocketname" from="PECL event &gt;= 1.5.0"/>
- <function name="eventlistener::setcallback" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventlistener::seterrorcallback" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventlistener::getbase" from="PECL event &gt;= 1.2.6-beta"/>
- <function name='eventhttpconnection' from='PECL event &gt;= 1.4.0-beta'/>
- <function name="eventhttpconnection::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::getbase" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::getpeer" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::setclosecallback" from="PECL event &gt;= 1.8.0"/>
- <function name="eventhttpconnection::setlocaladdress" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::setlocalport" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::settimeout" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::setmaxheaderssize" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::setmaxbodysize" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::setretries" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttpconnection::makerequest" from="PECL event &gt;= 1.4.0-beta"/>
- <function name='eventhttp' from='PECL event &gt;= 1.4.0-beta'/>
- <function name="eventhttp::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttp::accept" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttp::bind" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventhttp::setcallback" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::setdefaultcallback" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::setallowedmethods" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::setmaxbodysize" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::setmaxheaderssize" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::settimeout" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::addserveralias" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttp::removeserveralias" from="PECL event &gt;= 1.4.0-beta"/>
- <function name='eventhttprequest' from='PECL event &gt;= 1.4.0-beta'/>
- <function name="eventhttprequest::__construct" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::closeconnection" from="PECL event &gt;= 1.8.0"/>
- <function name="eventhttprequest::free" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getbufferevent" from="PECL event &gt;= 1.8.0"/>
- <function name="eventhttprequest::getconnection" from="PECL event &gt;= 1.8.0"/>
- <function name="eventhttprequest::getcommand" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::gethost" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::geturi" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getresponsecode" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getinputheaders" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getoutputheaders" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getinputbuffer" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::getoutputbuffer" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::senderror" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::sendreply" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::sendreplychunk" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::sendreplyend" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::sendreplystart" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::cancel" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::addheader" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::clearheaders" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::removeheader" from="PECL event &gt;= 1.4.0-beta"/>
- <function name="eventhttprequest::findheader" from="PECL event &gt;= 1.4.0-beta"/>
- <function name='eventutil' from='PECL event &gt;= 1.5.0'/>
- <function name="eventutil::__construct" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventutil::getlastsocketerrno" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventutil::getlastsocketerror" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventutil::getsocketname" from="PECL event &gt;= 1.5.0"/>
- <function name="eventutil::getsocketfd" from="PECL event &gt;= 1.7.0"/>
- <function name="eventutil::sslrandpoll" from="PECL event &gt;= 1.2.6-beta"/>
- <function name="eventutil::setsocketoption" from="PECL event &gt;= 1.6.0"/>
- <function name='eventsslcontext' from='PECL event &gt;= 1.2.6-beta'/>
- <function name="eventsslcontext::__construct" from="PECL event &gt;= 1.2.6-beta"/>
-</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/expect/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/expect/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/expect/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/expect/book.xml b/reference/expect/book.xml
deleted file mode 100644
index 967ec0540e03..000000000000
--- a/reference/expect/book.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.expect">
- <?phpdoc extension-membership="pecl" ?>
- <title>Expect</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.expect">
-  &reftitle.intro;
-  <simpara>
-   This extension allows to interact with processes through PTY. You may
-   consider using the <link linkend="wrappers.expect"><literal>expect://</literal>
-   wrapper</link> with the <link linkend="ref.filesystem">filesystem
-   functions</link> which provide a simpler and more intuitive interface.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.expect.setup;
- &reference.expect.constants;
- &reference.expect.examples;
- &reference.expect.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/expect/configure.xml b/reference/expect/configure.xml
deleted file mode 100644
index 013a9b2b8564..000000000000
--- a/reference/expect/configure.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="expect.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;expect">&url.pecl.package;expect</link>.
- </simpara>
- <simpara>
-  In order to use these functions you must compile PHP with expect support
-  by using the <option role="configure">--with-expect[=DIR]</option>
-  configure option.
- </simpara>
- <simpara>
-  Windows users will enable <filename>php_expect.dll</filename> inside
-  of &php.ini; in order to use these functions.
-  &pecl.windows.download;
- </simpara>
-</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/expect/constants.xml b/reference/expect/constants.xml
deleted file mode 100644
index 5bc5e38b6f78..000000000000
--- a/reference/expect/constants.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="expect.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.exp-glob">
-   <term>
-    <constant>EXP_GLOB</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Indicates that the pattern is a glob-style string pattern.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.exp-exact">
-   <term>
-    <constant>EXP_EXACT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Indicates that the pattern is an exact string.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.exp-regexp">
-   <term>
-    <constant>EXP_REGEXP</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Indicates that the pattern is a regexp-style string pattern.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.exp-eof">
-   <term>
-    <constant>EXP_EOF</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Value, returned by <function>expect_expectl</function>, when EOF is
-     reached.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.exp-timeout">
-   <term>
-    <constant>EXP_TIMEOUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Value, returned by <function>expect_expectl</function> upon timeout of
-     seconds, specified in value of <link linkend="ini.expect.timeout">expect.timeout</link>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.exp-fullbuffer">
-   <term>
-    <constant>EXP_FULLBUFFER</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Value, returned by <function>expect_expectl</function> if no pattern have
-     been matched.
-    </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/expect/examples.xml b/reference/expect/examples.xml
deleted file mode 100644
index 816647900eb8..000000000000
--- a/reference/expect/examples.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="expect.examples">
- &reftitle.examples;
- <section xml:id="expect.examples-usage">
-  <title>Expect Usage Examples</title>
-  <example>
-   <title>Expect Usage Example</title>
-   <simpara>
-    This example connects to the remote host via SSH, and prints the remote
-    uptime.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-ini_set("expect.loguser", "Off");
-
-$stream = fopen("expect://ssh root@remotehost uptime", "r");
-
-$cases = array (
-    array (0 => "password:", 1 => PASSWORD)
-);
-
-switch (expect_expectl ($stream, $cases)) {
-    case PASSWORD:
-        fwrite ($stream, "password\n");
-        break;
-
-    default:
-        die ("Error was occurred while connecting to the remote host!\n");
-}
-
-while ($line = fgets($stream)) {
-      print $line;
-}
-fclose ($stream);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <simpara>
-   The following example connects to the remote host, determines whether
-   installed OS is for 32 or 64 bit, then runs update for specific package.
-  </simpara>
-  <example>
-   <title>Another Expect Usage Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-ini_set("expect.timeout", -1);
-ini_set("expect.loguser", "Off");
-
-$stream = expect_popen("ssh root@remotehost");
-
-while (true) {
-    switch (expect_expectl ($stream, array (
-            array ("password:", PASSWORD), // SSH is asking for password
-            array ("yes/no)?", YESNO), // SSH is asking whether to store the host entry
-            array ("~$ ", SHELL, EXP_EXACT), // We've got the shell!
-    ))) {
-        case PASSWORD:
-            fwrite ($stream, "secret\n");
-            break;
-
-        case YESNO:
-            fwrite ($stream, "yes\n");
-            break;
-
-        case SHELL:
-            fwrite ($stream, "uname -a\n");
-            while (true) {
-                    switch (expect_expectl ($stream, array (
-                            array ("~$ ", SHELL, EXP_EXACT), // We've got the shell!
-                            array ("^Linux.*$", UNAME, EXP_REGEXP), // uname -a output
-                    ), $match)) {
-                        case UNAME:
-                            $uname .= $match[0];
-                            break;
-
-                        case SHELL:
-                            // Run update:
-                            if (strstr ($uname, "x86_64")) {
-                                    fwrite ($stream, "rpm -Uhv http://mirrorsite/somepath/some_64bit.rpm\n");
-                            } else {
-                                    fwrite ($stream, "rpm -Uhv http://mirrorsite/somepath/some_32bit.rpm\n");
-                            }
-                            fwrite ($stream, "exit\n");
-                            break 2;
-
-                        case EXP_TIMEOUT:
-                        case EXP_EOF:
-                            break 2;
-
-                        default:
-                            die ("Error has occurred!\n");
-                    }
-            }
-            break 2;
-
-        case EXP_TIMEOUT:
-        case EXP_EOF:
-            break 2;
-
-        default:
-            die ("Error has occurred!\n");
-    }
-}
-
-fclose ($stream);
-?>
-]]>
-   </programlisting>
-  </example>
- </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/expect/functions/expect-expectl.xml b/reference/expect/functions/expect-expectl.xml
deleted file mode 100644
index 62107912a9ce..000000000000
--- a/reference/expect/functions/expect-expectl.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.expect-expectl">
- <refnamediv>
-  <refname>expect_expectl</refname>
-  <refpurpose>Waits until the output from a process matches one
-  of the patterns, a specified time period has passed, or an <acronym>EOF</acronym> is seen
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>expect_expectl</methodname>
-   <methodparam><type>resource</type><parameter>expect</parameter></methodparam>
-   <methodparam><type>array</type><parameter>cases</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">match</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Waits until the output from a process matches one of the patterns,
-   a specified time period has passed, or an <acronym>EOF</acronym> is seen.
-  </simpara>
-  <simpara>
-   If <parameter>match</parameter> is provided, then it is filled with the result of search.
-   The matched string can be found in <parameter>match[0]</parameter>.
-   The match substrings (according to the parentheses) in the original pattern can be found
-   in <parameter>match[1]</parameter>, <parameter>match[2]</parameter>, and so
-   on, up to <parameter>match[9]</parameter> (the limitation of libexpect).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>expect</parameter></term>
-    <listitem>
-     <simpara>
-      An Expect stream, previously opened with
-      <function>expect_popen</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cases</parameter></term>
-    <listitem>
-     <para>
-      An array of expect cases. Each expect case is an indexed array,
-      as described in the following table:
-      <table>
-       <title>Expect Case Array</title>
-       <tgroup cols="5">
-        <thead>
-         <row>
-          <entry>Index Key</entry>
-          <entry>Value Type</entry>
-          <entry>Description</entry>
-          <entry>Is Mandatory</entry>
-          <entry>Default Value</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>0</entry>
-          <entry>string</entry>
-          <entry>pattern, that will be matched against the output from the stream</entry>
-          <entry>yes</entry>
-          <entry/>
-         </row>
-         <row>
-          <entry>1</entry>
-          <entry>mixed</entry>
-          <entry>value, that will be returned by this function, if the pattern matches</entry>
-          <entry>yes</entry>
-          <entry/>
-         </row>
-         <row>
-          <entry>2</entry>
-          <entry>integer</entry>
-          <entry>
-           pattern type, one of:
-           <link linkend="constant.exp-glob"><constant>EXP_GLOB</constant></link>,
-           <link linkend="constant.exp-exact"><constant>EXP_EXACT</constant></link>
-           or
-           <link linkend="constant.exp-regexp"><constant>EXP_REGEXP</constant></link>
-          </entry>
-          <entry>no</entry>
-          <entry><link linkend="constant.exp-glob"><constant>EXP_GLOB</constant></link></entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns value associated with the pattern that was matched.
-  </simpara>
-  <simpara>
-   On failure this function returns:
-   <link linkend="constant.exp-eof"><constant>EXP_EOF</constant></link>,
-   <link linkend="constant.exp-timeout"><constant>EXP_TIMEOUT</constant></link>
-   or
-   <link linkend="constant.exp-fullbuffer"><constant>EXP_FULLBUFFER</constant></link>
-  </simpara>
- </refsect1>
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL expect 0.2.1</entry>
-      <entry>
-      Prior to version 0.2.1, in <parameter>match</parameter> parameter a match string was returned,
-      not an array of match substrings.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>expect_expectl</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Copies file from remote host:
-ini_set("expect.timeout", 30);
-
-$stream = fopen("expect://scp user@remotehost:/var/log/messages /home/user/messages.txt", "r");
-
-$cases = array(
-    // array(pattern, value to return if pattern matched)
-    array("password:", "asked for password"),
-    array("yes/no)?",  "asked for yes/no")
-);
-
-while (true) {
-    switch (expect_expectl($stream, $cases)) {
-        case "asked for password":
-            fwrite($stream, "my password\n");
-            break;
-        case "asked for yes/no":
-            fwrite($stream, "yes\n");
-            break;
-        case EXP_TIMEOUT:
-        case EXP_EOF:
-            break 2; // break both the switch statement and the while loop
-        default:
-            die("Error has occurred!");
-    }
-}
-
-fclose($stream);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>expect_popen</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/expect/functions/expect-popen.xml b/reference/expect/functions/expect-popen.xml
deleted file mode 100644
index ae96a02286f6..000000000000
--- a/reference/expect/functions/expect-popen.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.expect-popen">
- <refnamediv>
-  <refname>expect_popen</refname>
-  <refpurpose>Execute command via Bourne shell, and open the PTY stream to
-  the process</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>expect_popen</methodname>
-   <methodparam><type>string</type><parameter>command</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Execute command via Bourne shell, and open the PTY stream to the process.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <simpara>
-      Command to execute.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an open PTY stream to the processes <literal>stdio</literal>,
-   <literal>stdout</literal>, and <literal>stderr</literal>.
-  </simpara>
-  <simpara>
-   On failure this function returns &false;.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>expect_popen</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Login to the PHP.net CVS repository:
-$stream = expect_popen ("cvs -d :pserver:anonymous@cvs.php.net:/repository login");
-sleep (3);
-fwrite ($stream, "phpfi\n");
-fclose ($stream);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>popen</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/expect/ini.xml b/reference/expect/ini.xml
deleted file mode 100644
index 0a39e9df559e..000000000000
--- a/reference/expect/ini.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="expect.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  In order to configure expect extension, there are configuration options
-  in the <link linkend="configuration.file">configuration file</link> &php.ini;.
-  <table>
-   <title>Expect &ConfigureOptions;</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="expect.configuration.list">
-     <row>
-      <entry><link linkend="ini.expect.timeout">expect.timeout</link></entry>
-      <entry>"10"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.expect.loguser">expect.loguser</link></entry>
-      <entry>"1"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.expect.logfile">expect.logfile</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.expect.match-max">expect.match_max</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.expect.timeout">
-   <term>
-    <parameter>expect.timeout</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     The timeout period for waiting for the data, when using the
-     <function>expect_expectl</function> function.
-    </simpara>
-    <simpara>
-     A value of "-1" disables a timeout from occurring.
-    </simpara>
-    <note>
-     <simpara>
-      A value of "0" causes the <function>expect_expectl</function>
-      function to return immediately.
-     </simpara>
-    </note>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="ini.expect.loguser">
-   <term>
-    <parameter>expect.loguser</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     Whether expect should send any output from the spawned process to stdout.
-     Since interactive programs typically echo their input, this usually suffices
-     to show both sides of the conversation.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="ini.expect.logfile">
-   <term>
-    <parameter>expect.logfile</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     Name of the file, where the output from the spawned process will be
-     written. If this file doesn't exist, it will be created.
-    </simpara>
-    <note>
-     <simpara>
-      If this configuration is not empty, the output is written regardless of
-      the value of <link linkend="ini.expect.loguser">expect.loguser</link>.
-     </simpara>
-    </note>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="ini.expect.match-max">
-   <term>
-    <parameter>expect.match_max</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     Changes default size (2000 bytes) of the buffer used to match asterisks
-     in patterns.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
- </variablelist>
-</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/expect/reference.xml b/reference/expect/reference.xml
deleted file mode 100644
index 6baf6c8f8e8c..000000000000
--- a/reference/expect/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <reference xml:id="ref.expect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Expect &Functions;</title>
-&reference.expect.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/expect/setup.xml b/reference/expect/setup.xml
deleted file mode 100644
index dc7b5b1de595..000000000000
--- a/reference/expect/setup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="expect.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="expect.requirements">
-  &reftitle.required;
-  <simpara>
-   This module uses the functions of the <link xlink:href="&url.expect;">expect</link> library.
-   You need libexpect version &gt;= 5.43.0.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.expect.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.expect.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="expect.resources">
-  &reftitle.resources;
-  <simpara>
-   <function>expect_popen</function> returns an open PTY stream used by
-   <function>expect_expectl</function>.
-  </simpara>
- </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/expect/versions.xml b/reference/expect/versions.xml
deleted file mode 100644
index 2343489ba8ca..000000000000
--- a/reference/expect/versions.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='expect_expectl' from='PECL expect &gt;= 0.1.0'/>
- <function name='expect_popen' from='PECL expect &gt;= 0.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/fann/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/fann/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/fann/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/fann/book.xml b/reference/fann/book.xml
deleted file mode 100644
index 2f0a021684dc..000000000000
--- a/reference/fann/book.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.fann">
-  &reftitle.intro;
-  <para>
-   PHP binding for FANN (Fast Artificial Neural Network) Library which implements multilayer
-   artificial neural networks with support for both fully connected and sparsely connected networks.
-   It includes a framework for easy handling of training data sets. It is easy to use, versatile,
-   well documented, and fast.
-  </para>
- </preface>
-
- &reference.fann.setup;
- &reference.fann.constants;
- &reference.fann.examples;
- &reference.fann.reference;
- &reference.fann.fannconnection;
-
-</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/fann/configure.xml b/reference/fann/configure.xml
deleted file mode 100644
index 60beca5d9ead..000000000000
--- a/reference/fann/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="fann.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;fann">&url.pecl.package;fann</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/fann/constants.xml b/reference/fann/constants.xml
deleted file mode 100644
index 91ad9ed6e064..000000000000
--- a/reference/fann/constants.xml
+++ /dev/null
@@ -1,617 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="fann.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
-  <variablelist xml:id="constants.fann-train">
-   <title>Training algorithms</title>
-   <varlistentry xml:id="constant.fann-train-incremental">
-    <term>
-     <constant>FANN_TRAIN_INCREMENTAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Standard backpropagation algorithm, where the weights are updated after each training pattern.
-      This means that the weights are updated many times during a single epoch. For this reason some problems,
-      will train very fast with this algorithm, while other more advanced problems will not train very well.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-train-batch">
-    <term>
-     <constant>FANN_TRAIN_BATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Standard backpropagation algorithm, where the weights are updated after calculating the mean square error
-      for the whole training set. This means that the weights are only updated once during an epoch.
-      For this reason, some problems will train slower with this algorithm. But since the mean square
-      error is calculated more correctly than in incremental training, some problems will reach better
-      solutions with this algorithm.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-train-rprop">
-    <term>
-     <constant>FANN_TRAIN_RPROP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A more advanced batch training algorithm which achieves good results for many problems. The RPROP
-      training algorithm is adaptive, and therefore does not use the learning_rate. Some other parameters
-      can however be set to change the way the RPROP algorithm works, but it is only recommended
-      for users with insight in how the RPROP training algorithm works. The RPROP training algorithm
-      is described by [Riedmiller and Braun, 1993], but the actual learning algorithm used here is
-      the iRPROP- training algorithm which is described by [Igel and Husken, 2000] which is a variety
-      of the standard RPROP training algorithm.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-train-quickprop">
-    <term>
-     <constant>FANN_TRAIN_QUICKPROP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A more advanced batch training algorithm which achieves good results for many problems.
-      The quickprop training algorithm uses the learning_rate parameter along with other more advanced parameters,
-      but it is only recommended to change these advanced parameters for users with insight into how the quickprop
-      training algorithm works. The quickprop training algorithm is described by [Fahlman, 1988].
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-train-sarprop">
-    <term>
-     <constant>FANN_TRAIN_SARPROP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Even more advance training algorithm. Only for version 2.2
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <variablelist xml:id="constants.fann-activation-funcs">
-   <title>Activation functions</title>
-   <varlistentry xml:id="constant.fann-linear">
-    <term>
-     <constant>FANN_LINEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Linear activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-threshold">
-    <term>
-     <constant>FANN_THRESHOLD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Threshold activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-threshold-symmetric">
-    <term>
-     <constant>FANN_THRESHOLD_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Threshold activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sigmoid">
-    <term>
-     <constant>FANN_SIGMOID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Sigmoid activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sigmoid-stepwise">
-    <term>
-     <constant>FANN_SIGMOID_STEPWISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Stepwise linear approximation to sigmoid.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sigmoid-symmetric">
-    <term>
-     <constant>FANN_SIGMOID_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Symmetric sigmoid activation function, aka. tanh.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sigmoid-symmetric-stepwise">
-    <term>
-     <constant>FANN_SIGMOID_SYMMETRIC_STEPWISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Stepwise linear approximation to symmetric sigmoid
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-gaussian">
-    <term>
-     <constant>FANN_GAUSSIAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Gaussian activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-gaussian-symmetric">
-    <term>
-     <constant>FANN_GAUSSIAN_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Symmetric Gaussian activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-gaussian-stepwise">
-    <term>
-     <constant>FANN_GAUSSIAN_STEPWISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Stepwise Gaussian activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-elliot">
-    <term>
-     <constant>FANN_ELLIOT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Fast (sigmoid-like) activation function defined by David Elliott.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-elliot-symmetric">
-    <term>
-     <constant>FANN_ELLIOT_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Fast (symmetric sigmoid-like) activation function defined by David Elliott.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-linear-piece">
-    <term>
-     <constant>FANN_LINEAR_PIECE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Bounded linear activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-linear-piece-symmetric">
-    <term>
-     <constant>FANN_LINEAR_PIECE_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Bounded linear activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sin-symmetric">
-    <term>
-     <constant>FANN_SIN_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Periodical sinus activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-cos-symmetric">
-    <term>
-     <constant>FANN_COS_SYMMETRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Periodical cosinus activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-sin">
-    <term>
-     <constant>FANN_SIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Periodical sinus activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-cos">
-    <term>
-     <constant>FANN_COS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Periodical cosinus activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <variablelist xml:id="constants.fann-errorfunc">
-   <title>Error function used during training</title>
-   <varlistentry xml:id="constant.fann-errorfunc-linear">
-    <term>
-     <constant>FANN_ERRORFUNC_LINEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Standard linear error function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-errorfunc-tanh">
-    <term>
-     <constant>FANN_ERRORFUNC_TANH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Tanh error function; usually better but may require a lower learning rate. This error function aggressively
-      targets outputs that differ much from the desired output, while not targeting outputs that differ only slightly.
-      Not recommended for cascade or incremental training.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <variablelist xml:id="constants.fann-stopfunc">
-   <title>Stop criteria used during training</title>
-   <varlistentry xml:id="constant.fann-stopfunc-mse">
-    <term>
-     <constant>FANN_STOPFUNC_MSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Stop criteria is Mean Square Error (MSE) value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-stopfunc-bit">
-    <term>
-     <constant>FANN_STOPFUNC_BIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Stop criterion is number of bits that fail. The number of bits means the number of output neurons
-      which differ more than the bit fail limit (see fann_get_bit_fail_limit, fann_set_bit_fail_limit). The bits are counted
-      in all of the training data, so this number can be higher than the number of training data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <variablelist xml:id="constants.fann-nettype">
-   <title>Definition of network types used by <function>fann_get_network_type</function></title>
-   <varlistentry xml:id="constant.fann-nettype-layer">
-    <term>
-     <constant>FANN_NETTYPE_LAYER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Each layer only has connections to the next layer.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-nettype-shortcut">
-    <term>
-     <constant>FANN_NETTYPE_SHORTCUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Each layer has connections to all following layers
-     </simpara>
-    </listitem>
-   </varlistentry>
-   </variablelist>
-  <variablelist xml:id="constants.fann-e">
-   <title>Errors</title>
-   <varlistentry xml:id="constant.fann-e-no-error">
-    <term>
-     <constant>FANN_E_NO_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-open-config-r">
-    <term>
-     <constant>FANN_E_CANT_OPEN_CONFIG_R</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to open configuration file for reading.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-open-config-w">
-    <term>
-     <constant>FANN_E_CANT_OPEN_CONFIG_W</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to open configuration file for writing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-wrong-config-version">
-    <term>
-     <constant>FANN_E_WRONG_CONFIG_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Wrong version of configuration file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-read-config">
-    <term>
-     <constant>FANN_E_CANT_READ_CONFIG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Error reading info from configuration file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-read-neuron">
-    <term>
-     <constant>FANN_E_CANT_READ_NEURON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Error reading neuron info from configuration file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-read-connections">
-    <term>
-     <constant>FANN_E_CANT_READ_CONNECTIONS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Error reading connections from configuration file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-wrong-num-connections">
-    <term>
-     <constant>FANN_E_WRONG_NUM_CONNECTIONS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Number of connections not equal to the number expected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-open-td-w">
-    <term>
-     <constant>FANN_E_CANT_OPEN_TD_W</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to open train data file for writing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-open-td-r">
-    <term>
-     <constant>FANN_E_CANT_OPEN_TD_R</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to open train data file for reading.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-read-td">
-    <term>
-     <constant>FANN_E_CANT_READ_TD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Error reading training data from file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-allocate-mem">
-    <term>
-     <constant>FANN_E_CANT_ALLOCATE_MEM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to allocate memory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-train-activation">
-    <term>
-     <constant>FANN_E_CANT_TRAIN_ACTIVATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to train with the selected activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-use-activation">
-    <term>
-     <constant>FANN_E_CANT_USE_ACTIVATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to use the selected activation function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-train-data-mismatch">
-    <term>
-     <constant>FANN_E_TRAIN_DATA_MISMATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Irreconcilable differences between two struct fann_train_data structures.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-cant-use-train-alg">
-    <term>
-     <constant>FANN_E_CANT_USE_TRAIN_ALG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unable to use the selected training algorithm.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-train-data-subset">
-    <term>
-     <constant>FANN_E_TRAIN_DATA_SUBSET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Trying to take subset which is not within the training set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-index-out-of-bound">
-    <term>
-     <constant>FANN_E_INDEX_OUT_OF_BOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Index is out of bound.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-scale-not-present">
-    <term>
-     <constant>FANN_E_SCALE_NOT_PRESENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Scaling parameters not present.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-input-no-match">
-    <term>
-     <constant>FANN_E_INPUT_NO_MATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The number of input neurons in the ann and data do not match
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.fann-e-output-no-match">
-    <term>
-     <constant>FANN_E_OUTPUT_NO_MATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The number of output neurons in the ann and data do not match.
-     </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/fann/examples.xml b/reference/fann/examples.xml
deleted file mode 100644
index b75afdf1182c..000000000000
--- a/reference/fann/examples.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="fann.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <section xml:id="fann.examples-1">
-  <title>XOR training</title>
-  <para>
-   This example shows how to train data for XOR function
-   <example>
-    <title>xor.data file</title>
-    <programlisting role="txt">
-<![CDATA[
-4 2 1
--1 -1
--1
--1 1
-1
-1 -1
-1
-1 1
--1
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Simple train</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$num_input = 2;
-$num_output = 1;
-$num_layers = 3;
-$num_neurons_hidden = 3;
-$desired_error = 0.001;
-$max_epochs = 500000;
-$epochs_between_reports = 1000;
-
-$ann = fann_create_standard($num_layers, $num_input, $num_neurons_hidden, $num_output);
-
-if ($ann) {
-    fann_set_activation_function_hidden($ann, FANN_SIGMOID_SYMMETRIC);
-    fann_set_activation_function_output($ann, FANN_SIGMOID_SYMMETRIC);
-
-    $filename = dirname(__FILE__) . "/xor.data";
-    if (fann_train_on_file($ann, $filename, $max_epochs, $epochs_between_reports, $desired_error))
-        fann_save($ann, dirname(__FILE__) . "/xor_float.net");
-
-    fann_destroy($ann);
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   This example shows how to read and run data for XOR function
-   <example>
-    <title>Simple test</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$train_file = (dirname(__FILE__) . "/xor_float.net");
-if (!is_file($train_file))
-    die("The file xor_float.net has not been created! Please run simple_train.php to generate it");
-
-$ann = fann_create_from_file($train_file);
-if (!$ann)
-    die("ANN could not be created");
-
-$input = array(-1, 1);
-$calc_out = fann_run($ann, $input);
-printf("xor test (%f,%f) -> %f\n", $input[0], $input[1], $calc_out[0]);
-fann_destroy($ann);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
-</chapter>
-
-
diff --git a/reference/fann/fannconnection.xml b/reference/fann/fannconnection.xml
deleted file mode 100644
index 38e495f14df8..000000000000
--- a/reference/fann/fannconnection.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.fannconnection" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The FANNConnection class</title>
- <titleabbrev>FANNConnection</titleabbrev>
-
- <partintro>
-
-<!-- {{{ FANNConnection intro -->
-  <section xml:id="fannconnection.intro">
-   &reftitle.intro;
-   <para>
-    <classname>FANNConnection</classname> is used for the neural network connection.
-    The objects of this class are used in <function>fann_get_connection_array</function> and <function>fann_set_weight_array</function>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="fannconnection.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>FANNConnection</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>FANNConnection</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="fannconnection.props.from-neuron">from_neuron</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="fannconnection.props.to-neuron">to_neuron</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="fannconnection.props.weight">weight</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.fannconnection')/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.fannconnection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ FANNConnection properties -->
-  <section xml:id="fannconnection.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="fannconnection.props.from-neuron">
-     <term><varname>from_neuron</varname></term>
-     <listitem>
-      <para>The neuron where the connection starts.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="fannconnection.props.to-neuron">
-     <term><varname>to_neuron</varname></term>
-     <listitem>
-      <para>The neuron where the connection ends.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="fannconnection.props.weight">
-     <term><varname>weight</varname></term>
-     <listitem>
-      <para>The weight of the connection.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.fann.entities.fannconnection;
-
-</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/fann/fannconnection/construct.xml b/reference/fann/fannconnection/construct.xml
deleted file mode 100644
index aac25fa61729..000000000000
--- a/reference/fann/fannconnection/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="fannconnection.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>FANNConnection::__construct</refname>
-  <refpurpose>The connection constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>FANNConnection::__construct</methodname>
-   <methodparam><type>int</type><parameter>from_neuron</parameter></methodparam>
-   <methodparam><type>int</type><parameter>to_neuron</parameter></methodparam>
-   <methodparam><type>float</type><parameter>weight</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Create new connection and initialize its params. After creating the connection, only weight can be changed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from_neuron</parameter></term>
-    <listitem>
-     <para>
-      The position number of starting neuron.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to_neuron</parameter></term>
-    <listitem>
-     <para>
-      The position number of terminating neuron.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>weight</parameter></term>
-    <listitem>
-     <para>
-      The connection weight value.
-     </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/fann/fannconnection/getfromneuron.xml b/reference/fann/fannconnection/getfromneuron.xml
deleted file mode 100644
index 27174aba97f5..000000000000
--- a/reference/fann/fannconnection/getfromneuron.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="fannconnection.getfromneuron" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>FANNConnection::getFromNeuron</refname>
-  <refpurpose>Returns the positions of starting neuron</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>FANNConnection::getFromNeuron</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the positions of starting neuron.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The positions of starting neuron.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/fannconnection/gettoneuron.xml b/reference/fann/fannconnection/gettoneuron.xml
deleted file mode 100644
index ab2aaa6d8f9b..000000000000
--- a/reference/fann/fannconnection/gettoneuron.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="fannconnection.gettoneuron" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>FANNConnection::getToNeuron</refname>
-  <refpurpose>Returns the positions of terminating neuron</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>FANNConnection::getToNeuron</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the positions of terminating neuron.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The positions of terminating neuron.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/fannconnection/getweight.xml b/reference/fann/fannconnection/getweight.xml
deleted file mode 100644
index 7eb99699b462..000000000000
--- a/reference/fann/fannconnection/getweight.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="fannconnection.getweight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>FANNConnection::getWeight</refname>
-  <refpurpose>Returns the connection weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>FANNConnection::getWeight</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the connection weight.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The connection weight.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/fannconnection/setweight.xml b/reference/fann/fannconnection/setweight.xml
deleted file mode 100644
index c8a54431e9a0..000000000000
--- a/reference/fann/fannconnection/setweight.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="fannconnection.setweight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>FANNConnection::setWeight</refname>
-  <refpurpose>Sets the connections weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>FANNConnection::setWeight</methodname>
-   <methodparam><type>float</type><parameter>weight</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the connection weight.
-  </para>
-  <para>
-    This method is different than <function>fann_set_weight</function>. It does not
-   update the weight value in the network. The network value is updated only after calling
-   <function>fann_set_weight_array</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>weight</parameter></term>
-     <listitem>
-      <para>
-       The connection weight.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.void;
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-cascadetrain-on-data.xml b/reference/fann/functions/fann-cascadetrain-on-data.xml
deleted file mode 100644
index c9c359d7fb3c..000000000000
--- a/reference/fann/functions/fann-cascadetrain-on-data.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-cascadetrain-on-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_cascadetrain_on_data</refname>
-  <refpurpose>Trains on an entire dataset, for a period of time using the Cascade2 training algorithm</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_cascadetrain_on_data</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_neurons</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neurons_between_reports</parameter></methodparam>
-   <methodparam><type>float</type><parameter>desired_error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The cascade output change fraction is a number between 0 and 1 determining how large a fraction
-   the <function>fann_get_MSE</function> value should change within <function>fann_get_cascade_output_stagnation_epochs</function>
-   during training of the output connections, in order for the training not to stagnate.  If the training stagnates,
-   the training of the output connections will be ended and new candidates will be prepared.
-  </para>
-  <para>
-   This training uses the parameters set using the fann_set_cascade_..., but it also uses another training algorithm
-   as it’s internal training algorithm. This algorithm can be set to either <constant>FANN_TRAIN_RPROP</constant> or
-   <constant>FANN_TRAIN_QUICKPROP</constant> by <function>fann_set_training_algorithm</function>, and the parameters
-   set for these training algorithms will also affect the cascade training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_neurons</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of neurons to be added to neural network.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neurons_between_reports</parameter></term>
-    <listitem>
-     <para>
-      The number of neurons between printing a status report. A value of zero means no reports should be printed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_error</parameter></term>
-    <listitem>
-     <para>
-      The desired <function>fann_get_MSE</function> or <function>fann_get_bit_fail</function>,
-      depending on which stop function is chosen by <function>fann_set_train_stop_function</function>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_cascadetrain_on_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/fann/functions/fann-cascadetrain-on-file.xml b/reference/fann/functions/fann-cascadetrain-on-file.xml
deleted file mode 100644
index 9c1b9783311e..000000000000
--- a/reference/fann/functions/fann-cascadetrain-on-file.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-cascadetrain-on-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_cascadetrain_on_file</refname>
-  <refpurpose>Trains on an entire dataset read from file, for a period of time using the Cascade2 training algorithm</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_cascadetrain_on_file</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_neurons</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neurons_between_reports</parameter></methodparam>
-   <methodparam><type>float</type><parameter>desired_error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Does the same as <function>fann_cascadetrain_on_data</function>, but reads the training data directly from a file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      A file containing the data for training. 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_neurons</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of neurons to be added to neural network
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neurons_between_reports</parameter></term>
-    <listitem>
-     <para>
-      The number of neurons between printing a status report. A value of zero means no reports should be printed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_error</parameter></term>
-    <listitem>
-     <para>
-      The desired <function>fann_get_MSE</function> or <function>fann_get_bit_fail</function>,
-      depending on which stop function is chosen by <function>fann_set_train_stop_function</function>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_cascadetrain_on_data</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/fann/functions/fann-clear-scaling-params.xml b/reference/fann/functions/fann-clear-scaling-params.xml
deleted file mode 100644
index 8ee61b474d7c..000000000000
--- a/reference/fann/functions/fann-clear-scaling-params.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-clear-scaling-params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_clear_scaling_params</refname>
-  <refpurpose>Clears scaling parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_clear_scaling_params</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Clears scaling parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-copy.xml b/reference/fann/functions/fann-copy.xml
deleted file mode 100644
index 2a518ac14143..000000000000
--- a/reference/fann/functions/fann-copy.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_copy</refname>
-  <refpurpose>Creates a copy of a fann structure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_copy</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a copy of a fann structure.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a copy of neural network resource on success, or &false; on error
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_test</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/fann/functions/fann-create-from-file.xml b/reference/fann/functions/fann-create-from-file.xml
deleted file mode 100644
index f35844997512..000000000000
--- a/reference/fann/functions/fann-create-from-file.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-from-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_from_file</refname>
-  <refpurpose>Constructs a backpropagation neural network from a configuration file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_from_file</methodname>
-   <methodparam><type>string</type><parameter>configuration_file</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a backpropagation neural network from a configuration file, which have been saved by <function>fann_save</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>configuration_file</parameter></term>
-    <listitem>
-     <para>
-      The configuration file path.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.ann;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_save</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/fann/functions/fann-create-shortcut-array.xml b/reference/fann/functions/fann-create-shortcut-array.xml
deleted file mode 100644
index 2943e98c679d..000000000000
--- a/reference/fann/functions/fann-create-shortcut-array.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-shortcut-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_shortcut_array</refname>
-  <refpurpose>Creates a standard backpropagation neural network which is not fully connected and has shortcut connections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_shortcut_array</methodname>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>array</type><parameter>layers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a standard backpropagation neural network which is not fully connected and has shortcut connections using an array of layers sizes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layers</parameter></term>
-    <listitem>
-     <para>
-      An array of layers sizes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_shortcut</function></member>
-    <member><function>fann_create_sparse</function></member>
-    <member><function>fann_create_standard</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/fann/functions/fann-create-shortcut.xml b/reference/fann/functions/fann-create-shortcut.xml
deleted file mode 100644
index 734727e43720..000000000000
--- a/reference/fann/functions/fann-create-shortcut.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-shortcut" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_shortcut</refname>
-  <refpurpose>Creates a standard backpropagation neural network which is not fully connected and has shortcut connections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_shortcut</methodname>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons1</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons2</parameter></methodparam>
-   <methodparam rep="repeat"><type>int</type><parameter>num_neuronsN</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a standard backpropagation neural network, which is not fully connected and which also has shortcut connections.
-  </para>
-  <para>
-   Shortcut connections are connections that skip layers. A fully connected network with shortcut connections, is a network
-   where all neurons are connected to all neurons in later layers. Including direct connections from the input layer to the output layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons1</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the first layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons2</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the second layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neuronsN</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in other layers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_shortcut_array</function></member>
-    <member><function>fann_create_sparse</function></member>
-    <member><function>fann_create_standard</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/fann/functions/fann-create-sparse-array.xml b/reference/fann/functions/fann-create-sparse-array.xml
deleted file mode 100644
index 575b67f5a91e..000000000000
--- a/reference/fann/functions/fann-create-sparse-array.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-sparse-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_sparse_array</refname>
-  <refpurpose>Creates a standard backpropagation neural network, which is not fully connected using an array of layer sizes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_sparse_array</methodname>
-   <methodparam><type>float</type><parameter>connection_rate</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>array</type><parameter>layers</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a standard backpropagation neural network, which is not fully connected using an array of layer sizes.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection_rate</parameter></term>
-    <listitem>
-     <para>
-      The connection rate controls how many connections there will be in the network. If the connection rate
-      is set to 1, the network will be fully connected, but if it is set to 0.5 only half of the connections
-      will be set. A connection rate of 1 will yield the same result as <function>fann_create_standard</function>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layers</parameter></term>
-    <listitem>
-     <para>
-       An array of layer sizes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_sparse</function></member>
-    <member><function>fann_create_standard</function></member>
-    <member><function>fann_create_shortcut</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/fann/functions/fann-create-sparse.xml b/reference/fann/functions/fann-create-sparse.xml
deleted file mode 100644
index 89e8019a69da..000000000000
--- a/reference/fann/functions/fann-create-sparse.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-sparse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_sparse</refname>
-  <refpurpose>Creates a standard backpropagation neural network, which is not fully connected</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_sparse</methodname>
-   <methodparam><type>float</type><parameter>connection_rate</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons1</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons2</parameter></methodparam>
-   <methodparam rep="repeat"><type>int</type><parameter>num_neuronsN</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a standard backpropagation neural network, which is not fully connected.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection_rate</parameter></term>
-    <listitem>
-     <para>
-      The connection rate controls how many connections there will be in the network. If the connection rate
-      is set to 1, the network will be fully connected, but if it is set to 0.5 only half of the connections
-      will be set. A connection rate of 1 will yield the same result as <function>fann_create_standard</function>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons1</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the first layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons2</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the second layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neuronsN</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in other layers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_sparse_array</function></member>
-    <member><function>fann_create_standard</function></member>
-    <member><function>fann_create_shortcut</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/fann/functions/fann-create-standard-array.xml b/reference/fann/functions/fann-create-standard-array.xml
deleted file mode 100644
index adc34ed03eb8..000000000000
--- a/reference/fann/functions/fann-create-standard-array.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-standard-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_standard_array</refname>
-  <refpurpose>Creates a standard fully connected backpropagation neural network using an array of layer sizes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_standard_array</methodname>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>array</type><parameter>layers</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a standard fully connected backpropagation neural network.
-  </para>
-  <para>
-   There will be a bias neuron in each layer (except the output layer),
-   and this bias neuron will be connected to all neurons in the next layer.
-   When running the network, the bias nodes always emits 1.
-  </para>
-  <para>
-   To destroy a neural network use the <function>fann_destroy</function> function.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layers</parameter></term>
-    <listitem>
-     <para>
-      An array of layer sizes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_standard</function></member>
-    <member><function>fann_create_sparse</function></member>
-    <member><function>fann_create_shortcut</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/fann/functions/fann-create-standard.xml b/reference/fann/functions/fann-create-standard.xml
deleted file mode 100644
index 1f10a8c07f5b..000000000000
--- a/reference/fann/functions/fann-create-standard.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-standard" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_standard</refname>
-  <refpurpose>Creates a standard fully connected backpropagation neural network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_standard</methodname>
-   <methodparam><type>int</type><parameter>num_layers</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons1</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_neurons2</parameter></methodparam>
-   <methodparam rep="repeat"><type>int</type><parameter>num_neuronsN</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a standard fully connected backpropagation neural network.
-  </para>
-  <para>
-   There will be a bias neuron in each layer (except the output layer),
-   and this bias neuron will be connected to all neurons in the next layer.
-   When running the network, the bias nodes always emits 1.
-  </para>
-  <para>
-   To destroy a neural network use the <function>fann_destroy</function> function.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_layers</parameter></term>
-    <listitem>
-     <para>
-      The total number of layers including the input and the output layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons1</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the first layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neurons2</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in the second layer.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_neuronsN</parameter></term>
-    <listitem>
-     <para>
-      Number of neurons in other layers.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a neural network resource on success, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_standard_array</function></member>
-    <member><function>fann_create_sparse</function></member>
-    <member><function>fann_create_shortcut</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/fann/functions/fann-create-train-from-callback.xml b/reference/fann/functions/fann-create-train-from-callback.xml
deleted file mode 100644
index 49d1860cbe34..000000000000
--- a/reference/fann/functions/fann-create-train-from-callback.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-train-from-callback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_train_from_callback</refname>
-  <refpurpose>Creates the training data struct from a user supplied function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_train_from_callback</methodname>
-   <methodparam><type>int</type><parameter>num_data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_output</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>user_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates the training data struct from a user supplied function. As the training data are numerable (data 1, data 2...),
-   the user must write a function that receives the number of the training data set (input, output) and returns the set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_data</parameter></term>
-    <listitem>
-     <para>
-      The number of training data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_input</parameter></term>
-    <listitem>
-     <para>
-      The number of inputs per training data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_output</parameter></term>
-    <listitem>
-     <para>
-      The number of outputs per training data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_function</parameter></term>
-    <listitem>
-     <para>
-      The user supplied function with following parameters:
-      <simplelist>
-       <member><literal>num</literal> - The number of the training data set</member>
-       <member><literal>num_input</literal> - The number of inputs per training data</member>
-       <member><literal>num_output</literal> - The number of outputs per training data</member>
-      </simplelist>
-     </para>
-     <para>
-      The function should return an associative array with keys <literal>input</literal> and <literal>output</literal> and
-      two array values of input and output.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.train;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>fann_create_train_from_callback</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function create_train_callback($num_data, $num_input, $num_output) {
-    return array(
-        "input" => array_fill(0, $num_input, 1),
-        "output" => array_fill(0, $num_output, 1),
-    );
-}
-
-$num_data = 3;
-$num_input = 2;
-$num_output = 1;
-$train_data = fann_create_train_from_callback($num_data, $num_input, $num_output, "create_train_callback");
-if ($train_data) {
-    // Do something with $train_data
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_read_train_from_file</function></member>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_destroy_train</function></member>
-    <member><function>fann_save_train</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/fann/functions/fann-create-train.xml b/reference/fann/functions/fann-create-train.xml
deleted file mode 100644
index 3ff6c5bef425..000000000000
--- a/reference/fann/functions/fann-create-train.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-create-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_create_train</refname>
-  <refpurpose>Creates an empty training data struct</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_create_train</methodname>
-   <methodparam><type>int</type><parameter>num_data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>num_output</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates an empty training data struct.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>num_data</parameter></term>
-    <listitem>
-     <para>
-      The number of training data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_input</parameter></term>
-    <listitem>
-     <para>
-      The number of inputs per training data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>num_output</parameter></term>
-    <listitem>
-     <para>
-      The number of outputs per training data
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.train;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_read_train_from_file</function></member>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_destroy_train</function></member>
-    <member><function>fann_save_train</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/fann/functions/fann-descale-input.xml b/reference/fann/functions/fann-descale-input.xml
deleted file mode 100644
index 78c37cabb35c..000000000000
--- a/reference/fann/functions/fann-descale-input.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-descale-input" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_descale_input</refname>
-  <refpurpose>Scale data in input vector after get it from ann based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_descale_input</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input_vector</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scale data in input vector after get it from ann based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input_vector</parameter></term>
-    <listitem>
-     <para>
-      Input vector that will be descaled
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_input</function></member>
-    <member><function>fann_descale_output</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/fann/functions/fann-descale-output.xml b/reference/fann/functions/fann-descale-output.xml
deleted file mode 100644
index 6be8037907c0..000000000000
--- a/reference/fann/functions/fann-descale-output.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-descale-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_descale_output</refname>
-  <refpurpose>Scale data in output vector after get it from ann based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_descale_output</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>output_vector</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scale data in output vector after get it from ann based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>output_vector</parameter></term>
-    <listitem>
-     <para>
-      Output vector that will be descaled
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_output</function></member>
-    <member><function>fann_descale_input</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/fann/functions/fann-descale-train.xml b/reference/fann/functions/fann-descale-train.xml
deleted file mode 100644
index 492208a8528b..000000000000
--- a/reference/fann/functions/fann-descale-train.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-descale-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_descale_train</refname>
-  <refpurpose>Descale input and output data based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_descale_train</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Descale input and output data based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_train</function></member>
-    <member><function>fann_set_scaling_params</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/fann/functions/fann-destroy-train.xml b/reference/fann/functions/fann-destroy-train.xml
deleted file mode 100644
index 8096939960d4..000000000000
--- a/reference/fann/functions/fann-destroy-train.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-destroy-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_destroy_train</refname>
-  <refpurpose>Destructs the training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_destroy_train</methodname>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Destructs the training data
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-destroy.xml b/reference/fann/functions/fann-destroy.xml
deleted file mode 100644
index 781fc2a8e53b..000000000000
--- a/reference/fann/functions/fann-destroy.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-destroy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_destroy</refname>
-  <refpurpose>Destroys the entire network and properly freeing all the associated memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_destroy</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Destroys the entire network and properly freeing all the associated memory.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-duplicate-train-data.xml b/reference/fann/functions/fann-duplicate-train-data.xml
deleted file mode 100644
index cfc7c3135328..000000000000
--- a/reference/fann/functions/fann-duplicate-train-data.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-duplicate-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_duplicate_train_data</refname>
-  <refpurpose>Returns an exact copy of a fann train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_duplicate_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an exact copy of a fann train data <type>resource</type>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.train;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-activation-function.xml b/reference/fann/functions/fann-get-activation-function.xml
deleted file mode 100644
index 2cc6a3e733d9..000000000000
--- a/reference/fann/functions/fann-get-activation-function.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-activation-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_activation_function</refname>
-  <refpurpose>Returns the activation function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_activation_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neuron</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the activation function for neuron number <literal>neuron</literal> in layer number
-   <literal>layer</literal>, counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to get activation functions for the neurons in the input layer.
-  </para>
-  <para>
-   The return value is one of the <link linkend="constants.fann-activation-funcs">activation functions</link> constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neuron</parameter></term>
-    <listitem>
-     <para>
-      Neuron number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <link linkend="constants.fann-activation-funcs">Activation functions</link> constant or -1
-   if the neuron is not defined in the neural network, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function_layer</function></member>
-    <member><function>fann_set_activation_function_hidden</function></member>
-    <member><function>fann_set_activation_function_output</function></member>
-    <member><function>fann_set_activation_steepness</function></member>
-    <member><function>fann_set_activation_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/fann/functions/fann-get-activation-steepness.xml b/reference/fann/functions/fann-get-activation-steepness.xml
deleted file mode 100644
index 144202bc5f42..000000000000
--- a/reference/fann/functions/fann-get-activation-steepness.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-activation-steepness" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_activation_steepness</refname>
-  <refpurpose>Returns the activation steepness for supplied neuron and layer number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_activation_steepness</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neuron</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the activation steepness for neuron number <literal>neuron</literal> in layer number
-   <literal>layer</literal>, counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to get activation steepness for the neurons in the input layer.
-  </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 aggressive training.
-  </para>
-  <para>
-   When training neural networks where the output values should be at the extremes
-   (usually 0 and 1, depending on the activation function), a steep activation function can be used (e.g.  1.0).
-  </para>
-  <para>
-   The default activation steepness is 0.5.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neuron</parameter></term>
-    <listitem>
-     <para>
-      Neuron number
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The activation steepness for the neuron or -1 if the neuron is not defined in the neural network, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function</function></member>
-    <member><function>fann_set_activation_steepness_layer</function></member>
-    <member><function>fann_set_activation_steepness_hidden</function></member>
-    <member><function>fann_set_activation_steepness_output</function></member>
-    <member><function>fann_set_activation_steepness</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/fann/functions/fann-get-bias-array.xml b/reference/fann/functions/fann-get-bias-array.xml
deleted file mode 100644
index 3cf70f0b5e08..000000000000
--- a/reference/fann/functions/fann-get-bias-array.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-bias-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_bias_array</refname>
-  <refpurpose>Get the number of bias in each layer in the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_get_bias_array</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of bias in each layer in the network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of numbers of bias in each layer
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-bit-fail-limit.xml b/reference/fann/functions/fann-get-bit-fail-limit.xml
deleted file mode 100644
index c1bc09a4cfb3..000000000000
--- a/reference/fann/functions/fann-get-bit-fail-limit.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-bit-fail-limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_bit_fail_limit</refname>
-  <refpurpose>Returns the bit fail limit used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_bit_fail_limit</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the bit fail limit used during training.
-  </para>
-  <para>
-   The bit fail limit is used during training where the <link linkend="constants.fann-stopfunc">stop function</link>
-   is set to <constant>FANN_STOPFUNC_BIT</constant>.
-  </para>
-  <para>
-   The limit is the maximum accepted difference between the desired output and the actual output during training.
-   Each output that diverges more than this limit is counted as an error bit. This difference is divided by two
-   when dealing with symmetric activation functions, so that symmetric and not symmetric activation functions
-   can use the same limit.
-  </para>
-  <para>
-   The default bit fail limit is 0.35.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The bit fail limit, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_bit_fail_limit</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/fann/functions/fann-get-bit-fail.xml b/reference/fann/functions/fann-get-bit-fail.xml
deleted file mode 100644
index 54a211084269..000000000000
--- a/reference/fann/functions/fann-get-bit-fail.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-bit-fail" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_bit_fail</refname>
-  <refpurpose>The number of fail bits</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_bit_fail</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of fail bits; means the number of output neurons which differ more than the bit fail limit
-   (see <function>fann_get_bit_fail_limit</function>, <function>fann_set_bit_fail_limit</function>).
-   The bits are counted in all of the training data, so this number can be higher than the number of training data.
-  </para>
-  <para>
-   This value is reset by <function>fann_reset_MSE</function> and updated by all the same functions
-   which also updates the MSE value (e.g. <function>fann_test_data</function>, <function>fann_train_epoch</function>)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of bits fail, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_reset_MSE</function></member>
-    <member><function>fann_test_data</function></member>
-    <member><function>fann_train_epoch</function></member>
-    <member><function>fann_get_bit_fail_limit</function></member>
-    <member><function>fann_set_bit_fail_limit</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/fann/functions/fann-get-cascade-activation-functions-count.xml b/reference/fann/functions/fann-get-cascade-activation-functions-count.xml
deleted file mode 100644
index c40e4778cd90..000000000000
--- a/reference/fann/functions/fann-get-cascade-activation-functions-count.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-activation-functions-count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_activation_functions_count</refname>
-  <refpurpose>Returns the number of cascade activation functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_activation_functions_count</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of activation functions in the <function>fann_get_cascade_activation_functions</function> array.
-  </para>
-  <para>
-   The default number of activation functions is 6.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of cascade activation functions, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_functions</function></member>
-    <member><function>fann_set_cascade_activation_functions</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/fann/functions/fann-get-cascade-activation-functions.xml b/reference/fann/functions/fann-get-cascade-activation-functions.xml
deleted file mode 100644
index 31a07e1832e7..000000000000
--- a/reference/fann/functions/fann-get-cascade-activation-functions.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-activation-functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_activation_functions</refname>
-  <refpurpose>Returns the cascade activation functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_get_cascade_activation_functions</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The cascade activation functions array is an array of the different activation functions used by the candidates
-  </para>
-  <para>
-   See <function>fann_get_cascade_num_candidates</function> for a description of which candidate neurons will be generated by this array.
-  </para>
-  <para>
-   The default activation functions are <constant>FANN_SIGMOID</constant>, <constant>FANN_SIGMOID_SYMMETRIC</constant>,
-   <constant>FANN_GAUSSIAN</constant>, <constant>FANN_GAUSSIAN_SYMMETRIC</constant>, <constant>FANN_ELLIOT</constant>,
-   <constant>FANN_ELLIOT_SYMMETRIC</constant>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The cascade activation functions, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_functions_count</function></member>
-    <member><function>fann_set_cascade_activation_functions</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/fann/functions/fann-get-cascade-activation-steepnesses-count.xml b/reference/fann/functions/fann-get-cascade-activation-steepnesses-count.xml
deleted file mode 100644
index 396aca1c85be..000000000000
--- a/reference/fann/functions/fann-get-cascade-activation-steepnesses-count.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-activation-steepnesses-count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_activation_steepnesses_count</refname>
-  <refpurpose>The number of activation steepnesses</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_activation_steepnesses_count</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of activation steepnesses in the <function>fann_get_cascade_activation_functions</function> array.
-  </para>
-  <para>
-   The default number of activation steepnesses is 4.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of activation steepnesses, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_steepnesses</function></member>
-    <member><function>fann_set_cascade_activation_functions</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/fann/functions/fann-get-cascade-activation-steepnesses.xml b/reference/fann/functions/fann-get-cascade-activation-steepnesses.xml
deleted file mode 100644
index ad42c7a831c5..000000000000
--- a/reference/fann/functions/fann-get-cascade-activation-steepnesses.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-activation-steepnesses" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_activation_steepnesses</refname>
-  <refpurpose>Returns the cascade activation steepnesses</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_get_cascade_activation_steepnesses</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The cascade activation steepnesses array is an array of the different activation functions used by the candidates.
-  </para>
-  <para>
-   See <function>fann_get_cascade_num_candidates</function> for a description of which candidate neurons will be generated by this array.
-  </para>
-  <para>
-   The default activation steepnesses are {0.25, 0.50, 0.75, 1.00}.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The cascade activation steepnesses, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_steepnesses_count</function></member>
-    <member><function>fann_set_cascade_activation_steepnesses</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/fann/functions/fann-get-cascade-candidate-change-fraction.xml b/reference/fann/functions/fann-get-cascade-candidate-change-fraction.xml
deleted file mode 100644
index aa28b5cfe9bf..000000000000
--- a/reference/fann/functions/fann-get-cascade-candidate-change-fraction.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-candidate-change-fraction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_candidate_change_fraction</refname>
-  <refpurpose>Returns the cascade candidate change fraction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_cascade_candidate_change_fraction</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The cascade candidate change fraction is a number between 0 and 1 determining how large a fraction the <function>fann_get_MSE</function>
-   value should change within <function>fann_get_cascade_candidate_stagnation_epochs</function> during training of the candidate neurons,
-   in order for the training not to stagnate. If the training stagnates, the training of the candidate neurons will be ended
-   and the best candidate will be selected.
-  </para>
-  <para>
-   It means that if the MSE does not change by a fraction of <function>fann_get_cascade_candidate_change_fraction</function> during
-   a period of <function>fann_get_cascade_candidate_stagnation_epochs</function>, the training of the candidate neurons is stopped
-   because the training has stagnated.
-  </para>
-  <para>
-   If the cascade candidate change fraction is low, the candidate neurons will be trained more and if the fraction is high they will be trained less.
-  </para>
-  <simpara>
-   The default cascade candidate change fraction is 0.01, which is equivalent to a 1% change in MSE.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The cascade candidate change fraction, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_candidate_change_fraction</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_get_cascade_candidate_stagnation_epochs</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/fann/functions/fann-get-cascade-candidate-limit.xml b/reference/fann/functions/fann-get-cascade-candidate-limit.xml
deleted file mode 100644
index 06829b921f8b..000000000000
--- a/reference/fann/functions/fann-get-cascade-candidate-limit.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-candidate-limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_candidate_limit</refname>
-  <refpurpose>Return the candidate limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_cascade_candidate_limit</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The candidate limit is a limit for how much the candidate neuron may be trained. The limit is a limit
-   on the proportion between the MSE and candidate score.
-  </para>
-  <para>
-   Set this to a lower value to avoid overfitting and to a higher if overfitting is not a problem.
-  </para>
-  <para>
-   The default candidate limit is 1000.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The candidate limit, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_candidate_limit</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/fann/functions/fann-get-cascade-candidate-stagnation-epochs.xml b/reference/fann/functions/fann-get-cascade-candidate-stagnation-epochs.xml
deleted file mode 100644
index ae98c4b6a25a..000000000000
--- a/reference/fann/functions/fann-get-cascade-candidate-stagnation-epochs.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-candidate-stagnation-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_candidate_stagnation_epochs</refname>
-  <refpurpose>Returns the number of cascade candidate stagnation epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_candidate_stagnation_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of cascade candidate stagnation epochs determines the number of epochs training is allowed to continue
-   without changing the MSE by a fraction of <function>fann_get_cascade_candidate_change_fraction</function>.
-  </para>
-  <para>
-   See more info about this parameter in <function>fann_get_cascade_candidate_change_fraction</function>.
-  </para>
-  <para>
-   The default number of cascade candidate stagnation epochs is 12.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of cascade candidate stagnation epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_candidate_stagnation_epochs</function></member>
-    <member><function>fann_get_cascade_candidate_change_fraction</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/fann/functions/fann-get-cascade-max-cand-epochs.xml b/reference/fann/functions/fann-get-cascade-max-cand-epochs.xml
deleted file mode 100644
index 748774231780..000000000000
--- a/reference/fann/functions/fann-get-cascade-max-cand-epochs.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-max-cand-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_max_cand_epochs</refname>
-  <refpurpose>Returns the maximum candidate epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_max_cand_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The maximum candidate epochs determines the maximum number of epochs the input connections
-   to the candidates may be trained before adding a new candidate neuron.
-  </para>
-  <para>
-   The default max candidate epochs is 150.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The maximum candidate epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_max_cand_epochs</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/fann/functions/fann-get-cascade-max-out-epochs.xml b/reference/fann/functions/fann-get-cascade-max-out-epochs.xml
deleted file mode 100644
index 13bf56d74bc5..000000000000
--- a/reference/fann/functions/fann-get-cascade-max-out-epochs.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-max-out-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_max_out_epochs</refname>
-  <refpurpose>Returns the maximum out epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_max_out_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The maximum out epochs determines the maximum number of epochs the output connections may be
-   trained after adding a new candidate neuron.
-  </para>
-  <para>
-   The default max out epochs is 150.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The maximum out epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_max_out_epochs</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/fann/functions/fann-get-cascade-min-cand-epochs.xml b/reference/fann/functions/fann-get-cascade-min-cand-epochs.xml
deleted file mode 100644
index 2460f5cba005..000000000000
--- a/reference/fann/functions/fann-get-cascade-min-cand-epochs.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-min-cand-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_min_cand_epochs</refname>
-  <refpurpose>Returns the minimum candidate epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_min_cand_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The minimum candidate epochs determines the minimum number of epochs the input connections
-   to the candidates may be trained before adding a new candidate neuron.
-  </para>
-  <para>
-   The default min candidate epochs is 50.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The minimum candidate epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_min_cand_epochs</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/fann/functions/fann-get-cascade-min-out-epochs.xml b/reference/fann/functions/fann-get-cascade-min-out-epochs.xml
deleted file mode 100644
index c95413674676..000000000000
--- a/reference/fann/functions/fann-get-cascade-min-out-epochs.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-min-out-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_min_out_epochs</refname>
-  <refpurpose>Returns the minimum out epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_min_out_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The minimum out epochs determines the minimum number of epochs the output connections must be trained
-   after adding a new candidate neuron.
-  </para>
-  <para>
-   The default min out epochs is 50.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The minimum out epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_min_out_epochs</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/fann/functions/fann-get-cascade-num-candidate-groups.xml b/reference/fann/functions/fann-get-cascade-num-candidate-groups.xml
deleted file mode 100644
index fe08e6970462..000000000000
--- a/reference/fann/functions/fann-get-cascade-num-candidate-groups.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-num-candidate-groups" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_num_candidate_groups</refname>
-  <refpurpose>Returns the number of candidate groups</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_num_candidate_groups</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of candidate groups is the number of groups of identical candidates which will be used during training.
-  </para>
-  <para>
-   This number can be used to have more candidates without having to define new parameters for the candidates.
-  </para>
-  <para>
-   See <function>fann_get_cascade_num_candidates</function> for a description of
-   which candidate neurons will be generated by this parameter.
-  </para>
-  <para>
-   The default number of candidate groups is 2.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of candidate groups, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_num_candidate_groups</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/fann/functions/fann-get-cascade-num-candidates.xml b/reference/fann/functions/fann-get-cascade-num-candidates.xml
deleted file mode 100644
index a462f53ab276..000000000000
--- a/reference/fann/functions/fann-get-cascade-num-candidates.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-num-candidates" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_num_candidates</refname>
-  <refpurpose>Returns the number of candidates used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_num_candidates</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of candidates used during training (calculated by multiplying
-   <function>fann_get_cascade_activation_functions_count</function>,
-   <function>fann_get_cascade_activation_steepnesses_count</function> and
-   <function>fann_get_cascade_num_candidate_groups</function>).
-  </para>
-  <para>
-   The actual candidates is defined by the <function>fann_get_cascade_activation_functions</function> and
-   <function>fann_get_cascade_activation_steepnesses</function> arrays. These arrays define the activation functions and
-   activation steepnesses used for the candidate neurons. If there are 2 activation functions in the activation function array and
-   3 steepnesses in the steepness array, then there will be 2x3=6 different candidates which will be trained. These 6 different
-   candidates can be copied into several candidate groups, where the only difference between these groups is the initial weights.
-   If the number of groups is set to 2, then the number of candidate neurons will be 2x3x2=12.
-   The number of candidate groups is defined by <function>fann_set_cascade_num_candidate_groups</function>.
-  </para>
-  <para>
-   The default number of candidates is 6x4x2 = 48
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of candidates used during training, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_functions</function></member>
-    <member><function>fann_get_cascade_activation_functions_count</function></member>
-    <member><function>fann_get_cascade_activation_steepnesses</function></member>
-    <member><function>fann_get_cascade_activation_steepnesses_count</function></member>
-    <member><function>fann_get_cascade_num_candidate_groups</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/fann/functions/fann-get-cascade-output-change-fraction.xml b/reference/fann/functions/fann-get-cascade-output-change-fraction.xml
deleted file mode 100644
index 27f5cc48a863..000000000000
--- a/reference/fann/functions/fann-get-cascade-output-change-fraction.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-output-change-fraction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_output_change_fraction</refname>
-  <refpurpose>Returns the cascade output change fraction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_cascade_output_change_fraction</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The cascade output change fraction is a number between 0 and 1 determining how large a fraction of the <function>fann_get_MSE</function>
-   value should change within <function>fann_get_cascade_output_stagnation_epochs</function> during training of the output connections,
-   in order for the training not to stagnate. If the training stagnates, the training of the output connections
-   will be ended and new candidates will be prepared.
-  </para>
-  <para>
-   It means that if the MSE does not change by a fraction of <function>fann_get_cascade_output_change_fraction</function> during
-   a period of <function>fann_get_cascade_output_stagnation_epochs</function>, the training of the output connections is
-   stopped because the training has stagnated.
-  </para>
-  <para>
-   If the cascade output change fraction is low, the output connections will be trained more and if the fraction is high,
-   they will be trained less.
-  </para>
-  <simpara>
-   The default cascade output change fraction is 0.01, which is equivalent to a 1% change in MSE.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The cascade output change fraction, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_output_change_fraction</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_get_cascade_output_stagnation_epochs</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/fann/functions/fann-get-cascade-output-stagnation-epochs.xml b/reference/fann/functions/fann-get-cascade-output-stagnation-epochs.xml
deleted file mode 100644
index 2456714c780f..000000000000
--- a/reference/fann/functions/fann-get-cascade-output-stagnation-epochs.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-output-stagnation-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_output_stagnation_epochs</refname>
-  <refpurpose>Returns the number of cascade output stagnation epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_cascade_output_stagnation_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The number of cascade output stagnation epochs determines the number of epochs training is allowed to continue
-   without changing the MSE by a fraction of <function>fann_get_cascade_output_change_fraction</function>.
-  </para>
-  <para>
-   See more info about this parameter in <function>fann_get_cascade_output_change_fraction</function>.
-  </para>
-  <para>
-   The default number of cascade output stagnation epochs is 12.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of cascade output stagnation epochs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_output_stagnation_epochs</function></member>
-    <member><function>fann_get_cascade_output_change_fraction</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/fann/functions/fann-get-cascade-weight-multiplier.xml b/reference/fann/functions/fann-get-cascade-weight-multiplier.xml
deleted file mode 100644
index 05832c9c6812..000000000000
--- a/reference/fann/functions/fann-get-cascade-weight-multiplier.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-cascade-weight-multiplier" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_cascade_weight_multiplier</refname>
-  <refpurpose>Returns the weight multiplier</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_cascade_weight_multiplier</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The weight multiplier is a parameter which is used to multiply the weights from the candidate neuron before adding
-   the neuron to the neural network. This parameter is usually between 0 and 1, and is used to make the training a bit less aggressive.
-  </para>
-  <para>
-   The default weight multiplier is 0.4.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The weight multiplier, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_cascade_weight_multiplier</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/fann/functions/fann-get-connection-array.xml b/reference/fann/functions/fann-get-connection-array.xml
deleted file mode 100644
index d883dcc5aa6a..000000000000
--- a/reference/fann/functions/fann-get-connection-array.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-connection-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_connection_array</refname>
-  <refpurpose>Get connections in the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_get_connection_array</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get connections in the network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of connections in the network
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-connection-rate.xml b/reference/fann/functions/fann-get-connection-rate.xml
deleted file mode 100644
index 8564cde9094b..000000000000
--- a/reference/fann/functions/fann-get-connection-rate.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-connection-rate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_connection_rate</refname>
-  <refpurpose>Get the connection rate used when the network was created</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_connection_rate</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the connection rate used when the network was created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The connection rate used when the network was created, or &false; on error.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-errno.xml b/reference/fann/functions/fann-get-errno.xml
deleted file mode 100644
index 7412ba6e254b..000000000000
--- a/reference/fann/functions/fann-get-errno.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-errno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_errno</refname>
-  <refpurpose>Returns the last error number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_errno</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the last error number.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-     &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The error number, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_reset_errno</function></member>
-    <member><function>fann_get_errstr</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/fann/functions/fann-get-errstr.xml b/reference/fann/functions/fann-get-errstr.xml
deleted file mode 100644
index e353761d94b6..000000000000
--- a/reference/fann/functions/fann-get-errstr.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-errstr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_errstr</refname>
-  <refpurpose>Returns the last errstr</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fann_get_errstr</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the last errstr.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-     &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The last error string, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_reset_errstr</function></member>
-    <member><function>fann_get_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/fann/functions/fann-get-layer-array.xml b/reference/fann/functions/fann-get-layer-array.xml
deleted file mode 100644
index f56aa7377a0b..000000000000
--- a/reference/fann/functions/fann-get-layer-array.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-layer-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_layer_array</refname>
-  <refpurpose>Get the number of neurons in each layer in the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_get_layer_array</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of neurons in each layer in the neural network.
-  </para>
-  <para>
-   Bias is not included so the layers match the fann_create functions.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array of numbers of neurons in each layer
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-learning-momentum.xml b/reference/fann/functions/fann-get-learning-momentum.xml
deleted file mode 100644
index 107acdda1338..000000000000
--- a/reference/fann/functions/fann-get-learning-momentum.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-learning-momentum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_learning_momentum</refname>
-  <refpurpose>Returns the learning momentum</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_learning_momentum</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The learning momentum can be used to speed up <constant>FANN_TRAIN_INCREMENTAL</constant> training.
-   A too high momentum will however not benefit training. Setting momentum to 0 will be the same as
-   not using the momentum parameter. The recommended value of this parameter is between 0.0 and 1.0.
-  </para>
-  <para>
-   The default momentum is 0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
-  <para>
-   The learning momentum, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_learning_momentum</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-get-learning-rate.xml b/reference/fann/functions/fann-get-learning-rate.xml
deleted file mode 100644
index 436c28c8ccc1..000000000000
--- a/reference/fann/functions/fann-get-learning-rate.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-learning-rate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_learning_rate</refname>
-  <refpurpose>Returns the learning rate</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_learning_rate</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The learning rate is used to determine how aggressive training should be for some of the training algorithms
-   (<constant>FANN_TRAIN_INCREMENTAL</constant>, <constant>FANN_TRAIN_BATCH</constant>, <constant>FANN_TRAIN_QUICKPROP</constant>).
-   Do however note that it is not used in <constant>FANN_TRAIN_RPROP</constant>.
-  </para>
-  <para>
-   The default learning rate is 0.7.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The learning rate, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_learning_rate</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-get-mse.xml b/reference/fann/functions/fann-get-mse.xml
deleted file mode 100644
index f426cf7ae5ea..000000000000
--- a/reference/fann/functions/fann-get-mse.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-mse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_MSE</refname>
-  <refpurpose>Reads the mean square error from the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_MSE</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads the mean square error from the network.
-  </para>
-  <para>
-   Reads the mean square error from the network. This value is calculated during training or testing and can therefore
-   sometimes be a bit off if the weights have been changed since the last calculation of the value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The mean square error, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_test_data</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/fann/functions/fann-get-network-type.xml b/reference/fann/functions/fann-get-network-type.xml
deleted file mode 100644
index acc17c4610cc..000000000000
--- a/reference/fann/functions/fann-get-network-type.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-network-type" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_network_type</refname>
-  <refpurpose>Get the type of neural network it was created as</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_network_type</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the type of neural network it was created as.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    <link linkend="constants.fann-nettype">Network type</link> constant, or &false; on error.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-num-input.xml b/reference/fann/functions/fann-get-num-input.xml
deleted file mode 100644
index a6ddb561cddd..000000000000
--- a/reference/fann/functions/fann-get-num-input.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-num-input" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_num_input</refname>
-  <refpurpose>Get the number of input neurons</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_num_input</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of input neurons.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of input neurons, or &false; on error
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-num-layers.xml b/reference/fann/functions/fann-get-num-layers.xml
deleted file mode 100644
index 3ad2c4f7faeb..000000000000
--- a/reference/fann/functions/fann-get-num-layers.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-num-layers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_num_layers</refname>
-  <refpurpose>Get the number of layers in the neural network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_num_layers</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of layers in the neural network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of layers in the neural network, or &false; on error.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-num-output.xml b/reference/fann/functions/fann-get-num-output.xml
deleted file mode 100644
index 7430ddb64236..000000000000
--- a/reference/fann/functions/fann-get-num-output.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-num-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_num_output</refname>
-  <refpurpose>Get the number of output neurons</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_num_output</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the number of output neurons.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of output neurons, or &false; on error
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-quickprop-decay.xml b/reference/fann/functions/fann-get-quickprop-decay.xml
deleted file mode 100644
index dfb72706a8ff..000000000000
--- a/reference/fann/functions/fann-get-quickprop-decay.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-quickprop-decay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_quickprop_decay</refname>
-  <refpurpose>Returns the decay which is a factor that weights should decrease in each iteration during quickprop training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_quickprop_decay</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The decay is a small negative valued number which is a factor that the weights should decrease in each iteration
-   during quickprop training. This is used to make sure that the weights do not become too high during training.
-  </para>
-  <para>
-   The default decay is -0.0001.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The decay, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_quickprop_decay</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/fann/functions/fann-get-quickprop-mu.xml b/reference/fann/functions/fann-get-quickprop-mu.xml
deleted file mode 100644
index a64d7f7407b6..000000000000
--- a/reference/fann/functions/fann-get-quickprop-mu.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-quickprop-mu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_quickprop_mu</refname>
-  <refpurpose>Returns the mu factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_quickprop_mu</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The mu factor is used to increase and decrease the step-size during quickprop training. The mu factor should always be above 1,
-   since it would otherwise decrease the step-size when it was suppose to increase it.
-  </para>
-  <para>
-   The default mu factor is 1.75.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The mu factor, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_quickprop_mu</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/fann/functions/fann-get-rprop-decrease-factor.xml b/reference/fann/functions/fann-get-rprop-decrease-factor.xml
deleted file mode 100644
index 78cdf3fe9635..000000000000
--- a/reference/fann/functions/fann-get-rprop-decrease-factor.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-rprop-decrease-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_rprop_decrease_factor</refname>
-  <refpurpose>Returns the decrease factor used during RPROP training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_rprop_decrease_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The decrease factor is a value smaller than 1, which is used to decrease the step-size during RPROP training.
-  </para>
-  <para>
-   The default decrease factor is 0.5.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The decrease factor, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_rprop_decrease_factor</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/fann/functions/fann-get-rprop-delta-max.xml b/reference/fann/functions/fann-get-rprop-delta-max.xml
deleted file mode 100644
index 54dca2db9e34..000000000000
--- a/reference/fann/functions/fann-get-rprop-delta-max.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-rprop-delta-max" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_rprop_delta_max</refname>
-  <refpurpose>Returns the maximum step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_rprop_delta_max</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The maximum step-size is a positive number determining how large the maximum step-size may be.
-  </para>
-  <para>
-   The default delta max is 50.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The maximum step-size, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_rprop_delta_max</function></member>
-    <member><function>fann_get_rprop_delta_min</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/fann/functions/fann-get-rprop-delta-min.xml b/reference/fann/functions/fann-get-rprop-delta-min.xml
deleted file mode 100644
index 560d295292c8..000000000000
--- a/reference/fann/functions/fann-get-rprop-delta-min.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-rprop-delta-min" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_rprop_delta_min</refname>
-  <refpurpose>Returns the minimum step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_rprop_delta_min</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The minimum step-size is a small positive number determining how small the minimum step-size may be.
-  </para>
-  <para>
-   The default value delta min is 0.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The minimum step-size, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_rprop_delta_min</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/fann/functions/fann-get-rprop-delta-zero.xml b/reference/fann/functions/fann-get-rprop-delta-zero.xml
deleted file mode 100644
index 182ef0a44890..000000000000
--- a/reference/fann/functions/fann-get-rprop-delta-zero.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-rprop-delta-zero" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_rprop_delta_zero</refname>
-  <refpurpose>Returns the initial step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_rprop_delta_zero</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The initial step-size is a positive number determining the initial step size.
-  </para>
-  <para>
-   The default delta zero is 0.1.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The initial step-size, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_rprop_delta_zero</function></member>
-    <member><function>fann_get_rprop_delta_min</function></member>
-    <member><function>fann_get_rprop_delta_max</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/fann/functions/fann-get-rprop-increase-factor.xml b/reference/fann/functions/fann-get-rprop-increase-factor.xml
deleted file mode 100644
index 7a433b02c76e..000000000000
--- a/reference/fann/functions/fann-get-rprop-increase-factor.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-rprop-increase-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_rprop_increase_factor</refname>
-  <refpurpose>Returns the increase factor used during RPROP training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_rprop_increase_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The increase factor is a value larger than 1, which is used to increase the step-size during RPROP training.
-  </para>
-  <para>
-   The default increase factor is 1.2.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The increase factor, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_rprop_increase_factor</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/fann/functions/fann-get-sarprop-step-error-shift.xml b/reference/fann/functions/fann-get-sarprop-step-error-shift.xml
deleted file mode 100644
index aade12f78d2d..000000000000
--- a/reference/fann/functions/fann-get-sarprop-step-error-shift.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-sarprop-step-error-shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_sarprop_step_error_shift</refname>
-  <refpurpose>Returns the sarprop step error shift</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_sarprop_step_error_shift</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the sarprop step error shift.
-  </para>
-  <para>
-   The default step error shift is 1.385.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The sarprop step error shift , or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_sarprop_step_error_shift</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/fann/functions/fann-get-sarprop-step-error-threshold-factor.xml b/reference/fann/functions/fann-get-sarprop-step-error-threshold-factor.xml
deleted file mode 100644
index 62ba4170c1a0..000000000000
--- a/reference/fann/functions/fann-get-sarprop-step-error-threshold-factor.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-sarprop-step-error-threshold-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_sarprop_step_error_threshold_factor</refname>
-  <refpurpose>Returns the sarprop step error threshold factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_sarprop_step_error_threshold_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The sarprop step error threshold factor.
-  </para>
-  <para>
-   The default factor is 0.1.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The sarprop step error threshold factor, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_sarprop_step_error_threshold_factor</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/fann/functions/fann-get-sarprop-temperature.xml b/reference/fann/functions/fann-get-sarprop-temperature.xml
deleted file mode 100644
index f4371a722dc4..000000000000
--- a/reference/fann/functions/fann-get-sarprop-temperature.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-sarprop-temperature" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_sarprop_temperature</refname>
-  <refpurpose>Returns the sarprop temperature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_sarprop_temperature</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the sarprop temperature.
-  </para>
-  <para>
-   The default temperature is 0.015.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The sarprop temperature, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_sarprop_temperature</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/fann/functions/fann-get-sarprop-weight-decay-shift.xml b/reference/fann/functions/fann-get-sarprop-weight-decay-shift.xml
deleted file mode 100644
index 226ac5ec5c63..000000000000
--- a/reference/fann/functions/fann-get-sarprop-weight-decay-shift.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-sarprop-weight-decay-shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_sarprop_weight_decay_shift</refname>
-  <refpurpose>Returns the sarprop weight decay shift</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_get_sarprop_weight_decay_shift</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The sarprop weight decay shift.
-  </para>
-  <para>
-   The default delta max is -6.644.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The sarprop weight decay shift, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_sarprop_weight_decay_shift</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/fann/functions/fann-get-total-connections.xml b/reference/fann/functions/fann-get-total-connections.xml
deleted file mode 100644
index a3e38b3531bb..000000000000
--- a/reference/fann/functions/fann-get-total-connections.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-total-connections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_total_connections</refname>
-  <refpurpose>Get the total number of connections in the entire network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_total_connections</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the total number of connections in the entire network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Total number of connections in the entire network, or &false; on error
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-total-neurons.xml b/reference/fann/functions/fann-get-total-neurons.xml
deleted file mode 100644
index 45739d2f127e..000000000000
--- a/reference/fann/functions/fann-get-total-neurons.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-total-neurons" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_total_neurons</refname>
-  <refpurpose>Get the total number of neurons in the entire network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_total_neurons</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the total number of neurons in the entire network. This number does also include the bias neurons,
-   so a 2-4-2 network has 2+4+2 +2(bias) = 10 neurons.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Total number of neurons in the entire network, or &false; on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-get-train-error-function.xml b/reference/fann/functions/fann-get-train-error-function.xml
deleted file mode 100644
index 1bc0cc8b410e..000000000000
--- a/reference/fann/functions/fann-get-train-error-function.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-train-error-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_train_error_function</refname>
-  <refpurpose>Returns the error function used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_train_error_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the error function used during training.
-  </para>
-  <para>
-   The error functions are described further in <link linkend="constants.fann-errorfunc">error functions</link> constants.
-  </para>
-  <para>
-   The default error function is <constant>FANN_ERRORFUNC_TANH</constant>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The <link linkend="constants.fann-errorfunc">error function</link> constant, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_train_error_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/fann/functions/fann-get-train-stop-function.xml b/reference/fann/functions/fann-get-train-stop-function.xml
deleted file mode 100644
index 348aebdd89ca..000000000000
--- a/reference/fann/functions/fann-get-train-stop-function.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-train-stop-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_train_stop_function</refname>
-  <refpurpose>Returns the stop function used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_train_stop_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the stop function used during training.
-  </para>
-  <para>
-   The stop functions are described further in <link linkend="constants.fann-stopfunc">stop functions</link> constants.
-  </para>
-  <para>
-   The default stop function is <constant>FANN_STOPFUNC_MSE</constant>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The <link linkend="constants.fann-stopfunc">stop function</link> constant, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_train_stop_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/fann/functions/fann-get-training-algorithm.xml b/reference/fann/functions/fann-get-training-algorithm.xml
deleted file mode 100644
index 19f6f923cee6..000000000000
--- a/reference/fann/functions/fann-get-training-algorithm.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-get-training-algorithm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_get_training_algorithm</refname>
-  <refpurpose>Returns the training algorithm</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_get_training_algorithm</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the training algorithm. This training algorithm is used by <function>fann_train_on_data</function> and associated functions.
-  </para>
-  <para>
-   Note that this algorithm is also used during <function>fann_cascadetrain_on_data</function>, although only
-   <constant>FANN_TRAIN_RPROP</constant> and <constant>FANN_TRAIN_QUICKPROP</constant> is allowed during cascade training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <link linkend="constants.fann-train">Training algorithm</link> constant, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-init-weights.xml b/reference/fann/functions/fann-init-weights.xml
deleted file mode 100644
index fa90b10d4d6d..000000000000
--- a/reference/fann/functions/fann-init-weights.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-init-weights" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_init_weights</refname>
-  <refpurpose>Initialize the weights using Widrow + Nguyen’s algorithm</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_init_weights</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Initialize the weights using Widrow + Nguyen’s algorithm.
-  </para>
-  <para>
-   This function behaves similarly to <function>fann_randomize_weights</function>. It will use the algorithm developed by
-   Derrick Nguyen and Bernard Widrow to set the weights in such a way as to speed up training. This technique is not always
-   successful, and in some cases can be less efficient than a purely random initialization.
-  </para>
-  <para>
-   The algorithm requires access to the range of the input data (for example largest and smallest input), and therefore
-   accepts a second argument, data, which is the training data that will be used to train the network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_randomize_weights</function></member>
-    <member><function>fann_read_train_from_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/fann/functions/fann-length-train-data.xml b/reference/fann/functions/fann-length-train-data.xml
deleted file mode 100644
index 3076f0f12ce6..000000000000
--- a/reference/fann/functions/fann-length-train-data.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-length-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_length_train_data</refname>
-  <refpurpose>Returns the number of training patterns in the train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_length_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of training patterns in the train data <type>resource</type>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of elements in the train data <type>resource</type>, or &false; on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-merge-train-data.xml b/reference/fann/functions/fann-merge-train-data.xml
deleted file mode 100644
index ec2d3dda99b4..000000000000
--- a/reference/fann/functions/fann-merge-train-data.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-merge-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_merge_train_data</refname>
-  <refpurpose>Merges the train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_merge_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data1</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>data2</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges the data from data1 and data2 into a new train data <type>resource</type>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data1</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data2</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   New merged train data <type>resource</type>, or &false; on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-num-input-train-data.xml b/reference/fann/functions/fann-num-input-train-data.xml
deleted file mode 100644
index 9120aee908aa..000000000000
--- a/reference/fann/functions/fann-num-input-train-data.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-num-input-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_num_input_train_data</refname>
-  <refpurpose>Returns the number of inputs in each of the training patterns in the train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_num_input_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of inputs in each of the training patterns in the train data <type>resource</type>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The number of inputs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_length_train_data</function></member>
-    <member><function>fann_num_output_train_data</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/fann/functions/fann-num-output-train-data.xml b/reference/fann/functions/fann-num-output-train-data.xml
deleted file mode 100644
index 7c784faf07ca..000000000000
--- a/reference/fann/functions/fann-num-output-train-data.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-num-output-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_num_output_train_data</refname>
-  <refpurpose>Returns the number of outputs in each of the training patterns in the train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fann_num_output_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of outputs in each of the training patterns in the train data <type>resource</type>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of outputs, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_length_train_data</function></member>
-    <member><function>fann_num_input_train_data</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/fann/functions/fann-print-error.xml b/reference/fann/functions/fann-print-error.xml
deleted file mode 100644
index 8762bd01982b..000000000000
--- a/reference/fann/functions/fann-print-error.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-print-error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_print_error</refname>
-  <refpurpose>Prints the error string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fann_print_error</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Prints the error string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-      &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.void;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_errstr</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/fann/functions/fann-randomize-weights.xml b/reference/fann/functions/fann-randomize-weights.xml
deleted file mode 100644
index 52cbea8cd97d..000000000000
--- a/reference/fann/functions/fann-randomize-weights.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-randomize-weights" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_randomize_weights</refname>
-  <refpurpose>Give each connection a random weight between min_weight and max_weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_randomize_weights</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>min_weight</parameter></methodparam>
-   <methodparam><type>float</type><parameter>max_weight</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Give each connection a random weight between <parameter>min_weight</parameter> and <parameter>max_weight</parameter>
-  </para>
-  <para>
-   From the beginning the weights are random between -0.1 and 0.1.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>min_weight</parameter></term>
-    <listitem>
-     <para>
-      Minimum weight value
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_weight</parameter></term>
-    <listitem>
-     <para>
-      Maximum weight value
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_init_weights</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/fann/functions/fann-read-train-from-file.xml b/reference/fann/functions/fann-read-train-from-file.xml
deleted file mode 100644
index 4780e144ed88..000000000000
--- a/reference/fann/functions/fann-read-train-from-file.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-read-train-from-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_read_train_from_file</refname>
-  <refpurpose>Reads a file that stores training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_read_train_from_file</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads a file that stores training data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The input file in the following format:
-     </para>
-     <programlisting role="txt">
-<![CDATA[
-num_train_data num_input num_output
-inputdata separated by space
-outputdata separated by space
-
-.
-.
-.
-
-inputdata separated by space
-outputdata separated by space
-]]>
-     </programlisting>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.train;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>fann_read_train_from_file</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$train_data = fann_read_train_from_file("xor.data");
-if ($train_data) {
-    // Do something with $train_data for XOR function
-}
-?>
-]]>
-    </programlisting>
-    <para>Contents of xor.data</para>
-    <programlisting role="txt">
-<![CDATA[
-4 2 1
--1 -1
--1
--1 1
-1
-1 -1
-1
-1 1
--1
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_destroy_train</function></member>
-    <member><function>fann_save_train</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/fann/functions/fann-reset-errno.xml b/reference/fann/functions/fann-reset-errno.xml
deleted file mode 100644
index 0a977d74e23c..000000000000
--- a/reference/fann/functions/fann-reset-errno.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-reset-errno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_reset_errno</refname>
-  <refpurpose>Resets the last error number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fann_reset_errno</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Resets the last error number.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-     &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.void;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_errno</function></member>
-    <member><function>fann_reset_errstr</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/fann/functions/fann-reset-errstr.xml b/reference/fann/functions/fann-reset-errstr.xml
deleted file mode 100644
index a3b05bf34c18..000000000000
--- a/reference/fann/functions/fann-reset-errstr.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-reset-errstr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_reset_errstr</refname>
-  <refpurpose>Resets the last error string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fann_reset_errstr</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Resets the last error string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-     &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.void;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_errstr</function></member>
-    <member><function>fann_reset_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/fann/functions/fann-reset-mse.xml b/reference/fann/functions/fann-reset-mse.xml
deleted file mode 100644
index 79bc135dd1a3..000000000000
--- a/reference/fann/functions/fann-reset-mse.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-reset-mse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_reset_MSE</refname>
-  <refpurpose>Resets the mean square error from the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_reset_MSE</methodname>
-   <methodparam><type>string</type><parameter>ann</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Resets the mean square error from the network.
-  </para>
-  <para>
-   This function also resets the number of bits that fail.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-      &fann.ann.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_get_bit_fail</function></member>
-    <member><function>fann_get_bit_fail_limit</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/fann/functions/fann-run.xml b/reference/fann/functions/fann-run.xml
deleted file mode 100644
index d1ad08ec4413..000000000000
--- a/reference/fann/functions/fann-run.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-run" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_run</refname>
-  <refpurpose>Will run input through the neural network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_run</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Will run input through the neural network, returning an array of outputs, the number of which being equal
-   to the number of neurons in the output layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <para>
-      Array of input values
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of output values, or &false; on error
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-save-train.xml b/reference/fann/functions/fann-save-train.xml
deleted file mode 100644
index e3974a968b0a..000000000000
--- a/reference/fann/functions/fann-save-train.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-save-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_save_train</refname>
-  <refpurpose>Save the training structure to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_save_train</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Save the training data to a file, with the format as specified in <function>fann_read_train_from_file</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>file_name</parameter></term>
-    <listitem>
-     <para>
-      The file name of the file where training data is saved to.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_read_train_from_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/fann/functions/fann-save.xml b/reference/fann/functions/fann-save.xml
deleted file mode 100644
index 3bccb6a2bd3d..000000000000
--- a/reference/fann/functions/fann-save.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-save" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_save</refname>
-  <refpurpose>Saves the entire network to a configuration file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_save</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>string</type><parameter>configuration_file</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Saves the entire network to a configuration file.
-  </para>
-  <para>
-   The configuration file contains all information about the neural network and enables
-   <function>fann_create_from_file</function> to create an exact copy of the neural network
-   and all of the parameters associated with the neural network.
-  </para>
-  <para>
-   These three parameters (<function>fann_set_callback</function>, <function>fann_set_error_log</function>,
-   <function>fann_set_user_data</function>) are NOT saved to the file because they cannot safely be ported
-   to a different location. Also temporary parameters generated during training like <function>fann_get_MSE</function>
-   is not saved.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>configuration_file</parameter></term>
-    <listitem>
-     <para>
-      The configuration file path.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_create_from_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/fann/functions/fann-scale-input-train-data.xml b/reference/fann/functions/fann-scale-input-train-data.xml
deleted file mode 100644
index 7a1445eb9aa8..000000000000
--- a/reference/fann/functions/fann-scale-input-train-data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-input-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_input_train_data</refname>
-  <refpurpose>Scales the inputs in the training data to the specified range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_input_train_data</methodname>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales the inputs in the training data to the specified range.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_min</parameter></term>
-    <listitem>
-     <para>
-      New minimum after scaling inputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_max</parameter></term>
-    <listitem>
-     <para>
-      New maximum after scaling inputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_output_train_data</function></member>
-    <member><function>fann_scale_train_data</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/fann/functions/fann-scale-input.xml b/reference/fann/functions/fann-scale-input.xml
deleted file mode 100644
index c1f97c26056d..000000000000
--- a/reference/fann/functions/fann-scale-input.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-input" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_input</refname>
-  <refpurpose>Scale data in input vector before feed it to ann based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_input</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input_vector</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scale data in input vector before feed it to ann based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input_vector</parameter></term>
-    <listitem>
-     <para>
-      Input vector that will be scaled
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_descale_input</function></member>
-    <member><function>fann_scale_output</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/fann/functions/fann-scale-output-train-data.xml b/reference/fann/functions/fann-scale-output-train-data.xml
deleted file mode 100644
index 2445dad3d606..000000000000
--- a/reference/fann/functions/fann-scale-output-train-data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-output-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_output_train_data</refname>
-  <refpurpose>Scales the outputs in the training data to the specified range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_output_train_data</methodname>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales the outputs in the training data to the specified range.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_min</parameter></term>
-    <listitem>
-     <para>
-      New minimum after scaling outputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_max</parameter></term>
-    <listitem>
-     <para>
-      New maximum after scaling outputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_input_train_data</function></member>
-    <member><function>fann_scale_train_data</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/fann/functions/fann-scale-output.xml b/reference/fann/functions/fann-scale-output.xml
deleted file mode 100644
index cc3723b520c3..000000000000
--- a/reference/fann/functions/fann-scale-output.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_output</refname>
-  <refpurpose>Scale data in output vector before feed it to ann based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_output</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>output_vector</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scale data in output vector before feed it to ann based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>output_vector</parameter></term>
-    <listitem>
-     <para>
-      Output vector that will be scaled
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_descale_output</function></member>
-    <member><function>fann_scale_input</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/fann/functions/fann-scale-train-data.xml b/reference/fann/functions/fann-scale-train-data.xml
deleted file mode 100644
index ee1196c02841..000000000000
--- a/reference/fann/functions/fann-scale-train-data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_train_data</refname>
-  <refpurpose>Scales the inputs and outputs in the training data to the specified range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_train_data</methodname>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales the inputs and outputs in the training data to the specified range.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_min</parameter></term>
-    <listitem>
-     <para>
-      New minimum after scaling inputs and outputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_max</parameter></term>
-    <listitem>
-     <para>
-      New maximum after scaling inputs and outputs in training data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_scale_output_train_data</function></member>
-    <member><function>fann_scale_input_train_data</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/fann/functions/fann-scale-train.xml b/reference/fann/functions/fann-scale-train.xml
deleted file mode 100644
index db220b473598..000000000000
--- a/reference/fann/functions/fann-scale-train.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-scale-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_scale_train</refname>
-  <refpurpose>Scale input and output data based on previously calculated parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_scale_train</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scale input and output data based on previously calculated parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_descale_train</function></member>
-    <member><function>fann_set_scaling_params</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/fann/functions/fann-set-activation-function-hidden.xml b/reference/fann/functions/fann-set-activation-function-hidden.xml
deleted file mode 100644
index c7441abe0c87..000000000000
--- a/reference/fann/functions/fann-set-activation-function-hidden.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-function-hidden" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_function_hidden</refname>
-  <refpurpose>Sets the activation function for all of the hidden layers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_function_hidden</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>activation_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the activation function for all of the hidden layers.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-activation-funcs">activation functions</link> constant.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function</function></member>
-    <member><function>fann_set_activation_function_layer</function></member>
-    <member><function>fann_set_activation_function_output</function></member>
-    <member><function>fann_set_activation_steepness</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/fann/functions/fann-set-activation-function-layer.xml b/reference/fann/functions/fann-set-activation-function-layer.xml
deleted file mode 100644
index 1fc85e87e8b0..000000000000
--- a/reference/fann/functions/fann-set-activation-function-layer.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-function-layer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_function_layer</refname>
-  <refpurpose>Sets the activation function for all the neurons in the supplied layer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_function_layer</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>activation_function</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the activation function for all the neurons in the layer number <literal>layer</literal>, counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to set activation functions for the neurons in the input layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-activation-funcs">activation functions</link> constant.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function</function></member>
-    <member><function>fann_set_activation_function_hidden</function></member>
-    <member><function>fann_set_activation_function_output</function></member>
-    <member><function>fann_set_activation_steepness</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/fann/functions/fann-set-activation-function-output.xml b/reference/fann/functions/fann-set-activation-function-output.xml
deleted file mode 100644
index d884d4df61fe..000000000000
--- a/reference/fann/functions/fann-set-activation-function-output.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-function-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_function_output</refname>
-  <refpurpose>Sets the activation function for the output layer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_function_output</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>activation_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the activation function for the output layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-activation-funcs">activation functions</link> constant.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function</function></member>
-    <member><function>fann_set_activation_function_layer</function></member>
-    <member><function>fann_set_activation_function_hidden</function></member>
-    <member><function>fann_set_activation_steepness</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/fann/functions/fann-set-activation-function.xml b/reference/fann/functions/fann-set-activation-function.xml
deleted file mode 100644
index e2bad143de7e..000000000000
--- a/reference/fann/functions/fann-set-activation-function.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_function</refname>
-  <refpurpose>Sets the activation function for supplied neuron and layer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>activation_function</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neuron</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the activation function for neuron number <literal>neuron</literal> in layer number
-   <literal>layer</literal>, counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to set activation functions for the neurons in the input layer.
-  </para>
-  <para>
-   When choosing an activation function it is important to note that the activation functions have different range.
-   <constant>FANN_SIGMOID</constant> is e.g. in the 0 - 1 range while <constant>FANN_SIGMOID_SYMMETRIC</constant> is
-   in the -1 - 1 range and <constant>FANN_LINEAR</constant> is unbound.
-  </para>
-  <para>
-   The supplied activation_function value must be
-   one of the <link linkend="constants.fann-activation-funcs">activation functions</link> constants.
-  </para>
-  <para>
-   The return value is one of the <link linkend="constants.fann-train">activation functions</link> constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-activation-funcs">activation functions</link> constant.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neuron</parameter></term>
-    <listitem>
-     <para>
-      Neuron number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_function_layer</function></member>
-    <member><function>fann_set_activation_function_hidden</function></member>
-    <member><function>fann_set_activation_function_output</function></member>
-    <member><function>fann_set_activation_steepness</function></member>
-    <member><function>fann_get_activation_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/fann/functions/fann-set-activation-steepness-hidden.xml b/reference/fann/functions/fann-set-activation-steepness-hidden.xml
deleted file mode 100644
index d8295308e99a..000000000000
--- a/reference/fann/functions/fann-set-activation-steepness-hidden.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-steepness-hidden" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_steepness_hidden</refname>
-  <refpurpose>Sets the steepness of the activation steepness for all neurons in the all hidden layers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_steepness_hidden</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>activation_steepness</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the steepness of the activation steepness for all neurons in the all hidden layers.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_steepness</parameter></term>
-    <listitem>
-     <para>
-      The activation steepness.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_steepness</function></member>
-    <member><function>fann_set_activation_steepness_layer</function></member>
-    <member><function>fann_set_activation_steepness_output</function></member>
-    <member><function>fann_get_activation_steepness</function></member>
-    <member><function>fann_set_activation_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/fann/functions/fann-set-activation-steepness-layer.xml b/reference/fann/functions/fann-set-activation-steepness-layer.xml
deleted file mode 100644
index 535171cbceb1..000000000000
--- a/reference/fann/functions/fann-set-activation-steepness-layer.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-steepness-layer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_steepness_layer</refname>
-  <refpurpose>Sets the activation steepness for all of the neurons in the supplied layer number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_steepness_layer</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>activation_steepness</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the activation steepness for all of the neurons in layer number <literal>layer</literal>,
-   counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to set activation steepness for the neurons in the input layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_steepness</parameter></term>
-    <listitem>
-     <para>
-      The activation steepness.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_steepness</function></member>
-    <member><function>fann_set_activation_steepness_hidden</function></member>
-    <member><function>fann_set_activation_steepness_output</function></member>
-    <member><function>fann_get_activation_steepness</function></member>
-    <member><function>fann_set_activation_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/fann/functions/fann-set-activation-steepness-output.xml b/reference/fann/functions/fann-set-activation-steepness-output.xml
deleted file mode 100644
index 82b33fc476fa..000000000000
--- a/reference/fann/functions/fann-set-activation-steepness-output.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-steepness-output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_steepness_output</refname>
-  <refpurpose>Sets the steepness of the activation steepness in the output layer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_steepness_output</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>activation_steepness</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the steepness of the activation steepness in the output layer.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_steepness</parameter></term>
-    <listitem>
-     <para>
-      The activation steepness.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_steepness</function></member>
-    <member><function>fann_set_activation_steepness_layer</function></member>
-    <member><function>fann_set_activation_steepness_hidden</function></member>
-    <member><function>fann_get_activation_steepness</function></member>
-    <member><function>fann_set_activation_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/fann/functions/fann-set-activation-steepness.xml b/reference/fann/functions/fann-set-activation-steepness.xml
deleted file mode 100644
index 098dc48dcb6b..000000000000
--- a/reference/fann/functions/fann-set-activation-steepness.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-activation-steepness" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_activation_steepness</refname>
-  <refpurpose>Sets the activation steepness for supplied neuron and layer number</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_activation_steepness</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>activation_steepness</parameter></methodparam>
-   <methodparam><type>int</type><parameter>layer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>neuron</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the activation steepness for neuron number <literal>neuron</literal> in layer number <literal>layer</literal>,
-   counting the input layer as layer 0.
-  </para>
-  <para>
-   It is not possible to set activation steepness for the neurons in the input layer.
-  </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 aggressive training.
-  </para>
-  <para>
-   When training neural networks where the output values should be at the extremes
-   (usually 0 and 1, depending on the activation function), a steep activation function can be used (e.g.  1.0).
-  </para>
-  <para>
-   The default activation steepness is 0.5.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>activation_steepness</parameter></term>
-    <listitem>
-     <para>
-      The activation steepness.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layer</parameter></term>
-    <listitem>
-     <para>
-      Layer number.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>neuron</parameter></term>
-    <listitem>
-     <para>
-      Neuron number.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_activation_steepness_layer</function></member>
-    <member><function>fann_set_activation_steepness_hidden</function></member>
-    <member><function>fann_set_activation_steepness_output</function></member>
-    <member><function>fann_get_activation_steepness</function></member>
-    <member><function>fann_set_activation_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/fann/functions/fann-set-bit-fail-limit.xml b/reference/fann/functions/fann-set-bit-fail-limit.xml
deleted file mode 100644
index eba0f2904ead..000000000000
--- a/reference/fann/functions/fann-set-bit-fail-limit.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-bit-fail-limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_bit_fail_limit</refname>
-  <refpurpose>Set the bit fail limit used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_bit_fail_limit</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bit_fail_limit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the bit fail limit used during training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>bit_fail_limit</parameter></term>
-    <listitem>
-     <para>
-      The bit fail limit.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_bit_fail_limit</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/fann/functions/fann-set-callback.xml b/reference/fann/functions/fann-set-callback.xml
deleted file mode 100644
index e73eb3963f75..000000000000
--- a/reference/fann/functions/fann-set-callback.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-callback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_callback</refname>
-  <refpurpose>Sets the callback function for use during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_callback</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the callback function for use during training. It means that it is called from
-   <function>fann_train_on_data</function> or <function>fann_train_on_file</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      The supplied callback function takes following parameters:
-      <simplelist>
-       <member><literal>ann</literal> - The neural network <type>resource</type></member>
-       <member><literal>train</literal> - The train data <type>resource</type>
-        or &null; if called from <function>fann_train_on_file</function></member>
-       <member><literal>max_epochs</literal> - The maximum number of epochs the training should continue</member>
-       <member><literal>epochs_between_reports</literal> - The number of epochs between calling this function</member>
-       <member><literal>desired_error</literal> - The desired <function>fann_get_MSE</function> or
-        <function>fann_get_bit_fail</function>, depending on the stop function chosen by
-        <function>fann_set_train_stop_function</function></member>
-       <member><literal>epochs</literal> - The current epoch</member>
-      </simplelist>
-     </para>
-     <para>
-      The callback should return &true;. If it returns &false;, the training will terminate.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_train_on_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/fann/functions/fann-set-cascade-activation-functions.xml b/reference/fann/functions/fann-set-cascade-activation-functions.xml
deleted file mode 100644
index 95a62a147a54..000000000000
--- a/reference/fann/functions/fann-set-cascade-activation-functions.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-activation-functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_activation_functions</refname>
-  <refpurpose>Sets the array of cascade candidate activation functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_activation_functions</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>cascade_activation_functions</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the array of cascade candidate activation functions.
-  </para>
-  <para>
-   See <function>fann_get_cascade_num_candidates</function> for a description of which candidate neurons will be generated by this array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_activation_functions</parameter></term>
-    <listitem>
-     <para>
-      The array of cascade candidate activation functions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_functions_count</function></member>
-    <member><function>fann_set_cascade_activation_functions</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/fann/functions/fann-set-cascade-activation-steepnesses.xml b/reference/fann/functions/fann-set-cascade-activation-steepnesses.xml
deleted file mode 100644
index 3e9dbddb324e..000000000000
--- a/reference/fann/functions/fann-set-cascade-activation-steepnesses.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-activation-steepnesses" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_activation_steepnesses</refname>
-  <refpurpose>Sets the array of cascade candidate activation steepnesses</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_activation_steepnesses</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>cascade_activation_steepnesses_count</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the array of cascade candidate activation steepnesses.
-  </para>
-  <para>
-   See <function>fann_get_cascade_num_candidates</function> for a description of which candidate neurons will be generated by this array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_activation_steepnesses_count</parameter></term>
-    <listitem>
-     <para>
-      The array of cascade candidate activation steepnesses.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_activation_steepnesses</function></member>
-    <member><function>fann_get_cascade_activation_steepnesses_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/fann/functions/fann-set-cascade-candidate-change-fraction.xml b/reference/fann/functions/fann-set-cascade-candidate-change-fraction.xml
deleted file mode 100644
index 34584f0dfd6e..000000000000
--- a/reference/fann/functions/fann-set-cascade-candidate-change-fraction.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-candidate-change-fraction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_candidate_change_fraction</refname>
-  <refpurpose>Sets the cascade candidate change fraction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_candidate_change_fraction</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>cascade_candidate_change_fraction</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the cascade candidate change fraction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_candidate_change_fraction</parameter></term>
-    <listitem>
-     <para>
-      The cascade candidate change fraction.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_candidate_change_fraction</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/fann/functions/fann-set-cascade-candidate-limit.xml b/reference/fann/functions/fann-set-cascade-candidate-limit.xml
deleted file mode 100644
index ab404a1cd454..000000000000
--- a/reference/fann/functions/fann-set-cascade-candidate-limit.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-candidate-limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_candidate_limit</refname>
-  <refpurpose>Sets the candidate limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_candidate_limit</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>cascade_candidate_limit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the candidate limit.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_candidate_limit</parameter></term>
-    <listitem>
-     <para>
-      The candidate limit.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_candidate_limit</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/fann/functions/fann-set-cascade-candidate-stagnation-epochs.xml b/reference/fann/functions/fann-set-cascade-candidate-stagnation-epochs.xml
deleted file mode 100644
index 0493f3a41241..000000000000
--- a/reference/fann/functions/fann-set-cascade-candidate-stagnation-epochs.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-candidate-stagnation-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_candidate_stagnation_epochs</refname>
-  <refpurpose>Sets the number of cascade candidate stagnation epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_candidate_stagnation_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_candidate_stagnation_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the number of cascade candidate stagnation epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_candidate_stagnation_epochs</parameter></term>
-    <listitem>
-     <para>
-      The number of cascade candidate stagnation epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_candidate_stagnation_epochs</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/fann/functions/fann-set-cascade-max-cand-epochs.xml b/reference/fann/functions/fann-set-cascade-max-cand-epochs.xml
deleted file mode 100644
index 8f0806a692f3..000000000000
--- a/reference/fann/functions/fann-set-cascade-max-cand-epochs.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-max-cand-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_max_cand_epochs</refname>
-  <refpurpose>Sets the max candidate epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_max_cand_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_max_cand_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the max candidate epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_max_cand_epochs</parameter></term>
-    <listitem>
-     <para>
-      The max candidate epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_max_cand_epochs</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/fann/functions/fann-set-cascade-max-out-epochs.xml b/reference/fann/functions/fann-set-cascade-max-out-epochs.xml
deleted file mode 100644
index b563be842895..000000000000
--- a/reference/fann/functions/fann-set-cascade-max-out-epochs.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-max-out-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_max_out_epochs</refname>
-  <refpurpose>Sets the maximum out epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_max_out_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_max_out_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum out epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_max_out_epochs</parameter></term>
-    <listitem>
-     <para>
-      The maximum out epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_max_out_epochs</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/fann/functions/fann-set-cascade-min-cand-epochs.xml b/reference/fann/functions/fann-set-cascade-min-cand-epochs.xml
deleted file mode 100644
index d7efc010ec91..000000000000
--- a/reference/fann/functions/fann-set-cascade-min-cand-epochs.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-min-cand-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_min_cand_epochs</refname>
-  <refpurpose>Sets the min candidate epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_min_cand_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_min_cand_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the min candidate epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_min_cand_epochs</parameter></term>
-    <listitem>
-     <para>
-      The minimum candidate epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_min_cand_epochs</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/fann/functions/fann-set-cascade-min-out-epochs.xml b/reference/fann/functions/fann-set-cascade-min-out-epochs.xml
deleted file mode 100644
index fe44d428ce47..000000000000
--- a/reference/fann/functions/fann-set-cascade-min-out-epochs.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-min-out-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_min_out_epochs</refname>
-  <refpurpose>Sets the minimum out epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_min_out_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_min_out_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the minimum out epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_min_out_epochs</parameter></term>
-    <listitem>
-     <para>
-      The minimum out epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_min_out_epochs</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/fann/functions/fann-set-cascade-num-candidate-groups.xml b/reference/fann/functions/fann-set-cascade-num-candidate-groups.xml
deleted file mode 100644
index 53d24b8619b1..000000000000
--- a/reference/fann/functions/fann-set-cascade-num-candidate-groups.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-num-candidate-groups" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_num_candidate_groups</refname>
-  <refpurpose>Sets the number of candidate groups</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_num_candidate_groups</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_num_candidate_groups</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the number of candidate groups.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_num_candidate_groups</parameter></term>
-    <listitem>
-     <para>
-      The number of candidate groups.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_num_candidate_groups</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/fann/functions/fann-set-cascade-output-change-fraction.xml b/reference/fann/functions/fann-set-cascade-output-change-fraction.xml
deleted file mode 100644
index c9f7a106e937..000000000000
--- a/reference/fann/functions/fann-set-cascade-output-change-fraction.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-output-change-fraction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_output_change_fraction</refname>
-  <refpurpose>Sets the cascade output change fraction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_output_change_fraction</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>cascade_output_change_fraction</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the cascade output change fraction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_output_change_fraction</parameter></term>
-    <listitem>
-     <para>
-      The cascade output change fraction.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_output_change_fraction</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/fann/functions/fann-set-cascade-output-stagnation-epochs.xml b/reference/fann/functions/fann-set-cascade-output-stagnation-epochs.xml
deleted file mode 100644
index 30d9863b3ddb..000000000000
--- a/reference/fann/functions/fann-set-cascade-output-stagnation-epochs.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-output-stagnation-epochs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_output_stagnation_epochs</refname>
-  <refpurpose>Sets the number of cascade output stagnation epochs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_output_stagnation_epochs</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>cascade_output_stagnation_epochs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the number of cascade output stagnation epochs.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_output_stagnation_epochs</parameter></term>
-    <listitem>
-     <para>
-      The number of cascade output stagnation epochs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_output_stagnation_epochs</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/fann/functions/fann-set-cascade-weight-multiplier.xml b/reference/fann/functions/fann-set-cascade-weight-multiplier.xml
deleted file mode 100644
index f05d39979072..000000000000
--- a/reference/fann/functions/fann-set-cascade-weight-multiplier.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-cascade-weight-multiplier" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_cascade_weight_multiplier</refname>
-  <refpurpose>Sets the weight multiplier</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_cascade_weight_multiplier</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>cascade_weight_multiplier</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the weight multiplier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cascade_weight_multiplier</parameter></term>
-    <listitem>
-     <para>
-      The weight multiplier.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_cascade_weight_multiplier</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/fann/functions/fann-set-error-log.xml b/reference/fann/functions/fann-set-error-log.xml
deleted file mode 100644
index 76673d94e59b..000000000000
--- a/reference/fann/functions/fann-set-error-log.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-error-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_error_log</refname>
-  <refpurpose>Sets where the errors are logged to</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fann_set_error_log</methodname>
-   <methodparam><type>resource</type><parameter>errdat</parameter></methodparam>
-   <methodparam><type>string</type><parameter>log_file</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets where the errors are logged to.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errdat</parameter></term>
-    <listitem>
-     &fann.errdat.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>log_file</parameter></term>
-    <listitem>
-     <para>
-      The log file path.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.void;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-set-input-scaling-params.xml b/reference/fann/functions/fann-set-input-scaling-params.xml
deleted file mode 100644
index e7d7e0705c28..000000000000
--- a/reference/fann/functions/fann-set-input-scaling-params.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-input-scaling-params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_input_scaling_params</refname>
-  <refpurpose>Calculate input scaling parameters for future use based on training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_input_scaling_params</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_input_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_input_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculate input scaling parameters for future use based on training data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_input_min</parameter></term>
-    <listitem>
-     <para>
-      The desired lower bound in input data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_input_max</parameter></term>
-    <listitem>
-     <para>
-      The desired upper bound in input data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_output_scaling_params</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/fann/functions/fann-set-learning-momentum.xml b/reference/fann/functions/fann-set-learning-momentum.xml
deleted file mode 100644
index 785aa72ad9ae..000000000000
--- a/reference/fann/functions/fann-set-learning-momentum.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-learning-momentum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_learning_momentum</refname>
-  <refpurpose>Sets the learning momentum</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_learning_momentum</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>learning_momentum</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the learning momentum.
-  </para>
-  <para>
-   More info available in <function>fann_get_learning_momentum</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>learning_momentum</parameter></term>
-    <listitem>
-     <para>
-      The learning momentum.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_learning_momentum</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-set-learning-rate.xml b/reference/fann/functions/fann-set-learning-rate.xml
deleted file mode 100644
index bc5b803e11a7..000000000000
--- a/reference/fann/functions/fann-set-learning-rate.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-learning-rate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_learning_rate</refname>
-  <refpurpose>Sets the learning rate</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_learning_rate</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>learning_rate</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the learning rate.
-  </para>
-  <para>
-   More info available in <function>fann_get_learning_rate</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>learning_rate</parameter></term>
-    <listitem>
-     <para>
-      The learning rate.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_learning_rate</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-set-output-scaling-params.xml b/reference/fann/functions/fann-set-output-scaling-params.xml
deleted file mode 100644
index f5f3bb05c94a..000000000000
--- a/reference/fann/functions/fann-set-output-scaling-params.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-output-scaling-params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_output_scaling_params</refname>
-  <refpurpose>Calculate output scaling parameters for future use based on training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_output_scaling_params</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_output_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_output_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculate output scaling parameters for future use based on training data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_output_min</parameter></term>
-    <listitem>
-     <para>
-      The desired lower bound in output data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_output_max</parameter></term>
-    <listitem>
-     <para>
-      The desired upper bound in output data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_input_scaling_params</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/fann/functions/fann-set-quickprop-decay.xml b/reference/fann/functions/fann-set-quickprop-decay.xml
deleted file mode 100644
index 49b2f76b24fd..000000000000
--- a/reference/fann/functions/fann-set-quickprop-decay.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-quickprop-decay" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_quickprop_decay</refname>
-  <refpurpose>Sets the quickprop decay factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_quickprop_decay</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>quickprop_decay</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the quickprop decay factor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>quickprop_decay</parameter></term>
-    <listitem>
-     <para>
-      The quickprop decay factor.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_quickprop_decay</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/fann/functions/fann-set-quickprop-mu.xml b/reference/fann/functions/fann-set-quickprop-mu.xml
deleted file mode 100644
index 6060276fa45c..000000000000
--- a/reference/fann/functions/fann-set-quickprop-mu.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-quickprop-mu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_quickprop_mu</refname>
-  <refpurpose>Sets the quickprop mu factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_quickprop_mu</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>quickprop_mu</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the quickprop mu factor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>quickprop_mu</parameter></term>
-    <listitem>
-     <para>
-      The mu factor.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_quickprop_mu</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/fann/functions/fann-set-rprop-decrease-factor.xml b/reference/fann/functions/fann-set-rprop-decrease-factor.xml
deleted file mode 100644
index 173e49ae11a8..000000000000
--- a/reference/fann/functions/fann-set-rprop-decrease-factor.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-rprop-decrease-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_rprop_decrease_factor</refname>
-  <refpurpose>Sets the decrease factor used during RPROP training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_rprop_decrease_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rprop_decrease_factor</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the decrease factor used during RPROP training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rprop_decrease_factor</parameter></term>
-    <listitem>
-     <para>
-      The decrease factor.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_rprop_decrease_factor</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/fann/functions/fann-set-rprop-delta-max.xml b/reference/fann/functions/fann-set-rprop-delta-max.xml
deleted file mode 100644
index dc4b443900e5..000000000000
--- a/reference/fann/functions/fann-set-rprop-delta-max.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-rprop-delta-max" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_rprop_delta_max</refname>
-  <refpurpose>Sets the maximum step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_rprop_delta_max</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rprop_delta_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The maximum step-size is a positive number determining how large the maximum step-size may be.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rprop_delta_max</parameter></term>
-    <listitem>
-     <para>
-      The maximum step-size.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_rprop_delta_max</function></member>
-    <member><function>fann_get_rprop_delta_min</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/fann/functions/fann-set-rprop-delta-min.xml b/reference/fann/functions/fann-set-rprop-delta-min.xml
deleted file mode 100644
index 79702e47ba45..000000000000
--- a/reference/fann/functions/fann-set-rprop-delta-min.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-rprop-delta-min" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_rprop_delta_min</refname>
-  <refpurpose>Sets the minimum step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_rprop_delta_min</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rprop_delta_min</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The minimum step-size is a small positive number determining how small the minimum step-size may be.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rprop_delta_min</parameter></term>
-    <listitem>
-     <para>
-      The minimum step-size.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_rprop_delta_min</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/fann/functions/fann-set-rprop-delta-zero.xml b/reference/fann/functions/fann-set-rprop-delta-zero.xml
deleted file mode 100644
index f47e0f149a75..000000000000
--- a/reference/fann/functions/fann-set-rprop-delta-zero.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-rprop-delta-zero" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_rprop_delta_zero</refname>
-  <refpurpose>Sets the initial step-size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_rprop_delta_zero</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rprop_delta_zero</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The initial step-size is a positive number determining the initial step size.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rprop_delta_zero</parameter></term>
-    <listitem>
-     <para>
-      The initial step-size.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_rprop_delta_zero</function></member>
-    <member><function>fann_get_rprop_delta_min</function></member>
-    <member><function>fann_get_rprop_delta_max</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/fann/functions/fann-set-rprop-increase-factor.xml b/reference/fann/functions/fann-set-rprop-increase-factor.xml
deleted file mode 100644
index 07b1869862dc..000000000000
--- a/reference/fann/functions/fann-set-rprop-increase-factor.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-rprop-increase-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_rprop_increase_factor</refname>
-  <refpurpose>Sets the increase factor used during RPROP training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_rprop_increase_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rprop_increase_factor</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the increase factor used during RPROP training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rprop_increase_factor</parameter></term>
-    <listitem>
-     <para>
-      The increase factor.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_rprop_increase_factor</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/fann/functions/fann-set-sarprop-step-error-shift.xml b/reference/fann/functions/fann-set-sarprop-step-error-shift.xml
deleted file mode 100644
index 7fc21fc90bc0..000000000000
--- a/reference/fann/functions/fann-set-sarprop-step-error-shift.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-sarprop-step-error-shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_sarprop_step_error_shift</refname>
-  <refpurpose>Sets the sarprop step error shift</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_sarprop_step_error_shift</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sarprop_step_error_shift</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the sarprop step error shift.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sarprop_step_error_shift</parameter></term>
-    <listitem>
-     <para>
-      The sarprop step error shift.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_sarprop_step_error_shift</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/fann/functions/fann-set-sarprop-step-error-threshold-factor.xml b/reference/fann/functions/fann-set-sarprop-step-error-threshold-factor.xml
deleted file mode 100644
index f4b2a5512354..000000000000
--- a/reference/fann/functions/fann-set-sarprop-step-error-threshold-factor.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-sarprop-step-error-threshold-factor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_sarprop_step_error_threshold_factor</refname>
-  <refpurpose>Sets the sarprop step error threshold factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_sarprop_step_error_threshold_factor</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sarprop_step_error_threshold_factor</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the sarprop step error threshold factor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sarprop_step_error_threshold_factor</parameter></term>
-    <listitem>
-     <para>
-      The sarprop step error threshold factor.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_sarprop_step_error_threshold_factor</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/fann/functions/fann-set-sarprop-temperature.xml b/reference/fann/functions/fann-set-sarprop-temperature.xml
deleted file mode 100644
index 7756ab3f7e7c..000000000000
--- a/reference/fann/functions/fann-set-sarprop-temperature.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-sarprop-temperature" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_sarprop_temperature</refname>
-  <refpurpose>Sets the sarprop temperature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_sarprop_temperature</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sarprop_temperature</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the sarprop temperature.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sarprop_temperature</parameter></term>
-    <listitem>
-     <para>
-      The sarprop temperature.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
-  </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_sarprop_temperature</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/fann/functions/fann-set-sarprop-weight-decay-shift.xml b/reference/fann/functions/fann-set-sarprop-weight-decay-shift.xml
deleted file mode 100644
index f21916f3d1f9..000000000000
--- a/reference/fann/functions/fann-set-sarprop-weight-decay-shift.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-sarprop-weight-decay-shift" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_sarprop_weight_decay_shift</refname>
-  <refpurpose>Sets the sarprop weight decay shift</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_sarprop_weight_decay_shift</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sarprop_weight_decay_shift</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the sarprop weight decay shift.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sarprop_weight_decay_shift</parameter></term>
-    <listitem>
-     <para>
-      The sarprop weight decay shift.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &fann.note.function.fann-2.2;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_sarprop_weight_decay_shift</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/fann/functions/fann-set-scaling-params.xml b/reference/fann/functions/fann-set-scaling-params.xml
deleted file mode 100644
index c6b7db44c09e..000000000000
--- a/reference/fann/functions/fann-set-scaling-params.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-scaling-params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_scaling_params</refname>
-  <refpurpose>Calculate input and output scaling parameters for future use based on training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_scaling_params</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_input_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_input_max</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_output_min</parameter></methodparam>
-   <methodparam><type>float</type><parameter>new_output_max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculate input and output scaling parameters for future use based on training data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_input_min</parameter></term>
-    <listitem>
-     <para>
-      The desired lower bound in input data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_input_max</parameter></term>
-    <listitem>
-     <para>
-      The desired upper bound in input data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_output_min</parameter></term>
-    <listitem>
-     <para>
-      The desired lower bound in output data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_output_max</parameter></term>
-    <listitem>
-     <para>
-      The desired upper bound in output data after scaling (not strictly followed)
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_set_input_scaling_params</function></member>
-    <member><function>fann_set_output_scaling_params</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/fann/functions/fann-set-train-error-function.xml b/reference/fann/functions/fann-set-train-error-function.xml
deleted file mode 100644
index a275e1a63d2f..000000000000
--- a/reference/fann/functions/fann-set-train-error-function.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-train-error-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_train_error_function</refname>
-  <refpurpose>Sets the error function used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_train_error_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>error_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the error function used during training.
-  </para>
-  <para>
-   The error functions are described further in <link linkend="constants.fann-errorfunc">error functions</link> constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-errorfunc">error function</link> constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_train_error_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/fann/functions/fann-set-train-stop-function.xml b/reference/fann/functions/fann-set-train-stop-function.xml
deleted file mode 100644
index abed909f87c5..000000000000
--- a/reference/fann/functions/fann-set-train-stop-function.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-train-stop-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_train_stop_function</refname>
-  <refpurpose>Sets the stop function used during training</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_train_stop_function</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>stop_function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the stop function used during training.
-  </para>
-  <para>
-   The stop functions are described further in <link linkend="constants.fann-stopfunc">stop functions</link> constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stop_function</parameter></term>
-    <listitem>
-     <para>
-      The <link linkend="constants.fann-stopfunc">stop function</link> constant.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_train_stop_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/fann/functions/fann-set-training-algorithm.xml b/reference/fann/functions/fann-set-training-algorithm.xml
deleted file mode 100644
index 8cde682ceeef..000000000000
--- a/reference/fann/functions/fann-set-training-algorithm.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-training-algorithm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_training_algorithm</refname>
-  <refpurpose>Sets the training algorithm</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_training_algorithm</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>training_algorithm</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the training algorithm.
-  </para>
-  <para>
-   More info available in <function>fann_get_training_algorithm</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>training_algorithm</parameter></term>
-    <listitem>
-     <para>
-      <link linkend="constants.fann-train">Training algorithm</link> constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_get_training_algorithm</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/fann/functions/fann-set-weight-array.xml b/reference/fann/functions/fann-set-weight-array.xml
deleted file mode 100644
index 8d84b377face..000000000000
--- a/reference/fann/functions/fann-set-weight-array.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-weight-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_weight_array</refname>
-  <refpurpose>Set connections in the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_weight_array</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>connections</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set connections in the network.
-  </para>
-  <para>
-   Only the weights can be changed, connections and weights are ignored if they do not already exist in the network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>connections</parameter></term>
-    <listitem>
-     <para>
-      An array of <classname>FANNConnection</classname> objects
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-set-weight.xml b/reference/fann/functions/fann-set-weight.xml
deleted file mode 100644
index f63b86945f12..000000000000
--- a/reference/fann/functions/fann-set-weight.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-set-weight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_set_weight</refname>
-  <refpurpose>Set a connection in the network</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_set_weight</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>int</type><parameter>from_neuron</parameter></methodparam>
-   <methodparam><type>int</type><parameter>to_neuron</parameter></methodparam>
-   <methodparam><type>float</type><parameter>weight</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set a connections in the network.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>from_neuron</parameter></term>
-    <listitem>
-     <para>
-      The neuron where the connection starts
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to_neuron</parameter></term>
-    <listitem>
-     <para>
-      The neuron where the connection ends
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>weight</parameter></term>
-    <listitem>
-     <para>
-      Connection weight
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-shuffle-train-data.xml b/reference/fann/functions/fann-shuffle-train-data.xml
deleted file mode 100644
index 67d5afd5cdac..000000000000
--- a/reference/fann/functions/fann-shuffle-train-data.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-shuffle-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_shuffle_train_data</refname>
-  <refpurpose>Shuffles training data, randomizing the order</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_shuffle_train_data</methodname>
-   <methodparam><type>resource</type><parameter>train_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shuffles training data, randomizing the order. This is recommended for incremental training,
-   while it have no influence during batch training.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>train_data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fann/functions/fann-subset-train-data.xml b/reference/fann/functions/fann-subset-train-data.xml
deleted file mode 100644
index 37b719797fb8..000000000000
--- a/reference/fann/functions/fann-subset-train-data.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-subset-train-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_subset_train_data</refname>
-  <refpurpose>Returns an copy of a subset of the train data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fann_subset_train_data</methodname>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pos</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an copy of a subset of the train data <type>resource</type>, starting at position
-   <literal>pos</literal> and <literal>length</literal> elements forward.
-  </para>
-  <para>
-   The <literal>fann_subset_train_data(train_data, 0, fann_length_train_data(train_data))</literal> do the same as
-   <function>fann_duplicate_train_data</function>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pos</parameter></term>
-    <listitem>
-     <para>
-      Starting position.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-      The number of copied elements.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.train;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_duplicate_train_data</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/fann/functions/fann-test-data.xml b/reference/fann/functions/fann-test-data.xml
deleted file mode 100644
index 313e847d452e..000000000000
--- a/reference/fann/functions/fann-test-data.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-test-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_test_data</refname>
-  <refpurpose>Test a set of training data and calculates the MSE for the training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_test_data</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Test a set of training data and calculates the MSE for the training data.
-  </para>
-  <para>
-   This function updates the MSE and the bit fail values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The updated MSE, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_train_epoch</function></member>
-    <member><function>fann_get_bit_fail</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-test.xml b/reference/fann/functions/fann-test.xml
deleted file mode 100644
index 8d2f261b11c7..000000000000
--- a/reference/fann/functions/fann-test.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-test" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_test</refname>
-  <refpurpose>Test with a set of inputs, and a set of desired outputs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fann_test</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input</parameter></methodparam>
-   <methodparam><type>array</type><parameter>desired_output</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Test with a set of inputs, and a set of desired outputs. This operation updates the mean square error,
-   but does not change the network in any way.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <para>
-      An array of inputs. This array must be exactly <function>fann_get_num_input</function> long.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_output</parameter></term>
-    <listitem>
-     <para>
-      An array of desired outputs. This array must be exactly <function>fann_get_num_output</function> long.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns test outputs on success, or &false; on error.</para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_test_data</function></member>
-    <member><function>fann_train</function></member>
-    <member><function>fann_get_num_input</function></member>
-    <member><function>fann_get_num_output</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/fann/functions/fann-train-epoch.xml b/reference/fann/functions/fann-train-epoch.xml
deleted file mode 100644
index 06e3917324ac..000000000000
--- a/reference/fann/functions/fann-train-epoch.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-train-epoch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_train_epoch</refname>
-  <refpurpose>Train one epoch with a set of training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>fann_train_epoch</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Train one epoch with the training data stored in data. One epoch is
-   where all of the training data is considered exactly once.
-  </para>
-  <simpara>
-   This function returns the MSE error as it is calculated either before or during the actual training.
-   This is not the actual MSE after the training epoch, but since calculating this would require going
-   through the entire training set once more, it is more than adequate to use this value during training.
-  </simpara>
-  <para>
-   The training algorithm used by this function is chosen by <function>fann_set_training_algorithm</function>
-   function.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The MSE, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_test_data</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_set_training_algorithm</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/fann/functions/fann-train-on-data.xml b/reference/fann/functions/fann-train-on-data.xml
deleted file mode 100644
index ea4ccb5c1fac..000000000000
--- a/reference/fann/functions/fann-train-on-data.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-train-on-data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_train_on_data</refname>
-  <refpurpose>Trains on an entire dataset for a period of time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_train_on_data</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_epochs</parameter></methodparam>
-   <methodparam><type>int</type><parameter>epochs_between_reports</parameter></methodparam>
-   <methodparam><type>float</type><parameter>desired_error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Trains on an entire dataset for a period of time.
-  </para>
-  <para>
-   This training uses the training algorithm chosen by <function>fann_set_training_algorithm</function> and
-   the parameters set for these training algorithms.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     &fann.train.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_epochs</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of epochs the training should continue
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>epochs_between_reports</parameter></term>
-    <listitem>
-     <para>
-      The number of epochs between calling a callback function. A value of zero means that user function is not called.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_error</parameter></term>
-    <listitem>
-     <para>
-      The desired <function>fann_get_MSE</function> or <function>fann_get_bit_fail</function>, depending on the stop function
-      chosen by <function>fann_set_train_stop_function</function>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_file</function></member>
-    <member><function>fann_train_epoch</function></member>
-    <member><function>fann_get_bit_fail</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_set_train_stop_function</function></member>
-    <member><function>fann_set_training_algorithm</function></member>
-    <member><function>fann_set_callback</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/fann/functions/fann-train-on-file.xml b/reference/fann/functions/fann-train-on-file.xml
deleted file mode 100644
index e0f6ec6b10fe..000000000000
--- a/reference/fann/functions/fann-train-on-file.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-train-on-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_train_on_file</refname>
-  <refpurpose>Trains on an entire dataset, which is read from file, for a period of time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_train_on_file</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_epochs</parameter></methodparam>
-   <methodparam><type>int</type><parameter>epochs_between_reports</parameter></methodparam>
-   <methodparam><type>float</type><parameter>desired_error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Trains on an entire dataset, which is read from file, for a period of time.
-  </para>
-  <para>
-   This training uses the training algorithm chosen by <function>fann_set_training_algorithm</function> and
-   the parameters set for these training algorithms.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The file containing train data
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_epochs</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of epochs the training should continue
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>epochs_between_reports</parameter></term>
-    <listitem>
-     <para>
-      The number of epochs between calling a user function. A value of zero means that user function is not called.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_error</parameter></term>
-    <listitem>
-     <para>
-      The desired <function>fann_get_MSE</function> or <function>fann_get_bit_fail</function>, depending on the stop function
-      chosen by <function>fann_set_train_stop_function</function>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_train_epoch</function></member>
-    <member><function>fann_get_bit_fail</function></member>
-    <member><function>fann_get_MSE</function></member>
-    <member><function>fann_set_train_stop_function</function></member>
-    <member><function>fann_set_training_algorithm</function></member>
-    <member><function>fann_set_callback</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/fann/functions/fann-train.xml b/reference/fann/functions/fann-train.xml
deleted file mode 100644
index a30ebadb88a6..000000000000
--- a/reference/fann/functions/fann-train.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.fann-train" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>fann_train</refname>
-  <refpurpose>Train one iteration with a set of inputs, and a set of desired outputs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fann_train</methodname>
-   <methodparam><type>resource</type><parameter>ann</parameter></methodparam>
-   <methodparam><type>array</type><parameter>input</parameter></methodparam>
-   <methodparam><type>array</type><parameter>desired_output</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Train one iteration with a set of inputs, and a set of desired outputs. This training is always incremental training,
-   since only one pattern is presented.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ann</parameter></term>
-    <listitem>
-     &fann.ann.description;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <para>
-      An array of inputs. This array must be exactly <function>fann_get_num_input</function> long.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>desired_output</parameter></term>
-    <listitem>
-     <para>
-      An array of desired outputs. This array must be exactly <function>fann_get_num_output</function> long.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &fann.return.bool;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>fann_train_on_data</function></member>
-    <member><function>fann_train_epoch</function></member>
-    <member><function>fann_get_num_input</function></member>
-    <member><function>fann_get_num_output</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/fann/reference.xml b/reference/fann/reference.xml
deleted file mode 100644
index 069fb8ae3044..000000000000
--- a/reference/fann/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.fann" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Fann &Functions;</title>
-
- &reference.fann.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/fann/setup.xml b/reference/fann/setup.xml
deleted file mode 100644
index fad1af04a6cb..000000000000
--- a/reference/fann/setup.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="fann.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="fann.requirements">
-  &reftitle.required;
-  <para>
-   PHP &gt;= 5.2.0 and libfann &gt;= 2.1.0
-  </para>
- </section>
-
- <section xml:id="fann.installation">
-  &reftitle.install;
-  <para>
-   The FANN PHP extension should work on all Linux systems.
- </para>
-
-  <simplelist>
-   <member>
-    <xref linkend="fann.installation.lib" />
-   </member>
-   <member>
-    <xref linkend="fann.installation.pecl" />
-   </member>
-   <member>
-    <xref linkend="fann.installation.manual" />
-   </member>
-  </simplelist>
-
-  <section xml:id="fann.installation.lib">
-
-   <title>FANN Library Installation</title>
-
-   <para>
-    Before you start installation make sure that <emphasis>libfann</emphasis> is installed
-    on your system. It's part of the main repository in the most Linux distributions
-    (search for <emphasis>fann</emphasis>). You need a development version.
-   </para>
-   <para>
-    If it is not installed, you need to install it first. Either download it from the
-    <link xlink:href="&url.fann.lib;">official site</link> or get it from your distro
-    repository. For example on Fedora:
-    <programlisting>
-<![CDATA[
-
-$ sudo yum install fann-devel
-
-]]>
-    </programlisting>
-    or Ubuntu:
-    <programlisting>
-<![CDATA[
-
-$ sudo apt-get install libfann-dev
-
-]]>
-    </programlisting>
-   </para>
-   <para>
-    If the library is re-installed manually, then all old library file should be removed
-    before re-installing otherwise the old library version could be linked.
-   </para>
-  </section>
-
-  <section xml:id="fann.installation.pecl">
-
-   <title>PECL Installation</title>
-
-   <para>
-    This extension is available on PECL. The installation is very simple. Just run:
-    <programlisting>
-<![CDATA[
-
-$ sudo pecl install fann
-
-]]>
-    </programlisting>
-   </para>
-  </section>
-
-  <section xml:id="fann.installation.manual">
-
-   <title>Manual Installation</title>
-
-   <para>
-    For developers and people interested in the latest changes, you
-    can compile the driver from the latest source code on
-    <link xlink:href="&url.fann.github;">Github</link>.
-    Go to Github and click the "Download ZIP" button. Then run:
-
-    <programlisting>
-<![CDATA[
-
-$ unzip php-fann-master.zip
-$ cd php-fann-master
-$ 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>fann.so</emphasis>. The build will display where
-      it is installing the PHP driver with output that looks something like:
-      <programlisting>
-<![CDATA[
-
-Installing '/usr/lib/php/extensions/no-debug-non-zts-20060613/fann.so'
-
-]]>
-      </programlisting>
-
-      Make sure that it is the same as the PHP extension directory by running:
-
-      <programlisting>
-<![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>fann.so</emphasis>.
-     </para>
-    </listitem>
-    <listitem>
-     <para>
-      To load the extension on PHP startup, add a line:
-
-      <programlisting>
-<![CDATA[
-
-extension=fann.so
-
-]]>
-      </programlisting>
-
-     </para>
-   </listitem>
-
-   </itemizedlist>
-  </section>
- </section>
-
- <section xml:id="fann.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/fann/versions.xml b/reference/fann/versions.xml
deleted file mode 100644
index 459e74b3af47..000000000000
--- a/reference/fann/versions.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='fann_create_standard' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_standard_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_sparse' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_sparse_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_shortcut' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_shortcut_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_destroy' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_copy' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_run' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_randomize_weights' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_init_weights' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_num_input' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_num_output' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_total_neurons' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_total_connections' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_network_type' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_connection_rate' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_num_layers' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_layer_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_bias_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_connection_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_weight_array' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_weight' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_test' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_mse' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_bit_fail' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_reset_mse' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_train_on_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_train_on_file' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_train_epoch' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_test_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_read_train_from_file' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_train_from_callback' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_destroy_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_shuffle_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_descale_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_input_scaling_params' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_output_scaling_params' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_scaling_params' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_clear_scaling_params' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_input' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_output' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_descale_input' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_descale_output' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_input_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_output_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_scale_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_merge_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_duplicate_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_subset_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_length_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_num_input_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_num_output_train_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_save_train' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_learning_rate' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_learning_rate' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_learning_momentum' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_learning_momentum' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_train_error_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_train_error_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_train_stop_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_train_stop_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_bit_fail_limit' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_bit_fail_limit' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_callback' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_quickprop_decay' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_quickprop_decay' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_quickprop_mu' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_quickprop_mu' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_rprop_increase_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_rprop_increase_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_rprop_decrease_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_rprop_decrease_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_rprop_delta_min' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_rprop_delta_min' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_rprop_delta_max' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_rprop_delta_max' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_rprop_delta_zero' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_rprop_delta_zero' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_sarprop_weight_decay_shift' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_sarprop_weight_decay_shift' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_sarprop_step_error_threshold_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_sarprop_step_error_threshold_factor' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_sarprop_step_error_shift' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_sarprop_step_error_shift' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_sarprop_temperature' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_sarprop_temperature' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_training_algorithm' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_training_algorithm' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_activation_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_function' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_function_layer' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_function_hidden' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_function_output' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_activation_steepness' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_steepness' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_steepness_layer' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_steepness_hidden' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_activation_steepness_output' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_cascadetrain_on_data' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_cascadetrain_on_file' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_output_change_fraction' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_output_change_fraction' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_output_stagnation_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_output_stagnation_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_candidate_change_fraction' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_candidate_change_fraction' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_candidate_stagnation_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_candidate_stagnation_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_weight_multiplier' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_weight_multiplier' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_candidate_limit' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_candidate_limit' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_max_out_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_max_out_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_min_out_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_min_out_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_max_cand_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_max_cand_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_min_cand_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_min_cand_epochs' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_num_candidates' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_activation_functions_count' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_activation_functions' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_activation_functions' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_activation_steepnesses_count' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_activation_steepnesses' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_activation_steepnesses' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_cascade_num_candidate_groups' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_cascade_num_candidate_groups' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_create_from_file' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_save' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_set_error_log' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_errno' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_reset_errno' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_reset_errstr' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_get_errstr' from='PECL fann &gt;= 1.0.0'/>
- <function name='fann_print_error' from='PECL fann &gt;= 1.0.0'/>
- <!-- Methods -->
- <function name='fannconnection::__construct' from='PECL fann &gt;= 1.0.0'/>
- <function name='fannconnection::getfromneuron' from='PECL fann &gt;= 1.0.0'/>
- <function name='fannconnection::gettoneuron' from='PECL fann &gt;= 1.0.0'/>
- <function name='fannconnection::getweight' from='PECL fann &gt;= 1.0.0'/>
- <function name='fannconnection::setweight' from='PECL fann &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/fdf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/fdf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/fdf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/fdf/book.xml b/reference/fdf/book.xml
deleted file mode 100644
index 3aac7c4c162d..000000000000
--- a/reference/fdf/book.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.fdf">
-  &reftitle.intro;
-  <simpara>
-   Forms Data Format (FDF) is a format for handling
-   forms within PDF documents. You should read the documentation at 
-   <link xlink:href="&spec.pdf.fdf;">&spec.pdf.fdf;</link>
-   for more information on what FDF is and how it is used in general.
-  </simpara>
-  <simpara>
-   The general idea of FDF is similar to HTML forms. The difference is
-   basically the format how data is transmitted to the server when the submit
-   button is pressed (this is actually the Form Data Format) and the format
-   of the form itself (which is the Portable Document Format, PDF).
-   Processing the FDF data is one of the features provided by the fdf
-   functions. But there is more.  One may as well take an existing PDF form
-   and populated the input fields with data without modifying the form
-   itself. In such a case one would create a FDF document
-   (<function>fdf_create</function>) set the values of each input field
-   (<function>fdf_set_value</function>) and associate it with a PDF form
-   (<function>fdf_set_file</function>). Finally it has to be sent to the
-   browser with MimeType <literal>application/vnd.fdf</literal>. The Acrobat
-   reader plugin of your browser recognizes the MimeType,  reads the
-   associated PDF form and fills in the data from the FDF document.
-  </simpara>
-
-  <simpara>
-   If you look at an FDF-document with a text editor you will find a
-   catalogue object with the name <literal>FDF</literal>. Such an object may
-   contain a number of entries like <literal>Fields</literal>,
-   <literal>F</literal>, <literal>Status</literal> etc..
-   The most commonly used entries are <literal>Fields</literal> which points
-   to a list of input fields, and <literal>F</literal> which contains the
-   filename of the PDF-document this data belongs to. Those entries are
-   referred to in the FDF documentation as /F-Key or /Status-Key.
-   Modifying this entries
-   is done by functions like <function>fdf_set_file</function> and
-   <function>fdf_set_status</function>. Fields are modified with
-   <function>fdf_set_value</function>, <function>fdf_set_opt</function> etc..
-  </simpara>
- </preface>
- <!-- }}} -->
- 
- &reference.fdf.setup;
- &reference.fdf.constants;
- &reference.fdf.examples;
- &reference.fdf.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/fdf/configure.xml b/reference/fdf/configure.xml
deleted file mode 100644
index 308336a88091..000000000000
--- a/reference/fdf/configure.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="fdf.installation">
- &reftitle.install;
- <simpara>
-  &pecl.info.dead;
-  <link xlink:href="&url.pecl.vcs;fdf">&url.pecl.vcs;fdf</link>.
- </simpara>
- <simpara>
-  This extension is no longer bundled with PHP.
- </simpara>
- <note>
-  <simpara>
-   If you run into problems configuring PHP with fdftk support, check
-   whether the header file <filename>fdftk.h</filename> and the library
-   <filename>libfdftk.so</filename> are at the right place.
-   The <command>configure</command> script supports both the directory structure of the
-   FDF SDK distribution and the usual <filename>DIR/include</filename> /
-   <filename>DIR/lib</filename> layout, so you can point it either
-   directly to the unpacked distribution directory or put the header
-   file and the appropriate library for your platform into e.g.
-   <filename>/usr/local/include</filename> and
-   <filename>/usr/local/lib</filename> and configure with
-   <option role="configure">--with-fdftk=/usr/local</option>.
-  </simpara>
- </note>
- <note>
-  <title>Note to Win32 Users</title>
-  <simpara>
-   &ext.windows.path.dll;
-   <filename>fdftk.dll</filename>
-  </simpara>
- </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/fdf/constants.xml b/reference/fdf/constants.xml
deleted file mode 100644
index 0168e2cb35f0..000000000000
--- a/reference/fdf/constants.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="fdf.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist> 
-  <varlistentry xml:id="constant.fdfvalue">
-   <term>
-    <constant>FDFValue</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfstatus">
-   <term>
-    <constant>FDFStatus</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdffile">
-   <term>
-    <constant>FDFFile</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfid">
-   <term>
-    <constant>FDFID</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfff">
-   <term>
-    <constant>FDFFf</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfsetff">
-   <term>
-    <constant>FDFSetFf</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfclearff">
-   <term>
-    <constant>FDFClearFf</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfflags">
-   <term>
-    <constant>FDFFlags</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfsetf">
-   <term>
-    <constant>FDFSetF</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfclrf">
-   <term>
-    <constant>FDFClrF</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfap">
-   <term>
-    <constant>FDFAP</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfas">
-   <term>
-    <constant>FDFAS</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfaction">
-   <term>
-    <constant>FDFAction</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfaa">
-   <term>
-    <constant>FDFAA</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfapref">
-   <term>
-    <constant>FDFAPRef</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfif">
-   <term>
-    <constant>FDFIF</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfenter">
-   <term>
-    <constant>FDFEnter</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfexit">
-   <term>
-    <constant>FDFExit</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfdown">
-   <term>
-    <constant>FDFDown</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfup">
-   <term>
-    <constant>FDFUp</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfformat">
-   <term>
-    <constant>FDFFormat</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfvalidate">
-   <term>
-    <constant>FDFValidate</constant>
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfkeystroke">
-   <term>
-    <constant>FDFKeystroke</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfcalculate">
-   <term>
-    <constant>FDFCalculate</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfnormalap">
-   <term>
-    <constant>FDFNormalAP</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfrolloverap">
-   <term>
-    <constant>FDFRolloverAP</constant> 
-    (<type>int</type>)
-   </term> 
-   <listitem> 
-    <simpara> 
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.fdfdownap">
-   <term>
-    <constant>FDFDownAP</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/fdf/examples.xml b/reference/fdf/examples.xml
deleted file mode 100644
index e16ac4d1ff38..000000000000
--- a/reference/fdf/examples.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="fdf.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  The following examples shows just the evaluation of form data.
-  <example>
-   <title>Evaluating a FDF document</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Open fdf from input string provided by the extension
-// The pdf form contained several input text fields with the names
-// volume, date, comment, publisher, preparer, and two checkboxes
-// show_publisher and show_preparer.
-$fdf = fdf_open_string($HTTP_FDF_DATA);
-$volume = fdf_get_value($fdf, "volume");
-echo "The volume field has the value '<b>$volume</b>'<br />";
-
-$date = fdf_get_value($fdf, "date");
-echo "The date field has the value '<b>$date</b>'<br />";
-
-$comment = fdf_get_value($fdf, "comment");
-echo "The comment field has the value '<b>$comment</b>'<br />";
-
-if (fdf_get_value($fdf, "show_publisher") == "On") {
-  $publisher = fdf_get_value($fdf, "publisher");
-  echo "The publisher field has the value '<b>$publisher</b>'<br />";
-} else
-  echo "Publisher shall not be shown.<br />";
-
-if (fdf_get_value($fdf, "show_preparer") == "On") {
-  $preparer = fdf_get_value($fdf, "preparer");
-  echo "The preparer field has the value '<b>$preparer</b>'<br />";
-} else
-  echo "Preparer shall not be shown.<br />";
-fdf_close($fdf);
-?>
-]]>
-    </programlisting>
-  </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/fdf/functions/fdf-add-doc-javascript.xml b/reference/fdf/functions/fdf-add-doc-javascript.xml
deleted file mode 100644
index 823a5f1f735a..000000000000
--- a/reference/fdf/functions/fdf-add-doc-javascript.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-add-doc-javascript">
- <refnamediv>
-  <refname>fdf_add_doc_javascript</refname>
-  <refpurpose>Adds javascript code to the FDF document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_add_doc_javascript</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script_code</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a script to the FDF, which Acrobat then adds to the doc-level scripts
-   of a document, once the FDF is imported into it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>script_name</parameter></term>
-    <listitem>
-     <simpara>
-      The script name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>script_code</parameter></term>
-    <listitem>
-     <simpara>
-      The script code. It is strongly suggested to use <literal>\r</literal>
-      for linebreaks within the script code.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Adding JavaScript code to a FDF</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fdf = fdf_create();
-fdf_add_doc_javascript($fdf, "PlusOne", "function PlusOne(x)\r{\r  return x+1;\r}\r");
-fdf_save($fdf);
-?>
-]]>
-   </programlisting>
-   <simpara>
-    will create a FDF like this:
-   </simpara>
-   <screen>
-<![CDATA[
-%FDF-1.2
-%âãÏÓ
-1 0 obj
-<<
-/FDF << /JavaScript << /Doc [ (PlusOne)(function PlusOne\(x\)\r{\r  return x+1;\r}\r)] >> >>
->>
-endobj
-trailer
-<<
-/Root 1 0 R
-
->>
-%%EOF
-]]>
-   </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/fdf/functions/fdf-add-template.xml b/reference/fdf/functions/fdf-add-template.xml
deleted file mode 100644
index 9143bb53b749..000000000000
--- a/reference/fdf/functions/fdf-add-template.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id='function.fdf-add-template' xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>fdf_add_template</refname>
-  <refpurpose>Adds a template into the FDF document</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_add_template</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>int</type><parameter>newpage</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>template</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rename</parameter></methodparam>
-  </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/fdf/functions/fdf-close.xml b/reference/fdf/functions/fdf-close.xml
deleted file mode 100644
index e96e6ad88822..000000000000
--- a/reference/fdf/functions/fdf-close.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-close">
- <refnamediv>
-  <refname>fdf_close</refname>
-  <refpurpose>Close an FDF document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fdf_close</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Closes the FDF document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_open</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/fdf/functions/fdf-create.xml b/reference/fdf/functions/fdf-create.xml
deleted file mode 100644
index c0d9347cee7d..000000000000
--- a/reference/fdf/functions/fdf-create.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-create">
- <refnamediv>
-  <refname>fdf_create</refname>
-  <refpurpose>Create a new FDF document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fdf_create</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Creates a new FDF document.
-  </simpara>
-  <simpara>
-   This function is needed if one would like to populate input fields in a
-   PDF document with data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a FDF document handle, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Populating a PDF document</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$outfdf = fdf_create();
-fdf_set_value($outfdf, "volume", $volume, 0);
-
-fdf_set_file($outfdf, "http:/testfdf/resultlabel.pdf");
-fdf_save($outfdf, "outtest.fdf");
-fdf_close($outfdf);
-Header("Content-type: application/vnd.fdf");
-$fp = fopen("outtest.fdf", "r");
-fpassthru($fp);
-unlink("outtest.fdf");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_close</function></member>
-   <member><function>fdf_save</function></member>
-   <member><function>fdf_open</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/fdf/functions/fdf-enum-values.xml b/reference/fdf/functions/fdf-enum-values.xml
deleted file mode 100644
index 36f9706ff3fb..000000000000
--- a/reference/fdf/functions/fdf-enum-values.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.fdf-enum-values" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>fdf_enum_values</refname>
-  <refpurpose>Call a user defined function for each document value</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_enum_values</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>function</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>userdata</parameter></methodparam>
-  </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/fdf/functions/fdf-errno.xml b/reference/fdf/functions/fdf-errno.xml
deleted file mode 100644
index 5a03d2474228..000000000000
--- a/reference/fdf/functions/fdf-errno.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-errno">
- <refnamediv>
-  <refname>fdf_errno</refname>
-  <refpurpose>Return error code for last fdf operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fdf_errno</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the error code set by the last FDF function call.
-  </simpara>
-  <simpara>
-   A textual description of the error may be obtained using
-   <function>fdf_error</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error code as an integer, or zero if there was no errors.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_error</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/fdf/functions/fdf-error.xml b/reference/fdf/functions/fdf-error.xml
deleted file mode 100644
index fd94f600fe6a..000000000000
--- a/reference/fdf/functions/fdf-error.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-error">
- <refnamediv>
-  <refname>fdf_error</refname>
-  <refpurpose>Return error description for FDF error code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_error</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>error_code</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets a textual description for the FDF error code given in
-   <parameter>error_code</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>error_code</parameter></term>
-    <listitem>
-     <simpara>
-      An error code obtained with <function>fdf_errno</function>.
-      If not provided, this function uses the internal error code set by the
-      last operation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error message as a string, or the string
-   <literal>no error</literal> if nothing went wrong.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_errno</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/fdf/functions/fdf-get-ap.xml b/reference/fdf/functions/fdf-get-ap.xml
deleted file mode 100644
index e8f2b8679141..000000000000
--- a/reference/fdf/functions/fdf-get-ap.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-ap">
- <refnamediv>
-  <refname>fdf_get_ap</refname>
-  <refpurpose>Get the appearance of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_get_ap</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>int</type><parameter>face</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the appearance of a <parameter>field</parameter> (i.e. the value of
-   the /AP key) and stores it in a file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>face</parameter></term>
-    <listitem>
-     <simpara>
-      The possible values are <constant>FDFNormalAP</constant>,
-      <constant>FDFRolloverAP</constant> and <constant>FDFDownAP</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The appearance will be stored in this parameter.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fdf/functions/fdf-get-attachment.xml b/reference/fdf/functions/fdf-get-attachment.xml
deleted file mode 100644
index 5a5399997427..000000000000
--- a/reference/fdf/functions/fdf-get-attachment.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-attachment">
- <refnamediv>
-  <refname>fdf_get_attachment</refname>
-  <refpurpose>Extracts uploaded file embedded in the FDF</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>fdf_get_attachment</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>savepath</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Extracts a file uploaded by means of the "file selection" field
-   <parameter>fieldname</parameter> and stores it under
-   <parameter>savepath</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>savepath</parameter></term>
-    <listitem>
-     <simpara>
-      May be the name of a plain file or an existing directory in which the
-      file is to be created under its original name. Any existing file under
-      the same name will be overwritten.
-     </simpara>
-     <note>
-      <simpara>
-       There seems to be no other way to find out the original filename but
-       to store the file using a directory as
-       <parameter>savepath</parameter> and check for the basename it was
-       stored under.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The returned array contains the following fields:
-   <itemizedlist>
-    <listitem>
-     <simpara><parameter>path</parameter> - path where the file got stored</simpara>
-    </listitem>
-    <listitem>
-     <simpara><parameter>size</parameter> - size of the stored file in bytes</simpara>
-    </listitem>
-    <listitem>
-     <simpara><parameter>type</parameter> - mimetype if given in the FDF</simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Storing an uploaded file</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-  $fdf = fdf_open_string($HTTP_FDF_DATA);
-  $data = fdf_get_attachment($fdf, "filename", "/tmpdir");
-  echo "The uploaded file is stored in $data[path]";
-?>
-]]>
-   </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/fdf/functions/fdf-get-encoding.xml b/reference/fdf/functions/fdf-get-encoding.xml
deleted file mode 100644
index fe44fe24a9ba..000000000000
--- a/reference/fdf/functions/fdf-get-encoding.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-encoding">
- <refnamediv>
-  <refname>fdf_get_encoding</refname>
-  <refpurpose>Get the value of the /Encoding key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_get_encoding</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the value of the <literal>/Encoding</literal> key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the encoding as a string. An empty string is returned if the
-   default <literal>PDFDocEncoding/Unicode</literal> scheme is used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_encoding</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/fdf/functions/fdf-get-file.xml b/reference/fdf/functions/fdf-get-file.xml
deleted file mode 100644
index 0b1e83ce1390..000000000000
--- a/reference/fdf/functions/fdf-get-file.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-file">
- <refnamediv>
-  <refname>fdf_get_file</refname>
-  <refpurpose>Get the value of the /F key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_get_file</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the value of the <literal>/F</literal> key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key value, as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_file</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/fdf/functions/fdf-get-flags.xml b/reference/fdf/functions/fdf-get-flags.xml
deleted file mode 100644
index 1f3a6edfe4ca..000000000000
--- a/reference/fdf/functions/fdf-get-flags.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.fdf-get-flags" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>fdf_get_flags</refname>
-  <refpurpose>Gets the flags of a field</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>fdf_get_flags</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>whichflags</parameter></methodparam>
-  </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/fdf/functions/fdf-get-opt.xml b/reference/fdf/functions/fdf-get-opt.xml
deleted file mode 100644
index a9b24dfaba86..000000000000
--- a/reference/fdf/functions/fdf-get-opt.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.fdf-get-opt" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>fdf_get_opt</refname>
-  <refpurpose>Gets a value from the opt array of a field</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>fdf_get_opt</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>element</parameter><initializer>-1</initializer></methodparam>
-  </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/fdf/functions/fdf-get-status.xml b/reference/fdf/functions/fdf-get-status.xml
deleted file mode 100644
index bb3664b5466e..000000000000
--- a/reference/fdf/functions/fdf-get-status.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-status">
- <refnamediv>
-  <refname>fdf_get_status</refname>
-  <refpurpose>Get the value of the /STATUS key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_get_status</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the value of the <literal>/STATUS</literal> key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key value, as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_status</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/fdf/functions/fdf-get-value.xml b/reference/fdf/functions/fdf-get-value.xml
deleted file mode 100644
index 8d9854d8b7c7..000000000000
--- a/reference/fdf/functions/fdf-get-value.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-value">
- <refnamediv>
-  <refname>fdf_get_value</refname>
-  <refpurpose>Get the value of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>fdf_get_value</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>which</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the value for the requested field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>which</parameter></term>
-    <listitem>
-     <simpara>
-      Elements of an array field can be retrieved by passing this optional
-      parameter, starting at zero. For non-array fields, this parameter will
-      be ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the field value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_value</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/fdf/functions/fdf-get-version.xml b/reference/fdf/functions/fdf-get-version.xml
deleted file mode 100644
index 411fb2601c56..000000000000
--- a/reference/fdf/functions/fdf-get-version.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-get-version">
- <refnamediv>
-  <refname>fdf_get_version</refname>
-  <refpurpose>Gets version number for FDF API or file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_get_version</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Return the FDF version for the given document, or the toolkit API version
-   number if no parameter is given.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the version as a string. For the current FDF toolkit 5.0 the API
-   version number is <literal>5.0</literal> and the document version number
-   is either <literal>1.2</literal>, <literal>1.3</literal> or
-   <literal>1.4</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_version</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/fdf/functions/fdf-header.xml b/reference/fdf/functions/fdf-header.xml
deleted file mode 100644
index 5b0908c49c35..000000000000
--- a/reference/fdf/functions/fdf-header.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-header">
- <refnamediv>
-  <refname>fdf_header</refname>
-  <refpurpose>Sets FDF-specific output headers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>fdf_header</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   This is a convenience function to set appropriate HTTP headers for FDF
-   output. It sets the <literal>Content-type:</literal> to
-   <literal>application/vnd.fdf</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fdf/functions/fdf-next-field-name.xml b/reference/fdf/functions/fdf-next-field-name.xml
deleted file mode 100644
index 8fc131fbe3de..000000000000
--- a/reference/fdf/functions/fdf-next-field-name.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-next-field-name">
- <refnamediv>
-  <refname>fdf_next_field_name</refname>
-  <refpurpose>Get the next field name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_next_field_name</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>fieldname</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the name of the field after the given field. This name can be used
-   with several functions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string. If not given, the first field will
-      be assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the field name as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Detecting all fieldnames in a FDF</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fdf = fdf_open($HTTP_FDF_DATA);
-for ($field = fdf_next_field_name($fdf);
-    $field != "";
-    $field = fdf_next_field_name($fdf, $field)) {
-    echo "field: $field\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_get_value</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/fdf/functions/fdf-open-string.xml b/reference/fdf/functions/fdf-open-string.xml
deleted file mode 100644
index fabfa0a3681d..000000000000
--- a/reference/fdf/functions/fdf-open-string.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-open-string">
- <refnamediv>
-  <refname>fdf_open_string</refname>
-  <refpurpose>Read a FDF document from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fdf_open_string</methodname>
-   <methodparam><type>string</type><parameter>fdf_data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads form data from a string.
-  </simpara>
-  <simpara>
-   You can use <function>fdf_open_string</function> together with
-   <varname>$HTTP_FDF_DATA</varname> to process FDF form input from a remote
-   client.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_data</parameter></term>
-    <listitem>
-     <simpara>
-      The data as returned from a PDF form or created using
-      <function>fdf_create</function> and
-      <function>fdf_save_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a FDF document handle, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Accessing the form data</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fdf = fdf_open_string($HTTP_FDF_DATA);
-/* ... */
-fdf_close($fdf);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_open</function></member>
-   <member><function>fdf_close</function></member>
-   <member><function>fdf_create</function></member>
-   <member><function>fdf_save_string</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/fdf/functions/fdf-open.xml b/reference/fdf/functions/fdf-open.xml
deleted file mode 100644
index 53b2571ca46d..000000000000
--- a/reference/fdf/functions/fdf-open.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-open">
- <refnamediv>
-  <refname>fdf_open</refname>
-  <refpurpose>Open a FDF document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>fdf_open</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Opens a file with form data.
-  </simpara>
-  <simpara>
-   You can also use <function>fdf_open_string</function> to process the
-   results of a PDF form POST request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the FDF file. This file must contain the data as returned from
-      a PDF form or created using <function>fdf_create</function> and
-      <function>fdf_save</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a FDF document handle, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Accessing the form data</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Save the FDF data into a temp file
-$fdffp = fopen("test.fdf", "w");
-fwrite($fdffp, $HTTP_FDF_DATA, strlen($HTTP_FDF_DATA));
-fclose($fdffp);
-
-// Open temp file and evaluate data
-$fdf = fdf_open("test.fdf");
-/* ... */
-fdf_close($fdf);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_open_string</function></member>
-   <member><function>fdf_close</function></member>
-   <member><function>fdf_create</function></member>
-   <member><function>fdf_save</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/fdf/functions/fdf-remove-item.xml b/reference/fdf/functions/fdf-remove-item.xml
deleted file mode 100644
index f4398abcb7a7..000000000000
--- a/reference/fdf/functions/fdf-remove-item.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.fdf-remove-item" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>fdf_remove_item</refname>
-  <refpurpose>Sets target frame for form</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_remove_item</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>item</parameter></methodparam>
-  </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/fdf/functions/fdf-save-string.xml b/reference/fdf/functions/fdf-save-string.xml
deleted file mode 100644
index f5cdeb19db86..000000000000
--- a/reference/fdf/functions/fdf-save-string.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-save-string">
- <refnamediv>
-  <refname>fdf_save_string</refname>
-  <refpurpose>Returns the FDF document as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>fdf_save_string</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the FDF document as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the document as a string, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving FDF as a string</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fdf = fdf_create();
-fdf_set_value($fdf, "foo", "bar");
-$str = fdf_save_string($fdf);
-fdf_close($fdf);
-echo $str;
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-%FDF-1.2
-%âãÏÓ
-1 0 obj
-<<
-/FDF << /Fields 2 0 R >>
->>
-endobj
-2 0 obj
-[
-<< /T (foo)/V (bar)>>
-]
-endobj
-trailer
-<<
-/Root 1 0 R
-
->>
-%%EOF
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_open_string</function></member>
-   <member><function>fdf_close</function></member>
-   <member><function>fdf_create</function></member>
-   <member><function>fdf_save</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/fdf/functions/fdf-save.xml b/reference/fdf/functions/fdf-save.xml
deleted file mode 100644
index a8f298ea5068..000000000000
--- a/reference/fdf/functions/fdf-save.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-save">
- <refnamediv>
-  <refname>fdf_save</refname>
-  <refpurpose>Save a FDF document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_save</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Saves a FDF document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      If provided, the resulting FDF will be written in this parameter.
-      Otherwise, this function will write the FDF to the default PHP output
-      stream.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_close</function></member>
-   <member><function>fdf_create</function></member>
-   <member><function>fdf_save_string</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/fdf/functions/fdf-set-ap.xml b/reference/fdf/functions/fdf-set-ap.xml
deleted file mode 100644
index d481b0c5518d..000000000000
--- a/reference/fdf/functions/fdf-set-ap.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-ap">
- <refnamediv>
-  <refname>fdf_set_ap</refname>
-  <refpurpose>Set the appearance of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_ap</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>field_name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>face</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>page_number</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the appearance of a field (i.e. the value of the
-   <literal>/AP</literal> key).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field_name</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>face</parameter></term>
-    <listitem>
-     <simpara>
-      The possible values are <constant>FDFNormalAP</constant>,
-      <constant>FDFRolloverAP</constant> and
-      <constant>FDFDownAP</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>page_number</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fdf/functions/fdf-set-encoding.xml b/reference/fdf/functions/fdf-set-encoding.xml
deleted file mode 100644
index 02b23a6c629f..000000000000
--- a/reference/fdf/functions/fdf-set-encoding.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-encoding">
- <refnamediv>
-  <refname>fdf_set_encoding</refname>
-  <refpurpose>Sets FDF character encoding</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_encoding</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the character encoding for the FDF document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>encoding</parameter></term>
-    <listitem>
-     <simpara>
-      The encoding name. The following values are supported:
-      "<literal>Shift-JIS</literal>", "<literal>UHC</literal>",
-      "<literal>GBK</literal>" and "<literal>BigFive</literal>".
-     </simpara>
-     <simpara>
-      An empty string resets the encoding to the default
-      <literal>PDFDocEncoding/Unicode</literal> scheme.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/fdf/functions/fdf-set-file.xml b/reference/fdf/functions/fdf-set-file.xml
deleted file mode 100644
index 0ac7ef084076..000000000000
--- a/reference/fdf/functions/fdf-set-file.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-file">
- <refnamediv>
-  <refname>fdf_set_file</refname>
-  <refpurpose>Set PDF document to display FDF data in</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_file</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>target_frame</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Selects a different PDF document to display the form results in than the
-   form it originated from.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      Should be given as an absolute URL.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>target_frame</parameter></term>
-    <listitem>
-     <simpara>
-      Use this parameter to specify the frame in which the document will be
-      displayed. You can also set the default value for this parameter using
-      <function>fdf_set_target_frame</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Passing FDF data to a second form</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-  /* set content type for Adobe FDF */
-  fdf_header();
-
-  /* start new fdf */
-  $fdf = fdf_create();
-
-  /* set field "foo" to value "bar" */
-  fdf_set_value($fdf, "foo", "bar");
-
-  /* tell client to display FDF data using "fdf_form.pdf" */
-  fdf_set_file($fdf, "http://www.example.com/fdf_form.pdf");
-
-  /* output fdf */
-  fdf_save($fdf);
-
-  /* clean up */
-  fdf_close($fdf);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_get_file</function></member>
-   <member><function>fdf_set_target_frame</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/fdf/functions/fdf-set-flags.xml b/reference/fdf/functions/fdf-set-flags.xml
deleted file mode 100644
index 5f3dff99690e..000000000000
--- a/reference/fdf/functions/fdf-set-flags.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-flags">
- <refnamediv>
-  <refname>fdf_set_flags</refname>
-  <refpurpose>Sets a flag of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_flags</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>whichFlags</parameter></methodparam>
-   <methodparam><type>int</type><parameter>newFlags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets certain flags of the given field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>whichFlags</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>newFlags</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_opt</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/fdf/functions/fdf-set-javascript-action.xml b/reference/fdf/functions/fdf-set-javascript-action.xml
deleted file mode 100644
index 5835231d2285..000000000000
--- a/reference/fdf/functions/fdf-set-javascript-action.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-javascript-action">
- <refnamediv>
-  <refname>fdf_set_javascript_action</refname>
-  <refpurpose>Sets an javascript action of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_javascript_action</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>trigger</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a javascript action for the given field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>trigger</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>script</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_submit_form_action</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/fdf/functions/fdf-set-on-import-javascript.xml b/reference/fdf/functions/fdf-set-on-import-javascript.xml
deleted file mode 100644
index f74439ddc8c0..000000000000
--- a/reference/fdf/functions/fdf-set-on-import-javascript.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-on-import-javascript">
- <refnamediv>
-  <refname>fdf_set_on_import_javascript</refname>
-  <refpurpose>Adds javascript code to be executed when Acrobat opens the FDF</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_on_import_javascript</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>before_data_import</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_add_doc_javascript</function></member>
-   <member><function>fdf_set_javascript_action</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/fdf/functions/fdf-set-opt.xml b/reference/fdf/functions/fdf-set-opt.xml
deleted file mode 100644
index 2cbeb1e6c127..000000000000
--- a/reference/fdf/functions/fdf-set-opt.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-opt">
- <refnamediv>
-  <refname>fdf_set_opt</refname>
-  <refpurpose>Sets an option of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_opt</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>element</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>str2</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets options of the given field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>element</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>str1</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>str2</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_flags</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/fdf/functions/fdf-set-status.xml b/reference/fdf/functions/fdf-set-status.xml
deleted file mode 100644
index aff9ae49346e..000000000000
--- a/reference/fdf/functions/fdf-set-status.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-status">
- <refnamediv>
-  <refname>fdf_set_status</refname>
-  <refpurpose>Set the value of the /STATUS key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_status</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>status</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the value of the <literal>/STATUS</literal> key. When a client
-   receives a FDF with a status set it will present the value in an alert
-   box.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>status</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_get_status</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/fdf/functions/fdf-set-submit-form-action.xml b/reference/fdf/functions/fdf-set-submit-form-action.xml
deleted file mode 100644
index 2d23c88c329b..000000000000
--- a/reference/fdf/functions/fdf-set-submit-form-action.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-submit-form-action">
- <refnamediv>
-  <refname>fdf_set_submit_form_action</refname>
-  <refpurpose>Sets a submit form action of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_submit_form_action</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>trigger</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a submit form action for the given field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>trigger</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>script</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_set_javascript_action</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/fdf/functions/fdf-set-target-frame.xml b/reference/fdf/functions/fdf-set-target-frame.xml
deleted file mode 100644
index b7d5380bb8f5..000000000000
--- a/reference/fdf/functions/fdf-set-target-frame.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-target-frame">
- <refnamediv>
-  <refname>fdf_set_target_frame</refname>
-  <refpurpose>Set target frame for form display</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_target_frame</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>frame_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the target frame to display a result PDF defined with
-   <function>fdf_save_file</function> in.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>frame_name</parameter></term>
-    <listitem>
-     <simpara>
-      The frame name, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_save_file</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/fdf/functions/fdf-set-value.xml b/reference/fdf/functions/fdf-set-value.xml
deleted file mode 100644
index cafea957282e..000000000000
--- a/reference/fdf/functions/fdf-set-value.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-value">
- <refnamediv>
-  <refname>fdf_set_value</refname>
-  <refpurpose>Set the value of a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_value</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>isName</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the <parameter>value</parameter> for the given field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldname</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the FDF field, as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      This parameter will be stored as a string unless it is an array. In
-      this case all array elements will be stored as a value array.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>isName</parameter></term>
-    <listitem>
-     <note>
-      <simpara>
-       In older versions of the FDF toolkit last parameter determined if the
-       field value was to be converted to a PDF Name (= 1) or set to a PDF
-       String (= 0).
-      </simpara>
-      <simpara>
-       The value is no longer used in the current toolkit version 5.0. For
-       compatibility reasons it is still supported as an optional parameter,
-       but ignored internally.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_get_value</function></member>
-   <member><function>fdf_remove_item</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/fdf/functions/fdf-set-version.xml b/reference/fdf/functions/fdf-set-version.xml
deleted file mode 100644
index 2dc2cb04a95f..000000000000
--- a/reference/fdf/functions/fdf-set-version.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fdf-set-version">
- <refnamediv>
-  <refname>fdf_set_version</refname>
-  <refpurpose>Sets version number for a FDF file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fdf_set_version</methodname>
-   <methodparam><type>resource</type><parameter>fdf_document</parameter></methodparam>
-   <methodparam><type>string</type><parameter>version</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the FDF <parameter>version</parameter> for the given document.
-  </simpara>
-  <simpara>
-   Some features supported by this extension are only available in newer FDF
-   versions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fdf_document</parameter></term>
-    <listitem>
-     <simpara>
-      The FDF document handle, returned by <function>fdf_create</function>,
-      <function>fdf_open</function> or <function>fdf_open_string</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <simpara>
-      The version number. For the current FDF toolkit 5.0, this may be
-      either <literal>1.2</literal>, <literal>1.3</literal> or
-      <literal>1.4</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fdf_get_version</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/fdf/reference.xml b/reference/fdf/reference.xml
deleted file mode 100644
index 8cc2329419e3..000000000000
--- a/reference/fdf/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.fdf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>FDF &Functions;</title>
-
- &reference.fdf.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/fdf/setup.xml b/reference/fdf/setup.xml
deleted file mode 100644
index 59b85146a57e..000000000000
--- a/reference/fdf/setup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="fdf.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="fdf.requirements">
-  &reftitle.required;
-  <simpara>
-   You need the FDF toolkit SDK available from
-   <link xlink:href="&spec.pdf.fdf;">&spec.pdf.fdf;</link>.
-   As of PHP 4.3.0 you need at least SDK version 5.0.
-   The FDF toolkit library is available in binary form only,
-   platforms supported by Adobe are Win32, Linux, Solaris and AIX.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.fdf.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="fdf.resources">
-  &reftitle.resources;
-  <simpara>
-   Most fdf functions require a <parameter>fdf</parameter> resource
-   as their first parameter. A <parameter>fdf</parameter> resource
-   is a handle to an opened fdf file. <parameter>fdf</parameter>
-   resources may be obtained using <function>fdf_create</function>,
-   <function>fdf_open</function> and <function>fdf_open_string</function>.
-  </simpara>
- </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/fdf/versions.xml b/reference/fdf/versions.xml
deleted file mode 100644
index 8ad04a69106b..000000000000
--- a/reference/fdf/versions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='fdf_add_doc_javascript' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_add_template' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_close' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_create' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_enum_values' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_errno' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_error' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_ap' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_attachment' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_encoding' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_file' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_flags' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_opt' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECLv'/>
- <function name='fdf_get_status' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_value' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_get_version' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_header' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVNf'/>
- <function name='fdf_next_field_name' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_open' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_open_string' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_remove_item' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_save' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_save_string' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_ap' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_encoding' from='PHP 4 &gt;= 4.0.7, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_file' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_flags' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_javascript_action' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_on_import_javascript' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_opt' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_status' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_submit_form_action' from='PHP 4 &gt;= 4.0.2, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_target_frame' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_value' from='PHP 4, PHP 5 &lt; 5.3.0, PECL fdf SVN'/>
- <function name='fdf_set_version' from='PHP 4 &gt;= 4.3.0, PHP 5 &lt; 5.3.0, PECL fdf 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/gearman/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/gearman/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/gearman/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/gearman/book.xml b/reference/gearman/book.xml
deleted file mode 100644
index fabf4015ee55..000000000000
--- a/reference/gearman/book.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.gearman">
- <?phpdoc extension-membership="pecl" ?>
- <title>Gearman</title>
- <titleabbrev>Gearman</titleabbrev>
-
- <preface xml:id="intro.gearman">
-  &reftitle.intro;
-  <simpara>
-   <link xlink:href="&url.gearman;">Gearman</link> is a generic application framework for farming
-   out work to multiple machines or processes. It allows applications to complete tasks in parallel,
-   to load balance processing, and to call functions between languages.  The framework can be
-   used in a variety of applications, from high-availability web sites to the transport of database
-   replication events.
-  </simpara>
-  <simpara>
-   This extension provides classes for writing Gearman clients and workers.
-  </simpara>
- </preface>
-
- &reference.gearman.setup;
- &reference.gearman.constants;
- &reference.gearman.examples;
- &reference.gearman.gearmanclient;
- &reference.gearman.gearmanjob;
- &reference.gearman.gearmantask;
- &reference.gearman.gearmanworker;
- &reference.gearman.gearmanexception;
-
-</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/gearman/configure.xml b/reference/gearman/configure.xml
deleted file mode 100644
index 6ad8137ad89c..000000000000
--- a/reference/gearman/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearman.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;gearman">&url.pecl.package;gearman</link>
- </simpara>
-
-</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/gearman/constants.xml b/reference/gearman/constants.xml
deleted file mode 100644
index 0d72d7e4a133..000000000000
--- a/reference/gearman/constants.xml
+++ /dev/null
@@ -1,580 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearman.constants">
- &reftitle.constants;
- &extension.constants;
- <simpara>
-  Return values.  Always check <methodname>GearmanClient::error</methodname> or
-  <methodname>GearmanWorker</methodname> for a string error, as it may contain
-  more details:
- </simpara>
- <variablelist>
-  <varlistentry xml:id="constant.gearman-success">
-   <term>
-    <constant>GEARMAN_SUCCESS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Whatever action was taken was successful.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-io-wait">
-   <term>
-    <constant>GEARMAN_IO_WAIT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     When in non-blocking mode, an event is hit that would have blocked.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-errno">
-   <term>
-    <constant>GEARMAN_ERRNO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A system error.  Check <methodname>GearmanClient::errno</methodname> or
-     <methodname>GearmanWorker::errno</methodname> for the system error code that
-     was returned.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-no-active-fds">
-   <term>
-    <constant>GEARMAN_NO_ACTIVE_FDS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <methodname>GearmanClient::wait</methodname> or <methodname>GearmanWorker</methodname> was
-     called with no connections.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-unexpected-packet">
-   <term>
-    <constant>GEARMAN_UNEXPECTED_PACKET</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Indicates something going very wrong in gearmand.  Applies only to
-     <classname>GearmanWorker</classname>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-getaddrinfo">
-   <term>
-    <constant>GEARMAN_GETADDRINFO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     DNS resolution failed (invalid host, port, etc).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-no-servers">
-   <term>
-    <constant>GEARMAN_NO_SERVERS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Did not call <methodname>GearmanClient::addServer</methodname> before submitting jobs
-     or tasks.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-lost-connection">
-   <term>
-    <constant>GEARMAN_LOST_CONNECTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Lost a connection during a request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-memory-allocation-failure">
-   <term>
-    <constant>GEARMAN_MEMORY_ALLOCATION_FAILURE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Memory allocation failed (ran out of memory).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-server-error">
-   <term>
-    <constant>GEARMAN_SERVER_ERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Something went wrong in the Gearman server and it could not handle the
-     request gracefully.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-work-data">
-   <term>
-    <constant>GEARMAN_WORK_DATA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Notice return code obtained with <methodname>GearmanClient::returnCode</methodname>
-     when using <methodname>GearmanClient::do</methodname>.  Sent to update the client
-     with data from a running job.  A worker uses this when it needs to send updates,
-     send partial results, or flush data during long running jobs.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-work-warning">
-   <term>
-    <constant>GEARMAN_WORK_WARNING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Notice return code obtained with <methodname>GearmanClient::returnCode</methodname>
-     when using <methodname>GearmanClient::do</methodname>.  Updates the client with
-     a warning.  The behavior is just like <constant>GEARMAN_WORK_DATA</constant>, but
-     should be treated as a warning instead of normal response data.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-work-status">
-   <term>
-    <constant>GEARMAN_WORK_STATUS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Notice return code obtained with <methodname>GearmanClient::returnCode</methodname>
-     when using <methodname>GearmanClient::do</methodname>. Sent to update the status
-     of a long running job. Use <methodname>GearmanClient::doStatus</methodname> to obtain
-     the percentage complete of the task.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-work-exception">
-   <term>
-    <constant>GEARMAN_WORK_EXCEPTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Notice return code obtained with <methodname>GearmanClient::returnCode</methodname>
-     when using <methodname>GearmanClient::do</methodname>. Indicates that a job failed
-     with a given exception.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-work-fail">
-   <term>
-    <constant>GEARMAN_WORK_FAIL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Notice return code obtained with <methodname>GearmanClient::returnCode</methodname>
-     when using <methodname>GearmanClient::do</methodname>. Indicates that the job failed.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-could-not-connect">
-   <term>
-    <constant>GEARMAN_COULD_NOT_CONNECT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Failed to connect to servers.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-invalid-function-name">
-   <term>
-    <constant>GEARMAN_INVALID_FUNCTION_NAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Trying to register a function name of NULL or using the callback interface
-     without specifying callbacks.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-invalid-worker-function">
-   <term>
-    <constant>GEARMAN_INVALID_WORKER_FUNCTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Trying to register a function with a NULL callback function.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-no-registered-functions">
-   <term>
-    <constant>GEARMAN_NO_REGISTERED_FUNCTIONS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     When a worker gets a job for a function it did not register.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-no-jobs">
-   <term>
-    <constant>GEARMAN_NO_JOBS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     For a non-blocking worker, when <methodname>GearmanWorker::work</methodname> does not have
-     any active jobs.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-echo-data-corruption">
-   <term>
-    <constant>GEARMAN_ECHO_DATA_CORRUPTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     After <methodname>GearmanClient::echo</methodname> or <methodname>GearmanWorker::echo</methodname>
-     the data returned doesn't match the data sent.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-need-workload-fn">
-   <term>
-    <constant>GEARMAN_NEED_WORKLOAD_FN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     When the client opted to stream the workload of a task, but did not
-     specify a workload callback function.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-pause">
-   <term>
-    <constant>GEARMAN_PAUSE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     For the non-blocking client task interface, can be returned from the task callback
-     to "pause" the call and return from <methodname>GearmanClient::runTasks</methodname>.
-     Call <methodname>GearmanClient::runTasks</methodname> again to continue.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-unknown-state">
-   <term>
-    <constant>GEARMAN_UNKNOWN_STATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Internal client/worker state error.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-send-buffer-too-small">
-   <term>
-    <constant>GEARMAN_SEND_BUFFER_TOO_SMALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Internal error: trying to flush more data in one atomic chunk than is possible
-     due to hard-coded buffer sizes.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-timeout">
-   <term>
-    <constant>GEARMAN_TIMEOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Hit the timeout limit set by the client/worker.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <simpara>
-  <classname>GearmanClient</classname> options:
- </simpara>
- <variablelist>
-  <varlistentry xml:id="constant.gearman-client-generate-unique">
-   <term>
-    <constant>GEARMAN_CLIENT_GENERATE_UNIQUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Generate a unique id (UUID) for each task.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-client-non-blocking">
-   <term>
-    <constant>GEARMAN_CLIENT_NON_BLOCKING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Run the cient in a non-blocking mode.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-client-unbuffered-result">
-   <term>
-    <constant>GEARMAN_CLIENT_UNBUFFERED_RESULT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Allow the client to read data in chunks rather than have the library
-     buffer the entire data result and pass that back.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-client-free-tasks">
-   <term>
-    <constant>GEARMAN_CLIENT_FREE_TASKS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Automatically free task objects once they are complete.  This is the default
-     setting in this extension to prevent memory leaks.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <simpara>
-  <classname>GearmanWorker</classname> options:
- </simpara>
- <variablelist>
-  <varlistentry xml:id="constant.gearman-worker-non-blocking">
-   <term>
-    <constant>GEARMAN_WORKER_NON_BLOCKING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Run the worker in non-blocking mode.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-worker-grab-uniq">
-   <term>
-    <constant>GEARMAN_WORKER_GRAB_UNIQ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Return the client assigned unique ID in addition to the job handle.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <simpara>
-  Base Gearman configuration:
- </simpara>
- <variablelist>
-  <varlistentry xml:id="constant.gearman-default-tcp-host">
-   <term>
-    <constant>GEARMAN_DEFAULT_TCP_HOST</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-default-tcp-port">
-   <term>
-    <constant>GEARMAN_DEFAULT_TCP_PORT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-default-socket-timeout">
-   <term>
-    <constant>GEARMAN_DEFAULT_SOCKET_TIMEOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-default-socket-send-size">
-   <term>
-    <constant>GEARMAN_DEFAULT_SOCKET_SEND_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-default-socket-recv-size">
-   <term>
-    <constant>GEARMAN_DEFAULT_SOCKET_RECV_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-max-error-size">
-   <term>
-    <constant>GEARMAN_MAX_ERROR_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-packet-header-size">
-   <term>
-    <constant>GEARMAN_PACKET_HEADER_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-job-handle-size">
-   <term>
-    <constant>GEARMAN_JOB_HANDLE_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-option-size">
-   <term>
-    <constant>GEARMAN_OPTION_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-unique-size">
-   <term>
-    <constant>GEARMAN_UNIQUE_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-max-command-args">
-   <term>
-    <constant>GEARMAN_MAX_COMMAND_ARGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-args-buffer-size">
-   <term>
-    <constant>GEARMAN_ARGS_BUFFER_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-send-buffer-size">
-   <term>
-    <constant>GEARMAN_SEND_BUFFER_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-recv-buffer-size">
-   <term>
-    <constant>GEARMAN_RECV_BUFFER_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gearman-worker-wait-timeout">
-   <term>
-    <constant>GEARMAN_WORKER_WAIT_TIMEOUT</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/gearman/examples.xml b/reference/gearman/examples.xml
deleted file mode 100644
index 0d0e7a157d13..000000000000
--- a/reference/gearman/examples.xml
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearman.examples">
- &reftitle.examples;
- <section xml:id="gearman.examples-reverse">
-  <title>Basic usage</title>
-  <example>
-   <title>Basic Gearman client and worker</title>
-   <simpara>
-    This example shows a very simple client and worker.  The client sends a string
-    to the job server, and the worker reverses the string and sends it back.
-    The job is performed synchronously.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-# Send reverse job
-do
-{
-  $result = $gmclient->doNormal("reverse", "Hello!");
-
-  # Check for various return packets and errors.
-  switch($gmclient->returnCode())
-  {
-    case GEARMAN_WORK_DATA:
-      echo "Data: $result\n";
-      break;
-    case GEARMAN_WORK_STATUS:
-      list($numerator, $denominator)= $gmclient->doStatus();
-      echo "Status: $numerator/$denominator complete\n";
-      break;
-    case GEARMAN_WORK_FAIL:
-      echo "Failed\n";
-      exit;
-    case GEARMAN_SUCCESS:
-      echo "Success: $result\n";
-      break;
-    default:
-      echo "RET: " . $gmclient->returnCode() . "\n";
-      exit;
-  }
-}
-while($gmclient->returnCode() != GEARMAN_SUCCESS);
-
-?>
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server. Change the worker function to
-# "reverse_fn_fast" for a faster worker with no output.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " . ($x + 1) . "/$workload_size complete\n";
-    $job->sendStatus($x, $workload_size);
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-# A much simpler and less verbose version of the above function would be:
-function reverse_fn_fast($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-    &example.outputs.similar;
-   <screen>
-<![CDATA[
-% php reverse_worker.php
-Starting
-Waiting for job...
-Received job: H:foo.local:36
-Workload: Hello! (6)
-Sending status: 1/6 complete
-Sending status: 2/6 complete
-Sending status: 3/6 complete
-Sending status: 4/6 complete
-Sending status: 5/6 complete
-Sending status: 6/6 complete
-Result: !olleH
-]]>
-   </screen>
-   <screen>
-<![CDATA[
-% php reverse_client.php
-Starting
-Sending job
-Status: 1/6 complete
-Status: 2/6 complete
-Status: 3/6 complete
-Status: 4/6 complete
-Status: 5/6 complete
-Status: 6/6 complete
-Success: !olleH
-]]>
-   </screen>
-  </example>
- </section>
- <section xml:id="gearman.examples-reverse-bg">
-  <title>Basic Gearman client and worker, background</title>
-  <example>
-   <title>Basic Gearman client and worker, background</title>
-   <simpara>
-    This example shows a very simple client and worker.  The client sends a string
-    to the job server as a background job, and the worker reverses the string.
-    Note that since the work is performed asynchronously, the client does not
-    wait for the job to complete and exits (and hence the client never receives the results).
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# create our client object
-$gmclient= new GearmanClient();
-
-# add the default server (localhost)
-$gmclient->addServer();
-
-# run reverse client in the background
-$job_handle = $gmclient->doBackground("reverse", "this is a test");
-
-if ($gmclient->returnCode() != GEARMAN_SUCCESS)
-{
-  echo "bad return code\n";
-  exit;
-}
-
-echo "done!\n";
-
-?>
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server. Change the worker function to
-# "reverse_fn_fast" for a faster worker with no output.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " . ($x + 1) . "/$workload_size complete\n";
-    $job->sendStatus($x, $workload_size);
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-# A much simpler and less verbose version of the above function would be:
-function reverse_fn_fast($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-% php reverse_worker.php
-Starting
-Waiting for job...
-Received job: H:foo.local:41
-Workload: this is a test (14)
-1/14 complete
-2/14 complete
-3/14 complete
-4/14 complete
-5/14 complete
-6/14 complete
-7/14 complete
-8/14 complete
-9/14 complete
-10/14 complete
-11/14 complete
-12/14 complete
-13/14 complete
-14/14 complete
-Result: tset a si siht
-]]>
-   </screen>
-   <screen>
-<![CDATA[
-% php reverse_client_bg.php
-done!
-]]>
-   </screen>
-  </example>
- </section>
- <section xml:id="gearman.examples-reverse-task">
-  <title>Basic Gearman client and worker, submitting tasks</title>
-  <example>
-   <title>Basic Gearman client and worker, submitting tasks</title>
-   <simpara>
-    In this example, the basic reverse client extended to run two tasks in parallel.
-    The reverse worker is unchanged except to add sending of data back during processing.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# create the gearman client
-$gmc= new GearmanClient();
-
-# add the default server (localhost)
-$gmc->addServer();
-
-# register some callbacks
-$gmc->setCreatedCallback("reverse_created");
-$gmc->setDataCallback("reverse_data");
-$gmc->setStatusCallback("reverse_status");
-$gmc->setCompleteCallback("reverse_complete");
-$gmc->setFailCallback("reverse_fail");
-
-# set some arbitrary application data
-$data['foo'] = 'bar';
-
-# add two tasks
-$task= $gmc->addTask("reverse", "foo", $data);
-$task2= $gmc->addTaskLow("reverse", "bar", NULL);
-
-# run the tasks in parallel (assuming multiple workers)
-if (! $gmc->runTasks())
-{
-    echo "ERROR " . $gmc->error() . "\n";
-    exit;
-}
-
-echo "DONE\n";
-
-function reverse_created($task)
-{
-    echo "CREATED: " . $task->jobHandle() . "\n";
-}
-
-function reverse_status($task)
-{
-    echo "STATUS: " . $task->jobHandle() . " - " . $task->taskNumerator() .
-         "/" . $task->taskDenominator() . "\n";
-}
-
-function reverse_complete($task)
-{
-    echo "COMPLETE: " . $task->jobHandle() . ", " . $task->data() . "\n";
-}
-
-function reverse_fail($task)
-{
-    echo "FAILED: " . $task->jobHandle() . "\n";
-}
-
-function reverse_data($task)
-{
-    echo "DATA: " . $task->data() . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server. Change the worker function to
-# "reverse_fn_fast" for a faster worker with no output.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " . ($x + 1) . "/$workload_size complete\n";
-    $job->sendStatus($x+1, $workload_size);
-    $job->sendData(substr($workload, $x, 1));
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-# A much simpler and less verbose version of the above function would be:
-function reverse_fn_fast($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-% php reverse_worker.php
-Starting
-Waiting for job...
-Received job: H:foo.local:45
-Workload: foo (3)
-1/3 complete
-2/3 complete
-3/3 complete
-Result: oof
-Received job: H:foo.local:44
-Workload: bar (3)
-1/3 complete
-2/3 complete
-3/3 complete
-Result: rab
-]]>
-   </screen>
-   <screen>
-<![CDATA[
-% php reverse_client_task.php
-CREATED: H:foo.local:44
-CREATED: H:foo.local:45
-STATUS: H:foo.local:45 - 1/3
-DATA: f
-STATUS: H:foo.local:45 - 2/3
-DATA: o
-STATUS: H:foo.local:45 - 3/3
-DATA: o
-COMPLETE: H:foo.local:45, oof
-STATUS: H:foo.local:44 - 1/3
-DATA: b
-STATUS: H:foo.local:44 - 2/3
-DATA: a
-STATUS: H:foo.local:44 - 3/3
-DATA: r
-COMPLETE: H:foo.local:44, rab
-DONE
-]]>
-   </screen>
-  </example>
- </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/gearman/gearmanclient.xml b/reference/gearman/gearmanclient.xml
deleted file mode 100644
index 778ca848feef..000000000000
--- a/reference/gearman/gearmanclient.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gearmanclient" role="class">
-
- <title>The GearmanClient class</title>
- <titleabbrev>GearmanClient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GearmanClient intro -->
-  <section xml:id="gearmanclient.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a class for connecting to a Gearman job server and making requests to perform
-    some function on provided data.  The function performed must be one registered by a Gearman
-    worker and the data passed is opaque to the job server.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gearmanclient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>GearmanClient</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanclient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='GearmanClient'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='GearmanClient'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gearman.entities.gearmanclient;
-
-</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/gearman/gearmanclient/addoptions.xml b/reference/gearman/gearmanclient/addoptions.xml
deleted file mode 100644
index 8039ef67c2f6..000000000000
--- a/reference/gearman/gearmanclient/addoptions.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addoptions">
- <refnamediv>
-  <refname>GearmanClient::addOptions</refname>
-  <refpurpose>Add client options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::addOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds one or more options to those already set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to add.
-      One of the following constants, or a combination of
-      them using the bitwise OR operator (<quote>|</quote>):
-      <constant>GEARMAN_CLIENT_GENERATE_UNIQUE</constant>,
-      <constant>GEARMAN_CLIENT_NON_BLOCKING</constant>,
-      <constant>GEARMAN_CLIENT_UNBUFFERED_RESULT</constant> or
-      <constant>GEARMAN_CLIENT_FREE_TASKS</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/addserver.xml b/reference/gearman/gearmanclient/addserver.xml
deleted file mode 100644
index 9a3ada52174e..000000000000
--- a/reference/gearman/gearmanclient/addserver.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addserver">
- <refnamediv>
-  <refname>GearmanClient::addServer</refname>
-  <refpurpose>Add a job server to the client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::addServer</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>setupExceptionHandler</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a job server to a list of servers that can be used to run a task.  No socket
-   I/O happens here; the server is simply added to the list.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.host;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.port;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Adding two job servers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add two job servers, the first on the default 4730 port
-$gmclient->addServer("10.0.0.1");
-$gmclient->addServer("10.0.0.2", 7003);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addServers</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/gearman/gearmanclient/addservers.xml b/reference/gearman/gearmanclient/addservers.xml
deleted file mode 100644
index e2b173c4555c..000000000000
--- a/reference/gearman/gearmanclient/addservers.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addservers">
- <refnamediv>
-  <refname>GearmanClient::addServers</refname>
-  <refpurpose>Add a list of job servers to the client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::addServers</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>servers</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>setupExceptionHandler</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a list of job servers that can be used to run a task.  No socket I/O happens here;
-   the servers are simply added to the full list of servers.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>servers</parameter></term>
-    <listitem>
-     <simpara>
-      A comma-separated list of servers, each server specified in the format &apos;<literal>host:port</literal>&apos;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Add two job servers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add multiple job servers, the first on the default 4730 port
-$gmclient->addServers("10.0.0.1,10.0.0.2:7003");
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addServer</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/gearman/gearmanclient/addtask.xml b/reference/gearman/gearmanclient/addtask.xml
deleted file mode 100644
index 13320269a24d..000000000000
--- a/reference/gearman/gearmanclient/addtask.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtask">
- <refnamediv>
-  <refname>GearmanClient::addTask</refname>
-  <refpurpose>Add a task to be run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTask</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a task to be run in parallel with other tasks.  Call this method for all the tasks
-   to be run in parallel, then call <methodname>GearmanClient::runTasks</methodname> to
-   perform the work.  Note that enough workers need to be available for the tasks to all
-   run in parallel.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
- <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic submission of two tasks</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Create our gearman client
-$gmclient= new GearmanClient();
-
-# add the default job server
-$gmclient->addServer();
-
-# set a function to be called when the work is complete
-$gmclient->setCompleteCallback("complete");
-
-# add a task to perform the "reverse" function on the string "Hello World!"
-$gmclient->addTask("reverse", "Hello World!", null, "1");
-
-# add another task to perform the "reverse" function on the string "!dlroW olleH"
-$gmclient->addTask("reverse", "!dlroW olleH", null, "2");
-
-# run the tasks
-$gmclient->runTasks();
-
-function complete($task)
-{
-  print "COMPLETE: " . $task->unique() . ", " . $task->data() . "\n";
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-COMPLETE: 2, Hello World!
-COMPLETE: 1, !dlroW olleH
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Basic submission of two tasks with passing application context</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$client = new GearmanClient();
-$client->addServer();
-
-# set a function to be called when the work is complete
-$client->setCompleteCallback("reverse_complete");
-
-# Add some tasks for a placeholder of where to put the results
-$results = array();
-$client->addTask("reverse", "Hello World!", $results, "t1");
-$client->addTask("reverse", "!dlroW olleH", $results, "t2");
-
-$client->runTasks();
-
-# The results should now be filled in from the callbacks
-foreach ($results as $id => $result)
-   echo $id . ": " . $result['handle'] . ", " . $result['data'] . "\n";
-
-
-function reverse_complete($task, $results)
-{
-   $results[$task->unique()] = array("handle"=>$task->jobHandle(), "data"=>$task->data());
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-t2: H.foo:21, Hello World!
-t1: H:foo:22, !dlroW olleH
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTaskHigh</methodname></member>
-   <member><methodname>GearmanClient::addTaskLow</methodname></member>
-   <member><methodname>GearmanClient::addTaskBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskHighBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskLowBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtaskbackground.xml b/reference/gearman/gearmanclient/addtaskbackground.xml
deleted file mode 100644
index 63549ceb7ed4..000000000000
--- a/reference/gearman/gearmanclient/addtaskbackground.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtaskbackground">
- <refnamediv>
-  <refname>GearmanClient::addTaskBackground</refname>
-  <refpurpose>Add a background task to be run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskBackground</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a background task to be run in parallel with other tasks.  Call this method for all the tasks
-   to be run in parallel, then call <methodname>GearmanClient::runTasks</methodname> to
-   perform the work.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Two tasks, one background and one not</title>
-   <simpara>
-    This example illustrates the difference between running a background task
-    and a normal task.  The client adds two tasks to execute the same function,
-    but one is added with <methodname>addTaskBackground</methodname>.  A callback is
-    set so that progress of the job can be tracked.  A simple worker with an
-    artificial delay reports on the job progress and the client picks this up
-    through the callback.  Two workers are run for this example.  Note that the
-    background task does not show in the client output.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# The client script
-
-# create our gearman client
-$gmc= new GearmanClient();
-
-# add the default job server
-$gmc->addServer();
-
-# set a couple of callbacks so we can track progress
-$gmc->setCompleteCallback("reverse_complete");
-$gmc->setStatusCallback("reverse_status");
-
-# add a task for the "reverse" function
-$task= $gmc->addTask("reverse", "Hello World!", null, "1");
-
-# add another task, but this one to run in the background
-$task= $gmc->addTaskBackground("reverse", "!dlroW olleH", null, "2");
-
-if (! $gmc->runTasks())
-{
-    echo "ERROR " . $gmc->error() . "\n";
-    exit;
-}
-
-echo "DONE\n";
-
-function reverse_status($task)
-{
-    echo "STATUS: " . $task->unique() . ", " . $task->jobHandle() . " - " . $task->taskNumerator() .
-         "/" . $task->taskDenominator() . "\n";
-}
-
-function reverse_complete($task)
-{
-    echo "COMPLETE: " . $task->unique() . ", " . $task->data() . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# The worker script
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " . ($x + 1) . "/$workload_size complete\n";
-    $job->sendStatus($x+1, $workload_size);
-    $job->sendData(substr($workload, $x, 1));
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    Worker output for two workers running:
-   </simpara>
-   <screen>
-<![CDATA[
-Received job: H:foo.local:65
-Workload: !dlroW olleH (12)
-1/12 complete
-Received job: H:foo.local:66
-Workload: Hello World! (12)
-Sending status: 1/12 complete
-Sending status: 2/12 complete
-Sending status: 2/12 complete
-Sending status: 3/12 complete
-Sending status: 3/12 complete
-Sending status: 4/12 complete
-Sending status: 4/12 complete
-Sending status: 5/12 complete
-Sending status: 5/12 complete
-Sending status: 6/12 complete
-Sending status: 6/12 complete
-Sending status: 7/12 complete
-Sending status: 7/12 complete
-Sending status: 8/12 complete
-Sending status: 8/12 complete
-Sending status: 9/12 complete
-Sending status: 9/12 complete
-Sending status: 10/12 complete
-Sending status: 10/12 complete
-Sending status: 11/12 complete
-Sending status: 11/12 complete
-Sending status: 12/12 complete
-Sending status: 12/12 complete
-Result: !dlroW olleH
-Result: Hello World!
-]]>
-   </screen>
-   <simpara>
-    Client output:
-   </simpara>
-   <screen>
-<![CDATA[
-STATUS: 1, H:foo.local:66 - 1/12
-STATUS: 1, H:foo.local:66 - 2/12
-STATUS: 1, H:foo.local:66 - 3/12
-STATUS: 1, H:foo.local:66 - 4/12
-STATUS: 1, H:foo.local:66 - 5/12
-STATUS: 1, H:foo.local:66 - 6/12
-STATUS: 1, H:foo.local:66 - 7/12
-STATUS: 1, H:foo.local:66 - 8/12
-STATUS: 1, H:foo.local:66 - 9/12
-STATUS: 1, H:foo.local:66 - 10/12
-STATUS: 1, H:foo.local:66 - 11/12
-STATUS: 1, H:foo.local:66 - 12/12
-COMPLETE: 1, !dlroW olleH
-DONE
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</methodname></member>
-   <member><methodname>GearmanClient::addTaskHigh</methodname></member>
-   <member><methodname>GearmanClient::addTaskLow</methodname></member>
-   <member><methodname>GearmanClient::addTaskHighBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskLowBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtaskhigh.xml b/reference/gearman/gearmanclient/addtaskhigh.xml
deleted file mode 100644
index db6b7527685e..000000000000
--- a/reference/gearman/gearmanclient/addtaskhigh.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtaskhigh">
- <refnamediv>
-  <refname>GearmanClient::addTaskHigh</refname>
-  <refpurpose>Add a high priority task to run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskHigh</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a high priority task to be run in parallel with other tasks.  Call this method for all
-   the high priority tasks to be run in parallel, then call
-   <methodname>GearmanClient::runTasks</methodname> to perform the work.  Tasks with a high
-   priority will be selected from the queue before those of normal or low priority.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A high priority task along with two normal tasks</title>
-   <simpara>
-    A high priority task is included among two other tasks.  A single worker
-    is available, so that tasks are run one at a time, with the high priority
-    task run first.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# create the gearman client
-$gmc= new GearmanClient();
-
-# add the default job server
-$gmc->addServer();
-
-# set the callback for when the job is complete
-$gmc->setCompleteCallback("reverse_complete");
-
-# add tasks, one of which is high priority
-$task= $gmc->addTask("reverse", "Hello World!", null, "1");
-$task= $gmc->addTaskHigh("reverse", "!dlroW olleH", null, "2");
-$task= $gmc->addTask("reverse", "Hello World!", null, "3");
-
-if (! $gmc->runTasks())
-{
-    echo "ERROR " . $gmc->error() . "\n";
-    exit;
-}
-echo "DONE\n";
-
-function reverse_complete($task)
-{
-    echo "COMPLETE: " . $task->unique() . ", " . $task->data() . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-COMPLETE: 2, Hello World!
-COMPLETE: 3, !dlroW olleH
-COMPLETE: 1, !dlroW olleH
-DONE
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</methodname></member>
-   <member><methodname>GearmanClient::addTaskLow</methodname></member>
-   <member><methodname>GearmanClient::addTaskBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskHighBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskLowBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtaskhighbackground.xml b/reference/gearman/gearmanclient/addtaskhighbackground.xml
deleted file mode 100644
index fe7c877cddf9..000000000000
--- a/reference/gearman/gearmanclient/addtaskhighbackground.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtaskhighbackground">
- <refnamediv>
-  <refname>GearmanClient::addTaskHighBackground</refname>
-  <refpurpose>Add a high priority background task to be run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskHighBackground</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a high priority background task to be run in parallel with other tasks.
-   Call this method for all the tasks to be run in parallel, then call
-   <methodname>GearmanClient::runTasks</methodname> to perform the work. Tasks with a high
-   priority will be selected from the queue before those of normal or low priority.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</methodname></member>
-   <member><methodname>GearmanClient::addTaskHigh</methodname></member>
-   <member><methodname>GearmanClient::addTaskLow</methodname></member>
-   <member><methodname>GearmanClient::addTaskBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskLowBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtasklow.xml b/reference/gearman/gearmanclient/addtasklow.xml
deleted file mode 100644
index 90d168b96742..000000000000
--- a/reference/gearman/gearmanclient/addtasklow.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtasklow">
- <refnamediv>
-  <refname>GearmanClient::addTaskLow</refname>
-  <refpurpose>Add a low priority task to run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskLow</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a low priority background task to be run in parallel with other tasks.
-   Call this method for all the tasks to be run in parallel, then call
-   <methodname>GearmanClient::runTasks</methodname> to perform the work. Tasks with a low
-   priority will be selected from the queue after those of normal or low priority.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A low priority task along with two normal tasks</title>
-   <simpara>
-    A low priority task is included among two other tasks.  A single worker
-    is available, so that tasks are run one at a time, with the low priority
-    task run last.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# create the gearman client
-$gmc= new GearmanClient();
-
-# add the default job server
-$gmc->addServer();
-
-# set the callback for when the job is complete
-$gmc->setCompleteCallback("reverse_complete");
-
-# add tasks, one of which is low priority
-$task= $gmc->addTask("reverse", "Hello World!", null, "1");
-$task= $gmc->addTaskLow("reverse", "!dlroW olleH", null, "2");
-$task= $gmc->addTask("reverse", "Hello World!", null, "3");
-
-if (! $gmc->runTasks())
-{
-    echo "ERROR " . $gmc->error() . "\n";
-    exit;
-}
-echo "DONE\n";
-
-function reverse_complete($task)
-{
-    echo "COMPLETE: " . $task->unique() . ", " . $task->data() . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-COMPLETE: 3, !dlroW olleH
-COMPLETE: 1, !dlroW olleH
-COMPLETE: 2, Hello World!
-DONE
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</methodname></member>
-   <member><methodname>GearmanClient::addTaskHigh</methodname></member>
-   <member><methodname>GearmanClient::addTaskBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskHighBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskLowBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtasklowbackground.xml b/reference/gearman/gearmanclient/addtasklowbackground.xml
deleted file mode 100644
index 808735094098..000000000000
--- a/reference/gearman/gearmanclient/addtasklowbackground.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtasklowbackground">
- <refnamediv>
-  <refname>GearmanClient::addTaskLowBackground</refname>
-  <refpurpose>Add a low priority background task to be run in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskLowBackground</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique_key</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a low priority background task to be run in parallel with other tasks.
-   Call this method for all the tasks to be run in parallel, then call
-   <methodname>GearmanClient::runTasks</methodname> to perform the work. Tasks with a low
-   priority will be selected from the queue after those of normal or high priority.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.context;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique_key</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; if the task could not be added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</methodname></member>
-   <member><methodname>GearmanClient::addTaskHigh</methodname></member>
-   <member><methodname>GearmanClient::addTaskLow</methodname></member>
-   <member><methodname>GearmanClient::addTaskBackground</methodname></member>
-   <member><methodname>GearmanClient::addTaskHighBackground</methodname></member>
-   <member><methodname>GearmanClient::runTasks</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/gearman/gearmanclient/addtaskstatus.xml b/reference/gearman/gearmanclient/addtaskstatus.xml
deleted file mode 100644
index effcff32352b..000000000000
--- a/reference/gearman/gearmanclient/addtaskstatus.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.addtaskstatus">
- <refnamediv>
-  <refname>GearmanClient::addTaskStatus</refname>
-  <refpurpose>Add a task to get status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanClient::addTaskStatus</methodname>
-   <methodparam><type>string</type><parameter>job_handle</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Used to request status information from the Gearman server, which will call the specified
-   status callback (set using <methodname>GearmanClient::setStatusCallback</methodname>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>job_handle</parameter></term>
-    <listitem>
-     <simpara>
-      The job handle for the task to get status for
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      Data to be passed to the status callback, generally a reference to an array or object
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Monitor completion of multiple background tasks</title>
-   <simpara>
-    An artificial delay is introduced in the worker in this example to simulate
-    a long running process. There is only one worker running for this example.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* create our object */
-$gmclient= new GearmanClient();
-
-/* add the default server */
-$gmclient->addServer();
-
-/* start some background jobs and save the handles */
-$handles = array();
-$handles[0] = $gmclient->doBackground("reverse", "Hello World!");
-$handles[1] = $gmclient->doBackground("reverse", "!dlroW olleH");
-
-$gmclient->setStatusCallback("reverse_status");
-
-/* Poll the server to see when those background jobs finish; */
-/* a better method would be to use event callbacks */
-do
-{
-   /* Use the context variable to track how many tasks have completed */
-   $done = 0;
-   $gmclient->addTaskStatus($handles[0], $done);
-   $gmclient->addTaskStatus($handles[1], $done);
-   $gmclient->runTasks();
-   echo "Done: $done\n";
-   sleep(1);
-}
-while ($done != 2);
-
-function reverse_status($task, $done)
-{
-   if (!$task->isKnown())
-      $done++;
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 0
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 1
-Done: 2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setStatusCallback</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/gearman/gearmanclient/clearcallbacks.xml b/reference/gearman/gearmanclient/clearcallbacks.xml
deleted file mode 100644
index 114927ab1f37..000000000000
--- a/reference/gearman/gearmanclient/clearcallbacks.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.clearcallbacks">
- <refnamediv>
-  <refname>GearmanClient::clearCallbacks</refname>
-  <refpurpose>Clear all task callback functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::clearCallbacks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Clears all the task callback functions that have previously been set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/clone.xml b/reference/gearman/gearmanclient/clone.xml
deleted file mode 100644
index 7f592589516c..000000000000
--- a/reference/gearman/gearmanclient/clone.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.clone">
- <refnamediv>
-  <refname>GearmanClient::clone</refname>
-  <refpurpose>Create a copy of a <classname>GearmanClient</classname> object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GearmanClient</type><methodname>GearmanClient::clone</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Creates a copy of a <classname>GearmanClient</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanClient</classname> on success, &false; on failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/construct.xml b/reference/gearman/gearmanclient/construct.xml
deleted file mode 100644
index 8c7f01bc4688..000000000000
--- a/reference/gearman/gearmanclient/construct.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.construct">
- <refnamediv>
-  <refname>GearmanClient::__construct</refname>
-  <refpurpose>Create a GearmanClient instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="GearmanClient">
-   <modifier>public</modifier> <methodname>GearmanClient::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   Creates a <classname>GearmanClient</classname> instance representing a client that connects to the
-   job server and submits tasks to complete.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanClient</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::clone</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/gearman/gearmanclient/context.xml b/reference/gearman/gearmanclient/context.xml
deleted file mode 100644
index b9b1e5a6538f..000000000000
--- a/reference/gearman/gearmanclient/context.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.context">
- <refnamediv>
-  <refname>GearmanClient::context</refname>
-  <refpurpose>Get the application context</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::context</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get the application context previously set with <methodname>GearmanClient::setContext</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The same context data structure set with <methodname>GearmanClient::setContext</methodname>
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setContext</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/gearman/gearmanclient/data.xml b/reference/gearman/gearmanclient/data.xml
deleted file mode 100644
index 1cad9960ba55..000000000000
--- a/reference/gearman/gearmanclient/data.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.data">
- <refnamediv>
-  <refname>GearmanClient::data</refname>
-  <refpurpose>Get the application data (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::data</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get the application data previously set with <methodname>GearmanClient::setData</methodname>.
-  </simpara>
-  <note>
-   <simpara>
-    This method was replaced by <methodname>GearmanClient::setContext</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The same string data set with <methodname>GearmanClient::setData</methodname>
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setData</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/gearman/gearmanclient/do.xml b/reference/gearman/gearmanclient/do.xml
deleted file mode 100644
index dcc415469a03..000000000000
--- a/reference/gearman/gearmanclient/do.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.do">
- <refnamediv>
-  <refname>GearmanClient::do</refname>
-  <refpurpose>Run a single task and return a result [deprecated]</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::do</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>unique</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <methodname>GearmanClient::do</methodname> method is deprecated as of
-   pecl/gearman 1.0.0. Use <methodname>GearmanClient::doNormal</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string representing the results of running a task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Simple job submission with immediate return</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Client code
-
-echo "Starting\n";
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-$result = $gmclient->doNormal("reverse", "Hello!");
-
-echo "Success: $result\n";
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server. Change the worker function to
-# "reverse_fn_fast" for a faster worker with no output.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Starting
-Sending job
-Success: !olleH
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Submitting a job and retrieving incremental status</title>
-    <simpara>
-     A job is submitted and the script loops to retrieve status information.
-     The worker has an artificial delay which results in a long running job
-     and sends status and data as processing occurs.
-     Each subsequent call to <methodname>GearmanClient::do</methodname>
-     produces status information on the running job.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Client code
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-# Send reverse job
-do
-{
-  $result = $gmclient->doNormal("reverse", "Hello!");
-  # Check for various return packets and errors.
-
-  switch($gmclient->returnCode())
-  {
-    case GEARMAN_WORK_DATA:
-      echo "Data: $result\n";
-      break;
-    case GEARMAN_WORK_STATUS:
-      list($numerator, $denominator)= $gmclient->doStatus();
-      echo "Status: $numerator/$denominator complete\n";
-      break;
-    case GEARMAN_WORK_FAIL:
-      echo "Failed\n";
-      exit;
-    case GEARMAN_SUCCESS:
-      break;
-    default:
-      echo "RET: " . $gmclient->returnCode() . "\n";
-      echo "Error: " . $gmclient->error() . "\n";
-      echo "Errno: " . $gmclient->getErrno() . "\n";
-      exit;
-  }
-}
-while($gmclient->returnCode() != GEARMAN_SUCCESS);
-
-echo "Success: $result\n";
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Worker code
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " + $x + 1 . "/$workload_size complete\n";
-    $job->sendStatus($x+1, $workload_size);
-    $job->sendData(substr($workload, $x, 1));
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <simpara>
-     Worker output:
-    </simpara>
-    <screen>
-<![CDATA[
-Starting
-Waiting for job...
-Received job: H:foo.local:106
-Workload: Hello! (6)
-1/6 complete
-2/6 complete
-3/6 complete
-4/6 complete
-5/6 complete
-6/6 complete
-Result: !olleH
-]]>
-    </screen>
-    <simpara>
-     Client output:
-    </simpara>
-    <screen>
-<![CDATA[
-Starting
-Sending job
-Status: 1/6 complete
-Data: H
-Status: 2/6 complete
-Data: e
-Status: 3/6 complete
-Data: l
-Status: 4/6 complete
-Data: l
-Status: 5/6 complete
-Data: o
-Status: 6/6 complete
-Data: !
-Success: !olleH
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dobackground.xml b/reference/gearman/gearmanclient/dobackground.xml
deleted file mode 100644
index f2aae86ee357..000000000000
--- a/reference/gearman/gearmanclient/dobackground.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dobackground">
- <refnamediv>
-  <refname>GearmanClient::doBackground</refname>
-  <refpurpose>Run a task in the background</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doBackground</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a task in the background, returning a job handle which can be used
-   to get the status of the running task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The job handle for the submitted task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Submit and monitor a background job</title>
-   <simpara>
-    The worker in this example has an artificial delay introduced to mimic
-    a long running job.  The client script periodically checks the status
-    of the running job.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* create our object */
-$gmclient= new GearmanClient();
-
-/* add the default server */
-$gmclient->addServer();
-
-/* run reverse client */
-$job_handle = $gmclient->doBackground("reverse", "this is a test");
-
-if ($gmclient->returnCode() != GEARMAN_SUCCESS)
-{
-  echo "bad return code\n";
-  exit;
-}
-
-$done = false;
-do
-{
-   sleep(3);
-   $stat = $gmclient->jobStatus($job_handle);
-   if (!$stat[0]) // the job is known so it is not done
-      $done = true;
-   echo "Running: " . ($stat[1] ? "true" : "false") . ", numerator: " . $stat[2] . ", denominator: " . $stat[3] . "\n";
-}
-while(!$done);
-
-echo "done!\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Running: true, numerator: 3, denominator: 14
-Running: true, numerator: 6, denominator: 14
-Running: true, numerator: 9, denominator: 14
-Running: true, numerator: 12, denominator: 14
-Running: false, numerator: 0, denominator: 0
-done!
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dohigh.xml b/reference/gearman/gearmanclient/dohigh.xml
deleted file mode 100644
index 2952d132b2d3..000000000000
--- a/reference/gearman/gearmanclient/dohigh.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dohigh">
- <refnamediv>
-  <refname>GearmanClient::doHigh</refname>
-  <refpurpose>Run a single high priority task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doHigh</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a single high priority task and returns a string representation of the result.  It is up to
-   the <classname>GearmanClient</classname> and <classname>GearmanWorker</classname> to
-   agree on the format of the result.  High priority tasks will get precedence over normal
-   and low priority tasks in the job queue.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string representing the results of running a task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dohighbackground.xml b/reference/gearman/gearmanclient/dohighbackground.xml
deleted file mode 100644
index 57cb25dec4c0..000000000000
--- a/reference/gearman/gearmanclient/dohighbackground.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dohighbackground">
- <refnamediv>
-  <refname>GearmanClient::doHighBackground</refname>
-  <refpurpose>Run a high priority task in the background</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doHighBackground</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a high priority task in the background, returning a job handle which can be used
-   to get the status of the running task.  High priority tasks take precedence over normal
-   and low priority tasks in the job queue.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The job handle for the submitted task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dojobhandle.xml b/reference/gearman/gearmanclient/dojobhandle.xml
deleted file mode 100644
index d0b5e063a02e..000000000000
--- a/reference/gearman/gearmanclient/dojobhandle.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dojobhandle">
- <refnamediv>
-  <refname>GearmanClient::doJobHandle</refname>
-  <refpurpose>Get the job handle for the running task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doJobHandle</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets that job handle for a running task.  This should be used between repeated
-   <methodname>GearmanClient::doNormal</methodname> calls.  The job handle can then be used
-   to get information on the task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The job handle for the running task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::jobStatus</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/gearman/gearmanclient/dolow.xml b/reference/gearman/gearmanclient/dolow.xml
deleted file mode 100644
index e2c7f8f1669e..000000000000
--- a/reference/gearman/gearmanclient/dolow.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dolow">
- <refnamediv>
-  <refname>GearmanClient::doLow</refname>
-  <refpurpose>Run a single low priority task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doLow</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a single low priority task and returns a string representation of the result.  It is up to
-   the <classname>GearmanClient</classname> and <classname>GearmanWorker</classname> to
-   agree on the format of the result.  Normal and high priority tasks will get precedence over
-   low priority tasks in the job queue.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string representing the results of running a task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dolowbackground.xml b/reference/gearman/gearmanclient/dolowbackground.xml
deleted file mode 100644
index a449213456d7..000000000000
--- a/reference/gearman/gearmanclient/dolowbackground.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dolowbackground">
- <refnamediv>
-  <refname>GearmanClient::doLowBackground</refname>
-  <refpurpose>Run a low priority task in the background</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doLowBackground</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a low priority task in the background, returning a job handle which can be used
-   to get the status of the running task.  Normal and high priority tasks take precedence over
-   low priority tasks in the job queue.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The job handle for the submitted task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</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/gearman/gearmanclient/donormal.xml b/reference/gearman/gearmanclient/donormal.xml
deleted file mode 100644
index 7927f0be1793..000000000000
--- a/reference/gearman/gearmanclient/donormal.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.donormal">
- <refnamediv>
-  <refname>GearmanClient::doNormal</refname>
-  <refpurpose>Run a single task and return a result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanClient::doNormal</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>unique</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Runs a single task and returns a string representation of the result.  It is up to
-   the <classname>GearmanClient</classname> and <classname>GearmanWorker</classname> to
-   agree on the format of the result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.functionname;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.workload;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.unique;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string representing the results of running a task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Simple job submission with immediate return</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Client code
-
-echo "Starting\n";
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-$result = $gmclient->doNormal("reverse", "Hello!");
-
-echo "Success: $result\n";
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server. Change the worker function to
-# "reverse_fn_fast" for a faster worker with no output.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Starting
-Sending job
-Success: !olleH
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Submitting a job and retrieving incremental status</title>
-    <simpara>
-     A job is submitted and the script loops to retrieve status information.
-     The worker has an artificial delay which results in a long running job
-     and sends status and data as processing occurs.
-     Each subsequent call to <methodname>GearmanClient::doNormal</methodname>
-     produces status information on the running job.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Client code
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-# Send reverse job
-do
-{
-  $result = $gmclient->doNormal("reverse", "Hello!");
-  # Check for various return packets and errors.
-
-  switch($gmclient->returnCode())
-  {
-    case GEARMAN_WORK_DATA:
-      echo "Data: $result\n";
-      break;
-    case GEARMAN_WORK_STATUS:
-      list($numerator, $denominator)= $gmclient->doStatus();
-      echo "Status: $numerator/$denominator complete\n";
-      break;
-    case GEARMAN_WORK_FAIL:
-      echo "Failed\n";
-      exit;
-    case GEARMAN_SUCCESS:
-      break;
-    default:
-      echo "RET: " . $gmclient->returnCode() . "\n";
-      echo "Error: " . $gmclient->error() . "\n";
-      echo "Errno: " . $gmclient->getErrno() . "\n";
-      exit;
-  }
-}
-while($gmclient->returnCode() != GEARMAN_SUCCESS);
-
-echo "Success: $result\n";
-
-?>
-]]>
-    </programlisting>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-# Worker code
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-print "Waiting for job...\n";
-while($gmworker->work())
-{
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-function reverse_fn($job)
-{
-  echo "Received job: " . $job->handle() . "\n";
-
-  $workload = $job->workload();
-  $workload_size = $job->workloadSize();
-
-  echo "Workload: $workload ($workload_size)\n";
-
-  # This status loop is not needed, just showing how it works
-  for ($x= 0; $x < $workload_size; $x++)
-  {
-    echo "Sending status: " + $x + 1 . "/$workload_size complete\n";
-    $job->sendStatus($x+1, $workload_size);
-    $job->sendData(substr($workload, $x, 1));
-    sleep(1);
-  }
-
-  $result= strrev($workload);
-  echo "Result: $result\n";
-
-  # Return what we want to send back to the client.
-  return $result;
-}
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <simpara>
-     Worker output:
-    </simpara>
-    <screen>
-<![CDATA[
-Starting
-Waiting for job...
-Received job: H:foo.local:106
-Workload: Hello! (6)
-1/6 complete
-2/6 complete
-3/6 complete
-4/6 complete
-5/6 complete
-6/6 complete
-Result: !olleH
-]]>
-    </screen>
-    <simpara>
-     Client output:
-    </simpara>
-    <screen>
-<![CDATA[
-Starting
-Sending job
-Status: 1/6 complete
-Data: H
-Status: 2/6 complete
-Data: e
-Status: 3/6 complete
-Data: l
-Status: 4/6 complete
-Data: l
-Status: 5/6 complete
-Data: o
-Status: 6/6 complete
-Data: !
-Success: !olleH
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doHigh</methodname></member>
-   <member><methodname>GearmanClient::doLow</methodname></member>
-   <member><methodname>GearmanClient::doBackground</methodname></member>
-   <member><methodname>GearmanClient::doHighBackground</methodname></member>
-   <member><methodname>GearmanClient::doLowBackground</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/gearman/gearmanclient/dostatus.xml b/reference/gearman/gearmanclient/dostatus.xml
deleted file mode 100644
index 7cea79105271..000000000000
--- a/reference/gearman/gearmanclient/dostatus.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.dostatus">
- <refnamediv>
-  <refname>GearmanClient::doStatus</refname>
-  <refpurpose>Get the status for the running task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>array</type><methodname>GearmanClient::doStatus</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the status for the running task.  This should be used between repeated
-   <methodname>GearmanClient::doNormal</methodname> calls.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array representing the percentage completion given as a fraction, with the
-   first element the numerator and the second element the denomintor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Get the status of a long running job</title>
-   <simpara>
-    The worker in this example has an artificial delay added during processing of the
-    string to be reversed.  After each delay it calls <methodname>GearmanJob::status</methodname>
-    which the client then picks up.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our client object.
-$gmclient= new GearmanClient();
-
-# Add default server (localhost).
-$gmclient->addServer();
-
-echo "Sending job\n";
-
-# Send reverse job
-do
-{
-  $result = $gmclient->doNormal("reverse", "Hello!");
-
-  # Check for various return packets and errors.
-  switch($gmclient->returnCode())
-  {
-    case GEARMAN_WORK_DATA:
-      break;
-    case GEARMAN_WORK_STATUS:
-      # get the current job status
-      list($numerator, $denominator)= $gmclient->doStatus();
-      echo "Status: $numerator/$denominator complete\n";
-      break;
-    case GEARMAN_WORK_FAIL:
-      echo "Failed\n";
-      exit;
-    case GEARMAN_SUCCESS:
-      break;
-    default:
-      echo "RET: " . $gmclient->returnCode() . "\n";
-      exit;
-  }
-}
-while($gmclient->returnCode() != GEARMAN_SUCCESS);
-
-echo "Success: $result\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Starting
-Sending job
-Status: 1/6 complete
-Status: 2/6 complete
-Status: 3/6 complete
-Status: 4/6 complete
-Status: 5/6 complete
-Status: 6/6 complete
-Success: !olleH
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doNormal</methodname></member>
-   <member><methodname>GearmanJob::status</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/gearman/gearmanclient/echo.xml b/reference/gearman/gearmanclient/echo.xml
deleted file mode 100644
index 8a0725deba57..000000000000
--- a/reference/gearman/gearmanclient/echo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.echo">
- <refnamediv>
-  <refname>GearmanClient::echo</refname>
-  <refpurpose>Send data to all job servers to see if they echo it back [deprecated]</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::echo</methodname>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <methodname>GearmanClient::echo</methodname> method is deprecated as of
-   pecl/gearman 1.0.0. Use <methodname>GearmanClient::ping</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      Some arbitrary serialized data to be echo back
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/error.xml b/reference/gearman/gearmanclient/error.xml
deleted file mode 100644
index 9b5fc5b1a82d..000000000000
--- a/reference/gearman/gearmanclient/error.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.error">
- <refnamediv>
-  <refname>GearmanClient::error</refname>
-  <refpurpose>Returns an error string for the last error encountered</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>GearmanClient::error</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns an error string for the last error encountered.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A human readable error string, or &false; if there is no error message available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::getErrno</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/gearman/gearmanclient/geterrno.xml b/reference/gearman/gearmanclient/geterrno.xml
deleted file mode 100644
index ed05d4ae1a6f..000000000000
--- a/reference/gearman/gearmanclient/geterrno.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.geterrno">
- <refnamediv>
-  <refname>GearmanClient::getErrno</refname>
-  <refpurpose>Get an errno value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanClient::getErrno</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Value of errno in the case of a GEARMAN_ERRNO return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid Gearman errno.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::error</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/gearman/gearmanclient/jobstatus.xml b/reference/gearman/gearmanclient/jobstatus.xml
deleted file mode 100644
index 66361d1977a8..000000000000
--- a/reference/gearman/gearmanclient/jobstatus.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.jobstatus">
- <refnamediv>
-  <refname>GearmanClient::jobStatus</refname>
-  <refname>gearman_job_status</refname>
-  <refpurpose>Get the status of a background job</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis role="GearmanClient">
-    <modifier>public</modifier> <type>array</type><methodname>GearmanClient::jobStatus</methodname>
-    <methodparam><type>string</type><parameter>job_handle</parameter></methodparam>
-   </methodsynopsis>
-   <simpara>
-    Gets the status for a background job given a job handle.  The status information will
-    specify whether the job is known, whether the job is currently running, and
-    the percentage completion.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>job_handle</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.jobhandle;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array containing status information for the job corresponding to the supplied
-   job handle.  The first array element is a boolean indicating whether the job is
-   even known, the second is a boolean indicating whether the job is still running,
-   and the third and fourth elements correspond to the numerator and denominator
-   of the fractional completion percentage, respectively.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Monitor the status of a long running background job</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* create our object */
-$gmclient= new GearmanClient();
-
-/* add the default server */
-$gmclient->addServer();
-
-/* run reverse client */
-$job_handle = $gmclient->doBackground("reverse", "this is a test");
-
-if ($gmclient->returnCode() != GEARMAN_SUCCESS)
-{
-  echo "bad return code\n";
-  exit;
-}
-
-$done = false;
-do
-{
-   sleep(3);
-   $stat = $gmclient->jobStatus($job_handle);
-   if (!$stat[0]) // the job is known so it is not done
-      $done = true;
-   echo "Running: " . ($stat[1] ? "true" : "false") . ", numerator: " . $stat[2] . ", denominator: " . $stat[3] . "\n";
-}
-while(!$done);
-
-echo "done!\n";
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Running: true, numerator: 3, denominator: 14
-Running: true, numerator: 6, denominator: 14
-Running: true, numerator: 9, denominator: 14
-Running: true, numerator: 12, denominator: 14
-Running: false, numerator: 0, denominator: 0
-done!
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doStatus</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/gearman/gearmanclient/ping.xml b/reference/gearman/gearmanclient/ping.xml
deleted file mode 100644
index 2e9c6e0396aa..000000000000
--- a/reference/gearman/gearmanclient/ping.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.ping">
- <refnamediv>
-  <refname>GearmanClient::ping</refname>
-  <refpurpose>Send data to all job servers to see if they echo it back</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::ping</methodname>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends some arbitrary data to all job servers to see if they echo it back.  The data sent
-   is not used or processed in any other way.  Primarily used for testing and debugging.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      Some arbitrary serialized data to be echo back
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/removeoptions.xml b/reference/gearman/gearmanclient/removeoptions.xml
deleted file mode 100644
index 563cc33f7c3d..000000000000
--- a/reference/gearman/gearmanclient/removeoptions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.removeoptions">
- <refnamediv>
-  <refname>GearmanClient::removeOptions</refname>
-  <refpurpose>Remove client options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::removeOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes (unsets) one or more options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to be removed (unset)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/returncode.xml b/reference/gearman/gearmanclient/returncode.xml
deleted file mode 100644
index f2338fe14d74..000000000000
--- a/reference/gearman/gearmanclient/returncode.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.returncode">
- <refnamediv>
-  <refname>GearmanClient::returnCode</refname>
-  <refpurpose>Get the last Gearman return code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanClient::returnCode</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the last Gearman return code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid Gearman return code.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/runtasks.xml b/reference/gearman/gearmanclient/runtasks.xml
deleted file mode 100644
index e402e0e1c585..000000000000
--- a/reference/gearman/gearmanclient/runtasks.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.runtasks">
- <refnamediv>
-  <refname>GearmanClient::runTasks</refname>
-  <refpurpose>Run a list of tasks in parallel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::runTasks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   For a set of tasks previously added with <methodname>GearmanClient::addTask</methodname>,
-   <methodname>GearmanClient::addTaskHigh</methodname>, <methodname>GearmanClient::addTaskLow</methodname>,
-   <methodname>GearmanClient::addTaskBackground</methodname>, <methodname>GearmanClient::addTaskHighBackground</methodname>, or
-   <methodname>GearmanClient::addTaskLowBackground</methodname>, this call starts running the tasks
-   in parallel.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::addTask</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/gearman/gearmanclient/setclientcallback.xml b/reference/gearman/gearmanclient/setclientcallback.xml
deleted file mode 100644
index be7c5e0093ad..000000000000
--- a/reference/gearman/gearmanclient/setclientcallback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setclientcallback">
- <refnamediv>
-  <refname>GearmanClient::setClientCallback</refname>
-  <refpurpose>Callback function when there is a data packet for a task (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>GearmanClient::setClientCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the callback function for accepting data packets for a task.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanClient::setDataCallback</methodname> in
-    the 0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setcompletecallback.xml b/reference/gearman/gearmanclient/setcompletecallback.xml
deleted file mode 100644
index 35526ecbf026..000000000000
--- a/reference/gearman/gearmanclient/setcompletecallback.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setcompletecallback">
- <refnamediv>
-  <refname>GearmanClient::setCompleteCallback</refname>
-  <refpurpose>Set a function to be called on task completion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setCompleteCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Use to set a callback function to be called when a <classname>GearmanTask</classname> is completed, or
-   when <methodname>GearmanJob::sendComplete</methodname> is invoked by a worker (whichever happens
-   first).
-  </simpara>
-  <simpara>
-   This callback executes only when executing a <classname>GearmanTask</classname> using
-   <methodname>GearmanClient::runTasks</methodname>. It is not used for individual jobs.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setcontext.xml b/reference/gearman/gearmanclient/setcontext.xml
deleted file mode 100644
index 80d9948083ad..000000000000
--- a/reference/gearman/gearmanclient/setcontext.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setcontext">
- <refnamediv>
-  <refname>GearmanClient::setContext</refname>
-  <refpurpose>Set application context</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setContext</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets an arbitrary string to provide application context that can
-   later be retrieved by <methodname>GearmanClient::context</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary context data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::context</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/gearman/gearmanclient/setcreatedcallback.xml b/reference/gearman/gearmanclient/setcreatedcallback.xml
deleted file mode 100644
index 2ee9194e1b9f..000000000000
--- a/reference/gearman/gearmanclient/setcreatedcallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setcreatedcallback">
- <refnamediv>
-  <refname>GearmanClient::setCreatedCallback</refname>
-  <refpurpose>Set a callback for when a task is queued</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setCreatedCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a callback function to be called when a task is received and queued by the Gearman job server.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setdata.xml b/reference/gearman/gearmanclient/setdata.xml
deleted file mode 100644
index 8f003262c561..000000000000
--- a/reference/gearman/gearmanclient/setdata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setdata">
- <refnamediv>
-  <refname>GearmanClient::setData</refname>
-  <refpurpose>Set application data (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setData</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets some arbitrary application data that can later be retrieved by
-   <methodname>GearmanClient::data</methodname>.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanClient::setContext</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::data</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/gearman/gearmanclient/setdatacallback.xml b/reference/gearman/gearmanclient/setdatacallback.xml
deleted file mode 100644
index 2e8279365519..000000000000
--- a/reference/gearman/gearmanclient/setdatacallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setdatacallback">
- <refnamediv>
-  <refname>GearmanClient::setDataCallback</refname>
-  <refpurpose>Callback function when there is a data packet for a task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setDataCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the callback function for accepting data packets for a task.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setexceptioncallback.xml b/reference/gearman/gearmanclient/setexceptioncallback.xml
deleted file mode 100644
index 3bca216cd52b..000000000000
--- a/reference/gearman/gearmanclient/setexceptioncallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setexceptioncallback">
- <refnamediv>
-  <refname>GearmanClient::setExceptionCallback</refname>
-  <refpurpose>Set a callback for worker exceptions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setExceptionCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Specifies a callback function to call when a worker for a task sends an exception.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setfailcallback.xml b/reference/gearman/gearmanclient/setfailcallback.xml
deleted file mode 100644
index 099c594cf1a5..000000000000
--- a/reference/gearman/gearmanclient/setfailcallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setfailcallback">
- <refnamediv>
-  <refname>GearmanClient::setFailCallback</refname>
-  <refpurpose>Set callback for job failure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setFailCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the callback function to be used when a task does not complete successfully.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setoptions.xml b/reference/gearman/gearmanclient/setoptions.xml
deleted file mode 100644
index fa9d8ef0599a..000000000000
--- a/reference/gearman/gearmanclient/setoptions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setoptions">
- <refnamediv>
-  <refname>GearmanClient::setOptions</refname>
-  <refpurpose>Set client options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets one or more client options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to be set
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/setstatuscallback.xml b/reference/gearman/gearmanclient/setstatuscallback.xml
deleted file mode 100644
index 342802a92dff..000000000000
--- a/reference/gearman/gearmanclient/setstatuscallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setstatuscallback">
- <refnamediv>
-  <refname>GearmanClient::setStatusCallback</refname>
-  <refpurpose>Set a callback for collecting task status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setStatusCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a callback function used for getting updated status information from a worker.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/settimeout.xml b/reference/gearman/gearmanclient/settimeout.xml
deleted file mode 100644
index 5cc7acb1f555..000000000000
--- a/reference/gearman/gearmanclient/settimeout.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.settimeout">
- <refnamediv>
-  <refname>GearmanClient::setTimeout</refname>
-  <refpurpose>Set socket I/O activity timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the timeout for socket I/O activity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      An interval of time in milliseconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanclient/setwarningcallback.xml b/reference/gearman/gearmanclient/setwarningcallback.xml
deleted file mode 100644
index 68b9f3ec32a2..000000000000
--- a/reference/gearman/gearmanclient/setwarningcallback.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setwarningcallback">
- <refnamediv>
-  <refname>GearmanClient::setWarningCallback</refname>
-  <refpurpose>Set a callback for worker warnings</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setWarningCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a callback function to be called when a worker sends a warning.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWorkloadCallback</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/gearman/gearmanclient/setworkloadcallback.xml b/reference/gearman/gearmanclient/setworkloadcallback.xml
deleted file mode 100644
index 41cf4aedb105..000000000000
--- a/reference/gearman/gearmanclient/setworkloadcallback.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.setworkloadcallback">
- <refnamediv>
-  <refname>GearmanClient::setWorkloadCallback</refname>
-  <refpurpose>Set a callback for accepting incremental data updates</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::setWorkloadCallback</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a callback function to be called when a worker needs to send back data prior to job completion.
-   A worker can do this when it needs to send updates, send partial results, or flush data
-   during long running jobs.
-  </simpara>
-  &gearman.note.callback;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &gearman.parameter.callback;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setDataCallback</methodname></member>
-   <member><methodname>GearmanClient::setCompleteCallback</methodname></member>
-   <member><methodname>GearmanClient::setCreatedCallback</methodname></member>
-   <member><methodname>GearmanClient::setExceptionCallback</methodname></member>
-   <member><methodname>GearmanClient::setFailCallback</methodname></member>
-   <member><methodname>GearmanClient::setStatusCallback</methodname></member>
-   <member><methodname>GearmanClient::setWarningCallback</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/gearman/gearmanclient/timeout.xml b/reference/gearman/gearmanclient/timeout.xml
deleted file mode 100644
index 0ea97ef9d6e2..000000000000
--- a/reference/gearman/gearmanclient/timeout.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.timeout">
- <refnamediv>
-  <refname>GearmanClient::timeout</refname>
-  <refpurpose>Get current socket I/O activity timeout value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanClient::timeout</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the timeout in milliseconds to wait for I/O activity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Timeout in milliseconds to wait for I/O activity.  A negative value means an infinite timeout.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::setTimeout</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/gearman/gearmanclient/wait.xml b/reference/gearman/gearmanclient/wait.xml
deleted file mode 100644
index 79ff587ccc91..000000000000
--- a/reference/gearman/gearmanclient/wait.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanclient.wait">
- <refnamediv>
-  <refname>GearmanClient::wait</refname>
-  <refpurpose>Wait for I/O activity on all connections in a client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanClient">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanClient::wait</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   This waits for activity from any one of the connected servers.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; on success &false; on an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::wait</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/gearman/gearmanexception.xml b/reference/gearman/gearmanexception.xml
deleted file mode 100644
index 937711b1e8fd..000000000000
--- a/reference/gearman/gearmanexception.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gearmanexception" role="class">
-
- <title>The GearmanException class</title>
- <titleabbrev>GearmanException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GearmanException intro -->
-  <section xml:id="gearmanexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gearmanexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>GearmanException</classname>
-    </ooclass>
-
-    <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>
-    <!-- GearmanException doesn't have any methods.
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
-</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/gearman/gearmanjob.xml b/reference/gearman/gearmanjob.xml
deleted file mode 100644
index e6809a1e11a1..000000000000
--- a/reference/gearman/gearmanjob.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gearmanjob" role="class">
-
- <title>The GearmanJob class</title>
- <titleabbrev>GearmanJob</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GearmanJob intro -->
-  <section xml:id="gearmanjob.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gearmanjob.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>GearmanJob</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanjob')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='GearmanJob'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gearman.entities.gearmanjob;
-
-</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/gearman/gearmanjob/complete.xml b/reference/gearman/gearmanjob/complete.xml
deleted file mode 100644
index 503f1492439f..000000000000
--- a/reference/gearman/gearmanjob/complete.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.complete">
- <refnamediv>
-  <refname>GearmanJob::complete</refname>
-  <refpurpose>Send the result and complete status (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::complete</methodname>
-   <methodparam><type>string</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends result data and the complete status update for this job.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendComplete</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      Serialized result data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendFail</methodname></member>
-   <member><methodname>GearmanJob::setReturn</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/gearman/gearmanjob/construct.xml b/reference/gearman/gearmanjob/construct.xml
deleted file mode 100644
index 1576347c0f89..000000000000
--- a/reference/gearman/gearmanjob/construct.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.construct">
- <refnamediv>
-  <refname>GearmanJob::__construct</refname>
-  <refpurpose>Create a GearmanJob instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>GearmanJob::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Creates a <classname>GearmanJob</classname> instance representing a job the worker is to complete.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanJob</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanjob/data.xml b/reference/gearman/gearmanjob/data.xml
deleted file mode 100644
index a684e6f1173a..000000000000
--- a/reference/gearman/gearmanjob/data.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.data">
- <refnamediv>
-  <refname>GearmanJob::data</refname>
-  <refpurpose>Send data for a running job (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::data</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends data to the job server (and any listening clients) for this job.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendData</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary serialized data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::workload</methodname></member>
-   <member><methodname>GearmanTask::data</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/gearman/gearmanjob/exception.xml b/reference/gearman/gearmanjob/exception.xml
deleted file mode 100644
index d0da0d6626ae..000000000000
--- a/reference/gearman/gearmanjob/exception.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.exception">
- <refnamediv>
-  <refname>GearmanJob::exception</refname>
-  <refpurpose>Send exception for running job (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::exception</methodname>
-   <methodparam><type>string</type><parameter>exception</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends the supplied exception when this job is running.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendException</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>exception</parameter></term>
-    <listitem>
-     <simpara>
-      An exception description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::setReturn</methodname></member>
-   <member><methodname>GearmanJob::sendStatus</methodname></member>
-   <member><methodname>GearmanJob::sendWarning</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/gearman/gearmanjob/fail.xml b/reference/gearman/gearmanjob/fail.xml
deleted file mode 100644
index c6348610b4c0..000000000000
--- a/reference/gearman/gearmanjob/fail.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.fail">
- <refnamediv>
-  <refname>GearmanJob::fail</refname>
-  <refpurpose>Send fail status (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::fail</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Sends failure status for this job, indicating that the job failed in a known way (as
-   opposed to failing due to a thrown exception).
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendFail</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendException</methodname></member>
-   <member><methodname>GearmanJob::setReturn</methodname></member>
-   <member><methodname>GearmanJob::sendStatus</methodname></member>
-   <member><methodname>GearmanJob::sendWarning</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/gearman/gearmanjob/functionname.xml b/reference/gearman/gearmanjob/functionname.xml
deleted file mode 100644
index 55120761fd4f..000000000000
--- a/reference/gearman/gearmanjob/functionname.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.functionname">
- <refnamediv>
-  <refname>GearmanJob::functionName</refname>
-  <refpurpose>Get function name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanJob::functionName</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the function name for this job.  This is the function the work will execute to
-   perform the job.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The name of a function, or &false; if the job has not yet been initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::function</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/gearman/gearmanjob/handle.xml b/reference/gearman/gearmanjob/handle.xml
deleted file mode 100644
index 6c566f84409b..000000000000
--- a/reference/gearman/gearmanjob/handle.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.handle">
- <refnamediv>
-  <refname>GearmanJob::handle</refname>
-  <refpurpose>Get the job handle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanJob::handle</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the opaque job handle assigned by the job server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An opaque job handle, or &false; if the job has not yet been initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::jobHandle</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/gearman/gearmanjob/returncode.xml b/reference/gearman/gearmanjob/returncode.xml
deleted file mode 100644
index e41c88c487bc..000000000000
--- a/reference/gearman/gearmanjob/returncode.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.returncode">
- <refnamediv>
-  <refname>GearmanJob::returnCode</refname>
-  <refpurpose>Get last return code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanJob::returnCode</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the last return code issued by the job server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid Gearman return code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::returnCode</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/gearman/gearmanjob/sendcomplete.xml b/reference/gearman/gearmanjob/sendcomplete.xml
deleted file mode 100644
index 4518c3593f01..000000000000
--- a/reference/gearman/gearmanjob/sendcomplete.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.sendcomplete">
- <refnamediv>
-  <refname>GearmanJob::sendComplete</refname>
-  <refpurpose>Send the result and complete status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendComplete</methodname>
-   <methodparam><type>string</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends result data and the complete status update for this job.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      Serialized result data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendFail</methodname></member>
-   <member><methodname>GearmanJob::setReturn</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/gearman/gearmanjob/senddata.xml b/reference/gearman/gearmanjob/senddata.xml
deleted file mode 100644
index 5d5ce173af0b..000000000000
--- a/reference/gearman/gearmanjob/senddata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.senddata">
- <refnamediv>
-  <refname>GearmanJob::sendData</refname>
-  <refpurpose>Send data for a running job</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendData</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends data to the job server (and any listening clients) for this job.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary serialized data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::workload</methodname></member>
-   <member><methodname>GearmanTask::data</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/gearman/gearmanjob/sendexception.xml b/reference/gearman/gearmanjob/sendexception.xml
deleted file mode 100644
index 19ed9485891f..000000000000
--- a/reference/gearman/gearmanjob/sendexception.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.sendexception">
- <refnamediv>
-  <refname>GearmanJob::sendException</refname>
-  <refpurpose>Send exception for running job (exception)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendException</methodname>
-   <methodparam><type>string</type><parameter>exception</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends the supplied exception when this job is running.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>exception</parameter></term>
-    <listitem>
-     <simpara>
-      An exception description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::setReturn</methodname></member>
-   <member><methodname>GearmanJob::sendStatus</methodname></member>
-   <member><methodname>GearmanJob::sendWarning</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/gearman/gearmanjob/sendfail.xml b/reference/gearman/gearmanjob/sendfail.xml
deleted file mode 100644
index fbe029ad08d9..000000000000
--- a/reference/gearman/gearmanjob/sendfail.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.sendfail">
- <refnamediv>
-  <refname>GearmanJob::sendFail</refname>
-  <refpurpose>Send fail status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendFail</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Sends failure status for this job, indicating that the job failed in a known way (as
-   opposed to failing due to a thrown exception).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendException</methodname></member>
-   <member><methodname>GearmanJob::setReturn</methodname></member>
-   <member><methodname>GearmanJob::sendStatus</methodname></member>
-   <member><methodname>GearmanJob::sendWarning</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/gearman/gearmanjob/sendstatus.xml b/reference/gearman/gearmanjob/sendstatus.xml
deleted file mode 100644
index df4638770c6f..000000000000
--- a/reference/gearman/gearmanjob/sendstatus.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.sendstatus">
- <refnamediv>
-  <refname>GearmanJob::sendStatus</refname>
-  <refpurpose>Send status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendStatus</methodname>
-   <methodparam><type>int</type><parameter>numerator</parameter></methodparam>
-   <methodparam><type>int</type><parameter>denominator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends status information to the job server and any listening clients.  Use this
-   to specify what percentage of the job has been completed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>numerator</parameter></term>
-    <listitem>
-     <simpara>
-      The numerator of the percentage completed expressed as a fraction.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>denominator</parameter></term>
-    <listitem>
-     <simpara>
-      The denominator of the percentage completed expressed as a fraction.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::jobStatus</methodname></member>
-   <member><methodname>GearmanTask::taskDenominator</methodname></member>
-   <member><methodname>GearmanTask::taskNumerator</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/gearman/gearmanjob/sendwarning.xml b/reference/gearman/gearmanjob/sendwarning.xml
deleted file mode 100644
index a5833986936c..000000000000
--- a/reference/gearman/gearmanjob/sendwarning.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.sendwarning">
- <refnamediv>
-  <refname>GearmanJob::sendWarning</refname>
-  <refpurpose>Send a warning</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::sendWarning</methodname>
-   <methodparam><type>string</type><parameter>warning</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends a warning for this job while it is running.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>warning</parameter></term>
-    <listitem>
-     <simpara>
-      A warning message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendComplete</methodname></member>
-   <member><methodname>GearmanJob::sendException</methodname></member>
-   <member><methodname>GearmanJob::sendFail</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/gearman/gearmanjob/setreturn.xml b/reference/gearman/gearmanjob/setreturn.xml
deleted file mode 100644
index 1c8d19052da7..000000000000
--- a/reference/gearman/gearmanjob/setreturn.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.setreturn">
- <refnamediv>
-  <refname>GearmanJob::setReturn</refname>
-  <refpurpose>Set a return value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::setReturn</methodname>
-   <methodparam><type>int</type><parameter>gearman_return_t</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the return value for this job, indicates how the job completed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>gearman_return_t</parameter></term>
-    <listitem>
-     <simpara>
-      A valid Gearman return value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Description...
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanjob/status.xml b/reference/gearman/gearmanjob/status.xml
deleted file mode 100644
index fc3d2523e3c0..000000000000
--- a/reference/gearman/gearmanjob/status.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.status">
- <refnamediv>
-  <refname>GearmanJob::status</refname>
-  <refpurpose>Send status (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::status</methodname>
-   <methodparam><type>int</type><parameter>numerator</parameter></methodparam>
-   <methodparam><type>int</type><parameter>denominator</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends status information to the job server and any listening clients.  Use this
-   to specify what percentage of the job has been completed.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendStatus</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>numerator</parameter></term>
-    <listitem>
-     <simpara>
-      The numerator of the percentage completed expressed as a fraction.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>denominator</parameter></term>
-    <listitem>
-     <simpara>
-      The denominator of the percentage completed expressed as a fraction.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::jobStatus</methodname></member>
-   <member><methodname>GearmanTask::taskDenominator</methodname></member>
-   <member><methodname>GearmanTask::taskNumerator</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/gearman/gearmanjob/unique.xml b/reference/gearman/gearmanjob/unique.xml
deleted file mode 100644
index f8502413a952..000000000000
--- a/reference/gearman/gearmanjob/unique.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.unique">
- <refnamediv>
-  <refname>GearmanJob::unique</refname>
-  <refpurpose>Get the unique identifier</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanJob::unique</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the unique identifier for this job.  The identifier is assigned by the client.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An opaque unique identifier, or &false; if the job has not yet been initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::do</methodname></member>
-   <member><methodname>GearmanTask::uuid</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/gearman/gearmanjob/warning.xml b/reference/gearman/gearmanjob/warning.xml
deleted file mode 100644
index 0507b052398a..000000000000
--- a/reference/gearman/gearmanjob/warning.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.warning">
- <refnamediv>
-  <refname>GearmanJob::warning</refname>
-  <refpurpose>Send a warning (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanJob::warning</methodname>
-   <methodparam><type>string</type><parameter>warning</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends a warning for this job while it is running.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanJob::sendWarning</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>warning</parameter></term>
-    <listitem>
-     <simpara>
-      A warning messages.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::sendComplete</methodname></member>
-   <member><methodname>GearmanJob::sendException</methodname></member>
-   <member><methodname>GearmanJob::sendFail</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/gearman/gearmanjob/workload.xml b/reference/gearman/gearmanjob/workload.xml
deleted file mode 100644
index b6d3dd620984..000000000000
--- a/reference/gearman/gearmanjob/workload.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.workload">
- <refnamediv>
-  <refname>GearmanJob::workload</refname>
-  <refpurpose>Get workload</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>string</type><methodname>GearmanJob::workload</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the workload for the job.  This is serialized data that is to be processed by the worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Serialized data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::do</methodname></member>
-   <member><methodname>GearmanJob::workloadSize</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/gearman/gearmanjob/workloadsize.xml b/reference/gearman/gearmanjob/workloadsize.xml
deleted file mode 100644
index ddca7a5ea1a8..000000000000
--- a/reference/gearman/gearmanjob/workloadsize.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanjob.workloadsize">
- <refnamediv>
-  <refname>GearmanJob::workloadSize</refname>
-  <refpurpose>Get size of work load</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanJob">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanJob::workloadSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the size of the job's work load (the data the worker is to process) in bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The size in bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanJob::workload</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/gearman/gearmantask.xml b/reference/gearman/gearmantask.xml
deleted file mode 100644
index 90bb62a17d0b..000000000000
--- a/reference/gearman/gearmantask.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gearmantask" role="class">
-
- <title>The GearmanTask class</title>
- <titleabbrev>GearmanTask</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GearmanTask intro -->
-  <section xml:id="gearmantask.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gearmantask.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>GearmanTask</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmantask')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='GearmanTask'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmantask')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='GearmanTask'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gearman.entities.gearmantask;
-
-</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/gearman/gearmantask/construct.xml b/reference/gearman/gearmantask/construct.xml
deleted file mode 100644
index 4801bc0d39c2..000000000000
--- a/reference/gearman/gearmantask/construct.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.construct">
- <refnamediv>
-  <refname>GearmanTask::__construct</refname>
-  <refpurpose>Create a GearmanTask instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="GearmanTask">
-   <modifier>public</modifier> <methodname>GearmanTask::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   Creates a <classname>GearmanTask</classname> instance representing a task to be submitted to a job server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/create.xml b/reference/gearman/gearmantask/create.xml
deleted file mode 100644
index baa4dee8a847..000000000000
--- a/reference/gearman/gearmantask/create.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="gearmantask.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>GearmanTask::create</refname>
-  <refpurpose>Create a task (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>GearmanTask</type><type>false</type></type><methodname>GearmanTask::create</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns a new <classname>GearmanTask</classname> object.
-  </simpara>
-  <note>
-   <simpara>
-    This method was removed in the 0.6.0 version of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanTask</classname> object&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/data.xml b/reference/gearman/gearmantask/data.xml
deleted file mode 100644
index 95060de34a13..000000000000
--- a/reference/gearman/gearmantask/data.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.data">
- <refnamediv>
-  <refname>GearmanTask::data</refname>
-  <refpurpose>Get data returned for a task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanTask::data</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns data being returned for a task by a worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The serialized data, or &false; if no data is present.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::dataSize</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/gearman/gearmantask/datasize.xml b/reference/gearman/gearmantask/datasize.xml
deleted file mode 100644
index 5479b7238365..000000000000
--- a/reference/gearman/gearmantask/datasize.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.datasize">
- <refnamediv>
-  <refname>GearmanTask::dataSize</refname>
-  <refpurpose>Get the size of returned data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>GearmanTask::dataSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the size of the data being returned for a task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The data size, or &false; if there is no data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::data</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/gearman/gearmantask/function.xml b/reference/gearman/gearmantask/function.xml
deleted file mode 100644
index 0ee371eeed8e..000000000000
--- a/reference/gearman/gearmantask/function.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.function">
- <refnamediv>
-  <refname>GearmanTask::function</refname>
-  <refpurpose>Get associated function name (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>GearmanTask::function</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the function this task is associated with, i.e., the function
-   the Gearman worker calls.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanTask::functionName</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A function name.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/functionname.xml b/reference/gearman/gearmantask/functionname.xml
deleted file mode 100644
index 3231f1359513..000000000000
--- a/reference/gearman/gearmantask/functionname.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.functionname">
- <refnamediv>
-  <refname>GearmanTask::functionName</refname>
-  <refpurpose>Get associated function name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanTask::functionName</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the function this task is associated with, i.e., the function
-   the Gearman worker calls.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A function name, or &false; if the task has not yet been created.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/isknown.xml b/reference/gearman/gearmantask/isknown.xml
deleted file mode 100644
index 541adee28aab..000000000000
--- a/reference/gearman/gearmantask/isknown.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.isknown">
- <refnamediv>
-  <refname>GearmanTask::isKnown</refname>
-  <refpurpose>Determine if task is known</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanTask::isKnown</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the status information for whether or not this task is known to the job server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; if the task is known, &false; otherwise.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/isrunning.xml b/reference/gearman/gearmantask/isrunning.xml
deleted file mode 100644
index c1e76632da46..000000000000
--- a/reference/gearman/gearmantask/isrunning.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.isrunning">
- <refnamediv>
-  <refname>GearmanTask::isRunning</refname>
-  <refpurpose>Test whether the task is currently running</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanTask::isRunning</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Indicates whether or not this task is currently running.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; if the task is running, &false; otherwise.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmantask/jobhandle.xml b/reference/gearman/gearmantask/jobhandle.xml
deleted file mode 100644
index 502f7aa7d51c..000000000000
--- a/reference/gearman/gearmantask/jobhandle.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.jobhandle">
- <refnamediv>
-  <refname>GearmanTask::jobHandle</refname>
-  <refname>gearman_job_handle</refname>
-  <refpurpose>Get the job handle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-   <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanTask::jobHandle</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the job handle for this task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The opaque job handle, or &false; if the task has not yet been created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::doJobHandle</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/gearman/gearmantask/recvdata.xml b/reference/gearman/gearmantask/recvdata.xml
deleted file mode 100644
index cdbd943dc7ef..000000000000
--- a/reference/gearman/gearmantask/recvdata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.recvdata">
- <refnamediv>
-  <refname>GearmanTask::recvData</refname>
-  <refpurpose>Read work or result data into a buffer for a task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>array</type></type><methodname>GearmanTask::recvData</methodname>
-   <methodparam><type>int</type><parameter>data_len</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data_len</parameter></term>
-    <listitem>
-     <simpara>
-      Length of data to be read.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array whose first element is the length of data read and the second is the data buffer.
-   Returns &false; if the read failed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::sendData</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/gearman/gearmantask/returncode.xml b/reference/gearman/gearmantask/returncode.xml
deleted file mode 100644
index 8d1dfe8d228b..000000000000
--- a/reference/gearman/gearmantask/returncode.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.returncode">
- <refnamediv>
-  <refname>GearmanTask::returnCode</refname>
-  <refpurpose>Get the last return code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanTask::returnCode</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the last Gearman return code for this task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid Gearman return code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::returnCode</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/gearman/gearmantask/senddata.xml b/reference/gearman/gearmantask/senddata.xml
deleted file mode 100644
index 4aaf05d67cba..000000000000
--- a/reference/gearman/gearmantask/senddata.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.senddata">
- <refnamediv>
-  <refname>GearmanTask::sendData</refname>
-  <refpurpose>Send data for a task (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>GearmanTask::sendData</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-  &warn.experimental.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to send to the worker.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The length of data sent, or &false; if the send failed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::recvData</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/gearman/gearmantask/sendworkload.xml b/reference/gearman/gearmantask/sendworkload.xml
deleted file mode 100644
index 6e47847ecdc4..000000000000
--- a/reference/gearman/gearmantask/sendworkload.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.sendworkload">
- <refnamediv>
-  <refname>GearmanTask::sendWorkload</refname>
-  <refpurpose>Send data for a task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>GearmanTask::sendWorkload</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-  &warn.experimental.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to send to the worker.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The length of data sent, or &false; if the send failed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::recvData</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/gearman/gearmantask/taskdenominator.xml b/reference/gearman/gearmantask/taskdenominator.xml
deleted file mode 100644
index 7b0ec3778967..000000000000
--- a/reference/gearman/gearmantask/taskdenominator.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.taskdenominator">
- <refnamediv>
-  <refname>GearmanTask::taskDenominator</refname>
-  <refpurpose>Get completion percentage denominator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>int</type></type><methodname>GearmanTask::taskDenominator</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the denominator of the percentage of the task that is complete expressed as a fraction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A number between 0 and 100, or &false; if cannot be determined.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::taskNumerator</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/gearman/gearmantask/tasknumerator.xml b/reference/gearman/gearmantask/tasknumerator.xml
deleted file mode 100644
index 6343e6d3c24d..000000000000
--- a/reference/gearman/gearmantask/tasknumerator.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.tasknumerator">
- <refnamediv>
-  <refname>GearmanTask::taskNumerator</refname>
-  <refpurpose>Get completion percentage numerator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>int</type></type><methodname>GearmanTask::taskNumerator</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the numerator of the percentage of the task that is complete expressed as a fraction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A number between 0 and 100, or &false; if cannot be determined.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanTask::taskDenominator</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/gearman/gearmantask/unique.xml b/reference/gearman/gearmantask/unique.xml
deleted file mode 100644
index af6742b03fd4..000000000000
--- a/reference/gearman/gearmantask/unique.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.unique">
- <refnamediv>
-  <refname>GearmanTask::unique</refname>
-  <refpurpose>Get the unique identifier for a task</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanTask">
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>GearmanTask::unique</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the unique identifier for this task.  This is assigned by the <classname>GearmanClient</classname>,
-   as opposed to the job handle which is set by the Gearman job server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The unique identifier, or &false; if no identifier is assigned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::do</methodname></member>
-   <member><methodname>GearmanClient::addTask</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/gearman/gearmantask/uuid.xml b/reference/gearman/gearmantask/uuid.xml
deleted file mode 100644
index f9fdfabec931..000000000000
--- a/reference/gearman/gearmantask/uuid.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmantask.uuid">
- <refnamediv>
-  <refname>GearmanTask::uuid</refname>
-  <refpurpose>Get the unique identifier for a task (deprecated)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>GearmanTask::uuid</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the unique identifier for this task.  This is assigned by the <classname>GearmanClient</classname>,
-   as opposed to the job handle which is set by the Gearman job server.
-  </simpara>
-  <note>
-   <simpara>
-    This method has been replaced by <methodname>GearmanTask::unique</methodname> in the
-    0.6.0 release of the Gearman extension.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The unique identifier, or &false; if no identifier is assigned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::do</methodname></member>
-   <member><methodname>GearmanClient::addTask</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/gearman/gearmanworker.xml b/reference/gearman/gearmanworker.xml
deleted file mode 100644
index bc152dc2afdc..000000000000
--- a/reference/gearman/gearmanworker.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gearmanworker" role="class">
-
- <title>The GearmanWorker class</title>
- <titleabbrev>GearmanWorker</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GearmanWorker intro -->
-  <section xml:id="gearmanworker.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gearmanworker.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>GearmanWorker</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanworker')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='GearmanWorker'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gearmanworker')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='GearmanWorker'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gearman.entities.gearmanworker;
-
-</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/gearman/gearmanworker/addfunction.xml b/reference/gearman/gearmanworker/addfunction.xml
deleted file mode 100644
index 0e922fc8745b..000000000000
--- a/reference/gearman/gearmanworker/addfunction.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.addfunction">
- <refnamediv>
-  <refname>GearmanWorker::addFunction</refname>
-  <refpurpose>Register and add callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::addFunction</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>function</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>context</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Registers a function name with the job server and specifies a callback corresponding to that
-   function.  Optionally specify extra application context data to be used when the callback is
-   called and a timeout.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of a function to register with the job server
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      A callback that gets called when a job for the registered function name is submitted
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      A reference to arbitrary application context data that can be modified by the worker function
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      An interval of time in seconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Simple worker making use of extra application context data</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# get a gearman worker
-$worker= new GearmanWorker();
-
-# add the default server (localhost)
-$worker->addServer();
-
-# define a variable to hold application data
-$count= 0;
-
-# add the "reverse" function
-$worker->addFunction("reverse", "reverse_cb", $count);
-
-# start the worker
-while ($worker->work());
-
-function reverse_cb($job, &$count)
-{
-  $count++;
-  return "$count: " . strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    Running a client that submits two jobs for the reverse function would have
-    output similar to the following:
-   </simpara>
-   <screen>
-<![CDATA[
-1: olleh
-2: dlrow
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::do</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/gearman/gearmanworker/addoptions.xml b/reference/gearman/gearmanworker/addoptions.xml
deleted file mode 100644
index 7de428bdbc24..000000000000
--- a/reference/gearman/gearmanworker/addoptions.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.addoptions">
- <refnamediv>
-  <refname>GearmanWorker::addOptions</refname>
-  <refpurpose>Add worker options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>true</type><methodname>GearmanWorker::addOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds one or more options to the options previously set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to be added
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.true.always;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::options</methodname></member>
-   <member><methodname>GearmanClient::setOptions</methodname></member>
-   <member><methodname>GearmanClient::removeOptions</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/gearman/gearmanworker/addserver.xml b/reference/gearman/gearmanworker/addserver.xml
deleted file mode 100644
index f6e966d550f1..000000000000
--- a/reference/gearman/gearmanworker/addserver.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.addserver">
- <refnamediv>
-  <refname>GearmanWorker::addServer</refname>
-  <refpurpose>Add a job server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::addServer</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>setupExceptionHandler</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a job server to this worker.  This goes into a list of servers than can be used to run jobs.
-   No socket I/O happens here.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.host;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      &gearman.parameter.port;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Add alternate Gearman servers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker= new GearmanWorker();
-$worker->addServer("10.0.0.1");
-$worker->addServer("10.0.0.2", 7003);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::addServers</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/gearman/gearmanworker/addservers.xml b/reference/gearman/gearmanworker/addservers.xml
deleted file mode 100644
index ddf5611e080f..000000000000
--- a/reference/gearman/gearmanworker/addservers.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.addservers">
- <refnamediv>
-  <refname>GearmanWorker::addServers</refname>
-  <refpurpose>Add job servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::addServers</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>servers</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>setupExceptionHandler</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds one or more job servers to this worker.  These go into a list of servers that can be used
-   to run jobs.  No socket I/O happens here.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>servers</parameter></term>
-    <listitem>
-     <simpara>
-      A comma separated list of job servers in the format host:port. If no port is
-     specified, it defaults to 4730.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Add two job servers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$worker= new GearmanWorker();
-$worker->addServers("10.0.0.1,10.0.0.2:7003");
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::addServer</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/gearman/gearmanworker/clone.xml b/reference/gearman/gearmanworker/clone.xml
deleted file mode 100644
index 8ff0bfe3cf0a..000000000000
--- a/reference/gearman/gearmanworker/clone.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.clone">
- <refnamediv>
-  <refname>GearmanWorker::clone</refname>
-  <refpurpose>Create a copy of the worker</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>GearmanWorker::clone</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Creates a copy of the worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanWorker</classname> object
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gearman/gearmanworker/construct.xml b/reference/gearman/gearmanworker/construct.xml
deleted file mode 100644
index f267e4ae859d..000000000000
--- a/reference/gearman/gearmanworker/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.construct">
- <refnamediv>
-  <refname>GearmanWorker::__construct</refname>
-  <refpurpose>Create a GearmanWorker instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <methodname>GearmanWorker::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   Creates a <classname>GearmanWorker</classname> instance representing a worker that connects to the job server and accepts tasks to run.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>GearmanWorker</classname> object
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::clone</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/gearman/gearmanworker/echo.xml b/reference/gearman/gearmanworker/echo.xml
deleted file mode 100644
index ee368bd6ceb7..000000000000
--- a/reference/gearman/gearmanworker/echo.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.echo">
- <refnamediv>
-  <refname>GearmanWorker::echo</refname>
-  <refpurpose>Test job server response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::echo</methodname>
-   <methodparam><type>string</type><parameter>workload</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends data to all job servers to see if they echo it back.  This is a test function
-   to see if job servers are responding properly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>workload</parameter></term>
-    <listitem>
-     <simpara>
-      Arbitrary serialized data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Standard Gearman return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanClient::echo</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/gearman/gearmanworker/error.xml b/reference/gearman/gearmanworker/error.xml
deleted file mode 100644
index a039ae7c3438..000000000000
--- a/reference/gearman/gearmanworker/error.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.error">
- <refnamediv>
-  <refname>GearmanWorker::error</refname>
-  <refpurpose>Get the last error encountered</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>GearmanWorker::error</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns an error string for the last error encountered.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A human readable error string, or &false; if there is no error message available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::getErrno</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/gearman/gearmanworker/geterrno.xml b/reference/gearman/gearmanworker/geterrno.xml
deleted file mode 100644
index 7896902b29e9..000000000000
--- a/reference/gearman/gearmanworker/geterrno.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.geterrno">
- <refnamediv>
-  <refname>GearmanWorker::getErrno</refname>
-  <refpurpose>Get errno</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanWorker::getErrno</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the value of errno in the case of a GEARMAN_ERRNO return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid errno.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::error</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/gearman/gearmanworker/options.xml b/reference/gearman/gearmanworker/options.xml
deleted file mode 100644
index 65aee103e9d2..000000000000
--- a/reference/gearman/gearmanworker/options.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.options">
- <refnamediv>
-  <refname>GearmanWorker::options</refname>
-  <refpurpose>Get worker options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanWorker::options</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the options previously set for the worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The options currently set for the worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::setOptions</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/gearman/gearmanworker/register.xml b/reference/gearman/gearmanworker/register.xml
deleted file mode 100644
index 216490adda22..000000000000
--- a/reference/gearman/gearmanworker/register.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.register">
- <refnamediv>
-  <refname>GearmanWorker::register</refname>
-  <refpurpose>Register a function with the job server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::register</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Registers a function name with the job server with an optional timeout.  The timeout
-   specifies how many seconds the server will wait before marking a job as failed.
-   If the timeout is set to zero, there is no timeout.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of a function to register with the job server
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      An interval of time in seconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A standard Gearman return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::unregister</methodname></member>
-   <member><methodname>GearmanWorker::unregisterAll</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/gearman/gearmanworker/removeoptions.xml b/reference/gearman/gearmanworker/removeoptions.xml
deleted file mode 100644
index 6eadbc8dee17..000000000000
--- a/reference/gearman/gearmanworker/removeoptions.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.removeoptions">
- <refnamediv>
-  <refname>GearmanWorker::removeOptions</refname>
-  <refpurpose>Remove worker options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>true</type><methodname>GearmanWorker::removeOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes (unsets) one or more worker options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to be removed (unset)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.true.always;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::options</methodname></member>
-   <member><methodname>GearmanWorker::setOptions</methodname></member>
-   <member><methodname>GearmanWorker::addOptions</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/gearman/gearmanworker/returncode.xml b/reference/gearman/gearmanworker/returncode.xml
deleted file mode 100644
index 98c66af8746c..000000000000
--- a/reference/gearman/gearmanworker/returncode.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.returncode">
- <refnamediv>
-  <refname>GearmanWorker::returnCode</refname>
-  <refpurpose>Get last Gearman return code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanWorker::returnCode</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the last Gearman return code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A valid Gearman return code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::error</methodname></member>
-   <member><methodname>GearmanWorker::getErrno</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/gearman/gearmanworker/setid.xml b/reference/gearman/gearmanworker/setid.xml
deleted file mode 100644
index efedbcbee864..000000000000
--- a/reference/gearman/gearmanworker/setid.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.setid">
- <refnamediv>
-  <refname>GearmanWorker::setId</refname>
-  <refpurpose>Give the worker an identifier so it can be tracked when asking gearmand for the list of available workers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::setId</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Assigns the worker an identifier.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <simpara>
-      A string identifier.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <example><!-- {{{ -->
-   <title><function>GearmanWorker::setId</function> example</title>
-   <simpara>
-     Set an identifier for a simple worker.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker= new GearmanWorker();
-$worker->setId('test');
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Run the following command:
-gearadmin --workers
-
-Output:
-30 ::3a3a:3361:3361:3a33%976303667 - : test
-]]>
-   </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/gearman/gearmanworker/setoptions.xml b/reference/gearman/gearmanworker/setoptions.xml
deleted file mode 100644
index cbe29fa94e22..000000000000
--- a/reference/gearman/gearmanworker/setoptions.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.setoptions">
- <refnamediv>
-  <refname>GearmanWorker::setOptions</refname>
-  <refpurpose>Set worker options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>true</type><methodname>GearmanWorker::setOptions</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets one or more options to the supplied value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>option</parameter></term>
-    <listitem>
-     <simpara>
-      The options to be set
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.true.always;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::options</methodname></member>
-   <member><methodname>GearmanWorker::addOptions</methodname></member>
-   <member><methodname>GearmanWorker::removeOptions</methodname></member>
-   <member><methodname>GearmanClient::setOptions</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/gearman/gearmanworker/settimeout.xml b/reference/gearman/gearmanworker/settimeout.xml
deleted file mode 100644
index a60c36491e2d..000000000000
--- a/reference/gearman/gearmanworker/settimeout.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.settimeout">
- <refnamediv>
-  <refname>GearmanWorker::setTimeout</refname>
-  <refpurpose>Set socket I/O activity timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>true</type><methodname>GearmanWorker::setTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the interval of time to wait for socket I/O activity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      An interval of time in milliseconds.  A negative value indicates an infinite timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.true.always;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A simple worker with a 5 second timeout</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object.
-$gmworker= new GearmanWorker();
-
-# Add default server (localhost).
-$gmworker->addServer();
-
-# Register function "reverse" with the server.
-$gmworker->addFunction("reverse", "reverse_fn");
-
-# Set the timeout to 5 seconds
-$gmworker->setTimeout(5000);
-
-echo "Waiting for job...\n";
-while(@$gmworker->work() || $gmworker->returnCode() == GEARMAN_TIMEOUT)
-{
-  if ($gmworker->returnCode() == GEARMAN_TIMEOUT)
-  {
-    # Normally one would want to do something useful here ...
-    echo "Timeout. Waiting for next job...\n";
-    continue;
-  }
-
-  if ($gmworker->returnCode() != GEARMAN_SUCCESS)
-  {
-    echo "return_code: " . $gmworker->returnCode() . "\n";
-    break;
-  }
-}
-
-echo "Done\n";
-
-function reverse_fn($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    Running the worker with no submitted jobs will generate output that looks like the following:
-   </simpara>
-   <screen>
-<![CDATA[
-Starting
-Waiting for job...
-Timeout. Waiting for next job...
-Timeout. Waiting for next job...
-Timeout. Waiting for next job...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::timeout</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/gearman/gearmanworker/timeout.xml b/reference/gearman/gearmanworker/timeout.xml
deleted file mode 100644
index 139ff9b082a6..000000000000
--- a/reference/gearman/gearmanworker/timeout.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.timeout">
- <refnamediv>
-  <refname>GearmanWorker::timeout</refname>
-  <refpurpose>Get socket I/O activity timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>int</type><methodname>GearmanWorker::timeout</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the current time to wait, in milliseconds, for socket I/O activity.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A time period in milliseconds.  A negative value indicates an infinite timeout.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::setTimeout</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/gearman/gearmanworker/unregister.xml b/reference/gearman/gearmanworker/unregister.xml
deleted file mode 100644
index bcb3e9a69bfc..000000000000
--- a/reference/gearman/gearmanworker/unregister.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.unregister">
- <refnamediv>
-  <refname>GearmanWorker::unregister</refname>
-  <refpurpose>Unregister a function name with the job servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::unregister</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unregisters a function name with the job servers ensuring that no more jobs (for that
-   function) are sent to this worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of a function to register with the job server
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A standard Gearman return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::register</methodname></member>
-   <member><methodname>GearmanWorker::unregisterAll</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/gearman/gearmanworker/unregisterall.xml b/reference/gearman/gearmanworker/unregisterall.xml
deleted file mode 100644
index a7f279a8ddaf..000000000000
--- a/reference/gearman/gearmanworker/unregisterall.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.unregisterall">
- <refnamediv>
-  <refname>GearmanWorker::unregisterAll</refname>
-  <refpurpose>Unregister all function names with the job servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::unregisterAll</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Unregisters all previously registered functions, ensuring that no more jobs are
-   sent to this worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A standard Gearman return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::register</methodname></member>
-   <member><methodname>GearmanWorker::unregister</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/gearman/gearmanworker/wait.xml b/reference/gearman/gearmanworker/wait.xml
deleted file mode 100644
index 5fa726287426..000000000000
--- a/reference/gearman/gearmanworker/wait.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.wait">
- <refnamediv>
-  <refname>GearmanWorker::wait</refname>
-  <refpurpose>Wait for activity from one of the job servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::wait</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Causes the worker to wait for activity from one of the Gearman job servers when operating
-   in non-blocking I/O mode.  On failure, issues a <constant>E_WARNING</constant> with the last Gearman error
-   encountered.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Running worker in non-blocking mode</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo "Starting\n";
-
-# Create our worker object
-$worker= new GearmanWorker();
-
-# Make the worker non-blocking
-$worker->addOptions(GEARMAN_WORKER_NON_BLOCKING);
-
-# Add the default server (localhost, port 4730)
-$worker->addServer();
-
-# Add our reverse function
-$worker->addFunction('reverse', 'reverse_fn');
-
-# Try to grab a job
-while (@$worker->work() ||
-       $worker->returnCode() == GEARMAN_IO_WAIT ||
-       $worker->returnCode() == GEARMAN_NO_JOBS)
-{
-  if ($worker->returnCode() == GEARMAN_SUCCESS)
-    continue;
-
-  echo "Waiting for next job...\n";
-  if (!@$worker->wait())
-  {
-    if ($worker->returnCode() == GEARMAN_NO_ACTIVE_FDS)
-    {
-      # We are not connected to any servers, so wait a bit before
-      # trying to reconnect.
-      sleep(5);
-      continue;
-    }
-    break;
-  }
-}
-
-echo "Worker Error: " . $worker->error() . "\n";
-
-function reverse_fn($job)
-{
-  return strrev($job->workload());
-}
-
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::work</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/gearman/gearmanworker/work.xml b/reference/gearman/gearmanworker/work.xml
deleted file mode 100644
index 99b502e6376a..000000000000
--- a/reference/gearman/gearmanworker/work.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearmanworker.work">
- <refnamediv>
-  <refname>GearmanWorker::work</refname>
-  <refpurpose>Wait for and perform jobs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="GearmanWorker">
-   <modifier>public</modifier> <type>bool</type><methodname>GearmanWorker::work</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Waits for a job to be assigned and then calls the appropriate callback function.
-   Issues an <constant>E_WARNING</constant> with the last Gearman error if the return
-   code is not one of <constant>GEARMAN_SUCCESS</constant>, <constant>GEARMAN_IO_WAIT</constant>,
-   or <constant>GEARMAN_WORK_FAIL</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>GearmanWorker::work</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-# create the worker
-$worker = new GearmanWorker();
-
-# add the default job server (localhost)
-$worker->addServer();
-
-# add the reverse function
-$worker->addFunction("reverse", "my_reverse_function");
-
-# start te worker listening for job submissions
-while ($worker->work());
-
-function my_reverse_function($job)
-{
-  return strrev($job->workload());
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>GearmanWorker::addFunction</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/gearman/setup.xml b/reference/gearman/setup.xml
deleted file mode 100644
index 766e836bb870..000000000000
--- a/reference/gearman/setup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gearman.setup">
- &reftitle.setup;
-
- <section xml:id="gearman.requirements">
-  &reftitle.required;
-  <!-- Use &no.requirement; if there no requirement -->
-  <simpara>
-   This extension requires the
-   <link xlink:href="&url.gearman.libgearman;">libgearman</link>,
-   <link xlink:href="&url.libevent;">libevent</link> and
-   <link xlink:href="&url.uuid;">uuid</link>
-   libraries,
-   and a running Gearman server.
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- &reference.gearman.configure;
- <!-- }}} -->
-
-</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/gearman/versions.xml b/reference/gearman/versions.xml
deleted file mode 100644
index b8433453d2e9..000000000000
--- a/reference/gearman/versions.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='gearman_version' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_return_code' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_create' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearman_task_function' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_uuid' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_job_handle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_is_known' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_is_running' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_numerator' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_denominator' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_data' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_data_size' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_send_data' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_task_recv_data' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_return_code' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_create' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_data' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_warning' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_status' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_complete' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_exception' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_fail' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_handle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_unique' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_function_name' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_workload' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_job_workload_size' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_return_code' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_create' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_clone' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_error' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_errno' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_timeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_set_timeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_set_options' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_options' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_remove_options' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_add_server' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_servers' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_high' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_low' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_job_handle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_status' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_high_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_do_low_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_job_status' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_echo' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_high' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_low' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_high_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_low_background' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_add_task_status' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_workload_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_created_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_data_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_warning_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_status_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_complete_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_exception_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_set_fail_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_clear_fn' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_data' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearman_client_context' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_set_data' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearman_client_set_context' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_client_run_tasks' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_client_wait' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearman_worker_return_code' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_create' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_clone' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_error' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_errno' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_set_options' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_add_server' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_add_servers' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_register' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_unregister' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_unregister_all' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_grab_job' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_add_function' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_work' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearman_worker_echo' from='PECL gearman &gt;= 0.5.0'/>
- <!-- Methods -->
-
- <function name='gearmanclient' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::__construct' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::returncode' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::clone' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::error' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::geterrno' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::timeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::settimeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::setoptions' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addoptions' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::removeoptions' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::addserver' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addservers' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::do' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dohigh' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dolow' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dojobhandle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dostatus' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dobackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dohighbackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::dolowbackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::jobstatus' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::echo' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtask' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtaskhigh' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtasklow' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtaskbackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtaskhighbackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtasklowbackground' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::addtaskstatus' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setworkloadcallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setcreatedcallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setclientcallback' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanclient::setdatacallback' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::setwarningcallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setstatuscallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setcompletecallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setexceptioncallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::setfailcallback' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::clearcallbacks' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::data' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanclient::context' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::setdata' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanclient::setcontext' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanclient::runtasks' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanclient::wait' from='PECL gearman &gt;= 0.6.0'/>
-
- <function name='gearmanworker' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::__construct' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::returncode' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::clone' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::error' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::geterrno' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::options' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::setoptions' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::addoptions' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::removeoptions' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::addserver' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::addservers' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::addfunction' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::work' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanworker::wait' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::timeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::settimeout' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::register' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::unregister' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::unregisterAll' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanworker::echo' from='PECL gearman &gt;= 0.6.0'/>
-
- <function name='gearmanjob' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::__construct' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::returncode' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::workload' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::workloadsize' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::warning' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendwarning' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::status' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendstatus' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::handle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::unique' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::data' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendData' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::complete' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendcomplete' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::exception' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendexception' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::fail' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmanjob::sendfail' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmanjob::functionname' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanjob::setreturn' from='PECL gearman &gt;= 0.5.0'/>
-
- <function name='gearmantask' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::__construct' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::returncode' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::create' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmantask::function' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmantask::functionname' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmantask::uuid' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmantask::unique' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmantask::jobhandle' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::isknown' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::isrunning' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::tasknumerator' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::taskdenominator' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::data' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::datasize' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmantask::senddata' from='PECL gearman &lt;= 0.5.0'/>
- <function name='gearmantask::sendworkload' from='PECL gearman &gt;= 0.6.0'/>
- <function name='gearmantask::recvdata' from='PECL gearman &gt;= 0.5.0'/>
-
- <function name='gearmanexception' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::__clone' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::__construct' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::getmessage' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::getcode' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::getfile' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::getline' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::gettrace' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::gettraceasstring' from='PECL gearman &gt;= 0.5.0'/>
- <function name='gearmanexception::__tostring' from='PECL gearman &gt;= 0.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/gender/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/gender/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/gender/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/gender/book.xml b/reference/gender/book.xml
deleted file mode 100644
index e2a3a66949a6..000000000000
--- a/reference/gender/book.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.gender">
- <?phpdoc extension-membership="pecl" ?>
- <title>Determine gender of firstnames</title>
- <titleabbrev>Gender</titleabbrev>
-
- <preface xml:id="intro.gender">
-  &reftitle.intro;
-  <simpara>
-   Gender PHP extension is a port of the gender.c program originally written by Joerg Michael. The main purpose is to find out the gender of firstnames. The current database contains &gt;40000 firstnames from 54 countries.
-  </simpara>
- </preface>
-
- &reference.gender.setup;
- &reference.gender.examples;
- &reference.gender.gender;
-
-</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/gender/configure.xml b/reference/gender/configure.xml
deleted file mode 100644
index 4c6aef9b1187..000000000000
--- a/reference/gender/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;gender">&url.pecl.package;gender</link>
- </simpara>
-
-
-</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/gender/examples.xml b/reference/gender/examples.xml
deleted file mode 100644
index 59af8803c650..000000000000
--- a/reference/gender/examples.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xml:id="gender.examples">
- &reftitle.examples;
- <section xml:id="gender.example.admin">
-  <title>Usage example.</title>
-  <simpara>
-    Gender class usage example.
-  </simpara>
-  <example>
-   <title>Usage example.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-namespace Gender;
-
-$gender = new Gender;
-
-
-$name = "Milene";
-$country = Gender::FRANCE;
-
-$result = $gender->get($name, $country);
-
-$data = $gender->country($country);
-
-switch($result) {
-    case Gender::IS_FEMALE:
-        printf("The name %s is female in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::IS_MOSTLY_FEMALE:
-        printf("The name %s is mostly female in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::IS_MALE:
-        printf("The name %s is male in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::IS_MOSTLY_MALE:
-        printf("The name %s is mostly male in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::IS_UNISEX_NAME:
-        printf("The name %s is unisex in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::IS_A_COUPLE:
-        printf("The name %s is both male and female in %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::NAME_NOT_FOUND:
-        printf("The name %s was not found for %s\n", $name, $data['country']);
-    break;
-
-
-    case Gender::ERROR_IN_NAME:
-        echo "There is an error in the given name!\n";
-    break;
-
-    default:
-        echo "An error occurred!\n";
-    break;
-
-}
-]]>
-   </programlisting>
-  </example>
- </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/gender/gender.xml b/reference/gender/gender.xml
deleted file mode 100644
index 7754aaaac5a1..000000000000
--- a/reference/gender/gender.xml
+++ /dev/null
@@ -1,883 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gender" role="class">
-
- <title>The Gender\Gender class</title>
- <titleabbrev>Gender\Gender</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Gender\Gender intro -->
-  <section xml:id="gender.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gender.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Gender\Gender</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Gender\Gender</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-female">Gender\Gender::IS_FEMALE</varname>
-     <initializer>70</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-mostly-female">Gender\Gender::IS_MOSTLY_FEMALE</varname>
-     <initializer>102</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-male">Gender\Gender::IS_MALE</varname>
-     <initializer>77</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-mostly-male">Gender\Gender::IS_MOSTLY_MALE</varname>
-     <initializer>109</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-unisex-name">Gender\Gender::IS_UNISEX_NAME</varname>
-     <initializer>63</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.is-a-couple">Gender\Gender::IS_A_COUPLE</varname>
-     <initializer>67</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.name-not-found">Gender\Gender::NAME_NOT_FOUND</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.error-in-name">Gender\Gender::ERROR_IN_NAME</varname>
-     <initializer>69</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.any-country">Gender\Gender::ANY_COUNTRY</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.britain">Gender\Gender::BRITAIN</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.ireland">Gender\Gender::IRELAND</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.usa">Gender\Gender::USA</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.spain">Gender\Gender::SPAIN</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.portugal">Gender\Gender::PORTUGAL</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.italy">Gender\Gender::ITALY</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.malta">Gender\Gender::MALTA</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.france">Gender\Gender::FRANCE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.belgium">Gender\Gender::BELGIUM</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.luxembourg">Gender\Gender::LUXEMBOURG</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.netherlands">Gender\Gender::NETHERLANDS</varname>
-     <initializer>11</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.germany">Gender\Gender::GERMANY</varname>
-     <initializer>12</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.east-frisia">Gender\Gender::EAST_FRISIA</varname>
-     <initializer>13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.austria">Gender\Gender::AUSTRIA</varname>
-     <initializer>14</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.swiss">Gender\Gender::SWISS</varname>
-     <initializer>15</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.iceland">Gender\Gender::ICELAND</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.denmark">Gender\Gender::DENMARK</varname>
-     <initializer>17</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.norway">Gender\Gender::NORWAY</varname>
-     <initializer>18</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.sweden">Gender\Gender::SWEDEN</varname>
-     <initializer>19</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.finland">Gender\Gender::FINLAND</varname>
-     <initializer>20</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.estonia">Gender\Gender::ESTONIA</varname>
-     <initializer>21</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.latvia">Gender\Gender::LATVIA</varname>
-     <initializer>22</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.lithuania">Gender\Gender::LITHUANIA</varname>
-     <initializer>23</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.poland">Gender\Gender::POLAND</varname>
-     <initializer>24</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.czech-rep">Gender\Gender::CZECH_REP</varname>
-     <initializer>25</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.slovakia">Gender\Gender::SLOVAKIA</varname>
-     <initializer>26</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.hungary">Gender\Gender::HUNGARY</varname>
-     <initializer>27</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.romania">Gender\Gender::ROMANIA</varname>
-     <initializer>28</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.bulgaria">Gender\Gender::BULGARIA</varname>
-     <initializer>29</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.bosnia">Gender\Gender::BOSNIA</varname>
-     <initializer>30</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.croatia">Gender\Gender::CROATIA</varname>
-     <initializer>31</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.kosovo">Gender\Gender::KOSOVO</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.macedonia">Gender\Gender::MACEDONIA</varname>
-     <initializer>33</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.montenegro">Gender\Gender::MONTENEGRO</varname>
-     <initializer>34</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.serbia">Gender\Gender::SERBIA</varname>
-     <initializer>35</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.slovenia">Gender\Gender::SLOVENIA</varname>
-     <initializer>36</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.albania">Gender\Gender::ALBANIA</varname>
-     <initializer>37</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.greece">Gender\Gender::GREECE</varname>
-     <initializer>38</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.russia">Gender\Gender::RUSSIA</varname>
-     <initializer>39</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.belarus">Gender\Gender::BELARUS</varname>
-     <initializer>40</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.moldova">Gender\Gender::MOLDOVA</varname>
-     <initializer>41</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.ukraine">Gender\Gender::UKRAINE</varname>
-     <initializer>42</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.armenia">Gender\Gender::ARMENIA</varname>
-     <initializer>43</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.azerbaijan">Gender\Gender::AZERBAIJAN</varname>
-     <initializer>44</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.georgia">Gender\Gender::GEORGIA</varname>
-     <initializer>45</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.kazakh-uzbek">Gender\Gender::KAZAKH_UZBEK</varname>
-     <initializer>46</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.turkey">Gender\Gender::TURKEY</varname>
-     <initializer>47</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.arabia">Gender\Gender::ARABIA</varname>
-     <initializer>48</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.israel">Gender\Gender::ISRAEL</varname>
-     <initializer>49</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.china">Gender\Gender::CHINA</varname>
-     <initializer>50</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.india">Gender\Gender::INDIA</varname>
-     <initializer>51</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.japan">Gender\Gender::JAPAN</varname>
-     <initializer>52</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="gender-gender.constants.korea">Gender\Gender::KOREA</varname>
-     <initializer>53</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gender')/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.gender')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Gender\Gender constants -->
-  <section xml:id="gender.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="gender-gender.constants.is-female">
-     <term><constant>Gender\Gender::IS_FEMALE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.is-mostly-female">
-     <term><constant>Gender\Gender::IS_MOSTLY_FEMALE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.is-male">
-     <term><constant>Gender\Gender::IS_MALE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.is-mostly-male">
-     <term><constant>Gender\Gender::IS_MOSTLY_MALE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.is-unisex-name">
-     <term><constant>Gender\Gender::IS_UNISEX_NAME</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.is-a-couple">
-     <term><constant>Gender\Gender::IS_A_COUPLE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.name-not-found">
-     <term><constant>Gender\Gender::NAME_NOT_FOUND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.error-in-name">
-     <term><constant>Gender\Gender::ERROR_IN_NAME</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.any-country">
-     <term><constant>Gender\Gender::ANY_COUNTRY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.britain">
-     <term><constant>Gender\Gender::BRITAIN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.ireland">
-     <term><constant>Gender\Gender::IRELAND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.usa">
-     <term><constant>Gender\Gender::USA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.spain">
-     <term><constant>Gender\Gender::SPAIN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.portugal">
-     <term><constant>Gender\Gender::PORTUGAL</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.italy">
-     <term><constant>Gender\Gender::ITALY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.malta">
-     <term><constant>Gender\Gender::MALTA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.france">
-     <term><constant>Gender\Gender::FRANCE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.belgium">
-     <term><constant>Gender\Gender::BELGIUM</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.luxembourg">
-     <term><constant>Gender\Gender::LUXEMBOURG</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.netherlands">
-     <term><constant>Gender\Gender::NETHERLANDS</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.germany">
-     <term><constant>Gender\Gender::GERMANY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.east-frisia">
-     <term><constant>Gender\Gender::EAST_FRISIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.austria">
-     <term><constant>Gender\Gender::AUSTRIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.swiss">
-     <term><constant>Gender\Gender::SWISS</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.iceland">
-     <term><constant>Gender\Gender::ICELAND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.denmark">
-     <term><constant>Gender\Gender::DENMARK</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.norway">
-     <term><constant>Gender\Gender::NORWAY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.sweden">
-     <term><constant>Gender\Gender::SWEDEN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.finland">
-     <term><constant>Gender\Gender::FINLAND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.estonia">
-     <term><constant>Gender\Gender::ESTONIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.latvia">
-     <term><constant>Gender\Gender::LATVIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.lithuania">
-     <term><constant>Gender\Gender::LITHUANIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.poland">
-     <term><constant>Gender\Gender::POLAND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.czech-rep">
-     <term><constant>Gender\Gender::CZECH_REP</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.slovakia">
-     <term><constant>Gender\Gender::SLOVAKIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.hungary">
-     <term><constant>Gender\Gender::HUNGARY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.romania">
-     <term><constant>Gender\Gender::ROMANIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.bulgaria">
-     <term><constant>Gender\Gender::BULGARIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.bosnia">
-     <term><constant>Gender\Gender::BOSNIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.croatia">
-     <term><constant>Gender\Gender::CROATIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.kosovo">
-     <term><constant>Gender\Gender::KOSOVO</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.macedonia">
-     <term><constant>Gender\Gender::MACEDONIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.montenegro">
-     <term><constant>Gender\Gender::MONTENEGRO</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.serbia">
-     <term><constant>Gender\Gender::SERBIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.slovenia">
-     <term><constant>Gender\Gender::SLOVENIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.albania">
-     <term><constant>Gender\Gender::ALBANIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.greece">
-     <term><constant>Gender\Gender::GREECE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.russia">
-     <term><constant>Gender\Gender::RUSSIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.belarus">
-     <term><constant>Gender\Gender::BELARUS</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.moldova">
-     <term><constant>Gender\Gender::MOLDOVA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.ukraine">
-     <term><constant>Gender\Gender::UKRAINE</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.armenia">
-     <term><constant>Gender\Gender::ARMENIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.azerbaijan">
-     <term><constant>Gender\Gender::AZERBAIJAN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.georgia">
-     <term><constant>Gender\Gender::GEORGIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.kazakh-uzbek">
-     <term><constant>Gender\Gender::KAZAKH_UZBEK</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.turkey">
-     <term><constant>Gender\Gender::TURKEY</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.arabia">
-     <term><constant>Gender\Gender::ARABIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.israel">
-     <term><constant>Gender\Gender::ISRAEL</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.china">
-     <term><constant>Gender\Gender::CHINA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.india">
-     <term><constant>Gender\Gender::INDIA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.japan">
-     <term><constant>Gender\Gender::JAPAN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="gender-gender.constants.korea">
-     <term><constant>Gender\Gender::KOREA</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.gender.entities.gender;
-
-</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/gender/gender/connect.xml b/reference/gender/gender/connect.xml
deleted file mode 100644
index 5aac0da6c9c9..000000000000
--- a/reference/gender/gender/connect.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.connect">
- <refnamediv>
-  <refname>Gender\Gender::connect</refname>
-  <refpurpose>Connect to an external name dictionary</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Gender\Gender::connect</methodname>
-   <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Connect to an external name dictionary. Currently only streams are
-    supported.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-      <term><parameter>dsn</parameter></term>
-        <listitem>
-          <simpara>
-           DSN to open.
-          </simpara>
-       </listitem>
-     </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Boolean as success of failure.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gender/gender/construct.xml b/reference/gender/gender/construct.xml
deleted file mode 100644
index bcb6b4d4d561..000000000000
--- a/reference/gender/gender/construct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.construct">
- <refnamediv>
-  <refname>Gender\Gender::__construct</refname>
-  <refpurpose>Construct the Gender object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Gender\Gender::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>dsn</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-    Create a Gender object optionally connecting to an external name
-    dictionary. When no external database was given, compiled in data will be
-    used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-      <term><parameter>dsn</parameter></term>
-        <listitem>
-          <simpara>
-           DSN to open.
-          </simpara>
-       </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/gender/gender/country.xml b/reference/gender/gender/country.xml
deleted file mode 100644
index 9a5c9b2c27e5..000000000000
--- a/reference/gender/gender/country.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.country">
- <refnamediv>
-  <refname>Gender\Gender::country</refname>
-  <refpurpose>Get textual country representation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Gender\Gender::country</methodname>
-   <methodparam><type>int</type><parameter>country</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the textual representation of a country from a Gender class
-   constant.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>country</parameter></term>
-    <listitem>
-     <simpara>
-      A country ID specified by a <classname>Gender\Gender</classname> class
-      constant.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-   &reftitle.returnvalues;
-   <simpara>
-    Returns an array with the short and full names of the country on success
-    &return.falseforfailure;.
-   </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Using <methodname>Gender\Gender::country</methodname></title>
-   <programlisting role="php">
-<![CDATA[
-$gender = new Gender\Gender;
-var_dump($gender->country(Gender\Gender::BRITAIN));
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  'country_short' =>
-  string(2) "UK"
-  'country' =>
-  string(13) "Great Britain"
-}
-]]>
-   </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/gender/gender/get.xml b/reference/gender/gender/get.xml
deleted file mode 100644
index 226dbe85bb67..000000000000
--- a/reference/gender/gender/get.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.get">
- <refnamediv>
-  <refname>Gender\Gender::get</refname>
-  <refpurpose>Get gender of a name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gender\Gender::get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>country</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Get the gender of the name in a particular country.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-      <term><parameter>name</parameter></term>
-        <listitem>
-          <simpara>
-            Name to check.
-          </simpara>
-       </listitem>
-     </varlistentry>
-    <varlistentry>
-      <term><parameter>country</parameter></term>
-        <listitem>
-          <simpara>
-            Country id identified by Gender class constant.
-          </simpara>
-       </listitem>
-     </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns gender of the name.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gender/gender/isnick.xml b/reference/gender/gender/isnick.xml
deleted file mode 100644
index c37bcf7bdf5d..000000000000
--- a/reference/gender/gender/isnick.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.isnick">
- <refnamediv>
-  <refname>Gender\Gender::isNick</refname>
-  <refpurpose>Check if the name0 is an alias of the name1</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gender\Gender::isNick</methodname>
-   <methodparam><type>string</type><parameter>name0</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name1</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>country</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Check whether the name0 is a nick of the name1.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-      <term><parameter>name0</parameter></term>
-        <listitem>
-          <simpara>
-            Name to check.
-          </simpara>
-       </listitem>
-     </varlistentry>
-    <varlistentry>
-      <term><parameter>name1</parameter></term>
-        <listitem>
-          <simpara>
-            Name to check.
-          </simpara>
-       </listitem>
-     </varlistentry>
-    <varlistentry>
-      <term><parameter>country</parameter></term>
-        <listitem>
-          <simpara>
-            Country id identified by Gender class constant. If ommited ANY_COUNTRY is used.
-          </simpara>
-       </listitem>
-     </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gender/gender/similarnames.xml b/reference/gender/gender/similarnames.xml
deleted file mode 100644
index 038345019606..000000000000
--- a/reference/gender/gender/similarnames.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender-gender.similarnames">
- <refnamediv>
-  <refname>Gender\Gender::similarNames</refname>
-  <refpurpose>Get similar names</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gender\Gender::similarNames</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>country</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Get similar names for the given name and country.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-      <term><parameter>name</parameter></term>
-        <listitem>
-          <simpara>
-            Name to check.
-          </simpara>
-       </listitem>
-     </varlistentry>
-    <varlistentry>
-      <term><parameter>country</parameter></term>
-        <listitem>
-          <simpara>
-            Country id identified by Gender class constant. If ommited ANY_COUNTRY is used.
-          </simpara>
-       </listitem>
-     </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns an array with the similar names found.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gender/setup.xml b/reference/gender/setup.xml
deleted file mode 100644
index 49791664401a..000000000000
--- a/reference/gender/setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gender.setup">
- &reftitle.setup;
-
- <!--<section xml:id="gender.requirements">
-  &reftitle.required;
-  <para>
-    This package has no external dependencies.
-  </para>
- </section>-->
-
- <section xml:id="gender.installation">
-  &reftitle.install;
-   <simpara>
-        &pecl.moved;
-   </simpara>
-   <simpara>
-     &pecl.info;
-   <link xlink:href="&url.pecl.package;gender">&url.pecl.package;gender</link>.
-   </simpara>
- </section>
-
- <!--<section xml:id="gender.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/gender/versions.xml b/reference/gender/versions.xml
deleted file mode 100644
index 607986900e8a..000000000000
--- a/reference/gender/versions.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
-
- <function name='gender\gender' from='PECL gender &gt;= 0.6.0'/>
- <function name='gender\gender::__construct' from='PECL gender &gt;= 0.6.0'/>
- <function name='gender\gender::get' from='PECL gender &gt;= 0.6.0'/>
- <function name='gender\gender::connect' from='PECL gender &gt;= 0.6.0'/>
- <function name='gender\gender::country' from='PECL gender &gt;= 0.8.0'/>
- <function name='gender\gender::similarNames' from='PECL gender &gt;= 0.9.0'/>
- <function name='gender\gender::isNick' from='PECL gender &gt;= 0.9.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/geoip/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/geoip/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/geoip/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/geoip/book.xml b/reference/geoip/book.xml
deleted file mode 100644
index b0d335e192b0..000000000000
--- a/reference/geoip/book.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.geoip">
- <?phpdoc extension-membership="pecl" ?>
- <title>Geo IP Location</title>
- <titleabbrev>GeoIP</titleabbrev>
-
- <preface xml:id="intro.geoip">
-  &reftitle.intro;
-  <simpara>
-    The GeoIP extension allows you to find the location of an IP address. City,
-    State, Country, Longitude, Latitude, and other information as all, such as
-    ISP and connection type can be obtained with the help of GeoIP.
-  </simpara>
-  <warning>
-   <simpara>
-    This extension does not support MaxMind's current "GeoIP2" databases,
-    only the "GeoIP legacy" database files.
-   </simpara>
-  </warning>
- </preface>
-
- &reference.geoip.setup;
- &reference.geoip.constants;
- &reference.geoip.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/geoip/constants.xml b/reference/geoip/constants.xml
deleted file mode 100644
index b653bba40b6b..000000000000
--- a/reference/geoip/constants.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="geoip.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.geoip-country-edition">
-   <term>
-    <constant>GEOIP_COUNTRY_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-region-edition-rev0">
-   <term>
-    <constant>GEOIP_REGION_EDITION_REV0</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-city-edition-rev0">
-   <term>
-    <constant>GEOIP_CITY_EDITION_REV0</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-org-edition">
-   <term>
-    <constant>GEOIP_ORG_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-isp-edition">
-   <term>
-    <constant>GEOIP_ISP_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-city-edition-rev1">
-   <term>
-    <constant>GEOIP_CITY_EDITION_REV1</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-region-edition-rev1">
-   <term>
-    <constant>GEOIP_REGION_EDITION_REV1</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-proxy-edition">
-   <term>
-    <constant>GEOIP_PROXY_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-asnum-edition">
-   <term>
-    <constant>GEOIP_ASNUM_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-netspeed-edition">
-   <term>
-    <constant>GEOIP_NETSPEED_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-domain-edition">
-   <term>
-    <constant>GEOIP_DOMAIN_EDITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <simpara>
-   The following constants are for net speed:
- </simpara>
- <variablelist>
-  <varlistentry xml:id="constant.geoip-unknown-speed">
-   <term>
-    <constant>GEOIP_UNKNOWN_SPEED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara/>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-dialup-speed">
-   <term>
-    <constant>GEOIP_DIALUP_SPEED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara/>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-cabledsl-speed">
-   <term>
-    <constant>GEOIP_CABLEDSL_SPEED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara/>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.geoip-corporate-speed">
-   <term>
-    <constant>GEOIP_CORPORATE_SPEED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <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/geoip/functions/geoip-asnum-by-name.xml b/reference/geoip/functions/geoip-asnum-by-name.xml
deleted file mode 100644
index 675773a23d0d..000000000000
--- a/reference/geoip/functions/geoip-asnum-by-name.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-asnum-by-name">
- <refnamediv>
-  <refname>geoip_asnum_by_name</refname>
-  <refpurpose>Get the Autonomous System Numbers (ASN)</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_asnum_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_asnum_by_name</function> function will return the Autonomous
-   System Numbers (ASN) associated with an IP address.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ASN on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_asnum_by_name</function> example</title>
-   <simpara>
-    This will output the ASN of the host www.example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$asn = geoip_asnum_by_name('www.example.com');
-
-if ($asn) {
-    echo 'The ASN is: ' . $asn;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-The ASN is: AS15133 EdgeCast Networks, Inc
-]]>
-   </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/geoip/functions/geoip-continent-code-by-name.xml b/reference/geoip/functions/geoip-continent-code-by-name.xml
deleted file mode 100644
index 613b3395e732..000000000000
--- a/reference/geoip/functions/geoip-continent-code-by-name.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-continent-code-by-name">
- <refnamediv>
-  <refname>geoip_continent_code_by_name</refname>
-  <refpurpose>Get the two letter continent code</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_continent_code_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_continent_code_by_name</function> function will return
-   the two letter continent code corresponding to a hostname or an IP address.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose location is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the two letter continent code on success, or &false; if the
-   address cannot be found in the database.
-  </simpara>
-  <table>
-   <title>Continent codes</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Code</entry>
-      <entry>Continent name</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>AF</literal></entry>
-      <entry>Africa</entry>
-     </row>
-     <row>
-      <entry><literal>AN</literal></entry>
-      <entry>Antarctica</entry>
-     </row>
-     <row>
-      <entry><literal>AS</literal></entry>
-      <entry>Asia</entry>
-     </row>
-     <row>
-      <entry><literal>EU</literal></entry>
-      <entry>Europe</entry>
-     </row>
-     <row>
-      <entry><literal>NA</literal></entry>
-      <entry>North america</entry>
-     </row>
-     <row>
-      <entry><literal>OC</literal></entry>
-      <entry>Oceania</entry>
-     </row>
-     <row>
-      <entry><literal>SA</literal></entry>
-      <entry>South america</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_continent_code_by_name</function> example</title>
-   <simpara>
-    This will print where the host example.com is located.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$continent = geoip_continent_code_by_name('www.example.com');
-if ($continent) {
-    echo 'This host is located in: ' . $continent;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
- This host is located in: NA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>geoip_country_code_by_name</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/geoip/functions/geoip-country-code-by-name.xml b/reference/geoip/functions/geoip-country-code-by-name.xml
deleted file mode 100644
index 1407a18fec1c..000000000000
--- a/reference/geoip/functions/geoip-country-code-by-name.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-country-code-by-name">
- <refnamediv>
-  <refname>geoip_country_code_by_name</refname>
-  <refpurpose>Get the two letter country code</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_country_code_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-    The <function>geoip_country_code_by_name</function> function will return
-    the two letter country code corresponding to a hostname or an IP address.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose location is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the two letter ISO country code on success, or &false;
-   if the address cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_country_code_by_name</function> example</title>
-   <simpara>
-    This will print where the host example.com is located.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$country = geoip_country_code_by_name('www.example.com');
-if ($country) {
-    echo 'This host is located in: ' . $country;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This host is located in: US
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <simpara>
-    Please see
-    <link xlink:href="&url.maxmind.iso3166;">&url.maxmind.iso3166;</link> for
-    a complete list of possible return values, including special codes.
-   </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>geoip_country_code3_by_name</function></member>
-   <member><function>geoip_country_name_by_name</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/geoip/functions/geoip-country-code3-by-name.xml b/reference/geoip/functions/geoip-country-code3-by-name.xml
deleted file mode 100644
index 7fc04338120e..000000000000
--- a/reference/geoip/functions/geoip-country-code3-by-name.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-country-code3-by-name">
- <refnamediv>
-  <refname>geoip_country_code3_by_name</refname>
-  <refpurpose>Get the three letter country code</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_country_code3_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_country_code3_by_name</function> function will return the
-   three letter country code corresponding to a hostname or an IP address.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose location is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the three letter country code on success, or &false;
-   if the address cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_country_code3_by_name</function> example</title>
-   <simpara>
-    This will print where the host example.com is located.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$country = geoip_country_code3_by_name('www.example.com');
-if ($country) {
-    echo 'This host is located in: ' . $country;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This host is located in: USA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>geoip_country_code_by_name</function></member>
-   <member><function>geoip_country_name_by_name</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/geoip/functions/geoip-country-name-by-name.xml b/reference/geoip/functions/geoip-country-name-by-name.xml
deleted file mode 100644
index e10ae385e523..000000000000
--- a/reference/geoip/functions/geoip-country-name-by-name.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-country-name-by-name">
- <refnamediv>
-  <refname>geoip_country_name_by_name</refname>
-  <refpurpose>Get the full country name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_country_name_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_country_name_by_name</function> function will return the
-   full country name corresponding to a hostname or an IP address.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose location is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the country name on success, or &false; if the address cannot
-   be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_country_name_by_name</function> example</title>
-   <simpara>
-    This will print where the host example.com is located.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$country = geoip_country_name_by_name('www.example.com');
-if ($country) {
-    echo 'This host is located in: ' . $country;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
- This host is located in: United States
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>geoip_country_code_by_name</function></member>
-   <member><function>geoip_country_code3_by_name</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/geoip/functions/geoip-database-info.xml b/reference/geoip/functions/geoip-database-info.xml
deleted file mode 100644
index 120d0557ae42..000000000000
--- a/reference/geoip/functions/geoip-database-info.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-database-info">
- <refnamediv>
-  <refname>geoip_database_info</refname>
-  <refpurpose>Get GeoIP Database information</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_database_info</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>database</parameter><initializer>GEOIP_COUNTRY_EDITION</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_database_info</function> function returns the corresponding
-   GeoIP Database version as it is defined inside the binary file.
-  </simpara>
-
-  <simpara>
-   If this function is called without arguments, it returns the version
-   of the GeoIP Free Country Edition.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The database type as an integer. You can use the
-      <link linkend="geoip.constants">various constants</link> defined with
-      this extension (ie: GEOIP_*_EDITION).
-     </simpara>
-
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the corresponding database version, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_database_info</function> example</title>
-   <simpara>
-    This will output information regarding the database.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print geoip_database_info(GEOIP_COUNTRY_EDITION);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-GEO-106FREE 20060801 Build 1 Copyright (c) 2006 MaxMind LLC All Rights Reserved
-]]>
-   </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/geoip/functions/geoip-db-avail.xml b/reference/geoip/functions/geoip-db-avail.xml
deleted file mode 100644
index 583b6d665bb1..000000000000
--- a/reference/geoip/functions/geoip-db-avail.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-avail">
- <refnamediv>
-  <refname>geoip_db_avail</refname>
-  <refpurpose>Determine if GeoIP Database is available</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>geoip_db_avail</methodname>
-   <methodparam><type>int</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_db_avail</function> function returns if the corresponding
-   GeoIP Database is available and can be opened on disk.
-  </simpara>
-
-  <simpara>
-   It does not indicate if the file is a proper database, only if it is readable.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The database type as an integer. You can use the
-      <link linkend="geoip.constants">various constants</link> defined with
-      this extension (ie: GEOIP_*_EDITION).
-     </simpara>
-
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; is database exists, &false; if not found, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_db_avail</function> example</title>
-   <simpara>
-    This will output the current database version string.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-if (geoip_db_avail(GEOIP_COUNTRY_EDITION))
-    print geoip_database_info(GEOIP_COUNTRY_EDITION);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-GEO-106FREE 20080801 Build 1 Copyright (c) 2006 MaxMind LLC All Rights Reserved
-]]>
-   </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/geoip/functions/geoip-db-filename.xml b/reference/geoip/functions/geoip-db-filename.xml
deleted file mode 100644
index 39eaae631272..000000000000
--- a/reference/geoip/functions/geoip-db-filename.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-filename">
- <refnamediv>
-  <refname>geoip_db_filename</refname>
-  <refpurpose>Returns the filename of the corresponding GeoIP Database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_db_filename</methodname>
-   <methodparam><type>int</type><parameter>database</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_db_filename</function> function returns the filename of
-   the corresponding GeoIP Database.
-  </simpara>
-
-  <simpara>
-   It does not indicate if the file exists or not on disk, only where the library
-   is looking for the database.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The database type as an integer. You can use the
-      <link linkend="geoip.constants">various constants</link> defined with
-      this extension (ie: GEOIP_*_EDITION).
-     </simpara>
-
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the filename of the corresponding database, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_db_filename</function> example</title>
-   <simpara>
-    This will output the filename of the corresponding database.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-print geoip_db_filename(GEOIP_COUNTRY_EDITION);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-/usr/share/GeoIP/GeoIP.dat
-]]>
-   </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/geoip/functions/geoip-db-get-all-info.xml b/reference/geoip/functions/geoip-db-get-all-info.xml
deleted file mode 100644
index bbdab2b2c86d..000000000000
--- a/reference/geoip/functions/geoip-db-get-all-info.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-db-get-all-info">
- <refnamediv>
-  <refname>geoip_db_get_all_info</refname>
-  <refpurpose>Returns detailed information about all GeoIP database types</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>geoip_db_get_all_info</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_db_get_all_info</function> function will return
-   detailed information as a multi-dimensional array about all the
-   GeoIP database types.
-  </simpara>
-  <simpara>
-   This function is available even if no databases are installed. It
-   will simply list them as non-available.
-  </simpara>
-  <simpara>
-   The names of the different keys of the returning associative array are as follows:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     "available" -- Boolean, indicate if DB is available (see
-     <function>geoip_db_avail</function>)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "description" -- The database description
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "filename" -- The database filename on disk (see
-     <function>geoip_db_filename</function>)
-    </simpara>
-   </listitem>
-  </itemizedlist>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the associative array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_db_get_all_info</function> example</title>
-   <simpara>
-    This will print the array containing all the information.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$infos = geoip_db_get_all_info();
-if (is_array($infos)) {
-    var_dump($infos);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(11) {
-  [1]=>
-  array(3) {
-    ["available"]=>
-    bool(true)
-    ["description"]=>
-    string(21) "GeoIP Country Edition"
-    ["filename"]=>
-    string(32) "/usr/share/GeoIP/GeoIP.dat"
-  }
-
-[ ... ]
-
-  [11]=>
-  array(3) {
-    ["available"]=>
-    bool(false)
-    ["description"]=>
-    string(25) "GeoIP Domain Name Edition"
-    ["filename"]=>
-    string(38) "/usr/share/GeoIP/GeoIPDomain.dat"
-  }
-}
-]]>
-   </screen>
-  </example>
-
-<example>
-   <title>A <function>geoip_db_get_all_info</function> example</title>
-   <simpara>
-    You can use the various constants as keys to get only parts of the information.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$infos = geoip_db_get_all_info();
-if ($infos[GEOIP_COUNTRY_EDITION]['available']) {
-    echo $infos[GEOIP_COUNTRY_EDITION]['description'];
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-GeoIP Country Edition
-]]>
-   </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/geoip/functions/geoip-domain-by-name.xml b/reference/geoip/functions/geoip-domain-by-name.xml
deleted file mode 100644
index 5884d9e0526d..000000000000
--- a/reference/geoip/functions/geoip-domain-by-name.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.geoip-domain-by-name">
- <refnamediv>
-  <refname>geoip_domain_by_name</refname>
-  <refpurpose>Get the second level domain name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_domain_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_domain_by_name</function> function will return the second level
-   domain names associated with a hostname or an IP address.
-  </simpara>
-  <simpara>
-   This function is currently only available to users who have bought a commercial
-   GeoIP Domain Edition. A warning will be issued if the proper database cannot be
-   located.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the domain name on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_domain_by_name</function> example</title>
-   <simpara>
-    This will output the domain associated with IP 61.106.139.1.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$domain = geoip_domain_by_name('61.106.139.1');
-
-if ($domain) {
-    echo 'The domain is: '. $domain;
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-The domain is: von.co.kr
-]]>
-   </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/geoip/functions/geoip-id-by-name.xml b/reference/geoip/functions/geoip-id-by-name.xml
deleted file mode 100644
index 363601c710cb..000000000000
--- a/reference/geoip/functions/geoip-id-by-name.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-id-by-name">
- <refnamediv>
-  <refname>geoip_id_by_name</refname>
-  <refpurpose>Get the Internet connection type</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>geoip_id_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_id_by_name</function> function will return the Internet
-   connection type corresponding to a hostname or an IP address.
-  </simpara>
-  <simpara>
-   The return value is numeric and can be compared to the following constants:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     GEOIP_UNKNOWN_SPEED
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     GEOIP_DIALUP_SPEED
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     GEOIP_CABLEDSL_SPEED
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     GEOIP_CORPORATE_SPEED
-    </simpara>
-   </listitem>
-  </itemizedlist>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose connection type is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the connection type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_id_by_name</function> example</title>
-   <simpara>
-    This will output the connection type of the host example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$netspeed = geoip_id_by_name('www.example.com');
-
-echo 'The connection type is ';
-
-switch ($netspeed) {
-    case GEOIP_DIALUP_SPEED:
-        echo 'dial-up';
-        break;
-    case GEOIP_CABLEDSL_SPEED:
-        echo 'cable or DSL';
-        break;
-    case GEOIP_CORPORATE_SPEED:
-        echo 'corporate';
-        break;
-    case GEOIP_UNKNOWN_SPEED:
-    default:
-        echo 'unknown';
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-The connection type is corporate
-]]>
-   </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/geoip/functions/geoip-isp-by-name.xml b/reference/geoip/functions/geoip-isp-by-name.xml
deleted file mode 100644
index 8106353071a5..000000000000
--- a/reference/geoip/functions/geoip-isp-by-name.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-isp-by-name">
- <refnamediv>
-  <refname>geoip_isp_by_name</refname>
-  <refpurpose>Get the Internet Service Provider (ISP) name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_isp_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_isp_by_name</function> function will return the name of
-   the Internet Service Provider (ISP) that an IP is assigned to.
-  </simpara>
-  <simpara>
-   This function is currently only available to users who have bought a commercial
-   GeoIP ISP Edition. A warning will be issued if the proper database cannot be
-   located.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ISP name on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_isp_by_name</function> example</title>
-   <simpara>
-    This will print the ISP name of host example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$isp = geoip_isp_by_name('www.example.com');
-if ($isp) {
-    echo 'This host IP is from ISP: ' . $isp;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This host IP is from ISP: ICANN c/o Internet Assigned Numbers Authority
-]]>
-   </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/geoip/functions/geoip-netspeedcell-by-name.xml b/reference/geoip/functions/geoip-netspeedcell-by-name.xml
deleted file mode 100644
index f71ac261f8d0..000000000000
--- a/reference/geoip/functions/geoip-netspeedcell-by-name.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-netspeedcell-by-name">
- <refnamediv>
-  <refname>geoip_netspeedcell_by_name</refname>
-  <refpurpose>Get the Internet connection speed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_netspeedcell_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_netspeedcell_by_name</function> function will return the Internet
-   connection type and speed corresponding to a hostname or an IP address.
-  </simpara>
-  <simpara>
-   This function is only available if using GeoIP Library version 1.4.8 or newer.
-  </simpara>
-  <simpara>
-   This function is currently only available to users who have bought a commercial
-   GeoIP NetSpeedCell Edition. A warning will be issued if the proper database cannot be
-   located.
-  </simpara>
-  <simpara>
-   The return value is a string, common values are:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     Cable/DSL
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Dialup
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Cellular
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Corporate
-    </simpara>
-   </listitem>
-  </itemizedlist>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the connection speed on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_netspeedcell_by_name</function> example</title>
-   <simpara>
-    This will output the connection speed of the host example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$netspeed = geoip_netspeedcell_by_name('www.example.com');
-
-if ($netspeed) {
-    echo 'The connection type is: '. $netspeed;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-The connection type is: Corporate
-]]>
-   </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/geoip/functions/geoip-org-by-name.xml b/reference/geoip/functions/geoip-org-by-name.xml
deleted file mode 100644
index db7be7ae375a..000000000000
--- a/reference/geoip/functions/geoip-org-by-name.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-org-by-name">
- <refnamediv>
-  <refname>geoip_org_by_name</refname>
-  <refpurpose>Get the organization name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_org_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_org_by_name</function> function will return the name of
-   the organization that an IP is assigned to.
-  </simpara>
-  <simpara>
-   This function is currently only available to users who have bought a commercial
-   GeoIP Organization, ISP or AS Edition. A warning will be issued if the proper
-   database cannot be located.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the organization name on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_org_by_name</function> example</title>
-   <simpara>
-    This will print to whom the host example.com IP is allocated.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$org = geoip_org_by_name('www.example.com');
-if ($org) {
-    echo 'This host IP is allocated to: ' . $org;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This host IP is allocated to: ICANN c/o Internet Assigned Numbers Authority
-]]>
-   </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/geoip/functions/geoip-record-by-name.xml b/reference/geoip/functions/geoip-record-by-name.xml
deleted file mode 100644
index 73fbef3dd345..000000000000
--- a/reference/geoip/functions/geoip-record-by-name.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-record-by-name">
- <refnamediv>
-  <refname>geoip_record_by_name</refname>
-  <refpurpose>Returns the detailed City information found in the GeoIP Database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>geoip_record_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_record_by_name</function> function will return the
-   record information corresponding to a hostname or an IP address.
-  </simpara>
-  <simpara>
-   This function is available for both GeoLite City Edition and commercial GeoIP
-   City Edition. A warning will be issued if the proper database cannot be
-   located.
-  </simpara>
-  <simpara>
-   The names of the different keys of the returning associative array are as follows:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     "continent_code" -- Two letter continent code (as of version 1.0.4 with
-     libgeoip 1.4.3 or newer)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "country_code" -- Two letter country code (see
-     <function>geoip_country_code_by_name</function>)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "country_code3" -- Three letter country code (see
-     <function>geoip_country_code3_by_name</function>)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "country_name" -- The country name (see
-     <function>geoip_country_name_by_name</function>)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "region" -- The region code (ex: CA for California)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "city" -- The city.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "postal_code" -- The Postal Code, FSA or Zip Code.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "latitude" -- The Latitude as signed <type>float</type>.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "longitude" -- The Longitude as signed <type>float</type>.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "dma_code" -- Designated Market Area code (USA and Canada only)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "area_code" -- The PSTN area code (ex: 212)
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose record is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the associative array on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL geoip 1.0.4</entry>
-      <entry>
-       Adding the continent_code with GeoIP Library 1.4.3 or newer only
-      </entry>
-     </row>
-     <row>
-      <entry>PECL geoip 1.0.3</entry>
-      <entry>
-       Adding country_code3 and country_name
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_record_by_name</function> example</title>
-   <simpara>
-    This will print the array containing the record of host example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$record = geoip_record_by_name('www.example.com');
-if ($record) {
-    print_r($record);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [continent_code] => NA
-    [country_code] => US
-    [country_code3] => USA
-    [country_name] => United States
-    [region] => CA
-    [city] => Marina Del Rey
-    [postal_code] =>
-    [latitude] => 33.9776992798
-    [longitude] => -118.435096741
-    [dma_code] => 803
-    [area_code] => 310
-)
-]]>
-   </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/geoip/functions/geoip-region-by-name.xml b/reference/geoip/functions/geoip-region-by-name.xml
deleted file mode 100644
index af298dae66d4..000000000000
--- a/reference/geoip/functions/geoip-region-by-name.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-region-by-name">
- <refnamediv>
-  <refname>geoip_region_by_name</refname>
-  <refpurpose>Get the country code and region</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>geoip_region_by_name</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_region_by_name</function> function will return the country
-   and region corresponding to a hostname or an IP address.
-  </simpara>
-  <simpara>
-   This function is currently only available to users who have bought a commercial
-   GeoIP Region Edition. A warning will be issued if the proper database cannot be
-   located.
-  </simpara>
-  <simpara>
-   The names of the different keys of the returning associative array are as follows:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     "country_code" -- Two letter country code (see
-     <function>geoip_country_code_by_name</function>)
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     "region" -- The region code (ex: CA for California)
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The hostname or IP address whose region is to be looked-up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the associative array on success, or &false; if the address
-   cannot be found in the database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_region_by_name</function> example</title>
-   <simpara>
-    This will print the array containing the country code and region
-    of the host example.com.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$region = geoip_region_by_name('www.example.com');
-if ($region) {
-    print_r($region);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [country_code] => US
-    [region] => CA
-)
-]]>
-   </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/geoip/functions/geoip-region-name-by-code.xml b/reference/geoip/functions/geoip-region-name-by-code.xml
deleted file mode 100644
index 73b203bc60a2..000000000000
--- a/reference/geoip/functions/geoip-region-name-by-code.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-region-name-by-code">
- <refnamediv>
-  <refname>geoip_region_name_by_code</refname>
-  <refpurpose>Returns the region name for some country and region code combo</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_region_name_by_code</methodname>
-   <methodparam><type>string</type><parameter>country_code</parameter></methodparam>
-   <methodparam><type>string</type><parameter>region_code</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_region_name_by_code</function> function will return the region
-   name corresponding to a country and region code combo.
-  </simpara>
-  <simpara>
-   In the United States, the region code corresponds to the two-letter abbreviation
-   of each state. In Canada, the region code corresponds to the two-letter province or
-   territory code as attributed by Canada Post.
-  </simpara>
-  <simpara>
-   For the rest of the world, GeoIP uses FIPS 10-4 codes to represent regions.
-   You can check <link xlink:href="&url.maxmind.fips;">&url.maxmind.fips;</link>
-   for a detailed list of FIPS 10-4 codes.
-  </simpara>
-  <simpara>
-   This function is always available if using GeoIP Library version 1.4.1 or newer. The
-   data is taken directly from the GeoIP Library and not from any database.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>country_code</parameter></term>
-    <listitem>
-     <simpara>
-      The two-letter country code (see
-      <function>geoip_country_code_by_name</function>)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>region_code</parameter></term>
-    <listitem>
-     <simpara>
-      The two-letter (or digit) region code (see
-      <function>geoip_region_by_name</function>)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the region name on success, or &false; if the country and region code
-   combo cannot be found.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>geoip_region_name_by_code</function> example using region code for US/Canada</title>
-    <simpara>
-     This will print the region name for country CA (Canada), region QC (Quebec).
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$region = geoip_region_name_by_code('CA', 'QC');
-if ($region) {
-    echo 'Region name for CA/QC is: ' . $region;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Region name for CA/QC is: Quebec
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>A <function>geoip_region_name_by_code</function> example using FIPS codes</title>
-    <simpara>
-     This will print the region name for country JP (Japan), region 01.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$region = geoip_region_name_by_code('JP', '01');
-if ($region) {
-    echo 'Region name for JP/01 is: ' . $region;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Region name for JP/01 is: Aichi
-]]>
-    </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/geoip/functions/geoip-setup-custom-directory.xml b/reference/geoip/functions/geoip-setup-custom-directory.xml
deleted file mode 100644
index 734c05adfee5..000000000000
--- a/reference/geoip/functions/geoip-setup-custom-directory.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.geoip-setup-custom-directory">
- <refnamediv>
-  <refname>geoip_setup_custom_directory</refname>
-  <refpurpose>Set a custom directory for the GeoIP database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>geoip_setup_custom_directory</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_setup_custom_directory</function> function will change the
-   default directory of the GeoIP database. This is equivalent to changing
-   <link linkend="ini.geoip.custom-directory">geoip.custom_directory</link>.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      The full path of where the GeoIP database is on disk.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>geoip_setup_custom_directory</function> example</title>
-   <simpara>
-    This will change the GeoIP default database path.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-geoip_setup_custom_directory('/some/other/path');
-
-print geoip_db_filename(GEOIP_COUNTRY_EDITION);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-/some/other/path/GeoIP.dat
-]]>
-   </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/geoip/functions/geoip-time-zone-by-country-and-region.xml b/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
deleted file mode 100644
index 9aa2eedd4572..000000000000
--- a/reference/geoip/functions/geoip-time-zone-by-country-and-region.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.geoip-time-zone-by-country-and-region">
- <refnamediv>
-  <refname>geoip_time_zone_by_country_and_region</refname>
-  <refpurpose>Returns the time zone for some country and region code combo</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>geoip_time_zone_by_country_and_region</methodname>
-   <methodparam><type>string</type><parameter>country_code</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>region_code</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   The <function>geoip_time_zone_by_country_and_region</function> function will return the
-   time zone corresponding to a country and region code combo.
-  </simpara>
-  <simpara>
-   In the United States, the region code corresponds to the two-letter abbreviation
-   of each state. In Canada, the region code corresponds to the two-letter province or
-   territory code as attributed by Canada Post.
-  </simpara>
-  <simpara>
-   For the rest of the world, GeoIP uses FIPS 10-4 codes to represent regions.
-   You can check <link xlink:href="&url.maxmind.fips;">&url.maxmind.fips;</link>
-   for a detailed list of FIPS 10-4 codes.
-  </simpara>
-  <simpara>
-   This function is always available if using GeoIP Library version 1.4.1 or newer. The
-   data is taken directly from the GeoIP Library and not from any database.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>country_code</parameter></term>
-    <listitem>
-     <simpara>
-      The two-letter country code (see
-      <function>geoip_country_code_by_name</function>)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>region_code</parameter></term>
-    <listitem>
-     <simpara>
-      The two-letter (or digit) region code (see
-      <function>geoip_region_by_name</function>)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the time zone on success, or &false; if the country and region code
-   combo cannot be found.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>geoip_time_zone_by_country_and_region</function> example using region code for US/Canada</title>
-    <simpara>
-     This will print the time zone for country CA (Canada), region QC (Quebec).
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$timezone = geoip_time_zone_by_country_and_region('CA', 'QC');
-if ($timezone) {
-    echo 'Time zone for CA/QC is: ' . $timezone;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Time zone for CA/QC is: America/Montreal
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>A <function>geoip_time_zone_by_country_and_region</function> example using FIPS codes</title>
-    <simpara>
-     This will print the time zone for country JP (Japan), region 01 (Aichi).
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$timezone = geoip_time_zone_by_country_and_region('JP', '01');
-if ($timezone) {
-    echo 'Time zone for JP/01 is: ' . $timezone;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Time zone for JP/01 is: Asia/Tokyo
-]]>
-    </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/geoip/ini.xml b/reference/geoip/ini.xml
deleted file mode 100644
index 55b05fb15fb8..000000000000
--- a/reference/geoip/ini.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="geoip.configuration">
-  &reftitle.runtime;
-  &extension.runtime;
-  <table>
-     <title>GeoIP &ConfigureOptions;</title>
-     <tgroup cols="4">
-       <thead>
-         <row>
-           <entry>&Name;</entry>
-           <entry>&Default;</entry>
-           <entry>&Changeable;</entry>
-           <entry>&Changelog;</entry>
-         </row>
-       </thead>
-       <tbody xml:id="geoip.configuration.list">
-         <row>
-           <entry><link linkend="ini.geoip.custom-directory">geoip.custom_directory</link></entry>
-           <entry>""</entry>
-           <entry><constant>INI_ALL</constant></entry>
-           <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-         </row>
-       </tbody>
-     </tgroup>
-   </table>
-
-  &ini.descriptions.title;
-
-  <variablelist>
-     <varlistentry xml:id="ini.geoip.custom-directory">
-       <term>
-         <parameter>geoip.custom_directory</parameter>
-         <type>string</type>
-       </term>
-       <listitem>
-         <simpara>
-           Empty by default, but can be set to force a different database path than the one compiled in the library.
-         </simpara>
-       </listitem>
-     </varlistentry>
-   </variablelist>
-</section>
diff --git a/reference/geoip/reference.xml b/reference/geoip/reference.xml
deleted file mode 100644
index 2440b29cba35..000000000000
--- a/reference/geoip/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.geoip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>GeoIP &Functions;</title>
- &reference.geoip.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/geoip/setup.xml b/reference/geoip/setup.xml
deleted file mode 100644
index 9b3f8dc77f69..000000000000
--- a/reference/geoip/setup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="geoip.setup">
- &reftitle.setup;
-
- <section xml:id="geoip.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires the GeoIP C library version 1.4.0 or higher to be
-   installed. You can grab the latest version from
-   <link xlink:href="&url.maxmind.geoip;">&url.maxmind.geoip;</link>
-   and compile it yourself.
-  </simpara>
-  <simpara>
-   By default, you will only have access to the Free GeoIP Country or GeoLite
-   City databases. While this module can work with other types of database,
-   you must buy a commercial license from
-   <link xlink:href="&url.maxmind;">Maxmind</link>.
-  </simpara>
- </section>
-
- <section xml:id="geoip.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;geoip">&url.pecl.package;geoip</link>.
-  </simpara>
- </section>
-
- &reference.geoip.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/geoip/versions.xml b/reference/geoip/versions.xml
deleted file mode 100644
index 2fd8c5033545..000000000000
--- a/reference/geoip/versions.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='geoip_asnum_by_name' from='PECL geoip &gt;= 1.1.0'/>
- <function name='geoip_continent_code_by_name' from='PECL geoip &gt;= 1.0.3'/>
- <function name='geoip_country_code3_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_country_code_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_country_name_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_database_info' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_db_avail' from='PECL geoip &gt;= 1.0.1'/>
- <function name='geoip_db_filename' from='PECL geoip &gt;= 1.0.1'/>
- <function name='geoip_db_get_all_info' from='PECL geoip &gt;= 1.0.1'/>
- <function name='geoip_domain_by_name' from='PECL geoip &gt;= 1.1.0'/>
- <function name='geoip_id_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_isp_by_name' from='PECL geoip &gt;= 1.0.2'/>
- <function name='geoip_netspeedcell_by_name' from='PECL geoip &gt;= 1.1.0'/>
- <function name='geoip_org_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_record_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_region_by_name' from='PECL geoip &gt;= 0.2.0'/>
- <function name='geoip_region_name_by_code' from='PECL geoip &gt;= 1.0.4'/>
- <function name='geoip_setup_custom_directory' from='PECL geoip &gt;= 1.1.0'/>
- <function name='geoip_time_zone_by_country_and_region' from='PECL geoip &gt;= 1.0.4'/>
-</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/gmagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/gmagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/gmagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/gmagick/book.xml b/reference/gmagick/book.xml
deleted file mode 100644
index 74578b226a01..000000000000
--- a/reference/gmagick/book.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.gmagick">
- <?phpdoc extension-membership="pecl" ?>
- <title>Gmagick</title>
- <titleabbrev>Gmagick</titleabbrev>
-
- <preface xml:id="intro.gmagick">
-  &reftitle.intro;
-  &warn.experimental;
-  <simpara>
-   Gmagick is a php extension to create, modify and obtain meta information of images using the GraphicsMagick API.
-  </simpara>
-  <simpara>
-   GraphicsMagick prides itself as the swiss army knife of image processing. It works with over 88 major formats
-   including important formats like DPX, GIF, JPEG, JPEG-2000, PNG, PDF, PNM, and TIFF.
-  </simpara>
-  <simpara>
-   Gmagick consists of a main Gmagick class, a GmagickDraw class which is in effect a drawing wand and a
-   GmagickPixel class of which instances represent a single pixel of an image (color, opacity).
-  </simpara>
-</preface>
-
- &reference.gmagick.setup;
- &reference.gmagick.constants;
- &reference.gmagick.examples;
- &reference.gmagick.gmagick;
- &reference.gmagick.gmagickdraw;
- &reference.gmagick.gmagickpixel;
- &reference.gmagick.gmagickexception;
- &reference.gmagick.gmagickpixelexception;
-</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/gmagick/constants.xml b/reference/gmagick/constants.xml
deleted file mode 100644
index 047d80486ad1..000000000000
--- a/reference/gmagick/constants.xml
+++ /dev/null
@@ -1,3127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="gmagick.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist xml:id="gmagick.constants.colortype">
-  <title>Colortype constants</title>
-  <varlistentry xml:id="gmagick.constants.color-black">
-   <term>
-    <constant>Gmagick::COLOR_BLACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Black
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-blue">
-   <term>
-    <constant>Gmagick::COLOR_BLUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Blue
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-cyan">
-   <term>
-    <constant>Gmagick::COLOR_CYAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Cyan
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-green">
-   <term>
-    <constant>Gmagick::COLOR_GREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Green
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-red">
-   <term>
-    <constant>Gmagick::COLOR_RED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Red
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-yellow">
-   <term>
-    <constant>Gmagick::COLOR_YELLOW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Yellow
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-magenta">
-   <term>
-    <constant>Gmagick::COLOR_MAGENTA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Magenta
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-opacity">
-   <term>
-    <constant>Gmagick::COLOR_OPACITY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Opacity
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-alpha">
-   <term>
-    <constant>Gmagick::COLOR_ALPHA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Alpha
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.color-fuzz">
-   <term>
-    <constant>Gmagick::COLOR_FUZZ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Fuzz
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.compositeop">
-  <title>Composite Operator Constants</title>
-  <varlistentry xml:id="gmagick.constants.composite-default">
-   <term>
-    <constant>Gmagick::COMPOSITE_DEFAULT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The default composite operator
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-undefined">
-   <term>
-    <constant>Gmagick::COMPOSITE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Undefined composite operator
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-no">
-   <term>
-    <constant>Gmagick::COMPOSITE_NO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     No composite operator defined
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-add">
-   <term>
-    <constant>Gmagick::COMPOSITE_ADD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The result of image + image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-atop">
-   <term>
-    <constant>Gmagick::COMPOSITE_ATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The result is the same shape as image, with composite image obscuring image where the image shapes overlap
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-blend">
-   <term>
-    <constant>Gmagick::COMPOSITE_BLEND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Blends the image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-bumpmap">
-   <term>
-    <constant>Gmagick::COMPOSITE_BUMPMAP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The same as COMPOSITE_MULTIPLY, except the source is converted to grayscale first.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-clear">
-   <term>
-    <constant>Gmagick::COMPOSITE_CLEAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Makes the target image transparent
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-colorburn">
-   <term>
-    <constant>Gmagick::COMPOSITE_COLORBURN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens the destination image to reflect the source image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-colordodge">
-   <term>
-    <constant>Gmagick::COMPOSITE_COLORDODGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Brightens the destination image to reflect the source image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-colorize">
-   <term>
-    <constant>Gmagick::COMPOSITE_COLORIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Colorizes the target image using the composite image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copyblack">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYBLACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies black from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copyblue">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYBLUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies blue from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copy">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies the source image on the target image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copycyan">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYCYAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies cyan from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copygreen">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYGREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies green from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copymagenta">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYMAGENTA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies magenta from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copyopacity">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYOPACITY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies opacity from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copyred">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYRED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies red from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-copyyellow">
-   <term>
-    <constant>Gmagick::COMPOSITE_COPYYELLOW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies yellow from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-darken">
-   <term>
-    <constant>Gmagick::COMPOSITE_DARKEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens the target image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dstatop">
-   <term>
-    <constant>Gmagick::COMPOSITE_DSTATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the destination lying inside of the source is composited over the source and replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dst">
-   <term>
-    <constant>Gmagick::COMPOSITE_DST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The target is left untouched
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dstin">
-   <term>
-    <constant>Gmagick::COMPOSITE_DSTIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The parts inside the source replace the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dstout">
-   <term>
-    <constant>Gmagick::COMPOSITE_DSTOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The parts outside the source replace the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dstover">
-   <term>
-    <constant>Gmagick::COMPOSITE_DSTOVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Target replaces the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-difference">
-   <term>
-    <constant>Gmagick::COMPOSITE_DIFFERENCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtracts the darker of the two constituent colors from the lighter
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-displace">
-   <term>
-    <constant>Gmagick::COMPOSITE_DISPLACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Shifts target image pixels as defined by the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-dissolve">
-   <term>
-    <constant>Gmagick::COMPOSITE_DISSOLVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dissolves the source in to the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-exclusion">
-   <term>
-    <constant>Gmagick::COMPOSITE_EXCLUSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Produces an effect similar to that of Gmagick::COMPOSITE_DIFFERENCE, but appears as lower contrast
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-hardlight">
-   <term>
-    <constant>Gmagick::COMPOSITE_HARDLIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Multiplies or screens the colors, dependent on the source color value
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-hue">
-   <term>
-    <constant>Gmagick::COMPOSITE_HUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Modifies the hue of the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-in">
-   <term>
-    <constant>Gmagick::COMPOSITE_IN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites source into the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-lighten">
-   <term>
-    <constant>Gmagick::COMPOSITE_LIGHTEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Lightens the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-luminize">
-   <term>
-    <constant>Gmagick::COMPOSITE_LUMINIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Luminizes the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-minus">
-   <term>
-    <constant>Gmagick::COMPOSITE_MINUS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtracts the source from the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-modulate">
-   <term>
-    <constant>Gmagick::COMPOSITE_MODULATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Modulates the target brightness, saturation and hue as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-multiply">
-   <term>
-    <constant>Gmagick::COMPOSITE_MULTIPLY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Multiplies the target to the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-out">
-   <term>
-    <constant>Gmagick::COMPOSITE_OUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites outer parts of the source on the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-over">
-   <term>
-    <constant>Gmagick::COMPOSITE_OVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites source over the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-overlay">
-   <term>
-    <constant>Gmagick::COMPOSITE_OVERLAY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Overlays the source on the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-plus">
-   <term>
-    <constant>Gmagick::COMPOSITE_PLUS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Adds the source to the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-replace">
-   <term>
-    <constant>Gmagick::COMPOSITE_REPLACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Replaces the target with the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-saturate">
-   <term>
-    <constant>Gmagick::COMPOSITE_SATURATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Saturates the target as defined by the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-screen">
-   <term>
-    <constant>Gmagick::COMPOSITE_SCREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source and destination are complemented and then multiplied and then replace the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-softlight">
-   <term>
-    <constant>Gmagick::COMPOSITE_SOFTLIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens or lightens the colors, dependent on the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-srcatop">
-   <term>
-    <constant>Gmagick::COMPOSITE_SRCATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying inside of the destination is composited onto the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-src">
-   <term>
-    <constant>Gmagick::COMPOSITE_SRC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source is copied to the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-srcin">
-   <term>
-    <constant>Gmagick::COMPOSITE_SRCIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying inside of the destination replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-srcout">
-   <term>
-    <constant>Gmagick::COMPOSITE_SRCOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying outside of the destination replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-srcover">
-   <term>
-    <constant>Gmagick::COMPOSITE_SRCOVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-subtract">
-   <term>
-    <constant>Gmagick::COMPOSITE_SUBTRACT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtract the colors in the source image from the destination image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-threshold">
-   <term>
-    <constant>Gmagick::COMPOSITE_THRESHOLD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source is composited on the target as defined by source threshold
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.composite-xor">
-   <term>
-    <constant>Gmagick::COMPOSITE_XOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source that lies outside of the destination is combined with the part of the destination that lies outside of the source
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.montagemode">
-  <title>Montage Mode constants</title>
-  <varlistentry xml:id="gmagick.constants.montagemode-frame">
-   <term>
-    <constant>Gmagick::MONTAGEMODE_FRAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.montagemode-unframe">
-   <term>
-    <constant>Gmagick::MONTAGEMODE_UNFRAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.montagemode-concatenate">
-   <term>
-    <constant>Gmagick::MONTAGEMODE_CONCATENATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.styles">
-  <title>Style constants</title>
-  <varlistentry xml:id="gmagick.constants.style-normal">
-   <term>
-    <constant>Gmagick::STYLE_NORMAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.style-italic">
-   <term>
-    <constant>Gmagick::STYLE_ITALIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.style-oblique">
-   <term>
-    <constant>Gmagick::STYLE_OBLIQUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.style-any">
-   <term>
-    <constant>Gmagick::STYLE_ANY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.filters">
-  <title>Filter constants</title>
-  <varlistentry xml:id="gmagick.constants.filter-undefined">
-   <term>
-    <constant>Gmagick::FILTER_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-point">
-   <term>
-    <constant>Gmagick::FILTER_POINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-box">
-   <term>
-    <constant>Gmagick::FILTER_BOX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-triangle">
-   <term>
-    <constant>Gmagick::FILTER_TRIANGLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-hermite">
-   <term>
-    <constant>Gmagick::FILTER_HERMITE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-hanning">
-   <term>
-    <constant>Gmagick::FILTER_HANNING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-hamming">
-   <term>
-    <constant>Gmagick::FILTER_HAMMING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-blackman">
-   <term>
-    <constant>Gmagick::FILTER_BLACKMAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-gaussian">
-   <term>
-    <constant>Gmagick::FILTER_GAUSSIAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-quadratic">
-   <term>
-    <constant>Gmagick::FILTER_QUADRATIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-cubic">
-   <term>
-    <constant>Gmagick::FILTER_CUBIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-catrom">
-   <term>
-    <constant>Gmagick::FILTER_CATROM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-mitchell">
-   <term>
-    <constant>Gmagick::FILTER_MITCHELL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-lanczos">
-   <term>
-    <constant>Gmagick::FILTER_LANCZOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-bessel">
-   <term>
-    <constant>Gmagick::FILTER_BESSEL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.filter-sinc">
-   <term>
-    <constant>Gmagick::FILTER_SINC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.imagetype">
-  <title>Image type constants</title>
-  <varlistentry xml:id="gmagick.constants.imgtype-undefined">
-   <term>
-    <constant>Gmagick::IMGTYPE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-bilevel">
-   <term>
-    <constant>Gmagick::IMGTYPE_BILEVEL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-grayscale">
-   <term>
-    <constant>Gmagick::IMGTYPE_GRAYSCALE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-grayscalematte">
-   <term>
-    <constant>Gmagick::IMGTYPE_GRAYSCALEMATTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-palette">
-   <term>
-    <constant>Gmagick::IMGTYPE_PALETTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-palettematte">
-   <term>
-    <constant>Gmagick::IMGTYPE_PALETTEMATTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-truecolor">
-   <term>
-    <constant>Gmagick::IMGTYPE_TRUECOLOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-truecolormatte">
-   <term>
-    <constant>Gmagick::IMGTYPE_TRUECOLORMATTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-colorseparation">
-   <term>
-    <constant>Gmagick::IMGTYPE_COLORSEPARATION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-colorseparationmatte">
-   <term>
-    <constant>Gmagick::IMGTYPE_COLORSEPARATIONMATTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.imgtype-optimize">
-   <term>
-    <constant>Gmagick::IMGTYPE_OPTIMIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.resolution">
-  <title>Resolution constants</title>
-  <varlistentry xml:id="gmagick.constants.resolution-undefined">
-   <term>
-    <constant>Gmagick::RESOLUTION_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resolution-pixelsperinch">
-   <term>
-    <constant>Gmagick::RESOLUTION_PIXELSPERINCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resolution-pixelspercentimeter">
-   <term>
-    <constant>Gmagick::RESOLUTION_PIXELSPERCENTIMETER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.compressiontype">
-  <title>Compression constants</title>
-  <varlistentry xml:id="gmagick.constants.compression-undefined">
-   <term>
-    <constant>Gmagick::COMPRESSION_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-no">
-   <term>
-    <constant>Gmagick::COMPRESSION_NO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-bzip">
-   <term>
-    <constant>Gmagick::COMPRESSION_BZIP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-fax">
-   <term>
-    <constant>Gmagick::COMPRESSION_FAX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-group4">
-   <term>
-    <constant>Gmagick::COMPRESSION_GROUP4</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-jpeg">
-   <term>
-    <constant>Gmagick::COMPRESSION_JPEG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-jpeg2000">
-   <term>
-    <constant>Gmagick::COMPRESSION_JPEG2000</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-losslessjpeg">
-   <term>
-    <constant>Gmagick::COMPRESSION_LOSSLESSJPEG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-lzw">
-   <term>
-    <constant>Gmagick::COMPRESSION_LZW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-rle">
-   <term>
-    <constant>Gmagick::COMPRESSION_RLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.compression-zip">
-   <term>
-    <constant>Gmagick::COMPRESSION_ZIP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.paint">
-  <title>Paint constants</title>
-  <varlistentry xml:id="gmagick.constants.paint-point">
-   <term>
-    <constant>Gmagick::PAINT_POINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.paint-replace">
-   <term>
-    <constant>Gmagick::PAINT_REPLACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.paint-floodfill">
-   <term>
-    <constant>Gmagick::PAINT_FLOODFILL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.paint-filltoborder">
-   <term>
-    <constant>Gmagick::PAINT_FILLTOBORDER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.paint-reset">
-   <term>
-    <constant>Gmagick::PAINT_RESET</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.gravity">
-  <title>Gravity constants</title>
-  <varlistentry xml:id="gmagick.constants.gravity-northwest">
-   <term>
-    <constant>Gmagick::GRAVITY_NORTHWEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-north">
-   <term>
-    <constant>Gmagick::GRAVITY_NORTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-northeast">
-   <term>
-    <constant>Gmagick::GRAVITY_NORTHEAST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-west">
-   <term>
-    <constant>Gmagick::GRAVITY_WEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-center">
-   <term>
-    <constant>Gmagick::GRAVITY_CENTER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-east">
-   <term>
-    <constant>Gmagick::GRAVITY_EAST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-southwest">
-   <term>
-    <constant>Gmagick::GRAVITY_SOUTHWEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-south">
-   <term>
-    <constant>Gmagick::GRAVITY_SOUTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.gravity-southeast">
-   <term>
-    <constant>Gmagick::GRAVITY_SOUTHEAST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.stretch">
-  <title>Stretch constants</title>
-  <varlistentry xml:id="gmagick.constants.stretch-normal">
-   <term>
-    <constant>Gmagick::STRETCH_NORMAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-ultracondensed">
-   <term>
-    <constant>Gmagick::STRETCH_ULTRACONDENSED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-condensed">
-   <term>
-    <constant>Gmagick::STRETCH_CONDENSED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-semicondensed">
-   <term>
-    <constant>Gmagick::STRETCH_SEMICONDENSED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-semiexpanded">
-   <term>
-    <constant>Gmagick::STRETCH_SEMIEXPANDED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-expanded">
-   <term>
-    <constant>Gmagick::STRETCH_EXPANDED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-extraexpanded">
-   <term>
-    <constant>Gmagick::STRETCH_EXTRAEXPANDED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-ultraexpanded">
-   <term>
-    <constant>Gmagick::STRETCH_ULTRAEXPANDED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.stretch-any">
-   <term>
-    <constant>Gmagick::STRETCH_ANY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.align">
-  <title>Align constants</title>
-  <varlistentry xml:id="gmagick.constants.align-undefined">
-   <term>
-    <constant>Gmagick::ALIGN_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.align-left">
-   <term>
-    <constant>Gmagick::ALIGN_LEFT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.align-center">
-   <term>
-    <constant>Gmagick::ALIGN_CENTER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.align-right">
-   <term>
-    <constant>Gmagick::ALIGN_RIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.decoration">
-  <title>Decoration constants</title>
-  <varlistentry xml:id="gmagick.constants.decoration-no">
-   <term>
-    <constant>Gmagick::DECORATION_NO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.decoration-underline">
-   <term>
-    <constant>Gmagick::DECORATION_UNDERLINE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.decoration-overline">
-   <term>
-    <constant>Gmagick::DECORATION_OVERLINE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.decoration-linetrough">
-   <term>
-    <constant>Gmagick::DECORATION_LINETROUGH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.noise">
-  <title>Noise  constants</title>
-  <varlistentry xml:id="gmagick.constants.noise-uniform">
-   <term>
-    <constant>Gmagick::NOISE_UNIFORM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.noise-gaussian">
-   <term>
-    <constant>Gmagick::NOISE_GAUSSIAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.noise-multiplicativegaussian">
-   <term>
-    <constant>Gmagick::NOISE_MULTIPLICATIVEGAUSSIAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.noise-impulse">
-   <term>
-    <constant>Gmagick::NOISE_IMPULSE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.noise-laplacian">
-   <term>
-    <constant>Gmagick::NOISE_LAPLACIAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.noise-poisson">
-   <term>
-    <constant>Gmagick::NOISE_POISSON</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.channel">
-  <title>Channel constants</title>
-  <varlistentry xml:id="gmagick.constants.channel-undefined">
-   <term>
-    <constant>Gmagick::CHANNEL_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-red">
-   <term>
-    <constant>Gmagick::CHANNEL_RED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-gray">
-   <term>
-    <constant>Gmagick::CHANNEL_GRAY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-cyan">
-   <term>
-    <constant>Gmagick::CHANNEL_CYAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-green">
-   <term>
-    <constant>Gmagick::CHANNEL_GREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-magenta">
-   <term>
-    <constant>Gmagick::CHANNEL_MAGENTA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-blue">
-   <term>
-    <constant>Gmagick::CHANNEL_BLUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-yellow">
-   <term>
-    <constant>Gmagick::CHANNEL_YELLOW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-alpha">
-   <term>
-    <constant>Gmagick::CHANNEL_ALPHA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-opacity">
-   <term>
-    <constant>Gmagick::CHANNEL_OPACITY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-matte">
-   <term>
-    <constant>Gmagick::CHANNEL_MATTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-black">
-   <term>
-    <constant>Gmagick::CHANNEL_BLACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-index">
-   <term>
-    <constant>Gmagick::CHANNEL_INDEX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.channel-all">
-   <term>
-    <constant>Gmagick::CHANNEL_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.metric">
-  <title>Metric constants</title>
-  <varlistentry xml:id="gmagick.constants.metric-undefined">
-   <term>
-    <constant>Gmagick::METRIC_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.metric-meanabsoluteerror">
-   <term>
-    <constant>Gmagick::METRIC_MEANABSOLUTEERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.metric-meansquareerror">
-   <term>
-    <constant>Gmagick::METRIC_MEANSQUAREERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.metric-peakabsoluteerror">
-   <term>
-    <constant>Gmagick::METRIC_PEAKABSOLUTEERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.metric-peaksignaltonoiseratio">
-   <term>
-    <constant>Gmagick::METRIC_PEAKSIGNALTONOISERATIO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.metric-rootmeansquarederror">
-   <term>
-    <constant>Gmagick::METRIC_ROOTMEANSQUAREDERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.pixel">
-  <title>Pixel constants</title>
-  <varlistentry xml:id="gmagick.constants.pixel-char">
-   <term>
-    <constant>Gmagick::PIXEL_CHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-double">
-   <term>
-    <constant>Gmagick::PIXEL_DOUBLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-float">
-   <term>
-    <constant>Gmagick::PIXEL_FLOAT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-integer">
-   <term>
-    <constant>Gmagick::PIXEL_INTEGER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-long">
-   <term>
-    <constant>Gmagick::PIXEL_LONG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-quantum">
-   <term>
-    <constant>Gmagick::PIXEL_QUANTUM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pixel-short">
-   <term>
-    <constant>Gmagick::PIXEL_SHORT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.colorspace">
-  <title>Colorspace constants</title>
-  <varlistentry xml:id="gmagick.constants.colorspace-undefined">
-   <term>
-    <constant>Gmagick::COLORSPACE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-rgb">
-   <term>
-    <constant>Gmagick::COLORSPACE_RGB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-gray">
-   <term>
-    <constant>Gmagick::COLORSPACE_GRAY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-transparent">
-   <term>
-    <constant>Gmagick::COLORSPACE_TRANSPARENT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-ohta">
-   <term>
-    <constant>Gmagick::COLORSPACE_OHTA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-lab">
-   <term>
-    <constant>Gmagick::COLORSPACE_LAB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-xyz">
-   <term>
-    <constant>Gmagick::COLORSPACE_XYZ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-ycbcr">
-   <term>
-    <constant>Gmagick::COLORSPACE_YCBCR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-ycc">
-   <term>
-    <constant>Gmagick::COLORSPACE_YCC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-yiq">
-   <term>
-    <constant>Gmagick::COLORSPACE_YIQ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-ypbpr">
-   <term>
-    <constant>Gmagick::COLORSPACE_YPBPR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-yuv">
-   <term>
-    <constant>Gmagick::COLORSPACE_YUV</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-cmyk">
-   <term>
-    <constant>Gmagick::COLORSPACE_CMYK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-srgb">
-   <term>
-    <constant>Gmagick::COLORSPACE_SRGB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-hsb">
-   <term>
-    <constant>Gmagick::COLORSPACE_HSB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-hsl">
-   <term>
-    <constant>Gmagick::COLORSPACE_HSL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-hwb">
-   <term>
-    <constant>Gmagick::COLORSPACE_HWB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-rec601luma">
-   <term>
-    <constant>Gmagick::COLORSPACE_REC601LUMA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-rec709luma">
-   <term>
-    <constant>Gmagick::COLORSPACE_REC709LUMA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.colorspace-log">
-   <term>
-    <constant>Gmagick::COLORSPACE_LOG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.virtualpixelmethods">
-  <title>Virtual Pixel Method constants</title>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-undefined">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-background">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_BACKGROUND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-constant">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_CONSTANT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-edge">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_EDGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-mirror">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_MIRROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-tile">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_TILE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.virtualpixelmethod-transparent">
-   <term>
-    <constant>Gmagick::VIRTUALPIXELMETHOD_TRANSPARENT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.preview">
-  <title>Preview constants</title>
-  <varlistentry xml:id="gmagick.constants.preview-undefined">
-   <term>
-    <constant>Gmagick::PREVIEW_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-rotate">
-   <term>
-    <constant>Gmagick::PREVIEW_ROTATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-shear">
-   <term>
-    <constant>Gmagick::PREVIEW_SHEAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-roll">
-   <term>
-    <constant>Gmagick::PREVIEW_ROLL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-hue">
-   <term>
-    <constant>Gmagick::PREVIEW_HUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-saturation">
-   <term>
-    <constant>Gmagick::PREVIEW_SATURATION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-brightness">
-   <term>
-    <constant>Gmagick::PREVIEW_BRIGHTNESS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-gamma">
-   <term>
-    <constant>Gmagick::PREVIEW_GAMMA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-spiff">
-   <term>
-    <constant>Gmagick::PREVIEW_SPIFF</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-dull">
-   <term>
-    <constant>Gmagick::PREVIEW_DULL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-grayscale">
-   <term>
-    <constant>Gmagick::PREVIEW_GRAYSCALE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-quantize">
-   <term>
-    <constant>Gmagick::PREVIEW_QUANTIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-despeckle">
-   <term>
-    <constant>Gmagick::PREVIEW_DESPECKLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-reducenoise">
-   <term>
-    <constant>Gmagick::PREVIEW_REDUCENOISE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-addnoise">
-   <term>
-    <constant>Gmagick::PREVIEW_ADDNOISE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-sharpen">
-   <term>
-    <constant>Gmagick::PREVIEW_SHARPEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-blur">
-   <term>
-    <constant>Gmagick::PREVIEW_BLUR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-threshold">
-   <term>
-    <constant>Gmagick::PREVIEW_THRESHOLD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-edgedetect">
-   <term>
-    <constant>Gmagick::PREVIEW_EDGEDETECT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-spread">
-   <term>
-    <constant>Gmagick::PREVIEW_SPREAD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-solarize">
-   <term>
-    <constant>Gmagick::PREVIEW_SOLARIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-shade">
-   <term>
-    <constant>Gmagick::PREVIEW_SHADE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-raise">
-   <term>
-    <constant>Gmagick::PREVIEW_RAISE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-segment">
-   <term>
-    <constant>Gmagick::PREVIEW_SEGMENT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-swirl">
-   <term>
-    <constant>Gmagick::PREVIEW_SWIRL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-implode">
-   <term>
-    <constant>Gmagick::PREVIEW_IMPLODE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-wave">
-   <term>
-    <constant>Gmagick::PREVIEW_WAVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-oilpaint">
-   <term>
-    <constant>Gmagick::PREVIEW_OILPAINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-charcoaldrawing">
-   <term>
-    <constant>Gmagick::PREVIEW_CHARCOALDRAWING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.preview-jpeg">
-   <term>
-    <constant>Gmagick::PREVIEW_JPEG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.renderingintent">
-  <title>Rendering Intent constants</title>
-  <varlistentry xml:id="gmagick.constants.renderingintent-undefined">
-   <term>
-    <constant>Gmagick::RENDERINGINTENT_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.renderingintent-saturation">
-   <term>
-    <constant>Gmagick::RENDERINGINTENT_SATURATION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.renderingintent-perceptual">
-   <term>
-    <constant>Gmagick::RENDERINGINTENT_PERCEPTUAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.renderingintent-absolute">
-   <term>
-    <constant>Gmagick::RENDERINGINTENT_ABSOLUTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.renderingintent-relative">
-   <term>
-    <constant>Gmagick::RENDERINGINTENT_RELATIVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.fillrule">
-  <title>Fillrule constants</title>
-  <varlistentry xml:id="gmagick.constants.fillrule-undefined">
-   <term>
-    <constant>Gmagick::FILLRULE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.fillrule-evenodd">
-   <term>
-    <constant>Gmagick::FILLRULE_EVENODD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.fillrule-nonzero">
-   <term>
-    <constant>Gmagick::FILLRULE_NONZERO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.pathunits">
-  <title>Pathunit constants</title>
-  <varlistentry xml:id="gmagick.constants.pathunits-undefined">
-   <term>
-    <constant>Gmagick::PATHUNITS_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pathunits-userspace">
-   <term>
-    <constant>Gmagick::PATHUNITS_USERSPACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pathunits-userspaceonuse">
-   <term>
-    <constant>Gmagick::PATHUNITS_USERSPACEONUSE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.pathunits-objectboundingbox">
-   <term>
-    <constant>Gmagick::PATHUNITS_OBJECTBOUNDINGBOX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.linecap">
-  <title>Linecap constants</title>
-  <varlistentry xml:id="gmagick.constants.linecap-undefined">
-   <term>
-    <constant>Gmagick::LINECAP_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linecap-butt">
-   <term>
-    <constant>Gmagick::LINECAP_BUTT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linecap-round">
-   <term>
-    <constant>Gmagick::LINECAP_ROUND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linecap-square">
-   <term>
-    <constant>Gmagick::LINECAP_SQUARE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.linejoin">
-  <title>Line Join constants</title>
-  <varlistentry xml:id="gmagick.constants.linejoin-undefined">
-   <term>
-    <constant>Gmagick::LINEJOIN_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linejoin-miter">
-   <term>
-    <constant>Gmagick::LINEJOIN_MITER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linejoin-round">
-   <term>
-    <constant>Gmagick::LINEJOIN_ROUND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.linejoin-bevel">
-   <term>
-    <constant>Gmagick::LINEJOIN_BEVEL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.resourcetypes">
-  <title>Resourcetype constants</title>
-  <varlistentry xml:id="gmagick.constants.resourcetype-undefined">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resourcetype-area">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_AREA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resourcetype-disk">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_DISK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resourcetype-file">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_FILE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resourcetype-map">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_MAP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.resourcetype-memory">
-   <term>
-    <constant>Gmagick::RESOURCETYPE_MEMORY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="gmagick.constants.orientation">
-  <title>Orientation constants</title>
-  <varlistentry xml:id="gmagick.constants.orientation-undefined">
-   <term>
-    <constant>Gmagick::ORIENTATION_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-topleft">
-   <term>
-    <constant>Gmagick::ORIENTATION_TOPLEFT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-topright">
-   <term>
-    <constant>Gmagick::ORIENTATION_TOPRIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-bottomright">
-   <term>
-    <constant>Gmagick::ORIENTATION_BOTTOMRIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-bottomleft">
-   <term>
-    <constant>Gmagick::ORIENTATION_BOTTOMLEFT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-lefttop">
-   <term>
-    <constant>Gmagick::ORIENTATION_LEFTTOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-righttop">
-   <term>
-    <constant>Gmagick::ORIENTATION_RIGHTTOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-rightbottom">
-   <term>
-    <constant>Gmagick::ORIENTATION_RIGHTBOTTOM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="gmagick.constants.orientation-leftbottom">
-   <term>
-    <constant>Gmagick::ORIENTATION_LEFTBOTTOM</constant>
-    (<type>int</type>)
-   </term>
-   <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>
- </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/gmagick/examples.xml b/reference/gmagick/examples.xml
deleted file mode 100644
index 7c0b8097d5b3..000000000000
--- a/reference/gmagick/examples.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.examples">
- &reftitle.examples;
- <simpara>
-  The following shows some common Gmagick image operations.
- </simpara>
- <example>
-  <title>Gmagick Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-//Instantiate a new Gmagick object
-$image = new Gmagick('example.jpg');
-
-//Make thumbnail from image loaded. 0 for either axes preserves aspect ratio
-$image->thumbnailimage(100, 0);
-
-//Create a border around the image, then simulate how the image will look like as an oil painting
-//Notice the chaining of mutator methods which is supported in gmagick
-$image->borderimage("yellow", 8, 8)->oilpaintimage(0.3);
-
-//Write the current image at the current state to a file
-$image->write('example_thumbnail.jpg');
-?>
-]]>
-  </programlisting>
- </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/gmagick/gmagick.xml b/reference/gmagick/gmagick.xml
deleted file mode 100644
index 41a532f90df9..000000000000
--- a/reference/gmagick/gmagick.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gmagick" role="class">
-
- <title>The Gmagick class</title>
- <titleabbrev>Gmagick</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Gmagick intro -->
-  <section xml:id="gmagick.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gmagick.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Gmagick</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Gmagick</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagick')/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.gmagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
- </partintro>
-
- &reference.gmagick.entities.gmagick;
-
-</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/gmagick/gmagick/addimage.xml b/reference/gmagick/gmagick/addimage.xml
deleted file mode 100644
index e6f2d842c0e5..000000000000
--- a/reference/gmagick/gmagick/addimage.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.addimage">
- <refnamediv>
-  <refname>Gmagick::addimage</refname>
-  <refpurpose>Adds new image to Gmagick object image list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::addimage</methodname>
-   <methodparam><type>Gmagick</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Adds new image to Gmagick object from the current position of the source object. After the operation iterator position is moved at the end of the list.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      The source Gmagick object
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object with image added
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/addnoiseimage.xml b/reference/gmagick/gmagick/addnoiseimage.xml
deleted file mode 100644
index 615cb6f26955..000000000000
--- a/reference/gmagick/gmagick/addnoiseimage.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.addnoiseimage">
- <refnamediv>
-  <refname>Gmagick::addnoiseimage</refname>
-  <refpurpose>Adds random noise to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::addnoiseimage</methodname>
-   <methodparam><type>int</type><parameter>noise_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Adds random noise to the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>noise_type</parameter></term>
-    <listitem>
-     <simpara>
-      The type of the noise. Refer to this list of <link linkend="gmagick.constants.noise">noise constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object with noise added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/annotateimage.xml b/reference/gmagick/gmagick/annotateimage.xml
deleted file mode 100644
index 8abdd094edde..000000000000
--- a/reference/gmagick/gmagick/annotateimage.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.annotateimage">
- <refnamediv>
-  <refname>Gmagick::annotateimage</refname>
-  <refpurpose>Annotates an image with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::annotateimage</methodname>
-   <methodparam><type>GmagickDraw</type><parameter>GmagickDraw</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Annotates an image with text.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>GmagickDraw</parameter></term>
-    <listitem>
-     <simpara>
-      The <classname>GmagickDraw</classname> object that contains settings for drawing the text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      Horizontal offset in pixels to the left of text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      Vertical offset in pixels to the baseline of text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <simpara>
-      The angle at which to write the text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      The string to draw.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with annotation made.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/blurimage.xml b/reference/gmagick/gmagick/blurimage.xml
deleted file mode 100644
index 8ba2b1a46889..000000000000
--- a/reference/gmagick/gmagick/blurimage.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.blurimage">
- <refnamediv>
-  <refname>Gmagick::blurimage</refname>
-  <refpurpose>Adds blur filter to image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::blurimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds blur filter to image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      Blur radius
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigma</parameter></term>
-    <listitem>
-     <simpara>
-      Standard deviation
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The blurred <classname>Gmagick</classname> object
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/borderimage.xml b/reference/gmagick/gmagick/borderimage.xml
deleted file mode 100644
index bee568a878a7..000000000000
--- a/reference/gmagick/gmagick/borderimage.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.borderimage">
- <refnamediv>
-  <refname>Gmagick::borderimage</refname>
-  <refpurpose>Surrounds the image with a border</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::borderimage</methodname>
-   <methodparam><type>GmagickPixel</type><parameter>color</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Surrounds the image with a border of the color defined by the bordercolor <classname>GmagickPixel</classname> object or a color string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      <classname>GmagickPixel</classname> object or a string containing the border color.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Border width.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Border height.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with border defined.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/charcoalimage.xml b/reference/gmagick/gmagick/charcoalimage.xml
deleted file mode 100644
index 0294377f4c49..000000000000
--- a/reference/gmagick/gmagick/charcoalimage.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.charcoalimage">
- <refnamediv>
-  <refname>Gmagick::charcoalimage</refname>
-  <refpurpose>Simulates a charcoal drawing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::charcoalimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Simulates a charcoal drawing.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the Gaussian, in pixels, not counting the center pixel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigma</parameter></term>
-    <listitem>
-     <simpara>
-      The standard deviation of the Gaussian, in pixels.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with charcoal simulation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/chopimage.xml b/reference/gmagick/gmagick/chopimage.xml
deleted file mode 100644
index 7718cd01bdb8..000000000000
--- a/reference/gmagick/gmagick/chopimage.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.chopimage">
- <refnamediv>
-  <refname>Gmagick::chopimage</refname>
-  <refpurpose>Removes a region of an image and trims</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::chopimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes a region of an image and collapses the image to occupy the removed portion.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-       Width of the chopped area.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Height of the chopped area.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      X origo of the chopped area.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      Y origo of the chopped area.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The chopped <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/clear.xml b/reference/gmagick/gmagick/clear.xml
deleted file mode 100644
index 2e10eadeec7f..000000000000
--- a/reference/gmagick/gmagick/clear.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.clear">
- <refnamediv>
-  <refname>Gmagick::clear</refname>
-  <refpurpose>Clears all resources associated to Gmagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Clears all resources associated to <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    The cleared <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/commentimage.xml b/reference/gmagick/gmagick/commentimage.xml
deleted file mode 100644
index 7dc1298be968..000000000000
--- a/reference/gmagick/gmagick/commentimage.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.commentimage">
- <refnamediv>
-  <refname>Gmagick::commentimage</refname>
-  <refpurpose>Adds a comment to your image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::commentimage</methodname>
-   <methodparam><type>string</type><parameter>comment</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a comment to your image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>comment</parameter></term>
-    <listitem>
-     <simpara>
-      The comment to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with comment added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/compositeimage.xml b/reference/gmagick/gmagick/compositeimage.xml
deleted file mode 100644
index 523dfea96bc6..000000000000
--- a/reference/gmagick/gmagick/compositeimage.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.compositeimage">
- <refnamediv>
-  <refname>Gmagick::compositeimage</refname>
-  <refpurpose>Composite one image onto another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::compositeimage</methodname>
-   <methodparam><type>Gmagick</type><parameter>source</parameter></methodparam>
-   <methodparam><type>int</type><parameter>COMPOSE</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Composite one image onto another at the specified offset.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      <classname>Gmagick</classname> object which holds the composite image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>COMPOSE</parameter></term>
-    <listitem>
-     <simpara>
-      Composite operator.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The column offset of the composited image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The row offset of the composited image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with compositions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/construct.xml b/reference/gmagick/gmagick/construct.xml
deleted file mode 100644
index 75b11ac25356..000000000000
--- a/reference/gmagick/gmagick/construct.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.construct">
- <refnamediv>
-  <refname>Gmagick::__construct</refname>
-  <refpurpose>The Gmagick constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Gmagick::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   The <classname>Gmagick</classname> constructor.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The path to an image to load or array of paths.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/cropimage.xml b/reference/gmagick/gmagick/cropimage.xml
deleted file mode 100644
index cdf809fdaec5..000000000000
--- a/reference/gmagick/gmagick/cropimage.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.cropimage">
- <refnamediv>
-  <refname>Gmagick::cropimage</refname>
-  <refpurpose>Extracts a region of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::cropimage</methodname>
-    <methodparam>
-      <type>int</type>
-      <parameter>width</parameter>
-    </methodparam>
-    <methodparam>
-      <type>int</type>
-      <parameter>height</parameter>
-    </methodparam>
-    <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Extracts a region of the image.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-
-    <varlistentry>
-      <term>
-        <parameter>width</parameter>
-      </term>
-      <listitem>
-        <simpara>
-          The width of the crop.
-        </simpara>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>
-        <parameter>height</parameter>
-      </term>
-      <listitem>
-        <simpara>
-          The height of the crop.
-        </simpara>
-      </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The X coordinate of the cropped region's top left corner.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-     The Y coordinate of the cropped region's top left corner.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The cropped <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/cropthumbnailimage.xml b/reference/gmagick/gmagick/cropthumbnailimage.xml
deleted file mode 100644
index 55b7dce87aa3..000000000000
--- a/reference/gmagick/gmagick/cropthumbnailimage.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.cropthumbnailimage">
- <refnamediv>
-  <refname>Gmagick::cropthumbnailimage</refname>
-  <refpurpose>Creates a crop thumbnail</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::cropthumbnailimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a fixed size thumbnail by first scaling the image down and cropping a specified area from the center.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-   <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-     The width of the thumbnail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      The Height of the thumbnail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The cropped <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/current.xml b/reference/gmagick/gmagick/current.xml
deleted file mode 100644
index 83b285c65215..000000000000
--- a/reference/gmagick/gmagick/current.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.current">
- <refnamediv>
-  <refname>Gmagick::current</refname>
-  <refpurpose>The current purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::current</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Returns reference to the current gmagick object with image pointer at the correct sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns self on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/cyclecolormapimage.xml b/reference/gmagick/gmagick/cyclecolormapimage.xml
deleted file mode 100644
index a14faa406671..000000000000
--- a/reference/gmagick/gmagick/cyclecolormapimage.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.cyclecolormapimage">
- <refnamediv>
-  <refname>Gmagick::cyclecolormapimage</refname>
-  <refpurpose>Displaces an image's colormap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::cyclecolormapimage</methodname>
-   <methodparam><type>int</type><parameter>displace</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Displaces an image's colormap by a given number of positions. If you cycle the colormap a number of times you can
-produce a psychedelic effect.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>displace</parameter></term>
-    <listitem>
-     <simpara>
-      The amount to displace the colormap.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns self on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/deconstructimages.xml b/reference/gmagick/gmagick/deconstructimages.xml
deleted file mode 100644
index f7b949fb7696..000000000000
--- a/reference/gmagick/gmagick/deconstructimages.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.deconstructimages">
- <refnamediv>
-  <refname>Gmagick::deconstructimages</refname>
-  <refpurpose>Returns certain pixel differences between images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::deconstructimages</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Compares each image with the next in a sequence and returns the maximum bounding region of any pixel differences it discovers.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/despeckleimage.xml b/reference/gmagick/gmagick/despeckleimage.xml
deleted file mode 100644
index c63456b66841..000000000000
--- a/reference/gmagick/gmagick/despeckleimage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.despeckleimage">
- <refnamediv>
-  <refname>Gmagick::despeckleimage</refname>
-  <refpurpose>The despeckleimage purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::despeckleimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Reduces the speckle noise in an image while preserving the edges of the original image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The despeckled <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Gmagick::despeckleimage</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* ... */
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </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/gmagick/gmagick/destroy.xml b/reference/gmagick/gmagick/destroy.xml
deleted file mode 100644
index dc55b2e66e0d..000000000000
--- a/reference/gmagick/gmagick/destroy.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.destroy">
- <refnamediv>
-  <refname>Gmagick::destroy</refname>
-  <refpurpose>The destroy purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Gmagick::destroy</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Destroys the <classname>Gmagick</classname> object and frees all resources associated with it
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/drawimage.xml b/reference/gmagick/gmagick/drawimage.xml
deleted file mode 100644
index 17a55d33284b..000000000000
--- a/reference/gmagick/gmagick/drawimage.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.drawimage">
- <refnamediv>
-  <refname>Gmagick::drawimage</refname>
-  <refpurpose>Renders the GmagickDraw object on the current image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::drawimage</methodname>
-   <methodparam><type>GmagickDraw</type><parameter>GmagickDraw</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Renders the <classname>GmagickDraw</classname> object on the current image.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>GmagickDraw</parameter></term>
-    <listitem>
-     <simpara>
-      The drawing operations to render on the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The drawn <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/edgeimage.xml b/reference/gmagick/gmagick/edgeimage.xml
deleted file mode 100644
index e72657c8e1b4..000000000000
--- a/reference/gmagick/gmagick/edgeimage.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.edgeimage">
- <refnamediv>
-  <refname>Gmagick::edgeimage</refname>
-  <refpurpose>Enhance edges within the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::edgeimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Enhance edges within the image with a convolution filter of the given radius. Use radius 0 and it will be auto-selected.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the operation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object with edges enhanced.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/embossimage.xml b/reference/gmagick/gmagick/embossimage.xml
deleted file mode 100644
index 082bd55f2eba..000000000000
--- a/reference/gmagick/gmagick/embossimage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.embossimage">
- <refnamediv>
-  <refname>Gmagick::embossimage</refname>
-  <refpurpose>Returns a grayscale image with a three-dimensional effect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::embossimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a grayscale image with a three-dimensional effect. 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 it will choose a suitable radius for you.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the effect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigma</parameter></term>
-    <listitem>
-     <simpara>
-      The sigma of the effect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The embossed <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/enhanceimage.xml b/reference/gmagick/gmagick/enhanceimage.xml
deleted file mode 100644
index 59cb23349d2f..000000000000
--- a/reference/gmagick/gmagick/enhanceimage.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.enhanceimage">
- <refnamediv>
-  <refname>Gmagick::enhanceimage</refname>
-  <refpurpose>Improves the quality of a noisy image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::enhanceimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Applies a digital filter that improves the quality of a noisy image.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The enhanced <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/equalizeimage.xml b/reference/gmagick/gmagick/equalizeimage.xml
deleted file mode 100644
index 6bdb4616878f..000000000000
--- a/reference/gmagick/gmagick/equalizeimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.equalizeimage">
- <refnamediv>
-  <refname>Gmagick::equalizeimage</refname>
-  <refpurpose>Equalizes the image histogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::equalizeimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Equalizes the image histogram.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The equalized <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/flipimage.xml b/reference/gmagick/gmagick/flipimage.xml
deleted file mode 100644
index c50b23ec4ba0..000000000000
--- a/reference/gmagick/gmagick/flipimage.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.flipimage">
- <refnamediv>
-  <refname>Gmagick::flipimage</refname>
-  <refpurpose>Creates a vertical mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::flipimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Creates a vertical mirror image by reflecting the pixels around the central x-axis.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The flipped <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Gmagick::flopimage</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/gmagick/gmagick/flopimage.xml b/reference/gmagick/gmagick/flopimage.xml
deleted file mode 100644
index 2e0137fc46b0..000000000000
--- a/reference/gmagick/gmagick/flopimage.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.flopimage">
- <refnamediv>
-  <refname>Gmagick::flopimage</refname>
-  <refpurpose>Creates a horizontal mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::flopimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-     Creates a horizontal mirror image by reflecting the pixels around the central y-axis.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The flopped <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Gmagick::flipimage</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/gmagick/gmagick/frameimage.xml b/reference/gmagick/gmagick/frameimage.xml
deleted file mode 100644
index 4ade4b77bd0e..000000000000
--- a/reference/gmagick/gmagick/frameimage.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.frameimage">
- <refnamediv>
-  <refname>Gmagick::frameimage</refname>
-  <refpurpose>Adds a simulated three-dimensional border</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::frameimage</methodname>
-   <methodparam><type>GmagickPixel</type><parameter>color</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>inner_bevel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>outer_bevel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-Adds a simulated three-dimensional border around the image. The width and height specify the border width of the vertical and horizontal sides of the frame. The inner and outer bevels indicate the width of the inner and outer shadows of the frame.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      <classname>GmagickPixel</classname> object or a float representing the matte color.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      The width of the border.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-       The height of the border.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>inner_bevel</parameter></term>
-    <listitem>
-     <simpara>
-      The inner bevel width.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>outer_bevel</parameter></term>
-    <listitem>
-     <simpara>
-       The outer bevel width.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The framed <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/gammaimage.xml b/reference/gmagick/gmagick/gammaimage.xml
deleted file mode 100644
index 64ee77a6a827..000000000000
--- a/reference/gmagick/gmagick/gammaimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.gammaimage">
- <refnamediv>
-  <refname>Gmagick::gammaimage</refname>
-  <refpurpose>Gamma-corrects an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::gammaimage</methodname>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gamma-corrects an image. The same image viewed on different devices will have perceptual differences in the way the image's intensities are represented on the screen. Specify individual gamma levels for the red, green, and blue channels, or adjust all three with the gamma parameter. Values typically range from 0.8 to 2.3.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>gamma</parameter></term>
-    <listitem>
-     <simpara>
-      The amount of gamma-correction.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The gamma corrected <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getcopyright.xml b/reference/gmagick/gmagick/getcopyright.xml
deleted file mode 100644
index 930bfa014b60..000000000000
--- a/reference/gmagick/gmagick/getcopyright.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getcopyright">
- <refnamediv>
-  <refname>Gmagick::getcopyright</refname>
-  <refpurpose>Returns the GraphicsMagick API copyright as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getcopyright</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the GraphicsMagick API copyright as a string.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the copyright notice of GraphicsMagick and
-   Magickwand C API.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getfilename.xml b/reference/gmagick/gmagick/getfilename.xml
deleted file mode 100644
index 66156ba35cb2..000000000000
--- a/reference/gmagick/gmagick/getfilename.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getfilename">
- <refnamediv>
-  <refname>Gmagick::getfilename</refname>
-  <refpurpose>The filename associated with an image sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getfilename</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the filename associated with an image sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagebackgroundcolor.xml b/reference/gmagick/gmagick/getimagebackgroundcolor.xml
deleted file mode 100644
index 4f15964fee7a..000000000000
--- a/reference/gmagick/gmagick/getimagebackgroundcolor.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagebackgroundcolor">
- <refnamediv>
-  <refname>Gmagick::getimagebackgroundcolor</refname>
-  <refpurpose>Returns the image background color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>Gmagick::getimagebackgroundcolor</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the image background color.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an GmagickPixel set to the background color of the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageblueprimary.xml b/reference/gmagick/gmagick/getimageblueprimary.xml
deleted file mode 100644
index b2df22ced0c6..000000000000
--- a/reference/gmagick/gmagick/getimageblueprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageblueprimary">
- <refnamediv>
-  <refname>Gmagick::getimageblueprimary</refname>
-  <refpurpose>Returns the chromaticy blue primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimageblueprimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the chromaticity blue primary point for the image.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-     The chromaticity blue primary x-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-     The chromaticity blue primary y-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array consisting of "x" and "y" coordinates of point.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagebordercolor.xml b/reference/gmagick/gmagick/getimagebordercolor.xml
deleted file mode 100644
index 9ebbb81e1fdc..000000000000
--- a/reference/gmagick/gmagick/getimagebordercolor.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagebordercolor">
- <refnamediv>
-  <refname>Gmagick::getimagebordercolor</refname>
-  <refpurpose>Returns the image border color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>Gmagick::getimagebordercolor</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the image border color.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <classname>GmagickPixel</classname> object representing the color of the border.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagechanneldepth.xml b/reference/gmagick/gmagick/getimagechanneldepth.xml
deleted file mode 100644
index 56ee6693d6ed..000000000000
--- a/reference/gmagick/gmagick/getimagechanneldepth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagechanneldepth">
- <refnamediv>
-  <refname>Gmagick::getimagechanneldepth</refname>
-  <refpurpose>Gets the depth for a particular image channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagechanneldepth</methodname>
-   <methodparam><type>int</type><parameter>channel_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Gets the depth for a particular image channel.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Depth of image channel
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagecolors.xml b/reference/gmagick/gmagick/getimagecolors.xml
deleted file mode 100644
index b34963933f4c..000000000000
--- a/reference/gmagick/gmagick/getimagecolors.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagecolors">
- <refnamediv>
-  <refname>Gmagick::getimagecolors</refname>
-  <refpurpose>Returns the color of the specified colormap index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagecolors</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the color of the specified colormap index.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of colors in image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagecolorspace.xml b/reference/gmagick/gmagick/getimagecolorspace.xml
deleted file mode 100644
index e08f605799ef..000000000000
--- a/reference/gmagick/gmagick/getimagecolorspace.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagecolorspace">
- <refnamediv>
-  <refname>Gmagick::getimagecolorspace</refname>
-  <refpurpose>Gets the image colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagecolorspace</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image colorspace.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Colorspace
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagecompose.xml b/reference/gmagick/gmagick/getimagecompose.xml
deleted file mode 100644
index e000f213b33e..000000000000
--- a/reference/gmagick/gmagick/getimagecompose.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagecompose">
- <refnamediv>
-  <refname>Gmagick::getimagecompose</refname>
-  <refpurpose>Returns the composite operator associated with the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagecompose</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the composite operator associated with the image.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the composite operator associated with the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagedelay.xml b/reference/gmagick/gmagick/getimagedelay.xml
deleted file mode 100644
index 208ee41ca0dd..000000000000
--- a/reference/gmagick/gmagick/getimagedelay.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagedelay">
- <refnamediv>
-  <refname>Gmagick::getimagedelay</refname>
-  <refpurpose>Gets the image delay</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagedelay</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image delay
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the composite operator associated with the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagedepth.xml b/reference/gmagick/gmagick/getimagedepth.xml
deleted file mode 100644
index 1ccff6b1d3ff..000000000000
--- a/reference/gmagick/gmagick/getimagedepth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagedepth">
- <refnamediv>
-  <refname>Gmagick::getimagedepth</refname>
-  <refpurpose>Gets the depth of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagedepth</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the depth of the image.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Image depth
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagedispose.xml b/reference/gmagick/gmagick/getimagedispose.xml
deleted file mode 100644
index 7a8febf8dc3e..000000000000
--- a/reference/gmagick/gmagick/getimagedispose.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagedispose">
- <refnamediv>
-  <refname>Gmagick::getimagedispose</refname>
-  <refpurpose>Gets the image disposal method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagedispose</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Gets the image disposal method
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the dispose method on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageextrema.xml b/reference/gmagick/gmagick/getimageextrema.xml
deleted file mode 100644
index 0e9fedd05f28..000000000000
--- a/reference/gmagick/gmagick/getimageextrema.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageextrema">
- <refnamediv>
-  <refname>Gmagick::getimageextrema</refname>
-  <refpurpose>Gets the extrema for the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimageextrema</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Returns an associative array with the keys "min" and "max". &gmagick.gmagickexception.throw;
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array with the keys "min" and "max".
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagefilename.xml b/reference/gmagick/gmagick/getimagefilename.xml
deleted file mode 100644
index 9cd87a07f267..000000000000
--- a/reference/gmagick/gmagick/getimagefilename.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagefilename">
- <refnamediv>
-  <refname>Gmagick::getimagefilename</refname>
-  <refpurpose>Returns the filename of a particular image in a sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getimagefilename</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Returns the filename of a particular image in a sequence
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string with the filename of the image
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageformat.xml b/reference/gmagick/gmagick/getimageformat.xml
deleted file mode 100644
index e42f51295d66..000000000000
--- a/reference/gmagick/gmagick/getimageformat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageformat">
- <refnamediv>
-  <refname>Gmagick::getimageformat</refname>
-  <refpurpose>Returns the format of a particular image in a sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getimageformat</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the format of a particular image in a sequence.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the image format on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagegamma.xml b/reference/gmagick/gmagick/getimagegamma.xml
deleted file mode 100644
index 58e4f7e5f0bb..000000000000
--- a/reference/gmagick/gmagick/getimagegamma.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagegamma">
- <refnamediv>
-  <refname>Gmagick::getimagegamma</refname>
-  <refpurpose>Gets the image gamma</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Gmagick::getimagegamma</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image gamma
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns the image gamma on success
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagegreenprimary.xml b/reference/gmagick/gmagick/getimagegreenprimary.xml
deleted file mode 100644
index 1f34afa96ed7..000000000000
--- a/reference/gmagick/gmagick/getimagegreenprimary.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagegreenprimary">
- <refnamediv>
-  <refname>Gmagick::getimagegreenprimary</refname>
-  <refpurpose>Returns the chromaticy green primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimagegreenprimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the chromaticity green primary point. Returns an array with the keys "x" and "y".
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the keys "x" and "y" on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageheight.xml b/reference/gmagick/gmagick/getimageheight.xml
deleted file mode 100644
index ba129e0a71ab..000000000000
--- a/reference/gmagick/gmagick/getimageheight.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageheight">
- <refnamediv>
-  <refname>Gmagick::getimageheight</refname>
-  <refpurpose>Returns the image height</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimageheight</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Returns the image height
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Returns the image height in pixels.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagehistogram.xml b/reference/gmagick/gmagick/getimagehistogram.xml
deleted file mode 100644
index 0aaa7090567e..000000000000
--- a/reference/gmagick/gmagick/getimagehistogram.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagehistogram">
- <refnamediv>
-  <refname>Gmagick::getimagehistogram</refname>
-  <refpurpose>Gets the image histogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimagehistogram</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the image histogram as an array of <classname>GmagickPixel</classname> objects.
-   Throw an <classname>GmagickException</classname> on error.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the image histogram as an array of <classname>GmagickPixel</classname> objects.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageindex.xml b/reference/gmagick/gmagick/getimageindex.xml
deleted file mode 100644
index cc72bd332362..000000000000
--- a/reference/gmagick/gmagick/getimageindex.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageindex">
- <refnamediv>
-  <refname>Gmagick::getimageindex</refname>
-  <refpurpose>Gets the index of the current active image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimageindex</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the index of the current active image within the <classname>Gmagick</classname> object.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Index of current active image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageinterlacescheme.xml b/reference/gmagick/gmagick/getimageinterlacescheme.xml
deleted file mode 100644
index 25424f801ae4..000000000000
--- a/reference/gmagick/gmagick/getimageinterlacescheme.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageinterlacescheme">
- <refnamediv>
-  <refname>Gmagick::getimageinterlacescheme</refname>
-  <refpurpose>Gets the image interlace scheme</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimageinterlacescheme</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image interlace scheme.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the interlace scheme as an integer on success
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageiterations.xml b/reference/gmagick/gmagick/getimageiterations.xml
deleted file mode 100644
index 46394a962716..000000000000
--- a/reference/gmagick/gmagick/getimageiterations.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageiterations">
- <refnamediv>
-  <refname>Gmagick::getimageiterations</refname>
-  <refpurpose>Gets the image iterations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimageiterations</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image iterations.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the image iterations as an integer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagematte.xml b/reference/gmagick/gmagick/getimagematte.xml
deleted file mode 100644
index 335ec24a19a5..000000000000
--- a/reference/gmagick/gmagick/getimagematte.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagematte">
- <refnamediv>
-  <refname>Gmagick::getimagematte</refname>
-  <refpurpose>Check if the image has a matte channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagematte</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns &true; if the image has a matte channel, otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the image has a matte channel, otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagemattecolor.xml b/reference/gmagick/gmagick/getimagemattecolor.xml
deleted file mode 100644
index fce7d049afbd..000000000000
--- a/reference/gmagick/gmagick/getimagemattecolor.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagemattecolor">
- <refnamediv>
-  <refname>Gmagick::getimagemattecolor</refname>
-  <refpurpose>Returns the image matte color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>Gmagick::getimagemattecolor</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns GmagickPixel object on success. Throw an GmagickException on error.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns GmagickPixel object on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageprofile.xml b/reference/gmagick/gmagick/getimageprofile.xml
deleted file mode 100644
index 63460a885e83..000000000000
--- a/reference/gmagick/gmagick/getimageprofile.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageprofile">
- <refnamediv>
-  <refname>Gmagick::getimageprofile</refname>
-  <refpurpose>Returns the named image profile</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getimageprofile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the named image profile.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the image profile.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageredprimary.xml b/reference/gmagick/gmagick/getimageredprimary.xml
deleted file mode 100644
index c9c71bd75e90..000000000000
--- a/reference/gmagick/gmagick/getimageredprimary.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageredprimary">
- <refnamediv>
-  <refname>Gmagick::getimageredprimary</refname>
-  <refpurpose>Returns the chromaticity red primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimageredprimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the chromaticity red primary point as an array with the keys "x" and "y".
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the chromaticity red primary point as an array with the keys "x" and "y".
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagerenderingintent.xml b/reference/gmagick/gmagick/getimagerenderingintent.xml
deleted file mode 100644
index 7640f6a63479..000000000000
--- a/reference/gmagick/gmagick/getimagerenderingintent.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagerenderingintent">
- <refnamediv>
-  <refname>Gmagick::getimagerenderingintent</refname>
-  <refpurpose>Gets the image rendering intent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagerenderingintent</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image rendering intent
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Extracts a region of the image and returns it as a new wand
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageresolution.xml b/reference/gmagick/gmagick/getimageresolution.xml
deleted file mode 100644
index 55b9477d419e..000000000000
--- a/reference/gmagick/gmagick/getimageresolution.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageresolution">
- <refnamediv>
-  <refname>Gmagick::getimageresolution</refname>
-  <refpurpose>Gets the image X and Y resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimageresolution</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the resolution as an array.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the resolution as an array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagescene.xml b/reference/gmagick/gmagick/getimagescene.xml
deleted file mode 100644
index bbc5a7bd32f5..000000000000
--- a/reference/gmagick/gmagick/getimagescene.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagescene">
- <refnamediv>
-  <refname>Gmagick::getimagescene</refname>
-  <refpurpose>Gets the image scene</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagescene</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image scene.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the image scene.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagesignature.xml b/reference/gmagick/gmagick/getimagesignature.xml
deleted file mode 100644
index 8a4f0b6f0632..000000000000
--- a/reference/gmagick/gmagick/getimagesignature.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagesignature">
- <refnamediv>
-  <refname>Gmagick::getimagesignature</refname>
-  <refpurpose>Generates an SHA-256 message digest</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getimagesignature</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Generates an SHA-256 message digest for the image pixel stream.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the SHA-256 hash of the file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagetype.xml b/reference/gmagick/gmagick/getimagetype.xml
deleted file mode 100644
index 42423a9a6f48..000000000000
--- a/reference/gmagick/gmagick/getimagetype.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagetype">
- <refnamediv>
-  <refname>Gmagick::getimagetype</refname>
-  <refpurpose>Gets the potential image type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagetype</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the potential image type.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the potential image type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimageunits.xml b/reference/gmagick/gmagick/getimageunits.xml
deleted file mode 100644
index 5161a3ead6b4..000000000000
--- a/reference/gmagick/gmagick/getimageunits.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimageunits">
- <refnamediv>
-  <refname>Gmagick::getimageunits</refname>
-  <refpurpose>Gets the image units of resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimageunits</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the image units of resolution.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the image units of resolution.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagewhitepoint.xml b/reference/gmagick/gmagick/getimagewhitepoint.xml
deleted file mode 100644
index a8b4b15b3136..000000000000
--- a/reference/gmagick/gmagick/getimagewhitepoint.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagewhitepoint">
- <refnamediv>
-  <refname>Gmagick::getimagewhitepoint</refname>
-  <refpurpose>Returns the chromaticity white point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getimagewhitepoint</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the chromaticity white point as an associative array with the keys "x" and "y".
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the chromaticity white point as an associative array with the keys "x" and "y".
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getimagewidth.xml b/reference/gmagick/gmagick/getimagewidth.xml
deleted file mode 100644
index 56974c76f230..000000000000
--- a/reference/gmagick/gmagick/getimagewidth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getimagewidth">
- <refnamediv>
-  <refname>Gmagick::getimagewidth</refname>
-  <refpurpose>Returns the width of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Gmagick::getimagewidth</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the width of the image.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the image width.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getpackagename.xml b/reference/gmagick/gmagick/getpackagename.xml
deleted file mode 100644
index 926894cc2a58..000000000000
--- a/reference/gmagick/gmagick/getpackagename.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getpackagename">
- <refnamediv>
-  <refname>Gmagick::getpackagename</refname>
-  <refpurpose>Returns the GraphicsMagick package name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getpackagename</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the GraphicsMagick package name.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the GraphicsMagick package name as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getquantumdepth.xml b/reference/gmagick/gmagick/getquantumdepth.xml
deleted file mode 100644
index 843a6f2dcf7e..000000000000
--- a/reference/gmagick/gmagick/getquantumdepth.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getquantumdepth">
- <refnamediv>
-  <refname>Gmagick::getquantumdepth</refname>
-  <refpurpose>Returns the Gmagick quantum depth as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getquantumdepth</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>Gmagick</classname> quantum depth as a string.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Gmagick</classname> quantum depth as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getreleasedate.xml b/reference/gmagick/gmagick/getreleasedate.xml
deleted file mode 100644
index f4c9771cbd0d..000000000000
--- a/reference/gmagick/gmagick/getreleasedate.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getreleasedate">
- <refnamediv>
-  <refname>Gmagick::getreleasedate</refname>
-  <refpurpose>Returns the GraphicsMagick release date as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::getreleasedate</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the GraphicsMagick release date as a string.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the GraphicsMagick release date as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getsamplingfactors.xml b/reference/gmagick/gmagick/getsamplingfactors.xml
deleted file mode 100644
index 74f8decef2cc..000000000000
--- a/reference/gmagick/gmagick/getsamplingfactors.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getsamplingfactors">
- <refnamediv>
-  <refname>Gmagick::getsamplingfactors</refname>
-  <refpurpose>Gets the horizontal and vertical sampling factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getsamplingfactors</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the horizontal and vertical sampling factor.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array with the horizontal and vertical sampling factors of the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getsize.xml b/reference/gmagick/gmagick/getsize.xml
deleted file mode 100644
index 74d027816b83..000000000000
--- a/reference/gmagick/gmagick/getsize.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getsize">
- <refnamediv>
-  <refname>Gmagick::getsize</refname>
-  <refpurpose>Returns the size associated with the Gmagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getsize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the size associated with the <classname>Gmagick</classname> object as an array with the keys "columns" and "rows".
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the size associated with the <classname>Gmagick</classname> object as an array with the keys "columns" and "rows".
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/getversion.xml b/reference/gmagick/gmagick/getversion.xml
deleted file mode 100644
index 1ef8372b1ea3..000000000000
--- a/reference/gmagick/gmagick/getversion.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.getversion">
- <refnamediv>
-  <refname>Gmagick::getversion</refname>
-  <refpurpose>Returns the GraphicsMagick API version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::getversion</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the GraphicsMagick API version as a string and as a number.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the GraphicsMagick API version as a string and as a number.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/hasnextimage.xml b/reference/gmagick/gmagick/hasnextimage.xml
deleted file mode 100644
index d3f2739eafae..000000000000
--- a/reference/gmagick/gmagick/hasnextimage.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.hasnextimage">
- <refnamediv>
-  <refname>Gmagick::hasnextimage</refname>
-  <refpurpose>Checks if the object has more images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::hasnextimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns &true; if the object has more images when traversing the list in the forward direction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the object has more images when traversing the list in the forward direction, returns &false; if there are none.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/haspreviousimage.xml b/reference/gmagick/gmagick/haspreviousimage.xml
deleted file mode 100644
index e352777393e9..000000000000
--- a/reference/gmagick/gmagick/haspreviousimage.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.haspreviousimage">
- <refnamediv>
-  <refname>Gmagick::haspreviousimage</refname>
-  <refpurpose>Checks if the object has a previous image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::haspreviousimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns &true; if the object has more images when traversing the list in the reverse direction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the object has more images when traversing the list in the reverse direction, returns &false; if there are none.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/implodeimage.xml b/reference/gmagick/gmagick/implodeimage.xml
deleted file mode 100644
index b11012c5116c..000000000000
--- a/reference/gmagick/gmagick/implodeimage.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.implodeimage">
- <refnamediv>
-  <refname>Gmagick::implodeimage</refname>
-  <refpurpose>Creates a new image as a copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::implodeimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a new image that is a copy of an existing one with the image pixels "imploded" by the specified percentage.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the implode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns imploded <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/labelimage.xml b/reference/gmagick/gmagick/labelimage.xml
deleted file mode 100644
index 5a9e918de18c..000000000000
--- a/reference/gmagick/gmagick/labelimage.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.labelimage">
- <refnamediv>
-  <refname>Gmagick::labelimage</refname>
-  <refpurpose>Adds a label to an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::labelimage</methodname>
-   <methodparam><type>string</type><parameter>label</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a label to an image.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>label</parameter></term>
-    <listitem>
-     <simpara>
-      The label to add
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Gmagick with label.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/levelimage.xml b/reference/gmagick/gmagick/levelimage.xml
deleted file mode 100644
index a4135f762908..000000000000
--- a/reference/gmagick/gmagick/levelimage.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.levelimage">
- <refnamediv>
-  <refname>Gmagick::levelimage</refname>
-  <refpurpose>Adjusts the levels of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::levelimage</methodname>
-   <methodparam><type>float</type><parameter>blackPoint</parameter></methodparam>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>whitePoint</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Gmagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adjusts the levels of an image by scaling the colors falling between specified white and black
- points to the full available quantum range. The parameters provided represent the black, mid, and
-  white points. The black point specifies the darkest color in the image. Colors darker than the black
- point are set to zero. Mid point specifies a gamma correction to apply to the image. White point
- specifies the lightest color in the image. Colors brighter than the white point are set to the
- maximum quantum value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blackPoint</parameter></term>
-    <listitem>
-     <simpara>
-      The image black point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>gamma</parameter></term>
-    <listitem>
-     <simpara>
-      The gamma value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>whitePoint</parameter></term>
-    <listitem>
-     <simpara>
-      The image white point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      Provide any channel constant that is valid for your channel mode.
-To apply to more than one channel, combine channeltype constants using bitwise
-operators. Refer to this list of <link linkend="gmagick.constants.channel">channel constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <classname>Gmagick</classname> object with image leveled.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/magnifyimage.xml b/reference/gmagick/gmagick/magnifyimage.xml
deleted file mode 100644
index d69d2cfcceb6..000000000000
--- a/reference/gmagick/gmagick/magnifyimage.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.magnifyimage">
- <refnamediv>
-  <refname>Gmagick::magnifyimage</refname>
-  <refpurpose>Scales an image proportionally 2x</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Gmagick::magnifyimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Conveniently scales an image proportionally to twice its original size.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Magnified <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/mapimage.xml b/reference/gmagick/gmagick/mapimage.xml
deleted file mode 100644
index bc3b67676ed2..000000000000
--- a/reference/gmagick/gmagick/mapimage.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.mapimage">
- <refnamediv>
-  <refname>Gmagick::mapimage</refname>
-  <refpurpose>Replaces the colors of an image with the closest color from a reference image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::mapimage</methodname>
-   <methodparam><type>gmagick</type><parameter>gmagick</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Replaces the colors of an image with the closest color from a reference image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>gmagick</parameter></term>
-    <listitem>
-     <simpara>
-      The reference image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dither</parameter></term>
-    <listitem>
-     <simpara>
-      Set this integer value to something other than zero to dither the mapped image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/medianfilterimage.xml b/reference/gmagick/gmagick/medianfilterimage.xml
deleted file mode 100644
index 26489ed07e16..000000000000
--- a/reference/gmagick/gmagick/medianfilterimage.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.medianfilterimage">
- <refnamediv>
-  <refname>Gmagick::medianfilterimage</refname>
-  <refpurpose>Applies a digital filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Gmagick::medianfilterimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the pixel neighborhood.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <classname>Gmagick</classname> object with median filter applied.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/minifyimage.xml b/reference/gmagick/gmagick/minifyimage.xml
deleted file mode 100644
index d23381eac543..000000000000
--- a/reference/gmagick/gmagick/minifyimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.minifyimage">
- <refnamediv>
-  <refname>Gmagick::minifyimage</refname>
-  <refpurpose>Scales an image proportionally to half its size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::minifyimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   A convenient method that scales an image proportionally to one-half its original size.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/modulateimage.xml b/reference/gmagick/gmagick/modulateimage.xml
deleted file mode 100644
index daf7d28db6a1..000000000000
--- a/reference/gmagick/gmagick/modulateimage.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.modulateimage">
- <refnamediv>
-  <refname>Gmagick::modulateimage</refname>
-  <refpurpose>Control the brightness, saturation, and hue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::modulateimage</methodname>
-   <methodparam><type>float</type><parameter>brightness</parameter></methodparam>
-   <methodparam><type>float</type><parameter>saturation</parameter></methodparam>
-   <methodparam><type>float</type><parameter>hue</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Lets you control the brightness, saturation, and hue of an image. Hue is the
-   percentage of absolute rotation from the current position. For example 50 results
-   in a counter-clockwise rotation of 90 degrees, 150 results in a clockwise rotation
-   of 90 degrees, with 0 and 200 both resulting in a rotation of 180 degrees.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>brightness</parameter></term>
-    <listitem>
-     <simpara>
-      The percent change in brighness (-100 thru +100).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>saturation</parameter></term>
-    <listitem>
-     <simpara>
-      The percent change in saturation (-100 thru +100)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>hue</parameter></term>
-    <listitem>
-     <simpara>
-      The percent change in hue (-100 thru +100)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/motionblurimage.xml b/reference/gmagick/gmagick/motionblurimage.xml
deleted file mode 100644
index 19d0e5e99ea3..000000000000
--- a/reference/gmagick/gmagick/motionblurimage.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.motionblurimage">
- <refnamediv>
-  <refname>Gmagick::motionblurimage</refname>
-  <refpurpose>Simulates motion blur</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::motionblurimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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 <methodname>Gmagick::motionblurimage</methodname> selects a suitable radius
-   for you. Angle gives the angle of the blurring motion.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the Gaussian, in pixels, not counting the center pixel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigma</parameter></term>
-    <listitem>
-     <simpara>
-      The standard deviation of the Gaussian, in pixels.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <simpara>
-      Apply the effect along this angle.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/newimage.xml b/reference/gmagick/gmagick/newimage.xml
deleted file mode 100644
index 393c0490c872..000000000000
--- a/reference/gmagick/gmagick/newimage.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.newimage">
- <refnamediv>
-  <refname>Gmagick::newimage</refname>
-  <refpurpose>Creates a new image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::newimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>string</type><parameter>background</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a new image with the specified background color.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Width of the new image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Height of the new image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>background</parameter></term>
-    <listitem>
-     <simpara>
-      The background color used for this image (as float).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      Image format.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/nextimage.xml b/reference/gmagick/gmagick/nextimage.xml
deleted file mode 100644
index d01a476d1134..000000000000
--- a/reference/gmagick/gmagick/nextimage.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.nextimage">
- <refnamediv>
-  <refname>Gmagick::nextimage</refname>
-  <refpurpose>Moves to the next image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Gmagick::nextimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Associates the next image in the image list with an <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/normalizeimage.xml b/reference/gmagick/gmagick/normalizeimage.xml
deleted file mode 100644
index cf583c57ce08..000000000000
--- a/reference/gmagick/gmagick/normalizeimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.normalizeimage">
- <refnamediv>
-  <refname>Gmagick::normalizeimage</refname>
-  <refpurpose>Enhances the contrast of a color image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::normalizeimage</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Enhances the contrast of a color image by adjusting the pixels color to span the entire range of colors available.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      Identify which channel to normalize.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/oilpaintimage.xml b/reference/gmagick/gmagick/oilpaintimage.xml
deleted file mode 100644
index 632e15c3e330..000000000000
--- a/reference/gmagick/gmagick/oilpaintimage.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.oilpaintimage">
- <refnamediv>
-  <refname>Gmagick::oilpaintimage</refname>
-  <refpurpose>Simulates an oil painting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::oilpaintimage</methodname>
-    <methodparam>
-      <type>float</type>
-      <parameter>radius</parameter>
-    </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Applies a special effect filter that simulates an oil painting. Each pixel is replaced by the most frequent color occurring in a circular region defined by radius.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-      <varlistentry>
-        <term>
-          <parameter>radius</parameter>
-        </term>
-        <listitem>
-          <simpara>
-            The radius of the circular neighborhood.
-          </simpara>
-        </listitem>
-      </varlistentry>
-    </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/previousimage.xml b/reference/gmagick/gmagick/previousimage.xml
deleted file mode 100644
index 161f43fcb67f..000000000000
--- a/reference/gmagick/gmagick/previousimage.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.previousimage">
- <refnamediv>
-  <refname>Gmagick::previousimage</refname>
-  <refpurpose>Move to the previous image in the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Gmagick::previousimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Associates the previous image in an image list with the Gmagick object.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/profileimage.xml b/reference/gmagick/gmagick/profileimage.xml
deleted file mode 100644
index 095106839ee6..000000000000
--- a/reference/gmagick/gmagick/profileimage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.profileimage">
- <refnamediv>
-  <refname>Gmagick::profileimage</refname>
-  <refpurpose>Adds or removes a profile from an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::profileimage</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>profile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of profile to add or remove: ICC, IPTC, or generic profile.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>profile</parameter></term>
-    <listitem>
-     <simpara>
-       The profile.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/quantizeimage.xml b/reference/gmagick/gmagick/quantizeimage.xml
deleted file mode 100644
index aa7e867ac57a..000000000000
--- a/reference/gmagick/gmagick/quantizeimage.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.quantizeimage">
- <refnamediv>
-  <refname>Gmagick::quantizeimage</refname>
-  <refpurpose>Analyzes the colors within a reference image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::quantizeimage</methodname>
-   <methodparam><type>int</type><parameter>numColors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-   <methodparam><type>int</type><parameter>treeDepth</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>measureError</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Analyzes the colors within a reference image and chooses a fixed number of
-   colors to represent the image. The goal of the algorithm is to minimize the
-   color difference between the input and output image while minimizing the processing time.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>numColors</parameter></term>
-    <listitem>
-     <simpara>
-      The number of colors.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>colorspace</parameter></term>
-    <listitem>
-     <simpara>
-      Perform color reduction in this colorspace, typically RGBColorspace.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>treeDepth</parameter></term>
-    <listitem>
-     <simpara>
-      Normally, this integer value is zero or one. A zero or one tells Quantize
-to choose a optimal tree depth of Log4(number_colors).% A tree of this depth generally
-allows the best representation of the reference image with the least amount of memory
-and the fastest computational speed. In some cases, such as an image with low color
-dispersion (a few number of colors), a value other than Log4(number_colors) is required.
-To expand the color tree completely, use a value of 8.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dither</parameter></term>
-    <listitem>
-     <simpara>
-      A value other than zero distributes the difference between an original image and the corresponding color reduced algorithm to neighboring pixels along a Hilbert curve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>measureError</parameter></term>
-    <listitem>
-     <simpara>
-      A value other than zero measures the difference between the original and quantized images. This difference is the total quantization error. The error is computed by summing over all pixels in an image the distance squared in RGB space between each reference pixel value and its quantized value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/quantizeimages.xml b/reference/gmagick/gmagick/quantizeimages.xml
deleted file mode 100644
index 3f5acff042b1..000000000000
--- a/reference/gmagick/gmagick/quantizeimages.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.quantizeimages">
- <refnamediv>
-  <refname>Gmagick::quantizeimages</refname>
-  <refpurpose>The quantizeimages purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::quantizeimages</methodname>
-   <methodparam><type>int</type><parameter>numColors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-   <methodparam><type>int</type><parameter>treeDepth</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>measureError</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Analyzes the colors within a sequence of images and chooses a fixed number of
-   colors to represent the image. The goal of the algorithm is to minimize the
-   color difference between the input and output image while minimizing the processing time.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>numColors</parameter></term>
-    <listitem>
-     <simpara>
-      The number of colors.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>colorspace</parameter></term>
-    <listitem>
-     <simpara>
-      Perform color reduction in this colorspace, typically RGBColorspace.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>treeDepth</parameter></term>
-    <listitem>
-     <simpara>
-      Normally, this integer value is zero or one. A zero or one tells Quantize
-to choose a optimal tree depth of Log4(number_colors).% A tree of this depth generally
-allows the best representation of the reference image with the least amount of memory
-and the fastest computational speed. In some cases, such as an image with low color
-dispersion (a few number of colors), a value other than Log4(number_colors) is required.
-To expand the color tree completely, use a value of 8.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dither</parameter></term>
-    <listitem>
-     <simpara>
-      A value other than zero distributes the difference between an original image and the corresponding color reduced algorithm to neighboring pixels along a Hilbert curve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>measureError</parameter></term>
-    <listitem>
-     <simpara>
-      A value other than zero measures the difference between the original and quantized images. This difference is the total quantization error. The error is computed by summing over all pixels in an image the distance squared in RGB space between each reference pixel value and its quantized value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/queryfontmetrics.xml b/reference/gmagick/gmagick/queryfontmetrics.xml
deleted file mode 100644
index ad2a8cdfa354..000000000000
--- a/reference/gmagick/gmagick/queryfontmetrics.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.queryfontmetrics">
- <refnamediv>
-  <refname>Gmagick::queryfontmetrics</refname>
-  <refpurpose>Returns an array representing the font metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::queryfontmetrics</methodname>
-   <methodparam><type>GmagickDraw</type><parameter>draw</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   MagickQueryFontMetrics() returns an array representing the font metrics.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/queryfonts.xml b/reference/gmagick/gmagick/queryfonts.xml
deleted file mode 100644
index 4a6b2ddd3e5a..000000000000
--- a/reference/gmagick/gmagick/queryfonts.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.queryfonts">
- <refnamediv>
-  <refname>Gmagick::queryfonts</refname>
-  <refpurpose>Returns the configured fonts</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::queryfonts</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Returns fonts supported by Gmagick.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/queryformats.xml b/reference/gmagick/gmagick/queryformats.xml
deleted file mode 100644
index 033ca6d40dab..000000000000
--- a/reference/gmagick/gmagick/queryformats.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.queryformats">
- <refnamediv>
-  <refname>Gmagick::queryformats</refname>
-  <refpurpose>Returns formats supported by Gmagick</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Gmagick::queryformats</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns formats supported by <classname>Gmagick</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies a <type>string</type> containing a pattern.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/radialblurimage.xml b/reference/gmagick/gmagick/radialblurimage.xml
deleted file mode 100644
index 705a597df74b..000000000000
--- a/reference/gmagick/gmagick/radialblurimage.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.radialblurimage">
- <refnamediv>
-  <refname>Gmagick::radialblurimage</refname>
-  <refpurpose>Radial blurs an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::radialblurimage</methodname>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Gmagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Radial blurs an image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <simpara>
-      The angle of the blur in degrees.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      Related channel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/raiseimage.xml b/reference/gmagick/gmagick/raiseimage.xml
deleted file mode 100644
index 3b38d7ed44e8..000000000000
--- a/reference/gmagick/gmagick/raiseimage.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.raiseimage">
- <refnamediv>
-  <refname>Gmagick::raiseimage</refname>
-  <refpurpose>Creates a simulated 3d button-like effect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::raiseimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>raise</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-       Width of the area to raise.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Height of the area to raise.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      X coordinate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      Y coordinate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>raise</parameter></term>
-    <listitem>
-     <simpara>
-      A value other than zero creates a 3-D raise effect, otherwise it has a lowered effect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/read.xml b/reference/gmagick/gmagick/read.xml
deleted file mode 100644
index 9d51ed47239c..000000000000
--- a/reference/gmagick/gmagick/read.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.read">
- <refnamediv>
-  <refname>Gmagick::read</refname>
-  <refpurpose>Reads image from filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::read</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads image from filename.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-          The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/readimage.xml b/reference/gmagick/gmagick/readimage.xml
deleted file mode 100644
index 0d260de403d6..000000000000
--- a/reference/gmagick/gmagick/readimage.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.readimage">
- <refnamediv>
-  <refname>Gmagick::readimage</refname>
-  <refpurpose>Reads image from filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::readimage</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads image from filename.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-          The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/readimageblob.xml b/reference/gmagick/gmagick/readimageblob.xml
deleted file mode 100644
index dc36d0aa4ca9..000000000000
--- a/reference/gmagick/gmagick/readimageblob.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.readimageblob">
- <refnamediv>
-  <refname>Gmagick::readimageblob</refname>
-  <refpurpose>Reads image from a binary string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::readimageblob</methodname>
-   <methodparam><type>string</type><parameter>imageContents</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads image from a binary string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>imageContents</parameter></term>
-    <listitem>
-     <simpara>
-      Content of image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/readimagefile.xml b/reference/gmagick/gmagick/readimagefile.xml
deleted file mode 100644
index 27e8d5c10264..000000000000
--- a/reference/gmagick/gmagick/readimagefile.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.readimagefile">
- <refnamediv>
-  <refname>Gmagick::readimagefile</refname>
-  <refpurpose>The readimagefile purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::readimagefile</methodname>
-   <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads an image or image sequence from an open file descriptor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fp</parameter></term>
-    <listitem>
-     <simpara>
-      The file descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/reducenoiseimage.xml b/reference/gmagick/gmagick/reducenoiseimage.xml
deleted file mode 100644
index 50a5c732253c..000000000000
--- a/reference/gmagick/gmagick/reducenoiseimage.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.reducenoiseimage">
- <refnamediv>
-  <refname>Gmagick::reducenoiseimage</refname>
-  <refpurpose>Smooths the contours of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::reducenoiseimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      The radius of the pixel neighborhood.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/removeimage.xml b/reference/gmagick/gmagick/removeimage.xml
deleted file mode 100644
index e78b256a2a5b..000000000000
--- a/reference/gmagick/gmagick/removeimage.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.removeimage">
- <refnamediv>
-  <refname>Gmagick::removeimage</refname>
-  <refpurpose>Removes an image from the image list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::removeimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Removes an image from the image list.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/removeimageprofile.xml b/reference/gmagick/gmagick/removeimageprofile.xml
deleted file mode 100644
index 7b2fd97ffd44..000000000000
--- a/reference/gmagick/gmagick/removeimageprofile.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.removeimageprofile">
- <refnamediv>
-  <refname>Gmagick::removeimageprofile</refname>
-  <refpurpose>Removes the named image profile and returns it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Gmagick::removeimageprofile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes the named image profile and returns it.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      Name of profile to return: ICC, IPTC, or generic profile.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The named profile.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/resampleimage.xml b/reference/gmagick/gmagick/resampleimage.xml
deleted file mode 100644
index 0535b0f9a8f2..000000000000
--- a/reference/gmagick/gmagick/resampleimage.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.resampleimage">
- <refnamediv>
-  <refname>Gmagick::resampleimage</refname>
-  <refpurpose>Resample image to desired resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::resampleimage</methodname>
-   <methodparam><type>float</type><parameter>xResolution</parameter></methodparam>
-   <methodparam><type>float</type><parameter>yResolution</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
-   <methodparam><type>float</type><parameter>blur</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Resample image to desired resolution.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>xResolution</parameter></term>
-    <listitem>
-     <simpara>
-      The new image x resolution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>yResolution</parameter></term>
-    <listitem>
-     <simpara>
-      The new image y resolution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filter</parameter></term>
-    <listitem>
-     <simpara>
-      Image filter to use.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blur</parameter></term>
-    <listitem>
-     <simpara>
-      The blur factor where larger than 1 is blurry, smaller than 1  is sharp.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/resizeimage.xml b/reference/gmagick/gmagick/resizeimage.xml
deleted file mode 100644
index 4b784252a00d..000000000000
--- a/reference/gmagick/gmagick/resizeimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.resizeimage">
- <refnamediv>
-  <refname>Gmagick::resizeimage</refname>
-  <refpurpose>Scales an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::resizeimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
-   <methodparam><type>float</type><parameter>blur</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>fit</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Scales an image to the desired dimensions with a filter.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      The number of columns in the scaled image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      The number of rows in the scaled image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filter</parameter></term>
-    <listitem>
-     <simpara>
-      Image filter to use.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blur</parameter></term>
-    <listitem>
-     <simpara>
-      The blur factor where larger than 1 is blurry, lesser than 1 is sharp.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/rollimage.xml b/reference/gmagick/gmagick/rollimage.xml
deleted file mode 100644
index c51173461e56..000000000000
--- a/reference/gmagick/gmagick/rollimage.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.rollimage">
- <refnamediv>
-  <refname>Gmagick::rollimage</refname>
-  <refpurpose>Offsets an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::rollimage</methodname>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Offsets an image as defined by x and y.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The x offset.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The y offset.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/rotateimage.xml b/reference/gmagick/gmagick/rotateimage.xml
deleted file mode 100644
index 110e791837fb..000000000000
--- a/reference/gmagick/gmagick/rotateimage.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.rotateimage">
- <refnamediv>
-  <refname>Gmagick::rotateimage</refname>
-  <refpurpose>Rotates an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::rotateimage</methodname>
-   <methodparam><type>mixed</type><parameter>color</parameter></methodparam>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rotates an image the specified number of degrees. Empty triangles left over from rotating the image are filled with the background color.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The background pixel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>degrees</parameter></term>
-    <listitem>
-     <simpara>
-      The number of degrees to rotate the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/scaleimage.xml b/reference/gmagick/gmagick/scaleimage.xml
deleted file mode 100644
index 67a5b31dbd4a..000000000000
--- a/reference/gmagick/gmagick/scaleimage.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.scaleimage">
- <refnamediv>
-  <refname>Gmagick::scaleimage</refname>
-  <refpurpose>Scales the size of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::scaleimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>fit</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Scales the size of an image to the given dimensions. The other parameter will be calculated if 0 is passed as either param.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      The number of columns in the scaled image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      The number of rows in the scaled image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/separateimagechannel.xml b/reference/gmagick/gmagick/separateimagechannel.xml
deleted file mode 100644
index ae88ee460f9c..000000000000
--- a/reference/gmagick/gmagick/separateimagechannel.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.separateimagechannel">
- <refnamediv>
-  <refname>Gmagick::separateimagechannel</refname>
-  <refpurpose>Separates a channel from the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::separateimagechannel</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Separates a channel from the image and returns a grayscale image. A channel is a particular color component of each pixel in the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.channel">Channel</link> constant
-      (<literal>Gmagick::CHANNEL_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setcompressionquality.xml b/reference/gmagick/gmagick/setcompressionquality.xml
deleted file mode 100644
index 17ef1cf5f2e8..000000000000
--- a/reference/gmagick/gmagick/setcompressionquality.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setcompressionquality">
- <refnamediv>
-  <refname>Gmagick::setCompressionQuality</refname>
-  <refpurpose>Sets the object's default compression quality</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <type>Gmagick</type><methodname>Gmagick::setCompressionQuality</methodname>
-   <methodparam>
-    <type>int</type><parameter>quality</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the object's default compression quality.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>quality</parameter></term>
-    <listitem>
-     <simpara>
-      The GraphicsMagick default value is 75.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-<!-- Not sure if the ChangeLog entries are useful
-     in this case or not, so leaving the block
-     commented out.
- <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>
-     <title> <function>Gmagick::setCompressionQuality</function></title>
-     <programlisting role="php">
-     <![CDATA[
-<?php
-$gm = new Gmagick();
-$gm->read("magick:rose");
-$gm->setCompressionQuality(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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setfilename.xml b/reference/gmagick/gmagick/setfilename.xml
deleted file mode 100644
index 96104e32dcb6..000000000000
--- a/reference/gmagick/gmagick/setfilename.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setfilename">
- <refnamediv>
-  <refname>Gmagick::setfilename</refname>
-  <refpurpose>Sets the filename before you read or write the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setfilename</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Sets the filename before you read or write an image file.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-     The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagebackgroundcolor.xml b/reference/gmagick/gmagick/setimagebackgroundcolor.xml
deleted file mode 100644
index 59acce13ab46..000000000000
--- a/reference/gmagick/gmagick/setimagebackgroundcolor.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagebackgroundcolor">
- <refnamediv>
-  <refname>Gmagick::setimagebackgroundcolor</refname>
-  <refpurpose>Sets the image background color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagebackgroundcolor</methodname>
-   <methodparam><type>GmagickPixel</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image background color.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The background pixel wand.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageblueprimary.xml b/reference/gmagick/gmagick/setimageblueprimary.xml
deleted file mode 100644
index 0c18590edd37..000000000000
--- a/reference/gmagick/gmagick/setimageblueprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageblueprimary">
- <refnamediv>
-  <refname>Gmagick::setimageblueprimary</refname>
-  <refpurpose>Sets the image chromaticity blue primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageblueprimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image chromaticity blue primary point.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The blue primary x-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The blue primary y-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagebordercolor.xml b/reference/gmagick/gmagick/setimagebordercolor.xml
deleted file mode 100644
index 1d20f4c0c8a3..000000000000
--- a/reference/gmagick/gmagick/setimagebordercolor.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagebordercolor">
- <refnamediv>
-  <refname>Gmagick::setimagebordercolor</refname>
-  <refpurpose>Sets the image border color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagebordercolor</methodname>
-   <methodparam><type>GmagickPixel</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image border color.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The border pixel wand.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagechanneldepth.xml b/reference/gmagick/gmagick/setimagechanneldepth.xml
deleted file mode 100644
index fa772c90ee85..000000000000
--- a/reference/gmagick/gmagick/setimagechanneldepth.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagechanneldepth">
- <refnamediv>
-  <refname>Gmagick::setimagechanneldepth</refname>
-  <refpurpose>Sets the depth of a particular image channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagechanneldepth</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>depth</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the depth of a particular image channel.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.channel">Channel</link> constant
-      (<literal>Gmagick::CHANNEL_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      The image depth in bits.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagecolorspace.xml b/reference/gmagick/gmagick/setimagecolorspace.xml
deleted file mode 100644
index b6ce9dc4688a..000000000000
--- a/reference/gmagick/gmagick/setimagecolorspace.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagecolorspace">
- <refnamediv>
-  <refname>Gmagick::setimagecolorspace</refname>
-  <refpurpose>Sets the image colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagecolorspace</methodname>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image colorspace.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>colorspace</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.colorspace">Colorspace</link> constant
-      (<literal>Gmagick::COLORSPACE_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagecompose.xml b/reference/gmagick/gmagick/setimagecompose.xml
deleted file mode 100644
index edfb42c73c2c..000000000000
--- a/reference/gmagick/gmagick/setimagecompose.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagecompose">
- <refnamediv>
-  <refname>Gmagick::setimagecompose</refname>
-  <refpurpose>Sets the image composite operator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagecompose</methodname>
-   <methodparam><type>int</type><parameter>composite</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image composite operator.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>composite</parameter></term>
-    <listitem>
-     <simpara>
-      The image composite operator.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagedelay.xml b/reference/gmagick/gmagick/setimagedelay.xml
deleted file mode 100644
index 21fb68e9542f..000000000000
--- a/reference/gmagick/gmagick/setimagedelay.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagedelay">
- <refnamediv>
-  <refname>Gmagick::setimagedelay</refname>
-  <refpurpose>Sets the image delay</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagedelay</methodname>
-   <methodparam><type>int</type><parameter>delay</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Sets the image delay.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>delay</parameter></term>
-    <listitem>
-     <simpara>
-      The image delay in 1/100th of a second.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagedepth.xml b/reference/gmagick/gmagick/setimagedepth.xml
deleted file mode 100644
index 6def56d64290..000000000000
--- a/reference/gmagick/gmagick/setimagedepth.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagedepth">
- <refnamediv>
-  <refname>Gmagick::setimagedepth</refname>
-  <refpurpose>Sets the image depth</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagedepth</methodname>
-   <methodparam><type>int</type><parameter>depth</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image depth.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      The image depth in bits: 8, 16, or 32.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagedispose.xml b/reference/gmagick/gmagick/setimagedispose.xml
deleted file mode 100644
index d9027d148263..000000000000
--- a/reference/gmagick/gmagick/setimagedispose.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagedispose">
- <refnamediv>
-  <refname>Gmagick::setimagedispose</refname>
-  <refpurpose>Sets the image disposal method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagedispose</methodname>
-   <methodparam><type>int</type><parameter>disposeType</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image disposal method.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>disposeType</parameter></term>
-    <listitem>
-     <simpara>
-      The image disposal type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagefilename.xml b/reference/gmagick/gmagick/setimagefilename.xml
deleted file mode 100644
index 20d7147b358f..000000000000
--- a/reference/gmagick/gmagick/setimagefilename.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagefilename">
- <refnamediv>
-  <refname>Gmagick::setimagefilename</refname>
-  <refpurpose>Sets the filename of a particular image in a sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagefilename</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the filename of a particular image in a sequence.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageformat.xml b/reference/gmagick/gmagick/setimageformat.xml
deleted file mode 100644
index 095897c44864..000000000000
--- a/reference/gmagick/gmagick/setimageformat.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageformat">
- <refnamediv>
-  <refname>Gmagick::setimageformat</refname>
-  <refpurpose>Sets the format of a particular image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageformat</methodname>
-   <methodparam><type>string</type><parameter>imageFormat</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the format of a particular image in a sequence.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>imageFormat</parameter></term>
-    <listitem>
-     <simpara>
-      The image format.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagegamma.xml b/reference/gmagick/gmagick/setimagegamma.xml
deleted file mode 100644
index a4ec5254e246..000000000000
--- a/reference/gmagick/gmagick/setimagegamma.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagegamma">
- <refnamediv>
-  <refname>Gmagick::setimagegamma</refname>
-  <refpurpose>Sets the image gamma</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagegamma</methodname>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image gamma.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>gamma</parameter></term>
-    <listitem>
-     <simpara>
-      The image gamma.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagegreenprimary.xml b/reference/gmagick/gmagick/setimagegreenprimary.xml
deleted file mode 100644
index 8198eb5c0830..000000000000
--- a/reference/gmagick/gmagick/setimagegreenprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagegreenprimary">
- <refnamediv>
-  <refname>Gmagick::setimagegreenprimary</refname>
-  <refpurpose>Sets the image chromaticity green primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagegreenprimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image chromaticity green primary point.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The chromaticity green primary x-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The chromaticity green primary y-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageindex.xml b/reference/gmagick/gmagick/setimageindex.xml
deleted file mode 100644
index ed52ee85d496..000000000000
--- a/reference/gmagick/gmagick/setimageindex.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageindex">
- <refnamediv>
-  <refname>Gmagick::setimageindex</refname>
-  <refpurpose>Set the iterator to the position in the image list specified with the index parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageindex</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set the iterator to the position in the image list specified with the index parameter.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <simpara>
-      The scene number.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageinterlacescheme.xml b/reference/gmagick/gmagick/setimageinterlacescheme.xml
deleted file mode 100644
index 42eb1eb5ce7f..000000000000
--- a/reference/gmagick/gmagick/setimageinterlacescheme.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageinterlacescheme">
- <refnamediv>
-  <refname>Gmagick::setimageinterlacescheme</refname>
-  <refpurpose>Sets the interlace scheme of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageinterlacescheme</methodname>
-   <methodparam><type>int</type><parameter>interlace</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the interlace scheme of the image.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>interlace</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.interlace">Interlace</link> constant
-      (<literal>Gmagick::INTERLACE_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageiterations.xml b/reference/gmagick/gmagick/setimageiterations.xml
deleted file mode 100644
index b2fec74daf04..000000000000
--- a/reference/gmagick/gmagick/setimageiterations.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageiterations">
- <refnamediv>
-  <refname>Gmagick::setimageiterations</refname>
-  <refpurpose>Sets the image iterations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageiterations</methodname>
-   <methodparam><type>int</type><parameter>iterations</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image iterations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>iterations</parameter></term>
-    <listitem>
-     <simpara>
-      The image delay in 1/100th of a second.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageprofile.xml b/reference/gmagick/gmagick/setimageprofile.xml
deleted file mode 100644
index 417d09ffe881..000000000000
--- a/reference/gmagick/gmagick/setimageprofile.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageprofile">
- <refnamediv>
-  <refname>Gmagick::setimageprofile</refname>
-  <refpurpose>Adds a named profile to the Gmagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageprofile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>profile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a named profile to the Gmagick object. If a profile with the same name already exists, it is replaced.
-   This method differs from the Gmagick::profileimage() method in that it does not apply any CMS color profiles.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      Name of profile to add or remove: ICC, IPTC, or generic profile.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>profile</parameter></term>
-    <listitem>
-     <simpara>
-      The profile.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageredprimary.xml b/reference/gmagick/gmagick/setimageredprimary.xml
deleted file mode 100644
index e482101237f2..000000000000
--- a/reference/gmagick/gmagick/setimageredprimary.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageredprimary">
- <refnamediv>
-  <refname>Gmagick::setimageredprimary</refname>
-  <refpurpose>Sets the image chromaticity red primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageredprimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image chromaticity red primary point.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The red primary x-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The red primary y-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagerenderingintent.xml b/reference/gmagick/gmagick/setimagerenderingintent.xml
deleted file mode 100644
index e5ed8fdf565d..000000000000
--- a/reference/gmagick/gmagick/setimagerenderingintent.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagerenderingintent">
- <refnamediv>
-  <refname>Gmagick::setimagerenderingintent</refname>
-  <refpurpose>Sets the image rendering intent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagerenderingintent</methodname>
-   <methodparam><type>int</type><parameter>rendering_intent</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image rendering intent.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rendering_intent</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.renderingintent">Rendering Intent</link> constant
-      (<literal>Gmagick::RENDERINGINTENT_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageresolution.xml b/reference/gmagick/gmagick/setimageresolution.xml
deleted file mode 100644
index e55cd95cc0e5..000000000000
--- a/reference/gmagick/gmagick/setimageresolution.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageresolution">
- <refnamediv>
-  <refname>Gmagick::setimageresolution</refname>
-  <refpurpose>Sets the image resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageresolution</methodname>
-   <methodparam><type>float</type><parameter>xResolution</parameter></methodparam>
-   <methodparam><type>float</type><parameter>yResolution</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image resolution.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>xResolution</parameter></term>
-    <listitem>
-     <simpara>
-      The image x resolution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>yResolution</parameter></term>
-    <listitem>
-     <simpara>
-      The image y resolution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The Gmagick object on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagescene.xml b/reference/gmagick/gmagick/setimagescene.xml
deleted file mode 100644
index 3a09b16d1acd..000000000000
--- a/reference/gmagick/gmagick/setimagescene.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagescene">
- <refnamediv>
-  <refname>Gmagick::setimagescene</refname>
-  <refpurpose>Sets the image scene</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagescene</methodname>
-   <methodparam><type>int</type><parameter>scene</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image scene.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>scene</parameter></term>
-    <listitem>
-     <simpara>
-      The image scene number.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagetype.xml b/reference/gmagick/gmagick/setimagetype.xml
deleted file mode 100644
index 011080abf07d..000000000000
--- a/reference/gmagick/gmagick/setimagetype.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagetype">
- <refnamediv>
-  <refname>Gmagick::setimagetype</refname>
-  <refpurpose>Sets the image type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagetype</methodname>
-   <methodparam><type>int</type><parameter>imgType</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>imgType</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.imagetype">Image type</link> constant
-      (<literal>Gmagick::IMGTYPE_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimageunits.xml b/reference/gmagick/gmagick/setimageunits.xml
deleted file mode 100644
index 18c0abb4a810..000000000000
--- a/reference/gmagick/gmagick/setimageunits.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimageunits">
- <refnamediv>
-  <refname>Gmagick::setimageunits</refname>
-  <refpurpose>Sets the image units of resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimageunits</methodname>
-   <methodparam><type>int</type><parameter>resolution</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image units of resolution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>resolution</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <link linkend="gmagick.constants.resolution">Resolution</link> constant
-      (<literal>Gmagick::RESOLUTION_*</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setimagewhitepoint.xml b/reference/gmagick/gmagick/setimagewhitepoint.xml
deleted file mode 100644
index 3c22c070ad07..000000000000
--- a/reference/gmagick/gmagick/setimagewhitepoint.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setimagewhitepoint">
- <refnamediv>
-  <refname>Gmagick::setimagewhitepoint</refname>
-  <refpurpose>Sets the image chromaticity white point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setimagewhitepoint</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image chromaticity white point.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      The white x-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      The white y-point.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setsamplingfactors.xml b/reference/gmagick/gmagick/setsamplingfactors.xml
deleted file mode 100644
index fb5b2fe0ddac..000000000000
--- a/reference/gmagick/gmagick/setsamplingfactors.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setsamplingfactors">
- <refnamediv>
-  <refname>Gmagick::setsamplingfactors</refname>
-  <refpurpose>Sets the image sampling factors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setsamplingfactors</methodname>
-   <methodparam><type>array</type><parameter>factors</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image sampling factors.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>factors</parameter></term>
-    <listitem>
-     <simpara>
-      An array of <type>float</type>s representing the sampling factor for each color component (in RGB order).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/setsize.xml b/reference/gmagick/gmagick/setsize.xml
deleted file mode 100644
index 2ecab65648ab..000000000000
--- a/reference/gmagick/gmagick/setsize.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setsize">
- <refnamediv>
-  <refname>Gmagick::setsize</refname>
-  <refpurpose>Sets the size of the Gmagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::setsize</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>columns</parameter></term>
-    <listitem>
-     <simpara>
-      The width in pixels.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <simpara>
-      The height in pixels.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/shearimage.xml b/reference/gmagick/gmagick/shearimage.xml
deleted file mode 100644
index e823bd5beb23..000000000000
--- a/reference/gmagick/gmagick/shearimage.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.shearimage">
- <refnamediv>
-  <refname>Gmagick::shearimage</refname>
-  <refpurpose>Creating a parallelogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::shearimage</methodname>
-   <methodparam><type>mixed</type><parameter>color</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xShear</parameter></methodparam>
-   <methodparam><type>float</type><parameter>yShear</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-Slides one edge of an image along the X or Y axis, creating a parallelogram.
- An X direction shear slides an edge along the X axis, while a Y direction shear slides an edge along the Y axis.
-The amount of the shear is controlled by a shear angle. For X direction shears, x_shear is measured relative to the
- Y axis, and similarly, for Y direction shears y_shear is measured relative to the X axis. Empty triangles left over
- from shearing the image are filled with the background color.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The background pixel wand.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>xShear</parameter></term>
-    <listitem>
-     <simpara>
-      The number of degrees to shear the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>yShear</parameter></term>
-    <listitem>
-     <simpara>
-      The number of degrees to shear the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/solarizeimage.xml b/reference/gmagick/gmagick/solarizeimage.xml
deleted file mode 100644
index 162c866ea412..000000000000
--- a/reference/gmagick/gmagick/solarizeimage.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.solarizeimage">
- <refnamediv>
-  <refname>Gmagick::solarizeimage</refname>
-  <refpurpose>Applies a solarizing effect to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::solarizeimage</methodname>
-   <methodparam><type>int</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Applies a special effect to the image, similar to the effect achieved in a
-   photo darkroom by selectively exposing areas of photo sensitive paper to light.
-  Threshold ranges from 0 to QuantumRange and is a measure of the extent of the solarization.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>threshold</parameter></term>
-    <listitem>
-     <simpara>
-      Define the extent of the solarization.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/spreadimage.xml b/reference/gmagick/gmagick/spreadimage.xml
deleted file mode 100644
index f4b12fe26632..000000000000
--- a/reference/gmagick/gmagick/spreadimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.spreadimage">
- <refnamediv>
-  <refname>Gmagick::spreadimage</refname>
-  <refpurpose>Randomly displaces each pixel in a block</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::spreadimage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Special effects method that randomly displaces each pixel in a block defined by the radius parameter.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <simpara>
-      Choose a random pixel in a neighborhood of this extent.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/stripimage.xml b/reference/gmagick/gmagick/stripimage.xml
deleted file mode 100644
index 9706275306f4..000000000000
--- a/reference/gmagick/gmagick/stripimage.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.stripimage">
- <refnamediv>
-  <refname>Gmagick::stripimage</refname>
-  <refpurpose>Strips an image of all profiles and comments</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::stripimage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Strips an image of all profiles and comments.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/swirlimage.xml b/reference/gmagick/gmagick/swirlimage.xml
deleted file mode 100644
index c68ccd0f014b..000000000000
--- a/reference/gmagick/gmagick/swirlimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.swirlimage">
- <refnamediv>
-  <refname>Gmagick::swirlimage</refname>
-  <refpurpose>Swirls the pixels about the center of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::swirlimage</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>degrees</parameter></term>
-    <listitem>
-     <simpara>
-      Define the tightness of the swirling effect.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/thumbnailimage.xml b/reference/gmagick/gmagick/thumbnailimage.xml
deleted file mode 100644
index 5d14c12a5e19..000000000000
--- a/reference/gmagick/gmagick/thumbnailimage.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.thumbnailimage">
- <refnamediv>
-  <refname>Gmagick::thumbnailimage</refname>
-  <refpurpose>Changes the size of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::thumbnailimage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>fit</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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
- for each side. Both sides will be scaled down until the match or are smaller than the parameter given for the side.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Image width.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Image height.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/trimimage.xml b/reference/gmagick/gmagick/trimimage.xml
deleted file mode 100644
index b741d5312936..000000000000
--- a/reference/gmagick/gmagick/trimimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.trimimage">
- <refnamediv>
-  <refname>Gmagick::trimimage</refname>
-  <refpurpose>Remove edges from the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::trimimage</methodname>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Remove edges that are the background color from the image.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fuzz</parameter></term>
-    <listitem>
-     <simpara>
-      By default target must match a particular pixel color exactly. However, in many cases two colors may differ by a small amount. The fuzz member of image defines how much tolerance is acceptable to consider two colors as the same. This parameter represents the variation on the quantum range.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/write.xml b/reference/gmagick/gmagick/write.xml
deleted file mode 100644
index 668dc120456c..000000000000
--- a/reference/gmagick/gmagick/write.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="gmagick.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- 
- <refnamediv>
-  <refname>Gmagick::write</refname>
-  <refpurpose>&Alias; <methodname>Gmagick::writeimage</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.method.alias; <methodname>Gmagick::writeimage</methodname>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagick/writeimage.xml b/reference/gmagick/gmagick/writeimage.xml
deleted file mode 100644
index 460a3dace35e..000000000000
--- a/reference/gmagick/gmagick/writeimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.writeimage">
- <refnamediv>
-  <refname>Gmagick::writeimage</refname>
-  <refpurpose>Writes an image to the specified filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Gmagick</type><methodname>Gmagick::writeimage</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>all_frames</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The image filename.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Gmagick</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &gmagick.gmagickexception.throw;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw.xml b/reference/gmagick/gmagickdraw.xml
deleted file mode 100644
index 94d3ca46e87d..000000000000
--- a/reference/gmagick/gmagickdraw.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gmagickdraw" role="class">
-
- <title>The GmagickDraw class</title>
- <titleabbrev>GmagickDraw</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GmagickDraw intro -->
-  <section xml:id="gmagickdraw.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gmagickdraw.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>GmagickDraw</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>GmagickDraw</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagickdraw')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gmagick.entities.gmagickdraw;
-
-</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/gmagick/gmagickdraw/annotate.xml b/reference/gmagick/gmagickdraw/annotate.xml
deleted file mode 100644
index 784d95b2cea1..000000000000
--- a/reference/gmagick/gmagickdraw/annotate.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.annotate">
- <refnamediv>
-  <refname>GmagickDraw::annotate</refname>
-  <refpurpose>Draws text on the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::annotate</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws text on the image.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      x ordinate to left of text
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      y ordinate to text baseline
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      text to draw
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/arc.xml b/reference/gmagick/gmagickdraw/arc.xml
deleted file mode 100644
index 35a86a8c83b5..000000000000
--- a/reference/gmagick/gmagickdraw/arc.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.arc">
- <refnamediv>
-  <refname>GmagickDraw::arc</refname>
-  <refpurpose>Draws an arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::arc</methodname>
-   <methodparam><type>float</type><parameter>sx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sy</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ex</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ey</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sd</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ed</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws an arc falling within a specified bounding rectangle on the image.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sx</parameter></term>
-    <listitem>
-     <simpara>
-      starting x ordinate of bounding rectangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sy</parameter></term>
-    <listitem>
-     <simpara>
-      starting y ordinate of bounding rectangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ex</parameter></term>
-    <listitem>
-     <simpara>
-      ending x ordinate of bounding rectangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ey</parameter></term>
-    <listitem>
-     <simpara>
-      ending y ordinate of bounding rectangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sd</parameter></term>
-    <listitem>
-     <simpara>
-      starting degrees of rotation
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ed</parameter></term>
-    <listitem>
-     <simpara>
-      ending degrees of rotation
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/bezier.xml b/reference/gmagick/gmagickdraw/bezier.xml
deleted file mode 100644
index 6244d207936b..000000000000
--- a/reference/gmagick/gmagickdraw/bezier.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.bezier">
- <refnamediv>
-  <refname>GmagickDraw::bezier</refname>
-  <refpurpose>Draws a bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::bezier</methodname>
-   <methodparam><type>array</type><parameter>coordinate_array</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a bezier curve through a set of points on the image.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>coordinate_array</parameter></term>
-    <listitem>
-     <simpara>
-      Coordinates array
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/ellipse.xml b/reference/gmagick/gmagickdraw/ellipse.xml
deleted file mode 100644
index 7244280b74a0..000000000000
--- a/reference/gmagick/gmagickdraw/ellipse.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.ellipse">
- <refnamediv>
-  <refname>GmagickDraw::ellipse</refname>
-  <refpurpose>Draws an ellipse on the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::ellipse</methodname>
-   <methodparam><type>float</type><parameter>ox</parameter></methodparam>
-   <methodparam><type>float</type><parameter>oy</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ry</parameter></methodparam>
-   <methodparam><type>float</type><parameter>start</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws an ellipse on the image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ox</parameter></term>
-    <listitem>
-     <simpara>
-      origin x ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>oy</parameter></term>
-    <listitem>
-     <simpara>
-      origin y ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rx</parameter></term>
-    <listitem>
-     <simpara>
-      radius in x
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ry</parameter></term>
-    <listitem>
-     <simpara>
-      radius in y
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <simpara>
-      starting rotation in degrees
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>end</parameter></term>
-    <listitem>
-     <simpara>
-      ending rotation in degrees
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfillcolor.xml b/reference/gmagick/gmagickdraw/getfillcolor.xml
deleted file mode 100644
index 46e7b58b900f..000000000000
--- a/reference/gmagick/gmagickdraw/getfillcolor.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfillcolor">
- <refnamediv>
-  <refname>GmagickDraw::getfillcolor</refname>
-  <refpurpose>Returns the fill color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>GmagickDraw::getfillcolor</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the fill color used for drawing filled objects.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickPixel</classname> fill color used for drawing filled objects.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfillopacity.xml b/reference/gmagick/gmagickdraw/getfillopacity.xml
deleted file mode 100644
index 9cc182f19b30..000000000000
--- a/reference/gmagick/gmagickdraw/getfillopacity.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfillopacity">
- <refnamediv>
-  <refname>GmagickDraw::getfillopacity</refname>
-  <refpurpose>Returns the opacity used when drawing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>GmagickDraw::getfillopacity</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the opacity used when drawing
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the opacity used when drawing using the fill color or fill texture. Fully opaque is 1.0.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfont.xml b/reference/gmagick/gmagickdraw/getfont.xml
deleted file mode 100644
index 345c9c5b4c22..000000000000
--- a/reference/gmagick/gmagickdraw/getfont.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfont">
- <refnamediv>
-  <refname>GmagickDraw::getfont</refname>
-  <refpurpose>Returns the font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>GmagickDraw::getfont</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns a string specifying the font used when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string on success and &false; if no font is set.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfontsize.xml b/reference/gmagick/gmagickdraw/getfontsize.xml
deleted file mode 100644
index 2481e8a899c5..000000000000
--- a/reference/gmagick/gmagickdraw/getfontsize.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfontsize">
- <refnamediv>
-  <refname>GmagickDraw::getfontsize</refname>
-  <refpurpose>Returns the font pointsize</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>GmagickDraw::getfontsize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the font pointsize used when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the font size associated with the current
-   <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfontstyle.xml b/reference/gmagick/gmagickdraw/getfontstyle.xml
deleted file mode 100644
index 7418430b7aa2..000000000000
--- a/reference/gmagick/gmagickdraw/getfontstyle.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfontstyle">
- <refnamediv>
-  <refname>GmagickDraw::getfontstyle</refname>
-  <refpurpose>Returns the font style</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>GmagickDraw::getfontstyle</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the font style used when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the font style constant (STYLE_) associated with the
-   <classname>GmagickDraw</classname> object or <literal>0</literal> if no style
-   is set.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getfontweight.xml b/reference/gmagick/gmagickdraw/getfontweight.xml
deleted file mode 100644
index ff0095ac97e5..000000000000
--- a/reference/gmagick/gmagickdraw/getfontweight.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getfontweight">
- <refnamediv>
-  <refname>GmagickDraw::getfontweight</refname>
-  <refpurpose>Returns the font weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>GmagickDraw::getfontweight</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the font weight used when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an int on success and 0 if no weight is set.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getstrokecolor.xml b/reference/gmagick/gmagickdraw/getstrokecolor.xml
deleted file mode 100644
index 490d85c2c42d..000000000000
--- a/reference/gmagick/gmagickdraw/getstrokecolor.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getstrokecolor">
- <refnamediv>
-  <refname>GmagickDraw::getstrokecolor</refname>
-  <refpurpose>Returns the color used for stroking object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>GmagickDraw::getstrokecolor</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the color used for stroking object outlines.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <classname>GmagickPixel</classname> object which describes the color.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getstrokeopacity.xml b/reference/gmagick/gmagickdraw/getstrokeopacity.xml
deleted file mode 100644
index ffc414637e4d..000000000000
--- a/reference/gmagick/gmagickdraw/getstrokeopacity.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getstrokeopacity">
- <refnamediv>
-  <refname>GmagickDraw::getstrokeopacity</refname>
-  <refpurpose>Returns the opacity of stroked object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>GmagickDraw::getstrokeopacity</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the opacity of stroked object outlines.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>float</type> describing the opacity.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/getstrokewidth.xml b/reference/gmagick/gmagickdraw/getstrokewidth.xml
deleted file mode 100644
index 931108e586bb..000000000000
--- a/reference/gmagick/gmagickdraw/getstrokewidth.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.getstrokewidth">
- <refnamediv>
-  <refname>GmagickDraw::getstrokewidth</refname>
-  <refpurpose>Returns the width of the stroke used to draw object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>GmagickDraw::getstrokewidth</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the width of the stroke used to draw object outlines.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>float</type> describing the stroke width.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/gettextdecoration.xml b/reference/gmagick/gmagickdraw/gettextdecoration.xml
deleted file mode 100644
index f53643ee6d22..000000000000
--- a/reference/gmagick/gmagickdraw/gettextdecoration.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.gettextdecoration">
- <refnamediv>
-  <refname>GmagickDraw::gettextdecoration</refname>
-  <refpurpose>Returns the text decoration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>GmagickDraw::gettextdecoration</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the decoration applied when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns one of the DECORATION_ constants and 0 if no decoration is set.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/gettextencoding.xml b/reference/gmagick/gmagickdraw/gettextencoding.xml
deleted file mode 100644
index ce6ae0933729..000000000000
--- a/reference/gmagick/gmagickdraw/gettextencoding.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.gettextencoding">
- <refnamediv>
-  <refname>GmagickDraw::gettextencoding</refname>
-  <refpurpose>Returns the code set used for text annotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>GmagickDraw::gettextencoding</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns a string which specifies the code set used for text annotations.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string specifying the code set or &false; if text encoding is not set.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/line.xml b/reference/gmagick/gmagickdraw/line.xml
deleted file mode 100644
index 1edbafdd0efc..000000000000
--- a/reference/gmagick/gmagickdraw/line.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.line">
- <refnamediv>
-  <refname>GmagickDraw::line</refname>
-  <refpurpose>Draws a line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::line</methodname>
-   <methodparam><type>float</type><parameter>sx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sy</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ex</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ey</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a line on the image using the current stroke color, stroke opacity, and stroke width.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sx</parameter></term>
-    <listitem>
-     <simpara>
-      starting x ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sy</parameter></term>
-    <listitem>
-     <simpara>
-      starting y ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ex</parameter></term>
-    <listitem>
-     <simpara>
-      ending x ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ey</parameter></term>
-    <listitem>
-     <simpara>
-      ending y ordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/point.xml b/reference/gmagick/gmagickdraw/point.xml
deleted file mode 100644
index b3c237ee22c2..000000000000
--- a/reference/gmagick/gmagickdraw/point.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.point">
- <refnamediv>
-  <refname>GmagickDraw::point</refname>
-  <refpurpose>Draws a point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::point</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a point using the current stroke color and stroke thickness at the specified coordinates.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      target x coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      target y coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/polygon.xml b/reference/gmagick/gmagickdraw/polygon.xml
deleted file mode 100644
index 0360d59b480e..000000000000
--- a/reference/gmagick/gmagickdraw/polygon.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.polygon">
- <refnamediv>
-  <refname>GmagickDraw::polygon</refname>
-  <refpurpose>Draws a polygon</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::polygon</methodname>
-   <methodparam><type>array</type><parameter>coordinates</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a polygon using the current stroke, stroke width, and fill color or texture, using the specified array of coordinates.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>coordinates</parameter></term>
-    <listitem>
-     <simpara>
-      coordinate array
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/polyline.xml b/reference/gmagick/gmagickdraw/polyline.xml
deleted file mode 100644
index 9f50826b8d07..000000000000
--- a/reference/gmagick/gmagickdraw/polyline.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.polyline">
- <refnamediv>
-  <refname>GmagickDraw::polyline</refname>
-  <refpurpose>Draws a polyline</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::polyline</methodname>
-   <methodparam><type>array</type><parameter>coordinate_array</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a polyline using the current stroke, stroke width, and fill color or texture, using the specified array of coordinates.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>coordinate_array</parameter></term>
-    <listitem>
-     <simpara>
-      The array of coordinates
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/rectangle.xml b/reference/gmagick/gmagickdraw/rectangle.xml
deleted file mode 100644
index a18c8d179aa5..000000000000
--- a/reference/gmagick/gmagickdraw/rectangle.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.rectangle">
- <refnamediv>
-  <refname>GmagickDraw::rectangle</refname>
-  <refpurpose>Draws a rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::rectangle</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a rectangle given two coordinates and using the current stroke, stroke width, and fill settings.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x1</parameter></term>
-    <listitem>
-     <simpara>
-      x ordinate of first coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y1</parameter></term>
-    <listitem>
-     <simpara>
-      y ordinate of first coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x2</parameter></term>
-    <listitem>
-     <simpara>
-      x ordinate of second coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y2</parameter></term>
-    <listitem>
-     <simpara>
-      y ordinate of second coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/rotate.xml b/reference/gmagick/gmagickdraw/rotate.xml
deleted file mode 100644
index 5ccbfb4b931b..000000000000
--- a/reference/gmagick/gmagickdraw/rotate.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.rotate">
- <refnamediv>
-  <refname>GmagickDraw::rotate</refname>
-  <refpurpose>Applies the specified rotation to the current coordinate space</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::rotate</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Applies the specified rotation to the current coordinate space.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>degrees</parameter></term>
-    <listitem>
-     <simpara>
-      degrees of rotation
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
- </refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/roundrectangle.xml b/reference/gmagick/gmagickdraw/roundrectangle.xml
deleted file mode 100644
index cc3da39b946b..000000000000
--- a/reference/gmagick/gmagickdraw/roundrectangle.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.roundrectangle">
- <refnamediv>
-  <refname>GmagickDraw::roundrectangle</refname>
-  <refpurpose>Draws a rounded rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::roundrectangle</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ry</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Draws a rounded rectangle given two coordinates, x and y corner radiuses and using the current stroke, stroke width, and fill settings.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x1</parameter></term>
-    <listitem>
-     <simpara>
-      x ordinate of first coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y1</parameter></term>
-    <listitem>
-     <simpara>
-      y ordinate of first coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>x2</parameter></term>
-    <listitem>
-     <simpara>
-      x ordinate of second coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y2</parameter></term>
-    <listitem>
-     <simpara>
-      y ordinate of second coordinate
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rx</parameter></term>
-    <listitem>
-     <simpara>
-      radius of corner in horizontal direction
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ry</parameter></term>
-    <listitem>
-     <simpara>
-      radius of corner in vertical direction
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/scale.xml b/reference/gmagick/gmagickdraw/scale.xml
deleted file mode 100644
index 15a05e6bb0ac..000000000000
--- a/reference/gmagick/gmagickdraw/scale.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.scale">
- <refnamediv>
-  <refname>GmagickDraw::scale</refname>
-  <refpurpose>Adjusts the scaling factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::scale</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adjusts the scaling factor to apply in the horizontal and vertical directions to the current coordinate space.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <simpara>
-      horizontal scale factor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <simpara>
-      vertical scale factor
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
- </refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfillcolor.xml b/reference/gmagick/gmagickdraw/setfillcolor.xml
deleted file mode 100644
index b393ff5a69e5..000000000000
--- a/reference/gmagick/gmagickdraw/setfillcolor.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfillcolor">
- <refnamediv>
-  <refname>GmagickDraw::setfillcolor</refname>
-  <refpurpose>Sets the fill color to be used for drawing filled objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfillcolor</methodname>
-   <methodparam><type>mixed</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the fill color to be used for drawing filled objects.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      <classname>GmagickPixel</classname> or <type>string</type> indicating color to use for filling.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object on success.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfillopacity.xml b/reference/gmagick/gmagickdraw/setfillopacity.xml
deleted file mode 100644
index 29dfd3c5535d..000000000000
--- a/reference/gmagick/gmagickdraw/setfillopacity.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfillopacity">
- <refnamediv>
-  <refname>GmagickDraw::setfillopacity</refname>
-  <refpurpose>The setfillopacity purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfillopacity</methodname>
-   <methodparam><type>float</type><parameter>fill_opacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the opacity to use when drawing using the fill color or fill texture. Setting it to 1.0 will make
-   fill full opaque.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fill_opacity</parameter></term>
-    <listitem>
-     <simpara>
-      Fill opacity
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfont.xml b/reference/gmagick/gmagickdraw/setfont.xml
deleted file mode 100644
index 46518e15ea50..000000000000
--- a/reference/gmagick/gmagickdraw/setfont.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfont">
- <refnamediv>
-  <refname>GmagickDraw::setfont</refname>
-  <refpurpose>Sets the fully-specified font to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfont</methodname>
-   <methodparam><type>string</type><parameter>font</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the fully-specified font to use when annotating with text
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>font</parameter></term>
-    <listitem>
-     <simpara>
-      font name
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfontsize.xml b/reference/gmagick/gmagickdraw/setfontsize.xml
deleted file mode 100644
index e9b5c3936000..000000000000
--- a/reference/gmagick/gmagickdraw/setfontsize.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfontsize">
- <refnamediv>
-  <refname>GmagickDraw::setfontsize</refname>
-  <refpurpose>Sets the font pointsize to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfontsize</methodname>
-   <methodparam><type>float</type><parameter>pointsize</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the font pointsize to use when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pointsize</parameter></term>
-    <listitem>
-     <simpara>
-      Text pointsize
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfontstyle.xml b/reference/gmagick/gmagickdraw/setfontstyle.xml
deleted file mode 100644
index fd6ecddf9968..000000000000
--- a/reference/gmagick/gmagickdraw/setfontstyle.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfontstyle">
- <refnamediv>
-  <refname>GmagickDraw::setfontstyle</refname>
-  <refpurpose>Sets the font style to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfontstyle</methodname>
-   <methodparam><type>int</type><parameter>style</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the font style to use when annotating with text. The AnyStyle enumeration acts as a wild-card "don't care" option.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>style</parameter></term>
-    <listitem>
-     <simpara>
-      Font style (NormalStyle, ItalicStyle, ObliqueStyle, AnyStyle)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setfontweight.xml b/reference/gmagick/gmagickdraw/setfontweight.xml
deleted file mode 100644
index 5dac2cb8d88b..000000000000
--- a/reference/gmagick/gmagickdraw/setfontweight.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setfontweight">
- <refnamediv>
-  <refname>GmagickDraw::setfontweight</refname>
-  <refpurpose>Sets the font weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setfontweight</methodname>
-   <methodparam><type>int</type><parameter>weight</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Sets the font weight to use when annotating with text.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>weight</parameter></term>
-    <listitem>
-     <simpara>
-      Font weight (valid range 100-900)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setstrokecolor.xml b/reference/gmagick/gmagickdraw/setstrokecolor.xml
deleted file mode 100644
index 1dab04663b4d..000000000000
--- a/reference/gmagick/gmagickdraw/setstrokecolor.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setstrokecolor">
- <refnamediv>
-  <refname>GmagickDraw::setstrokecolor</refname>
-  <refpurpose>Sets the color used for stroking object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setstrokecolor</methodname>
-   <methodparam><type>mixed</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the color used for stroking object outlines.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      <classname>GmagickPixel</classname> or <type>string</type> representing the color for the stroke.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object on success.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setstrokeopacity.xml b/reference/gmagick/gmagickdraw/setstrokeopacity.xml
deleted file mode 100644
index ee96b9e57f61..000000000000
--- a/reference/gmagick/gmagickdraw/setstrokeopacity.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setstrokeopacity">
- <refnamediv>
-  <refname>GmagickDraw::setstrokeopacity</refname>
-  <refpurpose>Specifies the opacity of stroked object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setstrokeopacity</methodname>
-   <methodparam><type>float</type><parameter>stroke_opacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Specifies the opacity of stroked object outlines.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stroke_opacity</parameter></term>
-    <listitem>
-     <simpara>
-      Stroke opacity. The value 1.0 is opaque.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/setstrokewidth.xml b/reference/gmagick/gmagickdraw/setstrokewidth.xml
deleted file mode 100644
index cd1a8f9c71f2..000000000000
--- a/reference/gmagick/gmagickdraw/setstrokewidth.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.setstrokewidth">
- <refnamediv>
-  <refname>GmagickDraw::setstrokewidth</refname>
-  <refpurpose>Sets the width of the stroke used to draw object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::setstrokewidth</methodname>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the width of the stroke used to draw object outlines
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Stroke width
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/settextdecoration.xml b/reference/gmagick/gmagickdraw/settextdecoration.xml
deleted file mode 100644
index 86407e9084f3..000000000000
--- a/reference/gmagick/gmagickdraw/settextdecoration.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.settextdecoration">
- <refnamediv>
-  <refname>GmagickDraw::settextdecoration</refname>
-  <refpurpose>Specifies a decoration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::settextdecoration</methodname>
-   <methodparam><type>int</type><parameter>decoration</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Specifies a decoration to be applied when annotating with text.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>int</parameter></term>
-    <listitem>
-     <simpara>
-      Text decoration. One of NoDecoration, UnderlineDecoration, OverlineDecoration, or LineThroughDecoration
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickdraw/settextencoding.xml b/reference/gmagick/gmagickdraw/settextencoding.xml
deleted file mode 100644
index 082b662db5d1..000000000000
--- a/reference/gmagick/gmagickdraw/settextencoding.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickdraw.settextencoding">
- <refnamediv>
-  <refname>GmagickDraw::settextencoding</refname>
-  <refpurpose>Specifies the text code set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickDraw</type><methodname>GmagickDraw::settextencoding</methodname>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Specifies the code set to use for text annotations. The only character
-   encoding which may be specified at this time is "UTF-8" for representing Unicode as
-   a sequence of bytes. Specify an empty string to set text encoding to the system's default.
-   Successful text annotation using Unicode may require fonts designed to support Unicode.
-  </simpara>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>encoding</parameter></term>
-    <listitem>
-     <simpara>
-      Character string specifying text encoding
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickDraw</classname> object.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickexception.xml b/reference/gmagick/gmagickexception.xml
deleted file mode 100644
index d8c92f502b7c..000000000000
--- a/reference/gmagick/gmagickexception.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gmagickexception" role="class">
-
- <title>The GmagickException class</title>
- <titleabbrev>GmagickException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GmagickException intro -->
-  <section xml:id="gmagickexception.intro">
-   &reftitle.intro;
-   <simpara>
-    GmagickException class
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gmagickexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>GmagickException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>GmagickException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
-</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/gmagick/gmagickpixel.xml b/reference/gmagick/gmagickpixel.xml
deleted file mode 100644
index d9dc28a1bf54..000000000000
--- a/reference/gmagick/gmagickpixel.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gmagickpixel" role="class">
-
- <title>The GmagickPixel class</title>
- <titleabbrev>GmagickPixel</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GmagickPixel intro -->
-  <section xml:id="gmagickpixel.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gmagickpixel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>GmagickPixel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>GmagickPixel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.gmagickpixel')/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.gmagickpixel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.gmagick.entities.gmagickpixel;
-
-</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/gmagick/gmagickpixel/construct.xml b/reference/gmagick/gmagickpixel/construct.xml
deleted file mode 100644
index 2a83a6490a0a..000000000000
--- a/reference/gmagick/gmagickpixel/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.construct">
- <refnamediv>
-  <refname>GmagickPixel::__construct</refname>
-  <refpurpose>The GmagickPixel constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>GmagickPixel::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>color</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs an <classname>GmagickPixel</classname> object. If a color is specified, the object is constructed and then initialised with that color before being returned.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The optional color string to use as the initial value of this object.
-     </simpara>
-    </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/gmagick/gmagickpixel/getcolor.xml b/reference/gmagick/gmagickpixel/getcolor.xml
deleted file mode 100644
index f8dd10dd90e8..000000000000
--- a/reference/gmagick/gmagickpixel/getcolor.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.getcolor">
- <refnamediv>
-  <refname>GmagickPixel::getcolor</refname>
-  <refpurpose>Returns the color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>GmagickPixel::getcolor</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>as_array</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>normalize_array</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>as_array</parameter></term>
-    <listitem>
-     <simpara>
-      &true; to indicate return of <type>array</type> instead of <type>string</type>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>normalize_array</parameter></term>
-    <listitem>
-     <simpara>
-      &true; to normalize the color values.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <type>string</type> or an <type>array</type> of channel values, each normalized if &true; is given as <parameter>normalize_array</parameter>. Throws <classname>GmagickPixelException</classname> on error.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickpixel/getcolorcount.xml b/reference/gmagick/gmagickpixel/getcolorcount.xml
deleted file mode 100644
index 8b91218075b8..000000000000
--- a/reference/gmagick/gmagickpixel/getcolorcount.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.getcolorcount">
- <refnamediv>
-  <refname>GmagickPixel::getcolorcount</refname>
-  <refpurpose>Returns the color count associated with this color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>GmagickPixel::getcolorcount</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the color count associated with this color.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the color count as an integer on success, throws <classname>GmagickPixelException</classname> on failure.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickpixel/getcolorvalue.xml b/reference/gmagick/gmagickpixel/getcolorvalue.xml
deleted file mode 100644
index 152398985ce6..000000000000
--- a/reference/gmagick/gmagickpixel/getcolorvalue.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.getcolorvalue">
- <refnamediv>
-  <refname>GmagickPixel::getcolorvalue</refname>
-  <refpurpose>Gets the normalized value of the provided color channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>GmagickPixel::getcolorvalue</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the value of the color channel specified, as a floating-point number between 0 and 1.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The channel to check, specified as one of the Gmagick channel constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The value of the channel, as a normalized floating-point number, throwing <classname>GmagickPixelException</classname> on error.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickpixel/setcolor.xml b/reference/gmagick/gmagickpixel/setcolor.xml
deleted file mode 100644
index ca9430aa2591..000000000000
--- a/reference/gmagick/gmagickpixel/setcolor.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.setcolor">
- <refnamediv>
-  <refname>GmagickPixel::setcolor</refname>
-  <refpurpose>Sets the color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>GmagickPixel::setcolor</methodname>
-   <methodparam><type>string</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      The color definition to use in order to initialise the <classname>GmagickPixel</classname> object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickPixel</classname> object.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickpixel/setcolorvalue.xml b/reference/gmagick/gmagickpixel/setcolorvalue.xml
deleted file mode 100644
index 0b7d3c4997f2..000000000000
--- a/reference/gmagick/gmagickpixel/setcolorvalue.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagickpixel.setcolorvalue">
- <refnamediv>
-  <refname>GmagickPixel::setcolorvalue</refname>
-  <refpurpose>Sets the normalized value of one of the channels</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>GmagickPixel</type><methodname>GmagickPixel::setcolorvalue</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <simpara>
-      One of the Gmagick channel color constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to set this channel to, ranging from 0 to 1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>GmagickPixel</classname> object.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/gmagick/gmagickpixelexception.xml b/reference/gmagick/gmagickpixelexception.xml
deleted file mode 100644
index ef6d9e0196ac..000000000000
--- a/reference/gmagick/gmagickpixelexception.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.gmagickpixelexception" role="class">
-
- <title>The GmagickPixelException class</title>
- <titleabbrev>GmagickPixelException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ GmagickPixelException intro -->
-  <section xml:id="gmagickpixelexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="gmagickpixelexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>GmagickPixelException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>GmagickPixelException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <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>
-
-
- </partintro>
-
-</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/gmagick/setup.xml b/reference/gmagick/setup.xml
deleted file mode 100644
index 8ac88075f3c6..000000000000
--- a/reference/gmagick/setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gmagick.setup">
- &reftitle.setup;
-
- <section xml:id="gmagick.requirements">
-  &reftitle.required;
-  <simpara>
-   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
-   website. To read about the difference between ImageMagick and GraphicsMagick,
-   check the <link xlink:href="&url.gmagick.imagemagickdiff.faq;">FAQ</link>.
- </simpara>
- </section>
-
-<!-- {{{ Installation -->
- <section xml:id="gmagick.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;gmagick">&url.pecl.package;gmagick</link>.
-  </simpara>
-  <note>
-   <simpara>The official name of this extension is <emphasis>gmagick</emphasis>.</simpara>
-  </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/gmagick/versions.xml b/reference/gmagick/versions.xml
deleted file mode 100644
index a817beda1b9a..000000000000
--- a/reference/gmagick/versions.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
-
- <function name='gmagickexception' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::__clone' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::__construct' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::getmessage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::getcode' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::getfile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::getline' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::gettrace' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::gettraceasstring' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickexception::__tostring' from='PECL gmagick &gt;= Unknown'/>
-
- <function name='gmagickpixelexception' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::__clone' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::__construct' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::getmessage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::getcode' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::getfile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::getline' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::gettrace' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::gettraceasstring' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixelexception::__tostring' from='PECL gmagick &gt;= Unknown'/>
-
- <function name='gmagick' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::__construct' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::readimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::writeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::resizeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::thumbnailimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::clear' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::cropimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::cropthumbnailimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::compositeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::drawimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::annotateimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::blurimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::addimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::addnoiseimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::borderimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::charcoalimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::chopimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::commentimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::current' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::cyclecolormapimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::deconstructimages' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::despeckleimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::destroy' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::edgeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::embossimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::enhanceimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::equalizeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::flipimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::flopimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::frameimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::gammaimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getcopyright' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getfilename' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagebackgroundcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagebackgroundcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageblueprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagebordercolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagechanneldepth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageblueprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagebordercolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagechanneldepth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagecolorspace' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagecolorspace' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagecolors' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagecompose' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagedelay' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagedepth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagecompose' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagedelay' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagedepth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagedispose' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagedispose' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setfilename' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageextrema' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagefilename' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagefilename' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageformat' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageformat' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagegamma' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagegamma' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagegreenprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagegreenprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageheight' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagehistogram' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageindex' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageindex' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageinterlacescheme' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageinterlacescheme' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageiterations' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagematte' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagemattecolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageprofile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageredprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagerenderingintent' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageresolution' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagescene' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagesignature' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagetype' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageiterations' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageprofile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageredprimary' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagerenderingintent' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageresolution' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagescene' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagetype' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimageunits' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagewhitepoint' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getimagewidth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getpackagename' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getquantumdepth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getreleasedate' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getsamplingfactors' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getsize' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimageunits' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setimagewhitepoint' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setsamplingfactors' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::setsize' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::getversion' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::hasnextimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::haspreviousimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::implodeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::labelimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::levelimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::magnifyimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::mapimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::medianfilterimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::minifyimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::modulateimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::motionblurimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::nextimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::newimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::normalizeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::oilpaintimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::previousimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::profileimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::quantizeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::quantizeimages' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::queryfontmetrics' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::queryfonts' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::queryformats' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::radialblurimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::raiseimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::readimageblob' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::readimagefile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::reducenoiseimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::removeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::removeimageprofile' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::resampleimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::rollimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::rotateimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::scaleimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::separateimagechannel' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::shearimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::solarizeimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::spreadimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::stripimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::swirlimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::trimimage' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::read' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagick::write' from='PECL gmagick &gt;= Unknown'/>
-
- <function name='gmagickdraw' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setstrokecolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setstrokewidth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfillcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::ellipse' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::annotate' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::arc' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::bezier' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfillcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfillopacity' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfont' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfontsize' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfontstyle' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getfontweight' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getstrokeopacity' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getstrokecolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::getstrokewidth' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::gettextdecoration' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::gettextencoding' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::line' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::point' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::polygon' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::polyline' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::rectangle' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::rotate' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::roundrectangle' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::scale' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfillopacity' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfont' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfontsize' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfontstyle' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setfontweight' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::setstrokeopacity' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::settextdecoration' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickdraw::settextencoding' from='PECL gmagick &gt;= Unknown'/>
-
- <function name='gmagickpixel' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::__construct' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::setcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::getcolor' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::getcolorcount' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::getcolorvalue' from='PECL gmagick &gt;= Unknown'/>
- <function name='gmagickpixel::setcolorvalue' from='PECL gmagick &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/gnupg/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/gnupg/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/gnupg/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/gnupg/book.xml b/reference/gnupg/book.xml
deleted file mode 100644
index 86530def27d7..000000000000
--- a/reference/gnupg/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.gnupg">
- <?phpdoc extension-membership="pecl" ?>
- <title>GNU Privacy Guard</title>
- <titleabbrev>GnuPG</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.gnupg">
-  &reftitle.intro;
-  <simpara>
-   This module allows you to interact with <link xlink:href="&url.gnupg;">gnupg</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.gnupg.setup;
- &reference.gnupg.constants;
- &reference.gnupg.examples;
- <!-- FIXME: Looks like this extension defines a class.. -->
- &reference.gnupg.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/gnupg/configure.xml b/reference/gnupg/configure.xml
deleted file mode 100644
index da5a8727e194..000000000000
--- a/reference/gnupg/configure.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gnupg.installation">
- &reftitle.install;
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;gnupg"/>.
- </simpara>
-</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/gnupg/constants.xml b/reference/gnupg/constants.xml
deleted file mode 100644
index ab33d1c86a2b..000000000000
--- a/reference/gnupg/constants.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id='gnupg.constants' xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- <variablelist>
-  <varlistentry xml:id="constant.gnupg-sig-mode-normal">
-   <term>
-    <constant>GNUPG_SIG_MODE_NORMAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sig-mode-detach">
-   <term>
-    <constant>GNUPG_SIG_MODE_DETACH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sig-mode-clear">
-   <term>
-    <constant>GNUPG_SIG_MODE_CLEAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-unknown">
-   <term>
-    <constant>GNUPG_VALIDITY_UNKNOWN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-undefined">
-   <term>
-    <constant>GNUPG_VALIDITY_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-never">
-   <term>
-    <constant>GNUPG_VALIDITY_NEVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-marginal">
-   <term>
-    <constant>GNUPG_VALIDITY_MARGINAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-full">
-   <term>
-    <constant>GNUPG_VALIDITY_FULL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-validity-ultimate">
-   <term>
-    <constant>GNUPG_VALIDITY_ULTIMATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-protocol-openpgp">
-   <term>
-    <constant>GNUPG_PROTOCOL_OpenPGP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-protocol-cms">
-   <term>
-    <constant>GNUPG_PROTOCOL_CMS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-valid">
-   <term>
-    <constant>GNUPG_SIGSUM_VALID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-green">
-   <term>
-    <constant>GNUPG_SIGSUM_GREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-red">
-   <term>
-    <constant>GNUPG_SIGSUM_RED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-key-revoked">
-   <term>
-    <constant>GNUPG_SIGSUM_KEY_REVOKED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-key-expired">
-   <term>
-    <constant>GNUPG_SIGSUM_KEY_EXPIRED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-key-missing">
-   <term>
-    <constant>GNUPG_SIGSUM_KEY_MISSING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-sig-expired">
-   <term>
-    <constant>GNUPG_SIGSUM_SIG_EXPIRED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-crl-missing">
-   <term>
-    <constant>GNUPG_SIGSUM_CRL_MISSING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-crl-too-old">
-   <term>
-    <constant>GNUPG_SIGSUM_CRL_TOO_OLD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-bad-policy">
-   <term>
-    <constant>GNUPG_SIGSUM_BAD_POLICY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-sigsum-sys-error">
-   <term>
-    <constant>GNUPG_SIGSUM_SYS_ERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-error-warning">
-   <term>
-    <constant>GNUPG_ERROR_WARNING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-error-exception">
-   <term>
-    <constant>GNUPG_ERROR_EXCEPTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.gnupg-error-silent">
-   <term>
-    <constant>GNUPG_ERROR_SILENT</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/gnupg/examples.xml b/reference/gnupg/examples.xml
deleted file mode 100644
index f4bb8009b36c..000000000000
--- a/reference/gnupg/examples.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gnupg.examples">
- &reftitle.examples;
- <section xml:id="gnupg.examples-clearsign">
-  <title>Clearsign text</title>
-  <simpara>
-   This example will clearsign a given text.
-  </simpara>
-  <example>
-   <title>gnupg clearsign example (procedural)</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// init gnupg
-$res = gnupg_init();
-// not really needed. Clearsign is default
-gnupg_setsignmode($res,GNUPG_SIG_MODE_CLEAR);
-// add key with passphrase 'test' for signing
-gnupg_addsignkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-// sign
-$signed = gnupg_sign($res,"just a test");
-echo $signed;
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>gnupg clearsign example (OO)</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// new class
-$gnupg = new gnupg();
-// not really needed. Clearsign is default
-$gnupg->setsignmode(gnupg::SIG_MODE_CLEAR);
-// add key with passphrase 'test' for signing
-$gnupg->addsignkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-// sign
-$signed = $gnupg->sign("just a test");
-echo $signed;
-?>
-]]>
-   </programlisting>
-  </example>
-  <example xml:id="gnupg.keylistiterator">
-   <title>keylistiterator</title>
-   <simpara>
-    This extension also comes with an Iterator for your keyring.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// create a new iterator for listing all public keys that matches 'example'
-$iterator = new gnupg_keylistiterator("example");
-foreach($iterator as $fingerprint => $userid){
-    echo $fingerprint." -> ".$userid."\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </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/gnupg/functions/gnupg-adddecryptkey.xml b/reference/gnupg/functions/gnupg-adddecryptkey.xml
deleted file mode 100644
index b2d47e115b40..000000000000
--- a/reference/gnupg/functions/gnupg-adddecryptkey.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-adddecryptkey">
- <refnamediv>
-  <refname>gnupg_adddecryptkey</refname>
-  <refpurpose>Add a key for decryption</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_adddecryptkey</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fingerprint</parameter></methodparam>
-   <methodparam><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fingerprint</parameter></term>
-    <listitem>
-     &gnupg.fingerprint;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passphrase</parameter></term>
-    <listitem>
-     <simpara>
-      The pass phrase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_adddecryptkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_adddecryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_adddecryptkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->adddecryptkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-?>
-]]>
-    </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/gnupg/functions/gnupg-addencryptkey.xml b/reference/gnupg/functions/gnupg-addencryptkey.xml
deleted file mode 100644
index 1ac416a7bc1d..000000000000
--- a/reference/gnupg/functions/gnupg-addencryptkey.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-addencryptkey">
- <refnamediv>
-  <refname>gnupg_addencryptkey</refname>
-  <refpurpose>Add a key for encryption</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_addencryptkey</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fingerprint</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fingerprint</parameter></term>
-    <listitem>
-     &gnupg.fingerprint;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_addencryptkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_addencryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC");
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_addencryptkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->addencryptkey("8660281B6051D071D94B5B230549F9DC851566DC");
-?>
-]]>
-    </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/gnupg/functions/gnupg-addsignkey.xml b/reference/gnupg/functions/gnupg-addsignkey.xml
deleted file mode 100644
index 4f0c88bb3698..000000000000
--- a/reference/gnupg/functions/gnupg-addsignkey.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-addsignkey">
- <refnamediv>
-  <refname>gnupg_addsignkey</refname>
-  <refpurpose>Add a key for signing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_addsignkey</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fingerprint</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fingerprint</parameter></term>
-    <listitem>
-     &gnupg.fingerprint;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passphrase</parameter></term>
-    <listitem>
-     <simpara>
-      The pass phrase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_addsignkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_addsignkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_addsignkey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->addsignkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-?>
-]]>
-    </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/gnupg/functions/gnupg-cleardecryptkeys.xml b/reference/gnupg/functions/gnupg-cleardecryptkeys.xml
deleted file mode 100644
index 8f2ef52c5687..000000000000
--- a/reference/gnupg/functions/gnupg-cleardecryptkeys.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-cleardecryptkeys">
- <refnamediv>
-  <refname>gnupg_cleardecryptkeys</refname>
-  <refpurpose>Removes all keys which were set for decryption before</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_cleardecryptkeys</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_cleardecryptkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_cleardecryptkeys($res);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_cleardecryptkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->cleardecryptkeys();
-?>
-]]>
-    </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/gnupg/functions/gnupg-clearencryptkeys.xml b/reference/gnupg/functions/gnupg-clearencryptkeys.xml
deleted file mode 100644
index 75535be8025f..000000000000
--- a/reference/gnupg/functions/gnupg-clearencryptkeys.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-clearencryptkeys">
- <refnamediv>
-  <refname>gnupg_clearencryptkeys</refname>
-  <refpurpose>Removes all keys which were set for encryption before</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_clearencryptkeys</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_clearencryptkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_clearencryptkeys($res);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_clearencryptkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->clearencryptkeys();
-?>
-]]>
-    </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/gnupg/functions/gnupg-clearsignkeys.xml b/reference/gnupg/functions/gnupg-clearsignkeys.xml
deleted file mode 100644
index 74bfbd2721fe..000000000000
--- a/reference/gnupg/functions/gnupg-clearsignkeys.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-clearsignkeys">
- <refnamediv>
-  <refname>gnupg_clearsignkeys</refname>
-  <refpurpose>Removes all keys which were set for signing before</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_clearsignkeys</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_clearsignkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_clearsignkeys($res);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_clearsignkeys</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->clearsignkeys();
-?>
-]]>
-    </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/gnupg/functions/gnupg-decrypt.xml b/reference/gnupg/functions/gnupg-decrypt.xml
deleted file mode 100644
index 9bb803c9de05..000000000000
--- a/reference/gnupg/functions/gnupg-decrypt.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-decrypt">
- <refnamediv>
-  <refname>gnupg_decrypt</refname>
-  <refpurpose>Decrypts a given text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_decrypt</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decrypts the given text with the keys, which were set with <link linkend="function.gnupg-adddecryptkey">gnupg_adddecryptkey</link> before.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      The text being decrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns the decrypted text.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_decrypt</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_adddecryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-$plain = gnupg_decrypt($res,$encrypted_text);
-echo $plain;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_decrypt</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->adddecryptkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-$plain = $gpg->decrypt($encrypted_text);
-echo $plain;
-?>
-]]>
-    </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/gnupg/functions/gnupg-decryptverify.xml b/reference/gnupg/functions/gnupg-decryptverify.xml
deleted file mode 100644
index 70f7bfe9f361..000000000000
--- a/reference/gnupg/functions/gnupg-decryptverify.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-decryptverify">
- <refnamediv>
-  <refname>gnupg_decryptverify</refname>
-  <refpurpose>Decrypts and verifies a given text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>gnupg_decryptverify</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">plaintext</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decrypts and verifies a given text and returns information about the
-   signature.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      The text being decrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>plaintext</parameter></term>
-    <listitem>
-     <simpara>
-      The parameter <parameter>plaintext</parameter> gets filled with the decrypted
-      text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns information about the signature and
-   fills the <parameter>plaintext</parameter> parameter with the decrypted text.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_decryptverify</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$plaintext = "";
-$res = gnupg_init();
-gnupg_adddecryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-$info = gnupg_decryptverify($res,$text,$plaintext);
-print_r($info);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_decryptverify</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$plaintext = "";
-$gpg = new gnupg();
-$gpg->adddecryptkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-$info = $gpg->decryptverify($text,$plaintext);
-print_r($info);
-?>
-]]>
-    </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/gnupg/functions/gnupg-deletekey.xml b/reference/gnupg/functions/gnupg-deletekey.xml
deleted file mode 100644
index 646a565cd994..000000000000
--- a/reference/gnupg/functions/gnupg-deletekey.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-deletekey">
- <refnamediv>
-  <refname>gnupg_deletekey</refname>
-  <refpurpose>Delete a key from the keyring</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_deletekey</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>allow_secret</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>allow_secret</parameter></term>
-    <listitem>
-     <simpara>
-      It specifies whether to delete secret keys as well.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_deletekey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_deletekey($res, "8660281B6051D071D94B5B230549F9DC851566DC");
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_deletekey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->deletekey("8660281B6051D071D94B5B230549F9DC851566DC");
-?>
-]]>
-    </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/gnupg/functions/gnupg-encrypt.xml b/reference/gnupg/functions/gnupg-encrypt.xml
deleted file mode 100644
index 9f58145b5b9d..000000000000
--- a/reference/gnupg/functions/gnupg-encrypt.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-encrypt">
- <refnamediv>
-  <refname>gnupg_encrypt</refname>
-  <refpurpose>Encrypts a given text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_encrypt</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>plaintext</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encrypts the given <parameter>plaintext</parameter> with the keys, which
-   were set with <link linkend="function.gnupg-addencryptkey">gnupg_addencryptkey</link> before and
-   returns the encrypted text.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>plaintext</parameter></term>
-    <listitem>
-     <simpara>
-      The text being encrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    On success, this function returns the encrypted text.
-    On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_encrypt</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_addencryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC");
-$enc = gnupg_encrypt($res, "just a test");
-echo $enc;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_encrypt</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->addencryptkey("8660281B6051D071D94B5B230549F9DC851566DC");
-$enc = $gpg->encrypt("just a test");
-echo $enc;
-?>
-]]>
-    </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/gnupg/functions/gnupg-encryptsign.xml b/reference/gnupg/functions/gnupg-encryptsign.xml
deleted file mode 100644
index 5b5c5a3e18bc..000000000000
--- a/reference/gnupg/functions/gnupg-encryptsign.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-encryptsign">
- <refnamediv>
-  <refname>gnupg_encryptsign</refname>
-  <refpurpose>Encrypts and signs a given text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_encryptsign</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>plaintext</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encrypts and signs the given <parameter>plaintext</parameter> with the
-   keys, which were set with
-   <link linkend="function.gnupg-addsignkey">gnupg_addsignkey</link> and <link linkend="function.gnupg-addencryptkey">gnupg_addencryptkey</link> before and
-   returns the encrypted and signed text.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>plaintext</parameter></term>
-    <listitem>
-     <simpara>
-      The text being encrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns the encrypted and signed text.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_encryptsign</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_addencryptkey($res,"8660281B6051D071D94B5B230549F9DC851566DC");
-gnupg_addsignkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-$enc = gnupg_encryptsign($res, "just a test");
-echo $enc;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_encryptsign</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->addencryptkey("8660281B6051D071D94B5B230549F9DC851566DC");
-$gpg->addsignkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-$enc = $gpg->encryptsign("just a test");
-echo $enc;
-?>
-]]>
-    </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/gnupg/functions/gnupg-export.xml b/reference/gnupg/functions/gnupg-export.xml
deleted file mode 100644
index eafa00809120..000000000000
--- a/reference/gnupg/functions/gnupg-export.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.gnupg-export">
- <refnamediv>
-  <refname>gnupg_export</refname>
-  <refpurpose>Exports a key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_export</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fingerprint</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Exports the key <parameter>fingerprint</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fingerprint</parameter></term>
-    <listitem>
-     &gnupg.fingerprint;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns the keydata.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_export</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-$export = gnupg_export($res,"8660281B6051D071D94B5B230549F9DC851566DC");
-echo $export;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_export</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$export = $gpg->export("8660281B6051D071D94B5B230549F9DC851566DC");
-?>
-]]>
-    </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/gnupg/functions/gnupg-getengineinfo.xml b/reference/gnupg/functions/gnupg-getengineinfo.xml
deleted file mode 100644
index c7803bd6362c..000000000000
--- a/reference/gnupg/functions/gnupg-getengineinfo.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-getengineinfo">
- <refnamediv>
-  <refname>gnupg_getengineinfo</refname>
-  <refpurpose>Returns the engine info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>gnupg_getengineinfo</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with engine info consisting of <literal>protocol</literal>,
-   <literal>file_name</literal> and <literal>home_dir</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_getengineinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-print_r(gnupg_getengineinfo($res));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  ["protocol"]=>
-  int(0)
-  ["file_name"]=>
-  string(12) "/usr/bin/gpg"
-  ["home_dir"]=>
-  string(0) ""
-}
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>OO <function>gnupg_getengineinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg(["file_name" => "/usr/bin/gpg2", "home_dir" => "/var/www/.gnupg"]);
-print_r($gpg->getengineinfo());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(3) {
-  ["protocol"]=>
-  int(0)
-  ["file_name"]=>
-  string(13) "/usr/bin/gpg2"
-  ["home_dir"]=>
-  string(15) "/var/www/.gnupg"
-}
-]]>
-    </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/gnupg/functions/gnupg-geterror.xml b/reference/gnupg/functions/gnupg-geterror.xml
deleted file mode 100644
index e0601eca2763..000000000000
--- a/reference/gnupg/functions/gnupg-geterror.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-geterror">
- <refnamediv>
-  <refname>gnupg_geterror</refname>
-  <refpurpose>Returns the errortext, if a function fails</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_geterror</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an errortext, if an error has occurred, otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_geterror</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-echo gnupg_geterror($res);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_geterror</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-echo $gpg->geterror();
-?>
-]]>
-    </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/gnupg/functions/gnupg-geterrorinfo.xml b/reference/gnupg/functions/gnupg-geterrorinfo.xml
deleted file mode 100644
index 2c81250b1e96..000000000000
--- a/reference/gnupg/functions/gnupg-geterrorinfo.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-geterrorinfo">
- <refnamediv>
-  <refname>gnupg_geterrorinfo</refname>
-  <refpurpose>Returns the error info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>gnupg_geterrorinfo</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with error info.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_geterrorinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-// this is called without any error
-print_r(gnupg_geterrorinfo($res));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  ["generic_message"]=>
-  bool(false)
-  ["gpgme_code"]=>
-  int(0)
-  ["gpgme_source"]=>
-  string(18) "Unspecified source"
-  ["gpgme_message"]=>
-  string(7) "Success"
-}
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>OO <function>gnupg_geterrorinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-// error call
-$gpg->decrypt('abc');
-// error info should be displayed
-print_r($gpg->geterrorinfo());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) {
-  ["generic_message"]=>
-  string(14) "decrypt failed"
-  ["gpgme_code"]=>
-  int(117440570)
-  ["gpgme_source"]=>
-  string(5) "GPGME"
-  ["gpgme_message"]=>
-  string(7) "No data"
-}
-]]>
-    </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/gnupg/functions/gnupg-getprotocol.xml b/reference/gnupg/functions/gnupg-getprotocol.xml
deleted file mode 100644
index 3c2bbaa3ebc7..000000000000
--- a/reference/gnupg/functions/gnupg-getprotocol.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-getprotocol">
- <refnamediv>
-  <refname>gnupg_getprotocol</refname>
-  <refpurpose>Returns the currently active protocol for all operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>gnupg_getprotocol</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the currently active protocol, which can be one of
-   <constant>GNUPG_PROTOCOL_OpenPGP</constant> or
-   <constant>GNUPG_PROTOCOL_CMS</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_getprotocol</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-echo gnupg_getprotocol($res);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_getprotocol</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-echo $gpg->getprotocol();
-?>
-]]>
-    </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/gnupg/functions/gnupg-gettrustlist.xml b/reference/gnupg/functions/gnupg-gettrustlist.xml
deleted file mode 100644
index d1b6d4c0aac2..000000000000
--- a/reference/gnupg/functions/gnupg-gettrustlist.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.gnupg-gettrustlist">
- <refnamediv>
-  <refname>gnupg_gettrustlist</refname>
-  <refpurpose>Search the trust items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>gnupg_gettrustlist</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <simpara>
-      Expression to limit the list of trust items to only the ones matching the pattern.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns an array of trust items.
-   On failure, this function returns &null;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_gettrustlist</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-$items = gnupg_gettrustlist($res);
-print_r($items);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_gettrustlist</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$items = $gpg->gettrustlist();
-print_r($items);
-?>
-]]>
-    </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/gnupg/functions/gnupg-import.xml b/reference/gnupg/functions/gnupg-import.xml
deleted file mode 100644
index 89b8eadea278..000000000000
--- a/reference/gnupg/functions/gnupg-import.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-import">
- <refnamediv>
-  <refname>gnupg_import</refname>
-  <refpurpose>Imports a key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>gnupg_import</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>keydata</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Imports the key <parameter>keydata</parameter> and returns an array with
-   information about the importprocess.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>keydata</parameter></term>
-    <listitem>
-     <simpara>
-      The data key that is being imported.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns and info-array about the importprocess.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_import</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-$info = gnupg_import($res,$keydata);
-print_r($info);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_import</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$info = $gpg->import($keydata);
-print_r($info);
-?>
-]]>
-    </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/gnupg/functions/gnupg-init.xml b/reference/gnupg/functions/gnupg-init.xml
deleted file mode 100644
index 89f1b4743e7f..000000000000
--- a/reference/gnupg/functions/gnupg-init.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-init">
- <refnamediv>
-  <refname>gnupg_init</refname>
-  <refpurpose>Initialize a connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>gnupg_init</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      Must be an associative array. It is used to change the default configuration
-      of the crypto engine.
-      <table>
-       <title>Configuration overrides</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>key</entry>
-          <entry>type</entry>
-          <entry>description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>file_name</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           It is the file name of the executable program implementing this protocol
-           which is usually path of the <literal>gpg</literal> executable.
-          </entry>
-         </row>
-         <row>
-          <entry>home_dir</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           It is the directory name of the configuration directory. It also overrides
-           <literal>GNUPGHOME</literal> environment variable that is used for the same
-           purpose.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A GnuPG <type>resource</type> connection used by other GnuPG functions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL gnupg 1.5.0</entry>
-      <entry>The <parameter>options</parameter> parameter was added.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_init</function> example with default setting</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Procedural <function>gnupg_init</function> example with overridden file name and home dir</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init(["file_name" => "/usr/bin/gpg2", "home_dir" => "/var/www/.gnupg"]);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO gnupg initializer example with default setting</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO gnupg initializer example with overridden file name and home dir</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg(["file_name" => "/usr/bin/gpg2", "home_dir" => "/var/www/.gnupg"]);
-?>
-]]>
-    </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/gnupg/functions/gnupg-keyinfo.xml b/reference/gnupg/functions/gnupg-keyinfo.xml
deleted file mode 100644
index c88ad09856f5..000000000000
--- a/reference/gnupg/functions/gnupg-keyinfo.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.gnupg-keyinfo">
- <refnamediv>
-  <refname>gnupg_keyinfo</refname>
-  <refpurpose>Returns an array with information about all keys that matches the given pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>gnupg_keyinfo</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <simpara>
-      The pattern being checked against the keys.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with information about all keys that matches the given
-   pattern or &false;, if an error has occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_keyinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-$info = gnupg_keyinfo($res, 'test');
-print_r($info);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_keyinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$info = $gpg->keyinfo("test");
-print_r($info);
-?>
-]]>
-    </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/gnupg/functions/gnupg-listsignatures.xml b/reference/gnupg/functions/gnupg-listsignatures.xml
deleted file mode 100644
index 841a091d8132..000000000000
--- a/reference/gnupg/functions/gnupg-listsignatures.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.gnupg-listsignatures">
- <refnamediv>
-  <refname>gnupg_listsignatures</refname>
-  <refpurpose>List key signatures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>gnupg_listsignatures</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>keyid</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>keyid</parameter></term>
-    <listitem>
-     <simpara>
-      The key ID to list signatures for.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns an array of key signatures.
-   On failure, this function returns &null;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_listsignatures</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-$signatures = gnupg_listsignatures($res, "8660281B6051D071D94B5B230549F9DC851566DC");
-print_r($signatures);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_listsignatures</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$signatures = $gpg->listsignatures("8660281B6051D071D94B5B230549F9DC851566DC");
-print_r($signatures);
-?>
-]]>
-    </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/gnupg/functions/gnupg-setarmor.xml b/reference/gnupg/functions/gnupg-setarmor.xml
deleted file mode 100644
index 9a40675d5db8..000000000000
--- a/reference/gnupg/functions/gnupg-setarmor.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-setarmor">
- <refnamediv>
-  <refname>gnupg_setarmor</refname>
-  <refpurpose>Toggle armored output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_setarmor</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>armor</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Toggle the armored output.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>armor</parameter></term>
-    <listitem>
-     <simpara>
-      Pass a non-zero integer-value to this function to enable armored-output
-      (default).
-      Pass 0 to disable armored output.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_setarmor</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_setarmor($res,1); // enable armored output;
-gnupg_setarmor($res,0); // disable armored output;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_setarmor</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->setarmor(1); // enable armored output;
-$gpg->setarmor(0); // disable armored output;
-?>
-]]>
-    </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/gnupg/functions/gnupg-seterrormode.xml b/reference/gnupg/functions/gnupg-seterrormode.xml
deleted file mode 100644
index 161b6c9abb25..000000000000
--- a/reference/gnupg/functions/gnupg-seterrormode.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-seterrormode">
- <refnamediv>
-  <refname>gnupg_seterrormode</refname>
-  <refpurpose>Sets the mode for error_reporting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>gnupg_seterrormode</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>errormode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the mode for <link linkend="ini.error-reporting">error_reporting</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>errormode</parameter></term>
-    <listitem>
-     <simpara>
-      The error mode.
-     </simpara>
-     <simpara>
-      <parameter>errormode</parameter> takes a constant indicating what type of
-      error_reporting should be used. The possible values are
-      <constant>GNUPG_ERROR_WARNING</constant>,
-      <constant>GNUPG_ERROR_EXCEPTION</constant> and
-      <constant>GNUPG_ERROR_SILENT</constant>.
-      By default <constant>GNUPG_ERROR_SILENT</constant> is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_seterrormode</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_seterrormode($res,GNUPG_ERROR_WARNING); // raise a PHP-Warning in case of an error
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_seterrormode</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->seterrormode(gnupg::ERROR_EXCEPTION); // throw an exception in case of an error
-?>
-]]>
-    </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/gnupg/functions/gnupg-setsignmode.xml b/reference/gnupg/functions/gnupg-setsignmode.xml
deleted file mode 100644
index 4adb594e6f34..000000000000
--- a/reference/gnupg/functions/gnupg-setsignmode.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-setsignmode">
- <refnamediv>
-  <refname>gnupg_setsignmode</refname>
-  <refpurpose>Sets the mode for signing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>gnupg_setsignmode</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>int</type><parameter>signmode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the mode for signing.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigmode</parameter></term>
-    <listitem>
-     <simpara>
-      The mode for signing.
-     </simpara>
-     <simpara>
-      <parameter>signmode</parameter> takes a constant indicating what type of
-      signature should be produced. The possible values are
-      <constant>GNUPG_SIG_MODE_NORMAL</constant>,
-      <constant>GNUPG_SIG_MODE_DETACH</constant> and
-      <constant>GNUPG_SIG_MODE_CLEAR</constant>.
-      By default <constant>GNUPG_SIG_MODE_CLEAR</constant> is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_setsignmode</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_setsignmode($res,GNUPG_SIG_MODE_DETACH); // produce a detached signature
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_setsignmode</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->setsignmode(gnupg::SIG_MODE_DETACH); // produce a detached signature
-?>
-]]>
-    </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/gnupg/functions/gnupg-sign.xml b/reference/gnupg/functions/gnupg-sign.xml
deleted file mode 100644
index d0e637ce1066..000000000000
--- a/reference/gnupg/functions/gnupg-sign.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-sign">
- <refnamediv>
-  <refname>gnupg_sign</refname>
-  <refpurpose>Signs a given text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>gnupg_sign</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>plaintext</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Signs the given <parameter>plaintext</parameter> with the keys, which were
-   set with <link linkend="function.gnupg-addsignkey">gnupg_addsignkey</link> before and
-   returns the signed text or the signature, depending on what was set with
-   <link linkend="function.gnupg-setsignmode">gnupg_setsignmode</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>plaintext</parameter></term>
-    <listitem>
-     <simpara>
-      The plain text being signed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns the signed text or the signature.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_sign</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$res = gnupg_init();
-gnupg_addsignkey($res,"8660281B6051D071D94B5B230549F9DC851566DC","test");
-$signed = gnupg_sign($res, "just a test");
-echo $signed;
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_sign</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$gpg = new gnupg();
-$gpg->addsignkey("8660281B6051D071D94B5B230549F9DC851566DC","test");
-$signed = $gpg->sign("just a test");
-echo $signed;
-?>
-]]>
-    </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/gnupg/functions/gnupg-verify.xml b/reference/gnupg/functions/gnupg-verify.xml
deleted file mode 100644
index 649bae3f959f..000000000000
--- a/reference/gnupg/functions/gnupg-verify.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.gnupg-verify">
- <refnamediv>
-  <refname>gnupg_verify</refname>
-  <refpurpose>Verifies a signed text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>gnupg_verify</methodname>
-   <methodparam><type>resource</type><parameter>identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signed_text</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signature</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">plaintext</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Verifies the given <parameter>signed_text</parameter> and returns information about the
-   signature.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     &gnupg.identifier;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signed_text</parameter></term>
-    <listitem>
-     <simpara>
-      The signed text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signature</parameter></term>
-    <listitem>
-     <simpara>
-      The signature.
-      To verify a clearsigned text, set signature to &false;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>plaintext</parameter></term>
-    <listitem>
-     <simpara>
-      The plain text.
-      If this optional parameter is passed, it is
-      filled with the plain text.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   On success, this function returns information about the signature.
-   On failure, this function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Procedural <function>gnupg_verify</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$plaintext = "";
-$res = gnupg_init();
-// clearsigned
-$info = gnupg_verify($res,$signed_text,false,$plaintext);
-print_r($info);
-// detached signature
-$info = gnupg_verify($res,$signed_text,$signature);
-print_r($info);
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>OO <function>gnupg_verify</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$plaintext = "";
-$gpg = new gnupg();
-// clearsigned
-$info = $gpg->verify($signed_text,false,$plaintext);
-print_r($info);
-// detached signature
-$info = $gpg->verify($signed_text,$signature);
-print_r($info);
-?>
-]]>
-    </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/gnupg/reference.xml b/reference/gnupg/reference.xml
deleted file mode 100644
index 5d2f98800f23..000000000000
--- a/reference/gnupg/reference.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ref.gnupg">
- <title>GnuPG &Functions;</title>
-
- <partintro>
-   &reftitle.notes;
-   <simpara>
-    This extension makes use of the keyring of the current user. This keyring
-    is normally located in ~/.gnupg/.
-    To specify a custom location, store the path to the keyring in the
-    environment variable GNUPGHOME. See <link linkend="function.putenv">putenv</link> for more information how to do
-    this.
-   </simpara>
-   <simpara>
-    Some functions require the specification of a key. This specification can
-    be anything that refers to a unique key (userid, key-id, fingerprint,
-    ...).
-    This documentation uses the fingerprint in all examples.
-   </simpara>
-   <note>
-    <simpara>
-     As alternative to the explicitly documented functions using
-     <type>resource</type>s, you can also use an object-oriented style using
-     <classname>gnupg</classname> objects.
-    </simpara>
-   </note>
-  </partintro>
-
- &reference.gnupg.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/gnupg/setup.xml b/reference/gnupg/setup.xml
deleted file mode 100644
index 9fd7bbbe41ed..000000000000
--- a/reference/gnupg/setup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="gnupg.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="gnupg.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires the <link xlink:href="&url.gpgme;">gpgme library</link>
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.gnupg.configure;
- <!-- }}} -->
-
-</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/gnupg/versions.xml b/reference/gnupg/versions.xml
deleted file mode 100644
index 5ff143d464b2..000000000000
--- a/reference/gnupg/versions.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='gnupg_adddecryptkey' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_addencryptkey' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_addsignkey' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_cleardecryptkeys' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_clearencryptkey' from='PECL gnupg &lt;= 0.4'/>
- <function name='gnupg_clearencryptkeys' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_clearsignkeys' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_clearsignerkey' from='PECL gnupg &lt;= 0.4'/>
- <function name='gnupg_clearsignerkeys' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_construct' from='PECL gnupg 0.1'/>
- <function name='gnupg_decrypt' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_decryptverify' from='PECL gnupg &gt;= 0.2'/>
- <function name='gnupg_deletekey' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_encrypt' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_encryptsign' from='PECL gnupg &gt;= 0.2'/>
- <function name='gnupg_export' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_getengineinfo' from='PECL gnupg &gt;= 1.5'/>
- <function name='gnupg_geterror' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_geterrorinfo' from='PECL gnupg &gt;= 1.5'/>
- <function name='gnupg_getprotocol' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_gettrustlist' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_import' from='PECL gnupg &gt;= 0.3'/>
- <function name='gnupg_init' from='PECL gnupg &gt;= 0.4'/>
- <function name='gnupg_keyinfo' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_listsignatures' from='PECL gnupg &gt;= 0.5'/>
- <function name='gnupg_setarmor' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_setencryptkey' from='PECL gnupg &lt;= &lt;= 0.4'/>
- <function name='gnupg_seterrormode' from='PECL gnupg &gt;= 0.6'/>
- <function name='gnupg_setpassphrase' from='PECL gnupg &lt;= 0.4'/>
- <function name='gnupg_setsignerkey' from='PECL gnupg &lt;= 0.4'/>
- <function name='gnupg_setsignmode' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_sign' from='PECL gnupg &gt;= 0.1'/>
- <function name='gnupg_verify' from='PECL gnupg &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
--->
diff --git a/reference/hrtime/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/hrtime/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/hrtime/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/hrtime/book.xml b/reference/hrtime/book.xml
deleted file mode 100644
index 3c319c60980d..000000000000
--- a/reference/hrtime/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.hrtime">
- <?phpdoc extension-membership="pecl" ?>
- <title>High resolution timing</title>
- <titleabbrev>HRTime</titleabbrev>
-
- <preface xml:id="intro.hrtime">
-  &reftitle.intro;
-  <simpara>
-The HRTime extension implements a high resolution StopWatch class. It uses the
-best possible APIs on different platforms which brings resolution up to nanoseconds. It also makes possible to implement
-a custom stopwatch using low level ticks delivered by the underlying APIs.
-  </simpara>
-  <note>
-   <simpara>
-    As of PHP 7.3.0 the related function <function>hrtime</function> is part of
-    the core.
-   </simpara>
-  </note>
- </preface>
-
- &reference.hrtime.setup;
- &reference.hrtime.examples;
- &reference.hrtime.hrtime.performancecounter;
- &reference.hrtime.hrtime.stopwatch;
- &reference.hrtime.hrtime.unit;
-
-</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/hrtime/configure.xml b/reference/hrtime/configure.xml
deleted file mode 100644
index 19498e05ce62..000000000000
--- a/reference/hrtime/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime.installation">
- &reftitle.install;
-
- <simpara>
-  Use <option role="configure">--with-hrtime[=DIR]</option> when compiling PHP.
- </simpara>
-
- <simpara>
-  Windows users should include <filename>php_hrtime.dll</filename> into &php.ini;
- </simpara>
-
-</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/hrtime/examples.xml b/reference/hrtime/examples.xml
deleted file mode 100644
index a2e5e49a3834..000000000000
--- a/reference/hrtime/examples.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xml:id="hrtime.examples">
- &reftitle.examples;
- <section xml:id="hrtime.example.basic">
-  <title>Basic usage</title>
-  <simpara>
-   The example illustrates the basic StopWatch class usage
-  </simpara>
-  <example>
-   <title>Measure several code blocks execution and get the total</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$c = new HRTime\StopWatch;
-
-$c->start();
-/* measure this code block execution */
-for ($i = 0; $i < 1024*1024; $i++);
-$c->stop();
-$elapsed0 = $c->getLastElapsedTime(HRTime\Unit::NANOSECOND);
-
-/* measurement is not running here*/
-for ($i = 0; $i < 1024*1024; $i++);
-
-$c->start();
-/* measure this code block execution */
-for ($i = 0; $i < 1024*1024; $i++);
-$c->stop();
-$elapsed1 = $c->getLastElapsedTime(HRTime\Unit::NANOSECOND);
-
-$elapsed_total = $c->getElapsedTime(HRTime\Unit::NANOSECOND);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </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/hrtime/hrtime-performancecounter/getfrequency.xml b/reference/hrtime/hrtime-performancecounter/getfrequency.xml
deleted file mode 100644
index 4af08af21ba1..000000000000
--- a/reference/hrtime/hrtime-performancecounter/getfrequency.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-performancecounter.getfrequency">
- <refnamediv>
-  <refname>HRTime\PerformanceCounter::getFrequency</refname>
-  <refpurpose>Timer frequency in ticks per second</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-      <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>HRTime\PerformanceCounter::getFrequency</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Returns the timer frequency in ticks per second. This value is constant after
-the system start on almost any operating system.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &integer; indicating the timer frequency.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-performancecounter/getticks.xml b/reference/hrtime/hrtime-performancecounter/getticks.xml
deleted file mode 100644
index 97cc4167b1b9..000000000000
--- a/reference/hrtime/hrtime-performancecounter/getticks.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-performancecounter.getticks">
- <refnamediv>
-  <refname>HRTime\PerformanceCounter::getTicks</refname>
-  <refpurpose>Current ticks from the system</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>HRTime\PerformanceCounter::getTicks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the ticks count.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &integer; indicating the ticks count.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-performancecounter/gettickssince.xml b/reference/hrtime/hrtime-performancecounter/gettickssince.xml
deleted file mode 100644
index 98bf7b04eee8..000000000000
--- a/reference/hrtime/hrtime-performancecounter/gettickssince.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-performancecounter.gettickssince">
- <refnamediv>
-  <refname>HRTime\PerformanceCounter::getTicksSince</refname>
-  <refpurpose>Ticks elapsed since the given value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>HRTime\PerformanceCounter::getTicksSince</methodname>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-Returns the ticks count elapsed since the given start value.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-    <varlistentry>
-     <term><parameter>start</parameter></term>
-      <listitem>
-       <simpara>
-        Starting ticks value.
-       </simpara>
-      </listitem>
-    </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &integer; indicating the ticks count.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/getelapsedticks.xml b/reference/hrtime/hrtime-stopwatch/getelapsedticks.xml
deleted file mode 100644
index 44b2fb23c0d5..000000000000
--- a/reference/hrtime/hrtime-stopwatch/getelapsedticks.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.getelapsedticks">
- <refnamediv>
-  <refname>HRTime\StopWatch::getElapsedTicks</refname>
-  <refpurpose>Get elapsed ticks for all intervals</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>HRTime\StopWatch::getElapsedTicks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Get elapsed ticks for all the previously closed intervals.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &integer; indicating elapsed ticks.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/getelapsedtime.xml b/reference/hrtime/hrtime-stopwatch/getelapsedtime.xml
deleted file mode 100644
index 4677d55b3b69..000000000000
--- a/reference/hrtime/hrtime-stopwatch/getelapsedtime.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.getelapsedtime">
- <refnamediv>
-  <refname>HRTime\StopWatch::getElapsedTime</refname>
-  <refpurpose>Get elapsed time for all intervals</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>HRTime\StopWatch::getElapsedTime</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>unit</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-Get elapsed time for all the previously closed intervals.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-    <varlistentry>
-     <term><parameter>unit</parameter></term>
-      <listitem>
-       <simpara>
-         Time unit represented by a HRTime\Unit constant. Default is
-         HRTime\Unit::SECOND.
-       </simpara>
-      </listitem>
-    </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &float; indicating elapsed time.
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/getlastelapsedticks.xml b/reference/hrtime/hrtime-stopwatch/getlastelapsedticks.xml
deleted file mode 100644
index f3e22f1923b4..000000000000
--- a/reference/hrtime/hrtime-stopwatch/getlastelapsedticks.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.getlastelapsedticks">
- <refnamediv>
-  <refname>HRTime\StopWatch::getLastElapsedTicks</refname>
-  <refpurpose>Get elapsed ticks for the last interval</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>HRTime\StopWatch::getLastElapsedTicks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Get elapsed ticks for the previously closed interval.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &integer; indicating elapsed ticks.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/getlastelapsedtime.xml b/reference/hrtime/hrtime-stopwatch/getlastelapsedtime.xml
deleted file mode 100644
index 18ea62044934..000000000000
--- a/reference/hrtime/hrtime-stopwatch/getlastelapsedtime.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.getlastelapsedtime">
- <refnamediv>
-  <refname>HRTime\StopWatch::getLastElapsedTime</refname>
-  <refpurpose>Get elapsed time for the last interval</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>HRTime\StopWatch::getLastElapsedTime</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>unit</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-Get elapsed time for the previously closed interval.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-    <varlistentry>
-     <term><parameter>unit</parameter></term>
-      <listitem>
-       <simpara>
-         Time unit represented by a HRTime\Unit constant. Default is
-         HRTime\Unit::SECOND.
-       </simpara>
-      </listitem>
-    </varlistentry>
-   </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &float; indicating elapsed time.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/isrunning.xml b/reference/hrtime/hrtime-stopwatch/isrunning.xml
deleted file mode 100644
index 1e3a3f7514af..000000000000
--- a/reference/hrtime/hrtime-stopwatch/isrunning.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.isrunning">
- <refnamediv>
-  <refname>HRTime\StopWatch::isRunning</refname>
-  <refpurpose>Whether the measurement is running</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>HRTime\StopWatch::isRunning</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Reveals whether the measurement was started.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns &boolean; indicating whether the measurement is running.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/start.xml b/reference/hrtime/hrtime-stopwatch/start.xml
deleted file mode 100644
index dfaec926b059..000000000000
--- a/reference/hrtime/hrtime-stopwatch/start.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.start">
- <refnamediv>
-  <refname>HRTime\StopWatch::start</refname>
-  <refpurpose>Start time measurement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>HRTime\StopWatch::start</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-Starts the time measurement. It has no effect if the measurement was already
-started. The measurement will be continued if it was previously stopped.
-
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns void.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime-stopwatch/stop.xml b/reference/hrtime/hrtime-stopwatch/stop.xml
deleted file mode 100644
index a22266433161..000000000000
--- a/reference/hrtime/hrtime-stopwatch/stop.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime-stopwatch.stop">
- <refnamediv>
-  <refname>HRTime\StopWatch::stop</refname>
-  <refpurpose>Stop time measurement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>HRTime\StopWatch::stop</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-Stop the time measurement for the previously started interval.
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  Returns void.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/hrtime/hrtime.performancecounter.xml b/reference/hrtime/hrtime.performancecounter.xml
deleted file mode 100644
index 6dd349d79e65..000000000000
--- a/reference/hrtime/hrtime.performancecounter.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.hrtime-performancecounter" role="class">
-
- <title>The HRTime\PerformanceCounter class</title>
- <titleabbrev>HRTime\PerformanceCounter</titleabbrev>
-
- <partintro>
-
-<!-- {{{ HRTime\PerformanceCounter intro -->
-  <section xml:id="hrtime-performancecounter.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="hrtime-performancecounter.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>HRTime\PerformanceCounter</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>HRTime\PerformanceCounter</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.hrtime-performancecounter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.hrtime.entities.hrtime-performancecounter;
-
-</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/hrtime/hrtime.stopwatch.xml b/reference/hrtime/hrtime.stopwatch.xml
deleted file mode 100644
index fa7cd3019ba9..000000000000
--- a/reference/hrtime/hrtime.stopwatch.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.hrtime-stopwatch" role="class">
-
- <title>The HRTime\StopWatch class</title>
- <titleabbrev>HRTime\StopWatch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ HRTime\StopWatch intro -->
-  <section xml:id="hrtime-stopwatch.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="hrtime-stopwatch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>HRTime\StopWatch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>HRTime\StopWatch</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>HRTime\PerformanceCounter</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.hrtime-stopwatch')/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.hrtime-performancecounter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.hrtime.entities.hrtime-stopwatch;
-
-</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/hrtime/hrtime.unit.xml b/reference/hrtime/hrtime.unit.xml
deleted file mode 100644
index 76126e5d0c8c..000000000000
--- a/reference/hrtime/hrtime.unit.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.hrtime-unit" role="class">
-
- <title>The HRTime\Unit class</title>
- <titleabbrev>HRTime\Unit</titleabbrev>
-
- <partintro>
-
-<!-- {{{ HRTime\Unit intro -->
-  <section xml:id="hrtime-unit.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="hrtime-unit.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>HRTime\Unit</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>HRTime\Unit</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="hrtime-unit.constants.second">HRTime\Unit::SECOND</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="hrtime-unit.constants.millisecond">HRTime\Unit::MILLISECOND</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="hrtime-unit.constants.microsecond">HRTime\Unit::MICROSECOND</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="hrtime-unit.constants.nanosecond">HRTime\Unit::NANOSECOND</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook)
-    xpointer(id('class.hrtime-unit')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"
-    />-->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ HRTime\Unit constants -->
-  <section xml:id="hrtime-unit.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="hrtime-unit.constants.second">
-     <term><constant>HRTime\Unit::SECOND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="hrtime-unit.constants.millisecond">
-     <term><constant>HRTime\Unit::MILLISECOND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="hrtime-unit.constants.microsecond">
-     <term><constant>HRTime\Unit::MICROSECOND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="hrtime-unit.constants.nanosecond">
-     <term><constant>HRTime\Unit::NANOSECOND</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- <!-- &reference.hrtime.entities.hrtime-unit; -->
-
-</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/hrtime/setup.xml b/reference/hrtime/setup.xml
deleted file mode 100644
index 96fa74d04f95..000000000000
--- a/reference/hrtime/setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="hrtime.setup">
- &reftitle.setup;
-
- <!--<section xml:id="hrtime.requirements">
-  &reftitle.required;
-  <para>
-
-  </para>
- </section>-->
-
- <section xml:id="hrtime.installation">
-  &reftitle.install;
-   <simpara>
-        &pecl.moved;
-   </simpara>
-   <simpara>
-     &pecl.info;
-   <link xlink:href="&url.pecl.package;hrtime">&url.pecl.package;hrtime</link>.
-   </simpara>
- </section>
-
- <!--<section xml:id="hrtime.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/hrtime/versions.xml b/reference/hrtime/versions.xml
deleted file mode 100644
index 3fdfe808cb2d..000000000000
--- a/reference/hrtime/versions.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='hrtime\performancecounter' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\performancecounter::getfrequency' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\performancecounter::getTicks' from='PECL hrtime &gt;= 0.6.0'/>
- <function name='hrtime\performancecounter::getTicksSince' from='PECL hrtime &gt;= 0.6.0'/>
-
- <function name='hrtime\stopwatch' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::getelapsedtime' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::getlastelapsedtime' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::start' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::stop' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::getelapsedticks' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::getlastelapsedticks' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::getfrequency' from='PECL hrtime &gt;= 0.4.3'/>
- <function name='hrtime\stopwatch::isrunning' from='PECL hrtime &gt;= 0.4.3'/>
-
- <function name='hrtime\unit' from='PECL hrtime &gt;= 0.4.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/ibase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ibase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ibase/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ibase/book.xml b/reference/ibase/book.xml
deleted file mode 100644
index e592cdfce6f4..000000000000
--- a/reference/ibase/book.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ibase">
- <?phpdoc extension-membership="pecl" ?>
- <title>Firebird/InterBase</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.ibase">
-  &reftitle.intro;
-  <warning>
-   <simpara>
-    &pecl.info.dead.git;
-    <link xlink:href="&url.php.git.mirror;pecl-database-interbase">&url.php.git.mirror;pecl-database-interbase</link>.
-   </simpara>
-  </warning>
-  <simpara>
-   Firebird is a relational database offering many ISO SQL-2003 features
-   that runs on Linux, Windows, and a variety of Unix platforms. Firebird
-   offers excellent concurrency, high performance, and powerful language
-   support for stored procedures and triggers. It has been used in production
-   systems, under a variety of names since 1981.
-  </simpara>
-  <simpara>
-   InterBase is the name of the closed-source variant of this RDBMS that
-   was developed by Embarcadero/Inprise. More information about InterBase is
-   available at <link xlink:href="&url.ibase;">&url.ibase;</link>.
-  </simpara>
-  <simpara>
-   Firebird is a commercially independent project (fundation) of C++ programmers,
-   technical advisors and supporters developing and enhancing a multi-platform
-   relational database management system based on the source code released by
-   Inprise Corp (now known as Embarcadero) under the InterBase
-   Public License v.1.0 on 25 July, 2000. More information about Firebird is
-   available at <link xlink:href="&url.firebird;">&url.firebird;</link>.
-  </simpara>
-  <note>
-   <simpara>
-    &pecl.moved-ver;7.4.0
-   </simpara>
-   <simpara>
-    This extension supports InterBase versions 6 and up and Firebird version 2.0 and up.
-   </simpara>
-  </note>
- </preface>
- <!-- }}} -->
-
- &reference.ibase.setup;
- &reference.ibase.constants;
- &reference.ibase.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/ibase/configure.xml b/reference/ibase/configure.xml
deleted file mode 100644
index 19fcd7813285..000000000000
--- a/reference/ibase/configure.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ibase.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved-ver;7.4.0
- </simpara>
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.git.hub;FirebirdSQL/php-firebird">&url.git.hub;FirebirdSQL/php-firebird</link>.
- </simpara>
- <simpara>
-  To enable Firebird/InterBase support configure PHP
-  <option role="configure">--with-interbase[=DIR]</option>, where DIR is the
-  Firebird/InterBase base install directory, which defaults to
-  <filename>/usr</filename>.
- </simpara>
- <note>
-  <title>Note to Win32/Win64 Users</title>
-  <simpara>
-   &ext.windows.path.dll;
-   <filename>fbclient.dll,gds32.dll</filename>
-  </simpara>
-  <para>
-   If you installed the Firebird/InterBase database server on the
-   same machine PHP is running on, you will have this DLL already and
-   <filename>fbclient.dll,gds32.dll</filename> (gds32.dll is generated from the installer for legacy applications) will already be in
-   the <envar>PATH</envar>.
-  </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/ibase/constants.xml b/reference/ibase/constants.xml
deleted file mode 100644
index 48e78a6bfce2..000000000000
--- a/reference/ibase/constants.xml
+++ /dev/null
@@ -1,624 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="ibase.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  The following constants can be passed to <function>ibase_trans</function>
-  to specify transaction behaviour.
-  <table>
-   <title>Firebird/InterBase transaction flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>IBASE_DEFAULT</entry>
-       <entry>
-       The default transaction settings are to be used. This default is
-       determined by the client library, which defines it as
-       IBASE_WRITE|IBASE_CONCURRENCY|IBASE_WAIT in most cases.</entry>
-      </row>
-      <row>
-       <entry>IBASE_READ</entry>
-       <entry>Starts a read-only transaction.</entry>
-      </row>
-      <row>
-       <entry>IBASE_WRITE</entry>
-       <entry>Starts a read-write transaction.</entry>
-      </row>
-      <row>
-       <entry>IBASE_CONSISTENCY</entry>
-       <entry>Starts a transaction with the isolation level set to
-       'consistency', which means the transaction cannot read from tables
-       that are being modified by other concurrent transactions.</entry>
-      </row>
-      <row>
-       <entry>IBASE_CONCURRENCY</entry>
-       <entry>Starts a transaction with the isolation level set to
-       'concurrency' (or 'snapshot'), which means the transaction 
-       has access to all tables, but cannot see changes that were committed
-       by other transactions after the transaction was started.</entry>
-      </row>
-      <row>
-       <entry>IBASE_COMMITTED</entry>
-       <entry>Starts a transaction with the isolation level set to
-       'read committed'. This flag should be combined with either
-       <constant>IBASE_REC_VERSION</constant> or 
-       <constant>IBASE_REC_NO_VERSION</constant>. This isolation level
-       allows access to changes that were committed after the transaction
-       was started. If <constant>IBASE_REC_NO_VERSION</constant> was
-       specified, only the latest version of a row can be read. If 
-       <constant>IBASE_REC_VERSION</constant> was specified, a row can
-       even be read when a modification to it is pending in a concurrent
-       transaction.
-      </entry>
-      </row>
-      <row>
-       <entry>IBASE_WAIT</entry>
-       <entry>Indicated that a transaction should wait and retry when a
-       conflict occurs.</entry>
-      </row>
-      <row>
-       <entry>IBASE_NOWAIT</entry>
-       <entry>Indicated that a transaction should fail immediately when a
-       conflict occurs.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-  </table>
- </para>
- 
- <para>
-  The following constants can be passed to <function>ibase_fetch_row</function>,
-  <function>ibase_fetch_assoc</function> or <function>ibase_fetch_object</function>
-  to specify fetch behaviour.
-  <table>
-   <title>Firebird/InterBase fetch flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>IBASE_FETCH_BLOBS</entry>
-       <entry>Also available as <constant>IBASE_TEXT</constant>for backward
-       compatibility. Causes BLOB contents to be fetched inline, instead of 
-       being fetched as BLOB identifiers.</entry>
-      </row>
-      <row>
-       <entry>IBASE_FETCH_ARRAYS</entry>
-       <entry>Causes arrays to be fetched inline. Otherwise, array
-       identifiers are returned. Array identifiers can only be used as
-       arguments to INSERT operations, as no functions to handle array
-       identifiers are currently available.
-       </entry>
-      </row>
-      <row>
-       <entry>IBASE_UNIXTIME</entry>
-       <entry>Causes date and time fields not to be returned as strings,
-       but as UNIX timestamps (the number of seconds since the epoch, which
-       is 1-Jan-1970 0:00 UTC). Might be problematic if used with dates
-       before 1970 on some systems.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-  </table>
- </para>
- <para>
-  The following constants are used to pass requests and options to the service
-  API functions (<function>ibase_server_info</function>, <function>ibase_db_info</function>,
-  <function>ibase_backup</function>, <function>ibase_restore</function>
-  and <function>ibase_maintain_db</function>). Please refer to
-  the Firebird/InterBase manuals for the meaning of these options.
-  <variablelist>
-   <varlistentry xml:id="constant.ibase-bkp-ignore-checksums">
-    <term>
-      <constant>IBASE_BKP_IGNORE_CHECKSUMS</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-ignore-limbo">
-    <term>
-      <constant>IBASE_BKP_IGNORE_LIMBO</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-metadata-only">
-    <term>
-      <constant>IBASE_BKP_METADATA_ONLY</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-no-garbage-collect">
-    <term>
-      <constant>IBASE_BKP_NO_GARBAGE_COLLECT</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-old-descriptions">
-    <term>
-      <constant>IBASE_BKP_OLD_DESCRIPTIONS</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-non-transportable">
-    <term>
-      <constant>IBASE_BKP_NON_TRANSPORTABLE</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-bkp-convert">
-    <term>
-      <constant>IBASE_BKP_CONVERT</constant>
-    </term>
-    <listitem>
-      <simpara>
-      Options to <function>ibase_backup</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-deactivate-idx">
-    <term>
-      <constant>IBASE_RES_DEACTIVATE_IDX</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-no-shadow">
-    <term>
-      <constant>IBASE_RES_NO_SHADOW</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-no-validity">
-    <term>
-      <constant>IBASE_RES_NO_VALIDITY</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-one-at-a-time">
-    <term>
-      <constant>IBASE_RES_ONE_AT_A_TIME</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-replace">
-    <term>
-      <constant>IBASE_RES_REPLACE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-create">
-    <term>
-      <constant>IBASE_RES_CREATE</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-res-use-all-space">
-    <term>
-      <constant>IBASE_RES_USE_ALL_SPACE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      Options to <function>ibase_restore</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-page-buffers">
-    <term>
-      <constant>IBASE_PRP_PAGE_BUFFERS</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-sweep-interval">
-    <term>
-      <constant>IBASE_PRP_SWEEP_INTERVAL</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-shutdown-db">
-    <term>
-      <constant>IBASE_PRP_SHUTDOWN_DB</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-deny-new-transactions">
-    <term>
-      <constant>IBASE_PRP_DENY_NEW_TRANSACTIONS</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-deny-new-attachments">
-    <term>
-      <constant>IBASE_PRP_DENY_NEW_ATTACHMENTS</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-reserve-space">
-    <term>
-      <constant>IBASE_PRP_RESERVE_SPACE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-res-use-full">
-    <term>
-      <constant>IBASE_PRP_RES_USE_FULL</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-res">
-    <term>
-      <constant>IBASE_PRP_RES</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-write-mode">
-    <term>
-      <constant>IBASE_PRP_WRITE_MODE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-wm-async">
-    <term>
-      <constant>IBASE_PRP_WM_ASYNC</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-wm-sync">
-    <term>
-      <constant>IBASE_PRP_WM_SYNC</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-access-mode">
-    <term>
-      <constant>IBASE_PRP_ACCESS_MODE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-am-readonly">
-    <term>
-      <constant>IBASE_PRP_AM_READONLY</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-am-readwrite">
-    <term>
-      <constant>IBASE_PRP_AM_READWRITE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-set-sql-dialect">
-    <term>
-      <constant>IBASE_PRP_SET_SQL_DIALECT</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-activate">
-    <term>
-      <constant>IBASE_PRP_ACTIVATE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-prp-db-online">
-    <term>
-      <constant>IBASE_PRP_DB_ONLINE</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-check-db">
-    <term>
-      <constant>IBASE_RPR_CHECK_DB</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-ignore-checksum">
-    <term>
-      <constant>IBASE_RPR_IGNORE_CHECKSUM</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-kill-shadows">
-    <term>
-      <constant>IBASE_RPR_KILL_SHADOWS</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-mend-db">
-    <term>
-      <constant>IBASE_RPR_MEND_DB</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-validate-db">
-    <term>
-      <constant>IBASE_RPR_VALIDATE_DB</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-full">
-    <term>
-      <constant>IBASE_RPR_FULL</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-rpr-sweep-db">
-    <term>
-      <constant>IBASE_RPR_SWEEP_DB</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_maintain_db</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-sts-data-pages">
-    <term>
-      <constant>IBASE_STS_DATA_PAGES</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-sts-db-log">
-    <term>
-      <constant>IBASE_STS_DB_LOG</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-sts-hdr-pages">
-    <term>
-      <constant>IBASE_STS_HDR_PAGES</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-sts-idx-pages">
-    <term>
-      <constant>IBASE_STS_IDX_PAGES</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-sts-sys-relations">
-    <term>
-      <constant>IBASE_STS_SYS_RELATIONS</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_db_info</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-server-version">
-    <term>
-      <constant>IBASE_SVC_SERVER_VERSION</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_server_info</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-implementation">
-    <term>
-      <constant>IBASE_SVC_IMPLEMENTATION</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_server_info</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-get-env">
-    <term>
-      <constant>IBASE_SVC_GET_ENV</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_server_info</function>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-get-env-lock">
-    <term>
-      <constant>IBASE_SVC_GET_ENV_LOCK</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-get-env-msg">
-    <term>
-      <constant>IBASE_SVC_GET_ENV_MSG</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-user-dbpath">
-    <term>
-      <constant>IBASE_SVC_USER_DBPATH</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-svr-db-info">
-    <term>
-      <constant>IBASE_SVC_SVR_DB_INFO</constant>
-    </term>
-    <listitem>
-      <simpara>
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.ibase-svc-get-users">
-    <term>
-      <constant>IBASE_SVC_GET_USERS</constant>
-    </term>
-    <listitem>
-      <simpara>
-       Options to <function>ibase_server_info</function>
-      </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/ibase/functions/fbird-add-user.xml b/reference/ibase/functions/fbird-add-user.xml
deleted file mode 100644
index e557d491e5b3..000000000000
--- a/reference/ibase/functions/fbird-add-user.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-add-user">
- <refnamediv>
-  <refname>fbird_add_user</refname>
-  <refpurpose>&Alias; <function>ibase_add_user</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_add_user</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_modify_user</function></member>
-   <member><function>fbird_delete_user</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/ibase/functions/fbird-affected-rows.xml b/reference/ibase/functions/fbird-affected-rows.xml
deleted file mode 100644
index 2a1c12b41bff..000000000000
--- a/reference/ibase/functions/fbird-affected-rows.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-affected-rows">
- <refnamediv>
-  <refname>fbird_affected_rows</refname>
-  <refpurpose>&Alias; <function>ibase_affected_rows</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_affected_rows</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_query</function></member>
-   <member><function>fbird_execute</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/ibase/functions/fbird-backup.xml b/reference/ibase/functions/fbird-backup.xml
deleted file mode 100644
index 2f19b6abff9a..000000000000
--- a/reference/ibase/functions/fbird-backup.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-backup">
- <refnamediv>
-  <refname>fbird_backup</refname>
-  <refpurpose>&Alias; <function>ibase_backup</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_backup</function>.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-blob-add.xml b/reference/ibase/functions/fbird-blob-add.xml
deleted file mode 100644
index cd1bd624e946..000000000000
--- a/reference/ibase/functions/fbird-blob-add.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-add">
- <refnamediv>
-  <refname>fbird_blob_add</refname>
-  <refpurpose>&Alias; <function>ibase_blob_add</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_add</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_cancel</function></member>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_create</function></member>
-   <member><function>fbird_blob_import</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/ibase/functions/fbird-blob-cancel.xml b/reference/ibase/functions/fbird-blob-cancel.xml
deleted file mode 100644
index 0fec00886695..000000000000
--- a/reference/ibase/functions/fbird-blob-cancel.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-cancel">
- <refnamediv>
-  <refname>fbird_blob_cancel</refname>
-  <refpurpose>Cancel creating blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>fbird_blob_cancel</methodname>
-   <methodparam><type>resource</type><parameter>blob_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function will discard a BLOB if it has not yet been closed by
-   <function>fbird_blob_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blob_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB handle opened with <function>fbird_blob_create</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_create</function></member>
-   <member><function>fbird_blob_import</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/ibase/functions/fbird-blob-close.xml b/reference/ibase/functions/fbird-blob-close.xml
deleted file mode 100644
index b7be15a06966..000000000000
--- a/reference/ibase/functions/fbird-blob-close.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-close">
- <refnamediv>
-  <refname>fbird_blob_close</refname>
-  <refpurpose>&Alias; <function>ibase_blob_close</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_create</function></member>
-   <member><function>fbird_blob_cancel</function></member>
-   <member><function>fbird_blob_open</function></member>
-   <member><function>fbird_blob_import</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/ibase/functions/fbird-blob-create.xml b/reference/ibase/functions/fbird-blob-create.xml
deleted file mode 100644
index ad4d6eeb401e..000000000000
--- a/reference/ibase/functions/fbird-blob-create.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-create">
- <refnamediv>
-  <refname>fbird_blob_create</refname>
-  <refpurpose>&Alias; <function>ibase_blob_create</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_create</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_add</function></member>
-   <member><function>fbird_blob_cancel</function></member>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_import</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/ibase/functions/fbird-blob-echo.xml b/reference/ibase/functions/fbird-blob-echo.xml
deleted file mode 100644
index 2d5f28a9ddc0..000000000000
--- a/reference/ibase/functions/fbird-blob-echo.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-echo">
- <refnamediv>
-  <refname>fbird_blob_echo</refname>
-  <refpurpose>&Alias; <function>ibase_blob_echo</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_echo</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_open</function></member>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_get</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/ibase/functions/fbird-blob-get.xml b/reference/ibase/functions/fbird-blob-get.xml
deleted file mode 100644
index bd266e5399c1..000000000000
--- a/reference/ibase/functions/fbird-blob-get.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-get">
- <refnamediv>
-  <refname>fbird_blob_get</refname>
-  <refpurpose>&Alias; <function>ibase_blob_get</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_get</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_open</function></member>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_echo</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/ibase/functions/fbird-blob-import.xml b/reference/ibase/functions/fbird-blob-import.xml
deleted file mode 100644
index 0bd8feedcbfd..000000000000
--- a/reference/ibase/functions/fbird-blob-import.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-import">
- <refnamediv>
-  <refname>fbird_blob_import</refname>
-  <refpurpose>&Alias; <function>ibase_blob_import</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_import</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_add</function></member>
-   <member><function>fbird_blob_cancel</function></member>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_create</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/ibase/functions/fbird-blob-info.xml b/reference/ibase/functions/fbird-blob-info.xml
deleted file mode 100644
index b97b635e4995..000000000000
--- a/reference/ibase/functions/fbird-blob-info.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id='function.fbird-blob-info'>
- <refnamediv>
-  <refname>fbird_blob_info</refname>
-  <refpurpose>&Alias; <function>ibase_blob_info</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_info</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-blob-open.xml b/reference/ibase/functions/fbird-blob-open.xml
deleted file mode 100644
index 088abe3a2a6c..000000000000
--- a/reference/ibase/functions/fbird-blob-open.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-blob-open">
- <refnamediv>
-  <refname>fbird_blob_open</refname>
-  <refpurpose>&Alias; <function>ibase_blob_open</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_blob_open</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_blob_close</function></member>
-   <member><function>fbird_blob_echo</function></member>
-   <member><function>fbird_blob_get</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/ibase/functions/fbird-close.xml b/reference/ibase/functions/fbird-close.xml
deleted file mode 100644
index 40d77f6fe1c3..000000000000
--- a/reference/ibase/functions/fbird-close.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-close">
- <refnamediv>
-  <refname>fbird_close</refname>
-  <refpurpose>&Alias; <function>ibase_close</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_connect</function></member>
-   <member><function>fbird_pconnect</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/ibase/functions/fbird-commit-ret.xml b/reference/ibase/functions/fbird-commit-ret.xml
deleted file mode 100644
index fc1582e0e2b2..000000000000
--- a/reference/ibase/functions/fbird-commit-ret.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-commit-ret">
- <refnamediv>
-  <refname>fbird_commit_ret</refname>
-  <refpurpose>&Alias; <function>ibase_commit_ret</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_commit_ret</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-commit.xml b/reference/ibase/functions/fbird-commit.xml
deleted file mode 100644
index 538fe6f74e30..000000000000
--- a/reference/ibase/functions/fbird-commit.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-commit">
- <refnamediv>
-  <refname>fbird_commit</refname>
-  <refpurpose>&Alias; <function>ibase_commit</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_commit</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-connect.xml b/reference/ibase/functions/fbird-connect.xml
deleted file mode 100644
index 2c9322a52907..000000000000
--- a/reference/ibase/functions/fbird-connect.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-connect">
- <refnamediv>
-  <refname>fbird_connect</refname>
-  <refpurpose>&Alias; <function>ibase_connect</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_connect</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_pconnect</function></member>
-   <member><function>fbird_close</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/ibase/functions/fbird-db-info.xml b/reference/ibase/functions/fbird-db-info.xml
deleted file mode 100644
index 7182d98904c7..000000000000
--- a/reference/ibase/functions/fbird-db-info.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-db-info">
- <refnamediv>
-  <refname>fbird_db_info</refname>
-  <refpurpose>&Alias; <function>ibase_db_info</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_db_info</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-delete-user.xml b/reference/ibase/functions/fbird-delete-user.xml
deleted file mode 100644
index 5581627a0dff..000000000000
--- a/reference/ibase/functions/fbird-delete-user.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-delete-user">
- <refnamediv>
-  <refname>fbird_delete_user</refname>
-  <refpurpose>&Alias; <function>ibase_delete_user</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_delete_user</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_add_user</function></member>
-   <member><function>fbird_modify_user</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/ibase/functions/fbird-drop-db.xml b/reference/ibase/functions/fbird-drop-db.xml
deleted file mode 100644
index 203ac7306a75..000000000000
--- a/reference/ibase/functions/fbird-drop-db.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-drop-db">
- <refnamediv>
-  <refname>fbird_drop_db</refname>
-  <refpurpose>&Alias; <function>ibase_drop_db</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_drop_db</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_connect</function></member>
-   <member><function>fbird_pconnect</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/ibase/functions/fbird-errcode.xml b/reference/ibase/functions/fbird-errcode.xml
deleted file mode 100644
index 3f75922a910f..000000000000
--- a/reference/ibase/functions/fbird-errcode.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-errcode">
- <refnamediv>
-  <refname>fbird_errcode</refname>
-  <refpurpose>&Alias; <function>ibase_errcode</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_errcode</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_errmsg</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/ibase/functions/fbird-errmsg.xml b/reference/ibase/functions/fbird-errmsg.xml
deleted file mode 100644
index ef7b1837e76f..000000000000
--- a/reference/ibase/functions/fbird-errmsg.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-errmsg">
- <refnamediv>
-  <refname>fbird_errmsg</refname>
-  <refpurpose>&Alias; <function>ibase_errmsg</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_errmsg</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_errcode</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/ibase/functions/fbird-execute.xml b/reference/ibase/functions/fbird-execute.xml
deleted file mode 100644
index a8bc7da9ef58..000000000000
--- a/reference/ibase/functions/fbird-execute.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-execute">
- <refnamediv>
-  <refname>fbird_execute</refname>
-  <refpurpose>&Alias; <function>ibase_execute</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_execute</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_query</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/ibase/functions/fbird-fetch-assoc.xml b/reference/ibase/functions/fbird-fetch-assoc.xml
deleted file mode 100644
index 3b5fa2c85b7c..000000000000
--- a/reference/ibase/functions/fbird-fetch-assoc.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-fetch-assoc">
- <refnamediv>
-  <refname>fbird_fetch_assoc</refname>
-  <refpurpose>&Alias; <function>ibase_fetch_assoc</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_fetch_assoc</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_fetch_row</function></member>
-   <member><function>fbird_fetch_object</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/ibase/functions/fbird-fetch-object.xml b/reference/ibase/functions/fbird-fetch-object.xml
deleted file mode 100644
index 853db71677f6..000000000000
--- a/reference/ibase/functions/fbird-fetch-object.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-fetch-object">
- <refnamediv>
-  <refname>fbird_fetch_object</refname>
-  <refpurpose>&Alias; <function>ibase_fetch_object</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_fetch_object</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_fetch_row</function></member>
-   <member><function>fbird_fetch_assoc</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/ibase/functions/fbird-fetch-row.xml b/reference/ibase/functions/fbird-fetch-row.xml
deleted file mode 100644
index e07fee1cb915..000000000000
--- a/reference/ibase/functions/fbird-fetch-row.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-fetch-row">
- <refnamediv>
-  <refname>fbird_fetch_row</refname>
-  <refpurpose>&Alias; <function>ibase_fetch_row</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_fetch_row</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_fetch_assoc</function></member>
-   <member><function>fbird_fetch_object</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/ibase/functions/fbird-field-info.xml b/reference/ibase/functions/fbird-field-info.xml
deleted file mode 100644
index 4eacec7afdfe..000000000000
--- a/reference/ibase/functions/fbird-field-info.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-field-info">
- <refnamediv>
-  <refname>fbird_field_info</refname>
- <refpurpose>&Alias; <function>ibase_field_info</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_field_info</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_num_fields</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/ibase/functions/fbird-free-event-handler.xml b/reference/ibase/functions/fbird-free-event-handler.xml
deleted file mode 100644
index 52d3448f23d4..000000000000
--- a/reference/ibase/functions/fbird-free-event-handler.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-free-event-handler">
- <refnamediv>
-  <refname>fbird_free_event_handler</refname>
-  <refpurpose>&Alias; <function>ibase_free_event_handler</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_free_event_handler</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_set_event_handler</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/ibase/functions/fbird-free-query.xml b/reference/ibase/functions/fbird-free-query.xml
deleted file mode 100644
index ec8795da2818..000000000000
--- a/reference/ibase/functions/fbird-free-query.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-free-query">
- <refnamediv>
-  <refname>fbird_free_query</refname>
-  <refpurpose>&Alias; <function>ibase_free_query</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_free_query</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-free-result.xml b/reference/ibase/functions/fbird-free-result.xml
deleted file mode 100644
index 12000886d66d..000000000000
--- a/reference/ibase/functions/fbird-free-result.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-free-result">
- <refnamediv>
-  <refname>fbird_free_result</refname>
-  <refpurpose>&Alias; <function>ibase_free_result</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_free_result</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-gen-id.xml b/reference/ibase/functions/fbird-gen-id.xml
deleted file mode 100644
index 618a9f1bcdfc..000000000000
--- a/reference/ibase/functions/fbird-gen-id.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-gen-id">
- <refnamediv>
-  <refname>fbird_gen_id</refname>
-  <refpurpose>&Alias; <function>ibase_gen_id</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_gen_id</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-maintain-db.xml b/reference/ibase/functions/fbird-maintain-db.xml
deleted file mode 100644
index c8c95c99598d..000000000000
--- a/reference/ibase/functions/fbird-maintain-db.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-maintain-db">
- <refnamediv>
-  <refname>fbird_maintain_db</refname>
-  <refpurpose>&Alias; <function>ibase_maintain_db</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_maintain_db</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-modify-user.xml b/reference/ibase/functions/fbird-modify-user.xml
deleted file mode 100644
index 9581be249c5c..000000000000
--- a/reference/ibase/functions/fbird-modify-user.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-modify-user">
- <refnamediv>
-  <refname>fbird_modify_user</refname>
-  <refpurpose>&Alias; <function>ibase_modify_user</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_modify_user</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_add_user</function></member>
-   <member><function>fbird_delete_user</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/ibase/functions/fbird-name-result.xml b/reference/ibase/functions/fbird-name-result.xml
deleted file mode 100644
index fe3d251225d7..000000000000
--- a/reference/ibase/functions/fbird-name-result.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-name-result">
- <refnamediv>
-  <refname>fbird_name_result</refname>
-  <refpurpose>&Alias; <function>ibase_name_result</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_name_result</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_prepare</function></member>
-   <member><function>fbird_execute</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/ibase/functions/fbird-num-fields.xml b/reference/ibase/functions/fbird-num-fields.xml
deleted file mode 100644
index 097b503fee9d..000000000000
--- a/reference/ibase/functions/fbird-num-fields.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-num-fields">
- <refnamediv>
-  <refname>fbird_num_fields</refname>
-  <refpurpose>&Alias; <function>ibase_num_fields</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_num_fields</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_field_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-num-params.xml b/reference/ibase/functions/fbird-num-params.xml
deleted file mode 100644
index 2cff671ab3f3..000000000000
--- a/reference/ibase/functions/fbird-num-params.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-num-params">
- <refnamediv>
-  <refname>fbird_num_params</refname>
-  <refpurpose>&Alias; <function>ibase_num_params</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_num_params</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_prepare</function></member>
-   <member><function>fbird_param_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-param-info.xml b/reference/ibase/functions/fbird-param-info.xml
deleted file mode 100644
index 98d9a47b9f15..000000000000
--- a/reference/ibase/functions/fbird-param-info.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-param-info">
- <refnamediv>
-  <refname>fbird_param_info</refname>
-  <refpurpose>&Alias; <function>ibase_param_info</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_param_info</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_field_info</function></member>
-   <member><function>fbird_num_params</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/ibase/functions/fbird-pconnect.xml b/reference/ibase/functions/fbird-pconnect.xml
deleted file mode 100644
index ef1313627439..000000000000
--- a/reference/ibase/functions/fbird-pconnect.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-pconnect">
- <refnamediv>
-  <refname>fbird_pconnect</refname>
-  <refpurpose>&Alias; <function>ibase_pconnect</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_pconnect</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_close</function></member>
-   <member><function>fbird_connect</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/ibase/functions/fbird-prepare.xml b/reference/ibase/functions/fbird-prepare.xml
deleted file mode 100644
index a112b24ab232..000000000000
--- a/reference/ibase/functions/fbird-prepare.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-prepare">
- <refnamediv>
-  <refname>fbird_prepare</refname>
-  <refpurpose>&Alias; <function>ibase_prepare</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_prepare</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-query.xml b/reference/ibase/functions/fbird-query.xml
deleted file mode 100644
index 0d1becea59be..000000000000
--- a/reference/ibase/functions/fbird-query.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-query">
- <refnamediv>
-  <refname>fbird_query</refname>
-  <refpurpose>&Alias; <function>ibase_query</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_query</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_errmsg</function></member>
-   <member><function>fbird_fetch_row</function></member>
-   <member><function>fbird_fetch_object</function></member>
-   <member><function>fbird_free_result</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/ibase/functions/fbird-restore.xml b/reference/ibase/functions/fbird-restore.xml
deleted file mode 100644
index 52c7d71ae153..000000000000
--- a/reference/ibase/functions/fbird-restore.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-restore">
- <refnamediv>
-  <refname>fbird_restore</refname>
- <refpurpose>&Alias; <function>ibase_restore</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_restore</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-rollback-ret.xml b/reference/ibase/functions/fbird-rollback-ret.xml
deleted file mode 100644
index a135dbc66cda..000000000000
--- a/reference/ibase/functions/fbird-rollback-ret.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-rollback-ret">
- <refnamediv>
-  <refname>fbird_rollback_ret</refname>
-  <refpurpose>&Alias; <function>ibase_rollback_ret</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_rollback_ret</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-rollback.xml b/reference/ibase/functions/fbird-rollback.xml
deleted file mode 100644
index 539091703efd..000000000000
--- a/reference/ibase/functions/fbird-rollback.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-rollback">
- <refnamediv>
-  <refname>fbird_rollback</refname>
-  <refpurpose>&Alias; <function>ibase_rollback</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_rollback</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-server-info.xml b/reference/ibase/functions/fbird-server-info.xml
deleted file mode 100644
index 8580bc372102..000000000000
--- a/reference/ibase/functions/fbird-server-info.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-server-info">
- <refnamediv>
-  <refname>fbird_server_info</refname>
-  <refpurpose>&Alias; <function>ibase_server_info</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_server_info</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-service-attach.xml b/reference/ibase/functions/fbird-service-attach.xml
deleted file mode 100644
index 49a9f8f57457..000000000000
--- a/reference/ibase/functions/fbird-service-attach.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-service-attach">
- <refnamediv>
-  <refname>fbird_service_attach</refname>
-  <refpurpose>&Alias; <function>ibase_service_attach</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_service_attach</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-service-detach.xml b/reference/ibase/functions/fbird-service-detach.xml
deleted file mode 100644
index 8996f1351de0..000000000000
--- a/reference/ibase/functions/fbird-service-detach.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-service-detach">
- <refnamediv>
-  <refname>fbird_service_detach</refname>
-  <refpurpose>&Alias; <function>ibase_service_detach</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_service_detach</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-set-event-handler.xml b/reference/ibase/functions/fbird-set-event-handler.xml
deleted file mode 100644
index 4c3cb000d185..000000000000
--- a/reference/ibase/functions/fbird-set-event-handler.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-set-event-handler">
- <refnamediv>
-  <refname>fbird_set_event_handler</refname>
-  <refpurpose>&Alias; <function>ibase_set_event_handler</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_set_event_handler</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_free_event_handler</function></member>
-   <member><function>fbird_wait_event</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/ibase/functions/fbird-trans.xml b/reference/ibase/functions/fbird-trans.xml
deleted file mode 100644
index 6993408337da..000000000000
--- a/reference/ibase/functions/fbird-trans.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-trans">
- <refnamediv>
-  <refname>fbird_trans</refname>
-  <refpurpose>&Alias; <function>ibase_trans</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_trans</function>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/fbird-wait-event.xml b/reference/ibase/functions/fbird-wait-event.xml
deleted file mode 100644
index c79246743b8d..000000000000
--- a/reference/ibase/functions/fbird-wait-event.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fbird-wait-event">
- <refnamediv>
-  <refname>fbird_wait_event</refname>
-  <refpurpose>&Alias; <function>ibase_wait_event</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>ibase_wait_event</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fbird_set_event_handler</function></member>
-   <member><function>fbird_free_event_handler</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/ibase/functions/ibase-add-user.xml b/reference/ibase/functions/ibase-add-user.xml
deleted file mode 100644
index 324dee01bf3f..000000000000
--- a/reference/ibase/functions/ibase-add-user.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-add-user">
- <refnamediv>
-  <refname>ibase_add_user</refname>
-  <refpurpose>Add a user to a security database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_add_user</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>first_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>middle_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>last_name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      The handle on the database server service.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_name</parameter></term>
-    <listitem>
-     <simpara>
-      The login name of the new database user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-     The password of the new user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>first_name</parameter></term>
-    <listitem>
-     <simpara>
-      The first name of the new database user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>middle_name</parameter></term>
-    <listitem>
-     <simpara>
-      The middle name of the new database user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>last_name</parameter></term>
-    <listitem>
-     <simpara>
-      The last name of the new database user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_modify_user</function></member>
-   <member><function>ibase_delete_user</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/ibase/functions/ibase-affected-rows.xml b/reference/ibase/functions/ibase-affected-rows.xml
deleted file mode 100644
index f2ee2b3cea8b..000000000000
--- a/reference/ibase/functions/ibase-affected-rows.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-affected-rows">
- <refnamediv>
-  <refname>ibase_affected_rows</refname>
-  <refpurpose>Return the number of rows that were affected by the previous query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ibase_affected_rows</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the number of rows that were affected by the
-   previous query (INSERT, UPDATE or DELETE) that was executed from within
-   the specified transaction context.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      A transaction context. If <parameter>link_identifier</parameter> is a
-      connection resource, its default transaction is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of rows as an integer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_query</function></member>
-   <member><function>ibase_execute</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/ibase/functions/ibase-backup.xml b/reference/ibase/functions/ibase-backup.xml
deleted file mode 100644
index a12ccbe1c63d..000000000000
--- a/reference/ibase/functions/ibase-backup.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-backup">
- <refnamediv>
-  <refname>ibase_backup</refname>
-  <refpurpose>Initiates a backup task in the service manager and returns immediately</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ibase_backup</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source_db</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest_file</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>verbose</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function passes the arguments to the (remote) database server. There it starts a new backup process. Therefore you
-   won't get any responses.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A previously opened connection to the database server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source_db</parameter></term>
-    <listitem>
-     <simpara>
-      The absolute file path to the database on the database server. You can also use a database alias.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dest_file</parameter></term>
-    <listitem>
-     <simpara>
-      The path to the backup file on the database server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      Additional options to pass to the database server for backup.
-      The <parameter>options</parameter> parameter can be a combination
-      of the following constants:
-      <constant>IBASE_BKP_IGNORE_CHECKSUMS</constant>,
-      <constant>IBASE_BKP_IGNORE_LIMBO</constant>,
-      <constant>IBASE_BKP_METADATA_ONLY</constant>,
-      <constant>IBASE_BKP_NO_GARBAGE_COLLECT</constant>,
-      <constant>IBASE_BKP_OLD_DESCRIPTIONS</constant>,
-      <constant>IBASE_BKP_NON_TRANSPORTABLE</constant> or
-      <constant>IBASE_BKP_CONVERT</constant>.
-      Read the section about <xref linkend="ibase.constants"/> for further information.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>verbose</parameter></term>
-    <listitem>
-     <simpara>
-      Since the backup process is done on the database server, you don't have any chance
-      to get its output. This argument is useless.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
-  <simpara>
-   Since the backup process is done on the (remote) server, this function just passes the arguments to it.
-   While the arguments are legal, you won't get &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_backup</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Attach to database server by ip address and port
-$service = ibase_service_attach ('10.1.11.200/3050', 'sysdba', 'masterkey');
-
-// Start the backup process on database server
-// Backup employee database using full path to /srv/backup/employees.fbk
-// Don't use any special arguments
-ibase_backup($service, '/srv/firebird/employees.fdb', '/srv/backup/employees.fbk');
-
-// Free the attached connection
-ibase_service_detach ($service);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>ibase_backup</function> example with arguments</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Attach to database server by name and default port
-$service = ibase_service_attach ('fb-server.contoso.local', 'sysdba', 'masterkey');
-
-// Start the backup process on database server
-// Backup employee database using alias to /srv/backup/employees.fbk.
-// Backup only the metadata. Don't create a transportable backup.
-ibase_backup($service, 'employees.fdb', '/srv/backup/employees.fbk', IBASE_BKP_METADATA_ONLY | IBASE_BKP_NON_TRANSPORTABLE);
-
-// Free the attached connection
-ibase_service_detach ($service);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_restore</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/ibase/functions/ibase-blob-add.xml b/reference/ibase/functions/ibase-blob-add.xml
deleted file mode 100644
index 135e22ffd60d..000000000000
--- a/reference/ibase/functions/ibase-blob-add.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-add">
- <refnamediv>
-  <refname>ibase_blob_add</refname>
-  <refpurpose>Add data into a newly created blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ibase_blob_add</methodname>
-   <methodparam><type>resource</type><parameter>blob_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>ibase_blob_add</function> adds data into a blob created with
-   <function>ibase_blob_create</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blob_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A blob handle opened with <function>ibase_blob_create</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The data to be added.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_cancel</function></member>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_create</function></member>
-   <member><function>ibase_blob_import</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/ibase/functions/ibase-blob-cancel.xml b/reference/ibase/functions/ibase-blob-cancel.xml
deleted file mode 100644
index 258a69be4702..000000000000
--- a/reference/ibase/functions/ibase-blob-cancel.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-cancel">
- <refnamediv>
-  <refname>ibase_blob_cancel</refname>
-  <refpurpose>Cancel creating blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_blob_cancel</methodname>
-   <methodparam><type>resource</type><parameter>blob_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function will discard a BLOB if it has not yet been closed by
-   <function>ibase_blob_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blob_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB handle opened with <function>ibase_blob_create</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_create</function></member>
-   <member><function>ibase_blob_import</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/ibase/functions/ibase-blob-close.xml b/reference/ibase/functions/ibase-blob-close.xml
deleted file mode 100644
index 352d4ebc3769..000000000000
--- a/reference/ibase/functions/ibase-blob-close.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-close">
- <refnamediv>
-  <refname>ibase_blob_close</refname>
-  <refpurpose>Close blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ibase_blob_close</methodname>
-   <methodparam><type>resource</type><parameter>blob_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function closes a BLOB that has either been opened for reading by
-   <function>ibase_blob_open</function> or has been opened for writing by
-   <function>ibase_blob_create</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blob_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB handle opened with <function>ibase_blob_create</function> or
-      <function>ibase_blob_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If the BLOB was being read, this function returns &true; on success, if
-   the BLOB was being written to, this function returns a string containing
-   the BLOB id that has been assigned to it by the database. On failure, this
-   function returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_cancel</function></member>
-   <member><function>ibase_blob_open</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/ibase/functions/ibase-blob-create.xml b/reference/ibase/functions/ibase-blob-create.xml
deleted file mode 100644
index 83cf34a7de3b..000000000000
--- a/reference/ibase/functions/ibase-blob-create.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-create">
- <refnamediv>
-  <refname>ibase_blob_create</refname>
-  <refpurpose>Create a new blob for adding data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ibase_blob_create</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>ibase_blob_create</function> creates a new BLOB for filling with
-   data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a BLOB handle for later use with
-   <function>ibase_blob_add</function>&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_add</function></member>
-   <member><function>ibase_blob_cancel</function></member>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_import</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/ibase/functions/ibase-blob-echo.xml b/reference/ibase/functions/ibase-blob-echo.xml
deleted file mode 100644
index 6d9debcdd351..000000000000
--- a/reference/ibase/functions/ibase-blob-echo.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-echo">
- <refnamediv>
-  <refname>ibase_blob_echo</refname>
-  <refpurpose>Output blob contents to browser</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_blob_echo</methodname>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_blob_echo</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function opens a BLOB for reading and sends its contents directly to
-   standard output (the browser, in most cases).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blob_id</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_open</function></member>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_get</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/ibase/functions/ibase-blob-get.xml b/reference/ibase/functions/ibase-blob-get.xml
deleted file mode 100644
index f1c892859f21..000000000000
--- a/reference/ibase/functions/ibase-blob-get.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-get">
- <refnamediv>
-  <refname>ibase_blob_get</refname>
-  <refpurpose>Get len bytes data from open blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_blob_get</methodname>
-   <methodparam><type>resource</type><parameter>blob_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns at most <parameter>len</parameter> bytes from a BLOB
-   that has been opened for reading by <function>ibase_blob_open</function>.
-  </simpara>
-  <note>
-   <simpara>
-    It is not possible to read from a BLOB that has been opened for writing
-    by <function>ibase_blob_create</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blob_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB handle opened with <function>ibase_blob_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>len</parameter></term>
-    <listitem>
-     <simpara>
-      Size of returned data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns at most <parameter>len</parameter> bytes from the BLOB, or &false;
-   on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>ibase_blob_get</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$result    = ibase_query("SELECT blob_value FROM table");
-$data      = ibase_fetch_object($result);
-$blob_data = ibase_blob_info($data->BLOB_VALUE);
-$blob_hndl = ibase_blob_open($data->BLOB_VALUE);
-echo         ibase_blob_get($blob_hndl, $blob_data[0]);
-?>
-]]>
-    </programlisting>
-   </example>
-   Whilst this example doesn't do much more than a
-   'ibase_blob_echo($data-&gt;BLOB_VALUE)' would do, it does show you how to get
-   information into a $variable to manipulate as you please.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_open</function></member>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_echo</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/ibase/functions/ibase-blob-import.xml b/reference/ibase/functions/ibase-blob-import.xml
deleted file mode 100644
index 03bbfc85a9ce..000000000000
--- a/reference/ibase/functions/ibase-blob-import.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-import">
- <refnamediv>
-  <refname>ibase_blob_import</refname>
-  <refpurpose>Create blob, copy file in it, and close it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_blob_import</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>file_handle</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_blob_import</methodname>
-   <methodparam><type>resource</type><parameter>file_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function creates a BLOB, reads an entire file into it, closes it and
-   returns the assigned BLOB id.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>file_handle</parameter></term>
-    <listitem>
-     <simpara>
-      The file handle is a handle returned by <function>fopen</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the BLOB id on success, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_blob_import</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dbh = ibase_connect($host, $username, $password);
-$filename = '/tmp/bar';
-
-$fd = fopen($filename, 'r');
-if ($fd) {
-
-    $blob = ibase_blob_import($dbh, $fd);
-    fclose($fd);
-
-    if (!is_string($blob)) {
-        // import failed
-    } else {
-        $query = "INSERT INTO foo (name, data) VALUES ('$filename', ?)";
-        $prepared = ibase_prepare($dbh, $query);
-        if (!ibase_execute($prepared, $blob)) {
-            // record insertion failed
-        }
-    }
-} else {
-    // unable to open the data file
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_add</function></member>
-   <member><function>ibase_blob_cancel</function></member>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_create</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/ibase/functions/ibase-blob-info.xml b/reference/ibase/functions/ibase-blob-info.xml
deleted file mode 100644
index 84ce2fd3f070..000000000000
--- a/reference/ibase/functions/ibase-blob-info.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-info">
- <refnamediv>
-  <refname>ibase_blob_info</refname>
-  <refpurpose>Return blob length and other useful info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_blob_info</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_blob_info</methodname>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the BLOB length and other useful information.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blob_id</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB id.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array containing information about a BLOB. The information returned
-   consists of the length of the BLOB, the number of segments it contains, the size
-   of the largest segment, and whether it is a stream BLOB or a segmented BLOB.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-blob-open.xml b/reference/ibase/functions/ibase-blob-open.xml
deleted file mode 100644
index 222856b15392..000000000000
--- a/reference/ibase/functions/ibase-blob-open.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-blob-open">
- <refnamediv>
-  <refname>ibase_blob_open</refname>
-  <refpurpose>Open blob for retrieving data parts</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ibase_blob_open</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ibase_blob_open</methodname>
-   <methodparam><type>string</type><parameter>blob_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Opens an existing BLOB for reading.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blob_id</parameter></term>
-    <listitem>
-     <simpara>
-      A BLOB id.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a BLOB handle for later use with
-   <function>ibase_blob_get</function>&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_blob_close</function></member>
-   <member><function>ibase_blob_echo</function></member>
-   <member><function>ibase_blob_get</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/ibase/functions/ibase-close.xml b/reference/ibase/functions/ibase-close.xml
deleted file mode 100644
index 05e90918a5cb..000000000000
--- a/reference/ibase/functions/ibase-close.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-close">
- <refnamediv>
-  <refname>ibase_close</refname>
-  <refpurpose>Close a connection to an InterBase database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_close</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>connection_id</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Closes the link to an InterBase database that's associated with
-   a connection id returned from <function>ibase_connect</function>.
-   Default transaction on link is committed, other transactions are
-   rolled back.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection_id</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier returned from
-      <function>ibase_connect</function>. If omitted, the last opened link
-      is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_connect</function></member>
-   <member><function>ibase_pconnect</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/ibase/functions/ibase-commit-ret.xml b/reference/ibase/functions/ibase-commit-ret.xml
deleted file mode 100644
index b50f1b0bc4b3..000000000000
--- a/reference/ibase/functions/ibase-commit-ret.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-commit-ret">
- <refnamediv>
-  <refname>ibase_commit_ret</refname>
-  <refpurpose>Commit a transaction without closing it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_commit_ret</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits a transaction without closing it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_or_trans_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      If called without an argument, this function commits the default
-      transaction of the default link. If the argument is a connection
-      identifier, the default transaction of the corresponding connection
-      will be committed. If the argument is a transaction identifier, the
-      corresponding transaction will be committed. The transaction context
-      will be retained, so statements executed from within this transaction
-      will not be invalidated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-commit.xml b/reference/ibase/functions/ibase-commit.xml
deleted file mode 100644
index ea44c0c6f887..000000000000
--- a/reference/ibase/functions/ibase-commit.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-commit">
- <refnamediv>
-  <refname>ibase_commit</refname>
-  <refpurpose>Commit a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_commit</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits a transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_or_trans_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      If called without an argument, this function commits the default
-      transaction of the default link. If the argument is a connection
-      identifier, the default transaction of the corresponding connection
-      will be committed. If the argument is a transaction identifier, the
-      corresponding transaction will be committed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-connect.xml b/reference/ibase/functions/ibase-connect.xml
deleted file mode 100644
index ffe791fcbdd5..000000000000
--- a/reference/ibase/functions/ibase-connect.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-connect">
- <refnamediv>
-  <refname>ibase_connect</refname>
-  <refpurpose>Open a connection to a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_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>string</type><parameter>charset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>buffers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>dialect</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>role</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sync</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Establishes a connection to an Firebird/InterBase server.
-  </simpara>
-  <simpara>
-   In case a second call is made to <function>ibase_connect</function> with
-   the same arguments, no new link will be established, but instead, the link
-   identifier of the already opened link will be returned. The link to the
-   server will be closed as soon as the execution of the script ends, unless
-   it's closed earlier by explicitly calling <function>ibase_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>database</parameter> argument has to be a valid path to
-      database file on the server it resides on. If the server is not local,
-      it must be prefixed with either 'hostname:' (TCP/IP), 'hostname/port:'
-      (TCP/IP with interbase server on custom TCP port), '//hostname/'
-      (NetBEUI), depending on the connection
-      protocol used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The user name. Can be set with the
-      <literal>ibase.default_user</literal> &php.ini; directive.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password for <parameter>username</parameter>. Can be set with the
-      <literal>ibase.default_password</literal> &php.ini; directive.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>charset</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>charset</parameter> is the default character set for a
-      database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>buffers</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>buffers</parameter> is the number of database buffers to
-      allocate for the server-side cache. If 0 or omitted, server chooses
-      its own default.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dialect</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>dialect</parameter> selects the default SQL dialect for any
-      statement executed within a connection, and it defaults to the highest
-      one supported by client libraries.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>role</parameter></term>
-    <listitem>
-     <simpara>
-      Functional only with InterBase 5 and up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sync</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an Firebird/InterBase link identifier on success, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If you get some error like "arithmetic exception, numeric overflow, or
-   string truncation. Cannot transliterate character between character sets"
-   (this occurs when you try use some character with accents) when using this
-   and after <function>ibase_query</function> you must set the character set
-   (i.e. ISO8859_1 or your current character set).
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_connect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$host = 'localhost:/path/to/your.gdb';
-
-$dbh = ibase_connect($host, $username, $password);
-$stmt = 'SELECT * FROM tblname';
-$sth = ibase_query($dbh, $stmt);
-while ($row = ibase_fetch_object($sth)) {
-    echo $row->email, "\n";
-}
-ibase_free_result($sth);
-ibase_close($dbh);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_pconnect</function></member>
-   <member><function>ibase_close</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/ibase/functions/ibase-db-info.xml b/reference/ibase/functions/ibase-db-info.xml
deleted file mode 100644
index b829a580da08..000000000000
--- a/reference/ibase/functions/ibase-db-info.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-db-info">
- <refnamediv>
-  <refname>ibase_db_info</refname>
-  <refpurpose>Request statistics about a database</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_db_info</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>int</type><parameter>action</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>argument</parameter><initializer>0</initializer></methodparam>
-  </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/ibase/functions/ibase-delete-user.xml b/reference/ibase/functions/ibase-delete-user.xml
deleted file mode 100644
index e730903c3e3f..000000000000
--- a/reference/ibase/functions/ibase-delete-user.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-delete-user">
- <refnamediv>
-  <refname>ibase_delete_user</refname>
-  <refpurpose>Delete a user from a security database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_delete_user</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-  </methodsynopsis>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      The handle on the database server service.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_name</parameter></term>
-    <listitem>
-     <simpara>
-      The login name of the user you want to delete from the database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_add_user</function></member>
-   <member><function>ibase_modify_user</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/ibase/functions/ibase-drop-db.xml b/reference/ibase/functions/ibase-drop-db.xml
deleted file mode 100644
index 5e57fe9c2ac8..000000000000
--- a/reference/ibase/functions/ibase-drop-db.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-drop-db">
- <refnamediv>
-  <refname>ibase_drop_db</refname>
-  <refpurpose>Drops a database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_drop_db</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This functions drops a database that was opened by either <function>ibase_connect</function>
-   or <function>ibase_pconnect</function>. The database is closed and deleted from the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_connect</function></member>
-   <member><function>ibase_pconnect</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/ibase/functions/ibase-errcode.xml b/reference/ibase/functions/ibase-errcode.xml
deleted file mode 100644
index d37dc70dbeed..000000000000
--- a/reference/ibase/functions/ibase-errcode.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-errcode">
- <refnamediv>
-  <refname>ibase_errcode</refname>
-  <refpurpose>Return an error code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ibase_errcode</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the error code that resulted from the most recent InterBase function
-   call.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error code as an integer, or &false; if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_errmsg</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/ibase/functions/ibase-errmsg.xml b/reference/ibase/functions/ibase-errmsg.xml
deleted file mode 100644
index 7403b7b9bef3..000000000000
--- a/reference/ibase/functions/ibase-errmsg.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-errmsg">
- <refnamediv>
-  <refname>ibase_errmsg</refname>
-  <refpurpose>Return error messages</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_errmsg</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the error message that resulted from the most recent InterBase function
-   call.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error message as a string, or &false; if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_errcode</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/ibase/functions/ibase-execute.xml b/reference/ibase/functions/ibase-execute.xml
deleted file mode 100644
index 673b7a3cd50f..000000000000
--- a/reference/ibase/functions/ibase-execute.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-execute">
- <refnamediv>
-  <refname>ibase_execute</refname>
-  <refpurpose>Execute a previously prepared query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_execute</methodname>
-   <methodparam><type>resource</type><parameter>query</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>values</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Execute a query prepared by <function>ibase_prepare</function>.
-  </simpara>
-  <simpara>
-   This is a lot more effective than using <function>ibase_query</function>
-   if you are repeating a same kind of query several times with only
-   some parameters changing.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase query prepared by <function>ibase_prepare</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If the query raises an error, returns &false;. If it is successful and
-   there is a (possibly empty) result set (such as with a SELECT query),
-   returns a result identifier. If the query was successful and there were
-   no results, returns &true;.
-  </simpara>
-  <note>
-   <simpara>
-    This function returns the number of rows affected by
-    the query (if &gt; 0 and applicable to the statement type). A query that
-    succeeded, but did not affect any rows (e.g. an UPDATE of a non-existent
-    record) will return &true;.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dbh = ibase_connect($host, $username, $password);
-
-$updates = array(
-    1 => 'Eric',
-    5 => 'Filip',
-    7 => 'Larry'
-);
-
-$query = ibase_prepare($dbh, "UPDATE FOO SET BAR = ? WHERE BAZ = ?");
-
-foreach ($updates as $baz => $bar) {
-    ibase_execute($query, $bar, $baz);
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_query</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/ibase/functions/ibase-fetch-assoc.xml b/reference/ibase/functions/ibase-fetch-assoc.xml
deleted file mode 100644
index c872ff604a4d..000000000000
--- a/reference/ibase/functions/ibase-fetch-assoc.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-fetch-assoc">
- <refnamediv>
-  <refname>ibase_fetch_assoc</refname>
-  <refpurpose>Fetch a result row from a query as an associative array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_fetch_assoc</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fetch_flag</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetch a result row from a query as an associative array.
-  </simpara>
-  <simpara>
-   <function>ibase_fetch_assoc</function> fetches one row of data from the
-   <parameter>result</parameter>.  If two or more columns of the result
-   have the same field names, the last column will take precedence. To
-   access the other column(s) of the same name, you either need to access
-   the result with numeric indices by using
-   <function>ibase_fetch_row</function> or use alias names in your query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      The result handle.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fetch_flag</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>fetch_flag</parameter> is a combination of the constants
-      <constant>IBASE_TEXT</constant> and <constant>IBASE_UNIXTIME</constant>
-      ORed together. Passing <constant>IBASE_TEXT</constant> will cause this
-      function to return BLOB contents instead of BLOB ids. Passing
-      <constant>IBASE_UNIXTIME</constant> will cause this function to return
-      date/time values as Unix timestamps instead of as formatted strings.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array that corresponds to the fetched row.
-   Subsequent calls will return the next row in the result set, or &false; if
-   there are no more rows.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_fetch_row</function></member>
-   <member><function>ibase_fetch_object</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/ibase/functions/ibase-fetch-object.xml b/reference/ibase/functions/ibase-fetch-object.xml
deleted file mode 100644
index 0e0265f78746..000000000000
--- a/reference/ibase/functions/ibase-fetch-object.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-fetch-object">
- <refnamediv>
-  <refname>ibase_fetch_object</refname>
-  <refpurpose>Get an object from a InterBase database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>ibase_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>result_id</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fetch_flag</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetches a row as a pseudo-object from a given result identifier.
-  </simpara>
-  <simpara>
-   Subsequent calls to <function>ibase_fetch_object</function>
-   return the next row in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result_id</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase result identifier obtained either by
-      <function>ibase_query</function> or <function>ibase_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fetch_flag</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>fetch_flag</parameter> is a combination of the constants
-      <constant>IBASE_TEXT</constant> and <constant>IBASE_UNIXTIME</constant>
-      ORed together. Passing <constant>IBASE_TEXT</constant> will cause this
-      function to return BLOB contents instead of BLOB ids. Passing
-      <constant>IBASE_UNIXTIME</constant> will cause this function to return
-      date/time values as Unix timestamps instead of as formatted strings.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object with the next row information, or &false; if there are
-   no more rows.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_fetch_object</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dbh = ibase_connect($host, $username, $password);
-$stmt = 'SELECT * FROM tblname';
-$sth = ibase_query($dbh, $stmt);
-while ($row = ibase_fetch_object($sth)) {
-    echo $row->email . "\n";
-}
-ibase_close($dbh);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_fetch_row</function></member>
-   <member><function>ibase_fetch_assoc</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/ibase/functions/ibase-fetch-row.xml b/reference/ibase/functions/ibase-fetch-row.xml
deleted file mode 100644
index 67cc839997f0..000000000000
--- a/reference/ibase/functions/ibase-fetch-row.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-fetch-row">
- <refnamediv>
-  <refname>ibase_fetch_row</refname>
-  <refpurpose>Fetch a row from an InterBase database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>result_identifier</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fetch_flag</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>ibase_fetch_row</function> fetches one row of data from the
-   given result set.
-  </simpara>
-  <simpara>
-   Subsequent calls to <function>ibase_fetch_row</function>
-   return the next row in the result set, or &false; if there are no
-   more rows.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase result identifier.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fetch_flag</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>fetch_flag</parameter> is a combination of the constants
-      <constant>IBASE_TEXT</constant> and <constant>IBASE_UNIXTIME</constant>
-      ORed together. Passing <constant>IBASE_TEXT</constant> will cause this
-      function to return BLOB contents instead of BLOB ids. Passing
-      <constant>IBASE_UNIXTIME</constant> will cause this function to return
-      date/time values as Unix timestamps instead of as formatted strings.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   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 0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_fetch_assoc</function></member>
-   <member><function>ibase_fetch_object</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/ibase/functions/ibase-field-info.xml b/reference/ibase/functions/ibase-field-info.xml
deleted file mode 100644
index 05e3ce094eb6..000000000000
--- a/reference/ibase/functions/ibase-field-info.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-field-info">
- <refnamediv>
-  <refname>ibase_field_info</refname>
-  <refpurpose>Get information about a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_field_info</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_number</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an array with information about a field after a select
-   query has been run.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase result identifier.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field_number</parameter></term>
-    <listitem>
-     <simpara>
-      Field offset.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the following keys: <literal>name</literal>,
-   <literal>alias</literal>, <literal>relation</literal>,
-   <literal>length</literal> and <literal>type</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_field_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rs = ibase_query("SELECT * FROM tablename");
-$coln = ibase_num_fields($rs);
-for ($i = 0; $i < $coln; $i++) {
-    $col_info = ibase_field_info($rs, $i);
-    echo "name: ". $col_info['name']. "\n";
-    echo "alias: ". $col_info['alias']. "\n";
-    echo "relation: ". $col_info['relation']. "\n";
-    echo "length: ". $col_info['length']. "\n";
-    echo "type: ". $col_info['type']. "\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_num_fields</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/ibase/functions/ibase-free-event-handler.xml b/reference/ibase/functions/ibase-free-event-handler.xml
deleted file mode 100644
index 3ce3bdd5c3f4..000000000000
--- a/reference/ibase/functions/ibase-free-event-handler.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-free-event-handler">
- <refnamediv>
-  <refname>ibase_free_event_handler</refname>
-  <refpurpose>Cancels a registered event handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_free_event_handler</methodname>
-   <methodparam><type>resource</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function causes the registered event handler specified by
-   <parameter>event</parameter> to be cancelled. The callback function will
-   no longer be called for the events it was registered to handle.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter></term>
-    <listitem>
-     <simpara>
-      An event resource, created by
-      <function>ibase_set_event_handler</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_set_event_handler</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/ibase/functions/ibase-free-query.xml b/reference/ibase/functions/ibase-free-query.xml
deleted file mode 100644
index fa36734c5d61..000000000000
--- a/reference/ibase/functions/ibase-free-query.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-free-query">
- <refnamediv>
-  <refname>ibase_free_query</refname>
-  <refpurpose>Free memory allocated by a prepared query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_free_query</methodname>
-   <methodparam><type>resource</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Frees a prepared query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      A query prepared with <function>ibase_prepare</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-free-result.xml b/reference/ibase/functions/ibase-free-result.xml
deleted file mode 100644
index 356a79bcc5c8..000000000000
--- a/reference/ibase/functions/ibase-free-result.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-free-result">
- <refnamediv>
-  <refname>ibase_free_result</refname>
-  <refpurpose>Free a result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_free_result</methodname>
-   <methodparam><type>resource</type><parameter>result_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Frees a result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      A result set created by <function>ibase_query</function> or
-      <function>ibase_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-gen-id.xml b/reference/ibase/functions/ibase-gen-id.xml
deleted file mode 100644
index aba1b59bd82e..000000000000
--- a/reference/ibase/functions/ibase-gen-id.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-gen-id">
- <refnamediv>
-  <refname>ibase_gen_id</refname>
-  <refpurpose>Increments the named generator and returns its new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ibase_gen_id</methodname>
-   <methodparam><type>string</type><parameter>generator</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>increment</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns new generator value as integer, or as string if the value is too big.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-maintain-db.xml b/reference/ibase/functions/ibase-maintain-db.xml
deleted file mode 100644
index 3a062cce0816..000000000000
--- a/reference/ibase/functions/ibase-maintain-db.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-maintain-db">
- <refnamediv>
-  <refname>ibase_maintain_db</refname>
-  <refpurpose>Execute a maintenance command on the database server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_maintain_db</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>int</type><parameter>action</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>argument</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-modify-user.xml b/reference/ibase/functions/ibase-modify-user.xml
deleted file mode 100644
index 5c465803cf92..000000000000
--- a/reference/ibase/functions/ibase-modify-user.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-modify-user">
- <refnamediv>
-  <refname>ibase_modify_user</refname>
-  <refpurpose>Modify a user to a security database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_modify_user</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>user_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>first_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>middle_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>last_name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      The handle on the database server service.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_name</parameter></term>
-    <listitem>
-     <simpara>
-      The login name of the database user to modify.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The user's new password.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>first_name</parameter></term>
-    <listitem>
-     <simpara>
-      The user's new first name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>middle_name</parameter></term>
-    <listitem>
-     <simpara>
-      The user's new middle name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>last_name</parameter></term>
-    <listitem>
-     <simpara>
-      The user's new last name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_add_user</function></member>
-   <member><function>ibase_delete_user</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/ibase/functions/ibase-name-result.xml b/reference/ibase/functions/ibase-name-result.xml
deleted file mode 100644
index adfb8f78afe7..000000000000
--- a/reference/ibase/functions/ibase-name-result.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-name-result">
- <refnamediv>
-  <refname>ibase_name_result</refname>
-  <refpurpose>Assigns a name to a result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_name_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function assigns a name to a result set. This name can be used later in
-   UPDATE|DELETE ... WHERE CURRENT OF <parameter>name</parameter> statements.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name to be assigned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_name_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = ibase_query("SELECT field1,field2 FROM table FOR UPDATE");
-ibase_name_result($result, "my_cursor");
-
-$updateqry = ibase_prepare("UPDATE table SET field2 = ? WHERE CURRENT OF my_cursor");
-
-for ($i = 0; ibase_fetch_row($result); ++$i) {
-    ibase_execute($updateqry, $i);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_prepare</function></member>
-   <member><function>ibase_execute</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/ibase/functions/ibase-num-fields.xml b/reference/ibase/functions/ibase-num-fields.xml
deleted file mode 100644
index d464ff8866f5..000000000000
--- a/reference/ibase/functions/ibase-num-fields.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-num-fields">
- <refnamediv>
-  <refname>ibase_num_fields</refname>
-  <refpurpose>Get the number of fields in a result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ibase_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>result_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get the number of fields in a result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result_id</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase result identifier.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of fields as an integer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_num_fields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rs = ibase_query("SELECT * FROM tablename");
-$coln = ibase_num_fields($rs);
-for ($i = 0; $i < $coln; $i++) {
-    $col_info = ibase_field_info($rs, $i);
-    echo "name: " . $col_info['name'] . "\n";
-    echo "alias: " . $col_info['alias'] . "\n";
-    echo "relation: " . $col_info['relation'] . "\n";
-    echo "length: " . $col_info['length'] . "\n";
-    echo "type: " . $col_info['type'] . "\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_field_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-num-params.xml b/reference/ibase/functions/ibase-num-params.xml
deleted file mode 100644
index 0f8b8cd9112f..000000000000
--- a/reference/ibase/functions/ibase-num-params.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-num-params">
- <refnamediv>
-  <refname>ibase_num_params</refname>
-  <refpurpose>Return the number of parameters in a prepared query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ibase_num_params</methodname>
-   <methodparam><type>resource</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the number of parameters in the prepared query specified
-   by <parameter>query</parameter>. This is the number of binding arguments that
-   must be present when calling <function>ibase_execute</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      The prepared query handle.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of parameters as an integer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_prepare</function></member>
-   <member><function>ibase_param_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-param-info.xml b/reference/ibase/functions/ibase-param-info.xml
deleted file mode 100644
index 9a2faa414bd8..000000000000
--- a/reference/ibase/functions/ibase-param-info.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-param-info">
- <refnamediv>
-  <refname>ibase_param_info</refname>
-  <refpurpose>Return information about a parameter in a prepared query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ibase_param_info</methodname>
-   <methodparam><type>resource</type><parameter>query</parameter></methodparam>
-   <methodparam><type>int</type><parameter>param_number</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an array with information about a parameter after a
-   query has been prepared.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase prepared query handle.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>param_number</parameter></term>
-    <listitem>
-     <simpara>
-      Parameter offset.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the following keys: <literal>name</literal>,
-   <literal>alias</literal>, <literal>relation</literal>,
-   <literal>length</literal> and <literal>type</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_field_info</function></member>
-   <member><function>ibase_num_params</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/ibase/functions/ibase-pconnect.xml b/reference/ibase/functions/ibase-pconnect.xml
deleted file mode 100644
index 6a5e266d198d..000000000000
--- a/reference/ibase/functions/ibase-pconnect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-pconnect">
- <refnamediv>
-  <refname>ibase_pconnect</refname>
-  <refpurpose>Open a persistent connection to an InterBase database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_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>string</type><parameter>charset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>buffers</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>dialect</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>role</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sync</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Opens a persistent connection to an InterBase database.
-  </simpara>
-  <simpara>
-   <function>ibase_pconnect</function> acts very much like
-   <function>ibase_connect</function> with two major differences.
-  </simpara>
-  <simpara>
-   First, when connecting, the function will first try to find a (persistent)
-   link that's already opened with the same parameters. If one is found, an
-   identifier for it will be returned instead of opening a new connection.
-  </simpara>
-  <simpara>
-   Second, the connection to the InterBase server will not be closed when the
-   execution of the script ends. Instead, the link will remain open for
-   future use (<function>ibase_close</function> will not close links
-   established by <function>ibase_pconnect</function>). This type of link is
-   therefore called 'persistent'.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>database</parameter> argument has to be a valid path to
-      database file on the server it resides on. If the server is not local,
-      it must be prefixed with either 'hostname:' (TCP/IP), '//hostname/'
-      (NetBEUI) or 'hostname@' (IPX/SPX), depending on the connection
-      protocol used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The user name. Can be set with the
-      <literal>ibase.default_user</literal> &php.ini; directive.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password for <parameter>username</parameter>. Can be set with the
-      <literal>ibase.default_password</literal> &php.ini; directive.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>charset</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>charset</parameter> is the default character set for a
-      database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>buffers</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>buffers</parameter> is the number of database buffers to
-      allocate for the server-side cache. If 0 or omitted, server chooses
-      its own default.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dialect</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>dialect</parameter> selects the default SQL dialect for any
-      statement executed within a connection, and it defaults to the highest
-      one supported by client libraries. Functional only with InterBase 6
-      and up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>role</parameter></term>
-    <listitem>
-     <simpara>
-      Functional only with InterBase 5 and up.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sync</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an InterBase link identifier on success, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_close</function></member>
-   <member><function>ibase_connect</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/ibase/functions/ibase-prepare.xml b/reference/ibase/functions/ibase-prepare.xml
deleted file mode 100644
index dce12f8874b1..000000000000
--- a/reference/ibase/functions/ibase-prepare.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-prepare">
- <refnamediv>
-  <refname>ibase_prepare</refname>
-  <refpurpose>Prepare a query for later binding of parameter placeholders and execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_prepare</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_prepare</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_prepare</methodname>
-   <methodparam><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>trans</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Prepare a query for later binding of parameter placeholders and execution
-   (via <function>ibase_execute</function>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase query.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier returned from
-      <function>ibase_connect</function>. If omitted, the last opened link
-      is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>trans</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase transaction handle the query should be associated with.
-      If omitted, the default transaction of the connection is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a prepared query handle, or &false; on error.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-query.xml b/reference/ibase/functions/ibase-query.xml
deleted file mode 100644
index b9874a7db4f0..000000000000
--- a/reference/ibase/functions/ibase-query.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-query">
- <refnamediv>
-  <refname>ibase_query</refname>
-  <refpurpose>Execute a query on an InterBase database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_query</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>bind_args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Performs a query on an InterBase database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase query.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>bind_args</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If the query raises an error, returns &false;. If it is successful and
-   there is a (possibly empty) result set (such as with a SELECT query),
-   returns a result identifier. If the query was successful and there were
-   no results, returns &true;.
-  </simpara>
-  <note>
-   <simpara>
-    In PHP 5.0.0 and up, this function will return the number of rows
-    affected by the query for INSERT, UPDATE and DELETE statements. In order
-    to retain backward compatibility, it will return &true; for these
-    statements if the query succeeded without affecting any rows.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If you get some error like "arithmetic exception, numeric overflow, or
-   string truncation. Cannot transliterate character between character sets"
-   (this occurs when you try use some character with accents) when using this
-   and after <function>ibase_query</function> you must set the character set
-   (i.e. ISO8859_1 or your current character set).
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_query</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$host = 'localhost:/path/to/your.gdb';
-
-$dbh = ibase_connect($host, $username, $password);
-$stmt = 'SELECT * FROM tblname';
-
-$sth = ibase_query($dbh, $stmt) or die(ibase_errmsg());
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_errmsg</function></member>
-   <member><function>ibase_fetch_row</function></member>
-   <member><function>ibase_fetch_object</function></member>
-   <member><function>ibase_free_result</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/ibase/functions/ibase-restore.xml b/reference/ibase/functions/ibase-restore.xml
deleted file mode 100644
index 3f62a87b4c80..000000000000
--- a/reference/ibase/functions/ibase-restore.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-restore">
- <refnamediv>
-  <refname>ibase_restore</refname>
-  <refpurpose>Initiates a restore task in the service manager and returns immediately</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ibase_restore</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest_db</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>verbose</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-
-   <simpara>
-   This function passes the arguments to the (remote) database server. There it starts a new restore process. Therefore you
-   won't get any responses.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A previously opened connection to the database server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source_file</parameter></term>
-    <listitem>
-     <simpara>
-      The absolute path on the server where the backup file is located.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dest_db</parameter></term>
-    <listitem>
-     <simpara>
-      The path to create the new database on the server. You can also use database alias.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      Additional options to pass to the database server for restore.
-      The <parameter>options</parameter> parameter can be a combination
-      of the following constants:
-      <constant>IBASE_RES_DEACTIVATE_IDX</constant>,
-      <constant>IBASE_RES_NO_SHADOW</constant>,
-      <constant>IBASE_RES_NO_VALIDITY</constant>,
-      <constant>IBASE_RES_ONE_AT_A_TIME</constant>,
-      <constant>IBASE_RES_REPLACE</constant>,
-      <constant>IBASE_RES_CREATE</constant>,
-      <constant>IBASE_RES_USE_ALL_SPACE</constant>,
-      <constant>IBASE_PRP_PAGE_BUFFERS</constant>,
-      <constant>IBASE_PRP_SWEEP_INTERVAL</constant>,
-      <constant>IBASE_RES_CREATE</constant>.
-      Read the section about <xref linkend="ibase.constants"/> for further information.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>verbose</parameter></term>
-    <listitem>
-     <simpara>
-      Since the restore process is done on the database server, you don't have any chance
-      to get its output. This argument is useless.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
-  <simpara>
-   Since the restore process is done on the (remote) server, this function just passes the arguments to it.
-   While the arguments are legal, you won't get &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_restore</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Attach to database server by ip address and port
-$service = ibase_service_attach ('10.1.11.200/3050', 'sysdba', 'masterkey');
-
-// Start the restore process on database server
-// Restore employee backup to the new emps.fdb database
-// Don't use any special arguments
-ibase_restore($service, '/srv/backup/employees.fbk', '/srv/firebird/emps.fdb');
-
-// Free the attached connection
-ibase_service_detach ($service);
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>ibase_restore</function> example with arguments</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Attach to database server by name and default port
-$service = ibase_service_attach ('fb-server.contoso.local', 'sysdba', 'masterkey');
-
-// Start the restore process on database server
-// Restore to employee database using alias.
-// Restore without indixes. Replace existing database.
-ibase_restore($service, '/srv/backup/employees.fbk', 'employees.fdb', IBASE_RES_DEACTIVATE_IDX | IBASE_RES_REPLACE);
-
-// Free the attached connection
-ibase_service_detach ($service);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_backup</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/ibase/functions/ibase-rollback-ret.xml b/reference/ibase/functions/ibase-rollback-ret.xml
deleted file mode 100644
index b9597ea227b2..000000000000
--- a/reference/ibase/functions/ibase-rollback-ret.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-rollback-ret">
- <refnamediv>
-  <refname>ibase_rollback_ret</refname>
-  <refpurpose>Roll back a transaction without closing it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_rollback_ret</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rolls back a transaction without closing it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_or_trans_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      If called without an argument, this function rolls back the default
-      transaction of the default link. If the argument is a connection
-      identifier, the default transaction of the corresponding connection
-      will be rolled back. If the argument is a transaction identifier, the
-      corresponding transaction will be rolled back. The transaction context
-      will be retained, so statements executed from within this transaction
-      will not be invalidated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-rollback.xml b/reference/ibase/functions/ibase-rollback.xml
deleted file mode 100644
index 221917c9f3db..000000000000
--- a/reference/ibase/functions/ibase-rollback.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-rollback">
- <refnamediv>
-  <refname>ibase_rollback</refname>
-  <refpurpose>Roll back a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_rollback</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_or_trans_identifier</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rolls back a transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>link_or_trans_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      If called without an argument, this function rolls back the default
-      transaction of the default link. If the argument is a connection
-      identifier, the default transaction of the corresponding connection
-      will be rolled back. If the argument is a transaction identifier, the
-      corresponding transaction will be rolled back.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-server-info.xml b/reference/ibase/functions/ibase-server-info.xml
deleted file mode 100644
index 2dca4976739a..000000000000
--- a/reference/ibase/functions/ibase-server-info.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-server-info">
- <refnamediv>
-  <refname>ibase_server_info</refname>
-  <refpurpose>Request information about a database server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_server_info</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>action</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A previously created connection to the database server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>action</parameter></term>
-    <listitem>
-     <simpara>
-      A valid constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns mixed types depending on context.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_service_attach</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    // Attach to the remote Firebird server
-    if (($service = ibase_service_attach('10.1.1.254/3050', 'sysdba', 'masterkey')) != FALSE) {
-
-        // Successfully attached.
-
-        // Output the info
-        echo "Server version: " . ibase_server_info($service, IBASE_SVC_SERVER_VERSION) . "\n";
-        echo "Server implementation: " . ibase_server_info($service, IBASE_SVC_IMPLEMENTATION) . "\n";
-        echo "Server users: " . print_r(ibase_server_info($service, IBASE_SVC_GET_USERS), true) . "\n";
-        echo "Server directory: " . ibase_server_info($service, IBASE_SVC_GET_ENV) . "\n";
-        echo "Server lock path: " . ibase_server_info($service, IBASE_SVC_GET_ENV_LOCK) . "\n";
-        echo "Server lib path: " . ibase_server_info($service, IBASE_SVC_GET_ENV_MSG) . "\n";
-        echo "Path of user db: " . ibase_server_info($service, IBASE_SVC_USER_DBPATH) . "\n";
-        echo "Established connections: " . print_r(ibase_server_info($service, IBASE_SVC_SVR_DB_INFO),true) . "\n";
-
-        // Detach from server (disconnect)
-        ibase_service_detach($service);
-
-    }
-    else {
-        // Output message on error
-        $conn_error = ibase_errmsg();
-        die($conn_error);
-    }
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Server version: LI-V3.0.4.33054 Firebird 3.0
-Server implementation: Firebird/Linux/AMD/Intel/x64
-Server users: Array
-(
-    [0] => Array
-        (
-            [user_name] => SYSDBA
-            [first_name] => Sql
-            [middle_name] => Server
-            [last_name] => Administrator
-            [user_id] => 0
-            [group_id] => 0
-        )
-
-)
-
-Server directory: /etc/firebird/
-Server lock path: /tmp/firebird/
-Server lib path: /usr/lib64/firebird/lib/
-Path of user db: /var/lib/firebird/secdb/security3.fdb
-Established connections: Array
-(
-    [attachments] => 3
-    [databases] => 2
-    [0] => /srv/firebird/poss.fdb
-    [1] => /srv/firebird/employees.fdb
-)
-]]>
-   </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/ibase/functions/ibase-service-attach.xml b/reference/ibase/functions/ibase-service-attach.xml
deleted file mode 100644
index 2716af6a4d63..000000000000
--- a/reference/ibase/functions/ibase-service-attach.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-service-attach">
- <refnamediv>
-  <refname>ibase_service_attach</refname>
-  <refpurpose>Connect to the service manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ibase_service_attach</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dba_username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dba_password</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      The name or ip address of the database host. You can define the port by adding
-      '/' and port number. If no port is specified, port 3050 will be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dba_username</parameter></term>
-    <listitem>
-     <simpara>
-      The name of any valid user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dba_password</parameter></term>
-    <listitem>
-     <simpara>
-      The user's password.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a Interbase / Firebird link identifier on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_service_attach</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    // Attach to the remote Firebird server by ip address
-    if (($service = ibase_service_attach('10.1.1.199', 'sysdba', 'masterkey')) != FALSE) {
-
-        // Successfully attached.
-        // Fetch server version (something like 'LI-V3.0.4.33054 Firebird 3.0')
-        $server_version  = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
-
-        // Fetch server implementation (something like 'Firebird/Linux/AMD/Intel/x64')
-        $server_implementation = ibase_server_info($service, IBASE_SVC_IMPLEMENTATION);
-
-        // Detach from server (disconnect)
-        ibase_service_detach($service);
-
-        // Output the info
-        echo "Server version: " . $server_version . "<br/>";
-        echo "Server implementation: " . $server_implementation;
-    }
-    else {
-        // Output message on error
-        $conn_error = ibase_errmsg();
-        die($conn_error);
-    }
-
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example>
-   <title><function>ibase_service_attach</function> example using <literal>hostname/port</literal> syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    // Attach to the remote Firebird server by name. Use Port 3050.
-    if (($service = ibase_service_attach('FB-SRV-01.contoso.local/3050', 'sysdba', 'masterkey')) != FALSE) {
-
-        // Successfully attached.
-        // Fetch server version (something like 'LI-V3.0.4.33054 Firebird 3.0')
-        $server_version  = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
-
-        // Fetch server implementation (something like 'Firebird/Linux/AMD/Intel/x64')
-        $server_implementation = ibase_server_info($service, IBASE_SVC_IMPLEMENTATION);
-
-        // Detach from server (disconnect)
-        ibase_service_detach($service);
-
-        // Output the info
-        echo "Server version: " . $server_version . "<br/>";
-        echo "Server implementation: " . $server_implementation;
-    }
-    else {
-        // Output message on error
-        $conn_error = ibase_errmsg();
-        die($conn_error);
-    }
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_service_detach</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/ibase/functions/ibase-service-detach.xml b/reference/ibase/functions/ibase-service-detach.xml
deleted file mode 100644
index 0a1488126ec1..000000000000
--- a/reference/ibase/functions/ibase-service-detach.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.ibase-service-detach">
- <refnamediv>
-  <refname>ibase_service_detach</refname>
-  <refpurpose>Disconnect from the service manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ibase_service_detach</methodname>
-   <methodparam><type>resource</type><parameter>service_handle</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>service_handle</parameter></term>
-    <listitem>
-     <simpara>
-      A previously created connection to the database server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_service_detach</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    // Attach to the remote Firebird server by ip address
-    if (($service = ibase_service_attach('10.1.1.199', 'sysdba', 'masterkey')) != FALSE) {
-
-        // Successfully attached.
-        // Fetch server version (something like 'LI-V3.0.4.33054 Firebird 3.0')
-        $server_version  = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
-
-        // Fetch server implementation (something like 'Firebird/Linux/AMD/Intel/x64')
-        $server_implementation = ibase_server_info($service, IBASE_SVC_IMPLEMENTATION);
-
-        // Detach from server (disconnect)
-        if(ibase_service_detach($service) == FALSE) {
-            echo "Error on service detach.";
-        }
-        else {
-            echo "Successfully detached from service.";
-        }
-
-    }
-    else {
-        // Output message on error
-        $conn_error = ibase_errmsg();
-        die($conn_error);
-    }
-
-?>
-]]>
-   </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/ibase/functions/ibase-set-event-handler.xml b/reference/ibase/functions/ibase-set-event-handler.xml
deleted file mode 100644
index dddb55557b34..000000000000
--- a/reference/ibase/functions/ibase-set-event-handler.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-set-event-handler">
- <refnamediv>
-  <refname>ibase_set_event_handler</refname>
-  <refpurpose>Register a callback function to be called when events are posted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_set_event_handler</methodname>
-   <methodparam><type>callable</type><parameter>event_handler</parameter></methodparam>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter>even_names</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_set_event_handler</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>event_handler</parameter></methodparam>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter>event_names</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function registers a PHP user function as event handler for the
-   specified events.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_handler</parameter></term>
-    <listitem>
-     <simpara>
-      The callback is called with the event name and the link resource as
-      arguments whenever one of the specified events is posted by the
-      database.
-     </simpara>
-     <simpara>
-      The callback must return &false; if the event handler should be
-      canceled. Any other return value is ignored. This function accepts up
-      to 15 event arguments.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <simpara>
-      An event name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>event_names</parameter></term>
-    <listitem>
-     <simpara>
-      At most 15 events allowed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The return value is an event resource. This resource can be used to free
-   the event handler using <function>ibase_free_event_handler</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ibase_set_event_handler</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function event_handler($event_name, $link)
-{
-    if ($event_name == "NEW ORDER") {
-        // process new order
-        ibase_query($link, "UPDATE orders SET status='handled'");
-    } else if ($event_name == "DB_SHUTDOWN") {
-        // free event handler
-        return false;
-    }
-}
-
-ibase_set_event_handler($link, "event_handler", "NEW_ORDER", "DB_SHUTDOWN");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_free_event_handler</function></member>
-   <member><function>ibase_wait_event</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/ibase/functions/ibase-trans.xml b/reference/ibase/functions/ibase-trans.xml
deleted file mode 100644
index 74d676afbb35..000000000000
--- a/reference/ibase/functions/ibase-trans.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-trans">
- <refnamediv>
-  <refname>ibase_trans</refname>
-  <refpurpose>Begin a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_trans</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>trans_args</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>resource</type><methodname>ibase_trans</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Begins a transaction.
-  </simpara>
-  <note>
-   <simpara>
-    The first call to <function>ibase_trans</function> will not return the default transaction
-    of a connection. All transactions started by <function>ibase_trans</function>
-    will be rolled back at the end of the script if they were not committed or
-    rolled back by either <function>ibase_commit</function> or
-    <function>ibase_rollback</function>.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function will accept multiple <parameter>trans_args</parameter>
-    and <parameter>link_identifier</parameter> arguments. This allows transactions
-    over multiple database connections, which are committed using a 2-phase commit
-    algorithm. This means you can rely on the updates to either succeed in every
-    database, or fail in every database. It does NOT mean you can use tables from
-    different databases in the same query!
-   </simpara>
-   <simpara>
-    If you use transactions over multiple databases, you will have to specify both
-    the <parameter>link_id</parameter> and <parameter>transaction_id</parameter>
-    in calls to <function>ibase_query</function> and <function>ibase_prepare</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>trans_args</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>trans_args</parameter> can be a combination of
-      <constant>IBASE_READ</constant>,
-      <constant>IBASE_WRITE</constant>,
-      <constant>IBASE_COMMITTED</constant>,
-      <constant>IBASE_CONSISTENCY</constant>,
-      <constant>IBASE_CONCURRENCY</constant>,
-      <constant>IBASE_REC_VERSION</constant>,
-      <constant>IBASE_REC_NO_VERSION</constant>,
-      <constant>IBASE_WAIT</constant> and
-      <constant>IBASE_NOWAIT</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>link_identifier</parameter></term>
-    <listitem>
-     <simpara>
-      An InterBase link identifier. If omitted, the last opened link is
-      assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a transaction handle, or &false; on error.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibase/functions/ibase-wait-event.xml b/reference/ibase/functions/ibase-wait-event.xml
deleted file mode 100644
index a39d82b8d712..000000000000
--- a/reference/ibase/functions/ibase-wait-event.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ibase-wait-event">
- <refnamediv>
-  <refname>ibase_wait_event</refname>
-  <refpurpose>Wait for an event to be posted by the database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_wait_event</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter>event_names</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>ibase_wait_event</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter>event_names</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function suspends execution of the script until one of the specified events
-   is posted by the database. The name of the event that was posted is returned. This
-   function accepts up to 15 event arguments.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <simpara>
-      The event name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>event_names</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the name of the event that was posted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ibase_set_event_handler</function></member>
-   <member><function>ibase_free_event_handler</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/ibase/ini.xml b/reference/ibase/ini.xml
deleted file mode 100644
index c43d2219f04a..000000000000
--- a/reference/ibase/ini.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="ibase.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
- <table>
-  <title>InterBase configuration options</title>
-  <tgroup cols="4">
-   <thead>
-    <row>
-     <entry>&Name;</entry>
-     <entry>&Default;</entry>
-     <entry>&Changeable;</entry>
-     <entry>&Changelog;</entry>
-    </row>
-   </thead>
-   <tbody xml:id="ibase.configuration.list">
-    <row>
-     <entry><link linkend="ini.ibase.allow-persistent">ibase.allow_persistent</link></entry>
-     <entry>"1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.max-persistent">ibase.max_persistent</link></entry>
-     <entry>"-1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.max-links">ibase.max_links</link></entry>
-     <entry>"-1"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.default-db">ibase.default_db</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.default-user">ibase.default_user</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.default-password">ibase.default_password</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.default-charset">ibase.default_charset</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.timestampformat">ibase.timestampformat</link></entry>
-     <entry>"%Y-%m-%d %H:%M:%S"</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.dateformat">ibase.dateformat</link></entry>
-     <entry>"%Y-%m-%d"</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibase.timeformat">ibase.timeformat</link></entry>
-     <entry>"%H:%M:%S"</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
- &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
-<variablelist>
-  <varlistentry xml:id="ini.ibase.allow-persistent">
-  <term>
-   <parameter>ibase.allow_persistent</parameter>
-   <type>bool</type>
-  </term>
-  <listitem>
-   <simpara>
-    Whether to allow
-    <link linkend="features.persistent-connections">persistent connections</link>
-    to Firebird/InterBase.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.ibase.max-persistent">
-  <term>
-   <parameter>ibase.max_persistent</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    The maximum number of persistent Firebird/InterBase connections per
-    process. New connections created with ibase_pconnect() will be non-persistent
-    if this number would be exceeded.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.ibase.max-links">
-  <term>
-   <parameter>ibase.max_links</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    The maximum number of Firebird/InterBase connections per process, including
-    persistent connections.
-   </simpara>
-  </listitem>
- </varlistentry>
-  <varlistentry xml:id="ini.ibase.default-db">
-  <term>
-   <parameter>ibase.default_db</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default database to connect to when ibase_[p]connect() is called
-    without specifying a database name. If this value is set and SQL safe
-    mode is enabled, no other connections than to this database will be allowed.
-   </simpara>
-  </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.ibase.default-user">
-  <term>
-   <parameter>ibase.default_user</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The user name to use when connecting to a database
-    if no user name is specified.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.ibase.default-password">
-  <term>
-   <parameter>ibase.default_password</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The password to use when connecting to a database
-    if no password is specified.
-   </simpara>
-  </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.ibase.default-charset">
-  <term>
-   <parameter>ibase.default_charset</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The character set to use when connecting to a database
-    if no character set is specified.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <!-- Date and time directives -->
-
- <varlistentry xml:id="ini.ibase.timestampformat">
-  <term>
-   <parameter>ibase.timestampformat</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-   </simpara>
-  </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.ibase.dateformat">
-  <term>
-   <parameter>ibase.dateformat</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-   </simpara>
-  </listitem>
- </varlistentry>
- <varlistentry xml:id="ini.ibase.timeformat">
-  <term>
-   <parameter>ibase.timeformat</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-   These directives are used to set the date and time formats
-   that are used when returning dates and times from a result set,
-   or when binding arguments to date and time parameters.
-   </simpara>
-  </listitem>
- </varlistentry>
-
-</variablelist>
-</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/ibase/reference.xml b/reference/ibase/reference.xml
deleted file mode 100644
index 6df96bb60eb0..000000000000
--- a/reference/ibase/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ibase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Firebird/InterBase &Functions;</title>
-
-  &reference.ibase.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/ibase/setup.xml b/reference/ibase/setup.xml
deleted file mode 100644
index 7d28d3885250..000000000000
--- a/reference/ibase/setup.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ibase.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.ibase.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.ibase.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/ibase/versions.xml b/reference/ibase/versions.xml
deleted file mode 100644
index a5f838430d0e..000000000000
--- a/reference/ibase/versions.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name="ibase_add_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_affected_rows" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_backup" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_add" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_cancel" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_close" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_create" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_echo" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_get" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_import" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_blob_open" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_close" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_commit" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_commit_ret" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_connect" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_db_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_delete_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_drop_db" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_errcode" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_errmsg" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_execute" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_fetch_assoc" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_fetch_object" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_fetch_row" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_field_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_free_event_handler" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_free_query" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_free_result" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_gen_id" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_maintain_db" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_modify_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_name_result" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_num_fields" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_num_params" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_num_rows" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_param_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_pconnect" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_prepare" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_query" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_restore" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_rollback" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_rollback_ret" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_server_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_service_attach" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_service_detach" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_set_event_handler" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_trans" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="ibase_wait_event" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <!-- Firebird alias functions for future use -->
- <function name="fbird_add_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_affected_rows" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_backup" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_add" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_cancel" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_close" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_create" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_echo" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_get" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_import" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_blob_open" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_close" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_commit" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_commit_ret" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_connect" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_db_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_delete_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_drop_db" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_errcode" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_errmsg" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_execute" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_fetch_assoc" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_fetch_object" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_fetch_row" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_field_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_free_event_handler" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_free_query" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_free_result" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_gen_id" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_maintain_db" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_modify_user" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_name_result" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_num_fields" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_num_params" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_num_rows" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_param_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_pconnect" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_prepare" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_query" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_restore" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_rollback" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_rollback_ret" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_server_info" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_service_attach" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_service_detach" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_set_event_handler" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_trans" from="PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="fbird_wait_event" from="PHP 5, PHP 7 &lt; 7.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
--->
diff --git a/reference/ibm_db2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ibm_db2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ibm_db2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ibm_db2/book.xml b/reference/ibm_db2/book.xml
deleted file mode 100644
index cc530f2fae3a..000000000000
--- a/reference/ibm_db2/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ibm-db2">
- <?phpdoc extension-membership="pecl" ?>
- <title>IBM DB2, Cloudscape and Apache Derby</title>
- <titleabbrev>IBM DB2</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.ibm-db2">
-  &reftitle.intro;
-  <simpara>
-   These functions enable you to access IBM DB2 Universal Database, IBM
-   Cloudscape, and Apache Derby databases using the DB2 Call Level Interface
-   (DB2 CLI).
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.ibm-db2.setup;
- &reference.ibm-db2.constants;
- &reference.ibm-db2.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/ibm_db2/configure.xml b/reference/ibm_db2/configure.xml
deleted file mode 100644
index 0535af0587c5..000000000000
--- a/reference/ibm_db2/configure.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ibm-db2.installation">
- &reftitle.install;
- <simpara>
-  To build the ibm_db2 extension, the DB2 application development header files
-  and libraries must be installed on the system.
-  DB2 does not install these by default, so it may be necessary to return to the
-  DB2 installer and add this option.
-  The DB2 Application Development Client includes the header files and is freely
-  available for download from the IBM DB2 Universal Database
-  <link xlink:href="&url.ibm.db2.client;">support site</link>.
- </simpara>
- <simpara>
-  If the DB2 application development header files and libraries are added to a
-  Linux or Unix operating system on which DB2 was already installed, the command
-  <command>db2iupdt -e</command> must be issued to update the symbolic links to
-  the header files and libraries in the DB2 instances.
- </simpara>
- <para>
-  ibm_db2 is a &link.pecl; extension, so follow the instructions in
-  <xref linkend="install.pecl"/> to install the ibm_db2 extension for PHP.
-  Issue the <command>configure</command> command to point to the location of
-  the DB2 header files and libraries as follows:
-  <screen>
-<![CDATA[
-bash$ ./configure --with-IBM_DB2=/path/to/DB2
-]]>
-  </screen>
-  The <command>configure</command> command defaults to
-  <filename class="directory">/opt/IBM/db2/V8.1</filename>.
- </para>
- <note>
-  <title>Note for IIS users</title>
-  <simpara>
-   If the ibm_db2 driver is being used with Microsoft Internet Information
-   Server (IIS), it may be necessary to do the following:
-  </simpara>
-  <simplelist>
-   <member>
-    Install DB2 with extended operating system security.
-   </member>
-   <member>
-    Add the PHP binary path to the <envar>PATH</envar> system environment variable (default C:\php\).
-   </member>
-   <member>
-    Create another system environment variable equal to the path where the PHP.INI file is located (eg: PHPRC = C:\php\).
-   </member>
-   <member>
-    Add the IUSR_COMPUTERNAME to the DB2USERS group.
-   </member>
-  </simplelist>
- </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/ibm_db2/constants.xml b/reference/ibm_db2/constants.xml
deleted file mode 100644
index 0b07fec93246..000000000000
--- a/reference/ibm_db2/constants.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<appendix xml:id="ibm-db2.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.db2-binary">
-   <term>
-    <constant>DB2_BINARY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara> 
-     Specifies that binary data shall be returned as is. This is the default
-     mode.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-convert">
-   <term>
-    <constant>DB2_CONVERT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that binary data shall be converted to a hexadecimal encoding
-     and returned as an ASCII string.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-passthru">
-   <term>
-    <constant>DB2_PASSTHRU</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that binary data shall be converted to a &null; value.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-scrollable">
-   <term>
-    <constant>DB2_SCROLLABLE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara> 
-     Specifies a scrollable cursor for a statement resource. This mode enables
-     random access to rows in a result set, but currently is supported only by
-     IBM DB2 Universal Database.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-forward-only">
-   <term>
-    <constant>DB2_FORWARD_ONLY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies a forward-only cursor for a statement resource. This is the
-     default cursor type and is supported on all database servers.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-param-in">
-   <term>
-    <constant>DB2_PARAM_IN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the PHP variable should be bound as an IN parameter for a
-     stored procedure.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-param-out">
-   <term>
-    <constant>DB2_PARAM_OUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the PHP variable should be bound as an OUT parameter for a
-     stored procedure.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-param-inout">
-   <term>
-    <constant>DB2_PARAM_INOUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies the PHP variable should be bound as an INOUT parameter for a
-     stored procedure.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-param-file">
-   <term>
-    <constant>DB2_PARAM_FILE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that the column should be bound directly to a file for input.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-autocommit-on">
-   <term>
-    <constant>DB2_AUTOCOMMIT_ON</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that autocommit should be turned on.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-autocommit-off">
-   <term>
-    <constant>DB2_AUTOCOMMIT_OFF</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that autocommit should be turned off.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-double">
-   <term>
-    <constant>DB2_DOUBLE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that the variable should be bound as a DOUBLE, FLOAT, or REAL
-     data type.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-long">
-   <term>
-    <constant>DB2_LONG</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that the variable should be bound as a SMALLINT, INTEGER, or
-     BIGINT data type.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-char">
-   <term>
-    <constant>DB2_CHAR</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that the variable should be bound as a CHAR or VARCHAR data type.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-case-natural">
-   <term>
-    <constant>DB2_CASE_NATURAL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that column names will be returned in their natural case.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-case-lower">
-   <term>
-    <constant>DB2_CASE_LOWER</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that column names will be returned in lower case.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-case-upper">
-   <term>
-    <constant>DB2_CASE_UPPER</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that column names will be returned in upper case.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-deferred-prepare-on">
-   <term>
-    <constant>DB2_DEFERRED_PREPARE_ON</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that deferred prepare should be turned on for the specified statement resource. 
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.db2-deferred-prepare-off">
-   <term>
-    <constant>DB2_DEFERRED_PREPARE_OFF</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that deferred prepare should be turned off for the specified statement resource. 
-    </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/ibm_db2/functions/db2-autocommit.xml b/reference/ibm_db2/functions/db2-autocommit.xml
deleted file mode 100644
index 526f3fe1f9cc..000000000000
--- a/reference/ibm_db2/functions/db2-autocommit.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.db2-autocommit">
- <refnamediv>
-  <refname>db2_autocommit</refname>
-  <refpurpose>
-   Returns or sets the AUTOCOMMIT state for a database connection
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>bool</type></type><methodname>db2_autocommit</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Sets or gets the AUTOCOMMIT behavior of the specified connection resource.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid database connection resource variable as returned from
-      <function>db2_connect</function> or <function>db2_pconnect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      One of the following constants:
-      <variablelist>
-       <varlistentry>
-        <term><constant>DB2_AUTOCOMMIT_OFF</constant></term>
-        <listitem>
-         <simpara>
-          Turns AUTOCOMMIT off.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><constant>DB2_AUTOCOMMIT_ON</constant></term>
-        <listitem>
-         <simpara>
-          Turns AUTOCOMMIT on.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   When <function>db2_autocommit</function> receives only the
-   <parameter>connection</parameter> parameter, it returns the current state
-   of AUTOCOMMIT for the requested connection as an integer value. A value of
-   <constant>DB2_AUTOCOMMIT_OFF</constant> indicates that AUTOCOMMIT is off,
-   while a value of <constant>DB2_AUTOCOMMIT_ON</constant> indicates that
-   AUTOCOMMIT is on.
-  </simpara>
-  <simpara>
-   When <function>db2_autocommit</function> receives both the
-   <parameter>connection</parameter> parameter and
-   <parameter>autocommit</parameter> parameter, it attempts to set the
-   AUTOCOMMIT state of the requested connection to the corresponding state.
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Retrieving the AUTOCOMMIT value for a connection</title>
-    <simpara>
-     In the following example, a connection which has been created with
-     AUTOCOMMIT turned off is tested with the
-     <function>db2_autocommit</function> function.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF);
-$conn = db2_connect($database, $user, $password, $options);
-$ac = db2_autocommit($conn);
-if ($ac == DB2_AUTOCOMMIT_OFF) {
-    print "$ac -- AUTOCOMMIT is off.";
-} else {
-    print "$ac -- AUTOCOMMIT is on.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0 -- AUTOCOMMIT is off.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Setting the AUTOCOMMIT value for a connection</title>
-    <simpara>
-     In the following example, a connection which was initially created with
-     AUTOCOMMIT turned off has its behavior changed to turn AUTOCOMMIT on.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF);
-$conn = db2_connect($database, $user, $password, $options);
-
-// Turn AUTOCOMMIT on
-$rc = db2_autocommit($conn, DB2_AUTOCOMMIT_ON);
-if ($rc) {
-    print "Turning AUTOCOMMIT on succeeded.\n";
-}
-
-// Check AUTOCOMMIT state
-$ac = db2_autocommit($conn);
-if ($ac == DB2_AUTOCOMMIT_OFF) {
-    print "$ac -- AUTOCOMMIT is off.";
-} else {
-    print "$ac -- AUTOCOMMIT is on.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Turning AUTOCOMMIT on succeeded.
-1 -- AUTOCOMMIT is on.
-]]>
-    </screen>
-   </example>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_connect</function></member>
-   <member><function>db2_pconnect</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/ibm_db2/functions/db2-bind-param.xml b/reference/ibm_db2/functions/db2-bind-param.xml
deleted file mode 100644
index 58c2906f8e64..000000000000
--- a/reference/ibm_db2/functions/db2-bind-param.xml
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-bind-param">
- <refnamediv>
-  <refname>db2_bind_param</refname>
-  <refpurpose>
-   Binds a PHP variable to an SQL statement parameter
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_bind_param</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type>int</type><parameter>parameter_number</parameter></methodparam>
-   <methodparam><type>string</type><parameter>variable_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>parameter_type</parameter><initializer><constant>DB2_PARAM_IN</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>data_type</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>precision</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>scale</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Binds a PHP variable to an SQL statement parameter in a statement resource
-   returned by <function>db2_prepare</function>. This function gives you more
-   control over the parameter type, data type, precision, and scale for the
-   parameter than simply passing the variable as part of the optional input
-   array to <function>db2_execute</function>.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A prepared statement returned from <function>db2_prepare</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameter_number</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the 1-indexed position of the parameter in the prepared
-      statement.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-   <term><parameter>variable_name</parameter></term>
-    <listitem>
-     <simpara>
-      A string specifying the name of the PHP variable to bind to the
-      parameter specified by <parameter>parameter_number</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameter_type</parameter></term>
-    <listitem>
-     <simpara>
-      A constant specifying whether the PHP variable should be bound to the
-      SQL parameter as an input parameter (<constant>DB2_PARAM_IN</constant>),
-      an output parameter (<constant>DB2_PARAM_OUT</constant>), or as a
-      parameter that accepts input and returns output
-      (<constant>DB2_PARAM_INOUT</constant>). To avoid memory overhead, you can
-      also specify <constant>DB2_PARAM_FILE</constant> to bind the PHP variable
-      to the name of a file that contains large object (BLOB, CLOB, or DBCLOB)
-      data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data_type</parameter></term>
-    <listitem>
-     <simpara>
-      A constant specifying the SQL data type that the PHP variable should be
-      bound as: one of <constant>DB2_BINARY</constant>,
-      <constant>DB2_CHAR</constant>, <literal>DB2_DOUBLE</literal>, or
-      <constant>DB2_LONG</constant> .
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>precision</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the precision with which the variable should be bound to the
-      database. This parameter can also be used for retrieving XML output values
-      from stored procedures. A non-negative value specifies the maximum size of
-      the XML data that will be retrieved from the database. If this parameter
-      is not used, a default of 1MB will be assumed for retrieving the XML
-      output value from the stored procedure.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>scale</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the scale with which the variable should be bound to the
-      database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Binding PHP variables to a prepared statement</title>
-    <simpara>
-     The SQL statement in the following example uses two input parameters in
-     the WHERE clause. We call <function>db2_bind_param</function> to bind two
-     PHP variables to the corresponding SQL parameters. Notice that the PHP
-     variables do not have to be declared or assigned before the call to
-     <function>db2_bind_param</function>; in the example,
-     <literal>$lower_limit</literal> is assigned a value before the call to
-     <function>db2_bind_param</function>, but <literal>$upper_limit</literal>
-     is assigned a value after the call to
-     <function>db2_bind_param</function>. The variables must be bound and, for
-     parameters that accept input, must have any value assigned, before calling
-     <function>db2_execute</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = 'SELECT name, breed, weight FROM animals
-    WHERE weight > ? AND weight < ?';
-$conn = db2_connect($database, $user, $password);
-$stmt = db2_prepare($conn, $sql);
-
-// We can declare the variable before calling db2_bind_param()
-$lower_limit = 1;
-
-db2_bind_param($stmt, 1, "lower_limit", DB2_PARAM_IN);
-db2_bind_param($stmt, 2, "upper_limit", DB2_PARAM_IN);
-
-// We can also declare the variable after calling db2_bind_param()
-$upper_limit = 15.0;
-
-if (db2_execute($stmt)) {
-    while ($row = db2_fetch_array($stmt)) {
-        print "{$row[0]}, {$row[1]}, {$row[2]}\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Pook, cat, 3.2
-Rickety Ride, goat, 9.7
-Peaches, dog, 12.3
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Calling stored procedures with IN and OUT parameters</title>
-    <para>
-     The stored procedure match_animal in the following example accepts
-     three different parameters:
-     <orderedlist>
-      <listitem>
-       <simpara>
-        an input (IN) parameter that accepts the name of the first animal as
-        input
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        an input-output (INOUT) parameter that accepts the name of the second
-        animal as input and returns the string <literal>TRUE</literal> if an
-        animal in the database matches that name
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        an output (OUT) parameter that returns the sum of the weight of the
-        two identified animals
-       </simpara>
-      </listitem>
-     </orderedlist>
-     In addition, the stored procedure returns a result set consisting of the
-     animals listed in alphabetic order starting at the animal corresponding
-     to the input value of the first parameter and ending at the animal
-     corresponding to the input value of the second parameter.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = 'CALL match_animal(?, ?, ?)';
-$conn = db2_connect($database, $user, $password);
-$stmt = db2_prepare($conn, $sql);
-
-$name = "Peaches";
-$second_name = "Rickety Ride";
-$weight = 0;
-
-db2_bind_param($stmt, 1, "name", DB2_PARAM_IN);
-db2_bind_param($stmt, 2, "second_name", DB2_PARAM_INOUT);
-db2_bind_param($stmt, 3, "weight", DB2_PARAM_OUT);
-
-print "Values of bound parameters _before_ CALL:\n";
-print "  1: {$name} 2: {$second_name} 3: {$weight}\n\n";
-
-if (db2_execute($stmt)) {
-    print "Values of bound parameters _after_ CALL:\n";
-    print "  1: {$name} 2: {$second_name} 3: {$weight}\n\n";
-
-    print "Results:\n";
-    while ($row = db2_fetch_array($stmt)) {
-        print "  {$row[0]}, {$row[1]}, {$row[2]}\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Values of bound parameters _before_ CALL:
-  1: Peaches 2: Rickety Ride 3: 0
-
-Values of bound parameters _after_ CALL:
-  1: Peaches 2: TRUE 3: 22
-
-Results:
-  Peaches, dog, 12.3
-  Pook, cat, 3.2
-  Rickety Ride, goat, 9.7
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Inserting a binary large object (BLOB) directly from a file</title>
-    <simpara>
-     The data for large objects are typically stored in files, such as XML
-     documents or audio files. Rather than reading an entire file into a PHP
-     variable, and then binding that PHP variable into an SQL statement, you
-     can avoid some memory overhead by binding the file directly to the input
-     parameter of your SQL statement. The following example demonstrates how
-     to bind a file directly into a BLOB column.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$stmt = db2_prepare($conn, "INSERT INTO animal_pictures(picture) VALUES (?)");
-
-$picture = "/opt/albums/spook/grooming.jpg";
-$rc = db2_bind_param($stmt, 1, "picture", DB2_PARAM_FILE);
-$rc = db2_execute($stmt);
-?>
-]]>
-    </programlisting>
-   </example>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_execute</function></member>
-   <member><function>db2_prepare</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/ibm_db2/functions/db2-client-info.xml b/reference/ibm_db2/functions/db2-client-info.xml
deleted file mode 100644
index 3528d77bd23e..000000000000
--- a/reference/ibm_db2/functions/db2-client-info.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.db2-client-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_client_info</refname>
-  <refpurpose>Returns an object with properties that describe the DB2 database client</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_client_info</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This function returns an object with read-only properties that return
-   information about the DB2 database client. The following table lists
-   the DB2 client properties:
-   <table>
-    <title>DB2 client properties</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Property name</entry>
-       <entry>Return type</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>APPL_CODEPAGE</entry>
-       <entry>int</entry>
-       <entry>The application code page.</entry>
-      </row>
-      <row>
-       <entry>CONN_CODEPAGE</entry>
-       <entry>int</entry>
-       <entry>The code page for the current connection.</entry>
-      </row>
-      <row>
-       <entry>DATA_SOURCE_NAME</entry>
-       <entry>string</entry>
-       <entry>The data source name (DSN) used to create the current connection
-        to the database.</entry>
-      </row>
-      <row>
-       <entry>DRIVER_NAME</entry>
-       <entry>string</entry>
-       <entry>The name of the library that implements the DB2 Call
-        Level Interface (CLI) specification.</entry>
-      </row>
-      <row>
-       <entry>DRIVER_ODBC_VER</entry>
-       <entry>string</entry>
-       <entry>The version of ODBC that the DB2 client supports. This returns a
-        string "MM.mm" where <varname>MM</varname> is the major version and
-        <varname>mm</varname> is the minor version. The DB2 client always
-        returns "03.51".
-       </entry>
-      </row>
-      <row>
-       <entry>DRIVER_VER</entry>
-       <entry>string</entry>
-       <entry>The version of the client, in the form of a string "MM.mm.uuuu" where
-        <varname>MM</varname> is the major version,
-        <varname>mm</varname> is the minor version,
-        and <varname>uuuu</varname> is the update. For example, "08.02.0001"
-        represents major version 8, minor version 2, update 1.
-       </entry>
-      </row>
-      <row>
-       <entry>ODBC_SQL_CONFORMANCE</entry>
-       <entry>string</entry>
-       <entry>
-        <para>The level of ODBC SQL grammar supported by the client:
-        <variablelist>
-         <varlistentry>
-          <term>MINIMUM</term>
-          <listitem>
-           <simpara>
-            Supports the minimum ODBC SQL grammar.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>CORE</term>
-          <listitem>
-           <simpara>
-            Supports the core ODBC SQL grammar.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>EXTENDED</term>
-          <listitem>
-           <simpara>
-            Supports extended ODBC SQL grammar.
-           </simpara>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>ODBC_VER</entry>
-       <entry>string</entry>
-       <entry>The version of ODBC that the ODBC driver manager supports. This
-        returns a string "MM.mm.rrrr" where <varname>MM</varname> is the major
-        version, <varname>mm</varname> is the minor version, and
-        <varname>rrrr</varname> is the release. The DB2 client always returns
-        "03.01.0000".
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies an active DB2 client connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object on a successful call,&return.falseforfailure;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>db2_client_info</function> example</title>
-   <simpara>
-    To retrieve information about the client, you must pass a valid
-    database connection resource to <function>db2_client_info</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[<?php
-$conn = db2_connect( 'SAMPLE', 'db2inst1', 'ibmdb2' );
-$client = db2_client_info( $conn );
-
-if ($client) {
-    echo "DRIVER_NAME: ";           var_dump( $client->DRIVER_NAME );
-    echo "DRIVER_VER: ";            var_dump( $client->DRIVER_VER );
-    echo "DATA_SOURCE_NAME: ";      var_dump( $client->DATA_SOURCE_NAME );
-    echo "DRIVER_ODBC_VER: ";       var_dump( $client->DRIVER_ODBC_VER );
-    echo "ODBC_VER: ";              var_dump( $client->ODBC_VER );
-    echo "ODBC_SQL_CONFORMANCE: ";  var_dump( $client->ODBC_SQL_CONFORMANCE );
-    echo "APPL_CODEPAGE: ";         var_dump( $client->APPL_CODEPAGE );
-    echo "CONN_CODEPAGE: ";         var_dump( $client->CONN_CODEPAGE );
-}
-else {
-    echo "Error retrieving client information.
-     Perhaps your database connection was invalid.";
-}
-db2_close($conn);
-
-?>]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-DRIVER_NAME: string(8) "libdb2.a"
-DRIVER_VER: string(10) "08.02.0001"
-DATA_SOURCE_NAME: string(6) "SAMPLE"
-DRIVER_ODBC_VER: string(5) "03.51"
-ODBC_VER: string(10) "03.01.0000"
-ODBC_SQL_CONFORMANCE: string(8) "EXTENDED"
-APPL_CODEPAGE: int(819)
-CONN_CODEPAGE: int(819)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_server_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibm_db2/functions/db2-close.xml b/reference/ibm_db2/functions/db2-close.xml
deleted file mode 100644
index b8a3d7925e82..000000000000
--- a/reference/ibm_db2/functions/db2-close.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-close">
- <refnamediv>
-  <refname>db2_close</refname>
-  <refpurpose>
-   Closes a database connection
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_close</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   This function closes a DB2 client connection created with
-   <function>db2_connect</function> and returns the corresponding
-   resources to the database server.
-  </simpara>
-  <simpara>
-   If you attempt to close a persistent DB2 client connection created with
-   <function>db2_pconnect</function>, the close request is ignored and the
-   persistent DB2 client connection remains available for the next caller.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies an active DB2 client connection.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Closing a connection</title>
-   <simpara>
-    The following example demonstrates a successful attempt to close a
-    connection to an IBM DB2, Cloudscape, or Apache Derby database.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect('SAMPLE', 'db2inst1', 'ibmdb2');
-$rc = db2_close($conn);
-if ($rc) {
-    echo "Connection was successfully closed.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Connection was successfully closed.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_connect</function></member>
-   <member><function>db2_pclose</function></member>
-   <member><function>db2_pconnect</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/ibm_db2/functions/db2-column-privileges.xml b/reference/ibm_db2/functions/db2-column-privileges.xml
deleted file mode 100644
index c73f35844846..000000000000
--- a/reference/ibm_db2/functions/db2-column-privileges.xml
+++ /dev/null
@@ -1,169 +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.db2-column-privileges" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_column_privileges</refname>
-  <refpurpose>
-   Returns a result set listing the columns and associated privileges for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_column_privileges</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>column_name</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns a result set listing the columns and associated privileges for a
-   table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. To match all schemas, pass &null;
-      or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table or view. To match all tables in the database,
-      pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the column. To match all columns in the table, pass &null;
-      or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the column privileges for columns matching the specified parameters. The
-   rows are composed of the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>TABLE_CAT</entry>
-        <entry>Name of the catalog. The value is NULL if this table does not
-         have catalogs.</entry>
-       </row>
-       <row>
-        <entry>TABLE_SCHEM</entry>
-        <entry>Name of the schema.</entry>
-       </row>
-       <row>
-        <entry>TABLE_NAME</entry>
-        <entry>Name of the table or view.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_NAME</entry>
-        <entry>Name of the column.</entry>
-       </row>
-       <row>
-        <entry>GRANTOR</entry>
-        <entry>Authorization ID of the user who granted the privilege.</entry>
-       </row>
-       <row>
-        <entry>GRANTEE</entry>
-        <entry>Authorization ID of the user to whom the privilege was
-         granted.</entry>
-       </row>
-       <row>
-        <entry>PRIVILEGE</entry>
-        <entry>The privilege for the column.</entry>
-       </row>
-       <row>
-        <entry>IS_GRANTABLE</entry>
-        <entry>Whether the GRANTEE is permitted to grant this privilege to
-        other users.</entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-columns.xml b/reference/ibm_db2/functions/db2-columns.xml
deleted file mode 100644
index 2bd0482787a9..000000000000
--- a/reference/ibm_db2/functions/db2-columns.xml
+++ /dev/null
@@ -1,227 +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.db2-columns" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_columns</refname>
-  <refpurpose>
-   Returns a result set listing the columns and associated metadata for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_columns</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>column_name</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the columns and associated metadata for a
-   table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-   <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. To match all schemas, pass
-      <literal>'%'</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table or view. To match all tables in the database,
-      pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the column. To match all columns in the table, pass &null;
-      or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the columns matching the specified parameters. The rows are composed of
-   the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>TABLE_CAT</entry>
-        <entry>Name of the catalog. The value is NULL if this table does not
-         have catalogs.</entry>
-       </row>
-       <row>
-        <entry>TABLE_SCHEM</entry>
-        <entry>Name of the schema.</entry>
-       </row>
-       <row>
-        <entry>TABLE_NAME</entry>
-        <entry>Name of the table or view.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_NAME</entry>
-        <entry>Name of the column.</entry>
-       </row>
-       <row>
-        <entry>DATA_TYPE</entry>
-        <entry>The SQL data type for the column represented as an integer value.</entry>
-       </row>
-       <row>
-        <entry>TYPE_NAME</entry>
-        <entry>A string representing the data type for the column.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_SIZE</entry>
-        <entry>An integer value representing the size of the column.</entry>
-       </row>
-       <row>
-        <entry>BUFFER_LENGTH</entry>
-        <entry>
-         Maximum number of bytes necessary to store data from this column.
-        </entry>
-       </row>
-       <row>
-        <entry>DECIMAL_DIGITS</entry>
-        <entry>
-         The scale of the column, or &null; where scale is not applicable.
-        </entry>
-       </row>
-       <row>
-        <entry>NUM_PREC_RADIX</entry>
-        <entry>
-         An integer value of either <literal>10</literal> (representing
-         an exact numeric data type), <literal>2</literal> (representing an
-         approximate numeric data type), or &null; (representing a data type for
-         which radix is not applicable).
-        </entry>
-       </row>
-       <row>
-        <entry>NULLABLE</entry>
-        <entry>An integer value representing whether the column is nullable or
-        not.</entry>
-       </row>
-       <row>
-        <entry>REMARKS</entry>
-        <entry>Description of the column.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_DEF</entry>
-        <entry>Default value for the column.</entry>
-       </row>
-       <row>
-        <entry>SQL_DATA_TYPE</entry>
-        <entry>An integer value representing the size of the column.</entry>
-       </row>
-       <row>
-        <entry>SQL_DATETIME_SUB</entry>
-        <entry>
-         Returns an integer value representing a datetime subtype code,
-         or &null; for SQL data types to which this does not apply.
-        </entry>
-       </row>
-       <row>
-        <entry>CHAR_OCTET_LENGTH</entry>
-        <entry>
-         Maximum length in octets for a character data type column, which
-         matches COLUMN_SIZE for single-byte character set data, or &null; for
-         non-character data types.
-        </entry>
-       </row>
-       <row>
-        <entry>ORDINAL_POSITION</entry>
-        <entry>The 1-indexed position of the column in the table.</entry>
-       </row>
-       <row>
-        <entry>IS_NULLABLE</entry>
-        <entry>
-         A string value where 'YES' means that the column is nullable and
-         'NO' means that the column is not nullable.
-       </entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-commit.xml b/reference/ibm_db2/functions/db2-commit.xml
deleted file mode 100644
index a1907bc65b12..000000000000
--- a/reference/ibm_db2/functions/db2-commit.xml
+++ /dev/null
@@ -1,76 +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.db2-commit" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_commit</refname>
-  <refpurpose>
-   Commits a transaction
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_commit</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Commits an in-progress transaction on the specified connection resource and
-   begins a new transaction. PHP applications normally default to AUTOCOMMIT
-   mode, so <function>db2_commit</function> is not necessary unless AUTOCOMMIT
-   has been turned off for the connection resource.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid database connection resource variable as returned from
-      <function>db2_connect</function> or <function>db2_pconnect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_autocommit</function></member>
-   <member><function>db2_rollback</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/ibm_db2/functions/db2-conn-error.xml b/reference/ibm_db2/functions/db2-conn-error.xml
deleted file mode 100644
index 467a06a13acb..000000000000
--- a/reference/ibm_db2/functions/db2-conn-error.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-conn-error">
- <refnamediv>
-  <refname>db2_conn_error</refname>
-  <refpurpose>
-   Returns a string containing the SQLSTATE returned by the last connection attempt
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>db2_conn_error</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   <function>db2_conn_error</function> returns an SQLSTATE value representing
-   the reason the last attempt to connect to a database failed. As
-   <function>db2_connect</function> returns &false; in the event of a failed
-   connection attempt, you do not pass any parameters to
-   <function>db2_conn_error</function> to retrieve the SQLSTATE value.
-  </simpara>
-  <simpara>
-   If, however, the connection was successful but becomes invalid over time,
-   you can pass the <parameter>connection</parameter> parameter to retrieve
-   the SQLSTATE value for a specific connection.
-  </simpara>
-  <para>
-   To learn what the SQLSTATE value means, you can issue the following command
-   at a DB2 Command Line Processor prompt:
-   <userinput>db2 '? <parameter>sqlstate-value</parameter>'</userinput>. You
-   can also call <function>db2_conn_errormsg</function> to retrieve an
-   explicit error message and the associated SQLCODE value.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A connection resource associated with a connection that initially
-      succeeded, but which over time became invalid.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the SQLSTATE value resulting from a failed connection attempt.
-   Returns an empty string if there is no error associated with the last
-   connection attempt.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving an SQLSTATE value for a failed connection attempt</title>
-   <simpara>
-    The following example demonstrates how to return an SQLSTATE value
-    after deliberately passing invalid parameters to
-    <function>db2_connect</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect('badname', 'baduser', 'badpassword');
-if (!$conn) {
-    print "SQLSTATE value: " . db2_conn_error();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-SQLSTATE value: 08001
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_conn_errormsg</function></member>
-   <member><function>db2_connect</function></member>
-   <member><function>db2_stmt_error</function></member>
-   <member><function>db2_stmt_errormsg</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/ibm_db2/functions/db2-conn-errormsg.xml b/reference/ibm_db2/functions/db2-conn-errormsg.xml
deleted file mode 100644
index 898e98534080..000000000000
--- a/reference/ibm_db2/functions/db2-conn-errormsg.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-conn-errormsg">
- <refnamediv>
-  <refname>db2_conn_errormsg</refname>
-  <refpurpose>
-   Returns the last connection error message and SQLCODE value
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>db2_conn_errormsg</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>connection</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>db2_conn_errormsg</function> returns an error message and SQLCODE
-   value representing the reason the last database connection attempt failed.
-   As <function>db2_connect</function> returns &false; in the event of a failed
-   connection attempt, do not pass any parameters to
-   <function>db2_conn_errormsg</function> to retrieve the associated error
-   message and SQLCODE value.
-  </simpara>
-  <simpara>
-   If, however, the connection was successful but becomes invalid over time,
-   you can pass the <parameter>connection</parameter> parameter to retrieve
-   the associated error message and SQLCODE value for a specific connection.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-     <listitem>
-      <simpara>
-       A connection resource associated with a connection that initially
-       succeeded, but which over time became invalid.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the error message and SQLCODE value resulting
-   from a failed connection attempt. If there is no error associated with the last
-   connection attempt, <function>db2_conn_errormsg</function> returns an empty
-   string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving the error message returned by a failed connection attempt</title>
-   <simpara>
-    The following example demonstrates how to return an error message and
-    SQLCODE value after deliberately passing invalid parameters to
-    <function>db2_connect</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect('badname', 'baduser', 'badpassword');
-if (!$conn) {
-    print db2_conn_errormsg();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-[IBM][CLI Driver] SQL1013N  The database alias name
-or database name "BADNAME" could not be found.  SQLSTATE=42705
- SQLCODE=-1013
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_conn_error</function></member>
-   <member><function>db2_connect</function></member>
-   <member><function>db2_stmt_error</function></member>
-   <member><function>db2_stmt_errormsg</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/ibm_db2/functions/db2-connect.xml b/reference/ibm_db2/functions/db2-connect.xml
deleted file mode 100644
index 45b2878e829c..000000000000
--- a/reference/ibm_db2/functions/db2-connect.xml
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.db2-connect">
- <refnamediv>
-  <refname>db2_connect</refname>
-  <refpurpose>
-   Returns a connection to a database
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>db2_connect</methodname>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>username</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Creates a new connection to an IBM DB2 Universal Database, IBM Cloudscape,
-   or Apache Derby database.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      For a cataloged connection to a database, <parameter>database</parameter>
-      represents the database alias in the DB2 client catalog.
-     </simpara>
-     <para>
-      For an uncataloged connection to a database,
-      <parameter>database</parameter> represents a complete connection
-      string in the following format:
-      <literallayout>DATABASE=<parameter>database</parameter>;HOSTNAME=<parameter>hostname</parameter>;PORT=<parameter>port</parameter>;PROTOCOL=TCPIP;UID=<parameter>username</parameter>;PWD=<parameter>password</parameter>;</literallayout>
-      <note>
-       <para>
-        When connecting to Db2 on IBM i, the underlying system calls
-        <link xlink:href="&url.db2.sqldriverconnect;">SQLDriverConnect</link>,
-        which only accepts DSN, UID, and PWD for the
-        <link xlink:href="&url.db2.connection.string;">connection string</link>.
-        Like so:
-        <literallayout>DSN=<parameter>database</parameter>;UID=<parameter>username</parameter>;PWD=<parameter>password</parameter>;</literallayout>
-       </para>
-      </note>
-      where the parameters represent the following values:
-      <variablelist>
-       <varlistentry>
-        <term><parameter>database</parameter></term>
-        <listitem>
-         <simpara>
-          The name of the database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>hostname</parameter></term>
-        <listitem>
-         <simpara>
-          The hostname or IP address of the database server.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>port</parameter></term>
-        <listitem>
-         <simpara>
-          The TCP/IP port on which the database is listening for
-          requests.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>username</parameter></term>
-        <listitem>
-         <simpara>
-          The username with which you are connecting to the
-          database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>password</parameter></term>
-        <listitem>
-         <simpara>
-          The password with which you are connecting to the database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The username with which you are connecting to the database.
-     </simpara>
-     <simpara>
-      For uncataloged connections, you must pass a &null; value or empty
-      string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password with which you are connecting to the database.
-     </simpara>
-     <simpara>
-      For uncataloged connections, you must pass a &null; value or empty
-      string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      An associative array of connection options that affect the behavior
-      of the connection, where valid array keys include:
-      <variablelist>
-       <varlistentry>
-        <term><parameter>autocommit</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_AUTOCOMMIT_ON</constant> value turns
-          autocommit on for this connection handle.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_AUTOCOMMIT_OFF</constant> value turns
-          autocommit off for this connection handle.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>DB2_ATTR_CASE</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_CASE_NATURAL</constant> value specifies
-          that column names are returned in natural case.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_CASE_LOWER</constant> value specifies
-          that column names are returned in lower case.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_CASE_UPPER</constant> value specifies
-          that column names are returned in upper case.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>CURSOR</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_FORWARD_ONLY</constant> value specifies a
-          forward-only cursor for a statement resource. This is the default
-          cursor type and is supported on all database servers.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_SCROLLABLE</constant> value specifies a
-          scrollable cursor for a statement resource. This mode enables
-          random access to rows in a result set, but currently is supported
-          only by IBM DB2 Universal Database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The following new option is available in ibm_db2 version 1.7.0 and later.
-      <variablelist>
-       <varlistentry>
-        <term><parameter>trustedcontext</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the DB2_TRUSTED_CONTEXT_ENABLE value turns trusted context
-          on for this connection handle. This parameter cannot be set using
-          <function>db2_set_option</function>.
-         </simpara>
-         <simpara>
-          This key works only if the database is cataloged (even if the
-          database is local), or if you specify the full DSN when you create
-          the connection.
-         </simpara>
-         <simpara>
-          To catalog the database, use following commands:
-         </simpara>
-         <literallayout>db2 catalog tcpip node loopback remote &lt;SERVERNAME&gt; server &lt;SERVICENAME&gt;
-db2 catalog database &lt;LOCALDBNAME&gt; as &lt;REMOTEDBNAME&gt; at node loopback
-db2 "update dbm cfg using svcename &lt;SERVICENAME&gt;"
-db2set DB2COMM=TCPIP</literallayout>
-        </listitem>
-       </varlistentry>
-     </variablelist>
-     </para>
-     <para>
-      The following new i5/OS options are available in ibm_db2 version 1.5.1
-      and later.
-      <variablelist>
-       <varlistentry>
-        <term><parameter>i5_lib</parameter></term>
-        <listitem>
-         <simpara>
-          A character value that indicates the default library that will be
-          used for resolving unqualified file references. This is not valid
-          if the connection is using system naming mode.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_naming</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_NAMING_ON</literal> value turns on DB2 UDB CLI iSeries
-          system naming mode. Files are qualified using the slash (/) delimiter.
-          Unqualified files are resolved using the library list for the job.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_NAMING_OFF</literal> value turns off DB2 UDB CLI default
-          naming mode, which is SQL naming. Files are qualified using the period (.)
-          delimiter. Unqualified files are resolved using either the default library
-          or the current user ID.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_commit</parameter></term>
-        <listitem>
-         <para>
-          The <parameter>i5_commit</parameter> attribute should be set before the
-          <function>db2_connect</function>. If the value is changed after the
-          connection has been established, and the connection is to a remote data
-          source, the change does not take effect until the next successful
-          <function>db2_connect</function> for the connection handle.
-          <note>
-           <simpara>
-            The php.ini setting <parameter>ibm_db2.i5_allow_commit</parameter>==0
-            or <literal>DB2_I5_TXN_NO_COMMIT</literal> is the default, but may be
-            overridden with the <parameter>i5_commit</parameter> option.
-           </simpara>
-          </note>
-         </para>
-         <simpara>
-          <literal>DB2_I5_TXN_NO_COMMIT</literal> - Commitment control is not used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_READ_UNCOMMITTED</literal> - Dirty reads, nonrepeatable
-          reads, and phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_READ_COMMITTED</literal> - Dirty reads are not possible.
-          Nonrepeatable reads, and phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_REPEATABLE_READ</literal> - Dirty reads and nonrepeatable
-          reads are not possible. Phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_SERIALIZABLE</literal> - Transactions are serializable.
-          Dirty reads, non-repeatable reads, and phantoms are not possible
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_query_optimize</parameter></term>
-        <listitem>
-         <simpara>
-           <literal>DB2_FIRST_IO</literal> All queries are optimized with the goal of
-           returning the first page of output as fast as possible. This goal works well
-           when the output is controlled by a user who is most likely to cancel the query
-           after viewing the first page of output data. Queries coded with an
-           OPTIMIZE FOR nnn ROWS clause honor the goal specified by the clause.
-         </simpara>
-         <simpara>
-          <literal>DB2_ALL_IO</literal> All queries are optimized with the goal of running
-          the entire query to completion in the shortest amount of elapsed time. This is a
-          good option when the output of a query is being written to a file or report, or
-          the interface is queuing the output data. Queries coded with an OPTIMIZE FOR nnn
-          ROWS clause honor the goal specified by the clause. This is the default.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_dbcs_alloc</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_DBCS_ALLOC_ON</literal> value turns on DB2 6X allocation scheme
-          for DBCS translation column size growth.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_DBCS_ALLOC_OFF</literal> value turns off DB2 6X allocation scheme
-          for DBCS translation column size growth.
-         </simpara>
-         <simpara>
-          Note: php.ini setting <parameter>ibm_db2.i5_dbcs_alloc</parameter>==0 or
-          <literal>DB2_I5_DBCS_ALLOC_OFF</literal> is the default, but may be overridden
-          with the <parameter>i5_dbcs_alloc</parameter> option.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_date_fmt</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_FMT_ISO</literal> - The International Organization for Standardization
-          (ISO) date format yyyy-mm-dd is used. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_USA</literal> - The United States date format mm/dd/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_EUR</literal> - The European date format dd.mm.yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JIS</literal> - The Japanese Industrial Standard date format
-          yyyy-mm-dd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_MDY</literal> - The date format mm/dd/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_DMY</literal> - The date format dd/mm/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_YMD</literal> - The date format yy/mm/dd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JUL</literal> - The Julian date format yy/ddd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_date_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_SLASH</literal> - A slash ( / ) is used as the date separator.
-          This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_DASH</literal> - A dash ( - ) is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as the date
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_BLANK</literal> - A blank is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_time_fmt</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_FMT_ISO</literal> - The International Organization for
-          Standardization (ISO) time format hh.mm.ss is used. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_USA</literal> - The United States time format
-          hh:mmxx is used, where xx is AM or PM.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_EUR</literal> - The European time format hh.mm.ss
-          is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JIS</literal> - The Japanese Industrial Standard
-          time format hh:mm:ss is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_HMS</literal> - The hh:mm:ss format is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_time_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_COLON</literal> - A colon ( : ) is used as the time
-          separator. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as the time
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the time
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_BLANK</literal> - A blank is used as the time separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_decimal_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as
-          the decimal separator. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the
-          decimal separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The following new i5/OS option is available in ibm_db2 version 1.8.0
-      and later.
-      <variablelist>
-       <varlistentry>
-        <term><parameter>i5_libl</parameter></term>
-        <listitem>
-         <simpara>
-          A character value that indicates the library list that will be used for
-          resolving unqualified file references. Specify the library list
-          elements separated by blanks 'i5_libl'=&gt;"MYLIB YOURLIB ANYLIB".
-         </simpara>
-         <note>
-          <simpara>
-           <parameter>i5_libl</parameter> calls qsys2/qcmdexc('cmd',cmdlen), which is only
-           available in i5/OS V5R4 and later.
-          </simpara>
-         </note>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a connection handle resource if the connection attempt is
-   successful. If the connection attempt fails, <function>db2_connect</function>
-   returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating a cataloged connection</title>
-    <simpara>
-     Cataloged connections require you to have previously cataloged the target
-     database through the DB2 Command Line Processor (CLP) or DB2
-     Configuration Assistant.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$database = 'SAMPLE';
-$user = 'db2inst1';
-$password = 'ibmdb2';
-
-$conn = db2_connect($database, $user, $password);
-
-if ($conn) {
-    echo "Connection succeeded.";
-    db2_close($conn);
-}
-else {
-    echo "Connection failed.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Connection succeeded.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Creating an uncataloged connection</title>
-    <simpara>
-     An uncataloged connection enables you to dynamically connect to a
-     database.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$database = 'SAMPLE';
-$user = 'db2inst1';
-$password = 'ibmdb2';
-$hostname = 'localhost';
-$port = 50000;
-
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;" .
-  "HOSTNAME=$hostname;PORT=$port;PROTOCOL=TCPIP;UID=$user;PWD=$password;";
-$conn = db2_connect($conn_string, '', '');
-
-if ($conn) {
-    echo "Connection succeeded.";
-    db2_close($conn);
-}
-else {
-    echo "Connection failed.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Connection succeeded.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Creating a connection with autocommit off by default</title>
-    <simpara>
-     Passing an array of options to <function>db2_connect</function> enables
-     you to modify the default behavior of the connection handle.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$database = 'SAMPLE';
-$user = 'db2inst1';
-$password = 'ibmdb2';
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF);
-
-$conn = db2_connect($database, $user, $password, $options);
-
-if ($conn) {
-    echo "Connection succeeded.\n";
-    if (db2_autocommit($conn)) {
-         echo "Autocommit is on.\n";
-    }
-    else {
-         echo "Autocommit is off.\n";
-    }
-    db2_close($conn);
-}
-else {
-    echo "Connection failed.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Connection succeeded.
-Autocommit is off.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>i5/OS best performance</title>
-    <simpara>
-     To achieve best performance for your i5/OS ibm_db2 1.5.1 PHP application
-     use the default host, userid, and password for your
-     <function>db2_connect</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-  $library = "ADC";
-  $i5 = db2_connect("", "", "", array("i5_lib"=>"qsys2"));
-  $result = db2_exec($i5,
-       "select * from systables where table_schema = '$library'");
-  while ($row = db2_fetch_both($result)) {
-     echo $row['TABLE_NAME']."</br>";
-  }
-  db2_close($i5);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-ANIMALS
-NAMES
-PICTURES
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Using trusted context</title>
-    <simpara>
-     The following example shows how to enable trusted context, switch
-     users, and get the current user ID.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$database = "SAMPLE";
-$hostname = "localhost";
-$port = 50000;
-$authID = "db2inst1";
-$auth_pass = "ibmdb2";
-
-$tc_user = "tcuser";
-$tc_pass = "tcpassword";
-
-$dsn = "DATABASE=$database;HOSTNAME=$hostname;PORT=$port;
-  PROTOCOL=TCPIP;UID=$authID;PWD=$auth_pass;";
-$options = array ("trustedcontext" => DB2_TRUSTED_CONTEXT_ENABLE);
-
-$tc_conn = db2_connect($dsn, "", "", $options);
-if($tc_conn) {
-    echo "Explicit trusted connection succeeded.\n";
-
-    if(db2_get_option($tc_conn, "trustedcontext")) {
-        $userBefore = db2_get_option($tc_conn, "trusted_user");
-
-        //Do some work as user 1.
-
-        //Switching to trusted user.
-        $parameters = array("trusted_user" => $tc_user,
-          "trusted_password" => $tcuser_pass);
-        $res = db2_set_option ($tc_conn, $parameters, 1);
-
-        $userAfter = db2_get_option($tc_conn, "trusted_user");
-        //Do more work as trusted user.
-
-        if($userBefore != $userAfter) {
-            echo "User has been switched." . "\n";
-        }
-    }
-
-    db2_close($tc_conn);
-}
-else {
-    echo "Explicit trusted connection failed.\n";
-}
-?>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Explicit trusted connection succeeded.
-User has been switched.
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_close</function></member>
-   <member><function>db2_pconnect</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/ibm_db2/functions/db2-cursor-type.xml b/reference/ibm_db2/functions/db2-cursor-type.xml
deleted file mode 100644
index 2872d2d9fc6e..000000000000
--- a/reference/ibm_db2/functions/db2-cursor-type.xml
+++ /dev/null
@@ -1,73 +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.db2-cursor-type" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_cursor_type</refname>
-  <refpurpose>
-   Returns the cursor type used by a statement resource
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>db2_cursor_type</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the cursor type used by a statement resource. Use this to determine
-   if you are working with a forward-only cursor or scrollable cursor.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns either <constant>DB2_FORWARD_ONLY</constant> if the statement
-   resource uses a forward-only cursor or <constant>DB2_SCROLLABLE</constant> if
-   the statement resource uses a scrollable cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_prepare</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/ibm_db2/functions/db2-escape-string.xml b/reference/ibm_db2/functions/db2-escape-string.xml
deleted file mode 100644
index ed64760d92c4..000000000000
--- a/reference/ibm_db2/functions/db2-escape-string.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.db2-escape-string" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_escape_string</refname>
-  <refpurpose>
-   Used to escape certain characters
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>db2_escape_string</methodname>
-   <methodparam><type>string</type><parameter>string_literal</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Prepends backslashes to special characters in the string argument.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string_literal</parameter></term>
-    <listitem>
-     <simpara>
-      The string that contains special characters that need to be modified.
-      Characters that are prepended with a backslash are <literal>\x00</literal>,
-      <literal>\n</literal>, <literal>\r</literal>, <literal>\</literal>,
-      <literal>'</literal>, <literal>"</literal> and <literal>\x1a</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <parameter>string_literal</parameter> with the special characters
-   noted above prepended with backslashes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>db2_escape_string</function> example</title>
-   <simpara>
-    Result of using the <function>db2_escape_string</function> function
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect($database, $user, $password);
-
-if ($conn) {
-    $str[0] = "All characters: \x00 , \n , \r , \ , ' , \" , \x1a .";
-    $str[1] = "Backslash (\). Single quote ('). Double quote (\")";
-    $str[2] = "The NULL character \0 must be quoted as well";
-    $str[3] = "Interesting characters: \x1a , \x00 .";
-    $str[4] = "Nothing to quote";
-    $str[5] = 200676;
-    $str[6] = "";
-
-    foreach( $str as $string ) {
-        echo "db2_escape_string: " . db2_escape_string($string). "\n";
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-db2_escape_string: All characters: \0 , \n , \r , \\ , \' , \" , \Z .
-db2_escape_string: Backslash (\\). Single quote (\'). Double quote (\")
-db2_escape_string: The NULL character \0 must be quoted as well
-db2_escape_string: Interesting characters: \Z , \0 .
-db2_escape_string: Nothing to quote
-db2_escape_string: 200676
-db2_escape_string:
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_prepare</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/ibm_db2/functions/db2-exec.xml b/reference/ibm_db2/functions/db2-exec.xml
deleted file mode 100644
index c0c95ed6caf9..000000000000
--- a/reference/ibm_db2/functions/db2-exec.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-exec">
- <refnamediv>
-  <refname>db2_exec</refname>
-  <refpurpose>
-   Executes an SQL statement directly
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>db2_exec</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Executes an SQL statement directly.
-  </simpara>
-  <simpara>
-   If you plan to interpolate PHP variables into the SQL statement, understand
-   that this is one of the more common security exposures. Consider calling
-   <function>db2_prepare</function> to prepare an SQL statement with parameter
-   markers for input values. Then you can call <function>db2_execute</function>
-   to pass in the input values and avoid SQL injection attacks.
-  </simpara>
-  <simpara>
-   If you plan to repeatedly issue the same SQL statement with different
-   parameters, consider calling <function>db2_prepare</function> and
-   <function>db2_execute</function> to enable the database server to reuse its
-   access plan and increase the efficiency of your database access.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid database connection resource variable as returned from
-      <function>db2_connect</function> or <function>db2_pconnect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>statement</parameter></term>
-    <listitem>
-     <simpara>
-      An SQL statement. The statement cannot contain any parameter markers.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array containing statement options. You can use this
-      parameter to request a scrollable cursor on database servers that
-      support this functionality.
-     </simpara>
-     <simpara>
-      For a description of valid statement options, see
-      <function>db2_set_option</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a statement resource if the SQL statement was issued successfully,
-   or &false; if the database failed to execute the SQL statement.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating a table with <function>db2_exec</function></title>
-    <simpara>
-     The following example uses <function>db2_exec</function> to issue a set
-     of DDL statements in the process of creating a table.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect($database, $user, $password);
-
-// Create the test table
-$create = 'CREATE TABLE animals (id INTEGER, breed VARCHAR(32),
-    name CHAR(16), weight DECIMAL(7,2))';
-$result = db2_exec($conn, $create);
-if ($result) {
-    print "Successfully created the table.\n";
-}
-
-// Populate the test table
-$animals = array(
-    array(0, 'cat', 'Pook', 3.2),
-    array(1, 'dog', 'Peaches', 12.3),
-    array(2, 'horse', 'Smarty', 350.0),
-    array(3, 'gold fish', 'Bubbles', 0.1),
-    array(4, 'budgerigar', 'Gizmo', 0.2),
-    array(5, 'goat', 'Rickety Ride', 9.7),
-    array(6, 'llama', 'Sweater', 150)
-);
-
-foreach ($animals as $animal) {
-    $rc = db2_exec($conn, "INSERT INTO animals (id, breed, name, weight)
-      VALUES ({$animal[0]}, '{$animal[1]}', '{$animal[2]}', {$animal[3]})");
-    if ($rc) {
-        print "Insert... ";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Successfully created the table.
-Insert... Insert... Insert... Insert... Insert... Insert... Insert...
-]]>
-    </screen>
-   </example>
-
-   <example>
-    <title>Executing a SELECT statement with a scrollable cursor</title>
-    <simpara>
-     The following example demonstrates how to request a scrollable cursor for
-     an SQL statement issued by <function>db2_exec</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect($database, $user, $password);
-$sql = "SELECT name FROM animals
-    WHERE weight < 10.0
-    ORDER BY name";
-if ($conn) {
-    require_once 'prepare.inc';
-    $stmt = db2_exec($conn, $sql, array('cursor' => DB2_SCROLLABLE));
-    while ($row = db2_fetch_array($stmt)) {
-        print "$row[0]\n";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Bubbles
-Gizmo
-Pook
-Rickety Ride
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Returning XML data as an SQL ResultSet</title>
-    <simpara>
-     The following example demonstrates how to work with documents stored
-     in a XML column using the SAMPLE database. Using some pretty simple
-     SQL/XML, this example returns some of the nodes in a XML document in
-     an SQL ResultSet format that most users are familiar with.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = 'SELECT * FROM XMLTABLE(
-    XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-    \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\'
-    COLUMNS
-    "CID" VARCHAR (50) PATH \'@Cid\',
-    "NAME" VARCHAR (50) PATH \'name\',
-    "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\'
-    ) AS T
-    WHERE NAME = \'Kathy Smith\'
-    ';
-$stmt = db2_exec($conn, $query);
-
-while($row = db2_fetch_object($stmt)){
-    printf("$row->CID     $row->NAME     $row->PHONE\n");
-}
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-1000     Kathy Smith     416-555-1358
-1001     Kathy Smith     905-555-7258
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Performing a "JOIN" with XML data</title>
-    <simpara>
-     The following example works with documents stored in 2 different
-     XML columns in the SAMPLE database. It creates 2 temporary
-     tables from the XML documents from 2 different columns and
-     returns an SQL ResultSet with information regarding shipping
-     status for the customer.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = '
-    SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS
-    FROM
-    XMLTABLE(
-    XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-    \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\'
-    COLUMNS
-    "CID" BIGINT PATH \'@Cid\',
-    "NAME" VARCHAR (50) PATH \'name\',
-    "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\'
-    ) as A,
-    PURCHASEORDER AS B,
-    XMLTABLE (
-    XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-    \'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\'
-    COLUMNS
-    "PONUM"  BIGINT PATH \'@PoNum\',
-    "STATUS" VARCHAR (50) PATH \'@Status\'
-    ) as C
-    WHERE A.CID = B.CUSTID AND
-    B.POID = C.PONUM AND
-    A.NAME = \'Kathy Smith\'
-';
-
-$stmt = db2_exec($conn, $query);
-
-while($row = db2_fetch_object($stmt)){
-    printf("$row->CID     $row->NAME     $row->PHONE     $row->PONUM     $row->STATUS\n");
-}
-
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-1001     Kathy Smith     905-555-7258     5002     Shipped
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Returning SQL data as part of a larger XML document</title>
-    <simpara>
-     The following example works with a portion of the PRODUCT.DESCRIPTION
-     documents in the SAMPLE database. It creates a XML document containing
-     product description (XML data) and pricing info (SQL data).
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = '
-SELECT
-XMLSERIALIZE(
-XMLQUERY(\'
-    declare boundary-space strip;
-    declare default element namespace "http://posample.org";
-    <promoList> {
-    for $prod in $doc/product
-    where $prod/description/price < 10.00
-    order by $prod/description/price ascending
-    return(
-        <promoitem> {
-        $prod,
-        <startdate> {$start} </startdate>,
-        <enddate> {$end} </enddate>,
-        <promoprice> {$promo} </promoprice>
-        } </promoitem>
-    )
-    } </promoList>
-\' passing by ref DESCRIPTION AS "doc",
-PROMOSTART as "start",
-PROMOEND as "end",
-PROMOPRICE as "promo"
-RETURNING SEQUENCE)
-AS CLOB (32000))
-AS NEW_PRODUCT_INFO
-FROM PRODUCT
-WHERE PID = \'100-100-01\'
-';
-
-$stmt = db2_exec($conn, $query);
-
-while($row = db2_fetch_array($stmt)){
-    printf("$row[0]\n");
-}
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-<promoList xmlns="http://posample.org">
-    <promoitem>
-    <product pid="100-100-01">
-        <description>
-            <name>Snow Shovel, Basic 22 inch</name>
-            <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details>
-            <price>9.99</price>
-            <weight>1 kg</weight>
-        </description>
-    </product>
-    <startdate>2004-11-19</startdate>
-    <enddate>2004-12-19</enddate>
-    <promoprice>7.25</promoprice>
-    </promoitem>
-</promoList>
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_execute</function></member>
-   <member><function>db2_prepare</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/ibm_db2/functions/db2-execute.xml b/reference/ibm_db2/functions/db2-execute.xml
deleted file mode 100644
index d145dd6cd3ab..000000000000
--- a/reference/ibm_db2/functions/db2-execute.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-execute">
- <refnamediv>
-  <refname>db2_execute</refname>
-  <refpurpose>
-   Executes a prepared SQL statement
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_execute</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>parameters</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   <function>db2_execute</function> executes an SQL statement that was
-   prepared by <function>db2_prepare</function>.
-  </simpara>
-  <simpara>
-   If the SQL statement returns a result set, for example, a SELECT statement
-   or a CALL to a stored procedure that returns one or more result sets, you
-   can retrieve a row as an array from the <literal>stmt</literal> resource
-   using <function>db2_fetch_assoc</function>,
-   <function>db2_fetch_both</function>, or
-   <function>db2_fetch_array</function>. Alternatively, you can use
-   <function>db2_fetch_row</function> to move the result set pointer to the
-   next row and fetch a column at a time from that row with
-   <function>db2_result</function>.
-  </simpara>
-  <simpara>
-   Refer to <function>db2_prepare</function> for a brief discussion of the
-   advantages of using <function>db2_prepare</function> and
-   <function>db2_execute</function> rather than <function>db2_exec</function>.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A prepared statement returned from <function>db2_prepare</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameters</parameter></term>
-    <listitem>
-     <simpara>
-      An array of input parameters matching any parameter markers contained
-      in the prepared statement.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Preparing and executing an SQL statement with parameter markers</title>
-    <simpara>
-     The following example prepares an INSERT statement that accepts four
-     parameter markers, then iterates over an array of arrays containing the
-     input values to be passed to <function>db2_execute</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$pet = array(0, 'cat', 'Pook', 3.2);
-
-$insert = 'INSERT INTO animals (id, breed, name, weight)
-    VALUES (?, ?, ?, ?)';
-
-$stmt = db2_prepare($conn, $insert);
-if ($stmt) {
-    $result = db2_execute($stmt, $pet);
-    if ($result) {
-        print "Successfully added new pet.";
-    }
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Successfully added new pet.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Calling a stored procedure with an OUT parameter</title>
-    <simpara>
-     The following example prepares a CALL statement that accepts one
-     parameter marker representing an OUT parameter, binds the PHP variable
-     <literal>$my_pets</literal> to the parameter using
-     <function>db2_bind_param</function>, then issues
-     <function>db2_execute</function> to execute the CALL statement. After the
-     CALL to the stored procedure has been made, the value of
-     <literal>$num_pets</literal> changes to reflect the value returned by the
-     stored procedure for that OUT parameter.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$num_pets = 0;
-$res = db2_prepare($conn, "CALL count_my_pets(?)");
-$rc = db2_bind_param($res, 1, "num_pets", DB2_PARAM_OUT);
-$rc = db2_execute($res);
-print "I have $num_pets pets!";
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-I have 7 pets!
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Returning XML data as an SQL ResultSet</title>
-    <simpara>
-     The following example demonstrates how to work with documents stored
-     in a XML column using the SAMPLE database. Using some pretty simple
-     SQL/XML, this example returns some of the nodes in a XML document in
-     an SQL ResultSet format that most users are familiar with.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = 'SELECT * FROM XMLTABLE(
-    XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-    \'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\'
-    COLUMNS
-    "CID" VARCHAR (50) PATH \'@Cid\',
-    "NAME" VARCHAR (50) PATH \'name\',
-    "PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\'
-    ) AS T
-    WHERE NAME = ?
-    ';
-
-$stmt = db2_prepare($conn, $query);
-
-$name = 'Kathy Smith';
-
-if ($stmt) {
-    db2_bind_param($stmt, 1, "name", DB2_PARAM_IN);
-    db2_execute($stmt);
-
-    while($row = db2_fetch_object($stmt)){
-    printf("$row->CID     $row->NAME     $row->PHONE\n");
-    }
-}
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-1000     Kathy Smith     416-555-1358
-1001     Kathy Smith     905-555-7258
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Performing a "JOIN" with XML data</title>
-    <simpara>
-     The following example works with documents stored in 2 different
-     XML columns in the SAMPLE database. It creates 2 temporary
-     tables from the XML documents from 2 different columns and
-     returns an SQL ResultSet with information regarding shipping
-     status for the customer.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = '
-SELECT A.CID, A.NAME, A.PHONE, C.PONUM, C.STATUS
-FROM
-XMLTABLE(
-XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-\'db2-fn:xmlcolumn("CUSTOMER.INFO")/customerinfo\'
-COLUMNS
-"CID" BIGINT PATH \'@Cid\',
-"NAME" VARCHAR (50) PATH \'name\',
-"PHONE" VARCHAR (50) PATH \'phone [ @type = "work"]\'
-) as A,
-PURCHASEORDER AS B,
-XMLTABLE (
-XMLNAMESPACES (DEFAULT \'http://posample.org\'),
-\'db2-fn:xmlcolumn("PURCHASEORDER.PORDER")/PurchaseOrder\'
-COLUMNS
-"PONUM"  BIGINT PATH \'@PoNum\',
-"STATUS" VARCHAR (50) PATH \'@Status\'
-) as C
-WHERE A.CID = B.CUSTID AND
-    B.POID = C.PONUM AND
-    A.NAME = ?
-';
-
-$stmt = db2_prepare($conn, $query);
-
-$name = 'Kathy Smith';
-
-if ($stmt) {
-    db2_bind_param($stmt, 1, "name", DB2_PARAM_IN);
-    db2_execute($stmt);
-
-    while($row = db2_fetch_object($stmt)){
-    printf("$row->CID     $row->NAME     $row->PHONE     $row->PONUM     $row->STATUS\n");
-    }
-}
-
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-1001     Kathy Smith     905-555-7258     5002     Shipped
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Returning SQL data as part of a larger XML document</title>
-    <simpara>
-     The following example works with a portion of the PRODUCT.DESCRIPTION
-     documents in the SAMPLE database. It creates a XML document containing
-     product description (XML data) and pricing info (SQL data).
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = db2_connect("SAMPLE", "db2inst1", "ibmdb2");
-
-$query = '
-SELECT
-XMLSERIALIZE(
-XMLQUERY(\'
-    declare boundary-space strip;
-    declare default element namespace "http://posample.org";
-    <promoList> {
-    for $prod in $doc/product
-    where $prod/description/price < 10.00
-    order by $prod/description/price ascending
-    return(
-        <promoitem> {
-        $prod,
-        <startdate> {$start} </startdate>,
-        <enddate> {$end} </enddate>,
-        <promoprice> {$promo} </promoprice>
-            } </promoitem>
-    )
-    } </promoList>
-\' passing by ref DESCRIPTION AS "doc",
-PROMOSTART as "start",
-PROMOEND as "end",
-PROMOPRICE as "promo"
-RETURNING SEQUENCE)
-AS CLOB (32000))
-AS NEW_PRODUCT_INFO
-FROM PRODUCT
-WHERE PID = ?
-';
-
-$stmt = db2_prepare($conn, $query);
-
-$pid = "100-100-01";
-
-if ($stmt) {
-    db2_bind_param($stmt, 1, "pid", DB2_PARAM_IN);
-    db2_execute($stmt);
-
-    while($row = db2_fetch_array($stmt)){
-    printf("$row[0]\n");
-    }
-}
-
-db2_close($conn);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-<promoList xmlns="http://posample.org">
-    <promoitem>
-    <product pid="100-100-01">
-        <description>
-            <name>Snow Shovel, Basic 22 inch</name>
-            <details>Basic Snow Shovel, 22 inches wide, straight handle with D-Grip</details>
-            <price>9.99</price>
-            <weight>1 kg</weight>
-        </description>
-    </product>
-    <startdate>2004-11-19</startdate>
-    <enddate>2004-12-19</enddate>
-    <promoprice>7.25</promoprice>
-    </promoitem>
-</promoList>
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_exec</function></member>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_prepare</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-fetch-array.xml b/reference/ibm_db2/functions/db2-fetch-array.xml
deleted file mode 100644
index b720cf733c27..000000000000
--- a/reference/ibm_db2/functions/db2-fetch-array.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-array">
- <refnamediv>
-  <refname>db2_fetch_array</refname>
-  <refpurpose>
-   Returns an array, indexed by column position, representing a row in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>db2_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns an array, indexed by column position, representing a row in a result
-   set. The columns are 0-indexed.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      Requests a specific 1-indexed row from the result set. Passing this
-      parameter results in a PHP warning if the result set uses a
-      forward-only cursor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a 0-indexed array with column values indexed by the column position
-   representing the next or requested row in the result set. Returns &false; if
-   there are no rows left in the result set, or if the row requested by
-   <parameter>row_number</parameter> does not exist in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Iterating through a forward-only cursor</title>
-    <simpara>
-     If you call <function>db2_fetch_array</function> without a specific row
-     number, it automatically retrieves the next row in the result set.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$stmt = db2_prepare($conn, $sql);
-$result = db2_execute($stmt);
-
-while ($row = db2_fetch_array($stmt)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row[0], $row[1], $row[2], $row[3]);
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-
-   <example>
-    <title>Retrieving specific rows with <function>db2_fetch_array</function>
-     from a scrollable cursor</title>
-    <simpara>
-     If your result set uses a scrollable cursor, you can call
-     <function>db2_fetch_array</function> with a specific row number. The
-     following example retrieves every other row in the result set, starting
-     with the second row.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$result = db2_exec($stmt, $sql, array('cursor' => DB2_SCROLLABLE));
-
-$i=2;
-while ($row = db2_fetch_array($result, $i)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row[0], $row[1], $row[2], $row[3]);
-    $i = $i + 2;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_object</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-fetch-assoc.xml b/reference/ibm_db2/functions/db2-fetch-assoc.xml
deleted file mode 100644
index d7e5ccc45e20..000000000000
--- a/reference/ibm_db2/functions/db2-fetch-assoc.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-assoc">
- <refnamediv>
-  <refname>db2_fetch_assoc</refname>
-  <refpurpose>
-   Returns an array, indexed by column name, representing a row in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>db2_fetch_assoc</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns an array, indexed by column name, representing a row in a result
-   set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      Requests a specific 1-indexed row from the result set. Passing this
-      parameter results in a PHP warning if the result set uses a
-      forward-only cursor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array with column values indexed by the column name
-   representing the next or requested row in the result set. Returns &false; if
-   there are no rows left in the result set, or if the row requested by
-   <parameter>row_number</parameter> does not exist in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Iterating through a forward-only cursor</title>
-    <simpara>
-     If you call <function>db2_fetch_assoc</function> without a specific row
-     number, it automatically retrieves the next row in the result set.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$stmt = db2_prepare($conn, $sql);
-$result = db2_execute($stmt);
-
-while ($row = db2_fetch_assoc($stmt)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row['ID'], $row['NAME'], $row['BREED'], $row['WEIGHT']);
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-
-   <example>
-    <title>Retrieving specific rows with <function>db2_fetch_assoc</function>
-     from a scrollable cursor</title>
-    <simpara>
-     If your result set uses a scrollable cursor, you can call
-     <function>db2_fetch_assoc</function> with a specific row number. The
-     following example retrieves every other row in the result set, starting
-     with the second row.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$result = db2_exec($stmt, $sql, array('cursor' => DB2_SCROLLABLE));
-
-$i=2;
-while ($row = db2_fetch_assoc($result, $i)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row['ID'], $row['NAME'], $row['BREED'], $row['WEIGHT']);
-    $i = $i + 2;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_object</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-fetch-both.xml b/reference/ibm_db2/functions/db2-fetch-both.xml
deleted file mode 100644
index cbc76b787c69..000000000000
--- a/reference/ibm_db2/functions/db2-fetch-both.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-both">
- <refnamediv>
-  <refname>db2_fetch_both</refname>
-  <refpurpose>
-   Returns an array, indexed by both column name and position, representing a row in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>db2_fetch_both</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns an array, indexed by both column name and position, representing a
-   row in a result set. Note that the row returned by
-   <function>db2_fetch_both</function> requires more memory than the
-   single-indexed arrays returned by <function>db2_fetch_assoc</function> or
-   <function>db2_fetch_array</function>.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      Requests a specific 1-indexed row from the result set. Passing this
-      parameter results in a PHP warning if the result set uses a
-      forward-only cursor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array with column values indexed by both the column
-   name and 0-indexed column number. The array represents the next or
-   requested row in the result set. Returns &false; if there are no rows left
-   in the result set, or if the row requested by
-   <parameter>row_number</parameter> does not exist in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Iterating through a forward-only cursor</title>
-    <simpara>
-     If you call <function>db2_fetch_both</function> without a specific row
-     number, it automatically retrieves the next row in the result set. The
-     following example accesses columns in the returned array by both column
-     name and by numeric index.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$stmt = db2_prepare($conn, $sql);
-$result = db2_execute($stmt);
-
-while ($row = db2_fetch_both($stmt)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row['ID'], $row[0], $row['BREED'], $row[3]);
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-
-   <example>
-    <title>Retrieving specific rows with <function>db2_fetch_both</function>
-     from a scrollable cursor</title>
-    <simpara>
-     If your result set uses a scrollable cursor, you can call
-     <function>db2_fetch_both</function> with a specific row number. The
-     following example retrieves every other row in the result set, starting
-     with the second row.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$result = db2_exec($stmt, $sql, array('cursor' => DB2_SCROLLABLE));
-
-$i=2;
-while ($row = db2_fetch_both($result, $i)) {
-    printf ("%-5d %-16s %-32s %10s\n",
-        $row[0], $row['NAME'], $row[2], $row['WEIGHT']);
-    $i = $i + 2;
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-0     Pook             cat                                    3.20
-5     Rickety Ride     goat                                   9.70
-2     Smarty           horse                                350.00
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_object</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-fetch-object.xml b/reference/ibm_db2/functions/db2-fetch-object.xml
deleted file mode 100644
index 783e35ee781d..000000000000
--- a/reference/ibm_db2/functions/db2-fetch-object.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-object">
- <refnamediv>
-  <refname>db2_fetch_object</refname>
-  <refpurpose>
-   Returns an object with properties representing columns in the fetched row
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns an object in which each property represents a column returned in
-   the row fetched from a result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      Requests a specific 1-indexed row from the result set. Passing this
-      parameter results in a PHP warning if the result set uses a
-      forward-only cursor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object representing a single row in the result set. The
-   properties of the object map to the names of the columns in the result set.
-  </simpara>
-  <simpara>
-   The IBM DB2, Cloudscape, and Apache Derby database servers typically fold
-   column names to upper-case, so the object properties will reflect that case.
-  </simpara>
-  <simpara>
-   If your SELECT statement calls a scalar function to modify the value
-   of a column, the database servers return the column number as the name of
-   the column in the result set. If you prefer a more descriptive column name
-   and object property, you can use the AS clause to assign a name to the
-   column in the result set.
-  </simpara>
-  <simpara>
-   Returns &false; if no row was retrieved.
-  </simpara>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>db2_fetch_object</function> example</title>
-   <simpara>
-    The following example issues a SELECT statement with a scalar function,
-    RTRIM, that removes whitespace from the end of the column. Rather than
-    creating an object with the properties "BREED" and "2", we use the AS
-    clause in the SELECT statement to assign the name "name" to the modified
-    column. The database server folds the column names to upper-case,
-    resulting in an object with the properties "BREED" and "NAME".
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect($database, $user, $password);
-
-$sql = "SELECT breed, RTRIM(name) AS name
-    FROM animals
-    WHERE id = ?";
-
-if ($conn) {
-    $stmt = db2_prepare($conn, $sql);
-    db2_execute($stmt, array(0));
-
-    while ($pet = db2_fetch_object($stmt)) {
-        echo "Come here, {$pet->NAME}, my little {$pet->BREED}!";
-    }
-    db2_close($conn);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Come here, Pook, my little cat!
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-fetch-row.xml b/reference/ibm_db2/functions/db2-fetch-row.xml
deleted file mode 100644
index a29e69f8c3a8..000000000000
--- a/reference/ibm_db2/functions/db2-fetch-row.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-fetch-row">
- <refnamediv>
-  <refname>db2_fetch_row</refname>
-  <refpurpose>
-   Sets the result set pointer to the next row or requested row
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row_number</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Use <function>db2_fetch_row</function> to iterate through a result set, or
-   to point to a specific row in a result set if you requested a scrollable
-   cursor.
-  </simpara>
-  <simpara>
-   To retrieve individual fields from the result set, call the
-   <function>db2_result</function> function.
-  </simpara>
-  <simpara>
-   Rather than calling <function>db2_fetch_row</function> and
-   <function>db2_result</function>, most applications will call one of
-   <function>db2_fetch_assoc</function>, <function>db2_fetch_both</function>,
-   or <function>db2_fetch_array</function> to advance the result set pointer
-   and return a complete row as an array.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      With scrollable cursors, you can request a specific row number in the
-      result set. Row numbering is 1-indexed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the requested row exists in the result set. Returns
-   &false; if the requested row does not exist in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Iterating through a result set</title>
-    <simpara>
-     The following example demonstrates how to iterate through a result set
-     with <function>db2_fetch_row</function> and retrieve columns from the
-     result set with <function>db2_result</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$sql = 'SELECT name, breed FROM animals WHERE weight < ?';
-$stmt = db2_prepare($conn, $sql);
-db2_execute($stmt, array(10));
-while (db2_fetch_row($stmt)) {
-    $name = db2_result($stmt, 0);
-    $breed = db2_result($stmt, 1);
-    print "$name $breed";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-cat Pook
-gold fish Bubbles
-budgerigar Gizmo
-goat Rickety Ride
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>i5/OS recommended alternatives to db2_fetch_row/db2_result</title>
-    <simpara>
-     On i5/OS it is recommended that you use <function>db2_fetch_both</function>,
-     <function>db2_fetch_array</function>, or <function>db2_fetch_object</function>
-     over <function>db2_fetch_row</function>/<function>db2_result</function>. In general
-     <function>db2_fetch_row</function>/<function>db2_result</function> have more issues
-     with various column types in <literal>EBCDIC</literal> to <literal>ASCII</literal>
-     translation, including possible truncation in <literal>DBCS</literal> applications.
-     You may also find the performance of <function>db2_fetch_both</function>,
-     <function>db2_fetch_array</function>, and <function>db2_fetch_object</function> to
-     be superior to <function>db2_fetch_row</function>/<function>db2_result</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-  $conn = db2_connect("","","");
-  $sql = 'SELECT SPECIFIC_SCHEMA, SPECIFIC_NAME, ROUTINE_SCHEMA, ROUTINE_NAME, ROUTINE_TYPE, ROUTINE_CREATED, ROUTINE_BODY, IN_PARMS, OUT_PARMS, INOUT_PARMS, PARAMETER_STYLE, EXTERNAL_NAME, EXTERNAL_LANGUAGE FROM QSYS2.SYSROUTINES FETCH FIRST 2 ROWS ONLY';
-  $stmt = db2_exec($conn, $sql, array('cursor' => DB2_SCROLLABLE));
-  while ($row = db2_fetch_both($stmt)){
-    echo "<br>db2_fetch_both {$row['SPECIFIC_NAME']} {$row['ROUTINE_CREATED']} {$row[5]}";
-  }
-  $stmt = db2_exec($conn, $sql, array('cursor' => DB2_SCROLLABLE));
-  while ($row = db2_fetch_array($stmt)){
-    echo "<br>db2_fetch_array {$row[1]}  {$row[5]}";
-  }
-  $stmt = db2_exec($conn, $sql, array('cursor' => DB2_SCROLLABLE));
-  while ($row = db2_fetch_object($stmt)){
-    echo "<br>db2_fetch_object {$row->SPECIFIC_NAME} {$row->ROUTINE_CREATED}";
-  }
-  db2_close($conn);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-db2_fetch_both MATCH_ANIMAL 2006-08-25-17.10.23.775000 2006-08-25-17.10.23.775000
-db2_fetch_both MULTIRESULTS 2006-10-17-10.11.05.308000 2006-10-17-10.11.05.308000
-db2_fetch_array MATCH_ANIMAL 2006-08-25-17.10.23.775000
-db2_fetch_array MULTIRESULTS 2006-10-17-10.11.05.308000
-db2_fetch_object MATCH_ANIMAL 2006-08-25-17.10.23.775000
-db2_fetch_object MULTIRESULTS 2006-10-17-10.11.05.308000
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_object</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-field-display-size.xml b/reference/ibm_db2/functions/db2-field-display-size.xml
deleted file mode 100644
index 37425165dc65..000000000000
--- a/reference/ibm_db2/functions/db2-field-display-size.xml
+++ /dev/null
@@ -1,90 +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.db2-field-display-size" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_display_size</refname>
-  <refpurpose>
-   Returns the maximum number of bytes required to display a column
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_field_display_size</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the maximum number of bytes required to display a column in a
-   result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer value with the maximum number of bytes required to
-   display the specified column. If the column does not exist in the result
-   set, <function>db2_field_display_size</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-name.xml b/reference/ibm_db2/functions/db2-field-name.xml
deleted file mode 100644
index d2454835de96..000000000000
--- a/reference/ibm_db2/functions/db2-field-name.xml
+++ /dev/null
@@ -1,89 +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.db2-field-name" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_name</refname>
-  <refpurpose>
-   Returns the name of the column in the result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>db2_field_name</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the name of the specified column in the result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the name of the specified column. If the
-   specified column does not exist in the result
-   set, <function>db2_field_name</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-num.xml b/reference/ibm_db2/functions/db2-field-num.xml
deleted file mode 100644
index 2f78d34c09b8..000000000000
--- a/reference/ibm_db2/functions/db2-field-num.xml
+++ /dev/null
@@ -1,88 +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.db2-field-num" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_num</refname>
-  <refpurpose>
-   Returns the position of the named column in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_field_num</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the position of the named column in a result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer containing the 0-indexed position of the named column in
-   the result set. If the specified column does not exist in the result set,
-   <function>db2_field_num</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-precision.xml b/reference/ibm_db2/functions/db2-field-precision.xml
deleted file mode 100644
index a7ce2d299652..000000000000
--- a/reference/ibm_db2/functions/db2-field-precision.xml
+++ /dev/null
@@ -1,88 +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.db2-field-precision" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_precision</refname>
-  <refpurpose>
-   Returns the precision of the indicated column in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_field_precision</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the precision of the indicated column in a result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer containing the precision of the specified column. If the
-   specified column does not exist in the result set,
-   <function>db2_field_precision</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-scale.xml b/reference/ibm_db2/functions/db2-field-scale.xml
deleted file mode 100644
index c2c83c01136c..000000000000
--- a/reference/ibm_db2/functions/db2-field-scale.xml
+++ /dev/null
@@ -1,88 +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.db2-field-scale" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_scale</refname>
-  <refpurpose>
-   Returns the scale of the indicated column in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_field_scale</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the scale of the indicated column in a result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer containing the scale of the specified column. If the
-   specified column does not exist in the result set,
-   <function>db2_field_scale</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-type.xml b/reference/ibm_db2/functions/db2-field-type.xml
deleted file mode 100644
index 19ff45449119..000000000000
--- a/reference/ibm_db2/functions/db2-field-type.xml
+++ /dev/null
@@ -1,88 +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.db2-field-type" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_type</refname>
-  <refpurpose>
-   Returns the data type of the indicated column in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>db2_field_type</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the data type of the indicated column in a result set.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the defined data type of the specified column.
-   If the specified column does not exist in the result set,
-   <function>db2_field_type</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-field-width.xml b/reference/ibm_db2/functions/db2-field-width.xml
deleted file mode 100644
index 0ca85466b0f9..000000000000
--- a/reference/ibm_db2/functions/db2-field-width.xml
+++ /dev/null
@@ -1,91 +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.db2-field-width" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_field_width</refname>
-  <refpurpose>
-   Returns the width of the current value of the indicated column in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_field_width</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns the width of the current value of the indicated column in a result
-   set. This is the maximum width of the column for a fixed-length data type,
-   or the actual width of the column for a variable-length data type.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies a statement resource containing a result set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Specifies the column in the result set. This can either be an integer
-       representing the 0-indexed position of the column, or a string
-       containing the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer containing the width of the specified character or
-   binary data type column in a result set. If the specified column does not
-   exist in the result set, <function>db2_field_width</function> returns
-   &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</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/ibm_db2/functions/db2-foreign-keys.xml b/reference/ibm_db2/functions/db2-foreign-keys.xml
deleted file mode 100644
index 86dc07fcd323..000000000000
--- a/reference/ibm_db2/functions/db2-foreign-keys.xml
+++ /dev/null
@@ -1,200 +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.db2-foreign-keys" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_foreign_keys</refname>
-  <refpurpose>
-   Returns a result set listing the foreign keys for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_foreign_keys</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns a result set listing the foreign keys for a table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. If <parameter>schema</parameter>
-      is &null;, <function>db2_foreign_keys</function> matches the schema for
-      the current connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the foreign keys for the specified table. The result set is composed of the
-   following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>PKTABLE_CAT</entry>
-        <entry>
-         Name of the catalog for the table containing the primary key. The
-         value is NULL if this table does not have catalogs.
-        </entry>
-       </row>
-       <row>
-        <entry>PKTABLE_SCHEM</entry>
-        <entry>
-         Name of the schema for the table containing the primary key.
-        </entry>
-       </row>
-       <row>
-        <entry>PKTABLE_NAME</entry>
-        <entry>Name of the table containing the primary key.</entry>
-       </row>
-       <row>
-        <entry>PKCOLUMN_NAME</entry>
-        <entry>Name of the column containing the primary key.</entry>
-       </row>
-       <row>
-        <entry>FKTABLE_CAT</entry>
-        <entry>
-         Name of the catalog for the table containing the foreign key. The
-         value is NULL if this table does not have catalogs.
-        </entry>
-       </row>
-       <row>
-        <entry>FKTABLE_SCHEM</entry>
-        <entry>
-         Name of the schema for the table containing the foreign key.
-        </entry>
-       </row>
-       <row>
-        <entry>FKTABLE_NAME</entry>
-        <entry>Name of the table containing the foreign key.</entry>
-       </row>
-       <row>
-        <entry>FKCOLUMN_NAME</entry>
-        <entry>Name of the column containing the foreign key.</entry>
-       </row>
-       <row>
-        <entry>KEY_SEQ</entry>
-        <entry>1-indexed position of the column in the key.</entry>
-       </row>
-       <row>
-        <entry>UPDATE_RULE</entry>
-        <entry>
-         Integer value representing the action applied to the foreign key
-         when the SQL operation is UPDATE.
-        </entry>
-       </row>
-       <row>
-        <entry>DELETE_RULE</entry>
-        <entry>
-         Integer value representing the action applied to the foreign key
-         when the SQL operation is DELETE.
-        </entry>
-       </row>
-       <row>
-        <entry>FK_NAME</entry>
-        <entry>The name of the foreign key.</entry>
-       </row>
-       <row>
-        <entry>PK_NAME</entry>
-        <entry>The name of the primary key.</entry>
-       </row>
-       <row>
-        <entry>DEFERRABILITY</entry>
-        <entry>
-         An integer value representing whether the foreign key deferrability is
-         SQL_INITIALLY_DEFERRED, SQL_INITIALLY_IMMEDIATE, or
-         SQL_NOT_DEFERRABLE.
-        </entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-free-result.xml b/reference/ibm_db2/functions/db2-free-result.xml
deleted file mode 100644
index 5793021d2e93..000000000000
--- a/reference/ibm_db2/functions/db2-free-result.xml
+++ /dev/null
@@ -1,73 +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.db2-free-result" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_free_result</refname>
-  <refpurpose>
-   Frees resources associated with a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_free_result</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Frees the system and database resources that are associated with a result
-   set. These resources are freed implicitly when a script finishes, but you
-   can call <function>db2_free_result</function> to explicitly free the result
-   set resources before the end of the script.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_free_stmt</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/ibm_db2/functions/db2-free-stmt.xml b/reference/ibm_db2/functions/db2-free-stmt.xml
deleted file mode 100644
index 9e66645d95e5..000000000000
--- a/reference/ibm_db2/functions/db2-free-stmt.xml
+++ /dev/null
@@ -1,74 +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.db2-free-stmt" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_free_stmt</refname>
-  <refpurpose>
-   Frees resources associated with the indicated statement resource
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_free_stmt</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Frees the system and database resources that are associated with a statement
-   resource. These resources are freed implicitly when a script finishes, but
-   you can call <function>db2_free_stmt</function> to explicitly free the
-   statement resources before the end of the script.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_free_result</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/ibm_db2/functions/db2-get-option.xml b/reference/ibm_db2/functions/db2-get-option.xml
deleted file mode 100644
index 84285976777b..000000000000
--- a/reference/ibm_db2/functions/db2-get-option.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-get-option">
- <refnamediv>
-  <refname>db2_get_option</refname>
-  <refpurpose>Retrieves an option value for a statement resource or a connection resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>db2_get_option</methodname>
-   <methodparam><type>resource</type><parameter>resource</parameter></methodparam>
-   <methodparam><type>string</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the value of a specified option value for a statement resource
-   or a connection resource.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>resource</parameter></term>
-    <listitem>
-    <simpara>
-     A valid statement resource as returned from
-     <function>db2_prepare</function> or a valid connection resource as
-     returned from <function>db2_connect</function> or
-     <function>db2_pconnect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term><parameter>option</parameter></term>
-   <listitem>
-    <para>
-     A valid statement or connection options. The following new options are available
-     as of ibm_db2 version 1.6.0. They provide useful tracking information
-     that can be set during execution with <function>db2_get_option</function>.
-     <note>
-      <simpara>
-       Prior versions of ibm_db2 do not support these new options.
-      </simpara>
-      <simpara>
-       When the value in each option is being set, some servers might not handle
-       the entire length provided and might truncate the value.
-      </simpara>
-      <simpara>
-       To ensure that the data specified in each option is converted correctly
-       when transmitted to a host system, use only the characters A through Z,
-       0 through 9, and the underscore (_) or period (.).
-      </simpara>
-     </note>
-     <variablelist>
-      <varlistentry>
-       <term><parameter>userid</parameter></term>
-        <listitem>
-         <para>
-          <literal>SQL_ATTR_INFO_USERID</literal> - A pointer to a null-terminated
-          character string used to identify the client user ID sent to the host
-          database server when using DB2 Connect.
-          <note>
-           <simpara>
-            DB2 for z/OS and OS/390 servers support up to a length of 16 characters.
-            This user-id is not to be confused with the authentication user-id, it is for
-            identification purposes only and is not used for any authorization.
-           </simpara>
-          </note>
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>acctstr</parameter></term>
-        <listitem>
-         <para>
-          <literal>SQL_ATTR_INFO_ACCTSTR</literal> - A pointer to a null-terminated
-          character string used to identify the client accounting string sent to the
-          host database server when using DB2 Connect.
-          <note>
-           <simpara>
-            DB2 for z/OS and OS/390 servers support up to a length of 200 characters.
-           </simpara>
-          </note>
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>applname</parameter></term>
-        <listitem>
-         <para>
-          <literal>SQL_ATTR_INFO_APPLNAME</literal> - A pointer to a null-terminated
-          character string used to identify the client application name sent to the
-          host database server when using DB2 Connect.
-          <note>
-           <simpara>
-            DB2 for z/OS and OS/390 servers support up to a length of 32 characters.
-           </simpara>
-          </note>
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>wrkstnname</parameter></term>
-        <listitem>
-         <para>
-          <literal>SQL_ATTR_INFO_WRKSTNNAME</literal> - A pointer to a null-terminated
-          character string used to identify the client workstation name sent to the
-          host database server when using DB2 Connect.
-          <note>
-           <simpara>
-            DB2 for z/OS and OS/390 servers support up to a length of 18 characters.
-           </simpara>
-          </note>
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <para>
-   The following table specifies which options are compatible with
-   the available resource types:
-   <table>
-    <title>Resource-Parameter Matrix</title>
-    <tgroup cols="5">
-     <colspec colnum="1" colname="col1" align="center"/>
-     <colspec colnum="2" colname="col2" align="center"/>
-     <colspec colnum="3" colname="col3" align="center"/>
-     <colspec colnum="4" colname="col4" align="center"/>
-     <colspec colnum="5" colname="col5" align="center"/>
-     <thead>
-      <row>
-       <entry morerows="1">Key</entry>
-       <entry morerows="1">Value</entry>
-       <entry namest="col3" nameend="col5">Resource Type</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry colname="col3">Connection</entry>
-       <entry colname="col4">Statement</entry>
-       <entry colname="col5">Result Set</entry>
-      </row>
-      <row>
-       <entry>userid</entry>
-       <entry><literal>SQL_ATTR_INFO_USERID</literal></entry>
-       <entry colname="col3">X</entry>
-       <entry colname="col4">X</entry>
-       <entry colname="col5">-</entry>
-      </row>
-      <row>
-       <entry>acctstr</entry>
-       <entry><literal>SQL_ATTR_INFO_ACCTSTR</literal></entry>
-       <entry colname="col3">X</entry>
-       <entry colname="col4">X</entry>
-       <entry colname="col5">-</entry>
-      </row>
-      <row>
-       <entry>applname</entry>
-       <entry><literal>SQL_ATTR_INFO_APPLNAME</literal></entry>
-       <entry colname="col3">X</entry>
-       <entry colname="col4">X</entry>
-       <entry colname="col5">-</entry>
-      </row>
-      <row>
-       <entry>wrkstnname</entry>
-       <entry><literal>SQL_ATTR_INFO_WRKSTNNAME</literal></entry>
-       <entry colname="col3">X</entry>
-       <entry colname="col4">X</entry>
-       <entry colname="col5">-</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current setting of the connection attribute provided on success
-  &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Setting and retrieving parameters through a connection resource</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$user     = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Obtain Connection Resource */
-$conn = db2_connect($database, $user, $password);
-
-echo "Client attributes passed through connection string:\n";
-
-/* Create the associative options array with valid key-value pairs */
-/* Assign the attributes through connection string */
-/* Access the options specified */
-$options1 = array('userid' => 'db2inst1');
-$conn1 = db2_connect($database, $user, $password, $options1);
-$val = db2_get_option($conn1, 'userid');
-echo $val . "\n";
-
-$options2 = array('acctstr' => 'account');
-$conn2 = db2_connect($database, $user, $password, $options2);
-$val = db2_get_option($conn2, 'acctstr');
-echo $val . "\n";
-
-$options3 = array('applname' => 'myapp');
-$conn3 = db2_connect($database, $user, $password, $options3);
-$val = db2_get_option($conn3, 'applname');
-echo $val . "\n";
-
-$options4 = array('wrkstnname' => 'workstation');
-$conn4 = db2_connect($database, $user, $password, $options4);
-$val = db2_get_option($conn4, 'wrkstnname');
-echo $val . "\n";
-
-echo "Client attributes passed post-connection:\n";
-
-/* Create the associative options array with valid key-value pairs */
-/* Assign the attributes after a connection is made */
-/* Access the options specified */
-$options5 = array('userid' => 'db2inst1');
-$conn5 = db2_connect($database, $user, $password);
-$rc = db2_set_option($conn5, $options5, 1);
-$val = db2_get_option($conn5, 'userid');
-echo $val . "\n";
-
-$options6 = array('acctstr' => 'account');
-$conn6 = db2_connect($database, $user, $password);
-$rc = db2_set_option($conn6, $options6, 1);
-$val = db2_get_option($conn6, 'acctstr');
-echo $val . "\n";
-
-$options7 = array('applname' => 'myapp');
-$conn7 = db2_connect($database, $user, $password);
-$rc = db2_set_option($conn7, $options7, 1);
-$val = db2_get_option($conn7, 'applname');
-echo $val . "\n";
-
-$options8 = array('wrkstnname' => 'workstation');
-$conn8 = db2_connect($database, $user, $password);
-$rc = db2_set_option($conn8, $options8, 1);
-$val = db2_get_option($conn8, 'wrkstnname');
-echo $val . "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Client attributes passed through connection string:
-db2inst1
-account
-myapp
-workstation
-Client attributes passed post-connection:
-db2inst1
-account
-myapp
-workstation]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_connect</function></member>
-   <member><function>db2_cursor_type</function></member>
-   <member><function>db2_exec</function></member>
-   <member><function>db2_set_option</function></member>
-   <member><function>db2_pconnect</function></member>
-   <member><function>db2_prepare</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/ibm_db2/functions/db2-last-insert-id.xml b/reference/ibm_db2/functions/db2-last-insert-id.xml
deleted file mode 100644
index 011248f0100b..000000000000
--- a/reference/ibm_db2/functions/db2-last-insert-id.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-last-insert-id">
- <refnamediv>
-  <refname>db2_last_insert_id</refname>
-  <refpurpose>Returns the auto generated ID of the last insert query that successfully
-  executed on this connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>null</type></type><methodname>db2_last_insert_id</methodname>
-   <methodparam><type>resource</type><parameter>resource</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the auto generated ID of the last insert query that successfully
-  executed on this connection.
-  </simpara>
-  <para>
-   The result of this function is not affected by any of the following:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      A single row INSERT statement with a VALUES clause for a table without an identity column.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      A multiple row INSERT statement with a VALUES clause.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      An INSERT statement with a fullselect.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      A ROLLBACK TO SAVEPOINT statement.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>resource</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection resource as returned from <function>db2_connect</function>
-      or <function>db2_pconnect</function>. The value of this parameter cannot be a
-      statement resource or result set resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the auto generated ID of last insert query that successfully
-  executed on this connection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="db2-last-insert-id.example.basic"><!-- {{{ -->
-   <title>A <function>db2_last_insert_id</function> example</title>
-   <simpara>
-     The following example shows how to return the
-     auto generated ID of last insert query that successfully
-     executed on this connection.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$database = "SAMPLE";
-$user = "db2inst1";
-$password = "ibmdb2";
-
-$conn = db2_connect($database, $user, $password);
-if($conn) {
-    $createTable = "CREATE TABLE lastInsertID
-      (id integer GENERATED BY DEFAULT AS IDENTITY, name varchar(20))";
-    $insertTable = "INSERT INTO lastInsertID (name) VALUES ('Temp Name')";
-
-    $stmt = @db2_exec($conn, $createTable);
-
-    /* Checking for single row inserted. */
-    $stmt = db2_exec($conn, $insertTable);
-    $ret =  db2_last_insert_id($conn);
-    if($ret) {
-        echo "Last Insert ID is : " . $ret . "\n";
-    } else {
-        echo "No Last insert ID.\n";
-    }
-
-    db2_close($conn);
-}
-else {
-    echo "Connection failed.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Last Insert ID is : 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/ibm_db2/functions/db2-lob-read.xml b/reference/ibm_db2/functions/db2-lob-read.xml
deleted file mode 100644
index d5a6c173b72e..000000000000
--- a/reference/ibm_db2/functions/db2-lob-read.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-lob-read">
- <refnamediv>
-  <refname>db2_lob_read</refname>
-  <refpurpose>
-   Gets a user defined size of LOB files with each invocation
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>db2_lob_read</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type>int</type><parameter>colnum</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Use <function>db2_lob_read</function> to iterate through a specified column of
-   a result set and retrieve a user defined size of LOB data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing LOB data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>colnum</parameter></term>
-    <listitem>
-     <simpara>
-      A valid column number in the result set of the <literal>stmt</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-      The size of the LOB data to be retrieved from the <literal>stmt</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the amount of data the user specifies. Returns
-   &false; if the data cannot be retrieved.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Iterating through different types of data</title>
-   <simpara>
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Database Connection Parameters */
-$db = 'SAMPLE';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Obtain Connection Resource */
-$conn = db2_connect($db,$username,$password);
-
-if ($conn) {
-    $drop = 'DROP TABLE clob_stream';
-    $result = @db2_exec( $conn, $drop );
-
-    $create = 'CREATE TABLE clob_stream (id INTEGER, my_clob CLOB)';
-    $result = db2_exec( $conn, $create );
-
-    $variable = "";
-    $stmt = db2_prepare($conn, "INSERT INTO clob_stream (id,my_clob) VALUES (1, ?)");
-    $variable = "THIS IS A CLOB TEST. THIS IS A CLOB TEST.";
-    db2_bind_param($stmt, 1, "variable", DB2_PARAM_IN);
-    db2_execute($stmt);
-
-    $sql = "SELECT id,my_clob FROM clob_stream";
-    $result = db2_prepare($conn, $sql);
-    db2_execute($result);
-    db2_fetch_row($result);
-    $i = 0;
-    /* Read LOB data */
-    while ($data = db2_lob_read($result, 2, 6)) {
-        echo "Loop $i: $data\n";
-        $i = $i + 1;
-    }
-
-    $drop = 'DROP TABLE blob_stream';
-    $result = @db2_exec( $conn, $drop );
-
-    $create = 'CREATE TABLE blob_stream (id INTEGER, my_blob CLOB)';
-    $result = db2_exec( $conn, $create );
-
-    $variable = "";
-    $stmt = db2_prepare($conn, "INSERT INTO blob_stream (id,my_blob) VALUES (1, ?)");
-    $variable = "THIS IS A BLOB TEST. THIS IS A BLOB TEST.";
-    db2_bind_param($stmt, 1, "variable", DB2_PARAM_IN);
-    db2_execute($stmt);
-
-    $sql = "SELECT id,my_blob FROM blob_stream";
-    $result = db2_prepare($conn, $sql);
-    db2_execute($result);
-    db2_fetch_row($result);
-    $i = 0;
-    /* Read LOB data */
-    while ($data = db2_lob_read($result, 2, 6)) {
-        echo "Loop $i: $data\n";
-        $i = $i + 1;
-    }
-} else {
-    echo 'no connection: ' . db2_conn_errormsg();
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Loop 0: THIS I
-Loop 1: S A CL
-Loop 2: OB TES
-Loop 3: T. THI
-Loop 4: S IS A
-Loop 5:  CLOB
-Loop 6: TEST.
-Loop 0: THIS I
-Loop 1: S A BL
-Loop 2: OB TES
-Loop 3: T. THI
-Loop 4: S IS A
-Loop 5:  BLOB
-Loop 6: TEST.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_bind_param</function></member>
-   <member><function>db2_exec</function></member>
-   <member><function>db2_execute</function></member>
-   <member><function>db2_fetch_row</function></member>
-   <member><function>db2_prepare</function></member>
-   <member><function>db2_result</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/ibm_db2/functions/db2-next-result.xml b/reference/ibm_db2/functions/db2-next-result.xml
deleted file mode 100644
index 8a35b6d1bfd8..000000000000
--- a/reference/ibm_db2/functions/db2-next-result.xml
+++ /dev/null
@@ -1,171 +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.db2-next-result" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_next_result</refname>
-  <refpurpose>
-   Requests the next result set from a stored procedure
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>db2_next_result</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   A stored procedure can return zero or more result sets. While you handle
-   the first result set in exactly the same way you would handle the results
-   returned by a simple SELECT statement, to fetch the second and subsequent
-   result sets from a stored procedure you must call the
-   <function>db2_next_result</function> function and return the result to a
-   uniquely named PHP variable.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A prepared statement returned from <function>db2_exec</function> or
-      <function>db2_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new statement resource containing the next result set if the
-   stored procedure returned another result set. Returns &false; if the stored
-   procedure did not return another result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Calling a stored procedure that returns multiple result sets</title>
-   <simpara>
-    In the following example, we call a stored procedure that returns three
-    result sets. The first result set is fetched directly from the same
-    statement resource on which we invoked the CALL statement, while the
-    second and third result sets are fetched from statement resources
-    returned from our calls to the <function>db2_next_result</function>
-    function.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect($database, $user, $password);
-
-if ($conn) {
-  $stmt = db2_exec($conn, 'CALL multiResults()');
-
-  print "Fetching first result set\n";
-  while ($row = db2_fetch_array($stmt)) {
-    var_dump($row);
-  }
-
-  print "\nFetching second result set\n";
-  $res = db2_next_result($stmt);
-  if ($res) {
-    while ($row = db2_fetch_array($res)) {
-      var_dump($row);
-    }
-  }
-
-  print "\nFetching third result set\n";
-  $res2 = db2_next_result($stmt);
-  if ($res2) {
-    while ($row = db2_fetch_array($res2)) {
-      var_dump($row);
-    }
-  }
-
-  db2_close($conn);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Fetching first result set
-array(2) {
-  [0]=>
-  string(16) "Bubbles         "
-  [1]=>
-  int(3)
-}
-array(2) {
-  [0]=>
-  string(16) "Gizmo           "
-  [1]=>
-  int(4)
-}
-
-Fetching second result set
-array(4) {
-  [0]=>
-  string(16) "Sweater         "
-  [1]=>
-  int(6)
-  [2]=>
-  string(5) "llama"
-  [3]=>
-  string(6) "150.00"
-}
-array(4) {
-  [0]=>
-  string(16) "Smarty          "
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "horse"
-  [3]=>
-  string(6) "350.00"
-}
-
-Fetching third result set
-array(1) {
-  [0]=>
-  string(16) "Bubbles         "
-}
-array(1) {
-  [0]=>
-  string(16) "Gizmo           "
-}
-]]>
-   </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/ibm_db2/functions/db2-num-fields.xml b/reference/ibm_db2/functions/db2-num-fields.xml
deleted file mode 100644
index 57f8d4633a23..000000000000
--- a/reference/ibm_db2/functions/db2-num-fields.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-num-fields">
- <refnamediv>
-  <refname>db2_num_fields</refname>
-  <refpurpose>
-   Returns the number of fields contained in a result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns the number of fields contained in a result set. This is most useful
-   for handling the result sets returned by dynamically generated queries, or
-   for result sets returned by stored procedures, where your application cannot
-   otherwise know how to retrieve and use the results.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer value representing the number of fields in the result
-   set associated with the specified statement resource. Returns &false; if
-   the statement resource is not a valid input value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving the number of fields in a result set</title>
-   <simpara>
-    The following example demonstrates how to retrieve the number of fields
-    returned in a result set.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$sql = "SELECT id, name, breed, weight FROM animals ORDER BY breed";
-$stmt = db2_prepare($conn, $sql);
-db2_execute($stmt, $sql);
-$columns = db2_num_fields($stmt);
-
-echo "There are {$columns} columns in the result set.";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-There are 4 columns in the result set.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_execute</function></member>
-   <member><function>db2_field_display_size</function></member>
-   <member><function>db2_field_name</function></member>
-   <member><function>db2_field_num</function></member>
-   <member><function>db2_field_precision</function></member>
-   <member><function>db2_field_scale</function></member>
-   <member><function>db2_field_type</function></member>
-   <member><function>db2_field_width</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/ibm_db2/functions/db2-num-rows.xml b/reference/ibm_db2/functions/db2-num-rows.xml
deleted file mode 100644
index 7a42a5d9c1a0..000000000000
--- a/reference/ibm_db2/functions/db2-num-rows.xml
+++ /dev/null
@@ -1,92 +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.db2-num-rows" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_num_rows</refname>
-  <refpurpose>
-   Returns the number of rows affected by an SQL statement
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>db2_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns the number of rows deleted, inserted, or updated by an SQL
-   statement.
-  </simpara>
-  <simpara>
-   To determine the number of rows that will be returned by a SELECT
-   statement, issue SELECT COUNT(*) with the same predicates as your
-   intended SELECT statement and retrieve the value.
-  </simpara>
-  <simpara>
-   If your application logic checks the number of rows returned by a SELECT
-   statement and branches if the number of rows is 0, consider modifying your
-   application to attempt to return the first row with one of
-   <function>db2_fetch_assoc</function>, <function>db2_fetch_both</function>,
-   <function>db2_fetch_array</function>, or <function>db2_fetch_row</function>,
-   and branch if the fetch function returns &false;.
-  </simpara>
-
-  <note>
-   <simpara>
-    If you issue a SELECT statement using a scrollable cursor,
-    <function>db2_num_rows</function> returns the number of rows returned by
-    the SELECT statement. However, the overhead associated with scrollable
-    cursors significantly degrades the performance of your application, so if
-    this is the only reason you are considering using scrollable cursors,
-    you should use a forward-only cursor and either call SELECT COUNT(*) or
-    rely on the <type>bool</type> return value of the fetch functions to
-    achieve the equivalent functionality with much better performance.
-   </simpara>
-  </note>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>stmt</literal> resource containing a result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of rows affected by the last SQL statement issued by
-   the specified statement handle,&return.falseforfailure;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibm_db2/functions/db2-pclose.xml b/reference/ibm_db2/functions/db2-pclose.xml
deleted file mode 100644
index ddfe051cef3e..000000000000
--- a/reference/ibm_db2/functions/db2-pclose.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-pclose">
- <refnamediv>
-  <refname>db2_pclose</refname>
-  <refpurpose>Closes a persistent database connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_pclose</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function closes a DB2 client connection created with
-   <function>db2_pconnect</function> and returns the corresponding resources
-   to the database server.
-   <note>
-    <simpara>
-     This function is only available on i5/OS in response to i5/OS system
-     administration requests.
-    </simpara>
-   </note>
-  </para>
-  <simpara>
-   If you have a persistent DB2 client connection created with
-   <function>db2_pconnect</function>, you may use this function to close the
-   connection. To avoid substantial connection performance penalties, this
-   function should only be used in rare cases when the persistent connection
-   has become unresponsive or the persistent connection will not be needed for
-   a long period of time.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies an active DB2 client connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="db2-pclose.example.basic"><!-- {{{ -->
-   <title>Closing a persistent connection</title>
-   <simpara>
-     The following example demonstrates a successful attempt to close a
-     connection to an IBM DB2 i5/OS database.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_pconnect('', '', '');
-$rc = db2_pclose($conn);
-if ($rc) {
-    echo "Connection was successfully closed.";
-}
-?>
-
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Connection was successfully closed.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_close</function></member>
-   <member><function>db2_pconnect</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/ibm_db2/functions/db2-pconnect.xml b/reference/ibm_db2/functions/db2-pconnect.xml
deleted file mode 100644
index 33d30e0f73be..000000000000
--- a/reference/ibm_db2/functions/db2-pconnect.xml
+++ /dev/null
@@ -1,686 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.db2-pconnect">
- <refnamediv>
-  <refname>db2_pconnect</refname>
-  <refpurpose>
-   Returns a persistent connection to a database
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>db2_pconnect</methodname>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>username</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>password</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns a persistent connection to an IBM DB2 Universal Database, IBM
-   Cloudscape, or Apache Derby database.
-  </simpara>
-
-  <simpara>
-   For more information on persistent
-   connections, refer to <xref linkend="features.persistent-connections"/>.
-  </simpara>
-
-  <simpara>
-   Calling <function>db2_close</function> on a persistent connection always
-   returns &true;, but the underlying DB2 client connection remains open and
-   waiting to serve the next matching <function>db2_pconnect</function>
-   request.
-  </simpara>
-
-  <simpara>
-   Users running version 1.9.0 or later of ibm_db2 should be aware that the
-   extension will perform a transaction rollback on persistent connections at
-   the end of a request, thus ending the transaction.  This prevents the
-   transaction block from carrying over to the next request which uses that
-   connection if script execution ends before the transaction block does.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      For a cataloged connection to a database, <parameter>database</parameter>
-      represents the database alias in the DB2 client catalog.
-     </simpara>
-     <para>
-      For an uncataloged connection to a database,
-      <parameter>database</parameter> represents a complete connection
-      string in the following format:
-      <literallayout>DATABASE=<parameter>database</parameter>;HOSTNAME=<parameter>hostname</parameter>;PORT=<parameter>port</parameter>;PROTOCOL=TCPIP;UID=<parameter>username</parameter>;PWD=<parameter>password</parameter>;</literallayout>
-      <note>
-       <para>
-        When connecting to Db2 on IBM i, the underlying system calls
-        <link xlink:href="&url.db2.sqldriverconnect;">SQLDriverConnect</link>,
-        which only accepts DSN, UID, and PWD for the
-        <link xlink:href="&url.db2.connection.string;">connection string</link>.
-        Like so:
-        <literallayout>DSN=<parameter>database</parameter>;UID=<parameter>username</parameter>;PWD=<parameter>password</parameter>;</literallayout>
-       </para>
-      </note>
-      where the parameters represent the following values:
-      <variablelist>
-       <varlistentry>
-        <term><parameter>database</parameter></term>
-        <listitem>
-         <simpara>
-          The name of the database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>hostname</parameter></term>
-        <listitem>
-         <simpara>
-          The hostname or IP address of the database server.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>port</parameter></term>
-        <listitem>
-         <simpara>
-          The TCP/IP port on which the database is listening for
-          requests.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>username</parameter></term>
-        <listitem>
-         <simpara>
-          The username with which you are connecting to the
-          database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>password</parameter></term>
-        <listitem>
-         <simpara>
-          The password with which you are connecting to the database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The username with which you are connecting to the database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password with which you are connecting to the database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      An associative array of connection options that affect the behavior
-      of the connection, where valid array keys include:
-      <variablelist>
-       <varlistentry>
-        <term><parameter>autocommit</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_AUTOCOMMIT_ON</constant> value turns
-          autocommit on for this connection handle.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_AUTOCOMMIT_OFF</constant> value turns
-          autocommit off for this connection handle.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>DB2_ATTR_CASE</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_CASE_NATURAL</constant> value specifies
-          that column names are returned in natural case.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_CASE_LOWER</constant> value specifies
-          that column names are returned in lower case.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_CASE_UPPER</constant> value specifies
-          that column names are returned in upper case.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>CURSOR</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the <constant>DB2_FORWARD_ONLY</constant> value specifies a
-          forward-only cursor for a statement resource. This is the default
-          cursor type and is supported on all database servers.
-         </simpara>
-         <simpara>
-          Passing the <constant>DB2_SCROLLABLE</constant> value specifies a
-          scrollable cursor for a statement resource. This mode enables
-          random access to rows in a result set, but currently is supported
-          only by IBM DB2 Universal Database.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The following new option is available in ibm_db2 version 1.7.0
-      and later.
-      <variablelist>
-       <varlistentry>
-        <term><parameter>trustedcontext</parameter></term>
-        <listitem>
-         <simpara>
-          Passing the DB2_TRUSTED_CONTEXT_ENABLE value turns trusted context
-          on for this connection handle. This parameter cannot be set using
-          <function>db2_set_option</function>.
-         </simpara>
-         <simpara>
-          This key works only if the database is cataloged (even if the
-          database is local), or if you specify the full DSN when you create
-          the connection.
-         </simpara>
-         <simpara>
-          To catalog the database, use following commands:
-         </simpara>
-         <literallayout>db2 catalog tcpip node loopback remote &lt;SERVERNAME&gt; server &lt;SERVICENAME&gt;
-db2 catalog database &lt;LOCALDBNAME&gt; as &lt;REMOTEDBNAME&gt; at node loopback
-db2 "update dbm cfg using svcename &lt;SERVICENAME&gt;"
-db2set DB2COMM=TCPIP</literallayout>
-
-        </listitem>
-       </varlistentry>
-     </variablelist>
-     </para>
-     <para>
-      The following new i5/OS options are available in ibm_db2 version 1.5.1
-      and later.
-      <tip>
-       <simpara>Conflicting connection attributes used in conjunction with persistent
-        connections can produce indeterminate results on i5/OS. Site policies should
-        be establish for all applications using each persistent connection user
-        profile. The default DB2_AUTOCOMMIT_ON is suggested when using persistent connections.
-       </simpara>
-      </tip>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>i5_lib</parameter></term>
-        <listitem>
-         <simpara>
-          A character value that indicates the default library that will be
-          used for resolving unqualified file references. This is not valid
-          if the connection is using system naming mode.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_naming</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_NAMING_ON</literal> value turns on DB2 UDB CLI iSeries
-          system naming mode. Files are qualified using the slash (/) delimiter.
-          Unqualified files are resolved using the library list for the job.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_NAMING_OFF</literal> value turns off DB2 UDB CLI default
-          naming mode, which is SQL naming. Files are qualified using the period (.)
-          delimiter. Unqualified files are resolved using either the default library
-          or the current user ID.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_commit</parameter></term>
-        <listitem>
-         <para>
-          The <parameter>i5_commit</parameter> attribute should be set before the
-          <function>db2_pconnect</function>. If the value is changed after the
-          connection has been established, and the connection is to a remote data
-          source, the change does not take effect until the next successful
-          <function>db2_pconnect</function> for the connection handle.
-          <note>
-           <simpara>
-            The php.ini setting <parameter>ibm_db2.i5_allow_commit</parameter>==0
-            or <literal>DB2_I5_TXN_NO_COMMIT</literal> is the default, but may be
-            overridden with the <parameter>i5_commit</parameter> option.
-           </simpara>
-          </note>
-         </para>
-         <simpara>
-          <literal>DB2_I5_TXN_NO_COMMIT</literal> - Commitment control is not used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_READ_UNCOMMITTED</literal> - Dirty reads, nonrepeatable
-          reads, and phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_READ_COMMITTED</literal> - Dirty reads are not possible.
-          Nonrepeatable reads, and phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_REPEATABLE_READ</literal> - Dirty reads and nonrepeatable
-          reads are not possible. Phantoms are possible.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_TXN_SERIALIZABLE</literal> - Transactions are serializable.
-          Dirty reads, non-repeatable reads, and phantoms are not possible
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_query_optimize</parameter></term>
-        <listitem>
-         <simpara>
-           <literal>DB2_FIRST_IO</literal> All queries are optimized with the goal of
-           returning the first page of output as fast as possible. This goal works well
-           when the output is controlled by a user who is most likely to cancel the query
-           after viewing the first page of output data. Queries coded with an
-           OPTIMIZE FOR nnn ROWS clause honor the goal specified by the clause.
-         </simpara>
-         <simpara>
-          <literal>DB2_ALL_IO</literal> All queries are optimized with the goal of running
-          the entire query to completion in the shortest amount of elapsed time. This is a
-          good option when the output of a query is being written to a file or report, or
-          the interface is queuing the output data. Queries coded with an OPTIMIZE FOR nnn
-          ROWS clause honor the goal specified by the clause. This is the default.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_dbcs_alloc</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_DBCS_ALLOC_ON</literal> value turns on DB2 6X allocation scheme
-          for DBCS translation column size growth.
-         </simpara>
-         <para>
-          <literal>DB2_I5_DBCS_ALLOC_OFF</literal> value turns off DB2 6X allocation scheme
-          for DBCS translation column size growth.
-          <note>
-           <simpara>
-            The php.ini setting <parameter>ibm_db2.i5_dbcs_alloc</parameter>==0 or
-            <literal>DB2_I5_DBCS_ALLOC_OFF</literal> is the default, but may be overridden
-            with the <parameter>i5_dbcs_alloc</parameter> option.
-           </simpara>
-          </note>
-          </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_date_fmt</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_FMT_ISO</literal> - The International Organization for Standardization
-          (ISO) date format yyyy-mm-dd is used. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_USA</literal> - The United States date format mm/dd/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_EUR</literal> - The European date format dd.mm.yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JIS</literal> - The Japanese Industrial Standard date format
-          yyyy-mm-dd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_MDY</literal> - The date format mm/dd/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_DMY</literal> - The date format dd/mm/yyyy is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_YMD</literal> - The date format yy/mm/dd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JUL</literal> - The Julian date format yy/ddd is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_date_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_SLASH</literal> - A slash ( / ) is used as the date separator.
-          This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_DASH</literal> - A dash ( - ) is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as the date
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_BLANK</literal> - A blank is used as the date separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_time_fmt</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_FMT_ISO</literal> - The International Organization for
-          Standardization (ISO) time format hh.mm.ss is used. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_USA</literal> - The United States time format
-          hh:mmxx is used, where xx is AM or PM.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_EUR</literal> - The European time format hh.mm.ss
-          is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_JIS</literal> - The Japanese Industrial Standard
-          time format hh:mm:ss is used.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_FMT_HMS</literal> - The hh:mm:ss format is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_time_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_COLON</literal> - A colon ( : ) is used as the time
-          separator. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as the time
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the time
-          separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_BLANK</literal> - A blank is used as the time separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>i5_decimal_sep</parameter></term>
-        <listitem>
-         <simpara>
-          <literal>DB2_I5_SEP_PERIOD</literal> - A period ( . ) is used as
-          the decimal separator. This is the default.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_COMMA</literal> - A comma ( , ) is used as the
-          decimal separator.
-         </simpara>
-         <simpara>
-          <literal>DB2_I5_SEP_JOB</literal> - The job default is used.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The following new i5/OS option is available in ibm_db2 version 1.8.0
-      and later.
-      <variablelist>
-       <varlistentry>
-        <term><parameter>i5_libl</parameter></term>
-        <listitem>
-         <para>
-          A character value that indicates the library list that will be used for
-          resolving unqualified file references. Specify the library list
-          elements separated by blanks 'i5_libl'=&gt;"MYLIB YOURLIB ANYLIB".
-          <note>
-           <simpara>
-            i5_libl calls qsys2/qcmdexc('cmd',cmdlen), which is only available
-            in i5/OS V5R4 and later.
-           </simpara>
-          </note>
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a connection handle resource if the connection attempt is
-   successful. <function>db2_pconnect</function> tries to reuse an existing
-   connection resource that exactly matches the
-   <parameter>database</parameter>, <parameter>username</parameter>, and
-   <parameter>password</parameter> parameters. If the connection attempt fails,
-   <function>db2_pconnect</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL ibm_db2 1.9.0</entry>
-      <entry>
-       Active transactions within a persistent connection will be rolled back
-       at the end of each request.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL ibm_db2 1.8.0</entry>
-      <entry>
-       The <parameter>i5_libl</parameter> option is available for i5/OS
-       users.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL ibm_db2 1.7.0</entry>
-      <entry>
-       The <parameter>trustedcontext</parameter> option is available.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL ibm_db2 1.5.1</entry>
-      <entry>
-       The <parameter>i5_lib</parameter>, <parameter>i5_naming</parameter>,
-       <parameter>i5_commit</parameter>,
-       <parameter>i5_query_optimize</parameter>,
-       <parameter>i5_dbcs_alloc</parameter>,
-       <parameter>i5_date_fmt</parameter>,
-       <parameter>i5_date_sep</parameter>,
-       <parameter>i5_time_fmt</parameter>, <parameter>i5_time_sep</parameter>
-       and <parameter>i5_decimal_sep</parameter> options are available for
-       i5/OS users.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>db2_pconnect</function> example</title>
-    <simpara>
-     In the following example, the first call to
-     <function>db2_pconnect</function> returns a new persistent connection
-     resource. The second call to <function>db2_pconnect</function> returns
-     a persistent connection resource that simply reuses the first persistent
-     connection resource.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$database = 'SAMPLE';
-$user = 'db2inst1';
-$password = 'ibmdb2';
-
-$pconn = db2_pconnect($database, $user, $password);
-
-if ($pconn) {
-    echo "Persistent connection succeeded.";
-}
-else {
-    echo "Persistent connection failed.";
-}
-
-$pconn2 = db2_pconnect($database, $user, $password);
-if ($pconn) {
-    echo "Second persistent connection succeeded.";
-}
-else {
-    echo "Second persistent connection failed.";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Persistent connection succeeded.
-Second persistent connection succeeded.
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Using trusted context</title>
-    <simpara>
-     The following example shows how to enable trusted context, switch
-     users, and get the current user ID.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$database = "SAMPLE";
-$hostname = "localhost";
-$port = 50000;
-$authID = "db2inst1";
-$auth_pass = "ibmdb2";
-
-$tc_user = "tcuser";
-$tc_pass = "tcpassword";
-
-$dsn = "DATABASE=$database;HOSTNAME=$hostname;PORT=$port;
-  PROTOCOL=TCPIP;UID=$authID;PWD=$auth_pass;";
-$options = array ("trustedcontext" => DB2_TRUSTED_CONTEXT_ENABLE);
-
-$tc_conn = db2_pconnect($dsn, "", "", $options);
-if($tc_conn) {
-    echo "Explicit trusted connection succeeded.\n";
-
-    if(db2_get_option($tc_conn, "trustedcontext")) {
-        $userBefore = db2_get_option($tc_conn, "trusted_user");
-
-        //Do some work as user 1.
-
-        //Switching to trusted user.
-        $parameters = array("trusted_user" => $tc_user,
-          "trusted_password" => $tcuser_pass);
-        $res = db2_set_option ($tc_conn, $parameters, 1);
-
-        $userAfter = db2_get_option($tc_conn, "trusted_user");
-        //Do more work as trusted user.
-
-        if($userBefore != $userAfter) {
-            echo "User has been switched." . "\n";
-        }
-    }
-
-    db2_close($tc_conn);
-}
-else {
-    echo "Explicit trusted connection failed.\n";
-}
-?>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Explicit trusted connection succeeded.
-User has been switched.
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_connect</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/ibm_db2/functions/db2-prepare.xml b/reference/ibm_db2/functions/db2-prepare.xml
deleted file mode 100644
index edc653ad026c..000000000000
--- a/reference/ibm_db2/functions/db2-prepare.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-prepare">
- <refnamediv>
-  <refname>db2_prepare</refname>
-  <refpurpose>
-   Prepares an SQL statement to be executed
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>db2_prepare</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type>string</type><parameter>statement</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>[]</initializer></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   <function>db2_prepare</function> creates a prepared SQL statement which can
-   include 0 or more parameter markers (<literal>?</literal> characters)
-   representing parameters for input, output, or input/output. You can pass
-   parameters to the prepared statement using
-   <function>db2_bind_param</function>, or for input values only, as an array
-   passed to <function>db2_execute</function>.
-  </simpara>
-  <para>
-   There are three main advantages to using prepared statements in your
-   application:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      <emphasis>Performance</emphasis>: when you prepare a statement, the
-      database server creates an optimized access plan for retrieving data with
-      that statement. Subsequently issuing the prepared statement with
-      <function>db2_execute</function> enables the statements to reuse that
-      access plan and avoids the overhead of dynamically creating a new access
-      plan for every statement you issue.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <emphasis>Security</emphasis>: when you prepare a statement, you can
-      include parameter markers for input values. When you execute a prepared
-      statement with input values for placeholders, the database server checks
-      each input value to ensure that the type matches the column definition or
-      parameter definition.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <emphasis>Advanced functionality</emphasis>: Parameter markers not only
-      enable you to pass input values to prepared SQL statements, they also
-      enable you to retrieve OUT and INOUT parameters from stored procedures
-      using <function>db2_bind_param</function>.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid database connection resource variable as returned from
-      <function>db2_connect</function> or <function>db2_pconnect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>statement</parameter></term>
-    <listitem>
-     <simpara>
-      An SQL statement, optionally containing one or more parameter markers..
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array containing statement options. You can use this
-      parameter to request a scrollable cursor on database servers that
-      support this functionality.
-     </simpara>
-     <simpara>
-      For a description of valid statement options, see
-      <function>db2_set_option</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a statement resource if the SQL statement was successfully parsed and
-   prepared by the database server. Returns &false; if the database server
-   returned an error. You can determine which error was returned by calling
-   <function>db2_stmt_error</function> or <function>db2_stmt_errormsg</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Preparing and executing an SQL statement with parameter markers</title>
-   <simpara>
-    The following example prepares an INSERT statement that accepts four
-    parameter markers, then iterates over an array of arrays containing the
-    input values to be passed to <function>db2_execute</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$animals = array(
-    array(0, 'cat', 'Pook', 3.2),
-    array(1, 'dog', 'Peaches', 12.3),
-    array(2, 'horse', 'Smarty', 350.0),
-);
-
-$insert = 'INSERT INTO animals (id, breed, name, weight)
-    VALUES (?, ?, ?, ?)';
-$stmt = db2_prepare($conn, $insert);
-if ($stmt) {
-    foreach ($animals as $animal) {
-        $result = db2_execute($stmt, $animal);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_bind_param</function></member>
-   <member><function>db2_execute</function></member>
-   <member><function>db2_stmt_error</function></member>
-   <member><function>db2_stmt_errormsg</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/ibm_db2/functions/db2-primary-keys.xml b/reference/ibm_db2/functions/db2-primary-keys.xml
deleted file mode 100644
index 6cd0e1863861..000000000000
--- a/reference/ibm_db2/functions/db2-primary-keys.xml
+++ /dev/null
@@ -1,152 +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.db2-primary-keys" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_primary_keys</refname>
-  <refpurpose>
-   Returns a result set listing primary keys for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_primary_keys</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the primary keys for a table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. If <parameter>schema</parameter>
-      is &null;, <function>db2_primary_keys</function> matches the schema for
-      the current connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the primary keys for the specified table. The result set is composed of the
-   following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>TABLE_CAT</entry>
-        <entry>
-         Name of the catalog for the table containing the primary key. The
-         value is NULL if this table does not have catalogs.
-        </entry>
-       </row>
-       <row>
-        <entry>TABLE_SCHEM</entry>
-        <entry>
-         Name of the schema for the table containing the primary key.
-        </entry>
-       </row>
-       <row>
-        <entry>TABLE_NAME</entry>
-        <entry>Name of the table containing the primary key.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_NAME</entry>
-        <entry>Name of the column containing the primary key.</entry>
-       </row>
-       <row>
-        <entry>KEY_SEQ</entry>
-        <entry>1-indexed position of the column in the key.</entry>
-       </row>
-       <row>
-        <entry>PK_NAME</entry>
-        <entry>The name of the primary key.</entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-procedure-columns.xml b/reference/ibm_db2/functions/db2-procedure-columns.xml
deleted file mode 100644
index a4e6dc2356aa..000000000000
--- a/reference/ibm_db2/functions/db2-procedure-columns.xml
+++ /dev/null
@@ -1,267 +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.db2-procedure-columns" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_procedure_columns</refname>
-  <refpurpose>
-   Returns a result set listing stored procedure parameters
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_procedure_columns</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>procedure</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>parameter</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the parameters for one or more stored
-   procedures.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the procedures. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>procedure</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the procedure. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>parameter</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the parameter. This parameter accepts a search pattern
-      containing <literal>_</literal> and <literal>%</literal> as wildcards.
-      If this parameter is &null;, all parameters for the specified stored
-      procedures are returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the parameters for the stored procedures matching the specified parameters.
-   The rows are composed of the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>PROCEDURE_CAT</entry>
-        <entry>The catalog that contains the procedure. The value is &null; if
-        this table does not have catalogs.</entry>
-       </row>
-       <row>
-        <entry>PROCEDURE_SCHEM</entry>
-        <entry>Name of the schema that contains the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>PROCEDURE_NAME</entry>
-        <entry>Name of the procedure.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_NAME</entry>
-        <entry>Name of the parameter.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_TYPE</entry>
-        <entry>
-         <para>
-          An integer value representing the type of the parameter:
-          <informaltable>
-           <tgroup cols="2">
-            <thead>
-             <row>
-              <entry>Return value</entry>
-              <entry>Parameter type</entry>
-             </row>
-            </thead>
-            <tbody>
-             <row>
-              <entry>1 (SQL_PARAM_INPUT)</entry>
-              <entry>Input (IN) parameter.</entry>
-             </row>
-             <row>
-              <entry>2 (SQL_PARAM_INPUT_OUTPUT)</entry>
-              <entry>Input/output (INOUT) parameter.</entry>
-             </row>
-             <row>
-              <entry>3 (SQL_PARAM_OUTPUT)</entry>
-              <entry>Output (OUT) parameter.</entry>
-             </row>
-            </tbody>
-           </tgroup>
-          </informaltable>
-         </para>
-        </entry>
-       </row>
-       <row>
-        <entry>DATA_TYPE</entry>
-        <entry>The SQL data type for the parameter represented as an integer
-         value.</entry>
-       </row>
-       <row>
-        <entry>TYPE_NAME</entry>
-        <entry>A string representing the data type for the parameter.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_SIZE</entry>
-        <entry>An integer value representing the size of the parameter.</entry>
-       </row>
-       <row>
-        <entry>BUFFER_LENGTH</entry>
-        <entry>
-         Maximum number of bytes necessary to store data for this parameter.
-        </entry>
-       </row>
-       <row>
-        <entry>DECIMAL_DIGITS</entry>
-        <entry>
-         The scale of the parameter, or &null; where scale is not applicable.
-        </entry>
-       </row>
-       <row>
-        <entry>NUM_PREC_RADIX</entry>
-        <entry>
-         An integer value of either <literal>10</literal> (representing
-         an exact numeric data type), <literal>2</literal> (representing an
-         approximate numeric data type), or &null; (representing a data type for
-         which radix is not applicable).
-        </entry>
-       </row>
-       <row>
-        <entry>NULLABLE</entry>
-        <entry>An integer value representing whether the parameter is nullable
-         or not.</entry>
-       </row>
-       <row>
-        <entry>REMARKS</entry>
-        <entry>Description of the parameter.</entry>
-       </row>
-       <row>
-        <entry>COLUMN_DEF</entry>
-        <entry>Default value for the parameter.</entry>
-       </row>
-       <row>
-        <entry>SQL_DATA_TYPE</entry>
-        <entry>An integer value representing the size of the parameter.</entry>
-       </row>
-       <row>
-        <entry>SQL_DATETIME_SUB</entry>
-        <entry>
-         Returns an integer value representing a datetime subtype code,
-         or &null; for SQL data types to which this does not apply.
-        </entry>
-       </row>
-       <row>
-        <entry>CHAR_OCTET_LENGTH</entry>
-        <entry>
-         Maximum length in octets for a character data type parameter, which
-         matches COLUMN_SIZE for single-byte character set data, or &null; for
-         non-character data types.
-        </entry>
-       </row>
-       <row>
-        <entry>ORDINAL_POSITION</entry>
-        <entry>The 1-indexed position of the parameter in the CALL
-         statement.</entry>
-       </row>
-       <row>
-        <entry>IS_NULLABLE</entry>
-        <entry>
-         A string value where 'YES' means that the parameter accepts or
-         returns &null; values and 'NO' means that the parameter does not
-         accept or return &null; values.
-       </entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-procedures.xml b/reference/ibm_db2/functions/db2-procedures.xml
deleted file mode 100644
index 56fa860f33d9..000000000000
--- a/reference/ibm_db2/functions/db2-procedures.xml
+++ /dev/null
@@ -1,162 +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.db2-procedures" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_procedures</refname>
-  <refpurpose>
-   Returns a result set listing the stored procedures registered in a database
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_procedures</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>procedure</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Returns a result set listing the stored procedures registered in a
-   database.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the procedures. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>procedure</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the procedure. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the stored procedures matching the specified parameters. The rows are
-   composed of the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-       <row>
-        <entry>PROCEDURE_CAT</entry>
-        <entry>The catalog that contains the procedure. The value is &null; if
-        this table does not have catalogs.</entry>
-       </row>
-       <row>
-        <entry>PROCEDURE_SCHEM</entry>
-        <entry>Name of the schema that contains the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>PROCEDURE_NAME</entry>
-        <entry>Name of the procedure.</entry>
-       </row>
-       <row>
-        <entry>NUM_INPUT_PARAMS</entry>
-        <entry>Number of input (IN) parameters for the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>NUM_OUTPUT_PARAMS</entry>
-        <entry>Number of output (OUT) parameters for the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>NUM_RESULT_SETS</entry>
-        <entry>Number of result sets returned by the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>REMARKS</entry>
-        <entry>Any comments about the stored procedure.</entry>
-       </row>
-       <row>
-        <entry>PROCEDURE_TYPE</entry>
-        <entry>Always returns <literal>1</literal>, indicating that the stored
-        procedure does not return a return value.</entry>
-       </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-result.xml b/reference/ibm_db2/functions/db2-result.xml
deleted file mode 100644
index a0910111c3e3..000000000000
--- a/reference/ibm_db2/functions/db2-result.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-result">
- <refnamediv>
-  <refname>db2_result</refname>
-  <refpurpose>
-   Returns a single column from a row in the result set
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>mixed</type><type>null</type></type><methodname>db2_result</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>column</parameter></methodparam>
-  </methodsynopsis>
-
-
-  <simpara>
-   Use <function>db2_result</function> to return the value of a specified
-   column in the current row of a result set. You must call
-   <function>db2_fetch_row</function> before calling
-   <function>db2_result</function> to set the location of the result set
-   pointer.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-     <listitem>
-      <simpara>
-       A valid <literal>stmt</literal> resource.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-     <listitem>
-      <simpara>
-       Either an integer mapping to the 0-indexed field in the result set, or
-       a string matching the name of the column.
-      </simpara>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value of the requested field if the field exists in the result
-   set. Returns &null; if the field does not exist, and issues a warning.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>db2_result</function> example</title>
-   <simpara>
-    The following example demonstrates how to iterate through a result set
-    with <function>db2_fetch_row</function> and retrieve columns from the
-    result set with <function>db2_result</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$sql = 'SELECT name, breed FROM animals WHERE weight < ?';
-$stmt = db2_prepare($conn, $sql);
-db2_execute($stmt, array(10));
-while (db2_fetch_row($stmt)) {
-    $name = db2_result($stmt, 0);
-    $breed = db2_result($stmt, 'BREED');
-    print "$name $breed";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-cat Pook
-gold fish Bubbles
-budgerigar Gizmo
-goat Rickety Ride
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_fetch_array</function></member>
-   <member><function>db2_fetch_assoc</function></member>
-   <member><function>db2_fetch_both</function></member>
-   <member><function>db2_fetch_object</function></member>
-   <member><function>db2_fetch_row</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/ibm_db2/functions/db2-rollback.xml b/reference/ibm_db2/functions/db2-rollback.xml
deleted file mode 100644
index 0e43e25a674a..000000000000
--- a/reference/ibm_db2/functions/db2-rollback.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-rollback">
- <refnamediv>
-  <refname>db2_rollback</refname>
-  <refpurpose>
-   Rolls back a transaction
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>db2_rollback</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Rolls back an in-progress transaction on the specified connection resource and
-   begins a new transaction. PHP applications normally default to AUTOCOMMIT
-   mode, so <function>db2_rollback</function> normally has no effect unless
-   AUTOCOMMIT has been turned off for the connection resource.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid database connection resource variable as returned from
-      <function>db2_connect</function> or <function>db2_pconnect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Rolling back a DELETE statement</title>
-   <simpara>
-    In the following example, we count the number of rows in a table, turn
-    off AUTOCOMMIT mode on a database connection, delete all of the rows in
-    the table and return the count of <literal>0</literal> to prove that the
-    rows have been removed. We then issue <function>db2_rollback</function>
-    and return the updated count of rows in the table to show that the number
-    is the same as before we issued the DELETE statement. The return to the
-    original state of the table demonstrates that the roll back of the
-    transaction succeeded.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = db2_connect($database, $user, $password);
-
-if ($conn) {
-    $stmt = db2_exec($conn, "SELECT count(*) FROM animals");
-    $res = db2_fetch_array( $stmt );
-    echo $res[0] . "\n";
-
-    // Turn AUTOCOMMIT off
-    db2_autocommit($conn, DB2_AUTOCOMMIT_OFF);
-
-    // Delete all rows from ANIMALS
-    db2_exec($conn, "DELETE FROM animals");
-
-    $stmt = db2_exec($conn, "SELECT count(*) FROM animals");
-    $res = db2_fetch_array( $stmt );
-    echo $res[0] . "\n";
-
-    // Roll back the DELETE statement
-    db2_rollback( $conn );
-
-    $stmt = db2_exec( $conn, "SELECT count(*) FROM animals" );
-    $res = db2_fetch_array( $stmt );
-    echo $res[0] . "\n";
-    db2_close($conn);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-7
-0
-7
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_autocommit</function></member>
-   <member><function>db2_commit</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/ibm_db2/functions/db2-server-info.xml b/reference/ibm_db2/functions/db2-server-info.xml
deleted file mode 100644
index d15e89245635..000000000000
--- a/reference/ibm_db2/functions/db2-server-info.xml
+++ /dev/null
@@ -1,386 +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.db2-server-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_server_info</refname>
-  <refpurpose>Returns an object with properties that describe the DB2 database server</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>stdClass</type><type>false</type></type><methodname>db2_server_info</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This function returns an object with read-only properties that return
-   information about the IBM DB2, Cloudscape, or Apache Derby database server.
-   The following table lists the database server properties:
-   <table>
-    <title>Database server properties</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Property name</entry>
-       <entry>Return type</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>DBMS_NAME</entry>
-       <entry>string</entry>
-       <entry>The name of the database server to which you are
-        connected. For DB2 servers this is a combination of
-        <literal>DB2</literal> followed by the operating system on which
-        the database server is running.</entry>
-      </row>
-      <row>
-       <entry>DBMS_VER</entry>
-       <entry>string</entry>
-       <entry>The version of the database server, in the form of a string
-       "MM.mm.uuuu" where <varname>MM</varname> is the major version,
-        <varname>mm</varname> is the minor version,
-        and <varname>uuuu</varname> is the update. For example, "08.02.0001"
-        represents major version 8, minor version 2, update 1.
-       </entry>
-      </row>
-      <row>
-       <entry>DB_CODEPAGE</entry>
-       <entry>int</entry>
-       <entry>The code page of the database to which you are connected.</entry>
-      </row>
-      <row>
-       <entry>DB_NAME</entry>
-       <entry>string</entry>
-       <entry>The name of the database to which you are connected.</entry>
-      </row>
-      <row>
-       <entry>DFT_ISOLATION</entry>
-       <entry>string</entry>
-       <entry>
-        <para>The default transaction isolation level supported by the
-        server:
-        <variablelist>
-         <varlistentry>
-          <term>UR</term>
-          <listitem>
-           <simpara>
-            Uncommitted read: changes are immediately visible by all
-            concurrent transactions.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>CS</term>
-          <listitem>
-           <simpara>
-            Cursor stability: a row read by one transaction can be altered and
-            committed by a second concurrent transaction.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>RS</term>
-          <listitem>
-           <simpara>
-            Read stability: a transaction can add or remove rows matching a
-            search condition or a pending transaction.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>RR</term>
-          <listitem>
-           <simpara>
-            Repeatable read: data affected by pending transaction is not
-            available to other transactions.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>NC</term>
-          <listitem>
-           <simpara>
-            No commit: any changes are visible at the end of a successful
-            operation. Explicit commits and rollbacks are not allowed.
-           </simpara>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>IDENTIFIER_QUOTE_CHAR</entry>
-       <entry>string</entry>
-       <entry>The character used to delimit an identifier.</entry>
-      </row>
-      <row>
-       <entry>INST_NAME</entry>
-       <entry>string</entry>
-       <entry>The instance on the database server that contains the
-        database.</entry>
-      </row>
-      <row>
-       <entry>ISOLATION_OPTION</entry>
-       <entry>array</entry>
-       <entry>An array of the isolation options supported by the
-        database server. The isolation options are described in
-        the DFT_ISOLATION property.</entry>
-      </row>
-      <row>
-       <entry>KEYWORDS</entry>
-       <entry>array</entry>
-       <entry>An array of the keywords reserved by the database
-        server.</entry>
-      </row>
-      <row>
-       <entry>LIKE_ESCAPE_CLAUSE</entry>
-       <entry>bool</entry>
-       <entry>&true; if the database server supports the
-       use of <literal>%</literal> and <literal>_</literal> wildcard
-       characters. &false; if the database server does not
-       support these wildcard characters.</entry>
-      </row>
-      <row>
-       <entry>MAX_COL_NAME_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of a column name supported by the database
-       server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_IDENTIFIER_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of an SQL identifier supported by the database
-       server, expressed in characters.</entry>
-      </row>
-      <row>
-       <entry>MAX_INDEX_SIZE</entry>
-       <entry>int</entry>
-       <entry>Maximum size of columns combined in an index supported by the
-        database server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_PROC_NAME_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of a procedure name supported by the database
-       server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_ROW_SIZE</entry>
-       <entry>int</entry>
-       <entry>Maximum length of a row in a base table supported by the
-       database server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_SCHEMA_NAME_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of a schema name supported by the database
-       server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_STATEMENT_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of an SQL statement supported by the database
-       server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>MAX_TABLE_NAME_LEN</entry>
-       <entry>int</entry>
-       <entry>Maximum length of a table name supported by the database
-       server, expressed in bytes.</entry>
-      </row>
-      <row>
-       <entry>NON_NULLABLE_COLUMNS</entry>
-       <entry>bool</entry>
-       <entry>&true; if the database server supports columns that can be
-        defined as NOT NULL, &false; if the database server does not support
-        columns defined as NOT NULL.</entry>
-      </row>
-      <row>
-       <entry>PROCEDURES</entry>
-       <entry>bool</entry>
-       <entry>&true; if the database server supports the use of the CALL
-        statement to call stored procedures, &false; if the database
-        server does not support the CALL statement.</entry>
-      </row>
-      <row>
-       <entry>SPECIAL_CHARS</entry>
-       <entry>string</entry>
-       <entry>A string containing all of the characters other than
-       a-Z, 0-9, and underscore that can be used in an identifier name.</entry>
-      </row>
-      <row>
-       <entry>SQL_CONFORMANCE</entry>
-       <entry>string</entry>
-       <entry>
-        <para>The level of conformance to the ANSI/ISO SQL-92 specification
-        offered by the database server:
-        <variablelist>
-         <varlistentry>
-          <term>ENTRY</term>
-          <listitem>
-           <simpara>
-            Entry-level SQL-92 compliance.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>FIPS127</term>
-          <listitem>
-           <simpara>
-            FIPS-127-2 transitional compliance.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>FULL</term>
-          <listitem>
-           <simpara>
-            Full level SQL-92 compliance.
-           </simpara>
-          </listitem>
-         </varlistentry>
-         <varlistentry>
-          <term>INTERMEDIATE</term>
-          <listitem>
-           <simpara>
-            Intermediate level SQL-92 compliance.
-           </simpara>
-          </listitem>
-         </varlistentry>
-        </variablelist>
-        </para>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies an active DB2 client connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object on a successful call,&return.falseforfailure;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>db2_server_info</function> example</title>
-   <simpara>
-    To retrieve information about the server, you must pass a valid
-    database connection resource to <function>db2_server_info</function>.
-   </simpara>
-   <programlisting role="php"><![CDATA[<?php
-
-$conn = db2_connect('sample', 'db2inst1', 'ibmdb2');
-
-$server = db2_server_info( $conn );
-
-if ($server) {
-    echo "DBMS_NAME: ";                 var_dump( $server->DBMS_NAME );
-    echo "DBMS_VER: ";                  var_dump( $server->DBMS_VER );
-    echo "DB_CODEPAGE: ";               var_dump( $server->DB_CODEPAGE );
-    echo "DB_NAME: ";                   var_dump( $server->DB_NAME );
-    echo "INST_NAME: ";                 var_dump( $server->INST_NAME );
-    echo "SPECIAL_CHARS: ";             var_dump( $server->SPECIAL_CHARS );
-    echo "KEYWORDS: ";                  var_dump( sizeof($server->KEYWORDS) );
-    echo "DFT_ISOLATION: ";             var_dump( $server->DFT_ISOLATION );
-    echo "ISOLATION_OPTION: ";
-    $il = '';
-    foreach( $server->ISOLATION_OPTION as $opt )
-    {
-       $il .= $opt." ";
-    }
-    var_dump( $il );
-    echo "SQL_CONFORMANCE: ";           var_dump( $server->SQL_CONFORMANCE );
-    echo "PROCEDURES: ";                var_dump( $server->PROCEDURES );
-    echo "IDENTIFIER_QUOTE_CHAR: ";     var_dump( $server->IDENTIFIER_QUOTE_CHAR );
-    echo "LIKE_ESCAPE_CLAUSE: ";        var_dump( $server->LIKE_ESCAPE_CLAUSE );
-    echo "MAX_COL_NAME_LEN: ";          var_dump( $server->MAX_COL_NAME_LEN );
-    echo "MAX_ROW_SIZE: ";              var_dump( $server->MAX_ROW_SIZE );
-    echo "MAX_IDENTIFIER_LEN: ";        var_dump( $server->MAX_IDENTIFIER_LEN );
-    echo "MAX_INDEX_SIZE: ";            var_dump( $server->MAX_INDEX_SIZE );
-    echo "MAX_PROC_NAME_LEN: ";         var_dump( $server->MAX_PROC_NAME_LEN );
-    echo "MAX_SCHEMA_NAME_LEN: ";       var_dump( $server->MAX_SCHEMA_NAME_LEN );
-    echo "MAX_STATEMENT_LEN: ";         var_dump( $server->MAX_STATEMENT_LEN );
-    echo "MAX_TABLE_NAME_LEN: ";        var_dump( $server->MAX_TABLE_NAME_LEN );
-    echo "NON_NULLABLE_COLUMNS: ";      var_dump( $server->NON_NULLABLE_COLUMNS );
-
-    db2_close($conn);
-}
-?>]]></programlisting>
-   &example.outputs;
-   <screen><![CDATA[DBMS_NAME: string(9) "DB2/LINUX"
-DBMS_VER: string(10) "08.02.0000"
-DB_CODEPAGE: int(1208)
-DB_NAME: string(6) "SAMPLE"
-INST_NAME: string(8) "db2inst1"
-SPECIAL_CHARS: string(2) "@#"
-KEYWORDS: int(179)
-DFT_ISOLATION: string(2) "CS"
-ISOLATION_OPTION: string(12) "UR CS RS RR "
-SQL_CONFORMANCE: string(7) "FIPS127"
-PROCEDURES: bool(true)
-IDENTIFIER_QUOTE_CHAR: string(1) """
-LIKE_ESCAPE_CLAUSE: bool(true)
-MAX_COL_NAME_LEN: int(30)
-MAX_ROW_SIZE: int(32677)
-MAX_IDENTIFIER_LEN: int(18)
-MAX_INDEX_SIZE: int(1024)
-MAX_PROC_NAME_LEN: int(128)
-MAX_SCHEMA_NAME_LEN: int(30)
-MAX_STATEMENT_LEN: int(2097152)
-MAX_TABLE_NAME_LEN: int(128)
-NON_NULLABLE_COLUMNS: bool(true)]]></screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_client_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ibm_db2/functions/db2-set-option.xml b/reference/ibm_db2/functions/db2-set-option.xml
deleted file mode 100644
index 0124d806632d..000000000000
--- a/reference/ibm_db2/functions/db2-set-option.xml
+++ /dev/null
@@ -1,912 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.db2-set-option">
-  <refnamediv>
-    <refname>db2_set_option</refname>
-    <refpurpose>Set options for connection or statement resources</refpurpose>
-  </refnamediv>
-  <refsect1 role="description">
-    &reftitle.description;
-    <methodsynopsis>
-      <type>bool</type><methodname>db2_set_option</methodname>
-      <methodparam><type>resource</type><parameter>resource</parameter></methodparam>
-      <methodparam><type>array</type><parameter>options</parameter></methodparam>
-      <methodparam><type>int</type><parameter>type</parameter></methodparam>
-    </methodsynopsis>
-    <simpara>
-     Sets options for a statement resource or a connection resource. You
-     cannot set options for result set resources.
-    </simpara>
-  </refsect1>
-  <refsect1 role="parameters">
-    &reftitle.parameters;
-    <variablelist>
-       <varlistentry>
-         <term><parameter>resource</parameter></term>
-         <listitem>
-           <simpara>
-            A valid statement resource as returned from
-            <function>db2_prepare</function> or a valid connection resource as
-            returned from <function>db2_connect</function> or
-            <function>db2_pconnect</function>.
-           </simpara>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term><parameter>options</parameter></term>
-         <listitem>
-           <para>
-            An associative array containing valid statement or connection
-            options. This parameter can be used to change autocommit values,
-            cursor types (scrollable or forward), and to specify the case of
-            the column names (lower, upper, or natural) that will appear in a
-            result set.
-             <variablelist>
-               <varlistentry>
-                 <term><parameter>autocommit</parameter></term>
-                 <listitem>
-                   <simpara>
-                    Passing <constant>DB2_AUTOCOMMIT_ON</constant> turns
-                    autocommit on for the specified connection resource.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_AUTOCOMMIT_OFF</constant> turns
-                    autocommit off for the specified connection resource.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-               <varlistentry>
-                 <term><parameter>cursor</parameter></term>
-                 <listitem>
-                   <simpara>
-                    Passing <constant>DB2_FORWARD_ONLY</constant> specifies a
-                    forward-only cursor for a statement resource. This is the
-                    default cursor type, and is supported by all database
-                    servers.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_SCROLLABLE</constant> specifies a
-                    scrollable cursor for a statement resource. Scrollable
-                    cursors enable result set rows to be accessed in
-                    non-sequential order, but are only supported by
-                    IBM DB2 Universal Database databases.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-               <varlistentry>
-                 <term><parameter>binmode</parameter></term>
-                 <listitem>
-                   <simpara>
-                    Passing <constant>DB2_BINARY</constant> specifies that
-                    binary data will be returned as is. This is the default
-                    mode. This is the equivalent of setting
-                    <literal>ibm_db2.binmode=1</literal> in &php.ini;.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_CONVERT</constant> specifies that
-                    binary data will be converted to hexadecimal encoding,
-                    and will be returned as such. This is the equivalent of
-                    setting <literal>ibm_db2.binmode=2</literal> in &php.ini;.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_PASSTHRU</constant> specifies that
-                    binary data will be converted to &null;. This is the
-                    equivalent of setting <literal>ibm_db2.binmode=3</literal>
-                    in &php.ini;.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-               <varlistentry>
-                 <term><parameter>db2_attr_case</parameter></term>
-                 <listitem>
-                   <simpara>
-                    Passing <constant>DB2_CASE_LOWER</constant> specifies that
-                    column names of the result set are returned in lower case.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_CASE_UPPER</constant> specifies that
-                    column names of the result set are returned in upper case.
-                   </simpara>
-                   <simpara>
-                    Passing <constant>DB2_CASE_NATURAL</constant> specifies that
-                    column names of the result set are returned in natural
-                    case.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-               <varlistentry>
-                <term><parameter>deferred_prepare</parameter></term>
-                <listitem>
-                 <simpara>
-                  Passing <constant>DB2_DEFERRED_PREPARE_ON</constant> turns deferred
-                  prepare on for the specified statement resource.
-                 </simpara>
-                 <simpara>
-                  Passing <constant>DB2_DEFERRED_PREPARE_OFF</constant> turns deferred
-                  prepare off for the specified statement resource.
-                 </simpara>
-                </listitem>
-               </varlistentry>
-             </variablelist>
-           </para>
-           <para>
-            The following new i5/OS options are available in ibm_db2 version 1.5.1
-            and later. These options apply only when running PHP and ibm_db2 natively on i5 systems.
-             <variablelist>
-               <varlistentry>
-                 <term><parameter>i5_fetch_only</parameter></term>
-                 <listitem>
-                   <simpara>
-                    <literal>DB2_I5_FETCH_ON</literal> - Cursors are read-only
-                    and cannot be used for positioned updates or deletes. This
-                    is the default unless <literal>SQL_ATTR_FOR_FETCH_ONLY</literal>
-                    environment has been set to <literal>SQL_FALSE</literal>.
-                   </simpara>
-                   <simpara>
-                    <literal>DB2_I5_FETCH_OFF</literal> - Cursors can be used
-                    for positioned updates and deletes.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-              </variablelist>
-           </para>
-           <para>
-            The following new option is available in ibm_db2 version 1.8.0 and later.
-             <variablelist>
-               <varlistentry>
-                 <term><parameter>rowcount</parameter></term>
-                 <listitem>
-                   <simpara>
-                    <literal>DB2_ROWCOUNT_PREFETCH_ON</literal> - Client can request
-                    the full row count prior to fetching, which means that
-                    <function>db2_num_rows</function> returns the number of rows selected
-                    even when a <literal>ROLLFORWARD_ONLY</literal> cursor is used.
-                   </simpara>
-                   <simpara>
-                    <literal>DB2_ROWCOUNT_PREFETCH_OFF</literal> - Client cannot request
-                    the full row count prior to fetching.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-             </variablelist>
-           </para>
-           <para>
-            The following new options are available in ibm_db2 version 1.7.0 and later.
-             <variablelist>
-               <varlistentry>
-                 <term><parameter>trusted_user</parameter></term>
-                 <listitem>
-                   <simpara>
-                    To switch the user to a trusted user, pass the User ID (String)
-                    of the trusted user as the value of this key. This option can
-                    be set on a connection resource only. To use this option, trusted
-                    context must be enabled on the connection resource.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-               <varlistentry>
-                 <term><parameter>trusted_password</parameter></term>
-                 <listitem>
-                   <simpara>
-                    The password (String) that corresponds to the user specified
-                    by the trusted_user key.
-                   </simpara>
-                 </listitem>
-               </varlistentry>
-              </variablelist>
-           </para>
-           <para>
-            The following new options are available in ibm_db2 version 1.6.0 and later.
-            These options provide useful tracking information that can be accessed during
-            execution with <function>db2_get_option</function>.
-            <note>
-             <simpara>
-              When the value in each option is being set, some servers might not handle
-              the entire length provided and might truncate the value.
-             </simpara>
-             <simpara>
-              To ensure that the data specified in each option is converted correctly
-              when transmitted to a host system, use only the characters A through Z,
-              0 through 9, and the underscore (_) or period (.).
-             </simpara>
-            </note>
-            <variablelist>
-             <varlistentry>
-              <term><parameter>userid</parameter></term>
-              <listitem>
-               <para>
-                <literal>SQL_ATTR_INFO_USERID</literal> - A pointer to a null-terminated
-                character string used to identify the client user ID sent to the host
-                database server when using DB2 Connect.
-                <note>
-                 <simpara>
-                  DB2 for z/OS and OS/390 servers support up to a length of 16 characters.
-                  This user-id is not to be confused with the authentication user-id, it is for
-                  identification purposes only and is not used for any authorization.
-                 </simpara>
-                </note>
-               </para>
-              </listitem>
-             </varlistentry>
-             <varlistentry>
-              <term><parameter>acctstr</parameter></term>
-              <listitem>
-               <para>
-                <literal>SQL_ATTR_INFO_ACCTSTR</literal> - A pointer to a null-terminated
-                character string used to identify the client accounting string sent to the
-                host database server when using DB2 Connect.
-                <note>
-                 <simpara>
-                  DB2 for z/OS and OS/390 servers support up to a length of 200 characters.
-                 </simpara>
-                </note>
-               </para>
-              </listitem>
-             </varlistentry>
-             <varlistentry>
-              <term><parameter>applname</parameter></term>
-              <listitem>
-               <para>
-                <literal>SQL_ATTR_INFO_APPLNAME</literal> - A pointer to a null-terminated
-                character string used to identify the client application name sent to the
-                host database server when using DB2 Connect.
-                <note>
-                 <simpara>
-                  DB2 for z/OS and OS/390 servers support up to a length of 32 characters.
-                 </simpara>
-                </note>
-               </para>
-              </listitem>
-             </varlistentry>
-             <varlistentry>
-              <term><parameter>wrkstnname</parameter></term>
-              <listitem>
-               <para>
-                <literal>SQL_ATTR_INFO_WRKSTNNAME</literal> - A pointer to a null-terminated
-                character string used to identify the client workstation name sent to the
-                host database server when using DB2 Connect.
-                <note>
-                 <simpara>
-                  DB2 for z/OS and OS/390 servers support up to a length of 18 characters.
-                 </simpara>
-                </note>
-               </para>
-              </listitem>
-             </varlistentry>
-            </variablelist>
-           </para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term><parameter>type</parameter></term>
-         <listitem>
-           <simpara>
-            An integer value that specifies the type of resource that was
-            passed into the function. The type of resource and this value
-            must correspond.
-           </simpara>
-           <simpara>
-            Passing <literal>1</literal> as the value specifies that
-            a connection resource has been passed into the function.
-           </simpara>
-           <simpara>
-            Passing any integer not equal to <literal>1</literal> as
-            the value specifies that a statement resource has been
-            passed into the function.
-           </simpara>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-    <simpara>
-    </simpara>
-    <para>
-     The following table specifies which options are compatible with
-     the available resource types:
-      <table>
-        <title>Resource-Parameter Matrix</title>
-        <tgroup cols="5">
-          <colspec colnum="1" colname="col1" align="center"/>
-          <colspec colnum="2" colname="col2" align="center"/>
-          <colspec colnum="3" colname="col3" align="center"/>
-          <colspec colnum="4" colname="col4" align="center"/>
-          <colspec colnum="5" colname="col5" align="center"/>
-
-          <thead>
-            <row>
-              <entry morerows="1">Key</entry>
-              <entry morerows="1">Value</entry>
-              <entry namest="col3" nameend="col5">Resource Type</entry>
-            </row>
-          </thead>
-
-          <tbody>
-            <row>
-              <entry colname="col3">Connection</entry>
-              <entry colname="col4">Statement</entry>
-              <entry colname="col5">Result Set</entry>
-            </row>
-            <row>
-              <entry>autocommit</entry>
-              <entry><constant>DB2_AUTOCOMMIT_ON</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">-</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>autocommit</entry>
-              <entry><constant>DB2_AUTOCOMMIT_OFF</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">-</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>cursor</entry>
-              <entry><constant>DB2_SCROLLABLE</constant></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>cursor</entry>
-              <entry><constant>DB2_FORWARD_ONLY</constant></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>binmode</entry>
-              <entry><constant>DB2_BINARY</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>binmode</entry>
-              <entry><constant>DB2_CONVERT</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>binmode</entry>
-              <entry><constant>DB2_PASSTHRU</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>db2_attr_case</entry>
-              <entry><constant>DB2_CASE_LOWER</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>db2_attr_case</entry>
-              <entry><constant>DB2_CASE_UPPER</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>db2_attr_case</entry>
-              <entry><constant>DB2_CASE_NATURAL</constant></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>deferred_prepare</entry>
-              <entry><constant>DB2_DEFERRED_PREPARE_ON</constant></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>deferred_prepare</entry>
-              <entry><constant>DB2_DEFERRED_PREPARE_OFF</constant></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>i5_fetch_only</entry>
-              <entry><literal>DB2_I5_FETCH_ON</literal></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>i5_fetch_only</entry>
-              <entry><literal>DB2_I5_FETCH_OFF</literal></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>rowcount</entry>
-              <entry><literal>DB2_ROWCOUNT_PREFETCH_ON</literal></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>rowcount</entry>
-              <entry><literal>DB2_ROWCOUNT_PREFETCH_OFF</literal></entry>
-              <entry colname="col3">-</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>trusted_user</entry>
-              <entry><literal>&lt;USER NAME&gt; (String)</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">-</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>trusted_password</entry>
-              <entry><literal>&lt;PASSWORD&gt; (String)</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">-</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>userid</entry>
-              <entry><literal>SQL_ATTR_INFO_USERID</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>acctstr</entry>
-              <entry><literal>SQL_ATTR_INFO_ACCTSTR</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>applname</entry>
-              <entry><literal>SQL_ATTR_INFO_APPLNAME</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-            <row>
-              <entry>wrkstnname</entry>
-              <entry><literal>SQL_ATTR_INFO_WRKSTNNAME</literal></entry>
-              <entry colname="col3">X</entry>
-              <entry colname="col4">X</entry>
-              <entry colname="col5">-</entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </table>
-    </para>
-  </refsect1>
-
-  <refsect1 role="returnvalues">
-    &reftitle.returnvalues;
-    <simpara>
-     &return.success;
-    </simpara>
-  </refsect1>
-  <!-- Place Changelog next if any -->
-
-  <!-- Place Examples next if any -->
-  <refsect1 role="examples">
-    &reftitle.examples;
-    <para>
-
-      <example>
-        <title>Setting one parameter with a connection resource</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_ON);
-
-/* Call the function using the correct resource, options array, and type values */
-$result = db2_set_option($conn, $options, 1);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Options Set Successfully]]></screen>
-      </example>
-
-      <example>
-        <title>Setting multiple parameters with a connection resource</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF,
-                    'binmode' => DB2_PASSTHRU,
-              'db2_attr_case' => DB2_CASE_UPPER,
-                     'cursor' => DB2_SCROLLABLE);
-
-/* Call the function using the correct resource, options array, and type values */
-$result = db2_set_option($conn, $options, 1);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Options Set Successfully]]></screen>
-      </example>
-
-      <!-- Behaves Incorrectly -->
-      <example>
-        <title>Setting multiple parameters with an invalid key</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF,
-             'MY_INVALID_KEY' => DB2_PASSTHRU,
-              'db2_attr_case' => DB2_CASE_UPPER,
-                     'cursor' => DB2_SCROLLABLE);
-
-/* Call the function using the correct resource, options array, and type values */
-$result = db2_set_option($conn, $options, 1);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Could Not Set Options]]></screen>
-      </example>
-
-      <!-- Behaves Incorrectly -->
-      <example>
-        <title>Setting multiple parameters with an invalid value</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF,
-                    'binmode' => 'INVALID_VALUE',
-              'db2_attr_case' => DB2_CASE_UPPER,
-                     'cursor' => DB2_SCROLLABLE);
-
-/* Call the function using the correct resource, options array, and type values */
-$result = db2_set_option($conn, $options, 1);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Could Not Set Options]]></screen>
-      </example>
-
-      <example>
-        <title>Setting multiple parameters with a connection resource and the wrong type</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF,
-                    'binmode' => DB2_PASSTHRU,
-              'db2_attr_case' => DB2_CASE_UPPER,
-                     'cursor' => DB2_SCROLLABLE);
-
-/* Call the function using the correct resource, options array, and the wrong type value */
-$result = db2_set_option($conn, $options, 2);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Could Not Set Options]]></screen>
-      </example>
-
-      <example>
-        <title>Setting multiple parameters with the wrong resource</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('autocommit' => DB2_AUTOCOMMIT_OFF,
-                    'binmode' => DB2_PASSTHRU,
-              'db2_attr_case' => DB2_CASE_UPPER,
-                     'cursor' => DB2_SCROLLABLE);
-
-$stmt = db2_prepare($conn, 'SELECT * FROM EMPLOYEE');
-
-/* Call the function using the wrong resource, and the correct options array, and type values */
-$result = db2_set_option($stmt, $options, 1);
-
-/* Check if all options could be set correctly */
-if($result)
-{
-  echo 'Options Set Successfully';
-}
-else
-{
-  echo 'Could Not Set Options';
-}
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Could Not Set Options]]></screen>
-      </example>
-
-      <example>
-        <title>Putting it all together</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-/* Database Connection Parameters */
-$database = 'SAMPLE';
-$hostname = 'localhost';
-$port = 50000;
-$protocol = 'TCPIP';
-$username = 'db2inst1';
-$password = 'ibmdb2';
-
-/* Connection String */
-$conn_string = "DRIVER={IBM DB2 ODBC DRIVER};DATABASE=$database;";
-$conn_string .= "HOSTNAME=$hostname;PORT=$port;PROTOCOL=$protocol;";
-$conn_string .= "UID=$username;PWD=$password;";
-
-/* Obtain Connection Resource */
-$conn = db2_connect($conn_string, '', '');
-
-/* Create the associative options array with valid key-value pairs */
-$options = array('db2_attr_case' => DB2_CASE_LOWER,
-                        'cursor' => DB2_SCROLLABLE);
-
-$stmt = db2_prepare($conn, 'SELECT * FROM EMPLOYEE WHERE EMPNO = ? OR EMPNO = ?');
-
-/* Call the function using the correct resource, options array, and type values */
-$option_result = db2_set_option($stmt, $options, 2);
-$result = db2_execute($stmt, array('000130', '000140'));
-
-/* Get Row 2 before Row 1 since Scrollable Cursor */
-print_r(db2_fetch_assoc($stmt, 2));
-print '<br /><br />';
-print_r(db2_fetch_assoc($stmt, 1));
-
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen><![CDATA[Array
-(
-    [empno] => 000140
-    [firstnme] => HEATHER
-    [midinit] => A
-    [lastname] => NICHOLLS
-    [workdept] => C01
-    [phoneno] => 1793
-    [hiredate] => 1976-12-15
-    [job] => ANALYST
-    [edlevel] => 18
-    [sex] => F
-    [birthdate] => 1946-01-19
-    [salary] => 28420.00
-    [bonus] => 600.00
-    [comm] => 2274.00
-)
-
-Array
-(
-    [empno] => 000130
-    [firstnme] => DELORES
-    [midinit] => M
-    [lastname] => QUINTANA
-    [workdept] => C01
-    [phoneno] => 4578
-    [hiredate] => 1971-07-28
-    [job] => ANALYST
-    [edlevel] => 16
-    [sex] => F
-    [birthdate] => 1925-09-15
-    [salary] => 23800.00
-    [bonus] => 500.00
-    [comm] => 1904.00
-)]]></screen>
-      </example>
-      <example>
-        <title>i5/OS cursors are read-only</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-  $conn = db2_connect("", "", "", array("i5_lib"=>"nobody"));
-  $stmt = db2_prepare($conn, 'select * from names where first = ?');
-  $name = "first2";
-  db2_bind_param($stmt, 1, "name", DB2_PARAM_IN);
-  $options = array("i5_fetch_only"=>DB2_I5_FETCH_ON);
-  db2_set_option($stmt,$options,0);
-  if (db2_execute($stmt)) {
-    while ($row = db2_fetch_array($stmt)) {
-      echo "{$row[0]} {$row[1]}";
-    }
-  }
-?>
-]]>
-        </programlisting>
-        &example.outputs;
-        <screen>
-<![CDATA[
-first2 last2
-]]>
-        </screen>
-      </example>
-    </para>
-  </refsect1>
-  <refsect1 role="seealso">
-    &reftitle.seealso;
-    <simplelist>
-       <member><function>db2_connect</function></member>
-       <member><function>db2_pconnect</function></member>
-       <member><function>db2_exec</function></member>
-       <member><function>db2_prepare</function></member>
-       <member><function>db2_cursor_type</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/ibm_db2/functions/db2-special-columns.xml b/reference/ibm_db2/functions/db2-special-columns.xml
deleted file mode 100644
index 5d22c62c6ebb..000000000000
--- a/reference/ibm_db2/functions/db2-special-columns.xml
+++ /dev/null
@@ -1,241 +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.db2-special-columns" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_special_columns</refname>
-  <refpurpose>
-   Returns a result set listing the unique row identifier columns for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_special_columns</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>scope</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the unique row identifier columns for a table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>scope</parameter></term>
-    <listitem>
-     <para>
-      Integer value representing the minimum duration for which the
-      unique row identifier is valid. This can be one of the following
-      values:
-      <informaltable>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Integer value</entry>
-          <entry>SQL constant</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>0</entry>
-          <entry>SQL_SCOPE_CURROW</entry>
-          <entry>Row identifier is valid only while the cursor is positioned
-          on the row.</entry>
-         </row>
-         <row>
-          <entry>1</entry>
-          <entry>SQL_SCOPE_TRANSACTION</entry>
-          <entry>Row identifier is valid for the duration of the
-           transaction.</entry>
-         </row>
-         <row>
-          <entry>2</entry>
-          <entry>SQL_SCOPE_SESSION</entry>
-          <entry>Row identifier is valid for the duration of the
-           connection.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </informaltable>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows with unique
-   row identifier information for a table. The rows are composed of the
-   following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>SCOPE</entry>
-       <entry>
-        <informaltable>
-         <tgroup cols="3">
-          <thead>
-           <row>
-            <entry>Integer value</entry>
-            <entry>SQL constant</entry>
-            <entry>Description</entry>
-           </row>
-          </thead>
-          <tbody>
-           <row>
-            <entry>0</entry>
-            <entry>SQL_SCOPE_CURROW</entry>
-            <entry>Row identifier is valid only while the cursor is positioned
-            on the row.</entry>
-           </row>
-           <row>
-            <entry>1</entry>
-            <entry>SQL_SCOPE_TRANSACTION</entry>
-            <entry>Row identifier is valid for the duration of the
-             transaction.</entry>
-           </row>
-           <row>
-            <entry>2</entry>
-            <entry>SQL_SCOPE_SESSION</entry>
-            <entry>Row identifier is valid for the duration of the
-             connection.</entry>
-           </row>
-          </tbody>
-         </tgroup>
-        </informaltable>
-       </entry>
-      </row>
-      <row>
-       <entry>COLUMN_NAME</entry>
-       <entry>Name of the unique column.</entry>
-      </row>
-      <row>
-       <entry>DATA_TYPE</entry>
-       <entry>SQL data type for the column.</entry>
-      </row>
-      <row>
-       <entry>TYPE_NAME</entry>
-       <entry>Character string representation of the SQL data type for the
-       column.</entry>
-      </row>
-      <row>
-       <entry>COLUMN_SIZE</entry>
-       <entry>An integer value representing the size of the column.</entry>
-      </row>
-      <row>
-       <entry>BUFFER_LENGTH</entry>
-       <entry>
-        Maximum number of bytes necessary to store data from this column.
-       </entry>
-      </row>
-      <row>
-       <entry>DECIMAL_DIGITS</entry>
-       <entry>
-        The scale of the column, or &null; where scale is not applicable.
-       </entry>
-      </row>
-      <row>
-       <entry>NUM_PREC_RADIX</entry>
-       <entry>
-        An integer value of either <literal>10</literal> (representing
-        an exact numeric data type), <literal>2</literal> (representing an
-        approximate numeric data type), or &null; (representing a data type for
-        which radix is not applicable).
-       </entry>
-      </row>
-      <row>
-       <entry>PSEUDO_COLUMN</entry>
-       <entry>Always returns 1.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-statistics.xml b/reference/ibm_db2/functions/db2-statistics.xml
deleted file mode 100644
index 4c554831e37f..000000000000
--- a/reference/ibm_db2/functions/db2-statistics.xml
+++ /dev/null
@@ -1,280 +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.db2-statistics" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_statistics</refname>
-  <refpurpose>
-   Returns a result set listing the index and statistics for a table
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_statistics</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>unique</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the index and statistics for a table.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema that contains the targeted table. If this parameter is
-      &null;, the statistics and indexes are returned for the schema of the
-      current user.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table.
-     </simpara>
-    </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>unique</parameter></term>
-    <listitem>
-     <simpara>
-      When <parameter>unique</parameter> is &true;, the information for all
-      indexes in the table are returned.
-      Otherwise, only the information for unique indexes in the table are
-      returned.
-     </simpara>
-    </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the statistics and indexes for the base tables matching the specified
-   parameters. The rows are composed of the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>TABLE_CAT</entry>
-       <entry>The catalog that contains the table. The value is &null; if
-       this table does not have catalogs.</entry>
-      </row>
-      <row>
-       <entry>TABLE_SCHEM</entry>
-       <entry>Name of the schema that contains the table.</entry>
-      </row>
-      <row>
-       <entry>TABLE_NAME</entry>
-       <entry>Name of the table.</entry>
-      </row>
-      <row>
-       <entry>NON_UNIQUE</entry>
-       <entry>
-        <para>
-         An integer value representing whether the index prohibits unique
-         values, or whether the row represents statistics on the table itself:
-         <informaltable>
-          <tgroup cols="2">
-           <thead>
-            <row>
-             <entry>Return value</entry>
-             <entry>Parameter type</entry>
-            </row>
-           </thead>
-           <tbody>
-            <row>
-             <entry>0 (SQL_FALSE)</entry>
-             <entry>The index allows duplicate values.</entry>
-            </row>
-            <row>
-             <entry>1 (SQL_TRUE)</entry>
-             <entry>The index values must be unique.</entry>
-            </row>
-            <row>
-             <entry>&null;</entry>
-             <entry>This row is statistics information for the table itself.</entry>
-            </row>
-           </tbody>
-          </tgroup>
-         </informaltable>
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>INDEX_QUALIFIER</entry>
-       <entry>A string value representing the qualifier that would have to be
-       prepended to INDEX_NAME to fully qualify the index.</entry>
-      </row>
-      <row>
-       <entry>INDEX_NAME</entry>
-       <entry>A string representing the name of the index.</entry>
-      </row>
-      <row>
-       <entry>TYPE</entry>
-       <entry>
-        <para>
-         An integer value representing the type of information contained in
-         this row of the result set:
-         <informaltable>
-          <tgroup cols="2">
-           <thead>
-            <row>
-             <entry>Return value</entry>
-             <entry>Parameter type</entry>
-            </row>
-           </thead>
-           <tbody>
-            <row>
-             <entry>0 (SQL_TABLE_STAT)</entry>
-             <entry>The row contains statistics about the table itself.</entry>
-            </row>
-            <row>
-             <entry>1 (SQL_INDEX_CLUSTERED)</entry>
-             <entry>The row contains information about a clustered index.</entry>
-            </row>
-            <row>
-             <entry>2 (SQL_INDEX_HASH)</entry>
-             <entry>The row contains information about a hashed index.</entry>
-            </row>
-            <row>
-             <entry>3 (SQL_INDEX_OTHER)</entry>
-             <entry>The row contains information about a type of index that
-             is neither clustered nor hashed.</entry>
-            </row>
-           </tbody>
-          </tgroup>
-         </informaltable>
-        </para>
-       </entry>
-      </row>
-      <row>
-       <entry>ORDINAL_POSITION</entry>
-       <entry>The 1-indexed position of the column in the index. &null; if
-        the row contains statistics information about the table itself.</entry>
-      </row>
-      <row>
-       <entry>COLUMN_NAME</entry>
-       <entry>The name of the column in the index. &null; if the row
-        contains statistics information about the table itself.</entry>
-      </row>
-      <row>
-       <entry>ASC_OR_DESC</entry>
-       <entry>
-        <literal>A</literal> if the column is sorted in ascending order,
-        <literal>D</literal> if the column is sorted in descending order,
-        &null; if the row contains statistics information about the table
-        itself.
-       </entry>
-      </row>
-      <row>
-       <entry>CARDINALITY</entry>
-       <entry>
-        <simpara>
-         If the row contains information about an index, this column contains
-         an integer value representing the number of unique values in the
-         index.
-        </simpara>
-        <simpara>
-         If the row contains information about the table itself, this column
-         contains an integer value representing the number of rows in the
-         table.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PAGES</entry>
-       <entry>
-        <simpara>
-         If the row contains information about an index, this column contains
-         an integer value representing the number of pages used to store the
-         index.
-        </simpara>
-        <simpara>
-         If the row contains information about the table itself, this column
-         contains an integer value representing the number of pages used to
-         store the table.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>FILTER_CONDITION</entry>
-       <entry>Always returns &null;.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_table_privileges</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-stmt-error.xml b/reference/ibm_db2/functions/db2-stmt-error.xml
deleted file mode 100644
index c4a2859f83e7..000000000000
--- a/reference/ibm_db2/functions/db2-stmt-error.xml
+++ /dev/null
@@ -1,86 +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.db2-stmt-error" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_stmt_error</refname>
-  <refpurpose>
-   Returns a string containing the SQLSTATE returned by an SQL statement
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>db2_stmt_error</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>stmt</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a string containing the SQLSTATE value returned by an SQL statement.
-  </simpara>
-  <simpara>
-   If you do not pass a statement resource as an argument to
-   <function>db2_stmt_error</function>, the driver returns the SQLSTATE
-   value associated with the last attempt to return a statement resource, for
-   example, from <function>db2_prepare</function> or
-   <function>db2_exec</function>.
-  </simpara>
-  <para>
-   To learn what the SQLSTATE value means, you can issue the following command
-   at a DB2 Command Line Processor prompt:
-   <userinput>db2 '? <parameter>sqlstate-value</parameter>'</userinput>. You
-   can also call <function>db2_stmt_errormsg</function> to retrieve an
-   explicit error message and the associated SQLCODE value.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing an SQLSTATE value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_conn_error</function></member>
-   <member><function>db2_conn_errormsg</function></member>
-   <member><function>db2_stmt_errormsg</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/ibm_db2/functions/db2-stmt-errormsg.xml b/reference/ibm_db2/functions/db2-stmt-errormsg.xml
deleted file mode 100644
index d20db97bdf97..000000000000
--- a/reference/ibm_db2/functions/db2-stmt-errormsg.xml
+++ /dev/null
@@ -1,80 +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.db2-stmt-errormsg" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_stmt_errormsg</refname>
-  <refpurpose>
-   Returns a string containing the last SQL statement error message
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>db2_stmt_errormsg</methodname>
-   <methodparam choice="opt"><type class="union"><type>resource</type><type>null</type></type><parameter>stmt</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a string containing the last SQL statement error message.
-  </simpara>
-  <simpara>
-   If you do not pass a statement resource as an argument to
-   <function>db2_stmt_errormsg</function>, the driver returns the error
-   message associated with the last attempt to return a statement resource,
-   for example, from <function>db2_prepare</function> or
-   <function>db2_exec</function>.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A valid statement resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the error message and SQLCODE value for the
-   last error that occurred issuing an SQL statement.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_conn_error</function></member>
-   <member><function>db2_conn_errormsg</function></member>
-   <member><function>db2_stmt_error</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/ibm_db2/functions/db2-table-privileges.xml b/reference/ibm_db2/functions/db2-table-privileges.xml
deleted file mode 100644
index 3fbb24994e50..000000000000
--- a/reference/ibm_db2/functions/db2-table-privileges.xml
+++ /dev/null
@@ -1,162 +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.db2-table-privileges" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_table_privileges</refname>
-  <refpurpose>
-   Returns a result set listing the tables and associated privileges in a database
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_table_privileges</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the tables and associated privileges in a
-   database.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table. This parameter accepts a search pattern
-      containing <literal>_</literal> and <literal>%</literal> as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the privileges for the tables that match the specified parameters. The rows
-   are composed of the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>TABLE_CAT</entry>
-       <entry>The catalog that contains the table. The value is &null; if
-       this table does not have catalogs.</entry>
-      </row>
-      <row>
-       <entry>TABLE_SCHEM</entry>
-       <entry>Name of the schema that contains the table.</entry>
-      </row>
-      <row>
-       <entry>TABLE_NAME</entry>
-       <entry>Name of the table.</entry>
-      </row>
-      <row>
-       <entry>GRANTOR</entry>
-       <entry>Authorization ID of the user who granted the privilege.</entry>
-      </row>
-      <row>
-       <entry>GRANTEE</entry>
-       <entry>Authorization ID of the user to whom the privilege was
-        granted.</entry>
-      </row>
-      <row>
-       <entry>PRIVILEGE</entry>
-       <entry>
-        The privilege that has been granted. This can be one of ALTER,
-        CONTROL, DELETE, INDEX, INSERT, REFERENCES, SELECT, or UPDATE.
-       </entry>
-      </row>
-      <row>
-       <entry>IS_GRANTABLE</entry>
-       <entry>
-        A string value of "YES" or "NO" indicating whether the grantee
-        can grant the privilege to other users.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_tables</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/ibm_db2/functions/db2-tables.xml b/reference/ibm_db2/functions/db2-tables.xml
deleted file mode 100644
index 9f5f9e5a3c7d..000000000000
--- a/reference/ibm_db2/functions/db2-tables.xml
+++ /dev/null
@@ -1,158 +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.db2-tables" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>db2_tables</refname>
-  <refpurpose>
-   Returns a result set listing the tables and associated metadata in a database
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>db2_tables</methodname>
-   <methodparam><type>resource</type><parameter>connection</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>qualifier</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>schema</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_name</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>table_type</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Returns a result set listing the tables and associated metadata in a
-   database.
-  </simpara>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <simpara>
-      A valid connection to an IBM DB2, Cloudscape, or Apache Derby database.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>qualifier</parameter></term>
-    <listitem>
-     <simpara>
-      A qualifier for DB2 databases running on OS/390 or z/OS servers. For
-      other databases, pass &null; or an empty string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>schema</parameter></term>
-    <listitem>
-     <simpara>
-      The schema which contains the tables. This parameter accepts a
-      search pattern containing <literal>_</literal> and <literal>%</literal>
-      as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table.  This parameter accepts a search pattern
-      containing <literal>_</literal> and <literal>%</literal> as wildcards.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_type</parameter></term>
-    <listitem>
-     <simpara>
-      A list of comma-delimited table type identifiers. To match all table
-      types, pass &null; or an empty string. Valid table type identifiers
-      include: ALIAS, HIERARCHY TABLE, INOPERATIVE VIEW, NICKNAME,
-      MATERIALIZED QUERY TABLE, SYSTEM TABLE, TABLE, TYPED TABLE, TYPED VIEW,
-      and VIEW.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a statement resource with a result set containing rows describing
-   the tables that match the specified parameters. The rows are composed of
-   the following columns:
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Column name</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>TABLE_CAT</entry>
-       <entry>The catalog that contains the table. The value is &null; if
-       this table does not have catalogs.</entry>
-      </row>
-      <row>
-       <entry>TABLE_SCHEM</entry>
-       <entry>Name of the schema that contains the table.</entry>
-      </row>
-      <row>
-       <entry>TABLE_NAME</entry>
-       <entry>Name of the table.</entry>
-      </row>
-      <row>
-       <entry>TABLE_TYPE</entry>
-       <entry>Table type identifier for the table.</entry>
-      </row>
-      <row>
-       <entry>REMARKS</entry>
-       <entry>Description of the table.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>db2_column_privileges</function></member>
-   <member><function>db2_columns</function></member>
-   <member><function>db2_foreign_keys</function></member>
-   <member><function>db2_primary_keys</function></member>
-   <member><function>db2_procedure_columns</function></member>
-   <member><function>db2_procedures</function></member>
-   <member><function>db2_special_columns</function></member>
-   <member><function>db2_statistics</function></member>
-   <member><function>db2_table_privileges</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/ibm_db2/ini.xml b/reference/ibm_db2/ini.xml
deleted file mode 100644
index ece4d2b24926..000000000000
--- a/reference/ibm_db2/ini.xml
+++ /dev/null
@@ -1,543 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ibm-db2.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <table>
-  <title>ibm_db2 &ConfigureOptions;</title>
-  <tgroup cols="4">
-   <thead>
-    <row>
-     <entry>&Name;</entry>
-     <entry>&Default;</entry>
-     <entry>&Changeable;</entry>
-     <entry>&Changelog;</entry>
-    </row>
-   </thead>
-   <tbody xml:id="ibm-db2.configuration.list">
-    <row>
-     <entry><link linkend="ini.ibm-db2.binmode">ibm_db2.binmode</link></entry>
-     <entry>"1"</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-all-pconnect">ibm_db2.i5_all_pconnect</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.6.5.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-allow-commit">ibm_db2.i5_allow_commit</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.4.9.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-blank-userid">ibm_db2.i5_blank_userid</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-char-trim">ibm_db2.i5_char_trim</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 2.1.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-dbcs-alloc">ibm_db2.i5_dbcs_alloc</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.5.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-guard-profile">ibm_db2.i5_guard_profile</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-ignore-userid">ibm_db2.i5_ignore_userid</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.8.0.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-job-sort">ibm_db2.i5_job_sort</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.8.4.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-log-verbose">ibm_db2.i5_log_verbose</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-max-pconnect">ibm_db2.i5_max_pconnect</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-override-ccsid">ibm_db2.i5_override_ccsid</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-servermode-subsystem">ibm_db2.i5_servermode_subsystem</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.i5-sys-naming">ibm_db2.i5_sys_naming</link></entry>
-     <entry>"0"</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.9.7.</entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.ibm-db2.instance-name">ibm_db2.instance_name</link></entry>
-     <entry>NULL</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry>Available as of ibm_db2 1.0.2.</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.ibm-db2.binmode">
-   <term>
-    <parameter>ibm_db2.binmode</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option controls the mode used for converting to and from binary
-     data in the PHP application.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        1 (DB2_BINARY)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        2 (DB2_CONVERT)
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        3 (DB2_PASSTHRU)
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-all-pconnect">
-   <term>
-    <parameter>ibm_db2.i5_all_pconnect</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option forces all connections to be persistent on IBM i.
-     Basically, all <function>db2_connect</function> calls transparently become
-     <function>db2_pconnect</function> calls.
-     By default, this option is <literal>0</literal>.
-     This option is provided as a convenience for cases where persistent
-     connections are faster.
-     It should not be used in new applications.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0  - Persistent and non-persistent connections can be made.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - All connections are persistent.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-allow-commit">
-   <term>
-    <parameter>ibm_db2.i5_allow_commit</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option controls the transaction isolation mode used.
-     By default, this option is <literal>0</literal>, so commitment control isn't used.
-     This option can be overridden when connecting if the array key
-     <parameter>i5_commit</parameter> is set in the connection options array
-     passed to <function>db2_connect</function> or
-     <function>db2_pconnect</function>.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - commitment control is not used
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - read uncommitted, dirty reads possible.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        2 - read committed, dirty reads are not possible.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        3 - repeatable read, dirty reads and non-repeatable reads are not possible
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        4 - serializeable, dirty reads, non-repeatable reads, and phantoms are not possible
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-blank-userid">
-   <term>
-    <parameter>ibm_db2.i5_blank_userid</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This controls if a blank user ID should be allowed on IBM i.
-     By default, this option is <literal>0</literal>.
-     Unlike <parameter>ibm_db2.i5_ignore_userid</parameter>, this option
-     doesn't force all user IDs to be empty or change job behaviour, but
-     simply allows an empty user ID to be passed, for connecting to Db2 as the
-     current user.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Don't allow a blank user ID to be passed.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Allow a blank user ID to be passed.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-char-trim">
-   <term>
-    <parameter>ibm_db2.i5_char_trim</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option controls if the end of strings are trimmed on IBM i.
-     Since many tables use fixed column sizes padded with spaces, this is
-     provided as a convenience.
-     By default, this option is <literal>0</literal>.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Columns are not trimmed.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Spaces at the end of returned character columns are removed.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-dbcs-alloc">
-   <term>
-    <parameter>ibm_db2.i5_dbcs_alloc</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This options affects the internal buffer allocation strategy on IBM i.
-     By default, this option is <literal>0</literal>.
-     When this option is set, buffers are allocated with a much larger size,
-     in case the database underestimates a string's size when converting
-     between encodings.
-     This option uses six times as much memory for buffers (to account for
-     the largest possible UTF-8 sequences), but may be needed if truncated
-     data is returned.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Minimum size buffers are allocated.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Larger size buffers are allocated.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-guard-profile">
-   <term>
-    <parameter>ibm_db2.i5_guard_profile</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option checks if the database user profile was switched when
-     connecting to a persistent database connection on IBM i, and if so,
-     disconnects from the database.
-     By default, this option is set to <literal>0</literal>.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Don't check for profile swaps.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Check for profile swaps and disconnect if so.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-log-verbose">
-   <term>
-    <parameter>ibm_db2.i5_log_verbose</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option sets if SQL diagnostic messages like warnings and errors are
-     always sent to the PHP error log on IBM i.
-     Normally, only a brief message on failure is sent (such as "statement
-     execute failed") to the PHP error log, as this option is set to
-     <literal>0</literal> by default.
-     Note that you can still and should call i.e.
-     <function>db2_stmt_errormsg</function> manually as part of checking if
-     functions fail.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Only logs brief messages.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Logs the SQL diagnostic message in addition to the brief message.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-ignore-userid">
-   <term>
-    <parameter>ibm_db2.i5_ignore_userid</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option ignores the user ID when connecting to the database when
-     running on IBM i, and runs SQL/CLI functionality inside of the PHP job,
-     instead of a separate job.
-     By default, this option is <literal>0</literal>.
-     When enabled, it no longer uses a separate database server job, and
-     always uses the current user profile for the database, ignoring the
-     username and password passed to <function>db2_connect</function> and
-     <function>db2_pconnect</function>.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Uses the specified credentials, and use an SQL/CLI server job.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Always use blank credentials, and run SQL/CLI in the PHP job.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-job-sort">
-   <term>
-    <parameter>ibm_db2.i5_job_sort</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     Controls the job sort option on IBM i.
-     By default, this option is <literal>0</literal>.
-     This corresponds to the IBM i SQL/CLI
-     <literal>SQL_ATTR_CONN_SORT_SEQUENCE</literal> attribute.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Uses the <literal>*HEX</literal> sort option, sorting by bytes.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Uses the job sort sequence set for the PHP job.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        2 - Uses the job sort sequence set for the database job.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-max-pconnect">
-   <term>
-    <parameter>ibm_db2.i5_max_pconnect</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     This will affect how many times a persistent connection can be reused
-     when running on IBM i.
-     By default, this is set to <literal>0</literal>, which means a persistent
-     connection can always be reused.
-     This option can help work around issues in a long-running database job
-     (i.e. if a procedure is leaking memory), but is obviously not a long-term
-     fix.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-override-ccsid">
-   <term>
-    <parameter>ibm_db2.i5_override_ccsid</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <simpara>
-     The PASE CCSID to use for character conversions from EBCDIC on IBM i.
-     By default, this is <literal>0</literal>, which will select the default
-     PASE job CCSID, which comes from the PASE locale settings.
-     For example, setting this to <literal>1208</literal> will use UTF-8.
-     This should only be modified if the PASE job CCSID isn't the expected
-     CCSID, and the locale cannot be modified.
-    </simpara>
-    <simpara>
-     To learn more about CCSIDs on IBM i, consult the
-     <link xlink:href="&url.ibm.ccsid;">IBM documentation</link>.
-     To learn how locales on IBM i PASE are mapped to CCSIDs, consult the
-     <link xlink:href="&url.ibm.pase.i;">IBM documentation</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-sys-naming">
-   <term>
-    <parameter>ibm_db2.i5_sys_naming</parameter>
-    <type>int</type>
-   </term>
-   <listitem>
-    <para>
-     This option controls the naming mode when connecting to an IBM i system.
-     By default, this option is <literal>0</literal>.
-     The naming mode affects how names are resolved and the allowed syntax for
-     names.
-     When set to <literal>0</literal>, this uses periods to qualify names and
-     uses the default library or user ID to resolve names.
-     When set to <literal>1</literal>, this uses slashes to qualify names and
-     uses the job library list to resolve names.
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        0 - Uses the SQL naming mode ("SCHEMA.TABLE").
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        1 - Uses the system naming mode ("LIBRARY/FILE").
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-    <simpara>
-     To learn more about naming modes on IBM i, consult the
-     <link xlink:href="&url.db2.object.naming;">IBM documentation</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.i5-servermode-subsystem">
-   <term>
-    <parameter>ibm_db2.i5_servermode-subsystem</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     This option changes which subsystem database server jobs run under on
-     IBM i.
-     By default, this option is &null;, so jobs will run under the default
-     subsystem for QSQSRVR jobs.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.ibm-db2.instance-name">
-   <term>
-    <parameter>ibm_db2.instance_name</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <para>
-     On Linux and UNIX operating systems, this option defines the name of the
-     instance to use for cataloged database connections.
-     By default, this option is &null;.
-     If this option is set, its value overrides the
-     <varname>DB2INSTANCE</varname> environment variable setting.
-    </para>
-    <simpara>
-     This option is ignored on Windows operating systems.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</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/ibm_db2/reference.xml b/reference/ibm_db2/reference.xml
deleted file mode 100644
index 8d165803dad5..000000000000
--- a/reference/ibm_db2/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ibm-db2" xmlns="http://docbook.org/ns/docbook">
- <title>IBM DB2 &Functions;</title>
-
- &reference.ibm-db2.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/ibm_db2/setup.xml b/reference/ibm_db2/setup.xml
deleted file mode 100644
index bfd289a8d25f..000000000000
--- a/reference/ibm_db2/setup.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ibm-db2.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="ibm-db2.requirements">
-  &reftitle.required;
-  <simpara>
-   To connect to IBM DB2 Universal Database for Linux, UNIX, and Windows, or
-   IBM Cloudscape, or Apache Derby, you must install an IBM DB2 Universal
-   Database client on the same computer on which you are running PHP. The
-   extension has been developed and tested with DB2 Version 8.2.
-  </simpara>
-  <simpara>
-   To connect to IBM DB2 Universal Database for z/OS or iSeries, you also
-   require IBM DB2 Connect or the equivalent DRDA gateway software.
-  </simpara>
-  <section xml:id="ibm-db2.requirements.unix">
-   <title>Requirements on Linux or Unix</title>
-   <simpara>
-    The user invoking the PHP executable or SAPI must specify the DB2 instance
-    before accessing these functions. You can set the name of the DB2 instance
-    in &php.ini; using the <literal>ibm_db2.instance_name</literal>
-    configuration option, or you can source the DB2 instance profile before
-    invoking the PHP executable.
-   </simpara>
-   <para>
-    If you created a DB2 instance named <literal>db2inst1</literal> in
-    <filename>/home/db2inst1/</filename>, for example, you can add the
-    following line to &php.ini;:
-    <screen>
-<![CDATA[
-ibm_db2.instance_name=db2inst1
-]]>
-    </screen>
-    If you do not set this option in &php.ini;, you must issue the
-    following command to modify your environment variables to enable access to
-    DB2:
-    <screen>
-<![CDATA[
-bash$ source /home/db2inst1/sqllib/db2profile
-]]>
-    </screen>
-    To enable your PHP-enabled Web server to access these functions, you must
-    either set the <literal>ibm_db2.instance_name</literal> configuration
-    option in &php.ini;, or source the DB2 instance environment in your Web
-    server start script (typically <filename>/etc/init.d/httpd</filename> or
-    <filename>/etc/init.d/apache</filename>).
-   </para>
-  </section>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.ibm-db2.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.ibm-db2.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="ibm-db2.resources">
-  &reftitle.resources;
-  <simpara>
-   The ibm_db2 extension returns connection resources, statement resources,
-   and result set resources.
-  </simpara>
- </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/ibm_db2/versions.xml b/reference/ibm_db2/versions.xml
deleted file mode 100644
index d6ef671d50d5..000000000000
--- a/reference/ibm_db2/versions.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='db2_autocommit' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_bind_param' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_client_info' from='PECL ibm_db2 &gt;= 1.1.1'/>
- <function name='db2_close' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_column_privileges' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_columnprivileges' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_columns' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_commit' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_conn_error' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_conn_errormsg' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_connect' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_cursor_type' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_escape_string' from='PECL ibm_db2 &gt;= 1.6.0'/>
- <function name='db2_exec' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_execute' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_fetch_array' from='PECL ibm_db2 &gt;= 1.0.1'/>
- <function name='db2_fetch_assoc' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_fetch_both' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_fetch_into' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_fetch_object' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_fetch_row' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_display_size' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_name' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_num' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_precision' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_scale' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_type' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_field_width' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_foreign_keys' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_foreignkeys' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_free_result' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_free_stmt' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_get_option' from='PECL ibm_db2 &gt;= 1.6.0'/>
- <function name='db2_getoption' from='PECL ibm_db2 &gt;= 1.6.0'/>
- <function name='db2_last_insert_id' from='PECL ibm_db2 &gt;= 1.7.1'/>
- <function name='db2_lob_read' from='PECL ibm_db2 &gt;= 1.6.0'/>
- <function name='db2_next_result' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_num_fields' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_num_rows' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_pclose' from='PECL ibm_db2 &gt;= 1.8.0'/>
- <function name='db2_pconnect' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_prepare' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_primary_keys' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_primarykeys' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_procedure_columns' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_procedurecolumns' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_procedures' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_result' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_rollback' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_server_info' from='PECL ibm_db2 &gt;= 1.1.1'/>
- <function name='db2_set_option' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_setoption' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_special_columns' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_specialcolumns' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_statistics' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_stmt_error' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_stmt_errormsg' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_table_privileges' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_tableprivileges' from='PECL ibm_db2 &gt;= 1.0.0'/>
- <function name='db2_tables' from='PECL ibm_db2 &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/iconv/reference.xml b/reference/iconv/reference.xml
index 58aa6bbd9a76..ed23612de6e6 100644
--- a/reference/iconv/reference.xml
+++ b/reference/iconv/reference.xml
@@ -6,9 +6,9 @@
 
   <partintro>
    &reftitle.seealso;
-   <para>
-    See also <link linkend="ref.recode">GNU Recode functions</link>.
-   </para>
+   <simpara>
+    See also <link xlink:href="../extensions/ref.recode.php">GNU Recode functions</link>.
+   </simpara>
   </partintro>
 
  &reference.iconv.entities.functions;
diff --git a/reference/igbinary/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/igbinary/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/igbinary/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/igbinary/book.xml b/reference/igbinary/book.xml
deleted file mode 100644
index 4617832b94d9..000000000000
--- a/reference/igbinary/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book xml:id="book.igbinary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>Igbinary</title>
- <titleabbrev>Igbinary</titleabbrev>
-
- <preface xml:id="intro.igbinary">
-  &reftitle.intro;
-  <simpara>
-   Igbinary is a drop in replacement for the standard PHP serializer.
-   Instead of the time and space consuming textual representation used by PHP's <function>serialize</function>,
-   igbinary stores PHP data structures in a compact binary form.
-   Memory savings are significant when using memcached, APCu,
-   or similar memory based storages for serialized data.
-   The typical reduction in storage requirements are around 50%.
-   The exact percentage depends on the data.
-  </simpara>
- </preface>
-
- &reference.igbinary.setup;
- &reference.igbinary.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/igbinary/functions/igbinary-serialize.xml b/reference/igbinary/functions/igbinary-serialize.xml
deleted file mode 100644
index 20fe9350f746..000000000000
--- a/reference/igbinary/functions/igbinary-serialize.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.igbinary-serialize">
- <refnamediv>
-  <refname>igbinary_serialize</refname>
-  <refpurpose>Generates a compact, storable binary representation of a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>igbinary_serialize</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Generates a storable representation of a value.
-  </simpara>
-  <simpara>
-   This is useful for storing or passing PHP values around without
-   losing their type and structure.
-  </simpara>
-  <simpara>
-   To make the serialized string into a PHP value again,
-   <function>igbinary_unserialize</function> can be used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-      <simpara>
-       The value to be serialized. <function>igbinary_serialize</function>
-       handles all types, except the <type>resource</type>-type and some <type>object</type>s (see note below).
-       Even &array;s that contain references to itself can be processed by <function>igbinary_serialize</function>.
-       Circular references inside the &array; or &object; that is being serializend will also be stored.
-       Any other reference will be lost.
-      </simpara>
-      <simpara>
-       When serializing objects, igbinary will attempt to call the member functions
-       <link linkend="object.serialize">__serialize()</link> or
-       <link linkend="object.sleep">__sleep()</link> prior to serialization.
-       This is to allow the object to do any last minute clean-up, etc. prior
-       to being serialized. Likewise, when the object is restored using
-       <function>igbinary_unserialize</function> the <link linkend="object.unserialize">__unserialize()</link> or
-       <link linkend="object.wakeup">__wakeup()</link> member function is called.
-      </simpara>
-      <note>
-       <simpara>
-        Private members of &object;s have the class name prepended to the member
-        name; protected members have a <literal>'*'</literal> prepended to the member name.
-        These prepended values have null bytes on either side.
-       </simpara>
-      </note>
-     </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing a byte-stream representation of
-   <parameter>value</parameter> that can be stored anywhere.
-  </simpara>
-  <simpara>
-   Note that this is a binary string which can include any byte value, and needs
-   to be stored and handled as such. For example,
-   <function>igbinary_serialize</function> output should generally be stored in a <literal>BLOB</literal>
-   field in a database, rather than a <literal>CHAR</literal> or <literal>TEXT</literal> field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>igbinary_serialize</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ser = igbinary_serialize(['test', 'test']);
-echo urlencode($ser), "\n";
-var_export(igbinary_unserialize($ser));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-%00%00%00%02%14%02%06%00%11%04test%06%01%0E%00
-array (
-  0 => 'test',
-  1 => 'test',
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Note that many built-in PHP objects cannot be serialized. However, those with
-    this ability either implement the <interfacename>Serializable</interfacename> interface or the
-    magic <link linkend="object.serialize">__serialize()</link>/<link linkend="object.unserialize">__unserialize()</link>
-    or <link linkend="object.sleep">__sleep()</link>/<link linkend="object.wakeup">__wakeup()</link> methods. If an
-    internal class does not fulfill any of those requirements, it cannot reliably be
-    serialized with any serializer.
-   </simpara>
-   <simpara>
-    There are some historical exceptions to the above rule, where some internal objects
-    could be serialized without implementing the interface or exposing the methods.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>serialize</function></member>
-   <member><function>igbinary_unserialize</function></member>
-   <member><function>var_export</function></member>
-   <member><function>json_encode</function></member>
-   <member><link linkend="language.oop5.serialization">Serializing Objects</link></member>
-   <member><link linkend="object.sleep">__sleep()</link></member>
-   <member><link linkend="object.wakeup">__wakeup()</link></member>
-   <member><link linkend="object.serialize">__serialize()</link></member>
-   <member><link linkend="object.unserialize">__unserialize()</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/igbinary/functions/igbinary-unserialize.xml b/reference/igbinary/functions/igbinary-unserialize.xml
deleted file mode 100644
index 943564467d08..000000000000
--- a/reference/igbinary/functions/igbinary-unserialize.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.igbinary-unserialize">
- <refnamediv>
-  <refname>igbinary_unserialize</refname>
-  <refpurpose>
-   Creates a PHP value from a stored representation from <function>igbinary_serialize</function>
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>igbinary_unserialize</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>igbinary_unserialize</function> takes a single serialized variable from
-   <function>igbinary_serialize</function> and converts it back into a PHP value.
-  </simpara>
-  <warning>
-   <simpara>
-    Untrusted user input must not be passed to <function>igbinary_unserialize</function>.
-    Unserialization can result in code being loaded and executed due to object
-    instantiation and autoloading, and a malicious user may be able to exploit
-    this. Instead a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) should be used,
-    if serialized data needs to be passed to a client.
-   </simpara>
-   <simpara>
-    If there is the need to unserialize externally-stored serialized data,
-    <function>hash_hmac</function> can be used for data validation.
-    It is important to ensure that nobody has tampered with the data.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    The igbinary serialization format does not provide a way to distinguish between different reference
-    groups for the same value. All PHP references to a given value as treated as part
-    of the same reference group when unserialized,
-    even if they were parts of difference reference groups when serialized.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>str</parameter></term>
-    <listitem>
-     <simpara>
-      The serialized string generated by <function>igbinary_serialize</function>.
-     </simpara>
-     <simpara>
-      If the value being unserialized is an &object;, after successfully
-      reconstructing the object igbinary will automatically attempt to call the
-      <link linkend="object.unserialize">__unserialize()</link> or
-      <link linkend="object.wakeup">__wakeup()</link> methods (if one exists).
-     </simpara>
-     <note>
-      <title>
-       <link linkend="ini.unserialize-callback-func">unserialize_callback_func</link>
-        directive
-      </title>
-      <simpara>
-       The callback specified in the
-       <link linkend="ini.unserialize-callback-func">unserialize_callback_func</link>
-       directive is called when an undefined class is unserialized.
-       If no callback is specified, the object will be instantiated as
-       <classname>__PHP_Incomplete_Class</classname>.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The converted value is returned, and can be a <type>bool</type>,
-   <type>int</type>, <type>float</type>, <type>string</type>,
-   <type>array</type>, <type>object</type>, or <type>null</type>.
-  </simpara>
-  <simpara>
-   In case the passed string is not unserializeable, &false; is returned and
-   <constant>E_NOTICE</constant> or <constant>E_WARNING</constant> is issued.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Objects may throw <classname>Throwable</classname>s in their unserialization handlers.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <simpara>
-    &null; or &false; is returned both in the case of an error and if unserializing
-    the serialized &null; or &false; value. It is possible to catch this special case by
-    comparing <parameter>str</parameter> with
-    <code>igbinary_serialize(null)</code> or <code>igbinary_serialize(false)</code>
-    or by catching the issued <constant>E_NOTICE</constant>.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>unserialize</function></member>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</function></member>
-   <member><function>hash_hmac</function></member>
-   <member><function>igbinary_serialize</function></member>
-   <member><link linkend="language.oop5.autoload">Autoloading Classes</link></member>
-   <member><link linkend="ini.unserialize-callback-func">unserialize_callback_func</link></member>
-   <member><link linkend="object.wakeup">__wakeup()</link></member>
-   <member><link linkend="object.serialize">__serialize()</link></member>
-   <member><link linkend="object.unserialize">__unserialize()</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/igbinary/ini.xml b/reference/igbinary/ini.xml
deleted file mode 100644
index 21b8e28e80b5..000000000000
--- a/reference/igbinary/ini.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xml:id="igbinary.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Igbinary &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.igbinary.compact-strings">igbinary.compact_strings</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  <table>
-   <title>Session Configuration Options Affecting Igbinary Behavior</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="igbinary.ini.list.extra">
-     <row>
-      <entry><link linkend="ini.igbinary.save-handler">session.save_handler</link></entry>
-      <entry>"files"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <variablelist>
- <varlistentry xml:id="ini.igbinary.compact-strings">
-  <term>
-   <parameter>igbinary.compact_strings</parameter>
-   <type>bool</type>
-  </term>
-  <listitem>
-   <simpara>
-    Enable or disable compacting of duplicate strings.
-    The default is On.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.igbinary.save-handler">
-  <term>
-   <parameter>session.save_handler</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    Igbinary is used as session handler by setting this value to <literal>igbinary</literal>.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- </variablelist>
-</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/igbinary/reference.xml b/reference/igbinary/reference.xml
deleted file mode 100644
index 58ac4fc53d11..000000000000
--- a/reference/igbinary/reference.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="ref.igbinary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Igbinary &Functions;</title>
-
- &reference.igbinary.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/igbinary/setup.xml b/reference/igbinary/setup.xml
deleted file mode 100644
index 9f4cd1a6ca31..000000000000
--- a/reference/igbinary/setup.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="igbinary.setup">
- &reftitle.setup;
-
- <section xml:id="igbinary.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;igbinary">&url.pecl.package;igbinary</link>.
-  </simpara>
-  <simpara>
-   &pecl.windows.download.avail;
-  </simpara>
- </section>
-
- &reference.igbinary.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/igbinary/versions.xml b/reference/igbinary/versions.xml
deleted file mode 100644
index d38d6278f70d..000000000000
--- a/reference/igbinary/versions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='igbinary_serialize' from='PECL igbinary &gt;= 1.1.1'/>
- <function name='igbinary_unserialize' from='PECL igbinary &gt;= 1.1.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
--->
diff --git a/reference/imagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/imagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/imagick/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/imagick/book.xml b/reference/imagick/book.xml
deleted file mode 100644
index 8d60f9c36823..000000000000
--- a/reference/imagick/book.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- 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>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.imagick">
-  &reftitle.intro;
-  <para>
-   &warn.experimental;
-   Imagick is a native php extension to create and modify images using the
-   ImageMagick API.
-  </para>
-<!-- {{{ About Imagick -->
-  <section xml:id="imagick.aboutimagemagick">
-   <title>About ImageMagick</title>
-   <para>
-    ImageMagick is a software suite to create, edit, and compose bitmap images.
-    It can read, convert and write images in a variety of formats (over 100)
-    including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF.
-   </para>
-   <para>
-    ImageMagick Studio LLC is a non-profit organization dedicated to making software imaging solutions freely available.
-   </para>
-  </section>
-<!-- }}} -->
-
- </preface>
- <!-- }}} -->
- 
- &reference.imagick.setup;
- &reference.imagick.constants;
- &reference.imagick.examples;
-
- &reference.imagick.imagick;
- &reference.imagick.imagickdraw;
- &reference.imagick.imagickdrawexception;
- &reference.imagick.imagickexception;
- &reference.imagick.imagickkernel;
- &reference.imagick.imagickkernelexception;
- &reference.imagick.imagickpixel;
- &reference.imagick.imagickpixelexception;
- &reference.imagick.imagickpixeliterator;
- &reference.imagick.imagickpixeliteratorexception;
-
-</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/imagick/constants.xml b/reference/imagick/constants.xml
deleted file mode 100644
index 48182b05b714..000000000000
--- a/reference/imagick/constants.xml
+++ /dev/null
@@ -1,4376 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xml:id="imagick.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist xml:id="imagick.constants.colortype">
-  <title><constant>COLOR_<replaceable>*</replaceable></constant> constants</title>
-  <para>Colortype constants. These constants are mainly used with 
-   <classname>ImagickPixel</classname>.
-  </para>
-   <varlistentry xml:id="imagick.constants.color-black">
-    <term>
-     <constant>imagick::COLOR_BLACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Black color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-blue">
-    <term>
-     <constant>imagick::COLOR_BLUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Blue color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-cyan">
-    <term>
-     <constant>imagick::COLOR_CYAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Cyan color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-green">
-    <term>
-     <constant>imagick::COLOR_GREEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Green color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-red">
-    <term>
-     <constant>imagick::COLOR_RED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Red color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-yellow">
-    <term>
-     <constant>imagick::COLOR_YELLOW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Yellow color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-magenta">
-    <term>
-     <constant>imagick::COLOR_MAGENTA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Magenta color
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-opacity">
-    <term>
-     <constant>imagick::COLOR_OPACITY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Color's opacity
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-alpha">
-    <term>
-     <constant>imagick::COLOR_ALPHA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Color's alpha
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.color-fuzz">
-    <term>
-     <constant>imagick::COLOR_FUZZ</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Color's fuzz
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.disposetype">
-  <title><constant>DISPOSE_<replaceable>*</replaceable></constant> constants</title>
-  <para>Dispose type constants</para>
-   <varlistentry xml:id="imagick.constants.dispose-unrecognized">
-    <term>
-     <constant>imagick::DISPOSE_UNRECOGNIZED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unrecognized dispose type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dispose-undefined">
-    <term>
-     <constant>imagick::DISPOSE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Undefined dispose type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dispose-none">
-    <term>
-     <constant>imagick::DISPOSE_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No dispose type defined
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dispose-background">
-    <term>
-     <constant>imagick::DISPOSE_BACKGROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dispose background
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dispose-previous">
-    <term>
-     <constant>imagick::DISPOSE_PREVIOUS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dispose previous
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.compositeop">
-  <title><constant>COMPOSITE_<replaceable>*</replaceable></constant> constants</title>
-  <varlistentry xml:id="imagick.constants.composite-default">
-   <term>
-    <constant>imagick::COMPOSITE_DEFAULT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The default composite operator
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-undefined">
-   <term>
-    <constant>imagick::COMPOSITE_UNDEFINED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Undefined composite operator
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-no">
-   <term>
-    <constant>imagick::COMPOSITE_NO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     No composite operator defined
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-add">
-   <term>
-    <constant>imagick::COMPOSITE_ADD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The result of image + image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-atop">
-   <term>
-    <constant>imagick::COMPOSITE_ATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The result is the same shape as image, with composite image obscuring image where the image shapes overlap
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-blend">
-   <term>
-    <constant>imagick::COMPOSITE_BLEND</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Blends the image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-bumpmap">
-   <term>
-    <constant>imagick::COMPOSITE_BUMPMAP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The same as COMPOSITE_MULTIPLY, except the source is converted to grayscale first.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-clear">
-   <term>
-    <constant>imagick::COMPOSITE_CLEAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Makes the target image transparent
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-colorburn">
-   <term>
-    <constant>imagick::COMPOSITE_COLORBURN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens the destination image to reflect the source image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-colordodge">
-   <term>
-    <constant>imagick::COMPOSITE_COLORDODGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Brightens the destination image to reflect the source image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-colorize">
-   <term>
-    <constant>imagick::COMPOSITE_COLORIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Colorizes the target image using the composite image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copyblack">
-   <term>
-    <constant>imagick::COMPOSITE_COPYBLACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies black from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copyblue">
-   <term>
-    <constant>imagick::COMPOSITE_COPYBLUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies blue from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copy">
-   <term>
-    <constant>imagick::COMPOSITE_COPY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies the source image on the target image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copycyan">
-   <term>
-    <constant>imagick::COMPOSITE_COPYCYAN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies cyan from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copygreen">
-   <term>
-    <constant>imagick::COMPOSITE_COPYGREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies green from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copymagenta">
-   <term>
-    <constant>imagick::COMPOSITE_COPYMAGENTA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies magenta from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copyopacity">
-   <term>
-    <constant>imagick::COMPOSITE_COPYOPACITY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies opacity from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copyred">
-   <term>
-    <constant>imagick::COMPOSITE_COPYRED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies red from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-copyyellow">
-   <term>
-    <constant>imagick::COMPOSITE_COPYYELLOW</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Copies yellow from the source to target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-darken">
-   <term>
-    <constant>imagick::COMPOSITE_DARKEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens the target image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dstatop">
-   <term>
-    <constant>imagick::COMPOSITE_DSTATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the destination lying inside of the source is composited over the source and replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dst">
-   <term>
-    <constant>imagick::COMPOSITE_DST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The target is left untouched
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dstin">
-   <term>
-    <constant>imagick::COMPOSITE_DSTIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The parts inside the source replace the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dstout">
-   <term>
-    <constant>imagick::COMPOSITE_DSTOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The parts outside the source replace the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dstover">
-   <term>
-    <constant>imagick::COMPOSITE_DSTOVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Target replaces the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-difference">
-   <term>
-    <constant>imagick::COMPOSITE_DIFFERENCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtracts the darker of the two constituent colors from the lighter
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-displace">
-   <term>
-    <constant>imagick::COMPOSITE_DISPLACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Shifts target image pixels as defined by the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-dissolve">
-   <term>
-    <constant>imagick::COMPOSITE_DISSOLVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dissolves the source in to the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-exclusion">
-   <term>
-    <constant>imagick::COMPOSITE_EXCLUSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Produces an effect similar to that of imagick::COMPOSITE_DIFFERENCE, but appears as lower contrast
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-hardlight">
-   <term>
-    <constant>imagick::COMPOSITE_HARDLIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Multiplies or screens the colors, dependent on the source color value
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-hue">
-   <term>
-    <constant>imagick::COMPOSITE_HUE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Modifies the hue of the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-in">
-   <term>
-    <constant>imagick::COMPOSITE_IN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites source into the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-lighten">
-   <term>
-    <constant>imagick::COMPOSITE_LIGHTEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Lightens the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-luminize">
-   <term>
-    <constant>imagick::COMPOSITE_LUMINIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Luminizes the target as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-minus">
-   <term>
-    <constant>imagick::COMPOSITE_MINUS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtracts the source from the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-modulate">
-   <term>
-    <constant>imagick::COMPOSITE_MODULATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Modulates the target brightness, saturation and hue as defined by source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-multiply">
-   <term>
-    <constant>imagick::COMPOSITE_MULTIPLY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Multiplies the target to the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-out">
-   <term>
-    <constant>imagick::COMPOSITE_OUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites outer parts of the source on the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-over">
-   <term>
-    <constant>imagick::COMPOSITE_OVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Composites source over the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-overlay">
-   <term>
-    <constant>imagick::COMPOSITE_OVERLAY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Overlays the source on the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-plus">
-   <term>
-    <constant>imagick::COMPOSITE_PLUS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Adds the source to the target
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-replace">
-   <term>
-    <constant>imagick::COMPOSITE_REPLACE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Replaces the target with the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-saturate">
-   <term>
-    <constant>imagick::COMPOSITE_SATURATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Saturates the target as defined by the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-screen">
-   <term>
-    <constant>imagick::COMPOSITE_SCREEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source and destination are complemented and then multiplied and then replace the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-softlight">
-   <term>
-    <constant>imagick::COMPOSITE_SOFTLIGHT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Darkens or lightens the colors, dependent on the source
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-srcatop">
-   <term>
-    <constant>imagick::COMPOSITE_SRCATOP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying inside of the destination is composited onto the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-src">
-   <term>
-    <constant>imagick::COMPOSITE_SRC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source is copied to the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-srcin">
-   <term>
-    <constant>imagick::COMPOSITE_SRCIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying inside of the destination replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-srcout">
-   <term>
-    <constant>imagick::COMPOSITE_SRCOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source lying outside of the destination replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-srcover">
-   <term>
-    <constant>imagick::COMPOSITE_SRCOVER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source replaces the destination
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-subtract">
-   <term>
-    <constant>imagick::COMPOSITE_SUBTRACT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Subtract the colors in the source image from the destination image
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-threshold">
-   <term>
-    <constant>imagick::COMPOSITE_THRESHOLD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The source is composited on the target as defined by source threshold
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="imagick.constants.composite-xor">
-   <term>
-    <constant>imagick::COMPOSITE_XOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The part of the source that lies outside of the destination is combined with the part of the destination that lies outside of the source
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.montagemode">
-  <title><constant>MONTAGEMODE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.montagemode-frame">
-    <term>
-     <constant>imagick::MONTAGEMODE_FRAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.montagemode-unframe">
-    <term>
-     <constant>imagick::MONTAGEMODE_UNFRAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.montagemode-concatenate">
-    <term>
-     <constant>imagick::MONTAGEMODE_CONCATENATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.styles">
-  <title><constant>STYLE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.style-normal">
-    <term>
-     <constant>imagick::STYLE_NORMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.style-italic">
-    <term>
-     <constant>imagick::STYLE_ITALIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.style-oblique">
-    <term>
-     <constant>imagick::STYLE_OBLIQUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.style-any">
-    <term>
-     <constant>imagick::STYLE_ANY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.filters">
-  <title><constant>FILTER_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.filter-undefined">
-    <term>
-     <constant>imagick::FILTER_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-point">
-    <term>
-     <constant>imagick::FILTER_POINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-box">
-    <term>
-     <constant>imagick::FILTER_BOX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-triangle">
-    <term>
-     <constant>imagick::FILTER_TRIANGLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-hermite">
-    <term>
-     <constant>imagick::FILTER_HERMITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-hanning">
-    <term>
-     <constant>imagick::FILTER_HANNING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-hamming">
-    <term>
-     <constant>imagick::FILTER_HAMMING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-blackman">
-    <term>
-     <constant>imagick::FILTER_BLACKMAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-gaussian">
-    <term>
-     <constant>imagick::FILTER_GAUSSIAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-quadratic">
-    <term>
-     <constant>imagick::FILTER_QUADRATIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-cubic">
-    <term>
-     <constant>imagick::FILTER_CUBIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-catrom">
-    <term>
-     <constant>imagick::FILTER_CATROM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-mitchell">
-    <term>
-     <constant>imagick::FILTER_MITCHELL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-lanczos">
-    <term>
-     <constant>imagick::FILTER_LANCZOS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-bessel">
-    <term>
-     <constant>imagick::FILTER_BESSEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.filter-sinc">
-    <term>
-     <constant>imagick::FILTER_SINC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.imagetype">
-  <title><constant>IMGTYPE_<replaceable>*</replaceable></constant> constants</title>
-  <simpara>
-   An image type combines a color model with the presence or absence of an
-   alpha channel.
-   Passing one of these constants to
-   <methodname>Imagick::setImageType</methodname> converts the image to that
-   type.
-   <methodname>Imagick::getImageType</methodname> reports the type of an image,
-   but only ever returns a type that describes actual pixel data, never
-   <constant>imagick::IMGTYPE_UNDEFINED</constant> or
-   <constant>imagick::IMGTYPE_OPTIMIZE</constant>.
-  </simpara>
-  <simpara>
-   The constants whose name ends in <literal>MATTE</literal> are the variants
-   that carry an alpha channel; the others have none.
-   In ImageMagick 6 the alpha channel was known as the matte channel, and when
-   Imagick is built against ImageMagick 7 each of these constants also exists
-   under an <constant>IMGTYPE_<replaceable>*</replaceable>ALPHA</constant> name
-   with the same value.
-  </simpara>
-   <varlistentry xml:id="imagick.constants.imgtype-undefined">
-    <term>
-     <constant>imagick::IMGTYPE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The image type is not known.
-      <methodname>Imagick::setImageType</methodname> converts nothing for this
-      value, but still records it on the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-bilevel">
-    <term>
-     <constant>imagick::IMGTYPE_BILEVEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Two colors only.
-      The image is converted to grayscale, its contrast is stretched, and every
-      pixel becomes either black or white depending on whether it is lighter or
-      darker than mid-gray; any alpha channel is discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-grayscale">
-    <term>
-     <constant>imagick::IMGTYPE_GRAYSCALE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Shades of gray.
-      The image is converted to the grayscale colorspace, and any alpha channel
-      is discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-grayscalematte">
-    <term>
-     <constant>imagick::IMGTYPE_GRAYSCALEMATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Shades of gray with an alpha channel.
-      The same as <constant>imagick::IMGTYPE_GRAYSCALE</constant>, except that
-      the alpha channel is kept, and if the image has none, an opaque one is
-      added.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-palette">
-    <term>
-     <constant>imagick::IMGTYPE_PALETTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Indexed color.
-      The image is converted to sRGB and, if it is not already indexed or has
-      more than 256 colors, it is quantized to 256 colors; any alpha channel is
-      discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-palettematte">
-    <term>
-     <constant>imagick::IMGTYPE_PALETTEMATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Indexed color with an alpha channel.
-      The image is converted to sRGB, the alpha channel is kept, and if the
-      image has none, an opaque one is added.
-      Unlike <constant>imagick::IMGTYPE_PALETTE</constant>, the colors are
-      quantized even when the image is already indexed, and the alpha channel
-      is included in the quantization.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-truecolor">
-    <term>
-     <constant>imagick::IMGTYPE_TRUECOLOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Direct color: one red, green, and blue value per pixel, with no palette.
-      The image is converted to sRGB, and any alpha channel is discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-truecolormatte">
-    <term>
-     <constant>imagick::IMGTYPE_TRUECOLORMATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Direct color with an alpha channel.
-      The same as <constant>imagick::IMGTYPE_TRUECOLOR</constant>, except that
-      the alpha channel is kept, and if the image has none, an opaque one is
-      added.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-colorseparation">
-    <term>
-     <constant>imagick::IMGTYPE_COLORSEPARATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      One channel per printing ink, with no palette.
-      The image is converted to the CMYK colorspace, and any alpha channel is
-      discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-colorseparationmatte">
-    <term>
-     <constant>imagick::IMGTYPE_COLORSEPARATIONMATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      One channel per printing ink, with no palette, plus an alpha channel.
-      The same as <constant>imagick::IMGTYPE_COLORSEPARATION</constant>, except
-      that the alpha channel is kept, and if the image has none, an opaque one
-      is added.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-palettebilevelmatte">
-    <term>
-     <constant>imagick::IMGTYPE_PALETTEBILEVELMATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Indexed color with a fully transparent or fully opaque alpha channel.
-      The image is converted to sRGB, an opaque alpha channel is added if it
-      has none, that channel alone is reduced to two values, and the colors
-      are then quantized.
-      This is the type of a PNG using binary transparency.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.imgtype-optimize">
-    <term>
-     <constant>imagick::IMGTYPE_OPTIMIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      <methodname>Imagick::setImageType</methodname> converts nothing for this
-      value, but still records it on the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.resolution">
-  <title><constant>RESOLUTION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.resolution-undefined">
-    <term>
-     <constant>imagick::RESOLUTION_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resolution-pixelsperinch">
-    <term>
-     <constant>imagick::RESOLUTION_PIXELSPERINCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resolution-pixelspercentimeter">
-    <term>
-     <constant>imagick::RESOLUTION_PIXELSPERCENTIMETER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.compressiontype">
-  <title><constant>COMPRESSION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.compression-undefined">
-    <term>
-     <constant>imagick::COMPRESSION_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-no">
-    <term>
-     <constant>imagick::COMPRESSION_NO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-bzip">
-    <term>
-     <constant>imagick::COMPRESSION_BZIP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-fax">
-    <term>
-     <constant>imagick::COMPRESSION_FAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-group4">
-    <term>
-     <constant>imagick::COMPRESSION_GROUP4</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-jpeg">
-    <term>
-     <constant>imagick::COMPRESSION_JPEG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-jpeg2000">
-    <term>
-     <constant>imagick::COMPRESSION_JPEG2000</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-losslessjpeg">
-    <term>
-     <constant>imagick::COMPRESSION_LOSSLESSJPEG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-lzw">
-    <term>
-     <constant>imagick::COMPRESSION_LZW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-rle">
-    <term>
-     <constant>imagick::COMPRESSION_RLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-zip">
-    <term>
-     <constant>imagick::COMPRESSION_ZIP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-dxt1">
-    <term>
-     <constant>imagick::COMPRESSION_DXT1</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-dxt3">
-    <term>
-     <constant>imagick::COMPRESSION_DXT3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.compression-dxt5">
-    <term>
-     <constant>imagick::COMPRESSION_DXT5</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.paint">
-  <title><constant>PAINT_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.paint-point">
-    <term>
-     <constant>imagick::PAINT_POINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.paint-replace">
-    <term>
-     <constant>imagick::PAINT_REPLACE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.paint-floodfill">
-    <term>
-     <constant>imagick::PAINT_FLOODFILL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.paint-filltoborder">
-    <term>
-     <constant>imagick::PAINT_FILLTOBORDER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.paint-reset">
-    <term>
-     <constant>imagick::PAINT_RESET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.gravity">
-  <title><constant>GRAVITY_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.gravity-northwest">
-    <term>
-     <constant>imagick::GRAVITY_NORTHWEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-north">
-    <term>
-     <constant>imagick::GRAVITY_NORTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-northeast">
-    <term>
-     <constant>imagick::GRAVITY_NORTHEAST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-west">
-    <term>
-     <constant>imagick::GRAVITY_WEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-center">
-    <term>
-     <constant>imagick::GRAVITY_CENTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-east">
-    <term>
-     <constant>imagick::GRAVITY_EAST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-southwest">
-    <term>
-     <constant>imagick::GRAVITY_SOUTHWEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-south">
-    <term>
-     <constant>imagick::GRAVITY_SOUTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.gravity-southeast">
-    <term>
-     <constant>imagick::GRAVITY_SOUTHEAST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.stretch">
-  <title><constant>STRETCH_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.stretch-normal">
-    <term>
-     <constant>imagick::STRETCH_NORMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-ultracondensed">
-    <term>
-     <constant>imagick::STRETCH_ULTRACONDENSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-condensed">
-    <term>
-     <constant>imagick::STRETCH_CONDENSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-semicondensed">
-    <term>
-     <constant>imagick::STRETCH_SEMICONDENSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-semiexpanded">
-    <term>
-     <constant>imagick::STRETCH_SEMIEXPANDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-expanded">
-    <term>
-     <constant>imagick::STRETCH_EXPANDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-extraexpanded">
-    <term>
-     <constant>imagick::STRETCH_EXTRAEXPANDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-ultraexpanded">
-    <term>
-     <constant>imagick::STRETCH_ULTRAEXPANDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.stretch-any">
-    <term>
-     <constant>imagick::STRETCH_ANY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.align">
-  <title><constant>ALIGN_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.align-undefined">
-    <term>
-     <constant>imagick::ALIGN_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.align-left">
-    <term>
-     <constant>imagick::ALIGN_LEFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.align-center">
-    <term>
-     <constant>imagick::ALIGN_CENTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.align-right">
-    <term>
-     <constant>imagick::ALIGN_RIGHT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.decoration">
-  <title><constant>DECORATION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.decoration-no">
-    <term>
-     <constant>imagick::DECORATION_NO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.decoration-underline">
-    <term>
-     <constant>imagick::DECORATION_UNDERLINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.decoration-overline">
-    <term>
-     <constant>imagick::DECORATION_OVERLINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.decoration-linetrough">
-    <term>
-     <constant>imagick::DECORATION_LINETROUGH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.noise">
-  <title><constant>NOISE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.noise-uniform">
-    <term>
-     <constant>imagick::NOISE_UNIFORM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-gaussian">
-    <term>
-     <constant>imagick::NOISE_GAUSSIAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-multiplicativegaussian">
-    <term>
-     <constant>imagick::NOISE_MULTIPLICATIVEGAUSSIAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-impulse">
-    <term>
-     <constant>imagick::NOISE_IMPULSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-laplacian">
-    <term>
-     <constant>imagick::NOISE_LAPLACIAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-poisson">
-    <term>
-     <constant>imagick::NOISE_POISSON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.noise-random">
-    <term>
-     <constant>imagick::NOISE_RANDOM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.channel">
-  <title><constant>CHANNEL_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.channel-undefined">
-    <term>
-     <constant>imagick::CHANNEL_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-red">
-    <term>
-     <constant>imagick::CHANNEL_RED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-gray">
-    <term>
-     <constant>imagick::CHANNEL_GRAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-cyan">
-    <term>
-     <constant>imagick::CHANNEL_CYAN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-green">
-    <term>
-     <constant>imagick::CHANNEL_GREEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-magenta">
-    <term>
-     <constant>imagick::CHANNEL_MAGENTA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-blue">
-    <term>
-     <constant>imagick::CHANNEL_BLUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-yellow">
-    <term>
-     <constant>imagick::CHANNEL_YELLOW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-alpha">
-    <term>
-     <constant>imagick::CHANNEL_ALPHA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-opacity">
-    <term>
-     <constant>imagick::CHANNEL_OPACITY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-matte">
-    <term>
-     <constant>imagick::CHANNEL_MATTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-black">
-    <term>
-     <constant>imagick::CHANNEL_BLACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-index">
-    <term>
-     <constant>imagick::CHANNEL_INDEX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-all">
-    <term>
-     <constant>imagick::CHANNEL_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.channel-default">
-    <term>
-     <constant>imagick::CHANNEL_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.metric">
-  <title><constant>METRIC_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.metric-undefined">
-    <term>
-     <constant>imagick::METRIC_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.metric-meanabsoluteerror">
-    <term>
-     <constant>imagick::METRIC_MEANABSOLUTEERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.metric-meansquareerror">
-    <term>
-     <constant>imagick::METRIC_MEANSQUAREERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.metric-peakabsoluteerror">
-    <term>
-     <constant>imagick::METRIC_PEAKABSOLUTEERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.metric-peaksignaltonoiseratio">
-    <term>
-     <constant>imagick::METRIC_PEAKSIGNALTONOISERATIO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.metric-rootmeansquarederror">
-    <term>
-     <constant>imagick::METRIC_ROOTMEANSQUAREDERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.pixel">
-  <title><constant>PIXEL_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.pixel-char">
-    <term>
-     <constant>imagick::PIXEL_CHAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-double">
-    <term>
-     <constant>imagick::PIXEL_DOUBLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-float">
-    <term>
-     <constant>imagick::PIXEL_FLOAT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-integer">
-    <term>
-     <constant>imagick::PIXEL_INTEGER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Only available for ImageMagick &lt; 7.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-long">
-    <term>
-     <constant>imagick::PIXEL_LONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-quantum">
-    <term>
-     <constant>imagick::PIXEL_QUANTUM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pixel-short">
-    <term>
-     <constant>imagick::PIXEL_SHORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.evaluate">
-  <title><constant>EVALUATE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.evaluate-undefined">
-    <term>
-     <constant>imagick::EVALUATE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-add">
-    <term>
-     <constant>imagick::EVALUATE_ADD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-and">
-    <term>
-     <constant>imagick::EVALUATE_AND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-divide">
-    <term>
-     <constant>imagick::EVALUATE_DIVIDE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-leftshift">
-    <term>
-     <constant>imagick::EVALUATE_LEFTSHIFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-max">
-    <term>
-     <constant>imagick::EVALUATE_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-min">
-    <term>
-     <constant>imagick::EVALUATE_MIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-multiply">
-    <term>
-     <constant>imagick::EVALUATE_MULTIPLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-or">
-    <term>
-     <constant>imagick::EVALUATE_OR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-rightshift">
-    <term>
-     <constant>imagick::EVALUATE_RIGHTSHIFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-set">
-    <term>
-     <constant>imagick::EVALUATE_SET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-subtract">
-    <term>
-     <constant>imagick::EVALUATE_SUBTRACT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-xor">
-    <term>
-     <constant>imagick::EVALUATE_XOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-pow">
-    <term>
-     <constant>imagick::EVALUATE_POW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-log">
-    <term>
-     <constant>imagick::EVALUATE_LOG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-threshold">
-    <term>
-     <constant>imagick::EVALUATE_THRESHOLD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-thresholdblack">
-    <term>
-     <constant>imagick::EVALUATE_THRESHOLDBLACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-thresholdwhite">
-    <term>
-     <constant>imagick::EVALUATE_THRESHOLDWHITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-gaussiannoise">
-    <term>
-     <constant>imagick::EVALUATE_GAUSSIANNOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-impulsenoise">
-    <term>
-     <constant>imagick::EVALUATE_IMPULSENOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-laplaciannoise">
-    <term>
-     <constant>imagick::EVALUATE_LAPLACIANNOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-multiplicativenoise">
-    <term>
-     <constant>imagick::EVALUATE_MULTIPLICATIVENOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-poissonnoise">
-    <term>
-     <constant>imagick::EVALUATE_POISSONNOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-uniformnoise">
-    <term>
-     <constant>imagick::EVALUATE_UNIFORMNOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-cosine">
-    <term>
-     <constant>imagick::EVALUATE_COSINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-sine">
-    <term>
-     <constant>imagick::EVALUATE_SINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.evaluate-addmodulus">
-    <term>
-     <constant>imagick::EVALUATE_ADDMODULUS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.colorspace">
-  <title><constant>COLORSPACE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.colorspace-undefined">
-    <term>
-     <constant>imagick::COLORSPACE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-rgb">
-    <term>
-     <constant>imagick::COLORSPACE_RGB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-gray">
-    <term>
-     <constant>imagick::COLORSPACE_GRAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-transparent">
-    <term>
-     <constant>imagick::COLORSPACE_TRANSPARENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-ohta">
-    <term>
-     <constant>imagick::COLORSPACE_OHTA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-lab">
-    <term>
-     <constant>imagick::COLORSPACE_LAB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-xyz">
-    <term>
-     <constant>imagick::COLORSPACE_XYZ</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-ycbcr">
-    <term>
-     <constant>imagick::COLORSPACE_YCBCR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-ycc">
-    <term>
-     <constant>imagick::COLORSPACE_YCC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-yiq">
-    <term>
-     <constant>imagick::COLORSPACE_YIQ</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-ypbpr">
-    <term>
-     <constant>imagick::COLORSPACE_YPBPR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-yuv">
-    <term>
-     <constant>imagick::COLORSPACE_YUV</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-cmyk">
-    <term>
-     <constant>imagick::COLORSPACE_CMYK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-srgb">
-    <term>
-     <constant>imagick::COLORSPACE_SRGB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-hsb">
-    <term>
-     <constant>imagick::COLORSPACE_HSB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-hsl">
-    <term>
-     <constant>imagick::COLORSPACE_HSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-hwb">
-    <term>
-     <constant>imagick::COLORSPACE_HWB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-rec601luma">
-    <term>
-     <constant>imagick::COLORSPACE_REC601LUMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-rec709luma">
-    <term>
-     <constant>imagick::COLORSPACE_REC709LUMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-log">
-    <term>
-     <constant>imagick::COLORSPACE_LOG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.colorspace-cmy">
-    <term>
-     <constant>imagick::COLORSPACE_CMY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.virtualpixelmethods">
-  <title><constant>VIRTUALPIXELMETHOD_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-undefined">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-background">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_BACKGROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-constant">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_CONSTANT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-edge">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_EDGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-mirror">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_MIRROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-tile">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_TILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-transparent">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_TRANSPARENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-mask">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_MASK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-black">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_BLACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-gray">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_GRAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-white">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_WHITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-horizontaltile">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_HORIZONTALTILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.3 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.virtualpixelmethod-verticaltile">
-    <term>
-     <constant>imagick::VIRTUALPIXELMETHOD_VERTICALTILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.3 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.preview">
-  <title><constant>PREVIEW_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.preview-undefined">
-    <term>
-     <constant>imagick::PREVIEW_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-rotate">
-    <term>
-     <constant>imagick::PREVIEW_ROTATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-shear">
-    <term>
-     <constant>imagick::PREVIEW_SHEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-roll">
-    <term>
-     <constant>imagick::PREVIEW_ROLL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-hue">
-    <term>
-     <constant>imagick::PREVIEW_HUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-saturation">
-    <term>
-     <constant>imagick::PREVIEW_SATURATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-brightness">
-    <term>
-     <constant>imagick::PREVIEW_BRIGHTNESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-gamma">
-    <term>
-     <constant>imagick::PREVIEW_GAMMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-spiff">
-    <term>
-     <constant>imagick::PREVIEW_SPIFF</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-dull">
-    <term>
-     <constant>imagick::PREVIEW_DULL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-grayscale">
-    <term>
-     <constant>imagick::PREVIEW_GRAYSCALE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-quantize">
-    <term>
-     <constant>imagick::PREVIEW_QUANTIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-despeckle">
-    <term>
-     <constant>imagick::PREVIEW_DESPECKLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-reducenoise">
-    <term>
-     <constant>imagick::PREVIEW_REDUCENOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-addnoise">
-    <term>
-     <constant>imagick::PREVIEW_ADDNOISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-sharpen">
-    <term>
-     <constant>imagick::PREVIEW_SHARPEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-blur">
-    <term>
-     <constant>imagick::PREVIEW_BLUR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-threshold">
-    <term>
-     <constant>imagick::PREVIEW_THRESHOLD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-edgedetect">
-    <term>
-     <constant>imagick::PREVIEW_EDGEDETECT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-spread">
-    <term>
-     <constant>imagick::PREVIEW_SPREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-solarize">
-    <term>
-     <constant>imagick::PREVIEW_SOLARIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-shade">
-    <term>
-     <constant>imagick::PREVIEW_SHADE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-raise">
-    <term>
-     <constant>imagick::PREVIEW_RAISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-segment">
-    <term>
-     <constant>imagick::PREVIEW_SEGMENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-swirl">
-    <term>
-     <constant>imagick::PREVIEW_SWIRL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-implode">
-    <term>
-     <constant>imagick::PREVIEW_IMPLODE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-wave">
-    <term>
-     <constant>imagick::PREVIEW_WAVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-oilpaint">
-    <term>
-     <constant>imagick::PREVIEW_OILPAINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-charcoaldrawing">
-    <term>
-     <constant>imagick::PREVIEW_CHARCOALDRAWING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.preview-jpeg">
-    <term>
-     <constant>imagick::PREVIEW_JPEG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.renderingintent">
-  <title><constant>RENDERINGINTENT_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.renderingintent-undefined">
-    <term>
-     <constant>imagick::RENDERINGINTENT_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.renderingintent-saturation">
-    <term>
-     <constant>imagick::RENDERINGINTENT_SATURATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.renderingintent-perceptual">
-    <term>
-     <constant>imagick::RENDERINGINTENT_PERCEPTUAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.renderingintent-absolute">
-    <term>
-     <constant>imagick::RENDERINGINTENT_ABSOLUTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.renderingintent-relative">
-    <term>
-     <constant>imagick::RENDERINGINTENT_RELATIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.interlace">
-  <title><constant>INTERLACE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.interlace-undefined">
-    <term>
-     <constant>imagick::INTERLACE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-no">
-    <term>
-     <constant>imagick::INTERLACE_NO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-line">
-    <term>
-     <constant>imagick::INTERLACE_LINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-plane">
-    <term>
-     <constant>imagick::INTERLACE_PLANE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-partition">
-    <term>
-     <constant>imagick::INTERLACE_PARTITION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-gif">
-    <term>
-     <constant>imagick::INTERLACE_GIF</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-jpeg">
-    <term>
-     <constant>imagick::INTERLACE_JPEG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interlace-png">
-    <term>
-     <constant>imagick::INTERLACE_PNG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.fillrule">
-  <title><constant>FILLRULE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.fillrule-undefined">
-    <term>
-     <constant>imagick::FILLRULE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.fillrule-evenodd">
-    <term>
-     <constant>imagick::FILLRULE_EVENODD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.fillrule-nonzero">
-    <term>
-     <constant>imagick::FILLRULE_NONZERO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.pathunits">
-  <title><constant>PATHUNITS_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.pathunits-undefined">
-    <term>
-     <constant>imagick::PATHUNITS_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pathunits-userspace">
-    <term>
-     <constant>imagick::PATHUNITS_USERSPACE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pathunits-userspaceonuse">
-    <term>
-     <constant>imagick::PATHUNITS_USERSPACEONUSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.pathunits-objectboundingbox">
-    <term>
-     <constant>imagick::PATHUNITS_OBJECTBOUNDINGBOX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.linecap">
-  <title><constant>LINECAP_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.linecap-undefined">
-    <term>
-     <constant>imagick::LINECAP_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linecap-butt">
-    <term>
-     <constant>imagick::LINECAP_BUTT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linecap-round">
-    <term>
-     <constant>imagick::LINECAP_ROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linecap-square">
-    <term>
-     <constant>imagick::LINECAP_SQUARE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.linejoin">
-  <title><constant>LINEJOIN_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.linejoin-undefined">
-    <term>
-     <constant>imagick::LINEJOIN_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linejoin-miter">
-    <term>
-     <constant>imagick::LINEJOIN_MITER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linejoin-round">
-    <term>
-     <constant>imagick::LINEJOIN_ROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.linejoin-bevel">
-    <term>
-     <constant>imagick::LINEJOIN_BEVEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.resourcetypes">
-  <title><constant>RESOURCETYPE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.resourcetype-undefined">
-    <term>
-     <constant>imagick::RESOURCETYPE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-area">
-    <term>
-     <constant>imagick::RESOURCETYPE_AREA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set the maximum width * height of an image that can reside in the pixel cache memory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-disk">
-    <term>
-     <constant>imagick::RESOURCETYPE_DISK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set maximum amount of disk space in bytes permitted for use by the pixel cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-file">
-    <term>
-     <constant>imagick::RESOURCETYPE_FILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set maximum number of open pixel cache files.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-map">
-    <term>
-     <constant>imagick::RESOURCETYPE_MAP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set maximum amount of memory map in bytes to allocate for the pixel cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-memory">
-    <term>
-     <constant>imagick::RESOURCETYPE_MEMORY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set maximum amount of memory in bytes to allocate for the pixel cache from the heap.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.resourcetype-thread">
-    <term>
-     <constant>imagick::RESOURCETYPE_THREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set maximum parallel threads.
-      &imagick.constant.available; 6.7.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.layermethod">
-  <title><constant>LAYERMETHOD_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.layermethod-undefined">
-    <term>
-     <constant>imagick::LAYERMETHOD_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-coalesce">
-    <term>
-     <constant>imagick::LAYERMETHOD_COALESCE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-compareany">
-    <term>
-     <constant>imagick::LAYERMETHOD_COMPAREANY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-compareclear">
-    <term>
-     <constant>imagick::LAYERMETHOD_COMPARECLEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-compareoverlay">
-    <term>
-     <constant>imagick::LAYERMETHOD_COMPAREOVERLAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-dispose">
-    <term>
-     <constant>imagick::LAYERMETHOD_DISPOSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-optimize">
-    <term>
-     <constant>imagick::LAYERMETHOD_OPTIMIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-optimizeplus">
-    <term>
-     <constant>imagick::LAYERMETHOD_OPTIMIZEPLUS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.2.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-optimizeimage">
-    <term>
-     <constant>imagick::LAYERMETHOD_OPTIMIZEIMAGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-optimizetrans">
-    <term>
-     <constant>imagick::LAYERMETHOD_OPTIMIZETRANS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-removedups">
-    <term>
-     <constant>imagick::LAYERMETHOD_REMOVEDUPS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-removezero">
-    <term>
-     <constant>imagick::LAYERMETHOD_REMOVEZERO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-composite">
-    <term>
-     <constant>imagick::LAYERMETHOD_COMPOSITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-merge">
-    <term>
-     <constant>imagick::LAYERMETHOD_MERGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.7 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-flatten">
-    <term>
-     <constant>imagick::LAYERMETHOD_FLATTEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.7 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.layermethod-mosaic">
-    <term>
-     <constant>imagick::LAYERMETHOD_MOSAIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.7 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.orientation">
-  <title><constant>ORIENTATION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.orientation-undefined">
-    <term>
-     <constant>imagick::ORIENTATION_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-topleft">
-    <term>
-     <constant>imagick::ORIENTATION_TOPLEFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-topright">
-    <term>
-     <constant>imagick::ORIENTATION_TOPRIGHT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-bottomright">
-    <term>
-     <constant>imagick::ORIENTATION_BOTTOMRIGHT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-bottomleft">
-    <term>
-     <constant>imagick::ORIENTATION_BOTTOMLEFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-lefttop">
-    <term>
-     <constant>imagick::ORIENTATION_LEFTTOP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-righttop">
-    <term>
-     <constant>imagick::ORIENTATION_RIGHTTOP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-rightbottom">
-    <term>
-     <constant>imagick::ORIENTATION_RIGHTBOTTOM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.orientation-leftbottom">
-    <term>
-     <constant>imagick::ORIENTATION_LEFTBOTTOM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.distortion">
-  <title><constant>DISTORTION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.distortion-undefined">
-    <term>
-     <constant>imagick::DISTORTION_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-affine">
-    <term>
-     <constant>imagick::DISTORTION_AFFINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-affineprojection">
-    <term>
-     <constant>imagick::DISTORTION_AFFINEPROJECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-arc">
-    <term>
-     <constant>imagick::DISTORTION_ARC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-bilinear">
-    <term>
-     <constant>imagick::DISTORTION_BILINEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-perspective">
-    <term>
-     <constant>imagick::DISTORTION_PERSPECTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-perspectiveprojection">
-    <term>
-     <constant>imagick::DISTORTION_PERSPECTIVEPROJECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-scalerotatetranslate">
-    <term>
-     <constant>imagick::DISTORTION_SCALEROTATETRANSLATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-polynomial">
-    <term>
-     <constant>imagick::DISTORTION_POLYNOMIAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-polar">
-    <term>
-     <constant>imagick::DISTORTION_POLAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-depolar">
-    <term>
-     <constant>imagick::DISTORTION_DEPOLAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-barrel">
-    <term>
-     <constant>imagick::DISTORTION_BARREL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-barrelinverse">
-    <term>
-     <constant>imagick::DISTORTION_BARRELINVERSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-shepards">
-    <term>
-     <constant>imagick::DISTORTION_SHEPARDS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.distortion-sentinel">
-    <term>
-     <constant>imagick::DISTORTION_SENTINEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.alphachannel">
-  <title><constant>ALPHACHANNEL_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.alphachannel-activate">
-    <term>
-     <constant>imagick::ALPHACHANNEL_ACTIVATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-deactivate">
-    <term>
-     <constant>imagick::ALPHACHANNEL_DEACTIVATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-reset">
-    <term>
-     <constant>imagick::ALPHACHANNEL_RESET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-set">
-    <term>
-     <constant>imagick::ALPHACHANNEL_SET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-undefined">
-    <term>
-     <constant>imagick::ALPHACHANNEL_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-copy">
-    <term>
-     <constant>imagick::ALPHACHANNEL_COPY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-extract">
-    <term>
-     <constant>imagick::ALPHACHANNEL_EXTRACT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-opaque">
-    <term>
-     <constant>imagick::ALPHACHANNEL_OPAQUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-shape">
-    <term>
-     <constant>imagick::ALPHACHANNEL_SHAPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-transparent">
-    <term>
-     <constant>imagick::ALPHACHANNEL_TRANSPARENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-background">
-    <term>
-     <constant>imagick::ALPHACHANNEL_BACKGROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.5.3 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-remove">
-    <term>
-     <constant>imagick::ALPHACHANNEL_REMOVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.7.8 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-associate">
-    <term>
-     <constant>imagick::ALPHACHANNEL_ASSOCIATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.9.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.alphachannel-dissociate">
-    <term>
-     <constant>imagick::ALPHACHANNEL_DISSOCIATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.9.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-     <varlistentry xml:id="imagick.constants.alphachannel-on">
-    <term>
-     <constant>imagick::ALPHACHANNEL_ON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 7.0.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-     <varlistentry xml:id="imagick.constants.alphachannel-off">
-    <term>
-     <constant>imagick::ALPHACHANNEL_OFF</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 7.0.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-     <varlistentry xml:id="imagick.constants.alphachannel-discrete">
-    <term>
-     <constant>imagick::ALPHACHANNEL_DISCRETE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 7.0.0 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.sparsecolormethod">
-  <title><constant>SPARSECOLORMETHOD_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-undefined">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-barycentric">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_BARYCENTRIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-bilinear">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_BILINEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-polynomial">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_POLYNOMIAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-spepards">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_SPEPARDS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.sparsecolormethod-voronoi">
-    <term>
-     <constant>imagick::SPARSECOLORMETHOD_VORONOI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.function">
-  <title><constant>FUNCTION_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.function-undefined">
-    <term>
-     <constant>imagick::FUNCTION_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.function-polynomial">
-    <term>
-     <constant>imagick::FUNCTION_POLYNOMIAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.function-sinusoid">
-    <term>
-     <constant>imagick::FUNCTION_SINUSOID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.9 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.interpolate">
-  <title><constant>INTERPOLATE_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.interpolate-undefined">
-    <term>
-     <constant>imagick::INTERPOLATE_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-average">
-    <term>
-     <constant>imagick::INTERPOLATE_AVERAGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-bicubic">
-    <term>
-     <constant>imagick::INTERPOLATE_BICUBIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-bilinear">
-    <term>
-     <constant>imagick::INTERPOLATE_BILINEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-filter">
-    <term>
-     <constant>imagick::INTERPOLATE_FILTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-integer">
-    <term>
-     <constant>imagick::INTERPOLATE_INTEGER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-mesh">
-    <term>
-     <constant>imagick::INTERPOLATE_MESH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-nearestneighbor">
-    <term>
-     <constant>imagick::INTERPOLATE_NEARESTNEIGHBOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.2 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.interpolate-spline">
-    <term>
-     <constant>imagick::INTERPOLATE_SPLINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.3.4 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
- </variablelist>
-
- <variablelist xml:id="imagick.constants.dithermethod">
-  <title><constant>DITHERMETHOD_<replaceable>*</replaceable></constant> constants</title>
-  <para></para>
-   <varlistentry xml:id="imagick.constants.dithermethod-undefined">
-    <term>
-     <constant>imagick::DITHERMETHOD_UNDEFINED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dithermethod-no">
-    <term>
-     <constant>imagick::DITHERMETHOD_NO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dithermethod-riemersma">
-    <term>
-     <constant>imagick::DITHERMETHOD_RIEMERSMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="imagick.constants.dithermethod-floydsteinberg">
-    <term>
-     <constant>imagick::DITHERMETHOD_FLOYDSTEINBERG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      &imagick.constant.available; 6.4.6 or higher.
-     </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/imagick/examples.xml b/reference/imagick/examples.xml
deleted file mode 100644
index 868f0596b54e..000000000000
--- a/reference/imagick/examples.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="imagick.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <section xml:id="imagick.examples-1">
-  <title>Basic usage</title>
-  <para>
-   Imagick makes image manipulation in PHP extremely easy through an OO
-   interface. Here is a quick example on how to make a thumbnail:
-   <example>
-    <title>Creating a thumbnail in Imagick</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-header('Content-type: image/jpeg');
-
-$image = new Imagick('image.jpg');
-
-// If 0 is provided as a width or height parameter,
-// aspect ratio is maintained
-$image->thumbnailImage(100, 0);
-
-echo $image;
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-
-  <para>
-   Using SPL and other OO features supported in Imagick, it can be simple
-   to resize all files in a directory (useful for batch resizing large
-   digital camera images to be web viewable). Here we use resize, as we might
-   want to retain certain meta-data:
-   <example>
-    <title>Make a thumbnail of all JPG files in a directory</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$images = new Imagick(glob('images/*.JPG'));
-
-foreach($images as $image) {
-
-    // Providing 0 forces thumbnailImage to maintain aspect ratio
-    $image->thumbnailImage(1024,0);
-
-}
-
-$images->writeImages();
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   This is an example of creating a reflection of an image.
-   The reflection is created by flipping the image and overlaying a gradient on it.
-   Then both, the original image and the reflection is overlaid on a canvas.
-   <example>
-    <title>Creating a reflection of an image</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Read the image */
-$im = new Imagick("test.png");
-
-/* Thumbnail the image */
-$im->thumbnailImage(200, null);
-
-/* Create a border for the image */
-$im->borderImage(new ImagickPixel("white"), 5, 5);
-
-/* Clone the image and flip it */
-$reflection = $im->clone();
-$reflection->flipImage();
-
-/* Create gradient. It will be overlaid on the reflection */
-$gradient = new Imagick();
-
-/* Gradient needs to be large enough for the image and the borders */
-$gradient->newPseudoImage($reflection->getImageWidth() + 10, $reflection->getImageHeight() + 10, "gradient:transparent-black");
-
-/* Composite the gradient on the reflection */
-$reflection->compositeImage($gradient, imagick::COMPOSITE_OVER, 0, 0);
-
-/* Add some opacity. Requires ImageMagick 6.2.9 or later */
-$reflection->setImageOpacity( 0.3 );
-
-/* Create an empty canvas */
-$canvas = new Imagick();
-
-/* Canvas needs to be large enough to hold the both images */
-$width = $im->getImageWidth() + 40;
-$height = ($im->getImageHeight() * 2) + 30;
-$canvas->newImage($width, $height, new ImagickPixel("black"));
-$canvas->setImageFormat("png");
-
-/* Composite the original image and the reflection on the canvas */
-$canvas->compositeImage($im, imagick::COMPOSITE_OVER, 20, 10);
-$canvas->compositeImage($reflection, imagick::COMPOSITE_OVER, 20, $im->getImageHeight() + 10);
-
-/* Output the image*/
-header("Content-Type: image/png");
-echo $canvas;
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Creating a reflection of an image</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/hello_world_reflection.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
-  <para>
-   This example illustrates how to use fill patterns during drawing.
-   <example>
-    <title>Filling text with gradient</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create a new imagick object */
-$im = new Imagick();
-
-/* Create new image. This will be used as fill pattern */
-$im->newPseudoImage(50, 50, "gradient:red-black");
-
-/* Create imagickdraw object */
-$draw = new ImagickDraw();
-
-/* Start a new pattern called "gradient" */
-$draw->pushPattern('gradient', 0, 0, 50, 50);
-
-/* Composite the gradient on the pattern */
-$draw->composite(Imagick::COMPOSITE_OVER, 0, 0, 50, 50, $im);
-
-/* Close the pattern */
-$draw->popPattern();
-
-/* Use the pattern called "gradient" as the fill */
-$draw->setFillPatternURL('#gradient');
-
-/* Set font size to 52 */
-$draw->setFontSize(52);
-
-/* Annotate some text */
-$draw->annotation(20, 50, "Hello World!");
-
-/* Create a new canvas object and a white image */
-$canvas = new Imagick();
-$canvas->newImage(350, 70, "white");
-
-/* Draw the ImagickDraw on to the canvas */
-$canvas->drawImage($draw);
-
-/* 1px black border around the image */
-$canvas->borderImage('black', 1, 1);
-
-/* Set the format to PNG */
-$canvas->setImageFormat('png');
-
-/* Output the image */
-header("Content-Type: image/png");
-echo $canvas;
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Filling text with gradient</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/hello_world.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
-  <para>
-   Working with animated GIF images
-   <example>
-    <title>Read in GIF image and resize all frames</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create a new imagick object and read in GIF */
-$im = new Imagick("example.gif");
-
-/* Resize all frames */
-foreach ($im as $frame) {
-    /* 50x50 frames */
-    $frame->thumbnailImage(50, 50);
-
-    /* Set the virtual canvas to correct size */
-    $frame->setImagePage(50, 50, 0, 0);
-}
-
-/* Notice writeImages instead of writeImage */
-$im->writeImages("example_small.gif", true);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <para>
-   Working with ellipse primitive and custom fonts
-   <example>
-    <title>Create a PHP logo</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Set width and height in proportion of genuine PHP logo */
-$width = 400;
-$height = 210;
-
-/* Create an Imagick object with transparent canvas */
-$img = new Imagick();
-$img->newImage($width, $height, new ImagickPixel('transparent'));
-
-/* New ImagickDraw instance for ellipse draw */
-$draw = new ImagickDraw();
-/* Set purple fill color for ellipse */
-$draw->setFillColor('#777bb4');
-/* Set ellipse dimensions */
-$draw->ellipse($width / 2, $height / 2, $width / 2, $height / 2, 0, 360);
-/* Draw ellipse onto the canvas */
-$img->drawImage($draw);
-
-/* Reset fill color from purple to black for text (note: we are reusing ImagickDraw object) */
-$draw->setFillColor('black');
-/* Set stroke border to white color */
-$draw->setStrokeColor('white');
-/* Set stroke border thickness */
-$draw->setStrokeWidth(2);
-/* Set font kerning (negative value means that letters are closer to each other) */
-$draw->setTextKerning(-8);
-/* Set font and font size used in PHP logo */
-$draw->setFont('Handel Gothic.ttf');
-$draw->setFontSize(150);
-/* Center text horizontally and vertically */
-$draw->setGravity(Imagick::GRAVITY_CENTER);
-
-/* Add center "php" with Y offset of -10 to canvas (inside ellipse) */
-$img->annotateImage($draw, 0, -10, 0, 'php');
-$img->setImageFormat('png');
-
-/* Set appropriate header for PNG and output the image */
-header('Content-Type: image/png');
-echo $img;
-?>
-
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Creating PHP logo with Imagick</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/php_logo.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
- </section>
-</chapter>
-
-
diff --git a/reference/imagick/figures/adaptiveBlurImage.gif b/reference/imagick/figures/adaptiveBlurImage.gif
deleted file mode 100644
index b4e9983809fc..000000000000
Binary files a/reference/imagick/figures/adaptiveBlurImage.gif and /dev/null differ
diff --git a/reference/imagick/figures/distortImage.png b/reference/imagick/figures/distortImage.png
deleted file mode 100644
index 27adef457070..000000000000
Binary files a/reference/imagick/figures/distortImage.png and /dev/null differ
diff --git a/reference/imagick/figures/floodfillpaint_intermediate.png b/reference/imagick/figures/floodfillpaint_intermediate.png
deleted file mode 100644
index 2e9cb81cd6db..000000000000
Binary files a/reference/imagick/figures/floodfillpaint_intermediate.png and /dev/null differ
diff --git a/reference/imagick/figures/floodfillpaint_result.png b/reference/imagick/figures/floodfillpaint_result.png
deleted file mode 100644
index 1962c91e8e28..000000000000
Binary files a/reference/imagick/figures/floodfillpaint_result.png and /dev/null differ
diff --git a/reference/imagick/figures/functionImage_multiplied.png b/reference/imagick/figures/functionImage_multiplied.png
deleted file mode 100644
index 5ab530924489..000000000000
Binary files a/reference/imagick/figures/functionImage_multiplied.png and /dev/null differ
diff --git a/reference/imagick/figures/functionImage_polynomial.png b/reference/imagick/figures/functionImage_polynomial.png
deleted file mode 100644
index 937e4b794ffd..000000000000
Binary files a/reference/imagick/figures/functionImage_polynomial.png and /dev/null differ
diff --git a/reference/imagick/figures/functionImage_sinusoidal.png b/reference/imagick/figures/functionImage_sinusoidal.png
deleted file mode 100644
index 46e68a02b763..000000000000
Binary files a/reference/imagick/figures/functionImage_sinusoidal.png and /dev/null differ
diff --git a/reference/imagick/figures/hello_world.png b/reference/imagick/figures/hello_world.png
deleted file mode 100644
index 3af4829e214a..000000000000
Binary files a/reference/imagick/figures/hello_world.png and /dev/null differ
diff --git a/reference/imagick/figures/hello_world_reflection.png b/reference/imagick/figures/hello_world_reflection.png
deleted file mode 100644
index b25f3211ebb0..000000000000
Binary files a/reference/imagick/figures/hello_world_reflection.png and /dev/null differ
diff --git a/reference/imagick/figures/importimagepixels.jpg b/reference/imagick/figures/importimagepixels.jpg
deleted file mode 100644
index c1580cc90fe7..000000000000
Binary files a/reference/imagick/figures/importimagepixels.jpg and /dev/null differ
diff --git a/reference/imagick/figures/php_logo.png b/reference/imagick/figures/php_logo.png
deleted file mode 100644
index d03c91fa1207..000000000000
Binary files a/reference/imagick/figures/php_logo.png and /dev/null differ
diff --git a/reference/imagick/imagick.xml b/reference/imagick/imagick.xml
deleted file mode 100644
index 2f24c5dd4511..000000000000
--- a/reference/imagick/imagick.xml
+++ /dev/null
@@ -1,770 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference role="class" xml:id="class.imagick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The <classname>Imagick</classname> class</title>
- <titleabbrev>Imagick</titleabbrev>
- <partintro>
-  <section xml:id="imagick.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>Imagick</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass><classname>Imagick</classname></ooclass>
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagick')/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.imagick')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-  </section>
-
- <section xml:id="imagick.imagick.methodtypes">
-  <title>Image methods and global methods</title>
-  <para>
-   The Imagick class has the ability to hold and operate on multiple
-   images simultaneously. This is achieved through an internal stack. There
-   is always an internal pointer that points at the current image. Some
-   functions operate on all images in the Imagick class, but most operate
-   only on the current image in the internal stack. As a convention, method
-   names can contain the word Image to denote they affect only the current
-   image in the stack.
-  </para>
- </section>
-
- <section xml:id="imagick.imagick.methods">
-  <title>Class Methods</title>
-  <para>
-   Because there are so many methods, here is a handy list of methods,
-   somewhat reduced to their general purpose:
-  </para>
-
-  <table>
-   <title>Class methods by purpose</title>
-   <tgroup cols="5">
-    <thead>
-     <row>
-      <entry>Image effects</entry>
-      <entry>Get methods</entry>
-      <entry>Set methods</entry>
-      <entry>Read/write images</entry>
-      <entry>Other</entry>
-     </row>
-    </thead>
-
-    <tbody>
-     <row>
-      <entry><methodname>Imagick::adaptiveBlurImage</methodname></entry>
-      <entry><methodname>Imagick::getCompression</methodname></entry>
-      <entry><methodname>Imagick::setBackgroundColor</methodname></entry>
-      <entry><methodname>Imagick::__construct</methodname></entry>
-      <entry><methodname>Imagick::clear</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::adaptiveResizeImage</methodname></entry>
-      <entry><methodname>Imagick::getFilename</methodname></entry>
-      <entry><methodname>Imagick::setCompressionQuality</methodname></entry>
-      <entry><methodname>Imagick::addImage</methodname></entry>
-      <entry><methodname>Imagick::clone</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::adaptiveSharpenImage</methodname></entry>
-      <entry><methodname>Imagick::getFormat</methodname></entry>
-      <entry><methodname>Imagick::setCompression</methodname></entry>
-      <entry><methodname>Imagick::appendImages</methodname></entry>
-      <entry><methodname>Imagick::current</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::adaptiveThresholdImage</methodname></entry>
-      <entry><methodname>Imagick::getImageBackgroundColor</methodname></entry>
-      <entry><methodname>Imagick::setFilename</methodname></entry>
-      <entry><methodname>Imagick::getFilename</methodname></entry>
-      <entry><methodname>Imagick::destroy</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::addNoiseImage</methodname></entry>
-      <entry><methodname>Imagick::getImageBlob</methodname></entry>
-      <entry><methodname>Imagick::getImagesBlob</methodname></entry>   
-      <entry><methodname>Imagick::setFormat</methodname></entry>
-      <entry><methodname>Imagick::getFormat</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::affinetransformimage</methodname></entry>
-      <entry><methodname>Imagick::getImageBluePrimary</methodname></entry>
-      <entry><methodname>Imagick::setImageBackgroundColor</methodname></entry>
-      <entry><methodname>Imagick::getImageFilename</methodname></entry>
-      <entry><methodname>Imagick::getHomeURL</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::annotateImage</methodname></entry>
-      <entry><methodname>Imagick::getImageBorderColor</methodname></entry>
-      <entry><methodname>Imagick::setFirstIterator</methodname></entry>
-      <entry><methodname>Imagick::getImageFormat</methodname></entry>
-      <entry><methodname>Imagick::commentImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::averageImages</methodname></entry>
-      <entry><methodname>Imagick::getImageChannelDepth</methodname></entry>
-      <entry><methodname>Imagick::setImageBias</methodname></entry>
-      <entry><methodname>Imagick::getImage</methodname></entry>
-      <entry><methodname>Imagick::getNumberImages</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::blackThresholdImage</methodname></entry>
-      <entry><methodname>Imagick::getImageChannelDistortion</methodname></entry>
-      <entry><methodname>Imagick::setImageBluePrimary</methodname></entry>
-      <entry><methodname>Imagick::setImageFilename</methodname></entry>
-      <entry><methodname>Imagick::getReleaseDate</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::blurImage</methodname></entry>
-      <entry><methodname>Imagick::getImageChannelExtrema</methodname></entry>
-      <entry><methodname>Imagick::setImageBorderColor</methodname></entry>
-      <entry><methodname>Imagick::setImageFormat</methodname></entry>
-      <entry><methodname>Imagick::getVersion</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::borderImage</methodname></entry>
-      <entry><methodname>Imagick::getImageChannelMean</methodname></entry>
-      <entry><methodname>Imagick::setImageChannelDepth</methodname></entry>
-      <entry><methodname>Imagick::readImageFile</methodname></entry>
-      <entry><methodname>Imagick::hasNextImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::charcoalImage</methodname></entry>
-      <entry><methodname>Imagick::getImageChannelStatistics</methodname></entry>
-      <entry><methodname>Imagick::setImageColormapColor</methodname></entry>
-      <entry><methodname>Imagick::readImage</methodname></entry>
-      <entry><methodname>Imagick::hasPreviousImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::chopImage</methodname></entry>
-      <entry><methodname>Imagick::getImageColormapColor</methodname></entry>
-      <entry><methodname>Imagick::setImageColorSpace</methodname></entry>
-      <entry><methodname>Imagick::writeImages</methodname></entry>
-      <entry><methodname>Imagick::labelImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::clipImage</methodname></entry>
-      <entry><methodname>Imagick::getImageColorspace</methodname></entry>
-      <entry><methodname>Imagick::setImageCompose</methodname></entry>
-      <entry><methodname>Imagick::writeImage</methodname></entry>
-      <entry><methodname>Imagick::newImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::clipPathImage</methodname></entry>
-      <entry><methodname>Imagick::getImageColors</methodname></entry>
-      <entry><methodname>Imagick::setImageCompression</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::newPseudoImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::coalesceImages</methodname></entry>
-      <entry><methodname>Imagick::getImageCompose</methodname></entry>
-      <entry><methodname>Imagick::setImageDelay</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::nextImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::colorFloodFillImage</methodname></entry>
-      <entry><methodname>Imagick::getImageDelay</methodname></entry>
-      <entry><methodname>Imagick::setImageDepth</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::pingImageBlob</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::colorizeImage</methodname></entry>
-      <entry><methodname>Imagick::getImageDepth</methodname></entry>
-      <entry><methodname>Imagick::setImageDispose</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::pingImageFile</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::combineImages</methodname></entry>
-      <entry><methodname>Imagick::getImageDispose</methodname></entry>
-      <entry><methodname>Imagick::setImageDispose</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::pingImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::compareImageChannels</methodname></entry>
-      <entry><methodname>Imagick::getImageDistortion</methodname></entry>
-      <entry><methodname>Imagick::setImageExtent</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::previousImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::compareImageLayers</methodname></entry>
-      <entry><methodname>Imagick::getImageExtrema</methodname></entry>
-      <entry><methodname>Imagick::setImageFilename</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::profileImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::compositeImage</methodname></entry>
-      <entry><methodname>Imagick::getImageFilename</methodname></entry>
-      <entry><methodname>Imagick::setImageFormat</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::queryFormats</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::contrastImage</methodname></entry>
-      <entry><methodname>Imagick::getImageFormat</methodname></entry>
-      <entry><methodname>Imagick::setImageGamma</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::removeImageProfile</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::contrastStretchImage</methodname></entry>
-      <entry><methodname>Imagick::getImageGamma</methodname></entry>
-      <entry><methodname>Imagick::setImageGreenPrimary</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::removeImage</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::convolveImage</methodname></entry>
-      <entry><methodname>Imagick::getImageGeometry</methodname></entry>
-      <entry><methodname>Imagick::setImageIndex</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::setFirstIterator</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::cropImage</methodname></entry>
-      <entry><methodname>Imagick::getImageGreenPrimary</methodname></entry>
-      <entry><methodname>Imagick::setImageInterpolateMethod</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::setImageIndex</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::cycleColormapImage</methodname></entry>
-      <entry><methodname>Imagick::getImageHeight</methodname></entry>
-      <entry><methodname>Imagick::setImageIterations</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::valid</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::deconstructImages</methodname></entry>
-      <entry><methodname>Imagick::getImageHistogram</methodname></entry>
-      <entry><methodname>Imagick::setImageMatteColor</methodname></entry>
-      <entry></entry>
-      <entry><methodname>Imagick::getCopyright</methodname></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::drawImage</methodname></entry>
-      <entry><methodname>Imagick::getImageIndex</methodname></entry>
-      <entry><methodname>Imagick::setImageMatte</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::edgeImage</methodname></entry>
-      <entry><methodname>Imagick::getImageInterlaceScheme</methodname></entry>
-      <entry><methodname>Imagick::setImagePage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::embossImage</methodname></entry>
-      <entry><methodname>Imagick::getImageInterpolateMethod</methodname></entry>
-      <entry><methodname>Imagick::setImageProfile</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::enhanceImage</methodname></entry>
-      <entry><methodname>Imagick::getImageIterations</methodname></entry>
-      <entry><methodname>Imagick::setImageProperty</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::equalizeImage</methodname></entry>
-      <entry><methodname>Imagick::getImageMatteColor</methodname></entry>
-      <entry><methodname>Imagick::setImageRedPrimary</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::evaluateImage</methodname></entry>
-      <entry><methodname>Imagick::getImageMatte</methodname></entry>
-      <entry><methodname>Imagick::setImageRenderingIntent</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::flattenImages</methodname></entry>
-      <entry><methodname>Imagick::getImagePage</methodname></entry>
-      <entry><methodname>Imagick::setImageResolution</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::flipImage</methodname></entry>
-      <entry><methodname>Imagick::getImagePixelColor</methodname></entry>
-      <entry><methodname>Imagick::setImageScene</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::flopImage</methodname></entry>
-      <entry><methodname>Imagick::getImageProfile</methodname></entry>
-      <entry><methodname>Imagick::setImageTicksPerSecond</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry></entry>
-      <entry><methodname>Imagick::getImageProperty</methodname></entry>
-      <entry><methodname>Imagick::setImageType</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::fxImage</methodname></entry>
-      <entry><methodname>Imagick::getImageRedPrimary</methodname></entry>
-      <entry><methodname>Imagick::setImageUnits</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::gammaImage</methodname></entry>
-      <entry><methodname>Imagick::getImageRegion</methodname></entry>
-      <entry><methodname>Imagick::setImageVirtualPixelMethod</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::gaussianBlurImage</methodname></entry>
-      <entry><methodname>Imagick::getImageRenderingIntent</methodname></entry>
-      <entry><methodname>Imagick::setImageWhitepoint</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::implodeImage</methodname></entry>
-      <entry><methodname>Imagick::getImageResolution</methodname></entry>
-      <entry><methodname>Imagick::setInterlaceScheme</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::levelImage</methodname></entry>
-      <entry><methodname>Imagick::getImageScene</methodname></entry>
-      <entry><methodname>Imagick::setOption</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::linearStretchImage</methodname></entry>
-      <entry><methodname>Imagick::getImageSignature</methodname></entry>
-      <entry><methodname>Imagick::setPage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::magnifyImage</methodname></entry>
-      <entry><methodname>Imagick::getImageTicksPerSecond</methodname></entry>
-      <entry><methodname>Imagick::setResolution</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::matteFloodFillImage</methodname></entry>
-      <entry><methodname>Imagick::getImageTotalInkDensity</methodname></entry>
-      <entry><methodname>Imagick::setResourceLimit</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::medianFilterImage</methodname></entry>
-      <entry><methodname>Imagick::getImageType</methodname></entry>
-      <entry><methodname>Imagick::setSamplingFactors</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::minifyImage</methodname></entry>
-      <entry><methodname>Imagick::getImageUnits</methodname></entry>
-      <entry><methodname>Imagick::setSizeOffset</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::modulateImage</methodname></entry>
-      <entry><methodname>Imagick::getImageVirtualPixelMethod</methodname></entry>
-      <entry><methodname>Imagick::setSize</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::montageImage</methodname></entry>
-      <entry><methodname>Imagick::getImageWhitepoint</methodname></entry>
-      <entry><methodname>Imagick::setType</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::morphImages</methodname></entry>
-      <entry><methodname>Imagick::getImageWidth</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::mosaicImages</methodname></entry>
-      <entry><methodname>Imagick::getImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::motionBlurImage</methodname></entry>
-      <entry><methodname>Imagick::getInterlaceScheme</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::negateImage</methodname></entry>
-      <entry><methodname>Imagick::getNumberImages</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::normalizeImage</methodname></entry>
-      <entry><methodname>Imagick::getOption</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::oilPaintImage</methodname></entry>
-      <entry><methodname>Imagick::getPackageName</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::optimizeImageLayers</methodname></entry>
-      <entry><methodname>Imagick::getPage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::paintOpaqueImage</methodname></entry>
-      <entry><methodname>Imagick::getPixelIterator</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::paintTransparentImage</methodname></entry>
-      <entry><methodname>Imagick::getPixelRegionIterator</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::posterizeImage</methodname></entry>
-
-      <entry><methodname>Imagick::getQuantumDepth</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::radialBlurImage</methodname></entry>
-      <entry><methodname>Imagick::getQuantumRange</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::raiseImage</methodname></entry>
-      <entry><methodname>Imagick::getResourceLimit</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::randomThresholdImage</methodname></entry>
-      <entry><methodname>Imagick::getResource</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::reduceNoiseImage</methodname></entry>
-      <entry><methodname>Imagick::getSamplingFactors</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::render</methodname></entry>
-      <entry><methodname>Imagick::getSizeOffset</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::resampleImage</methodname></entry>
-      <entry><methodname>Imagick::getSize</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::resizeImage</methodname></entry>
-      <entry><methodname>Imagick::identifyImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::rollImage</methodname></entry>
-      <entry><methodname>Imagick::getImageSize</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::rotateImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::sampleImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::scaleImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::separateImageChannel</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::sepiaToneImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::shadeImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::shadowImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::sharpenImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::shaveImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::shearImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::sigmoidalContrastImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::sketchImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::solarizeImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::spliceImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::spreadImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::steganoImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::stereoImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::stripImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::swirlImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::textureImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::thresholdImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::thumbnailImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::tintImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::transverseImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::trimImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::uniqueImageColors</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::unsharpMaskImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::vignetteImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::waveImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><methodname>Imagick::whiteThresholdImage</methodname></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </section>
- </partintro>
- &reference.imagick.entities.imagick;
-</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/imagick/imagick/adaptiveblurimage.xml b/reference/imagick/imagick/adaptiveblurimage.xml
deleted file mode 100644
index b2742160c5a1..000000000000
--- a/reference/imagick/imagick/adaptiveblurimage.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.adaptiveblurimage">
- <refnamediv>
-  <refname>Imagick::adaptiveBlurImage</refname>
-  <refpurpose>Adds adaptive blur filter to image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::adaptiveBlurImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds an adaptive blur filter to image. The intensity of an adaptive blur
-   depends is dramatically decreased at edge of the image, whereas a standard
-   blur is uniform across the image. &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the Gaussian, in pixels, not counting the center pixel.
-       Provide a value of 0 and the radius will be chosen automagically.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the Gaussian, in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::adaptiveBlurImage</function>:</title>
-    <para>
-     Adaptively blur an image, then display to the browser.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-header('Content-type: image/jpeg');
-
-$image = new Imagick('test.jpg');
-
-$image->adaptiveBlurImage(5,3);
-echo $image;
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Using Imagick::adaptiveBlurImage()</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/adaptiveBlurImage.gif"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::blurImage</function></member>
-    <member><function>Imagick::motionBlurImage</function></member>
-    <member><function>Imagick::radialBlurImage</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/imagick/imagick/adaptiveresizeimage.xml b/reference/imagick/imagick/adaptiveresizeimage.xml
deleted file mode 100644
index df94cb160cfa..000000000000
--- a/reference/imagick/imagick/adaptiveresizeimage.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.adaptiveresizeimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::adaptiveResizeImage</refname>
-  <refpurpose>Adaptively resize image with data dependent triangulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::adaptiveResizeImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>bestfit</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adaptively resize image with data-dependent triangulation. Avoids
-   blurring across sharp color changes. Most useful when used to shrink
-   images slightly to a slightly smaller "web size"; may not look good
-   when a full-sized image is adaptively resized to a thumbnail.
-   &imagick.method.available.0x629;
-  </para>
-  &imagick.bestfit.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       The number of columns in the scaled image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       The number of rows in the scaled image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bestfit</parameter></term>
-     <listitem>
-      <simpara>
-       Whether to fit the image within the given dimensions while preserving
-       the aspect ratio.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>legacy</parameter></term>
-     <listitem>
-      <simpara>
-       Optional <type>bool</type> parameter.
-       If set to true, the calculations are done with the small rounding bug
-       that existed in Imagick before 3.4.0. If set to false, the calculations
-       should produce the same results as the ImageMagick command-line tools.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL imagick 2.1.0</entry>
-      <entry>Added optional fit parameter.</entry>
-     </row>
-     <row>
-      <entry>PECL imagick 2.1.0</entry>
-      <entry>
-      This method now supports proportional scaling.
-      Pass zero as either parameter for proportional scaling.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL imagick 3.4.0</entry>
-      <entry>
-       Added the <parameter>legacy</parameter> parameter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::adaptiveResizeImage</function></title>
-    <para>
-     Resize an image to a standard size for the web.  This method works best
-     when resizing to a size only slightly smaller than the previous image
-     size.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-header('Content-type: image/jpeg');
-
-$image = new Imagick('image.jpg');
-$image->adaptiveResizeImage(1024,768);
-
-echo $image;
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::chopImage</function></member>
-    <member><function>Imagick::cropImage</function></member>
-    <member><function>Imagick::magnifyImage</function></member>
-    <member><function>Imagick::minifyImage</function></member>
-    <member><function>Imagick::resizeImage</function></member>
-    <member><function>Imagick::scaleImage</function></member>
-    <member><function>Imagick::shaveImage</function></member>
-    <member><function>Imagick::thumbnailImage</function></member>
-    <member><function>Imagick::trimImage</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/imagick/imagick/adaptivesharpenimage.xml b/reference/imagick/imagick/adaptivesharpenimage.xml
deleted file mode 100644
index 682468b9c0d0..000000000000
--- a/reference/imagick/imagick/adaptivesharpenimage.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.adaptivesharpenimage">
- <refnamediv>
-  <refname>Imagick::adaptiveSharpenImage</refname>
-  <refpurpose>Adaptively sharpen the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::adaptiveSharpenImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Adaptively sharpen the image by sharpening more intensely
-   near image edges and less intensely far from edges. &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the Gaussian, in pixels, not counting the center pixel. Use 0 for auto-select.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the Gaussian, in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>Imagick::adaptiveSharpenImage</function> example</title>
-    <para>
-     Adaptively sharpen the image with radius 2 and sigma 1.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $image = new Imagick('image.png');
-    $image->adaptiveSharpenImage(2,1);
-} catch(ImagickException $e) {
-    echo 'Error: ' , $e->getMessage();
-    die();
-}
-header('Content-type: image/png');
-echo $image;
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::sharpenImage</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/imagick/imagick/adaptivethresholdimage.xml b/reference/imagick/imagick/adaptivethresholdimage.xml
deleted file mode 100644
index 074179226498..000000000000
--- a/reference/imagick/imagick/adaptivethresholdimage.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.adaptivethresholdimage">
- <refnamediv>
-  <refname>Imagick::adaptiveThresholdImage</refname>
-  <refpurpose>Selects a threshold for each pixel based on a range of intensity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::adaptiveThresholdImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Selects an individual threshold for each pixel based on the
-   range of intensity values in its local neighborhood.  This
-   allows for thresholding of an image whose global intensity
-   histogram doesn't contain distinctive peaks.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       Width of the local neighborhood.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       Height of the local neighborhood.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The mean offset
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::adaptiveThresholdImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function adaptiveThresholdImage($imagePath, $width, $height, $adaptiveOffset) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $adaptiveOffsetQuantum = intval($adaptiveOffset * \Imagick::getQuantum());
-    $imagick->adaptiveThresholdImage($width, $height, $adaptiveOffsetQuantum);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/addimage.xml b/reference/imagick/imagick/addimage.xml
deleted file mode 100644
index b77c26ae2e3c..000000000000
--- a/reference/imagick/imagick/addimage.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.addimage">
- <refnamediv>
-  <refname>Imagick::addImage</refname>
-  <refpurpose>Adds new image to Imagick object image list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::addImage</methodname>
-   <methodparam><type>Imagick</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds new image to Imagick object from the current position of the source object.
-   After the operation iterator position is moved at the end of the list.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>source</parameter></term>
-     <listitem>
-      <para>
-       The source Imagick object
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/addnoiseimage.xml b/reference/imagick/imagick/addnoiseimage.xml
deleted file mode 100644
index 407aaf65ed32..000000000000
--- a/reference/imagick/imagick/addnoiseimage.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.addnoiseimage">
- <refnamediv>
-  <refname>Imagick::addNoiseImage</refname>
-  <refpurpose>Adds random noise to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::addNoiseImage</methodname>
-   <methodparam><type>int</type><parameter>noise_type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds random noise to the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>noise_type</parameter></term>
-     <listitem>
-      <para>
-       The type of the noise. Refer to this list of
-       <link linkend="imagick.constants.noise">noise constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::addNoiseImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function addNoiseImage($noiseType, $imagePath, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->addNoiseImage($noiseType, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/affinetransformimage.xml b/reference/imagick/imagick/affinetransformimage.xml
deleted file mode 100644
index e81007a54cba..000000000000
--- a/reference/imagick/imagick/affinetransformimage.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.affinetransformimage">
- <refnamediv>
-  <refname>Imagick::affineTransformImage</refname>
-  <refpurpose>Transforms an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::affineTransformImage</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>matrix</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Transforms an image as dictated by the affine matrix.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matrix</parameter></term>
-     <listitem>
-      <para>
-       The affine matrix
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::affineTransformImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function affineTransformImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $draw = new \ImagickDraw();
-
-    $angle = deg2rad(40);
-
-    $affineRotate = array(
-        "sx" => cos($angle), "sy" => cos($angle), 
-        "rx" => sin($angle), "ry" => -sin($angle), 
-        "tx" => 0, "ty" => 0,
-    );
-
-    $draw->affine($affineRotate);
-
-    $imagick->affineTransformImage($draw);
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/animateimages.xml b/reference/imagick/imagick/animateimages.xml
deleted file mode 100644
index 24d2848aa685..000000000000
--- a/reference/imagick/imagick/animateimages.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.animateimages">
- <refnamediv>
-  <refname>Imagick::animateImages</refname>
-  <refpurpose>Animates an image or images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::animateImages</methodname>
-   <methodparam><type>string</type><parameter>x_server</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This method animates the image onto a local or remote X server. This method
-   is not available on Windows.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x_server</parameter></term>
-     <listitem>
-      <para>
-       X server address
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/annotateimage.xml b/reference/imagick/imagick/annotateimage.xml
deleted file mode 100644
index 6e0ed07b4123..000000000000
--- a/reference/imagick/imagick/annotateimage.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.annotateimage">
- <refnamediv>
-  <refname>Imagick::annotateImage</refname>
-  <refpurpose>Annotates an image with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::annotateImage</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>draw_settings</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Annotates an image with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>draw_settings</parameter></term>
-     <listitem>
-      <para>
-       The ImagickDraw object that contains settings for drawing the text
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       Horizontal offset in pixels to the left of text
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Vertical offset in pixels to the baseline of text
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle</parameter></term>
-     <listitem>
-      <para>
-       The angle at which to write the text
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The string to draw
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::annotateImage</function>:</title>
-    <para>
-     Annotate text on an empty image
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create some objects */
-$image = new Imagick();
-$draw = new ImagickDraw();
-$pixel = new ImagickPixel( 'gray' );
-
-/* New image */
-$image->newImage(800, 75, $pixel);
-
-/* Black text */
-$draw->setFillColor('black');
-
-/* Font properties */
-$draw->setFont('Bookman-DemiItalic');
-$draw->setFontSize( 30 );
-
-/* Create text */
-$image->annotateImage($draw, 10, 45, 0, 'The quick brown fox jumps over the lazy dog');
-
-/* Give image a format */
-$image->setImageFormat('png');
-
-/* Output the image with headers */
-header('Content-type: image/png');
-echo $image;
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ImagickDraw::annotation</function></member>
-    <member><function>ImagickDraw::setFont</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/imagick/imagick/appendimages.xml b/reference/imagick/imagick/appendimages.xml
deleted file mode 100644
index 816f823d83fb..000000000000
--- a/reference/imagick/imagick/appendimages.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.appendimages">
- <refnamediv>
-  <refname>Imagick::appendImages</refname>
-  <refpurpose>Append a set of images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::appendImages</methodname>
-   <methodparam><type>bool</type><parameter>stack</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Append a set of images into one larger image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>stack</parameter></term>
-     <listitem>
-      <para>
-       Whether to stack the images vertically.
-       By default (or if &false; is specified) images are stacked left-to-right.
-       If <parameter>stack</parameter> is &true;, images are stacked top-to-bottom.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns Imagick instance on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>Imagick::appendImages</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create new imagick object */
-$im = new Imagick();
-
-/* create red, green and blue images */
-$im->newImage(100, 50, "red");
-$im->newImage(100, 50, "green");
-$im->newImage(100, 50, "blue");
-
-/* Append the images into one */
-$im->resetIterator();
-$combined = $im->appendImages(true);
-
-/* Output the image */
-$combined->setImageFormat("png");
-header("Content-Type: image/png");
-echo $combined;
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Imagick::appendImages()</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/floodfillpaint_intermediate.png"/>
-     </imageobject>
-    </mediaobject>
-   </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/imagick/imagick/autolevelimage.xml b/reference/imagick/imagick/autolevelimage.xml
deleted file mode 100644
index 3faa13c15d45..000000000000
--- a/reference/imagick/imagick/autolevelimage.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.autolevelimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::autoLevelImage</refname>
-  <refpurpose>Adjusts the levels of a particular image channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::autoLevelImage</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adjusts the levels of a particular image channel by scaling the minimum and maximum values to the full quantum range.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      Which channel should the auto-levelling should be done on.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::autoLevelImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function autoLevelImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->autoLevelImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/averageimages.xml b/reference/imagick/imagick/averageimages.xml
deleted file mode 100644
index e08ec9b18fe7..000000000000
--- a/reference/imagick/imagick/averageimages.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.averageimages">
- <refnamediv>
-  <refname>Imagick::averageImages</refname>
-  <refpurpose>Average a set of images</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::averageImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Average a set of images.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/blackthresholdimage.xml b/reference/imagick/imagick/blackthresholdimage.xml
deleted file mode 100644
index 2e7c2d2a2e8e..000000000000
--- a/reference/imagick/imagick/blackthresholdimage.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.blackthresholdimage">
- <refnamediv>
-  <refname>Imagick::blackThresholdImage</refname>
-  <refpurpose>Forces all pixels below the threshold into black</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::blackThresholdImage</methodname>
-   <methodparam><type>mixed</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Is like Imagick::thresholdImage() but forces all pixels below the threshold
-   into black while leaving all pixels above the threshold unchanged.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-       The threshold below which everything turns black
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as a parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::blackThresholdImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function blackThresholdImage($imagePath, $thresholdColor) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->blackthresholdimage($thresholdColor);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/blueshiftimage.xml b/reference/imagick/imagick/blueshiftimage.xml
deleted file mode 100644
index 119566897231..000000000000
--- a/reference/imagick/imagick/blueshiftimage.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.blueshiftimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::blueShiftImage</refname>
-  <refpurpose>Mutes the colors of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::blueShiftImage</methodname>
-   <methodparam choice="opt"><type>float</type><parameter>factor</parameter><initializer>1.5</initializer></methodparam>
-  </methodsynopsis>
-  
-  <para>
-   Mutes the colors of the image to simulate a scene at nighttime in the moonlight.
-  </para>
-
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>factor</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::blueShiftImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function blueShiftImage($imagePath, $blueShift) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->blueShiftImage($blueShift);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/blurimage.xml b/reference/imagick/imagick/blurimage.xml
deleted file mode 100644
index 107176f5db6a..000000000000
--- a/reference/imagick/imagick/blurimage.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.blurimage">
- <refnamediv>
-  <refname>Imagick::blurImage</refname>
-  <refpurpose>Adds blur filter to image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::blurImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds blur filter to image. Optional third parameter to blur a specific
-   channel.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       Blur radius
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       Standard deviation
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       The <link linkend="imagick.constants.channel">Channeltype</link>
-       constant. When not supplied, all channels are blurred.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::blurImage</function>:</title>
-    <para>
-     Blur an image, then display to the browser.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-header('Content-type: image/jpeg');
-
-$image = new Imagick('test.jpg');
-
-$image->blurImage(5,3);
-echo $image;
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::adaptiveBlurImage</function></member>
-    <member><function>Imagick::motionBlurImage</function></member>
-    <member><function>Imagick::radialBlurImage</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/imagick/imagick/borderimage.xml b/reference/imagick/imagick/borderimage.xml
deleted file mode 100644
index 053c656d818b..000000000000
--- a/reference/imagick/imagick/borderimage.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.borderimage">
- <refnamediv>
-  <refname>Imagick::borderImage</refname>
-  <refpurpose>Surrounds the image with a border</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::borderImage</methodname>
-   <methodparam><type>mixed</type><parameter>bordercolor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Surrounds the image with a border of the color defined by the bordercolor ImagickPixel object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>bordercolor</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the border color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       Border width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       Border height
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::borderImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function borderImage($imagePath, $color, $width, $height) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->borderImage($color, $width, $height);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/brightnesscontrastimage.xml b/reference/imagick/imagick/brightnesscontrastimage.xml
deleted file mode 100644
index 1e2ef25768c6..000000000000
--- a/reference/imagick/imagick/brightnesscontrastimage.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.brightnesscontrastimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::brightnessContrastImage</refname>
-  <refpurpose>Change the brightness and/or contrast of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::brightnessContrastImage</methodname>
-   <methodparam><type>float</type><parameter>brightness</parameter></methodparam>
-   <methodparam><type>float</type><parameter>contrast</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change the brightness and/or contrast of an image. It converts the brightness and contrast parameters into slope and intercept and calls a polynomial function to apply to the image.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>brightness</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>contrast</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::brightnessContrastImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function brightnessContrastImage($imagePath, $brightness, $contrast, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->brightnessContrastImage($brightness, $contrast, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/charcoalimage.xml b/reference/imagick/imagick/charcoalimage.xml
deleted file mode 100644
index 3f1323bcb5fa..000000000000
--- a/reference/imagick/imagick/charcoalimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.charcoalimage">
- <refnamediv>
-  <refname>Imagick::charcoalImage</refname>
-  <refpurpose>Simulates a charcoal drawing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::charcoalImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Simulates a charcoal drawing.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the Gaussian, in pixels, not counting the center pixel
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the Gaussian, in pixels
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::charcoalImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function charcoalImage($imagePath, $radius, $sigma) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->charcoalImage($radius, $sigma);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/chopimage.xml b/reference/imagick/imagick/chopimage.xml
deleted file mode 100644
index 3b19a99d03e8..000000000000
--- a/reference/imagick/imagick/chopimage.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.chopimage">
- <refnamediv>
-  <refname>Imagick::chopImage</refname>
-  <refpurpose>Removes a region of an image and trims</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::chopImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a region of an image and collapses the image to occupy the removed portion.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       Width of the chopped area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       Height of the chopped area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X origo of the chopped area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y origo of the chopped area
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::chopImage</function>:</title>
-    <para>
-     Example of using Imagick::chopImage
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create some objects */
-$image = new Imagick();
-$pixel = new ImagickPixel( 'gray' );
-
-/* New image */
-$image->newImage(400, 200, $pixel);
-
-/* Chop image */
-$image->chopImage(200, 200, 0, 0);
-
-/* Give image a format */
-$image->setImageFormat('png');
-
-/* Output the image with headers */
-header('Content-type: image/png');
-echo $image;
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::cropImage</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/imagick/imagick/clampimage.xml b/reference/imagick/imagick/clampimage.xml
deleted file mode 100644
index 7c1c75e5af41..000000000000
--- a/reference/imagick/imagick/clampimage.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.clampimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::clampImage</refname>
-  <refpurpose>Restricts the color range from 0 to the quantum depth.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::clampImage</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Restricts the color range from 0 to the quantum depth.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/imagick/imagick/clear.xml b/reference/imagick/imagick/clear.xml
deleted file mode 100644
index 719bfb159fa7..000000000000
--- a/reference/imagick/imagick/clear.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.clear">
- <refnamediv>
-  <refname>Imagick::clear</refname>
-  <refpurpose>Clears all resources associated to Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Clears all resources associated to Imagick object
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/clipimage.xml b/reference/imagick/imagick/clipimage.xml
deleted file mode 100644
index 49fcc0c64739..000000000000
--- a/reference/imagick/imagick/clipimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.clipimage">
- <refnamediv>
-  <refname>Imagick::clipImage</refname>
-  <refpurpose>Clips along the first path from the 8BIM profile</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::clipImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Clips along the first path from the 8BIM profile, if present.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/clipimagepath.xml b/reference/imagick/imagick/clipimagepath.xml
deleted file mode 100644
index 0bb573ea9c7d..000000000000
--- a/reference/imagick/imagick/clipimagepath.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.clipimagepath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::clipImagePath</refname>
-  <refpurpose>Clips along the named paths from the 8BIM profile, if present</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Imagick::clipImagePath</methodname>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>inside</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Clips along the named paths from the 8BIM profile, if present. Later operations take effect inside the path.  Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pathname</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>inside</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/clippathimage.xml b/reference/imagick/imagick/clippathimage.xml
deleted file mode 100644
index a9ca1ebd3c26..000000000000
--- a/reference/imagick/imagick/clippathimage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.clippathimage">
- <refnamediv>
-  <refname>Imagick::clipPathImage</refname>
-  <refpurpose>Clips along the named paths from the 8BIM profile</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::clipPathImage</methodname>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>inside</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Clips along the named paths from the 8BIM profile, if
-   present. Later operations take effect inside the path.
-   It may be a number if preceded with #, to work on a
-   numbered path, e.g., "#1" to use the first path.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pathname</parameter></term>
-     <listitem>
-      <para>
-       The name of the path
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>inside</parameter></term>
-     <listitem>
-      <para>
-       If &true; later operations take effect inside clipping path.
-       Otherwise later operations take effect outside clipping path.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/clone.xml b/reference/imagick/imagick/clone.xml
deleted file mode 100644
index 5da16980ec9c..000000000000
--- a/reference/imagick/imagick/clone.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.clone">
- <refnamediv>
-  <refname>Imagick::clone</refname>
-  <refpurpose>Makes an exact copy of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::clone</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Makes an exact copy of the Imagick object.
-  </para>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of imagick 3.1.0
-    in favour of using the <link linkend="language.oop5.cloning">clone</link>
-    keyword.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A copy of the Imagick object is 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>PECL imagick 3.1.0</entry>
-       <entry>
-        The method was deprecated in favour of the
-        <link linkend="language.oop5.cloning">clone</link> keyword.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/clutimage.xml b/reference/imagick/imagick/clutimage.xml
deleted file mode 100644
index ebd1843b700c..000000000000
--- a/reference/imagick/imagick/clutimage.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.clutimage">
- <refnamediv>
-  <refname>Imagick::clutImage</refname>
-  <refpurpose>Replaces colors in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::clutImage</methodname>
-   <methodparam><type>Imagick</type><parameter>lookup_table</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Replaces colors in the image from a color lookup table. Optional second
-   parameter to replace colors in a specific channel. &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>lookup_table</parameter></term>
-     <listitem>
-      <para>
-       Imagick object containing the color lookup table
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       The <link linkend="imagick.constants.channel">Channeltype</link>
-       constant. When not supplied, default channels are replaced.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::clutImage</function>:</title>
-    <para>
-     Replace colors in the image from a color lookup table.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = new Imagick('test.jpg');
-$clut = new Imagick();
-$clut->newImage(1, 1, new ImagickPixel('black'));
-$image->clutImage($clut);
-$image->writeImage('test_out.jpg');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::adaptiveBlurImage</function></member>
-    <member><function>Imagick::motionBlurImage</function></member>
-    <member><function>Imagick::radialBlurImage</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/imagick/imagick/coalesceimages.xml b/reference/imagick/imagick/coalesceimages.xml
deleted file mode 100644
index e3bb865b3eeb..000000000000
--- a/reference/imagick/imagick/coalesceimages.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.coalesceimages">
- <refnamediv>
-  <refname>Imagick::coalesceImages</refname>
-  <refpurpose>Composites a set of images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::coalesceImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Composites a set of images while respecting any page offsets
-   and disposal methods.  GIF, MIFF, and MNG animation sequences
-   typically start with an image background and each subsequent
-   image varies in size and offset.  Returns a new Imagick object
-   where each image in the sequence is the same size as the first
-   and composited with the next image in the sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/colorfloodfillimage.xml b/reference/imagick/imagick/colorfloodfillimage.xml
deleted file mode 100644
index 4f2d7c632a2d..000000000000
--- a/reference/imagick/imagick/colorfloodfillimage.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.colorfloodfillimage">
- <refnamediv>
-  <refname>Imagick::colorFloodfillImage</refname>
-  <refpurpose>Changes the color value of any pixel that matches target</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::colorFloodfillImage</methodname>
-   <methodparam><type>mixed</type><parameter>fill</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>bordercolor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the color value of any pixel that matches target and is an
-   immediate neighbor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object containing the fill color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The amount of fuzz. For example, set fuzz to 10 and the color red at
-       intensities of 100 and 102 respectively are now interpreted as the
-       same color for the purposes of the floodfill.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bordercolor</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object containing the border color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as first and third
-        parameter. Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/colorizeimage.xml b/reference/imagick/imagick/colorizeimage.xml
deleted file mode 100644
index cc13701573bd..000000000000
--- a/reference/imagick/imagick/colorizeimage.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.colorizeimage">
- <refnamediv>
-  <refname>Imagick::colorizeImage</refname>
-  <refpurpose>Blends the fill color with the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::colorizeImage</methodname>
-   <methodparam><type>mixed</type><parameter>colorize</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>opacity</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Blends the fill color with each pixel in the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>colorize</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the colorize color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or an float containing the opacity value. 
-       1.0 is fully opaque and 0.0 is fully transparent.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter and
-        a float representing the opacity value as the second parameter.
-        Previous versions allow only an ImagickPixel objects.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::colorizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function colorizeImage($imagePath, $color, $opacity) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $opacity = $opacity / 255.0;
-    $opacityColor = new \ImagickPixel("rgba(0, 0, 0, $opacity)");
-    $imagick->colorizeImage($color, $opacityColor);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/colormatriximage.xml b/reference/imagick/imagick/colormatriximage.xml
deleted file mode 100644
index 53a406e0e23f..000000000000
--- a/reference/imagick/imagick/colormatriximage.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.colormatriximage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::colorMatrixImage</refname>
-  <refpurpose>Apply color transformation to an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::colorMatrixImage</methodname>
-   <methodparam><type>array</type><parameter>color_matrix</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Apply color transformation to an image. The method permits saturation changes, hue rotation, luminance to alpha, and various other effects. Although variable-sized transformation matrices can be used, typically one uses a 5x5 matrix for an RGBA image and a 6x6 for CMYKA (or RGBA with offsets). The matrix is similar to those used by Adobe Flash except offsets are in column 6 rather than 5 (in support of CMYKA images) and offsets are normalized (divide Flash offset by 255)
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color_matrix</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::colorMatrixImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function colorMatrixImage($imagePath, $colorMatrix) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setImageOpacity(1);
-
-    //A color matrix should look like:
-    //    $colorMatrix = [
-    //        1.5, 0.0, 0.0, 0.0, 0.0, -0.157,
-    //        0.0, 1.0, 0.5, 0.0, 0.0, -0.157,
-    //        0.0, 0.0, 1.5, 0.0, 0.0, -0.157,
-    //        0.0, 0.0, 0.0, 1.0, 0.0,  0.0,
-    //        0.0, 0.0, 0.0, 0.0, 1.0,  0.0,
-    //        0.0, 0.0, 0.0, 0.0, 0.0,  1.0
-    //    ];
-
-    $background = new \Imagick();
-    $background->newPseudoImage($imagick->getImageWidth(), $imagick->getImageHeight(),  "pattern:checkerboard");
-
-    $background->setImageFormat('png');
-
-    $imagick->setImageFormat('png');
-    $imagick->colorMatrixImage($colorMatrix);
-    
-    $background->compositeImage($imagick, \Imagick::COMPOSITE_ATOP, 0, 0);
-
-    header("Content-Type: image/png");
-    echo $background->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/combineimages.xml b/reference/imagick/imagick/combineimages.xml
deleted file mode 100644
index 2fc393654e5b..000000000000
--- a/reference/imagick/imagick/combineimages.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.combineimages">
- <refnamediv>
-  <refname>Imagick::combineImages</refname>
-  <refpurpose>Combines one or more images into a single image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::combineImages</methodname>
-   <methodparam><type>int</type><parameter>channelType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Combines one or more images into a single image. The grayscale
-   value of the pixels of each image in the sequence is assigned
-   in order to the specified channels of the combined image. The
-   typical ordering would be image 1 =&gt; Red, 2 =&gt; Green,
-   3 =&gt; Blue, etc.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channelType</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/commentimage.xml b/reference/imagick/imagick/commentimage.xml
deleted file mode 100644
index 5291e6160f0b..000000000000
--- a/reference/imagick/imagick/commentimage.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.commentimage">
- <refnamediv>
-  <refname>Imagick::commentImage</refname>
-  <refpurpose>Adds a comment to your image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::commentImage</methodname>
-   <methodparam><type>string</type><parameter>comment</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a comment to your image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-       The comment to add
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::commentImage</function>:</title>
-    <para>
-     Commenting an image and retrieving the comment:
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create new Imagick object */
-$im = new imagick();
-
-/* Create an empty image */
-$im->newImage(100, 100, new ImagickPixel("red"));
-
-/* Add comment to the image */
-$im->commentImage("Hello World!");
-
-/* Display the comment */
-echo $im->getImageProperty("comment");
-
-?>
-]]>
-    </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/imagick/imagick/compareimagechannels.xml b/reference/imagick/imagick/compareimagechannels.xml
deleted file mode 100644
index 5f9f7b442420..000000000000
--- a/reference/imagick/imagick/compareimagechannels.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.compareimagechannels">
- <refnamediv>
-  <refname>Imagick::compareImageChannels</refname>
-  <refpurpose>Returns the difference in one or more images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::compareImageChannels</methodname>
-   <methodparam><type>Imagick</type><parameter>image</parameter></methodparam>
-   <methodparam><type>int</type><parameter>channelType</parameter></methodparam>
-   <methodparam><type>int</type><parameter>metricType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Compares one or more images and returns the difference image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>image</parameter></term>
-     <listitem>
-      <para>
-       Imagick object containing the image to compare.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channelType</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>metricType</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.metric">metric type constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array consisting of <literal>new_wand</literal> and
-   <literal>distortion</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/compareimagelayers.xml b/reference/imagick/imagick/compareimagelayers.xml
deleted file mode 100644
index 248911f43009..000000000000
--- a/reference/imagick/imagick/compareimagelayers.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.compareimagelayers">
- <refnamediv>
-  <refname>Imagick::compareImageLayers</refname>
-  <refpurpose>Returns the maximum bounding region between images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::compareImageLayers</methodname>
-   <methodparam><type>int</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Compares each image with the next in a sequence and returns the
-   maximum bounding region of any pixel differences it discovers.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.layermethod">layer method constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::compareImageLayers</function></title>
-    <para>
-      Comparing image layers
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* create new imagick object */
-$im = new Imagick("test.gif");
-
-/* optimize the image layers */
-$result = $im->compareImageLayers(imagick::LAYERMETHOD_COALESCE);
-
-/* work on the $result */
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::optimizeImageLayers</function></member>
-    <member><function>Imagick::writeImages</function></member>
-    <member><function>Imagick::writeImage</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/imagick/imagick/compareimages.xml b/reference/imagick/imagick/compareimages.xml
deleted file mode 100644
index 25a4f882072a..000000000000
--- a/reference/imagick/imagick/compareimages.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.compareimages">
- <refnamediv>
-  <refname>Imagick::compareImages</refname>
-  <refpurpose>Compares an image to a reconstructed image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::compareImages</methodname>
-   <methodparam><type>Imagick</type><parameter>compare</parameter></methodparam>
-   <methodparam><type>int</type><parameter>metric</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an array containing a reconstructed image and the difference between images.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>compare</parameter></term>
-     <listitem>
-      <para>
-       An image to compare to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>metric</parameter></term>
-     <listitem>
-      <para>
-       Provide a valid metric type constant. Refer to this
-       list of  <link linkend="imagick.constants.metric">metric constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing a reconstructed image and the difference between images.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::compareImages</function>:</title>
-    <para>
-     Compare images and display the reconstructed image
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$image1 = new imagick("image1.png");
-$image2 = new imagick("image2.png");
-
-$result = $image1->compareImages($image2, Imagick::METRIC_MEANSQUAREERROR);
-$result[0]->setImageFormat("png");
-
-header("Content-Type: image/png");
-echo $result[0];
-
-?>
-]]>
-    </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/imagick/imagick/compositeimage.xml b/reference/imagick/imagick/compositeimage.xml
deleted file mode 100644
index e191d330b0e9..000000000000
--- a/reference/imagick/imagick/compositeimage.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.compositeimage">
- <refnamediv>
-  <refname>Imagick::compositeImage</refname>
-  <refpurpose>Composite one image onto another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::compositeImage</methodname>
-   <methodparam><type>Imagick</type><parameter>composite_object</parameter></methodparam>
-   <methodparam><type>int</type><parameter>composite</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Composite one image onto another at the specified offset. Any extra arguments needed for the compose algorithm should passed to setImageArtifact with 'compose:args' as the first parameter and the data as the second parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>composite_object</parameter></term>
-     <listitem>
-      <para>
-       Imagick object which holds the composite image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>compose</parameter></term>
-     <listitem>
-      <para>
-       Composite operator. See <link 
-       linkend="imagick.constants.compositeop">Composite Operator
-       Constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The column offset of the composited image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The row offset of the composited image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this list of <link
-       linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::compositeImage</function>:</title>
-    <para>
-     Composite two images with the 'mathematics' compose method
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// Equivalent to running the command
-// convert src1.png src2.png -compose mathematics -define compose:args="1,0,-0.5,0.5" -composite output.png
-
-$src1 = new \Imagick("./src1.png");
-$src2 = new \Imagick("./src2.png");
-
-$src1->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-$src1->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-$src1->compositeImage($src2, Imagick::COMPOSITE_MATHEMATICS, 0, 0);
-$src1->writeImage("./output.png");
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setImageArtifact</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/imagick/imagick/construct.xml b/reference/imagick/imagick/construct.xml
deleted file mode 100644
index aad9f94a97af..000000000000
--- a/reference/imagick/imagick/construct.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.construct">
- <refnamediv>
-  <refname>Imagick::__construct</refname>
-  <refpurpose>The Imagick constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Imagick::__construct</methodname>
-   <methodparam choice="opt"><type>mixed</type><parameter>files</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Creates an Imagick instance for a specified image or set of images.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>files</parameter></term>
-    <listitem>
-     <para>
-      The path to an image to load or an array of paths. Paths can include
-      wildcards for file names, or can be URLs.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>                                        
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/contrastimage.xml b/reference/imagick/imagick/contrastimage.xml
deleted file mode 100644
index 3deeec65087f..000000000000
--- a/reference/imagick/imagick/contrastimage.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.contrastimage">
- <refnamediv>
-  <refname>Imagick::contrastImage</refname>
-  <refpurpose>Change the contrast of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::contrastImage</methodname>
-   <methodparam><type>bool</type><parameter>sharpen</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enhances the intensity differences between the lighter and
-   darker elements of the image.  Set sharpen to a value other
-   than 0 to increase the image contrast otherwise the contrast
-   is reduced.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sharpen</parameter></term>
-     <listitem>
-      <para>
-      The sharpen value
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::contrastImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function contrastImage($imagePath, $contrastType) {
-    $imagick = new \Imagick(realpath($imagePath));
-    if ($contrastType != 2) {
-        $imagick->contrastImage($contrastType);
-    }
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/contraststretchimage.xml b/reference/imagick/imagick/contraststretchimage.xml
deleted file mode 100644
index 9f2305d5f14d..000000000000
--- a/reference/imagick/imagick/contraststretchimage.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.contraststretchimage">
- <refnamediv>
-  <refname>Imagick::contrastStretchImage</refname>
-  <refpurpose>Enhances the contrast of a color image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::contrastStretchImage</methodname>
-   <methodparam><type>float</type><parameter>black_point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>white_point</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Enhances the contrast of a color image by adjusting the pixels
-   color to span the entire range of colors available. &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>black_point</parameter></term>
-     <listitem>
-      <para>
-      The black point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>white_point</parameter></term>
-     <listitem>
-      <para>
-      The white point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. <constant>Imagick::CHANNEL_ALL</constant>. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/convolveimage.xml b/reference/imagick/imagick/convolveimage.xml
deleted file mode 100644
index 639c55f43689..000000000000
--- a/reference/imagick/imagick/convolveimage.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.convolveimage">
- <refnamediv>
-  <refname>Imagick::convolveImage</refname>
-  <refpurpose>Applies a custom convolution kernel to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::convolveImage</methodname>
-   <methodparam><type>array</type><parameter>kernel</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a custom convolution kernel to the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>kernel</parameter></term>
-     <listitem>
-      <para>
-      The convolution kernel
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::convolveImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function convolveImage($imagePath, $bias, $kernelMatrix) {
-    $imagick = new \Imagick(realpath($imagePath));    
-    //$edgeFindingKernel = [-1, -1, -1, -1, 8, -1, -1, -1, -1,];
-    $imagick->setImageBias($bias * \Imagick::getQuantum());
-    $imagick->convolveImage($kernelMatrix);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/count.xml b/reference/imagick/imagick/count.xml
deleted file mode 100644
index 4cff71e37dc6..000000000000
--- a/reference/imagick/imagick/count.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::count</refname>
-  <refpurpose>Get the number of images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::count</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of images.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      An unused argument. Currently there is a non-particularly well defined feature in PHP where calling count() on a countable object might (or might not) require this method to accept a parameter. This parameter is here to be conformant with the interface of countable, even though the param is not used.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of images.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/cropimage.xml b/reference/imagick/imagick/cropimage.xml
deleted file mode 100644
index f70368ccb893..000000000000
--- a/reference/imagick/imagick/cropimage.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.cropimage">
- <refnamediv>
-  <refname>Imagick::cropImage</refname>
-  <refpurpose>Extracts a region of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::cropImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Extracts a region of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      The width of the crop
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-      The height of the crop
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      The X coordinate of the cropped region's top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      The Y coordinate of the cropped region's top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::cropImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function cropImage($imagePath, $startX, $startY, $width, $height) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->cropImage($width, $height, $startX, $startY);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/cropthumbnailimage.xml b/reference/imagick/imagick/cropthumbnailimage.xml
deleted file mode 100644
index 94b66099b7fc..000000000000
--- a/reference/imagick/imagick/cropthumbnailimage.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.cropthumbnailimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::cropThumbnailImage</refname>
-  <refpurpose>Creates a crop thumbnail</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::cropThumbnailImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-  Creates a fixed size thumbnail by first scaling the image up or down and cropping a specified
-  area from the center.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the thumbnail
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The Height of the thumbnail
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>legacy</parameter></term>
-     <listitem>
-      <simpara>
-       Optional <type>bool</type> parameter.
-       If set to true, the calculations are done with the small rounding bug
-       that existed in Imagick before 3.4.0. If set to false, the calculations
-       should produce the same results as the ImageMagick command-line tools.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL imagick 3.4.0</entry>
-      <entry>
-       Added the <parameter>legacy</parameter> parameter.
-      </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/imagick/imagick/current.xml b/reference/imagick/imagick/current.xml
deleted file mode 100644
index 05e24dafe8d9..000000000000
--- a/reference/imagick/imagick/current.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.current">
- <refnamediv>
-  <refname>Imagick::current</refname>
-  <refpurpose>Returns a reference to the current Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::current</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns reference to the current imagick object with image pointer at the correct sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns self on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/cyclecolormapimage.xml b/reference/imagick/imagick/cyclecolormapimage.xml
deleted file mode 100644
index cb5e99c029dc..000000000000
--- a/reference/imagick/imagick/cyclecolormapimage.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.cyclecolormapimage">
- <refnamediv>
-  <refname>Imagick::cycleColormapImage</refname>
-  <refpurpose>Displaces an image's colormap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::cycleColormapImage</methodname>
-   <methodparam><type>int</type><parameter>displace</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Displaces an image's colormap by a given number of positions.  If you
-   cycle the colormap a number of times you can produce a psychedelic
-   effect.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>displace</parameter></term>
-     <listitem>
-      <para>
-      The amount to displace the colormap.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/decipherimage.xml b/reference/imagick/imagick/decipherimage.xml
deleted file mode 100644
index 20bfc4facbcb..000000000000
--- a/reference/imagick/imagick/decipherimage.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.decipherimage">
- <refnamediv>
-  <refname>Imagick::decipherImage</refname>
-  <refpurpose>Deciphers an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::decipherImage</methodname>
-   <methodparam><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Deciphers image that has been enciphered before. The image must be enciphered
-   using <function>Imagick::encipherImage</function>.
-   &imagick.method.available.0x639;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>passphrase</parameter></term>
-     <listitem>
-      <para>
-       The passphrase
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::encipherImage</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/imagick/imagick/deconstructimages.xml b/reference/imagick/imagick/deconstructimages.xml
deleted file mode 100644
index 5b0fd7a88b9f..000000000000
--- a/reference/imagick/imagick/deconstructimages.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.deconstructimages">
- <refnamediv>
-  <refname>Imagick::deconstructImages</refname>
-  <refpurpose>Returns certain pixel differences between images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::deconstructImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Compares each image with the next in a sequence and returns the maximum
-   bounding region of any pixel differences it discovers.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/deleteimageartifact.xml b/reference/imagick/imagick/deleteimageartifact.xml
deleted file mode 100644
index 5d2f309d6052..000000000000
--- a/reference/imagick/imagick/deleteimageartifact.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.deleteimageartifact">
- <refnamediv>
-  <refname>Imagick::deleteImageArtifact</refname>
-  <refpurpose>Delete image artifact</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::deleteImageArtifact</methodname>
-   <methodparam><type>string</type><parameter>artifact</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes an artifact associated with the image.  The difference between image properties and 
-   image artifacts is that properties are public and artifacts are private.
-   &imagick.method.available.0x657;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>artifact</parameter></term>
-     <listitem>
-      <para>
-       The name of the artifact to delete
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setImageArtifact</function></member>
-    <member><function>Imagick::getImageArtifact</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/imagick/imagick/deleteimageproperty.xml b/reference/imagick/imagick/deleteimageproperty.xml
deleted file mode 100644
index 6710cf07f07a..000000000000
--- a/reference/imagick/imagick/deleteimageproperty.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.deleteimageproperty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::deleteImageProperty</refname>
-  <refpurpose>Deletes an image property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::deleteImageProperty</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes an image property.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name of the property to delete.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/deskewimage.xml b/reference/imagick/imagick/deskewimage.xml
deleted file mode 100644
index 9d0bc7866da9..000000000000
--- a/reference/imagick/imagick/deskewimage.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.deskewimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::deskewImage</refname>
-  <refpurpose>Removes skew from the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::deskewImage</methodname>
-   <methodparam><type>float</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method can be used to remove skew from for example scanned images where the paper
-   was not properly placed on the scanning surface. &imagick.method.available.0x645;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-       Deskew threshold
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::deskewImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function deskewImage($threshold) {
-    $imagick = new \Imagick(realpath("images/NYTimes-Page1-11-11-1918.jpg"));
-    $deskewImagick = clone $imagick;
-    
-    //This is the only thing required for deskewing.
-    $deskewImagick->deskewImage($threshold);
-
-    //The rest of this example is to make the result obvious - because
-    //otherwise the result is not obvious.
-    $trim = 9;
-
-    $deskewImagick->cropImage($deskewImagick->getImageWidth() - $trim, $deskewImagick->getImageHeight(), $trim, 0);
-    $imagick->cropImage($imagick->getImageWidth() - $trim, $imagick->getImageHeight(), $trim, 0);
-    $deskewImagick->resizeimage($deskewImagick->getImageWidth() / 2, $deskewImagick->getImageHeight() / 2, \Imagick::FILTER_LANCZOS, 1);
-    $imagick->resizeimage($imagick->getImageWidth() / 2, $imagick->getImageHeight() / 2, \Imagick::FILTER_LANCZOS, 1);
-    $newCanvas = new \Imagick();
-    $newCanvas->newimage($imagick->getImageWidth() + $deskewImagick->getImageWidth() + 20, $imagick->getImageHeight(), 'red', 'jpg');
-    $newCanvas->compositeimage($imagick, \Imagick::COMPOSITE_COPY, 5, 0);
-    $newCanvas->compositeimage($deskewImagick, \Imagick::COMPOSITE_COPY, $imagick->getImageWidth() + 10, 0);
-
-    header("Content-Type: image/jpg");
-    echo $newCanvas->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/despeckleimage.xml b/reference/imagick/imagick/despeckleimage.xml
deleted file mode 100644
index 7d16a26252e6..000000000000
--- a/reference/imagick/imagick/despeckleimage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.despeckleimage">
- <refnamediv>
-  <refname>Imagick::despeckleImage</refname>
-  <refpurpose>Reduces the speckle noise in an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::despeckleImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Reduces the speckle noise in an image while preserving the edges of the original image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-    <example>
-      <title> <function>Imagick::despeckleImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function despeckleImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->despeckleImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/destroy.xml b/reference/imagick/imagick/destroy.xml
deleted file mode 100644
index 71ba57ad137c..000000000000
--- a/reference/imagick/imagick/destroy.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.destroy">
- <refnamediv>
-  <refname>Imagick::destroy</refname>
-  <refpurpose>Destroys the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::destroy</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Destroys the Imagick object and frees all resources associated with it. 
-   This method is deprecated in favour of <link linkend="imagick.clear">Imagick::clear</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/displayimage.xml b/reference/imagick/imagick/displayimage.xml
deleted file mode 100644
index d72fb78a92bc..000000000000
--- a/reference/imagick/imagick/displayimage.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.displayimage">
- <refnamediv>
-  <refname>Imagick::displayImage</refname>
-  <refpurpose>Displays an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::displayImage</methodname>
-   <methodparam><type>string</type><parameter>servername</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method displays an image on a X server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servername</parameter></term>
-     <listitem>
-      <para>
-       The X server name
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/displayimages.xml b/reference/imagick/imagick/displayimages.xml
deleted file mode 100644
index d4cc2cac82e6..000000000000
--- a/reference/imagick/imagick/displayimages.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.displayimages">
- <refnamediv>
-  <refname>Imagick::displayImages</refname>
-  <refpurpose>Displays an image or image sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::displayImages</methodname>
-   <methodparam><type>string</type><parameter>servername</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Displays an image or image sequence on a X server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servername</parameter></term>
-     <listitem>
-      <para>
-       The X server name
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/distortimage.xml b/reference/imagick/imagick/distortimage.xml
deleted file mode 100644
index f5095741bb79..000000000000
--- a/reference/imagick/imagick/distortimage.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.distortimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::distortImage</refname>
-  <refpurpose>Distorts an image using various distortion methods</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::distortImage</methodname>
-   <methodparam><type>int</type><parameter>method</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arguments</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>bestfit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Distorts an image using various distortion methods, by mapping color
-   lookups of the source image to a new destination image usually of the same
-   size as the source image, unless 'bestfit' is set to &true;.
-  </para>
-  <para>
-   If 'bestfit' is enabled, and distortion allows it, the destination image
-   is adjusted to ensure the whole source 'image' will just fit within the
-   final destination image, which will be sized and offset accordingly. Also
-   in many cases the virtual offset of the source image will be taken into
-   account in the mapping.
-  </para>
-  <para>
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-       The method of image distortion. See <link 
-       linkend="imagick.constants.distortion">distortion constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arguments</parameter></term>
-     <listitem>
-      <para>
-       The arguments for this distortion method
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bestfit</parameter></term>
-     <listitem>
-      <para>
-       Attempt to resize destination to fit distorted source
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::distortImage</function>:</title>
-    <para>
-     Distort an image and display to the browser.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create new object */
-$im = new Imagick();
-
-/* Create new checkerboard pattern */
-$im->newPseudoImage(100, 100, "pattern:checkerboard");
-
-/* Set the image format to png */
-$im->setImageFormat('png');
-
-/* Fill new visible areas with transparent */
-$im->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-
-/* Activate matte */
-$im->setImageMatte(true);
-
-/* Control points for the distortion */
-$controlPoints = array( 10, 10, 
-                        10, 5,
-
-                        10, $im->getImageHeight() - 20,
-                        10, $im->getImageHeight() - 5,
-
-                        $im->getImageWidth() - 10, 10,
-                        $im->getImageWidth() - 10, 20,
-
-                        $im->getImageWidth() - 10, $im->getImageHeight() - 10,
-                        $im->getImageWidth() - 10, $im->getImageHeight() - 30);
-
-/* Perform the distortion */                       
-$im->distortImage(Imagick::DISTORTION_PERSPECTIVE, $controlPoints, true);
-
-/* Output the image */
-header("Content-Type: image/png");
-echo $im;
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Using Imagick::distortImage()</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/distortImage.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::blurImage</function></member>
-    <member><function>Imagick::motionBlurImage</function></member>
-    <member><function>Imagick::radialBlurImage</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/imagick/imagick/drawimage.xml b/reference/imagick/imagick/drawimage.xml
deleted file mode 100644
index 5e211b2b59e3..000000000000
--- a/reference/imagick/imagick/drawimage.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.drawimage">
- <refnamediv>
-  <refname>Imagick::drawImage</refname>
-  <refpurpose>Renders the ImagickDraw object on the current image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::drawImage</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>draw</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Renders the ImagickDraw object on the current image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>draw</parameter></term>
-     <listitem>
-      <para>
-      The drawing operations to render on the image.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/edgeimage.xml b/reference/imagick/imagick/edgeimage.xml
deleted file mode 100644
index d37ecdddc6e4..000000000000
--- a/reference/imagick/imagick/edgeimage.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.edgeimage">
- <refnamediv>
-  <refname>Imagick::edgeImage</refname>
-  <refpurpose>Enhance edges within the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::edgeImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enhance edges within the image with a convolution filter of the given
-   radius. Use radius 0 and it will be auto-selected.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the operation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::edgeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function edgeImage($imagePath, $radius) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->edgeImage($radius);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/embossimage.xml b/reference/imagick/imagick/embossimage.xml
deleted file mode 100644
index 35fb70e9422f..000000000000
--- a/reference/imagick/imagick/embossimage.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.embossimage">
- <refnamediv>
-  <refname>Imagick::embossImage</refname>
-  <refpurpose>Returns a grayscale image with a three-dimensional effect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::embossImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a grayscale image with a three-dimensional effect.  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 it will choose a suitable radius for you.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the effect
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-      The sigma of the effect
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::embossImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function embossImage($imagePath, $radius, $sigma) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->embossImage($radius, $sigma);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/encipherimage.xml b/reference/imagick/imagick/encipherimage.xml
deleted file mode 100644
index 55a854e20704..000000000000
--- a/reference/imagick/imagick/encipherimage.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.encipherimage">
- <refnamediv>
-  <refname>Imagick::encipherImage</refname>
-  <refpurpose>Enciphers an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::encipherImage</methodname>
-   <methodparam><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Converts plain pixels to enciphered pixels. The image is not readable
-   until it has been deciphered using <function>Imagick::decipherImage</function>
-   &imagick.method.available.0x639;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>passphrase</parameter></term>
-     <listitem>
-      <para>
-       The passphrase
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::decipherImage</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/imagick/imagick/enhanceimage.xml b/reference/imagick/imagick/enhanceimage.xml
deleted file mode 100644
index 56c061171a57..000000000000
--- a/reference/imagick/imagick/enhanceimage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.enhanceimage">
- <refnamediv>
-  <refname>Imagick::enhanceImage</refname>
-  <refpurpose>Improves the quality of a noisy image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::enhanceImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::enhanceImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function enhanceImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->enhanceImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/equalizeimage.xml b/reference/imagick/imagick/equalizeimage.xml
deleted file mode 100644
index a4404706dd3c..000000000000
--- a/reference/imagick/imagick/equalizeimage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.equalizeimage">
- <refnamediv>
-  <refname>Imagick::equalizeImage</refname>
-  <refpurpose>Equalizes the image histogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::equalizeImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Equalizes the image histogram.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-    <example>
-      <title> <function>Imagick::equalizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function equalizeImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->equalizeImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/evaluateimage.xml b/reference/imagick/imagick/evaluateimage.xml
deleted file mode 100644
index 7a9b0ca277ed..000000000000
--- a/reference/imagick/imagick/evaluateimage.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.evaluateimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::evaluateImage</refname>
-  <refpurpose>Applies an expression to an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::evaluateImage</methodname>
-   <methodparam><type>int</type><parameter>op</parameter></methodparam>
-   <methodparam><type>float</type><parameter>constant</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Applies an arithmetic, relational, or logical expression to an image.  Use
-   these operators to lighten or darken an image, to increase or decrease
-   contrast in an image, or to produce the "negative" of an image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>op</parameter></term>
-     <listitem>
-      <para>
-      The evaluation operator
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>constant</parameter></term>
-     <listitem>
-      <para>
-      The value of the operator
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-  <example>
-   <title>Using <function>Imagick::evaluateImage</function></title>
-   <para>
-    Using evaluateImage to reduce opacity in an image.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Create new object with the image
-$im = new Imagick('example-alpha.png');
-
-// Reduce the alpha by 50%
-$im->evaluateImage(Imagick::EVALUATE_DIVIDE, 2, Imagick::CHANNEL_ALPHA);
-
-// Output the image
-header("Content-Type: image/png");
-echo $im;
-?>
-]]>
-   </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/imagick/imagick/exportimagepixels.xml b/reference/imagick/imagick/exportimagepixels.xml
deleted file mode 100644
index 7f35f8ea226a..000000000000
--- a/reference/imagick/imagick/exportimagepixels.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.exportimagepixels" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::exportImagePixels</refname>
-  <refpurpose>Exports raw image pixels</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::exportImagePixels</methodname>
-   <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>
-   <methodparam><type>string</type><parameter>map</parameter></methodparam>
-   <methodparam><type>int</type><parameter>STORAGE</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Exports image pixels into an array. The map defines the ordering of the exported 
-   pixels. The size of the returned array is <literal>width * height * strlen(map)</literal>.
-   &imagick.method.available.0x647;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X-coordinate of the exported area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y-coordinate of the exported area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       Width of the exported aread
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       Height of the exported area
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>map</parameter></term>
-     <listitem>
-      <para>
-       Ordering of the exported pixels. For example <literal>"RGB"</literal>. 
-       Valid characters for the map are R, G, B, A, O, C, Y, M, K, I and P.    
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>STORAGE</parameter></term>
-     <listitem>
-      <para>
-       Refer to this list of <link linkend="imagick.constants.pixel">pixel type constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::exportImagePixels</function></title>
-    <para>
-     Export image pixels into an array
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create new object */
-$im = new Imagick();
-
-/* Create new image */
-$im->newPseudoImage(0, 0, "magick:rose");
-
-/* Export the image pixels */
-$pixels = $im->exportImagePixels(10, 10, 2, 2, "RGB", Imagick::PIXEL_CHAR);
-
-/* Output */
-var_dump($pixels);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(12) {
-  [0]=>
-  int(72)
-  [1]=>
-  int(64)
-  [2]=>
-  int(57)
-  [3]=>
-  int(69)
-  [4]=>
-  int(59)
-  [5]=>
-  int(43)
-  [6]=>
-  int(124)
-  [7]=>
-  int(120)
-  [8]=>
-  int(-96)
-  [9]=>
-  int(91)
-  [10]=>
-  int(84)
-  [11]=>
-  int(111)
-}
-]]>
-    </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/imagick/imagick/extentimage.xml b/reference/imagick/imagick/extentimage.xml
deleted file mode 100644
index df5a9486d19d..000000000000
--- a/reference/imagick/imagick/extentimage.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.extentimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::extentImage</refname>
-  <refpurpose>Set image size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::extentImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Comfortability method for setting image size. The method sets the image size and allows
-   setting x,y coordinates where the new area begins.
-   &imagick.method.available.0x631;
-  </para>
-
-  <caution>
-   <simpara>
-  Prior to ImageMagick 6.5.7-8 (1623), $x was positive when shifting to the left and negative when shifting to the right, and $y was positive when shifting an image up and negative when shifting an image down.
-
-  Somewhere between ImageMagick 6.3.7 (1591) and ImageMagick 6.5.7-8 (1623), the axes of $x and $y were flipped, so that $x was negative when shifting to the left and positive when shifting to the right, and $y was negative when shifting an image up and positive when shifting an image down.
-
-  Somewhere between ImageMagick 6.5.7-8 (1623) and ImageMagick 6.6.9-7 (1641), the axes of $x and $y were flipped back to pre-ImageMagick 6.5.7-8 (1623) functionality.
-
-   </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The new width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The new height
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X position for the new size
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y position for the new size
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::resizeImage</function></member>
-    <member><function>Imagick::thumbnailImage</function></member>
-    <member><function>Imagick::cropImage</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/imagick/imagick/filter.xml b/reference/imagick/imagick/filter.xml
deleted file mode 100644
index 4ed48422f747..000000000000
--- a/reference/imagick/imagick/filter.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.filter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::filter</refname>
-  <refpurpose>Applies a custom convolution kernel to the image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::filter</methodname>
-   <methodparam><type>ImagickKernel</type><parameter>ImagickKernel</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_UNDEFINED</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a custom convolution kernel to the image.
-  </para>
-
- 
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ImagickKernel</parameter></term>
-    <listitem>
-     <para>
-      An instance of ImagickKernel that represents either a single kernel or a linked series of kernels.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      &imagick.parameter.channel;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::filter</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function filter($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $matrix = [
-        [-1, 0, -1],
-        [0,  5,  0],
-        [-1, 0, -1],
-    ];
-    
-    $kernel = \ImagickKernel::fromMatrix($matrix);
-    $strength = 0.5;    
-    $kernel->scale($strength, \Imagick::NORMALIZE_KERNEL_VALUE);    
-    $kernel->addUnityKernel(1 - $strength);
-
-    $imagick->filter($kernel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/flattenimages.xml b/reference/imagick/imagick/flattenimages.xml
deleted file mode 100644
index 9aa556a69c08..000000000000
--- a/reference/imagick/imagick/flattenimages.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.flattenimages">
- <refnamediv>
-  <refname>Imagick::flattenImages</refname>
-  <refpurpose>Merges a sequence of images</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::flattenImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Merges a sequence of images.  This is useful for combining Photoshop layers into a single image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/flipimage.xml b/reference/imagick/imagick/flipimage.xml
deleted file mode 100644
index eb264745970f..000000000000
--- a/reference/imagick/imagick/flipimage.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.flipimage">
- <refnamediv>
-  <refname>Imagick::flipImage</refname>
-  <refpurpose>Creates a vertical mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::flipImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Creates a vertical mirror image by reflecting the pixels around the central x-axis.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-    <example>
-      <title> <function>Imagick::flipImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function flipImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->flipImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Imagick::flopimage</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/imagick/imagick/floodfillpaintimage.xml b/reference/imagick/imagick/floodfillpaintimage.xml
deleted file mode 100644
index 38be9a2fb508..000000000000
--- a/reference/imagick/imagick/floodfillpaintimage.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.floodfillpaintimage">
- <refnamediv>
-  <refname>Imagick::floodFillPaintImage</refname>
-  <refpurpose>Changes the color value of any pixel that matches target</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::floodFillPaintImage</methodname>
-   <methodparam><type>mixed</type><parameter>fill</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>target</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>invert</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Changes the color value of any pixel that matches target and is an
-   immediate neighbor. This method is a replacement for deprecated 
-   <function>Imagick::paintFloodFillImage</function>.
-   &imagick.method.available.0x638;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the fill color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.fuzz;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>target</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the target color to paint
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>invert</parameter></term>
-     <listitem>
-      <para>
-       If &true; paints any pixel that does not match the target color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>Imagick::floodfillPaintImage</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create new imagick object */
-$im = new Imagick();
-
-/* create red, green and blue images */
-$im->newImage(100, 50, "red");
-$im->newImage(100, 50, "green");
-$im->newImage(100, 50, "blue");
-
-/* Append the images into one */
-$im->resetIterator();
-$combined = $im->appendImages(true);
-
-/* Save the intermediate image for comparison */
-$combined->writeImage("floodfillpaint_intermediate.png");
-
-/* The target pixel to paint */
-$x = 1;
-$y = 1;
-
-/* Get the color we are painting */
-$target = $combined->getImagePixelColor($x, $y);
-
-/* Paints pixel in position 1,1 black and all neighboring 
-   pixels that match the target color */
-$combined->floodfillPaintImage("black", 1, $target, $x, $y, false);
-
-/* Save the result */
-$combined->writeImage("floodfillpaint_result.png");
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Imagick::floodfillPaintImage()</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/floodfillpaint_intermediate.png"/>
-     </imageobject>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/floodfillpaint_result.png"/>
-     </imageobject>
-    </mediaobject>
-   </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/imagick/imagick/flopimage.xml b/reference/imagick/imagick/flopimage.xml
deleted file mode 100644
index 708bdc923153..000000000000
--- a/reference/imagick/imagick/flopimage.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.flopimage">
- <refnamediv>
-  <refname>Imagick::flopImage</refname>
-  <refpurpose>Creates a horizontal mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::flopImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Creates a horizontal mirror image by reflecting the pixels around the central y-axis.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-    <example>
-      <title> <function>Imagick::flopImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function flopImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->flopImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Imagick::flipimage</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/imagick/imagick/forwardfouriertransformimage.xml b/reference/imagick/imagick/forwardfouriertransformimage.xml
deleted file mode 100644
index 5523a36a5fd1..000000000000
--- a/reference/imagick/imagick/forwardfouriertransformimage.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.forwardfouriertransformimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::forwardFourierTransformImage</refname>
-  <refpurpose>Implements the discrete Fourier transform (DFT)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::forwardFourierTransformimage</methodname>
-   <methodparam><type>bool</type><parameter>magnitude</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Implements the discrete Fourier transform (DFT) of the image either as a magnitude / phase or real / imaginary image pair.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>magnitude</parameter></term>
-    <listitem>
-     <para>
-      If true, return as magnitude / phase pair otherwise a real / imaginary image pair.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::forwardFourierTransformImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-//Utility function for forwardTransformImage
-function createMask() {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(0);
-    $draw->setStrokeColor('rgb(255, 255, 255)');
-    $draw->setFillColor('rgb(255, 255, 255)');
-
-    //Draw a circle on the y-axis, with its centre
-    //at x, y that touches the origin
-    $draw->circle(250, 250, 220, 250);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(512, 512, "black");
-    $imagick->drawImage($draw);
-    $imagick->gaussianBlurImage(20, 20);
-    $imagick->autoLevelImage();
-
-    return $imagick;
-}
-
-
-function forwardFourierTransformImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->resizeimage(512, 512, \Imagick::FILTER_LANCZOS, 1);
-
-    $mask = createMask();
-    $imagick->forwardFourierTransformImage(true);
-
-    @$imagick->setimageindex(0);
-    $magnitude = $imagick->getimage();
-
-    @$imagick->setimageindex(1);
-    $imagickPhase = $imagick->getimage();
-
-    if (true) {
-        $imagickPhase->compositeImage($mask, \Imagick::COMPOSITE_MULTIPLY, 0, 0);
-    }
-
-    if (false) {
-        $output = clone $imagickPhase;
-        $output->setimageformat('png');
-        header("Content-Type: image/png");
-        echo $output->getImageBlob();
-    }
-
-    $magnitude->inverseFourierTransformImage($imagickPhase, true);
-
-    $magnitude->setimageformat('png');
-    header("Content-Type: image/png");
-    echo $magnitude->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/frameimage.xml b/reference/imagick/imagick/frameimage.xml
deleted file mode 100644
index 72909d03aa8a..000000000000
--- a/reference/imagick/imagick/frameimage.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.frameimage">
- <refnamediv>
-  <refname>Imagick::frameImage</refname>
-  <refpurpose>Adds a simulated three-dimensional border</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::frameImage</methodname>
-   <methodparam><type>mixed</type><parameter>matte_color</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>inner_bevel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>outer_bevel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a simulated three-dimensional border around the image.
-   The width and height specify the border width of the vertical
-   and horizontal sides of the frame.  The inner and outer
-   bevels indicate the width of the inner and outer shadows of
-   the frame.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matte_color</parameter></term>
-     <listitem>
-      <para>
-      ImagickPixel object or a string representing the matte color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      The width of the border
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-      The height of the border
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>inner_bevel</parameter></term>
-     <listitem>
-      <para>
-      The inner bevel width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>outer_bevel</parameter></term>
-     <listitem>
-      <para>
-      The outer bevel width
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::frameImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function frameImage($imagePath, $color, $width, $height, $innerBevel, $outerBevel) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $width = $width + $innerBevel + $outerBevel;
-    $height = $height + $innerBevel + $outerBevel;
-
-    $imagick->frameimage(
-        $color,
-        $width,
-        $height,
-        $innerBevel,
-        $outerBevel
-    );
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/functionimage.xml b/reference/imagick/imagick/functionimage.xml
deleted file mode 100644
index 6af43f6c47dc..000000000000
--- a/reference/imagick/imagick/functionimage.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.functionimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::functionImage</refname>
-  <refpurpose>Applies a function on the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::functionImage</methodname>
-   <methodparam><type>int</type><parameter>function</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arguments</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies an arithmetic, relational, or logical expression to a pseudo image.
-  </para>
-  <para>
-   See also <link xlink:href="&url.imagemagick.usage.transform.function;">ImageMagick
-   v6 Examples - Image Transformations — Function, Multi-Argument Evaluate</link>
-  </para>
-  <para>
-   &imagick.method.available.0x649;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>function</parameter></term>
-     <listitem>
-      <para>
-       Refer to this list of <link linkend="imagick.constants.function">function constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arguments</parameter></term>
-     <listitem>
-      <para>
-       Array of arguments to pass to this function.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Create a sinusoidal gradient</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$imagick = new Imagick();
-$imagick->newPseudoImage(200, 200, 'gradient:black-white');
-$arguments = array(3, -90);
-$imagick->functionImage(Imagick::FUNCTION_SINUSOID, $arguments);
-
-header("Content-Type: image/png");
-$imagick->setImageFormat("png");
-echo $imagick->getImageBlob();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of create a sinusoidal gradient</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/functionImage_sinusoidal.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-   
-   <example>
-    <title>Create a gradient from the polynomial (4x^2 - 4x + 1) </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$imagick = new Imagick();
-$imagick->newPseudoImage(200, 200, 'gradient:black-white');
-$arguments = array(4, -4, 1);
-$imagick->functionImage(Imagick::FUNCTION_POLYNOMIAL, $arguments);
-
-header("Content-Type: image/png");
-$imagick->setimageformat("png");
-echo $imagick->getImageBlob();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of create a polynomial gradient</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/functionImage_polynomial.png"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-
-   <example>
-    <title>
-     Create a complex gradient from the
-     polynomial (4x^2 - 4x^2 + 1) modulated by a sinusoidal gradient
-    </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$imagick1 = new Imagick();
-$imagick1->newPseudoImage(200, 200, 'gradient:black-white');
-$arguments = array(9, -90);
-$imagick1->functionImage(Imagick::FUNCTION_SINUSOID, $arguments);
-
-$imagick2 = new Imagick();
-$imagick2->newPseudoImage(200, 200, 'gradient:black-white');
-$arguments = array(0.5, 0);
-$imagick2->functionImage(Imagick::FUNCTION_SINUSOID, $arguments);
-$imagick1->compositeimage($imagick2, Imagick::COMPOSITE_MULTIPLY, 0, 0);
-
-header("Content-Type: image/png");
-$imagick1->setImageFormat("png");
-echo $imagick1->getImageBlob();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of create complex gradient</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/functionImage_multiplied.png"/>
-     </imageobject>
-    </mediaobject>
-   </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/imagick/imagick/fximage.xml b/reference/imagick/imagick/fximage.xml
deleted file mode 100644
index 82f863f705fa..000000000000
--- a/reference/imagick/imagick/fximage.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.fximage" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::fxImage</refname>
-  <refpurpose>Evaluate expression for each pixel in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::fxImage</methodname>
-   <methodparam><type>string</type><parameter>expression</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Evaluate expression for each pixel in the image. Consult <link
-   xlink:href="&url.imagemagick;script/fx.php">The Fx Special Effects Image
-   Operator</link> for more information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>expression</parameter></term>
-     <listitem>
-      <para>
-      The expression.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::fxImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function fxImage() {
-    $imagick = new \Imagick();
-    $imagick->newPseudoImage(200, 200, "xc:white");
-
-    $fx = 'xx=i-w/2; yy=j-h/2; rr=hypot(xx,yy); (.5-rr/140)*1.2+.5';
-    $fxImage = $imagick->fxImage($fx);
-
-    header("Content-Type: image/png");
-    $fxImage->setimageformat('png');
-    echo $fxImage->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/gammaimage.xml b/reference/imagick/imagick/gammaimage.xml
deleted file mode 100644
index d23283635e9f..000000000000
--- a/reference/imagick/imagick/gammaimage.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.gammaimage">
- <refnamediv>
-  <refname>Imagick::gammaImage</refname>
-  <refpurpose>Gamma-corrects an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::gammaImage</methodname>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Gamma-corrects an image.  The same image viewed on different devices will
-   have perceptual differences in the way the image's intensities are
-   represented on the screen.  Specify individual gamma levels for the red,
-   green, and blue channels, or adjust all three with the gamma parameter.
-   Values typically range from 0.8 to 2.3.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gamma</parameter></term>
-     <listitem>
-      <para>
-      The amount of gamma-correction.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::gammaImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function gammaImage($imagePath, $gamma, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->gammaImage($gamma, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/gaussianblurimage.xml b/reference/imagick/imagick/gaussianblurimage.xml
deleted file mode 100644
index 419b5125e683..000000000000
--- a/reference/imagick/imagick/gaussianblurimage.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.gaussianblurimage">
- <refnamediv>
-  <refname>Imagick::gaussianBlurImage</refname>
-  <refpurpose>Blurs an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::gaussianBlurImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Blurs an image.  We convolve the image with a Gaussian operator of the
-   given radius and standard deviation (sigma). For reasonable results, the
-   radius should be larger than sigma.  Use a radius of 0 and selects a
-   suitable radius for you.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the Gaussian, in pixels, not counting the center pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the Gaussian, in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::gaussianBlurImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function gaussianBlurImage($imagePath, $radius, $sigma, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->gaussianBlurImage($radius, $sigma, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/getcolorspace.xml b/reference/imagick/imagick/getcolorspace.xml
deleted file mode 100644
index 6ae2e59631af..000000000000
--- a/reference/imagick/imagick/getcolorspace.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getcolorspace">
- <refnamediv>
-  <refname>Imagick::getColorspace</refname>
-  <refpurpose>Gets the colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getColorspace</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the global colorspace value.
-   &imagick.method.available.0x657;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer which can be compared against <link linkend="imagick.constants.colorspace">COLORSPACE constants</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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getcompression.xml b/reference/imagick/imagick/getcompression.xml
deleted file mode 100644
index a87396f334fa..000000000000
--- a/reference/imagick/imagick/getcompression.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getcompression">
- <refnamediv>
-  <refname>Imagick::getCompression</refname>
-  <refpurpose>Gets the object compression type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getCompression</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Gets the object compression type.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the compression 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/imagick/imagick/getcompressionquality.xml b/reference/imagick/imagick/getcompressionquality.xml
deleted file mode 100644
index 4d6fc24e6296..000000000000
--- a/reference/imagick/imagick/getcompressionquality.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getcompressionquality">
- <refnamediv>
-  <refname>Imagick::getCompressionQuality</refname>
-  <refpurpose>Gets the object compression quality</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getCompressionQuality</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Gets the object compression quality.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns integer describing the compression quality
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getcopyright.xml b/reference/imagick/imagick/getcopyright.xml
deleted file mode 100644
index d7d00bf3dfc5..000000000000
--- a/reference/imagick/imagick/getcopyright.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getcopyright">
- <refnamediv>
-  <refname>Imagick::getCopyright</refname>
-  <refpurpose>Returns the ImageMagick API copyright as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getCopyright</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick API copyright as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the copyright notice of Imagemagick and
-   Magickwand C API.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getfilename.xml b/reference/imagick/imagick/getfilename.xml
deleted file mode 100644
index 9035ac88826b..000000000000
--- a/reference/imagick/imagick/getfilename.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getfilename">
- <refnamediv>
-  <refname>Imagick::getFilename</refname>
-  <refpurpose>The filename associated with an image sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getFilename</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the filename associated with an image sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getfont.xml b/reference/imagick/imagick/getfont.xml
deleted file mode 100644
index 407cccd8b9f6..000000000000
--- a/reference/imagick/imagick/getfont.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getfont">
- <refnamediv>
-  <refname>Imagick::getFont</refname>
-  <refpurpose>Gets font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getFont</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the objects font property.
-   &imagick.method.available.0x637;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string containing the font name or &false; if not font is set.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setFont</function></member>
-    <member><function>ImagickDraw::setFont</function></member>
-    <member><function>ImagickDraw::getFont</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/imagick/imagick/getformat.xml b/reference/imagick/imagick/getformat.xml
deleted file mode 100644
index 7dc877cf531d..000000000000
--- a/reference/imagick/imagick/getformat.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getformat">
- <refnamediv>
-  <refname>Imagick::getFormat</refname>
-  <refpurpose>Returns the format of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getFormat</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the format of the Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the format of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getgravity.xml b/reference/imagick/imagick/getgravity.xml
deleted file mode 100644
index a4d6709de06b..000000000000
--- a/reference/imagick/imagick/getgravity.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getgravity">
- <refnamediv>
-  <refname>Imagick::getGravity</refname>
-  <refpurpose>Gets the gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getGravity</methodname>
-   <void />
-  </methodsynopsis>
-
-  <para>
-   Gets the global gravity property for the Imagick object.
-   &imagick.method.available.0x640;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the gravity property. Refer to the list of 
-   <link linkend="imagick.constants.gravity">gravity constants</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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/gethomeurl.xml b/reference/imagick/imagick/gethomeurl.xml
deleted file mode 100644
index e73225df6716..000000000000
--- a/reference/imagick/imagick/gethomeurl.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.gethomeurl">
- <refnamediv>
-  <refname>Imagick::getHomeURL</refname>
-  <refpurpose>Returns the ImageMagick home URL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getHomeURL</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick home URL.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a link to the imagemagick homepage.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimage.xml b/reference/imagick/imagick/getimage.xml
deleted file mode 100644
index 5d56989dc19a..000000000000
--- a/reference/imagick/imagick/getimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimage">
- <refnamediv>
-  <refname>Imagick::getImage</refname>
-  <refpurpose>Returns a new Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::getImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns a new Imagick object with the current image sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object with the current image sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagealphachannel.xml b/reference/imagick/imagick/getimagealphachannel.xml
deleted file mode 100644
index c61718eea1cf..000000000000
--- a/reference/imagick/imagick/getimagealphachannel.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagealphachannel">
- <refnamediv>
-  <refname>Imagick::getImageAlphaChannel</refname>
-  <refpurpose>Checks if the image has an alpha channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::getImageAlphaChannel</methodname>
-   <void />
-  </methodsynopsis>
-
-  <para>
-   Returns whether the image has an alpha channel.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the image has an alpha channel value and &false; if not,
-   i.e. the image is <acronym>RGB</acronym> rather than <acronym>RGBA</acronym>
-   or <acronym>CMYK</acronym> rather than <acronym>CMYKA</acronym>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </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 imagick 3.6.0</entry>
-      <entry>
-       Returns a &boolean; now; previously, an &integer; was returned.
-      </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/imagick/imagick/getimageartifact.xml b/reference/imagick/imagick/getimageartifact.xml
deleted file mode 100644
index 1aff02bb8c9d..000000000000
--- a/reference/imagick/imagick/getimageartifact.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageartifact">
- <refnamediv>
-  <refname>Imagick::getImageArtifact</refname>
-  <refpurpose>Get image artifact</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageArtifact</methodname>
-   <methodparam><type>string</type><parameter>artifact</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets an artifact associated with the image.  The difference between image properties and 
-   image artifacts is that properties are public and artifacts are private.
-   &imagick.method.available.0x657;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>artifact</parameter></term>
-     <listitem>
-      <para>
-       The name of the artifact
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the artifact value on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setImageArtifact</function></member>
-    <member><function>Imagick::deleteImageArtifact</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/imagick/imagick/getimageattribute.xml b/reference/imagick/imagick/getimageattribute.xml
deleted file mode 100644
index 5095ea9db140..000000000000
--- a/reference/imagick/imagick/getimageattribute.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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>Returns a named attribute</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageAttribute</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a named attribute.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      The key of the attribute to get.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagebackgroundcolor.xml b/reference/imagick/imagick/getimagebackgroundcolor.xml
deleted file mode 100644
index 2be924ff387f..000000000000
--- a/reference/imagick/imagick/getimagebackgroundcolor.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagebackgroundcolor">
- <refnamediv>
-  <refname>Imagick::getImageBackgroundColor</refname>
-  <refpurpose>Returns the image background color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>Imagick::getImageBackgroundColor</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image background color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an ImagickPixel set to the background color of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageblob.xml b/reference/imagick/imagick/getimageblob.xml
deleted file mode 100644
index 9cdc770c3a88..000000000000
--- a/reference/imagick/imagick/getimageblob.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageblob">
- <refnamediv>
-  <refname>Imagick::getImageBlob</refname>
-  <refpurpose>Returns the image sequence as a blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageBlob</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Implements direct to memory image formats.  It returns the image
-   sequence as a string.  The format of the image determines the
-   format of the returned blob (GIF, JPEG, PNG, etc.). To return a
-   different image format, use Imagick::setImageFormat().
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageblueprimary.xml b/reference/imagick/imagick/getimageblueprimary.xml
deleted file mode 100644
index 271f6d0efb04..000000000000
--- a/reference/imagick/imagick/getimageblueprimary.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageblueprimary">
- <refnamediv>
-  <refname>Imagick::getImageBluePrimary</refname>
-  <refpurpose>Returns the chromaticy blue primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageBluePrimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the chromaticity blue primary point for the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      The chromaticity blue primary x-point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      The chromaticity blue primary y-point.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array consisting of "x" and "y" coordinates of point.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagebordercolor.xml b/reference/imagick/imagick/getimagebordercolor.xml
deleted file mode 100644
index ad2150f4a6b2..000000000000
--- a/reference/imagick/imagick/getimagebordercolor.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagebordercolor">
- <refnamediv>
-  <refname>Imagick::getImageBorderColor</refname>
-  <refpurpose>Returns the image border color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>Imagick::getImageBorderColor</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image border color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechanneldepth.xml b/reference/imagick/imagick/getimagechanneldepth.xml
deleted file mode 100644
index 282bbccdd783..000000000000
--- a/reference/imagick/imagick/getimagechanneldepth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechanneldepth">
- <refnamediv>
-  <refname>Imagick::getImageChannelDepth</refname>
-  <refpurpose>Gets the depth for a particular image channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageChannelDepth</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Gets the depth for a particular image channel.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/getimagechanneldistortion.xml b/reference/imagick/imagick/getimagechanneldistortion.xml
deleted file mode 100644
index f531292e221f..000000000000
--- a/reference/imagick/imagick/getimagechanneldistortion.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechanneldistortion">
- <refnamediv>
-  <refname>Imagick::getImageChannelDistortion</refname>
-  <refpurpose>Compares image channels of an image to a reconstructed image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getImageChannelDistortion</methodname>
-   <methodparam><type>Imagick</type><parameter>reference</parameter></methodparam>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>metric</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Compares one or more image channels of an image to a reconstructed image
-   and returns the specified distortion metric.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>reference</parameter></term>
-     <listitem>
-      <para>
-      Imagick object to compare to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>metric</parameter></term>
-     <listitem>
-      <para>
-      One of the <link linkend="imagick.constants.metric">metric type constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechanneldistortions.xml b/reference/imagick/imagick/getimagechanneldistortions.xml
deleted file mode 100644
index f31b52125339..000000000000
--- a/reference/imagick/imagick/getimagechanneldistortions.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechanneldistortions">
- <refnamediv>
-  <refname>Imagick::getImageChannelDistortions</refname>
-  <refpurpose>Gets channel distortions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getImageChannelDistortions</methodname>
-   <methodparam><type>Imagick</type><parameter>reference</parameter></methodparam>
-   <methodparam><type>int</type><parameter>metric</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Compares one or more image channels of an image to a reconstructed image and returns the specified distortion metrics
-   &imagick.method.available.0x644;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>reference</parameter></term>
-     <listitem>
-      <para>
-       Imagick object containing the reference image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>metric</parameter></term>
-     <listitem>
-      <para>
-       Refer to this list of <link linkend="imagick.constants.metric">metric type constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>float</type> describing the channel distortion.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechannelextrema.xml b/reference/imagick/imagick/getimagechannelextrema.xml
deleted file mode 100644
index 6a7314520ccd..000000000000
--- a/reference/imagick/imagick/getimagechannelextrema.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechannelextrema">
- <refnamediv>
-  <refname>Imagick::getImageChannelExtrema</refname>
-  <refpurpose>Gets the extrema for one or more image channels</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageChannelExtrema</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the extrema for one or more image channels.  Return value is an
-   associative array with the keys "minima" and "maxima".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechannelkurtosis.xml b/reference/imagick/imagick/getimagechannelkurtosis.xml
deleted file mode 100644
index dc440f31045b..000000000000
--- a/reference/imagick/imagick/getimagechannelkurtosis.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.getimagechannelkurtosis" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::getImageChannelKurtosis</refname>
-  <refpurpose>The getImageChannelKurtosis purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageChannelKurtosis</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the kurtosis and skewness of a specific channel. &imagick.method.available.0x649;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with <literal>kurtosis</literal> and <literal>skewness</literal>
-   members.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechannelmean.xml b/reference/imagick/imagick/getimagechannelmean.xml
deleted file mode 100644
index 23d5e733330c..000000000000
--- a/reference/imagick/imagick/getimagechannelmean.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechannelmean">
- <refnamediv>
-  <refname>Imagick::getImageChannelMean</refname>
-  <refpurpose>Gets the mean and standard deviation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageChannelMean</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the mean and standard deviation of one or more image channels.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with <literal>"mean"</literal> and <literal>"standardDeviation"</literal>
-   members.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechannelrange.xml b/reference/imagick/imagick/getimagechannelrange.xml
deleted file mode 100644
index 32622523aca0..000000000000
--- a/reference/imagick/imagick/getimagechannelrange.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechannelrange">
- <refnamediv>
-  <refname>Imagick::getImageChannelRange</refname>
-  <refpurpose>Gets channel range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageChannelRange</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Gets the range for one or more image channels.
-   &imagick.method.available.0x640;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing minima and maxima values of the channel(s).
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagechannelstatistics.xml b/reference/imagick/imagick/getimagechannelstatistics.xml
deleted file mode 100644
index cf4dbdd7b87d..000000000000
--- a/reference/imagick/imagick/getimagechannelstatistics.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagechannelstatistics">
- <refnamediv>
-  <refname>Imagick::getImageChannelStatistics</refname>
-  <refpurpose>Returns statistics for each channel in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageChannelStatistics</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns statistics for each channel in the image.  The statistics include
-   the channel depth, its minima and maxima, the mean, and the standard
-   deviation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/getimageclipmask.xml b/reference/imagick/imagick/getimageclipmask.xml
deleted file mode 100644
index 3b8119f78c64..000000000000
--- a/reference/imagick/imagick/getimageclipmask.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageclipmask">
- <refnamediv>
-  <refname>Imagick::getImageClipMask</refname>
-  <refpurpose>Gets image clip mask</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::getImageClipMask</methodname>
-   <void />
-  </methodsynopsis>
-
-  <para>
-   Returns the image clip mask. The clip mask is an Imagick object containing the clip mask.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an Imagick object containing the clip mask.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagecolormapcolor.xml b/reference/imagick/imagick/getimagecolormapcolor.xml
deleted file mode 100644
index be239b42ae31..000000000000
--- a/reference/imagick/imagick/getimagecolormapcolor.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecolormapcolor">
- <refnamediv>
-  <refname>Imagick::getImageColormapColor</refname>
-  <refpurpose>Returns the color of the specified colormap index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>Imagick::getImageColormapColor</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the color of the specified colormap index.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-      The offset into the image colormap.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagecolors.xml b/reference/imagick/imagick/getimagecolors.xml
deleted file mode 100644
index 9c428bc15579..000000000000
--- a/reference/imagick/imagick/getimagecolors.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecolors">
- <refnamediv>
-  <refname>Imagick::getImageColors</refname>
-  <refpurpose>Gets the number of unique colors in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageColors</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the number of unique colors in the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <type>int</type>, the number of unique colors in the image.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagecolorspace.xml b/reference/imagick/imagick/getimagecolorspace.xml
deleted file mode 100644
index 830906fea287..000000000000
--- a/reference/imagick/imagick/getimagecolorspace.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecolorspace">
- <refnamediv>
-  <refname>Imagick::getImageColorspace</refname>
-  <refpurpose>Gets the image colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageColorspace</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image colorspace.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer which can be compared against <link linkend="imagick.constants.colorspace">COLORSPACE constants</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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagecompose.xml b/reference/imagick/imagick/getimagecompose.xml
deleted file mode 100644
index 7de0538f0b11..000000000000
--- a/reference/imagick/imagick/getimagecompose.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecompose">
- <refnamediv>
-  <refname>Imagick::getImageCompose</refname>
-  <refpurpose>Returns the composite operator associated with the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageCompose</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the composite operator associated with the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/getimagecompression.xml b/reference/imagick/imagick/getimagecompression.xml
deleted file mode 100644
index 1bc6e5a65a6b..000000000000
--- a/reference/imagick/imagick/getimagecompression.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecompression">
- <refnamediv>
-  <refname>Imagick::getImageCompression</refname>
-  <refpurpose>Gets the current image's compression type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageCompression</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Gets the current image's compression type.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the compression 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/imagick/imagick/getimagecompressionquality.xml b/reference/imagick/imagick/getimagecompressionquality.xml
deleted file mode 100644
index 6c887b843573..000000000000
--- a/reference/imagick/imagick/getimagecompressionquality.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagecompressionquality">
- <refnamediv>
-  <refname>Imagick::getImageCompressionQuality</refname>
-  <refpurpose>Gets the current image's compression quality</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageCompressionQuality</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Gets the current image's compression quality
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns integer describing the images compression quality
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagedelay.xml b/reference/imagick/imagick/getimagedelay.xml
deleted file mode 100644
index c9644d94abb9..000000000000
--- a/reference/imagick/imagick/getimagedelay.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagedelay">
- <refnamediv>
-  <refname>Imagick::getImageDelay</refname>
-  <refpurpose>Gets the image delay</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageDelay</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image delay.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image delay.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagedepth.xml b/reference/imagick/imagick/getimagedepth.xml
deleted file mode 100644
index d7cd2ed0e0b5..000000000000
--- a/reference/imagick/imagick/getimagedepth.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagedepth">
- <refnamediv>
-  <refname>Imagick::getImageDepth</refname>
-  <refpurpose>Gets the image depth</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageDepth</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image depth.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The image depth.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagedispose.xml b/reference/imagick/imagick/getimagedispose.xml
deleted file mode 100644
index 3da2a2d6aa68..000000000000
--- a/reference/imagick/imagick/getimagedispose.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagedispose">
- <refnamediv>
-  <refname>Imagick::getImageDispose</refname>
-  <refpurpose>Gets the image disposal method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageDispose</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image disposal method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the dispose method on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagedistortion.xml b/reference/imagick/imagick/getimagedistortion.xml
deleted file mode 100644
index eb3b207a7163..000000000000
--- a/reference/imagick/imagick/getimagedistortion.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagedistortion">
- <refnamediv>
-  <refname>Imagick::getImageDistortion</refname>
-  <refpurpose>Compares an image to a reconstructed image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getImageDistortion</methodname>
-   <methodparam><type>MagickWand</type><parameter>reference</parameter></methodparam>
-   <methodparam><type>int</type><parameter>metric</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Compares an image to a reconstructed image and returns the specified distortion
-   metric.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>reference</parameter></term>
-     <listitem>
-      <para>
-      Imagick object to compare to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>metric</parameter></term>
-     <listitem>
-      <para>
-      One of the <link linkend="imagick.constants.metric">metric type constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the distortion metric used on the image (or the best guess
-   thereof).
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageextrema.xml b/reference/imagick/imagick/getimageextrema.xml
deleted file mode 100644
index 6f0457178a64..000000000000
--- a/reference/imagick/imagick/getimageextrema.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageextrema">
- <refnamediv>
-  <refname>Imagick::getImageExtrema</refname>
-  <refpurpose>Gets the extrema for the image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageExtrema</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the extrema for the image.  Returns an associative array with the keys "min" and "max".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array with the keys "min" and "max".
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagefilename.xml b/reference/imagick/imagick/getimagefilename.xml
deleted file mode 100644
index 23c4461b7dd9..000000000000
--- a/reference/imagick/imagick/getimagefilename.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagefilename">
- <refnamediv>
-  <refname>Imagick::getImageFilename</refname>
-  <refpurpose>Returns the filename of a particular image in a sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageFilename</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the filename of a particular image in a sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string with the filename of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageformat.xml b/reference/imagick/imagick/getimageformat.xml
deleted file mode 100644
index 6fb7bf1f57a2..000000000000
--- a/reference/imagick/imagick/getimageformat.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageformat">
- <refnamediv>
-  <refname>Imagick::getImageFormat</refname>
-  <refpurpose>Returns the format of a particular image in a sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageFormat</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the format of a particular image in a sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the image format on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagegamma.xml b/reference/imagick/imagick/getimagegamma.xml
deleted file mode 100644
index 1e877c8ba218..000000000000
--- a/reference/imagick/imagick/getimagegamma.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagegamma">
- <refnamediv>
-  <refname>Imagick::getImageGamma</refname>
-  <refpurpose>Gets the image gamma</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getImageGamma</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image gamma.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image gamma on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagegeometry.xml b/reference/imagick/imagick/getimagegeometry.xml
deleted file mode 100644
index 0e65740b6369..000000000000
--- a/reference/imagick/imagick/getimagegeometry.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagegeometry">
- <refnamediv>
-  <refname>Imagick::getImageGeometry</refname>
-  <refpurpose>Gets the width and height as an associative array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageGeometry</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the width and height as an associative array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with the width/height of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title>Using <function>Imagick::getImageGeometry</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-$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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagegravity.xml b/reference/imagick/imagick/getimagegravity.xml
deleted file mode 100644
index f39636ebdc44..000000000000
--- a/reference/imagick/imagick/getimagegravity.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagegravity">
- <refnamediv>
-  <refname>Imagick::getImageGravity</refname>
-  <refpurpose>Gets the image gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageGravity</methodname>
-   <void />
-  </methodsynopsis>
-
-  <para>
-   Gets the current gravity value of the
-   image. Unlike <function>Imagick::getGravity</function>, this method
-   returns the gravity defined for the current image sequence.
-   &imagick.method.available.0x644;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the images gravity property. Refer to the list of 
-   <link linkend="imagick.constants.gravity">gravity constants</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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagegreenprimary.xml b/reference/imagick/imagick/getimagegreenprimary.xml
deleted file mode 100644
index 5291478427fe..000000000000
--- a/reference/imagick/imagick/getimagegreenprimary.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagegreenprimary">
- <refnamediv>
-  <refname>Imagick::getImageGreenPrimary</refname>
-  <refpurpose>Returns the chromaticy green primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageGreenPrimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the chromaticity green primary point. Returns an array with the keys "x" and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with the keys "x" and "y" on success, throws an
-   ImagickException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageheight.xml b/reference/imagick/imagick/getimageheight.xml
deleted file mode 100644
index 592e7a020ee0..000000000000
--- a/reference/imagick/imagick/getimageheight.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageheight">
- <refnamediv>
-  <refname>Imagick::getImageHeight</refname>
-  <refpurpose>Returns the image height</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageHeight</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image height.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image height in pixels.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagehistogram.xml b/reference/imagick/imagick/getimagehistogram.xml
deleted file mode 100644
index 17e1e1757dec..000000000000
--- a/reference/imagick/imagick/getimagehistogram.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagehistogram">
- <refnamediv>
-  <refname>Imagick::getImageHistogram</refname>
-  <refpurpose>Gets the image histogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageHistogram</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image histogram as an array of ImagickPixel objects.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image histogram as an array of ImagickPixel objects.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title>Generates  <function>Imagick::getImageHistogram</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function getColorStatistics($histogramElements, $colorChannel) {
-    $colorStatistics = [];
-
-    foreach ($histogramElements as $histogramElement) {
-        $color = $histogramElement->getColorValue($colorChannel);
-        $color = intval($color * 255);
-        $count = $histogramElement->getColorCount();
-
-        if (array_key_exists($color, $colorStatistics)) {
-            $colorStatistics[$color] += $count;
-        }
-        else {
-            $colorStatistics[$color] = $count;
-        }
-    }
-
-    ksort($colorStatistics);
-    
-    return $colorStatistics;
-}
-    
-
-
-function getImageHistogram($imagePath) {
-
-    $backgroundColor = 'black';
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeWidth(0); //make the lines be as thin as possible
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    $histogramWidth = 256;
-    $histogramHeight = 100; // the height for each RGB segment
-
-    $imagick = new \Imagick(realpath($imagePath));
-    //Resize the image to be small, otherwise PHP tends to run out of memory
-    //This might lead to bad results for images that are pathologically 'pixelly'
-    $imagick->adaptiveResizeImage(200, 200, true);
-    $histogramElements = $imagick->getImageHistogram();
-
-    $histogram = new \Imagick();
-    $histogram->newpseudoimage($histogramWidth, $histogramHeight * 3, 'xc:black');
-    $histogram->setImageFormat('png');
-
-    $getMax = function ($carry, $item)  {
-        if ($item > $carry) {
-            return $item;
-        }
-        return $carry;
-    };
-
-    $colorValues = [
-        'red' => getColorStatistics($histogramElements, \Imagick::COLOR_RED),
-        'lime' => getColorStatistics($histogramElements, \Imagick::COLOR_GREEN),
-        'blue' => getColorStatistics($histogramElements, \Imagick::COLOR_BLUE),
-    ];
-
-    $max = array_reduce($colorValues['red'] , $getMax, 0);
-    $max = array_reduce($colorValues['lime'] , $getMax, $max);
-    $max = array_reduce($colorValues['blue'] , $getMax, $max);
-
-    $scale =  $histogramHeight / $max;
-
-    $count = 0;
-    foreach ($colorValues as $color => $values) {
-        $draw->setstrokecolor($color);
-
-        $offset = ($count + 1) * $histogramHeight;
-
-        foreach ($values as $index => $value) {
-            $draw->line($index, $offset, $index, $offset - ($value * $scale));
-        }
-        $count++;
-    }
-
-    $histogram->drawImage($draw);
-    
-    header( "Content-Type: image/png" );
-    echo $histogram;
-}
-
-?>
-]]>
-      </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/imagick/imagick/getimageindex.xml b/reference/imagick/imagick/getimageindex.xml
deleted file mode 100644
index a54450f67104..000000000000
--- a/reference/imagick/imagick/getimageindex.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageindex">
- <refnamediv>
-  <refname>Imagick::getImageIndex</refname>
-  <refpurpose>Gets the index of the current active image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageIndex</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the index of the current active image within the Imagick object.
-   This method has been deprecated. See
-   <function>Imagick::getIteratorIndex</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer containing the index of the image in the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageinterlacescheme.xml b/reference/imagick/imagick/getimageinterlacescheme.xml
deleted file mode 100644
index 608173aad11c..000000000000
--- a/reference/imagick/imagick/getimageinterlacescheme.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageinterlacescheme">
- <refnamediv>
-  <refname>Imagick::getImageInterlaceScheme</refname>
-  <refpurpose>Gets the image interlace scheme</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageInterlaceScheme</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image interlace scheme.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the interlace scheme as an integer on success.
-   &imagick.imagickexception.throw;   
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageinterpolatemethod.xml b/reference/imagick/imagick/getimageinterpolatemethod.xml
deleted file mode 100644
index 491f47a74292..000000000000
--- a/reference/imagick/imagick/getimageinterpolatemethod.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageinterpolatemethod">
- <refnamediv>
-  <refname>Imagick::getImageInterpolateMethod</refname>
-  <refpurpose>Returns the interpolation method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageInterpolateMethod</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the interpolation method for the specified image. The method is one of 
-   the <constant>Imagick::INTERPOLATE_<replaceable>*</replaceable></constant> constants.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the interpolate method on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageiterations.xml b/reference/imagick/imagick/getimageiterations.xml
deleted file mode 100644
index eb0265a456d1..000000000000
--- a/reference/imagick/imagick/getimageiterations.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageiterations">
- <refnamediv>
-  <refname>Imagick::getImageIterations</refname>
-  <refpurpose>Gets the image iterations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageIterations</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image iterations.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image iterations as an integer.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagelength.xml b/reference/imagick/imagick/getimagelength.xml
deleted file mode 100644
index 13474f100b54..000000000000
--- a/reference/imagick/imagick/getimagelength.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagelength">
- <refnamediv>
-  <refname>Imagick::getImageLength</refname>
-  <refpurpose>Returns the image length in bytes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageLength</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image length in bytes
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an int containing the current image size.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::getImageLength</function>:</title>
-    <para>
-     Getting image length in bytes
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = new Imagick('test.jpg');
-echo $image->getImageLength() . ' bytes';
-?>
-]]>
-    </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/imagick/imagick/getimagematte.xml b/reference/imagick/imagick/getimagematte.xml
deleted file mode 100644
index 881b6146931e..000000000000
--- a/reference/imagick/imagick/getimagematte.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagematte">
- <refnamediv>
-  <refname>Imagick::getImageMatte</refname>
-  <refpurpose>Return if the image has a matte channel</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::getImageMatte</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Returns &true; if the image has a matte channel otherwise false.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/getimagemattecolor.xml b/reference/imagick/imagick/getimagemattecolor.xml
deleted file mode 100644
index 317790ab3ab2..000000000000
--- a/reference/imagick/imagick/getimagemattecolor.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagemattecolor">
- <refnamediv>
-  <refname>Imagick::getImageMatteColor</refname>
-  <refpurpose>Returns the image matte color</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>Imagick::getImageMatteColor</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image matte color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns ImagickPixel object on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagemimetype.xml b/reference/imagick/imagick/getimagemimetype.xml
deleted file mode 100644
index a4b7e3c70b58..000000000000
--- a/reference/imagick/imagick/getimagemimetype.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.getimagemimetype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::getImageMimeType</refname>
-  <refpurpose>Returns the image mime-type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageMimeType</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the image mime-type.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageorientation.xml b/reference/imagick/imagick/getimageorientation.xml
deleted file mode 100644
index d1beff313310..000000000000
--- a/reference/imagick/imagick/getimageorientation.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageorientation">
- <refnamediv>
-  <refname>Imagick::getImageOrientation</refname>
-  <refpurpose>Gets the image orientation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageOrientation</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Gets the image orientation. The return value is one of the <link
-   linkend="imagick.constants.orientation">orientation constants</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an int on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagepage.xml b/reference/imagick/imagick/getimagepage.xml
deleted file mode 100644
index 447e96699c5f..000000000000
--- a/reference/imagick/imagick/getimagepage.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagepage">
- <refnamediv>
-  <refname>Imagick::getImagePage</refname>
-  <refpurpose>Returns the page geometry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImagePage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the page geometry associated with the image in an array with the
-   keys "width", "height", "x", and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the page geometry associated with the image in an array with the
-   keys "width", "height", "x", and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagepixelcolor.xml b/reference/imagick/imagick/getimagepixelcolor.xml
deleted file mode 100644
index c5768690c897..000000000000
--- a/reference/imagick/imagick/getimagepixelcolor.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagepixelcolor">
- <refnamediv>
-  <refname>Imagick::getImagePixelColor</refname>
-  <refpurpose>Returns the color of the specified pixel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>Imagick::getImagePixelColor</methodname>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the color of the specified pixel.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      The x-coordinate of the pixel
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      The y-coordinate of the pixel
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an ImagickPixel instance for the color at the coordinates given.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageprofile.xml b/reference/imagick/imagick/getimageprofile.xml
deleted file mode 100644
index 5189bbf5d155..000000000000
--- a/reference/imagick/imagick/getimageprofile.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageprofile">
- <refnamediv>
-  <refname>Imagick::getImageProfile</refname>
-  <refpurpose>Returns the named image profile</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageProfile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the named image profile.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      The name of the profile to return.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the image profile.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageprofiles.xml b/reference/imagick/imagick/getimageprofiles.xml
deleted file mode 100644
index 7e5f7c1608c5..000000000000
--- a/reference/imagick/imagick/getimageprofiles.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageprofiles">
- <refnamediv>
-  <refname>Imagick::getImageProfiles</refname>
-  <refpurpose>Returns the image profiles</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageProfiles</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>include_values</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Returns all associated profiles that match the pattern. If &false; is passed as second parameter
-   only the profile names are returned. &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-      The pattern for profile names.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>include_values</parameter></term>
-     <listitem>
-      <para>
-      Whether to return only profile names. If &false; then only profile names will be returned.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the image profiles or profile names.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageproperties.xml b/reference/imagick/imagick/getimageproperties.xml
deleted file mode 100644
index d8e708de27bc..000000000000
--- a/reference/imagick/imagick/getimageproperties.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.getimageproperties" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::getImageProperties</refname>
-  <refpurpose>Returns the image properties</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageProperties</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>include_values</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Returns all associated properties that match the pattern. If &false; is passed as second parameter
-   only the property names are returned. &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-      The pattern for property names.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>include_values</parameter></term>
-     <listitem>
-      <para>
-      Whether to return only property names. If &false; then only property names will be returned.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns an array containing the image properties or property names.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::getImageProperties</function>:</title>
-    <para>
-     An example of extracting EXIF information.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create the object */
-$im = new imagick("/path/to/example.jpg");
-
-/* Get the EXIF information */
-$exifArray = $im->getImageProperties("exif:*");
-
-/* Loop through the EXIF properties */
-foreach ($exifArray as $name => $property)
-{
-    echo "{$name} => {$property}<br />\n"; 
-}
-
-?>
-]]>
-    </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/imagick/imagick/getimageproperty.xml b/reference/imagick/imagick/getimageproperty.xml
deleted file mode 100644
index 93b62655d9c4..000000000000
--- a/reference/imagick/imagick/getimageproperty.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageproperty">
- <refnamediv>
-  <refname>Imagick::getImageProperty</refname>
-  <refpurpose>Returns the named image property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageProperty</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Returns the named image property. &imagick.method.available.0x632;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       name of the property (for example Exif:DateTime) 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </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>
-   <example>
-    <title>Using <function>Imagick::getImageProperty</function>:</title>
-    <para>
-     Setting and getting image property
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = new Imagick();
-$image->newImage(300, 200, "black");
-
-$image->setImageProperty('Exif:Make', 'Imagick');
-echo $image->getImageProperty('Exif:Make');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setImageProperty</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/imagick/imagick/getimageredprimary.xml b/reference/imagick/imagick/getimageredprimary.xml
deleted file mode 100644
index c63f6a7be307..000000000000
--- a/reference/imagick/imagick/getimageredprimary.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageredprimary">
- <refnamediv>
-  <refname>Imagick::getImageRedPrimary</refname>
-  <refpurpose>Returns the chromaticity red primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageRedPrimary</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the chromaticity red primary point as an array with the keys "x" and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns the chromaticity red primary point as an array with the keys "x"
-    and "y".
-    &imagick.imagickexception.throw;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageregion.xml b/reference/imagick/imagick/getimageregion.xml
deleted file mode 100644
index f18015937d28..000000000000
--- a/reference/imagick/imagick/getimageregion.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageregion">
- <refnamediv>
-  <refname>Imagick::getImageRegion</refname>
-  <refpurpose>Extracts a region of the image</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::getImageRegion</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Extracts a region of the image and returns it as a new Imagick object.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the extracted region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the extracted region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X-coordinate of the top-left corner of the extracted region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y-coordinate of the top-left corner of the extracted region.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Extracts a region of the image and returns it as a new wand.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagerenderingintent.xml b/reference/imagick/imagick/getimagerenderingintent.xml
deleted file mode 100644
index dd8fffad62ac..000000000000
--- a/reference/imagick/imagick/getimagerenderingintent.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagerenderingintent">
- <refnamediv>
-  <refname>Imagick::getImageRenderingIntent</refname>
-  <refpurpose>Gets the image rendering intent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageRenderingIntent</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image rendering intent.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image <link
-   linkend="imagick.constants.renderingintent">rendering intent</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageresolution.xml b/reference/imagick/imagick/getimageresolution.xml
deleted file mode 100644
index 7c4bff848d42..000000000000
--- a/reference/imagick/imagick/getimageresolution.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageresolution">
- <refnamediv>
-  <refname>Imagick::getImageResolution</refname>
-  <refpurpose>Gets the image X and Y resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageResolution</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image X and Y resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the resolution as an array.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagesblob.xml b/reference/imagick/imagick/getimagesblob.xml
deleted file mode 100644
index 79d635ce585a..000000000000
--- a/reference/imagick/imagick/getimagesblob.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagesblob">
- <refnamediv>
-  <refname>Imagick::getImagesBlob</refname>
-  <refpurpose>Returns all image sequences as a blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImagesBlob</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Implements direct to memory image formats.  It returns all image
-   sequences as a string.  The format of the image determines the
-   format of the returned blob (GIF, JPEG, PNG, etc.). To return a
-   different image format, use Imagick::setImageFormat().
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the images. On failure, throws
-   ImagickException.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagescene.xml b/reference/imagick/imagick/getimagescene.xml
deleted file mode 100644
index 66c71fdc225a..000000000000
--- a/reference/imagick/imagick/getimagescene.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagescene">
- <refnamediv>
-  <refname>Imagick::getImageScene</refname>
-  <refpurpose>Gets the image scene</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageScene</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image scene.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image scene.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagesignature.xml b/reference/imagick/imagick/getimagesignature.xml
deleted file mode 100644
index 910a9a72391c..000000000000
--- a/reference/imagick/imagick/getimagesignature.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagesignature">
- <refnamediv>
-  <refname>Imagick::getImageSignature</refname>
-  <refpurpose>Generates an SHA-256 message digest</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getImageSignature</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Generates an SHA-256 message digest for the image pixel stream.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the SHA-256 hash of the file.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagesize.xml b/reference/imagick/imagick/getimagesize.xml
deleted file mode 100644
index ac610753558d..000000000000
--- a/reference/imagick/imagick/getimagesize.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagesize">
- <refnamediv>
-  <refname>Imagick::getImageSize</refname>
-  <refpurpose>Returns the image length in bytes</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image length in bytes.
-   Deprecated in favour of <link linkend="imagick.getimagelength">Imagick::getImageLength()</link>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an int containing the current image 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagetickspersecond.xml b/reference/imagick/imagick/getimagetickspersecond.xml
deleted file mode 100644
index 838b3194b40e..000000000000
--- a/reference/imagick/imagick/getimagetickspersecond.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagetickspersecond">
- <refnamediv>
-  <refname>Imagick::getImageTicksPerSecond</refname>
-  <refpurpose>Gets the image ticks-per-second</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageTicksPerSecond</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image ticks-per-second.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image ticks-per-second.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagetotalinkdensity.xml b/reference/imagick/imagick/getimagetotalinkdensity.xml
deleted file mode 100644
index e3243950445b..000000000000
--- a/reference/imagick/imagick/getimagetotalinkdensity.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagetotalinkdensity">
- <refnamediv>
-  <refname>Imagick::getImageTotalInkDensity</refname>
-  <refpurpose>Gets the image total ink density</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getImageTotalInkDensity</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image total ink density.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns the image total ink density of the image.
-    &imagick.imagickexception.throw;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagetype.xml b/reference/imagick/imagick/getimagetype.xml
deleted file mode 100644
index 43cc14a80ff8..000000000000
--- a/reference/imagick/imagick/getimagetype.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagetype">
- <refnamediv>
-  <refname>Imagick::getImageType</refname>
-  <refpurpose>Gets the image type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageType</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the type of the image, derived from its colorspace, its storage
-   class and whether it carries an alpha channel. The pixels themselves are
-   not examined, so the value reflects how the image is currently held rather
-   than the smallest type it could be reduced to.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns one of the following
-   <link linkend="imagick.constants.imagetype"><constant>imagick::IMGTYPE_<replaceable>*</replaceable></constant></link>
-   constants. <constant>imagick::IMGTYPE_UNDEFINED</constant> and
-   <constant>imagick::IMGTYPE_OPTIMIZE</constant> are never returned.
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-bilevel"><constant>imagick::IMGTYPE_BILEVEL</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-grayscale"><constant>imagick::IMGTYPE_GRAYSCALE</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-grayscalematte"><constant>imagick::IMGTYPE_GRAYSCALEMATTE</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-palette"><constant>imagick::IMGTYPE_PALETTE</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-palettematte"><constant>imagick::IMGTYPE_PALETTEMATTE</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-truecolor"><constant>imagick::IMGTYPE_TRUECOLOR</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-truecolormatte"><constant>imagick::IMGTYPE_TRUECOLORMATTE</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-colorseparation"><constant>imagick::IMGTYPE_COLORSEPARATION</constant></link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="imagick.constants.imgtype-colorseparationmatte"><constant>imagick::IMGTYPE_COLORSEPARATIONMATTE</constant></link>
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimageunits.xml b/reference/imagick/imagick/getimageunits.xml
deleted file mode 100644
index bdc55d69c6e3..000000000000
--- a/reference/imagick/imagick/getimageunits.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimageunits">
- <refnamediv>
-  <refname>Imagick::getImageUnits</refname>
-  <refpurpose>Gets the image units of resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageUnits</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the image units of resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image units of resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagevirtualpixelmethod.xml b/reference/imagick/imagick/getimagevirtualpixelmethod.xml
deleted file mode 100644
index 453853b6265a..000000000000
--- a/reference/imagick/imagick/getimagevirtualpixelmethod.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagevirtualpixelmethod">
- <refnamediv>
-  <refname>Imagick::getImageVirtualPixelMethod</refname>
-  <refpurpose>Returns the virtual pixel method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageVirtualPixelMethod</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the virtual pixel method for the specified image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the virtual pixel method on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagewhitepoint.xml b/reference/imagick/imagick/getimagewhitepoint.xml
deleted file mode 100644
index e0c34cdc5791..000000000000
--- a/reference/imagick/imagick/getimagewhitepoint.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagewhitepoint">
- <refnamediv>
-  <refname>Imagick::getImageWhitePoint</refname>
-  <refpurpose>Returns the chromaticity white point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getImageWhitePoint</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the chromaticity white point as an associative array with the keys "x" and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the chromaticity white point as an associative array with the keys
-   "x" and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getimagewidth.xml b/reference/imagick/imagick/getimagewidth.xml
deleted file mode 100644
index 67cd2fa5ebe9..000000000000
--- a/reference/imagick/imagick/getimagewidth.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getimagewidth">
- <refnamediv>
-  <refname>Imagick::getImageWidth</refname>
-  <refpurpose>Returns the image width</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getImageWidth</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the image width.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the image width.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getinterlacescheme.xml b/reference/imagick/imagick/getinterlacescheme.xml
deleted file mode 100644
index 7c3de2c80114..000000000000
--- a/reference/imagick/imagick/getinterlacescheme.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getinterlacescheme">
- <refnamediv>
-  <refname>Imagick::getInterlaceScheme</refname>
-  <refpurpose>Gets the object interlace scheme</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getInterlaceScheme</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the object interlace scheme.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Gets the wand <link linkend="imagick.constants.interlace">interlace
-   scheme</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getiteratorindex.xml b/reference/imagick/imagick/getiteratorindex.xml
deleted file mode 100644
index 914877fa7839..000000000000
--- a/reference/imagick/imagick/getiteratorindex.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getiteratorindex">
- <refnamediv>
-  <refname>Imagick::getIteratorIndex</refname>
-  <refpurpose>Gets the index of the current active image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getIteratorIndex</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Returns the index of the current active image within the Imagick object.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer containing the index of the image in the stack.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::getIteratorIndex</function>:</title>
-    <para>
-     Create images, set and get the iterator index
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$im = new Imagick();
-$im->newImage(100, 100, new ImagickPixel("red"));
-$im->newImage(100, 100, new ImagickPixel("green"));
-$im->newImage(100, 100, new ImagickPixel("blue"));
-
-$im->setIteratorIndex(1);
-echo $im->getIteratorIndex();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setIteratorIndex</function></member>
-    <member><function>Imagick::getImageIndex</function></member>
-    <member><function>Imagick::setImageIndex</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/imagick/imagick/getnumberimages.xml b/reference/imagick/imagick/getnumberimages.xml
deleted file mode 100644
index ffc804fd4688..000000000000
--- a/reference/imagick/imagick/getnumberimages.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getnumberimages">
- <refnamediv>
-  <refname>Imagick::getNumberImages</refname>
-  <refpurpose>Returns the number of images in the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getNumberImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the number of images associated with Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of images associated with Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getoption.xml b/reference/imagick/imagick/getoption.xml
deleted file mode 100644
index 81364077f881..000000000000
--- a/reference/imagick/imagick/getoption.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getoption">
- <refnamediv>
-  <refname>Imagick::getOption</refname>
-  <refpurpose>Returns a value associated with the specified key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::getOption</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a value associated within the object for the specified key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-      The name of the option
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a value associated with a wand and the specified key.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getpackagename.xml b/reference/imagick/imagick/getpackagename.xml
deleted file mode 100644
index 97687f87e48d..000000000000
--- a/reference/imagick/imagick/getpackagename.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getpackagename">
- <refnamediv>
-  <refname>Imagick::getPackageName</refname>
-  <refpurpose>Returns the ImageMagick package name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getPackageName</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick package name.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the ImageMagick package name as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getpage.xml b/reference/imagick/imagick/getpage.xml
deleted file mode 100644
index 2f9eaddfc780..000000000000
--- a/reference/imagick/imagick/getpage.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getpage">
- <refnamediv>
-  <refname>Imagick::getPage</refname>
-  <refpurpose>Returns the page geometry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getPage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the page geometry associated with the Imagick object in
-   an associative array with the keys "width", "height", "x", and "y".
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the page geometry associated with the Imagick object in
-   an associative array with the keys "width", "height", "x", and "y",
-   throwing ImagickException on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getpixeliterator.xml b/reference/imagick/imagick/getpixeliterator.xml
deleted file mode 100644
index b6bd21183103..000000000000
--- a/reference/imagick/imagick/getpixeliterator.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getpixeliterator">
- <refnamediv>
-  <refname>Imagick::getPixelIterator</refname>
-  <refpurpose>Returns a MagickPixelIterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixelIterator</type><methodname>Imagick::getPixelIterator</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns a MagickPixelIterator.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an ImagickPixelIterator on success.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::getPixelIterator</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function getPixelIterator($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imageIterator = $imagick->getPixelIterator();
-
-    foreach ($imageIterator as $row => $pixels) { /* Loop through pixel rows */
-        foreach ($pixels as $column => $pixel) { /* Loop through the pixels in the row (columns) */
-            /** @var $pixel \ImagickPixel */
-            if ($column % 2) {
-                $pixel->setColor("rgba(0, 0, 0, 0)"); /* Paint every second pixel black*/
-            }
-        }
-        $imageIterator->syncIterator(); /* Sync the iterator, this is important to do on each iteration */
-    }
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagick/getpixelregioniterator.xml b/reference/imagick/imagick/getpixelregioniterator.xml
deleted file mode 100644
index 94be187db99d..000000000000
--- a/reference/imagick/imagick/getpixelregioniterator.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getpixelregioniterator">
- <refnamediv>
-  <refname>Imagick::getPixelRegionIterator</refname>
-  <refpurpose>Get an ImagickPixelIterator for an image section</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixelIterator</type><methodname>Imagick::getPixelRegionIterator</methodname>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get an ImagickPixelIterator for an image section.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       The width of the region.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       The height of the region.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an ImagickPixelIterator for an image section.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <para>
-   <example><!-- {{{ -->
-    <title><methodname>Imagick::getPixelRegionIterator</methodname> example</title>
-    <para>
-     Iterate over the pixels in the top left of the image, changing them to be black.
-    </para>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$im = new Imagick(realpath("./testImage.png"));
-$areaIterator = $im->getPixelRegionIterator(0, 0, 10, 10);
-
-foreach ($areaIterator as $rowIterator) {
-    foreach ($rowIterator as $pixel) {
-        // Paint every pixel black
-        $pixel->setColor("rgba(0, 0, 0, 0)");
-    }
-    $areaIterator->syncIterator();
-}
-$im->writeImage("./output.png");
-?>
-]]>
-    </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/imagick/imagick/getpointsize.xml b/reference/imagick/imagick/getpointsize.xml
deleted file mode 100644
index 796ab1c7345c..000000000000
--- a/reference/imagick/imagick/getpointsize.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getpointsize">
- <refnamediv>
-  <refname>Imagick::getPointSize</refname>
-  <refpurpose>Gets point size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>Imagick::getPointSize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the objects point size property.
-   &imagick.method.available.0x637;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &float; containing the point size.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setPointSize</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/imagick/imagick/getquantum.xml b/reference/imagick/imagick/getquantum.xml
deleted file mode 100644
index d58f5a24f404..000000000000
--- a/reference/imagick/imagick/getquantum.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.getquantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::getQuantum</refname>
-  <refpurpose>Returns the ImageMagick quantum range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Imagick::getQuantum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick quantum range. If HDRI was enabled then the type is a float, if not it is an int.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getquantumdepth.xml b/reference/imagick/imagick/getquantumdepth.xml
deleted file mode 100644
index 2df8045d068c..000000000000
--- a/reference/imagick/imagick/getquantumdepth.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getquantumdepth">
- <refnamediv>
-  <refname>Imagick::getQuantumDepth</refname>
-  <refpurpose>Gets the quantum depth</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getQuantumDepth</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the Imagick quantum depth.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with <literal>"quantumDepthLong"</literal> and <literal>"quantumDepthString"</literal>
-   members.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getquantumrange.xml b/reference/imagick/imagick/getquantumrange.xml
deleted file mode 100644
index 0a16cffb1e2c..000000000000
--- a/reference/imagick/imagick/getquantumrange.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getquantumrange">
- <refnamediv>
-  <refname>Imagick::getQuantumRange</refname>
-  <refpurpose>Returns the Imagick quantum range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getQuantumRange</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the quantum range for the Imagick instance.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array containing the quantum range as an
-   <type>int</type> (<literal>"quantumRangeLong"</literal>) and as a 
-   <type>string</type> (<literal>"quantumRangeString"</literal>).
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getregistry.xml b/reference/imagick/imagick/getregistry.xml
deleted file mode 100644
index 2d8d0ea6f54b..000000000000
--- a/reference/imagick/imagick/getregistry.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.getregistry" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::getRegistry</refname>
-  <refpurpose>Get a StringRegistry entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getRegistry</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get the StringRegistry entry for the named key or false if not set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      The entry to get.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getreleasedate.xml b/reference/imagick/imagick/getreleasedate.xml
deleted file mode 100644
index d1faed186dfd..000000000000
--- a/reference/imagick/imagick/getreleasedate.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getreleasedate">
- <refnamediv>
-  <refname>Imagick::getReleaseDate</refname>
-  <refpurpose>Returns the ImageMagick release date</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Imagick::getReleaseDate</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick release date as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the ImageMagick release date as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getresource.xml b/reference/imagick/imagick/getresource.xml
deleted file mode 100644
index 7947ef72773c..000000000000
--- a/reference/imagick/imagick/getresource.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getresource">
- <refnamediv>
-  <refname>Imagick::getResource</refname>
-  <refpurpose>Returns the specified resource's memory usage</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Imagick::getResource</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the specified resource's memory usage in megabytes.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-      Refer to the list of <link linkend="imagick.constants.resourcetypes">resourcetype constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the specified resource's memory usage in megabytes.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getresourcelimit.xml b/reference/imagick/imagick/getresourcelimit.xml
deleted file mode 100644
index 3e0c69e8516d..000000000000
--- a/reference/imagick/imagick/getresourcelimit.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getresourcelimit">
- <refnamediv>
-  <refname>Imagick::getResourceLimit</refname>
-  <refpurpose>Returns the specified resource limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Imagick::getResourceLimit</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the specified resource limit.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       One of the <link 
-       linkend="imagick.constants.resourcetypes">resourcetype constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the specified resource limit.
-   The unit depends on the type of the resource being limited.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::setResourceLimit</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/imagick/imagick/getsamplingfactors.xml b/reference/imagick/imagick/getsamplingfactors.xml
deleted file mode 100644
index bc563e59830b..000000000000
--- a/reference/imagick/imagick/getsamplingfactors.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getsamplingfactors">
- <refnamediv>
-  <refname>Imagick::getSamplingFactors</refname>
-  <refpurpose>Gets the horizontal and vertical sampling factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getSamplingFactors</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the horizontal and vertical sampling factor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array with the horizontal and vertical sampling
-   factors of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getsize.xml b/reference/imagick/imagick/getsize.xml
deleted file mode 100644
index a8c026e42a74..000000000000
--- a/reference/imagick/imagick/getsize.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getsize">
- <refnamediv>
-  <refname>Imagick::getSize</refname>
-  <refpurpose>Returns the size associated with the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::getSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Get the size in pixels associated with the Imagick object, previously set by <function>Imagick::setSize</function>.
-  </para>
-  <note>
-   <para>
-    This method just returns the size that was set using <function>Imagick::setSize</function>. If you want to get the actual width / height of the image, use <function>Imagick::getImageWidth</function> and <function>Imagick::getImageHeight</function>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the size associated with the Imagick object as an array with the
-   keys "columns" and "rows".
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Getting the size of a raw RGB image set at 200x400, after scaling to 400x800 (compared to width / height)</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-//Set size first and then load the raw image
-$img = new Imagick();
-$img->setSize(200, 400);
-$img->readImage("image.rgb");
-
-$img->scaleImage(400, 800);
-
-$size = $img->getSize();
-print_r($size);
-
-echo $img->getImageWidth()."x".$img->getImageHeight();
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [columns] => 200
-    [rows] => 400
-)
-400x800
-]]>
-    </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/imagick/imagick/getsizeoffset.xml b/reference/imagick/imagick/getsizeoffset.xml
deleted file mode 100644
index 030a228c068f..000000000000
--- a/reference/imagick/imagick/getsizeoffset.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getsizeoffset">
- <refnamediv>
-  <refname>Imagick::getSizeOffset</refname>
-  <refpurpose>Returns the size offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Imagick::getSizeOffset</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Returns the size offset associated with the Imagick object.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the size offset associated with the Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/getversion.xml b/reference/imagick/imagick/getversion.xml
deleted file mode 100644
index ade82032bb33..000000000000
--- a/reference/imagick/imagick/getversion.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.getversion">
- <refnamediv>
-  <refname>Imagick::getVersion</refname>
-  <refpurpose>Returns the ImageMagick API version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::getVersion</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the ImageMagick API version as a string and as a number.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the ImageMagick API version as a string and as a number.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/haldclutimage.xml b/reference/imagick/imagick/haldclutimage.xml
deleted file mode 100644
index e4050b768e5e..000000000000
--- a/reference/imagick/imagick/haldclutimage.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.haldclutimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::haldClutImage</refname>
-  <refpurpose>Replaces colors in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::haldClutImage</methodname>
-   <methodparam><type>Imagick</type><parameter>clut</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Replaces colors in the image using a Hald lookup table. Hald images can be created using 
-   HALD color coder.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clut</parameter></term>
-     <listitem>
-      <para>
-       Imagick object containing the Hald lookup image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::haldClutImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function haldClutImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagickPalette = new \Imagick(realpath("images/hald/hald_8.png"));
-    $imagickPalette->sepiatoneImage(55);
-    $imagick->haldClutImage($imagickPalette);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/hasnextimage.xml b/reference/imagick/imagick/hasnextimage.xml
deleted file mode 100644
index 0e3ecf144eba..000000000000
--- a/reference/imagick/imagick/hasnextimage.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.hasnextimage">
- <refnamediv>
-  <refname>Imagick::hasNextImage</refname>
-  <refpurpose>Checks if the object has more images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::hasNextImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns &true; if the object has more images when traversing the list in the forward direction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <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.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/haspreviousimage.xml b/reference/imagick/imagick/haspreviousimage.xml
deleted file mode 100644
index c32d4da37d8d..000000000000
--- a/reference/imagick/imagick/haspreviousimage.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.haspreviousimage">
- <refnamediv>
-  <refname>Imagick::hasPreviousImage</refname>
-  <refpurpose>Checks if the object has a previous image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::hasPreviousImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns &true; if the object has more images when traversing the list in the reverse direction
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <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.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/identifyformat.xml b/reference/imagick/imagick/identifyformat.xml
deleted file mode 100644
index c7f4e67a729a..000000000000
--- a/reference/imagick/imagick/identifyformat.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.identifyformat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::identifyFormat</refname>
-  <refpurpose>Formats a string with image details</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>Imagick::identifyFormat</methodname>
-   <methodparam><type>string</type><parameter>embedText</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Replaces any embedded formatting characters with the appropriate image property and returns the interpreted text. See http://www.imagemagick.org/script/escape.php for escape sequences.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>embedText</parameter></term>
-    <listitem>
-     <para>
-      A string containing formatting sequences e.g. "Trim box: %@ number of unique colors: %k".
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns format&return.falseforfailure;.
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::identifyFormat</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $output = "Output of 'Trim box: %@ number of unique colors: %k' is: <br/>";
-        $imagick = new \Imagick(realpath("./images/artifact/mask.png"));
-        $output .= $imagick->identifyFormat("Trim box: %@ number of unique colors: %k");
-
-?>
-]]>
-      </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/imagick/imagick/identifyimage.xml b/reference/imagick/imagick/identifyimage.xml
deleted file mode 100644
index 6540a424c631..000000000000
--- a/reference/imagick/imagick/identifyimage.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.identifyimage">
- <refnamediv>
-  <refname>Imagick::identifyImage</refname>
-  <refpurpose>Identifies an image and fetches attributes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::identifyImage</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>appendRawOutput</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Identifies an image and returns the attributes.  Attributes include
-   the image width, height, size, and others.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>appendRawOutput</parameter></term>
-     <listitem>
-      <para>
-         If &true; then the raw output is appended to the array.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Identifies an image and returns the attributes.  Attributes include
-   the image width, height, size, and others.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-   <title>Example Result Format</title>
-   <screen>
-<![CDATA[
-Array
-(
-    [imageName] => /some/path/image.jpg
-    [format] => JPEG (Joint Photographic Experts Group JFIF format)
-    [geometry] => Array
-        (
-            [width] => 90
-            [height] => 90
-        )
-
-    [type] => TrueColor
-    [colorSpace] => RGB
-    [resolution] => Array
-        (
-            [x] => 300
-            [y] => 300
-        )
-
-    [units] => PixelsPerInch
-    [fileSize] => 1.88672kb
-    [compression] => JPEG
-    [signature] => 9a6dc8f604f97d0d691c0286176ddf992e188f0bebba98494b2146ee2d7118da
-)
-]]>
-   </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/imagick/imagick/implodeimage.xml b/reference/imagick/imagick/implodeimage.xml
deleted file mode 100644
index 3806daac5398..000000000000
--- a/reference/imagick/imagick/implodeimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.implodeimage">
- <refnamediv>
-  <refname>Imagick::implodeImage</refname>
-  <refpurpose>Creates a new image as a copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::implodeImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the implode
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::implodeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function implodeImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->implodeImage(0.0001);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-
-}
-
-?>
-]]>
-      </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/imagick/imagick/importimagepixels.xml b/reference/imagick/imagick/importimagepixels.xml
deleted file mode 100644
index bdd91882988e..000000000000
--- a/reference/imagick/imagick/importimagepixels.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.importimagepixels" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::importImagePixels</refname>
-  <refpurpose>Imports image pixels</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::importImagePixels</methodname>
-   <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>
-   <methodparam><type>string</type><parameter>map</parameter></methodparam>
-   <methodparam><type>int</type><parameter>storage</parameter></methodparam>
-   <methodparam><type>array</type><parameter>pixels</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Imports pixels from an array into an image. The <parameter>map</parameter> is usually
-   'RGB'. This method imposes the following constraints for the parameters: amount of pixels
-   in the array must match <parameter>width</parameter> x <parameter>height</parameter> x length of the map.
-   &imagick.method.available.0x645;
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The image x position
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The image y position
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The image width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The image height
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>map</parameter></term>
-     <listitem>
-      <para>
-       Map of pixel ordering as a string. This can be for example <literal>RGB</literal>.
-       The value can be any combination or order of R = red, G = green, B = blue, A = alpha (0 is transparent), 
-       O = opacity (0 is opaque), C = cyan, Y = yellow, M = magenta, K = black, I = intensity (for grayscale), P = pad.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>storage</parameter></term>
-     <listitem>
-      <para>
-       The pixel storage method. 
-       Refer to this list of <link linkend="imagick.constants.pixel">pixel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pixels</parameter></term>
-     <listitem>
-      <para>
-       The array of pixels
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title><methodname>Imagick::importImagePixels</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Generate array of pixels. 2000 pixels per color stripe */
-$count = 2000 * 3;
-
-$pixels = 
-   array_merge(array_pad(array(), $count, 0),
-               array_pad(array(), $count, 255), 
-               array_pad(array(), $count, 0),
-               array_pad(array(), $count, 255),
-               array_pad(array(), $count, 0));
-
-/* Width and height. The area is amount of pixels divided
-   by three. Three comes from 'RGB', three values per pixel */
-$width = $height = pow((count($pixels) / 3), 0.5);
-
-/* Create empty image */
-$im = new Imagick();
-$im->newImage($width, $height, 'gray');
-
-/* Import the pixels into image.
-   width * height * strlen("RGB") must match count($pixels) */
-$im->importImagePixels(0, 0, $width, $height, "RGB", Imagick::PIXEL_CHAR, $pixels);
-
-/* output as jpeg image */
-$im->setImageFormat('jpg');
-header("Content-Type: image/jpg");
-echo $im;
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <mediaobject>
-     <alt>Output of example : Imagick::importImagePixels()</alt>
-     <imageobject>
-      <imagedata fileref="en/reference/imagick/figures/importimagepixels.jpg"/>
-     </imageobject>
-    </mediaobject>
-   </example>
-  </para>
- </refsect1>
-
-<!-- TODO: document exportimagepixels
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Imagick::exportImagePixels</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/imagick/imagick/inversefouriertransformimage.xml b/reference/imagick/imagick/inversefouriertransformimage.xml
deleted file mode 100644
index 50100a7612e1..000000000000
--- a/reference/imagick/imagick/inversefouriertransformimage.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.inversefouriertransformimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::inverseFourierTransformImage</refname>
-  <refpurpose>Implements the inverse discrete Fourier transform (DFT)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::inverseFourierTransformImage</methodname>
-   <methodparam><type>Imagick</type><parameter>complement</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>magnitude</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Implements the inverse discrete Fourier transform (DFT) of the image either as a magnitude / phase or real / imaginary image pair.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>complement</parameter></term>
-    <listitem>
-     <para>
-      The second image to combine with this one to form either the magnitude / phase or real / imaginary image pair.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>magnitude</parameter></term>
-    <listitem>
-     <para>
-      If true, combine as magnitude / phase pair otherwise a real / imaginary image pair.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/labelimage.xml b/reference/imagick/imagick/labelimage.xml
deleted file mode 100644
index d4316ce0cae5..000000000000
--- a/reference/imagick/imagick/labelimage.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.labelimage">
- <refnamediv>
-  <refname>Imagick::labelImage</refname>
-  <refpurpose>Adds a label to an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::labelImage</methodname>
-   <methodparam><type>string</type><parameter>label</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a label to an image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>label</parameter></term>
-     <listitem>
-      <para>
-      The label to add
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/levelimage.xml b/reference/imagick/imagick/levelimage.xml
deleted file mode 100644
index 8995e9cd6970..000000000000
--- a/reference/imagick/imagick/levelimage.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.levelimage">
- <refnamediv>
-  <refname>Imagick::levelImage</refname>
-  <refpurpose>Adjusts the levels of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::levelImage</methodname>
-   <methodparam><type>float</type><parameter>blackPoint</parameter></methodparam>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>whitePoint</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adjusts the levels of an image by scaling the colors falling
-   between specified white and black points to the full
-   available quantum range. The parameters provided represent
-   the black, mid, and white points. The black point specifies
-   the darkest color in the image. Colors darker than the black
-   point are set to zero. Mid point specifies a gamma
-   correction to apply to the image.  White point 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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>blackPoint</parameter></term>
-     <listitem>
-      <para>
-      The image black point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>gamma</parameter></term>
-     <listitem>
-      <para>
-      The gamma value
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>whitePoint</parameter></term>
-     <listitem>
-      <para>
-      The image white point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::levelImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function levelImage($blackPoint, $gamma, $whitePoint) {
-    $imagick = new \Imagick();
-    $imagick->newPseudoimage(500, 500, 'gradient:black-white');
-
-    $imagick->setFormat('png');
-    $quantum = $imagick->getQuantum();
-    $imagick->levelImage($blackPoint / 100 , $gamma, $quantum * $whitePoint / 100);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/linearstretchimage.xml b/reference/imagick/imagick/linearstretchimage.xml
deleted file mode 100644
index aa1ae18fa3e3..000000000000
--- a/reference/imagick/imagick/linearstretchimage.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.linearstretchimage">
- <refnamediv>
-  <refname>Imagick::linearStretchImage</refname>
-  <refpurpose>Stretches with saturation the image intensity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::linearStretchImage</methodname>
-   <methodparam><type>float</type><parameter>blackPoint</parameter></methodparam>
-   <methodparam><type>float</type><parameter>whitePoint</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Stretches with saturation the image intensity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>blackPoint</parameter></term>
-     <listitem>
-      <para>
-      The image black point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>whitePoint</parameter></term>
-     <listitem>
-      <para>
-      The image white point
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::linearStretchImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function linearStretchImage($imagePath, $blackThreshold, $whiteThreshold) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $pixels = $imagick->getImageWidth() * $imagick->getImageHeight();
-    $imagick->linearStretchImage($blackThreshold * $pixels, $whiteThreshold * $pixels);
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/liquidrescaleimage.xml b/reference/imagick/imagick/liquidrescaleimage.xml
deleted file mode 100644
index 063107fb9822..000000000000
--- a/reference/imagick/imagick/liquidrescaleimage.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.liquidrescaleimage">
- <refnamediv>
-  <refname>Imagick::liquidRescaleImage</refname>
-  <refpurpose>Animates an image or images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::liquidRescaleImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>float</type><parameter>delta_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rigidity</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This method scales the images using liquid rescaling method. This method
-   is an implementation of a technique called seam carving. In order for this
-   method to work as expected ImageMagick must be compiled with liblqr support.
-   &imagick.method.available.0x639;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the target size
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the target size
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>delta_x</parameter></term>
-     <listitem>
-      <para>
-       How much the seam can traverse on x-axis. 
-       Passing 0 causes the seams to be straight.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rigidity</parameter></term>
-     <listitem>
-      <para>
-       Introduces a bias for non-straight seams. This parameter is 
-       typically 0.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::resizeImage</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/imagick/imagick/listregistry.xml b/reference/imagick/imagick/listregistry.xml
deleted file mode 100644
index 209f7148c211..000000000000
--- a/reference/imagick/imagick/listregistry.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.listregistry" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::listRegistry</refname>
-  <refpurpose>List all the registry settings</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::listRegistry</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   List all the registry settings. Returns an array of all the key/value pairs in the registry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array containing the key/values from the registry.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/magnifyimage.xml b/reference/imagick/imagick/magnifyimage.xml
deleted file mode 100644
index 45dab1cf15ae..000000000000
--- a/reference/imagick/imagick/magnifyimage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.magnifyimage">
- <refnamediv>
-  <refname>Imagick::magnifyImage</refname>
-  <refpurpose>Scales an image proportionally 2x</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::magnifyImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Is a convenience method that scales an image proportionally to twice its original size.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-    <example>
-      <title> <function>Imagick::magnifyImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function magnifyImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->magnifyImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/mapimage.xml b/reference/imagick/imagick/mapimage.xml
deleted file mode 100644
index 192f642d5d6e..000000000000
--- a/reference/imagick/imagick/mapimage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.mapimage">
- <refnamediv>
-  <refname>Imagick::mapImage</refname>
-  <refpurpose>Replaces the colors of an image with the closest color from a reference image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::mapImage</methodname>
-   <methodparam><type>Imagick</type><parameter>map</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>map</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dither</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/mattefloodfillimage.xml b/reference/imagick/imagick/mattefloodfillimage.xml
deleted file mode 100644
index 0be21adbb6ba..000000000000
--- a/reference/imagick/imagick/mattefloodfillimage.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.mattefloodfillimage">
- <refnamediv>
-  <refname>Imagick::matteFloodfillImage</refname>
-  <refpurpose>Changes the transparency value of a color</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::matteFloodfillImage</methodname>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>bordercolor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the transparency value of any pixel that matches
-   target and is an immediate neighbor.  If the method
-   <constant>FillToBorderMethod</constant> is specified, the transparency value
-   is changed for any neighbor pixel that does not match
-   the bordercolor member of image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       The level of transparency: 1.0 is fully opaque and 0.0 is fully
-       transparent.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The fuzz member of image defines how much tolerance is acceptable to
-       consider two colors as the same.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bordercolor</parameter></term>
-     <listitem>
-      <para>
-      An <classname>ImagickPixel</classname> object or string representing the border color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      The starting x coordinate of the operation.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      The starting y coordinate of the operation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the third parameter.
-        Previous versions allow only an <classname>ImagickPixel</classname> object.
-       </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/imagick/imagick/medianfilterimage.xml b/reference/imagick/imagick/medianfilterimage.xml
deleted file mode 100644
index f0f8c364d9af..000000000000
--- a/reference/imagick/imagick/medianfilterimage.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.medianfilterimage">
- <refnamediv>
-  <refname>Imagick::medianFilterImage</refname>
-  <refpurpose>Applies a digital filter</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::medianFilterImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the pixel neighborhood.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::medianFilterImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function medianFilterImage($radius, $imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    @$imagick->medianFilterImage($radius);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/mergeimagelayers.xml b/reference/imagick/imagick/mergeimagelayers.xml
deleted file mode 100644
index c0619798e6c1..000000000000
--- a/reference/imagick/imagick/mergeimagelayers.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.mergeimagelayers">
- <refnamediv>
-  <refname>Imagick::mergeImageLayers</refname>
-  <refpurpose>Merges image layers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::mergeImageLayers</methodname>
-   <methodparam><type>int</type><parameter>layer_method</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges image layers into one. This method is useful when working with image
-   formats that use multiple layers such as PSD. The merging is controlled using
-   the <parameter>layer_method</parameter> which defines how the layers are merged.
-   &imagick.method.available.0x637;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>layer_method</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>Imagick::LAYERMETHOD_<replaceable>*</replaceable></constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an Imagick object containing the merged image.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::mergeImageLayers</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function mergeImageLayers($layerMethodType, $imagePath1, $imagePath2) {
-
-    $imagick = new \Imagick(realpath($imagePath1));
-
-    $imagick2 = new \Imagick(realpath($imagePath2));
-    $imagick->addImage($imagick2);
-    $imagick->setImageFormat('png');
-
-    $result = $imagick->mergeImageLayers($layerMethodType);
-    header("Content-Type: image/png");
-    echo $result->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/minifyimage.xml b/reference/imagick/imagick/minifyimage.xml
deleted file mode 100644
index e55cc5d6dc51..000000000000
--- a/reference/imagick/imagick/minifyimage.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.minifyimage">
- <refnamediv>
-  <refname>Imagick::minifyImage</refname>
-  <refpurpose>Scales an image proportionally to half its size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::minifyImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Is a convenience method that scales an image proportionally to one-half its original size
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/modulateimage.xml b/reference/imagick/imagick/modulateimage.xml
deleted file mode 100644
index f4d2ea09b7aa..000000000000
--- a/reference/imagick/imagick/modulateimage.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.modulateimage">
- <refnamediv>
-  <refname>Imagick::modulateImage</refname>
-  <refpurpose>Control the brightness, saturation, and hue</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::modulateImage</methodname>
-   <methodparam><type>float</type><parameter>brightness</parameter></methodparam>
-   <methodparam><type>float</type><parameter>saturation</parameter></methodparam>
-   <methodparam><type>float</type><parameter>hue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Lets you control the brightness, saturation, and hue of an image.  Hue
-   is the percentage of absolute rotation from the current position.  For
-   example 50 results in a counter-clockwise rotation of 90 degrees, 150
-   results in a clockwise rotation of 90 degrees, with 0 and 200 both
-   resulting in a rotation of 180 degrees.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>brightness</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>saturation</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>hue</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::modulateImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function modulateImage($imagePath, $hue, $brightness, $saturation) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->modulateImage($brightness, $saturation, $hue);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/montageimage.xml b/reference/imagick/imagick/montageimage.xml
deleted file mode 100644
index dc5053d1769d..000000000000
--- a/reference/imagick/imagick/montageimage.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.montageimage">
- <refnamediv>
-  <refname>Imagick::montageImage</refname>
-  <refpurpose>Creates a composite image</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::montageImage</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>draw</parameter></methodparam>
-   <methodparam><type>string</type><parameter>tile_geometry</parameter></methodparam>
-   <methodparam><type>string</type><parameter>thumbnail_geometry</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>string</type><parameter>frame</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a composite image by combining several separate images.
-   The images are tiled on the composite image with the name of the
-   image optionally appearing just below the individual tile.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>draw</parameter></term>
-     <listitem>
-      <para>
-       The font name, size, and color are obtained from this object.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>tile_geometry</parameter></term>
-     <listitem>
-      <para>
-       The number of tiles per row and page (e.g. 6x4+0+0).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>thumbnail_geometry</parameter></term>
-     <listitem>
-      <para>
-       Preferred image size and border size of each thumbnail
-       (e.g. 120x120+4+3).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Thumbnail framing mode, see <link 
-       linkend="imagick.constants.montagemode">Montage Mode constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>frame</parameter></term>
-     <listitem>
-      <para>
-       Surround the image with an ornamental border (e.g. 15x15+3+3). The
-       frame color is that of the thumbnail's matte color.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Creates a composite image and returns it as a new <classname>Imagick</classname> 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/imagick/imagick/morphimages.xml b/reference/imagick/imagick/morphimages.xml
deleted file mode 100644
index 42e392c42745..000000000000
--- a/reference/imagick/imagick/morphimages.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.morphimages">
- <refnamediv>
-  <refname>Imagick::morphImages</refname>
-  <refpurpose>Method morphs a set of images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::morphImages</methodname>
-   <methodparam><type>int</type><parameter>number_frames</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Method morphs a set of images.  Both the image pixels and size
-   are linearly interpolated to give the appearance of a
-   meta-morphosis from one image to the next.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>number_frames</parameter></term>
-     <listitem>
-      <para>
-      The number of in-between images to generate.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  This method returns a new Imagick object on success.
-  &imagick.imagickexception.throw;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/morphology.xml b/reference/imagick/imagick/morphology.xml
deleted file mode 100644
index a198574c1e6e..000000000000
--- a/reference/imagick/imagick/morphology.xml
+++ /dev/null
@@ -1,575 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.morphology" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::morphology</refname>
-  <refpurpose>Applies a user supplied kernel to the image according to the given morphology method.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::morphology</methodname>
-   <methodparam><type>int</type><parameter>morphologyMethod</parameter></methodparam>
-   <methodparam><type>int</type><parameter>iterations</parameter></methodparam>
-   <methodparam><type>ImagickKernel</type><parameter>ImagickKernel</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a user supplied kernel to the image according to the given morphology method.
-
-  </para>
-
- 
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>morphologyMethod</parameter></term>
-    <listitem>
-     <para>
-      Which morphology method to use one of the \Imagick::MORPHOLOGY_* constants.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>iterations</parameter></term>
-    <listitem>
-     <para>
-      The number of iteration to apply the morphology function. A value of -1 means loop until no change found. How this is applied may depend on the morphology method. Typically this is a value of 1.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ImagickKernel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title>Convolve <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $imagick = $this->getCharacter();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_GAUSSIAN, "5,1");
-        $imagick->morphology(\Imagick::MORPHOLOGY_CONVOLVE, 2, $kernel);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Correlate <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-        // Top-left pixel must be black
-        // Bottom right pixel must be white
-        // We don't care about the rest.
-        
-
-        $imagick = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromMatrix(self::$correlateMatrix, [2, 2]);
-        $imagick->morphology(\Imagick::MORPHOLOGY_CORRELATE, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Erode <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_ERODE, 2, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Erode Intensity <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacter();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "1");
-        $canvas->morphology(\Imagick::MORPHOLOGY_ERODE_INTENSITY, 2, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Dilate <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DILATE, 4, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Dilate intensity <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacter();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "1");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DILATE_INTENSITY, 4, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Distance with Chebyshev kernel <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_CHEBYSHEV, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DISTANCE, 3, $kernel);
-        $canvas->autoLevelImage();
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Distance with Manhattan kernel <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_MANHATTAN, "5");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DISTANCE, 3, $kernel);
-        $canvas->autoLevelImage();
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Distance with ocatagonal kernel <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGONAL, "5");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DISTANCE, 3, $kernel);
-        $canvas->autoLevelImage();
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Distance with Euclidean kernel <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_EUCLIDEAN, "4");
-        $canvas->morphology(\Imagick::MORPHOLOGY_DISTANCE, 3, $kernel);
-        $canvas->autoLevelImage();
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Edge <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_EDGE, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Open <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        // As a result you will see that 'Open' smoothed the outline, by rounding off any sharp points, and remove any parts that is smaller than the shape used. It will also disconnect or 'open' any thin bridges.
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "6");
-        $canvas->morphology(\Imagick::MORPHOLOGY_OPEN, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Open intensity <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        // As a result you will see that 'Open' smoothed the outline, by rounding off any sharp points, and remove any parts that is smaller than the shape used. It will also disconnect or 'open' any thin bridges.
-
-        $canvas = $this->getCharacter();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "6");
-        $canvas->morphology(\Imagick::MORPHOLOGY_OPEN_INTENSITY, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Close <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        //The basic use of the 'Close' method is to reduce or remove any 'holes' or 'gaps' about the size of the kernel 'Structure Element'. That is 'close' parts of the background that are about that size.
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "6");
-        $canvas->morphology(\Imagick::MORPHOLOGY_CLOSE, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Close Intensity <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        //The basic use of the 'Close' method is to reduce or remove any 'holes' or 'gaps' about the size of the kernel 'Structure Element'. That is 'close' parts of the background that are about that size.
-        $canvas = $this->getCharacter();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "6");
-        $canvas->morphology(\Imagick::MORPHOLOGY_CLOSE_INTENSITY, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Smooth <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_SMOOTH, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Edge in <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_EDGE_IN, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Edge out <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_OCTAGON, "3");
-        $canvas->morphology(\Imagick::MORPHOLOGY_EDGE_OUT, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>The 'TopHat' method, or more specifically 'White Top Hat', returns the pixels that were removed by a Opening of the shape, that is the pixels that were removed to round off the points, and the connecting bridged between shapes. <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "5");
-        $canvas->morphology(\Imagick::MORPHOLOGY_TOP_HAT, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>The 'BottomHat' method, also known as 'Black TopHat' is the pixels that a Closing of the shape adds to the image. That is the pixels that were used to fill in the 'holes', 'gaps', and 'bridges'. <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "5");
-        $canvas->morphology(\Imagick::MORPHOLOGY_BOTTOM_HAT, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Hit and Miss <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        //This finds all the pixels with 3 pixels of the right edge
-        $matrix = [[1, false, false, 0]];
-        $kernel = \ImagickKernel::fromMatrix(
-            $matrix,
-            [0, 0]
-        );
-        $canvas->morphology(\Imagick::MORPHOLOGY_HIT_AND_MISS, 1, $kernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Thinning <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $leftEdgeKernel = \ImagickKernel::fromMatrix([[0, 1]], [1, 0]);
-        $rightEdgeKernel = \ImagickKernel::fromMatrix([[1, 0]], [0, 0]);
-        $leftEdgeKernel->addKernel($rightEdgeKernel);
-        
-        $canvas->morphology(\Imagick::MORPHOLOGY_THINNING, 3, $leftEdgeKernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Thicken <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $leftEdgeKernel = \ImagickKernel::fromMatrix([[0, 1]], [1, 0]);
-        $rightEdgeKernel = \ImagickKernel::fromMatrix([[1, 0]], [0, 0]);
-        $leftEdgeKernel->addKernel($rightEdgeKernel);
-
-        $canvas->morphology(\Imagick::MORPHOLOGY_THICKEN, 3, $leftEdgeKernel);
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Thick to generate a convex hull <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $diamondKernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DIAMOND, "1");
-        $convexKernel =  \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_CONVEX_HULL, "");
-
-        // The thicken morphology doesn't handle small gaps. We close them
-        // with the close morphology.
-        $canvas->morphology(\Imagick::MORPHOLOGY_CLOSE, 1, $diamondKernel);
-        $canvas->morphology(\Imagick::MORPHOLOGY_THICKEN, -1, $convexKernel);
-        $canvas->morphology(\Imagick::MORPHOLOGY_CLOSE, 1, $diamondKernel);
-
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Iterative morphology <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $canvas = $this->getCharacterOutline();
-        $kernel = \ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DISK, "2");        
-        $canvas->morphology(\Imagick::MORPHOLOGY_ITERATIVE, 3, $kernel);
-        $canvas->autoLevelImage();
-        header("Content-Type: image/png");
-        echo $canvas->getImageBlob();
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>Helper function to get an image silhouette <function>Imagick::morphology</function></title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-function getCharacterOutline() {
-    $imagick = new \Imagick(realpath("./images/character.png"));
-    $character = new \Imagick();
-    $character->newPseudoImage(
-        $imagick->getImageWidth(),
-        $imagick->getImageHeight(),
-        "canvas:white"
-    );
-    $canvas = new \Imagick();
-    $canvas->newPseudoImage(
-        $imagick->getImageWidth(),
-        $imagick->getImageHeight(),
-        "canvas:black"
-    );
-
-    $character->compositeimage(
-        $imagick,
-        \Imagick::COMPOSITE_COPYOPACITY,
-        0, 0
-    );
-    $canvas->compositeimage(
-        $character,
-        \Imagick::COMPOSITE_ATOP,
-        0, 0
-    );
-    $canvas->setFormat('png');
-
-    return $canvas;
-}
-?>
-]]>
-      </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/imagick/imagick/mosaicimages.xml b/reference/imagick/imagick/mosaicimages.xml
deleted file mode 100644
index 07fdf02cf4e6..000000000000
--- a/reference/imagick/imagick/mosaicimages.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.mosaicimages">
- <refnamediv>
-  <refname>Imagick::mosaicImages</refname>
-  <refpurpose>Forms a mosaic from images</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::mosaicImages</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Inlays an image sequence to form a single coherent picture. It
-   returns a wand with each image in the sequence composited at
-   the location defined by the page offset of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/motionblurimage.xml b/reference/imagick/imagick/motionblurimage.xml
deleted file mode 100644
index b8fc82b69fb0..000000000000
--- a/reference/imagick/imagick/motionblurimage.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.motionblurimage">
- <refnamediv>
-  <refname>Imagick::motionBlurImage</refname>
-  <refpurpose>Simulates motion blur</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::motionBlurImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>   
-  </methodsynopsis>
-  <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 for you. Angle gives the angle of the blurring motion.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the Gaussian, in pixels, not counting the center pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-      The standard deviation of the Gaussian, in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle</parameter></term>
-     <listitem>
-      <para>
-      Apply the effect along this angle.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-       The channel argument affects only if Imagick is compiled against ImageMagick version
-       6.4.4 or greater.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::motionBlurImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function motionBlurImage($imagePath, $radius, $sigma, $angle, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->motionBlurImage($radius, $sigma, $angle, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/negateimage.xml b/reference/imagick/imagick/negateimage.xml
deleted file mode 100644
index 64daefb084c7..000000000000
--- a/reference/imagick/imagick/negateimage.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.negateimage">
- <refnamediv>
-  <refname>Imagick::negateImage</refname>
-  <refpurpose>Negates the colors in the reference image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::negateImage</methodname>
-   <methodparam><type>bool</type><parameter>gray</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Negates the colors in the reference image. The Grayscale
-   option means that only grayscale values within the image
-   are negated.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gray</parameter></term>
-     <listitem>
-      <para>
-      Whether to only negate grayscale pixels within the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::negateImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function negateImage($imagePath, $grayOnly, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->negateImage($grayOnly, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/newimage.xml b/reference/imagick/imagick/newimage.xml
deleted file mode 100644
index 3eca99a87325..000000000000
--- a/reference/imagick/imagick/newimage.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.newimage">
- <refnamediv>
-  <refname>Imagick::newImage</refname>
-  <refpurpose>Creates a new image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::newImage</methodname>
-   <methodparam><type>int</type><parameter>cols</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>background</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new image and associates ImagickPixel value as background color
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>cols</parameter></term>
-     <listitem>
-      <para>
-      Columns in the new image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      Rows in the new image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>background</parameter></term>
-     <listitem>
-      <para>
-      The background color used for this image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-      Image format. This parameter was added in Imagick version 2.0.1.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the third parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::newImage</function>:</title>
-    <para>
-     Create a new image and display it.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$image = new Imagick();
-$image->newImage(100, 100, new ImagickPixel('red'));
-$image->setImageFormat('png');
-
-header('Content-type: image/png');
-echo $image;
-
-?>
-]]>
-    </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/imagick/imagick/newpseudoimage.xml b/reference/imagick/imagick/newpseudoimage.xml
deleted file mode 100644
index 1b83353632c8..000000000000
--- a/reference/imagick/imagick/newpseudoimage.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.newpseudoimage">
- <refnamediv>
-  <refname>Imagick::newPseudoImage</refname>
-  <refpurpose>Creates a new image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::newPseudoImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pseudoString</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new image using ImageMagick pseudo-formats.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       columns in the new image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       rows in the new image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pseudoString</parameter></term>
-     <listitem>
-      <para>
-       string containing pseudo image definition.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::newPseudoImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function newPseudoImage($canvasType) {
-    $imagick = new \Imagick();
-    $imagick->newPseudoImage(300, 300, $canvasType);
-    $imagick->setImageFormat("png");
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-//newPseudoImage('gradient:red-rgba(64, 255, 255, 0.5)');
-//newPseudoImage("radial-gradient:red-blue");
-newPseudoImage("plasma:fractal");
-
-?>
-]]>
-      </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/imagick/imagick/nextimage.xml b/reference/imagick/imagick/nextimage.xml
deleted file mode 100644
index b46311aa8a36..000000000000
--- a/reference/imagick/imagick/nextimage.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.nextimage">
- <refnamediv>
-  <refname>Imagick::nextImage</refname>
-  <refpurpose>Moves to the next image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::nextImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Associates the next image in the image list with an Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/normalizeimage.xml b/reference/imagick/imagick/normalizeimage.xml
deleted file mode 100644
index f79e5bc8054e..000000000000
--- a/reference/imagick/imagick/normalizeimage.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.normalizeimage">
- <refnamediv>
-  <refname>Imagick::normalizeImage</refname>
-  <refpurpose>Enhances the contrast of a color image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::normalizeImage</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::normalizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function normalizeImage($imagePath, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $original = clone $imagick;
-    $original->cropimage($original->getImageWidth() / 2, $original->getImageHeight(), 0, 0);
-    $imagick->normalizeImage($channel);
-    $imagick->compositeimage($original, \Imagick::COMPOSITE_ATOP, 0, 0);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/oilpaintimage.xml b/reference/imagick/imagick/oilpaintimage.xml
deleted file mode 100644
index 00eeada71b11..000000000000
--- a/reference/imagick/imagick/oilpaintimage.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.oilpaintimage">
- <refnamediv>
-  <refname>Imagick::oilPaintImage</refname>
-  <refpurpose>Simulates an oil painting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::oilPaintImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a special effect filter that simulates an oil painting.
-   Each pixel is replaced by the most frequent color occurring in
-   a circular region defined by radius.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      The radius of the circular neighborhood.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::oilPaintImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function oilPaintImage($imagePath, $radius) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->oilPaintImage($radius);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/opaquepaintimage.xml b/reference/imagick/imagick/opaquepaintimage.xml
deleted file mode 100644
index 1edffcfc2549..000000000000
--- a/reference/imagick/imagick/opaquepaintimage.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.opaquepaintimage">
- <refnamediv>
-  <refname>Imagick::opaquePaintImage</refname>
-  <refpurpose>Changes the color value of any pixel that matches target</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::opaquePaintImage</methodname>
-   <methodparam><type>mixed</type><parameter>target</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>fill</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>invert</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Changes any pixel that matches color with the color defined by fill.
-   &imagick.method.available.0x638;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>target</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the color to change
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       The replacement color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.fuzz;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>invert</parameter></term>
-     <listitem>
-      <para>
-       If &true; paints any pixel that does not match the target color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/optimizeimagelayers.xml b/reference/imagick/imagick/optimizeimagelayers.xml
deleted file mode 100644
index 860ee74d06b7..000000000000
--- a/reference/imagick/imagick/optimizeimagelayers.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.optimizeimagelayers">
- <refnamediv>
-  <refname>Imagick::optimizeImageLayers</refname>
-  <refpurpose>Removes repeated portions of images to optimize</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::optimizeImageLayers</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Compares each image the GIF disposed forms of the previous image
-   in the sequence.  From this it attempts to select the smallest
-   cropped image to replace each frame, while preserving the results
-   of the animation. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::optimizeImageLayers</function></title>
-    <para>
-      Reading, optimizing and writing a GIF image
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* create new imagick object */
-$im = new Imagick("test.gif");
-
-/* optimize the image layers */
-$im->optimizeImageLayers();
-
-/* write the image back */
-$im->writeImages("test_optimized.gif", true);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::compareImageLayers</function></member>
-    <member><function>Imagick::writeImages</function></member>
-    <member><function>Imagick::writeImage</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/imagick/imagick/orderedposterizeimage.xml b/reference/imagick/imagick/orderedposterizeimage.xml
deleted file mode 100644
index 1b68f546b626..000000000000
--- a/reference/imagick/imagick/orderedposterizeimage.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.orderedposterizeimage">
- <refnamediv>
-  <refname>Imagick::orderedPosterizeImage</refname>
-  <refpurpose>Performs an ordered dither</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::orderedPosterizeImage</methodname>
-   <methodparam><type>string</type><parameter>threshold_map</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-    Performs an ordered dither based on a number of pre-defined dithering threshold maps, 
-    but over multiple intensity levels, which can be different for different channels, 
-    according to the input arguments. &imagick.method.available.0x631;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold_map</parameter></term>
-     <listitem>
-      <para>
-       A string containing the name of the threshold dither map to use
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::orderedPosterizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function orderedPosterizeImage($imagePath, $orderedPosterizeType) {
-    $imagick = new \Imagick(realpath($imagePath));
-    
-  
-    $imagick->orderedPosterizeImage($orderedPosterizeType);
-    $imagick->setImageFormat('png');
-    
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-//orderedPosterizeImage($imagePath, 'o4x4,3,3');
-//orderedPosterizeImage($imagePath, 'o8x8,6,6');
-orderedPosterizeImage($imagePath, 'h8x8a');
-
-
-
-
-
-?>
-]]>
-      </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/imagick/imagick/paintfloodfillimage.xml b/reference/imagick/imagick/paintfloodfillimage.xml
deleted file mode 100644
index b0a5c503bdd4..000000000000
--- a/reference/imagick/imagick/paintfloodfillimage.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.paintfloodfillimage">
- <refnamediv>
-  <refname>Imagick::paintFloodfillImage</refname>
-  <refpurpose>Changes the color value of any pixel that matches target</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::paintFloodfillImage</methodname>
-   <methodparam><type>mixed</type><parameter>fill</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>bordercolor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Changes the color value of any pixel that matches target and is an
-   immediate neighbor. As of ImageMagick 6.3.8 this method has been deprecated
-   and <function>Imagick::floodfillPaintImage</function> should be used instead.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the fill color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The amount of fuzz. For example, set fuzz to 10 and the color red at
-       intensities of 100 and 102 respectively are now interpreted as the
-       same color for the purposes of the floodfill.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bordercolor</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel object or a string containing the border color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y start position of the floodfill
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/paintopaqueimage.xml b/reference/imagick/imagick/paintopaqueimage.xml
deleted file mode 100644
index 69ab54588655..000000000000
--- a/reference/imagick/imagick/paintopaqueimage.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.paintopaqueimage">
- <refnamediv>
-  <refname>Imagick::paintOpaqueImage</refname>
-  <refpurpose>Change any pixel that matches color</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::paintOpaqueImage</methodname>
-   <methodparam><type>mixed</type><parameter>target</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>fill</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes any pixel that matches color with the color defined by fill.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>target</parameter></term>
-     <listitem>
-      <para>
-       Change this target color to the fill color within the image. An
-       ImagickPixel object or a string representing the target color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       An ImagickPixel object or a string representing the fill color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The fuzz member of image defines how much tolerance is acceptable to
-       consider two colors as the same.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as first and second parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/painttransparentimage.xml b/reference/imagick/imagick/painttransparentimage.xml
deleted file mode 100644
index a3d4c9a2a4d0..000000000000
--- a/reference/imagick/imagick/painttransparentimage.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.painttransparentimage">
- <refnamediv>
-  <refname>Imagick::paintTransparentImage</refname>
-  <refpurpose>Changes any pixel that matches color with the color defined by fill</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::paintTransparentImage</methodname>
-   <methodparam><type>mixed</type><parameter>target</parameter></methodparam>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes any pixel that matches color with the color defined by fill.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>target</parameter></term>
-     <listitem>
-      <para>
-      Change this target color to specified opacity value within the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       The level of transparency: 1.0 is fully opaque and 0.0 is fully 
-       transparent.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The fuzz member of image defines how much tolerance is acceptable to
-       consider two colors as the same.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/pingimage.xml b/reference/imagick/imagick/pingimage.xml
deleted file mode 100644
index 317c11c38a58..000000000000
--- a/reference/imagick/imagick/pingimage.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.pingimage">
- <refnamediv>
-  <refname>Imagick::pingImage</refname>
-  <refpurpose>Fetch basic attributes about the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::pingImage</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method can be used to query image width, height, size, and
-   format without reading the whole image in to memory.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      The filename to read the information from.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/pingimageblob.xml b/reference/imagick/imagick/pingimageblob.xml
deleted file mode 100644
index 3c8275140463..000000000000
--- a/reference/imagick/imagick/pingimageblob.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.pingimageblob">
- <refnamediv>
-  <refname>Imagick::pingImageBlob</refname>
-  <refpurpose>Quickly fetch attributes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::pingImageBlob</methodname>
-   <methodparam><type>string</type><parameter>image</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This method can be used to query image width, height, size, and
-   format without reading the whole image to memory. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>image</parameter></term>
-     <listitem>
-      <para>
-      A string containing the image.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::pingImageBlob</function></title>
-    <para>
-      Pinging an image from a string
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* read image contents */
-$image = file_get_contents("test.jpg");
-
-/* create new imagick object */
-$im = new Imagick();
-
-/* pass the string to the imagick object */
-$im->pingImageBlob($image);
-
-/* output image width and height */
-echo $im->getImageWidth() . 'x' . $im->getImageHeight();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::pingImage</function></member>
-    <member><function>Imagick::pingImageFile</function></member>
-    <member><function>Imagick::readImage</function></member>
-    <member><function>Imagick::readImageBlob</function></member>
-    <member><function>Imagick::readImageFile</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/imagick/imagick/pingimagefile.xml b/reference/imagick/imagick/pingimagefile.xml
deleted file mode 100644
index ab6681b27d30..000000000000
--- a/reference/imagick/imagick/pingimagefile.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.pingimagefile">
- <refnamediv>
-  <refname>Imagick::pingImageFile</refname>
-  <refpurpose>Get basic image attributes in a lightweight manner</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::pingImageFile</methodname>
-   <methodparam><type>resource</type><parameter>filehandle</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>fileName</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This method can be used to query image width, height, size, and
-   format without reading the whole image to memory. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filehandle</parameter></term>
-     <listitem>
-      <para>
-      An open filehandle to the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fileName</parameter></term>
-     <listitem>
-      <para>
-      Optional filename for this image.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::pingImageFile</function></title>
-    <para>
-      Opening a remote location
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* fopen a remote location */
-$fp = fopen("http://example.com/test.jpg");
-
-/* create new imagick object */
-$im = new Imagick();
-
-/* pass the handle to imagick */
-$im->pingImageFile($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::pingImage</function></member>
-    <member><function>Imagick::pingImageBlob</function></member>
-    <member><function>Imagick::readImage</function></member>
-    <member><function>Imagick::readImageBlob</function></member>
-    <member><function>Imagick::readImageFile</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/imagick/imagick/polaroidimage.xml b/reference/imagick/imagick/polaroidimage.xml
deleted file mode 100644
index ed7a2298a5ee..000000000000
--- a/reference/imagick/imagick/polaroidimage.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.polaroidimage">
- <refnamediv>
-  <refname>Imagick::polaroidImage</refname>
-  <refpurpose>Simulates a Polaroid picture</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::polaroidImage</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>properties</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Simulates a Polaroid picture. &imagick.method.available.0x632;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>properties</parameter></term>
-     <listitem>
-      <para>
-       The polaroid properties
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle</parameter></term>
-     <listitem>
-      <para>
-       The polaroid angle
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>Imagick::polaroidImage</function> example</title>
-    <para>
-     An example of using Imagick::polaroidImage()
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create the object */
-$image = new Imagick('source.png');
-
-/* Set the opacity */
-$image->polaroidImage(new ImagickDraw(), 25);
-
-/* output the image */
-header('Content-type: image/png');
-echo $image;
-
-?>
-]]>
-    </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/imagick/imagick/posterizeimage.xml b/reference/imagick/imagick/posterizeimage.xml
deleted file mode 100644
index 1486275bfb66..000000000000
--- a/reference/imagick/imagick/posterizeimage.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.posterizeimage">
- <refnamediv>
-  <refname>Imagick::posterizeImage</refname>
-  <refpurpose>Reduces the image to a limited number of color level</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::posterizeImage</methodname>
-   <methodparam><type>int</type><parameter>levels</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reduces the image to a limited number of color level.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>levels</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dither</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::posterizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function posterizeImage($imagePath, $posterizeType, $numberLevels) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->posterizeImage($numberLevels, $posterizeType);
-    $imagick->setImageFormat('png');
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-posterizeImage($imagePath, \Imagick::DITHERMETHOD_RIEMERSMA, 8);
-
-?>
-]]>
-      </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/imagick/imagick/previewimages.xml b/reference/imagick/imagick/previewimages.xml
deleted file mode 100644
index e04425a2f3af..000000000000
--- a/reference/imagick/imagick/previewimages.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.previewimages">
- <refnamediv>
-  <refname>Imagick::previewImages</refname>
-  <refpurpose>Quickly pin-point appropriate parameters for image processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::previewImages</methodname>
-   <methodparam><type>int</type><parameter>preview</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Tiles 9 thumbnails of the specified image with an image processing
-   operation applied at varying strengths.  This is helpful to quickly
-   pin-point an appropriate parameter for an image processing operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>preview</parameter></term>
-     <listitem>
-      <para>
-       Preview type. See <link linkend="imagick.constants.preview">Preview type constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/previousimage.xml b/reference/imagick/imagick/previousimage.xml
deleted file mode 100644
index 88a79f871c38..000000000000
--- a/reference/imagick/imagick/previousimage.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.previousimage">
- <refnamediv>
-  <refname>Imagick::previousImage</refname>
-  <refpurpose>Move to the previous image in the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::previousImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   &imagick.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/imagick/imagick/profileimage.xml b/reference/imagick/imagick/profileimage.xml
deleted file mode 100644
index 92d5ede99145..000000000000
--- a/reference/imagick/imagick/profileimage.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.profileimage">
- <refnamediv>
-  <refname>Imagick::profileImage</refname>
-  <refpurpose>Adds or removes a profile from an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::profileImage</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>profile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds or removes a <acronym>ICC</acronym>, <acronym>IPTC</acronym>,
-   or generic profile from an image.
-   If the <parameter>profile</parameter> is &null;,
-   it is removed from the image rather than added.
-  </simpara>
-  <simpara>
-   To remove every single profile from the image use <literal>'*'</literal>
-   as the <parameter>name</parameter> and &null; for the
-   <parameter>profile</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <simpara>
-       The profile name.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>profile</parameter></term>
-     <listitem>
-      <simpara>
-       The profile data.
-       If &null;, the specified profile will be deleted.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/quantizeimage.xml b/reference/imagick/imagick/quantizeimage.xml
deleted file mode 100644
index 82cf4a5cc95a..000000000000
--- a/reference/imagick/imagick/quantizeimage.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.quantizeimage">
- <refnamediv>
-  <refname>Imagick::quantizeImage</refname>
-  <refpurpose>Analyzes the colors within a reference image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::quantizeImage</methodname>
-   <methodparam><type>int</type><parameter>numberColors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-   <methodparam><type>int</type><parameter>treedepth</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>measureError</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>numberColors</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>colorspace</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>treedepth</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dither</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>measureError</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::quantizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function quantizeImage($imagePath, $numberColors, $colorSpace, $treeDepth, $dither) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->quantizeImage($numberColors, $colorSpace, $treeDepth, $dither, false);
-    $imagick->setImageFormat('png');
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/quantizeimages.xml b/reference/imagick/imagick/quantizeimages.xml
deleted file mode 100644
index a328c2f167c8..000000000000
--- a/reference/imagick/imagick/quantizeimages.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.quantizeimages">
- <refnamediv>
-  <refname>Imagick::quantizeImages</refname>
-  <refpurpose>Analyzes the colors within a sequence of images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::quantizeImages</methodname>
-   <methodparam><type>int</type><parameter>numberColors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-   <methodparam><type>int</type><parameter>treedepth</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>dither</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>measureError</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>numberColors</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>colorspace</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>treedepth</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dither</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>measureError</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/queryfontmetrics.xml b/reference/imagick/imagick/queryfontmetrics.xml
deleted file mode 100644
index 99a8a31f98dc..000000000000
--- a/reference/imagick/imagick/queryfontmetrics.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.queryfontmetrics">
- <refnamediv>
-  <refname>Imagick::queryFontMetrics</refname>
-  <refpurpose>Returns an array representing the font metrics</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Imagick::queryFontMetrics</methodname>
-   <methodparam><type>ImagickDraw</type><parameter>properties</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>multiline</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a multi-dimensional array representing the font metrics.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>properties</parameter></term>
-     <listitem>
-      <para>
-       ImagickDraw object containing font properties
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>multiline</parameter></term>
-     <listitem>
-      <para>
-       Multiline parameter. If left empty it is autodetected
-      </para>
-     </listitem>
-    </varlistentry>
-    
-   </variablelist>
-  </para>
-  
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a multi-dimensional array representing the font metrics.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::queryFontMetrics</function>:</title>
-    <para>
-     Query the metrics for the text and dump the results on the screen.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create a new Imagick object */
-$im = new Imagick();
-
-/* Create an ImagickDraw object */
-$draw = new ImagickDraw();
-
-/* Set the font */
-$draw->setFont('/path/to/font.ttf');
-
-/* Dump the font metrics, autodetect multiline */
-var_dump($im->queryFontMetrics($draw, "Hello World!"));
-?>
-]]>
-    </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/imagick/imagick/queryfonts.xml b/reference/imagick/imagick/queryfonts.xml
deleted file mode 100644
index f851a0ae2686..000000000000
--- a/reference/imagick/imagick/queryfonts.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.queryfonts">
- <refnamediv>
-  <refname>Imagick::queryFonts</refname>
-  <refpurpose>Returns the configured fonts</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::queryFonts</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the configured fonts.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-       The query pattern
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-  
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the configured fonts.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
- 
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::queryFonts</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $output = '';
-        $output .= "Fonts that match 'Helvetica*' are:<br/>";
-
-        $fontList = \Imagick::queryFonts("Helvetica*");
- 
-        foreach ($fontList as $fontName) {
-            $output .= '<li>'. $fontName."</li>";
-        }
-
-        return $output;
-
-?>
-]]>
-      </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/imagick/imagick/queryformats.xml b/reference/imagick/imagick/queryformats.xml
deleted file mode 100644
index dc9a035f34ac..000000000000
--- a/reference/imagick/imagick/queryformats.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.queryformats">
- <refnamediv>
-  <refname>Imagick::queryFormats</refname>
-  <refpurpose>Returns formats supported by Imagick</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Imagick::queryFormats</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>pattern</parameter><initializer>"*"</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns formats supported by Imagick.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the formats supported by Imagick.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::queryFormats</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function render() {
-        $output = "";
-        $input = \Imagick::queryformats();
-        $columns = 6;
-
-        $output .= "<table border='2'>";
-
-        for ($i=0; $i < count($input); $i += $columns) {
-            $output .= "<tr>";
-            for ($c=0; $c<$columns; $c++) {
-                $output .= "<td>";
-                if (($i + $c) <  count($input)) {
-                    $output .= $input[$i + $c];
-                }
-                $output .= "</td>";
-            }
-            $output .= "</tr>";
-        }
-
-        $output .= "</table>";
-
-        return $output;
-    }
-
-?>
-]]>
-      </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/imagick/imagick/radialblurimage.xml b/reference/imagick/imagick/radialblurimage.xml
deleted file mode 100644
index 748ff7ee964e..000000000000
--- a/reference/imagick/imagick/radialblurimage.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.radialblurimage">
- <refnamediv>
-  <refname>Imagick::radialBlurImage</refname>
-  <refpurpose>Radial blurs an image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::radialBlurImage</methodname>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Radial blurs an image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>angle</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::radialBlurImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function radialBlurImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    //Blur 3 times with different radii
-    $imagick->radialBlurImage(3);
-    $imagick->radialBlurImage(5);
-    $imagick->radialBlurImage(7);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/raiseimage.xml b/reference/imagick/imagick/raiseimage.xml
deleted file mode 100644
index 7a91037752e4..000000000000
--- a/reference/imagick/imagick/raiseimage.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.raiseimage">
- <refnamediv>
-  <refname>Imagick::raiseImage</refname>
-  <refpurpose>Creates a simulated 3d button-like effect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::raiseImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>raise</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</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>raise</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::raiseImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function raiseImage($imagePath, $width, $height, $x, $y, $raise) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    //x and y do nothing?
-    $imagick->raiseImage($width, $height, $x, $y, $raise);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/randomthresholdimage.xml b/reference/imagick/imagick/randomthresholdimage.xml
deleted file mode 100644
index 600e9b68204c..000000000000
--- a/reference/imagick/imagick/randomthresholdimage.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.randomthresholdimage">
- <refnamediv>
-  <refname>Imagick::randomThresholdImage</refname>
-  <refpurpose>Creates a high-contrast, two-color image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::randomThresholdImage</methodname>
-   <methodparam><type>float</type><parameter>low</parameter></methodparam>
-   <methodparam><type>float</type><parameter>high</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Changes the value of individual pixels based on the
-   intensity of each pixel compared to threshold. The
-   result is a high-contrast, two color image. &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>low</parameter></term>
-     <listitem>
-      <para>
-       The low point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>high</parameter></term>
-     <listitem>
-      <para>
-       The high point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Provide any channel constant that is valid for your channel mode. To
-       apply to more than one channel, combine channeltype constants using
-       bitwise operators. Refer to this
-       list of  <link linkend="imagick.constants.channel">channel constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::randomThresholdImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function randomThresholdimage($imagePath, $lowThreshold, $highThreshold, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imagick->randomThresholdimage(
-        $lowThreshold * \Imagick::getQuantum(),
-        $highThreshold * \Imagick::getQuantum(),
-        $channel
-    );
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/readimage.xml b/reference/imagick/imagick/readimage.xml
deleted file mode 100644
index 7a3cc0d29d45..000000000000
--- a/reference/imagick/imagick/readimage.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.readimage">
- <refnamediv>
-  <refname>Imagick::readImage</refname>
-  <refpurpose>Reads image from filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::readImage</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads image from filename
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/readimageblob.xml b/reference/imagick/imagick/readimageblob.xml
deleted file mode 100644
index bbbc8296e3e8..000000000000
--- a/reference/imagick/imagick/readimageblob.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.readimageblob">
- <refnamediv>
-  <refname>Imagick::readImageBlob</refname>
-  <refpurpose>Reads image from a binary string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::readImageBlob</methodname>
-   <methodparam><type>string</type><parameter>image</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads image from a binary string
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>image</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::readImageBlob</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function readImageBlob() {
-    $base64 = "iVBORw0KGgoAAAANSUhEUgAAAM0AAAD
- NCAMAAAAsYgRbAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5c
- cllPAAAABJQTFRF3NSmzMewPxIG//ncJEJsldTou1jHgAAAARBJREFUeNrs2EEK
- gCAQBVDLuv+V20dENbMY831wKz4Y/VHb/5RGQ0NDQ0NDQ0NDQ0NDQ0NDQ
- 0NDQ0NDQ0NDQ0NDQ0NDQ0NDQ0PzMWtyaGhoaGhoaGhoaGhoaGhoxtb0QGho
- aGhoaGhoaGhoaGhoaMbRLEvv50VTQ9OTQ5OpyZ01GpM2g0bfmDQaL7S+ofFC6x
- v3ZpxJiywakzbvd9r3RWPS9I2+MWk0+kbf0Hih9Y17U0nTHibrDDQ0NDQ0NDQ0
- NDQ0NDQ0NTXbRSL/AK72o6GhoaGhoRlL8951vwsNDQ0NDQ1NDc0WyHtDTEhD
- Q0NDQ0NTS5MdGhoaGhoaGhoaGhoaGhoaGhoaGhoaGposzSHAAErMwwQ2HwRQ
- AAAAAElFTkSuQmCC";
-
-    $imageBlob = base64_decode($base64);
-
-    $imagick = new Imagick();
-    $imagick->readImageBlob($imageBlob);
-
-    header("Content-Type: image/png");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagick/readimagefile.xml b/reference/imagick/imagick/readimagefile.xml
deleted file mode 100644
index 0e1fd81f5c86..000000000000
--- a/reference/imagick/imagick/readimagefile.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.readimagefile">
- <refnamediv>
-  <refname>Imagick::readImageFile</refname>
-  <refpurpose>Reads image from open filehandle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::readImageFile</methodname>
-   <methodparam><type>resource</type><parameter>filehandle</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>fileName</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads image from open filehandle
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filehandle</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fileName</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/readimages.xml b/reference/imagick/imagick/readimages.xml
deleted file mode 100644
index 03c77443ac00..000000000000
--- a/reference/imagick/imagick/readimages.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.readimages" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::readimages</refname>
-  <refpurpose>Reads image from an array of filenames</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::readImages</methodname>
-   <methodparam><type>array</type><parameter>filenames</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reads image from an array of filenames. All the images are held in a single Imagick object.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filenames</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/recolorimage.xml b/reference/imagick/imagick/recolorimage.xml
deleted file mode 100644
index e5c939cac18d..000000000000
--- a/reference/imagick/imagick/recolorimage.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.recolorimage">
- <refnamediv>
-  <refname>Imagick::recolorImage</refname>
-  <refpurpose>Recolors image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::recolorImage</methodname>
-   <methodparam><type>array</type><parameter>matrix</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Translate, scale, shear, or rotate image colors. This method supports variable sized matrices but normally
-   5x5 matrix is used for RGBA and 6x6 is used for CMYK. The last row should contain the normalized values.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matrix</parameter></term>
-     <listitem>
-      <para>
-       The matrix containing the color values
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::recolorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function recolorImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $remapColor = [ 1, 0, 0,
-        0, 0, 1,
-        0, 1, 0,];
-
-//$remapColor = [
-//    1.438, -0.122, -0.016,  0, 0, -0.03,
-//    -0.062,  1.378, -0.016,  0, 0,  0.05,
-//    -0.062, -0.122, 1.483,   0, 0, -0.02,
-//];
-
-    @$imagick->recolorImage($remapColor);
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/reducenoiseimage.xml b/reference/imagick/imagick/reducenoiseimage.xml
deleted file mode 100644
index ba8ec0d5aaf7..000000000000
--- a/reference/imagick/imagick/reducenoiseimage.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.reducenoiseimage">
- <refnamediv>
-  <refname>Imagick::reduceNoiseImage</refname>
-  <refpurpose>Smooths the contours of an image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::reduceNoiseImage</methodname>
-   <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 Imagick::reduceNoiseImage() selects a
-   suitable radius for you.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::reduceNoiseImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function reduceNoiseImage($imagePath, $reduceNoise) {
-    $imagick = new \Imagick(realpath($imagePath));
-    @$imagick->reduceNoiseImage($reduceNoise);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/remapimage.xml b/reference/imagick/imagick/remapimage.xml
deleted file mode 100644
index cf49236b5db4..000000000000
--- a/reference/imagick/imagick/remapimage.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.remapimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::remapImage</refname>
-  <refpurpose>Remaps image colors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::remapImage</methodname>
-   <methodparam><type>Imagick</type><parameter>replacement</parameter></methodparam>
-   <methodparam><type>int</type><parameter>DITHER</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Replaces colors an image with those defined by <parameter>replacement</parameter>. The colors
-   are replaced with the closest possible color. &imagick.method.available.0x645;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>replacement</parameter></term>
-     <listitem>
-      <para>
-       An Imagick object containing the replacement colors
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>DITHER</parameter></term>
-     <listitem>
-      <para>
-       Refer to this list of <link linkend="imagick.constants.dithermethod">dither method constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/removeimage.xml b/reference/imagick/imagick/removeimage.xml
deleted file mode 100644
index 1c35b7fa5bdc..000000000000
--- a/reference/imagick/imagick/removeimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.removeimage">
- <refnamediv>
-  <refname>Imagick::removeImage</refname>
-  <refpurpose>Removes an image from the image list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::removeImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Removes an image from the image list.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/removeimageprofile.xml b/reference/imagick/imagick/removeimageprofile.xml
deleted file mode 100644
index 361b847370ef..000000000000
--- a/reference/imagick/imagick/removeimageprofile.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.removeimageprofile">
- <refnamediv>
-  <refname>Imagick::removeImageProfile</refname>
-  <refpurpose>Removes the named image profile and returns it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::removeImageProfile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes the named image profile and returns it.
-  </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>
-   Returns a string containing the profile of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/render.xml b/reference/imagick/imagick/render.xml
deleted file mode 100644
index b3ca8356c95c..000000000000
--- a/reference/imagick/imagick/render.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.render">
- <refnamediv>
-  <refname>Imagick::render</refname>
-  <refpurpose>Renders all preceding drawing commands</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::render</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Renders all preceding drawing commands.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/resampleimage.xml b/reference/imagick/imagick/resampleimage.xml
deleted file mode 100644
index c70e3795f913..000000000000
--- a/reference/imagick/imagick/resampleimage.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.resampleimage">
- <refnamediv>
-  <refname>Imagick::resampleImage</refname>
-  <refpurpose>Resample image to desired resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::resampleImage</methodname>
-   <methodparam><type>float</type><parameter>x_resolution</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y_resolution</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
-   <methodparam><type>float</type><parameter>blur</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Resample image to desired resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x_resolution</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y_resolution</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filter</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>blur</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::resampleImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function resampleImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imagick->resampleImage(200, 200, \Imagick::FILTER_LANCZOS, 1);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/resetimagepage.xml b/reference/imagick/imagick/resetimagepage.xml
deleted file mode 100644
index 8571a06e51e4..000000000000
--- a/reference/imagick/imagick/resetimagepage.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.resetimagepage">
- <refnamediv>
-  <refname>Imagick::resetImagePage</refname>
-  <refpurpose>Reset image page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::resetImagePage</methodname>
-   <methodparam><type>string</type><parameter>page</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   The page definition as a string. The string is in format WxH+x+y.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>page</parameter></term>
-     <listitem>
-      <para>
-       The page definition. For example <literal>7168x5147+0+0</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/resizeimage.xml b/reference/imagick/imagick/resizeimage.xml
deleted file mode 100644
index 684a194da065..000000000000
--- a/reference/imagick/imagick/resizeimage.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.resizeimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::resizeImage</refname>
-  <refpurpose>Scales an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::resizeImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>int</type><parameter>filter</parameter></methodparam>
-   <methodparam><type>float</type><parameter>blur</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>bestfit</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales an image to the desired dimensions with a
-   <link linkend="imagick.constants.filters">filter</link>.
-  </para>
-  &imagick.bestfit.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       Width of the image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       Height of the image
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filter</parameter></term>
-     <listitem>
-      <para>
-       Refer to the list of <link linkend="imagick.constants.filters">filter constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>blur</parameter></term>
-     <listitem>
-      <para>
-       The blur factor where &gt; 1 is blurry, &lt; 1 is sharp.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bestfit</parameter></term>
-     <listitem>
-      <simpara>
-       Optional <type>bool</type> parameter.
-       If set to true, the image is resized to fit within the given dimensions
-       while preserving the aspect ratio.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><parameter>legacy</parameter></term>
-     <listitem>
-      <simpara>
-       Optional <type>bool</type> parameter.
-       If set to true, the calculations are done with the small rounding bug that existed in
-       Imagick before 3.4.0. If set to false, the calculations should produce the same results
-       as the ImageMagick command-line tools.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-      <entry>
-      Added optional fit parameter. This method now supports proportional scaling.
-      Pass zero as either parameter for proportional scaling.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL imagick 3.4.0</entry>
-      <entry>
-       Added the <parameter>legacy</parameter> parameter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::resizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function resizeImage($imagePath, $width, $height, $filterType, $blur, $bestFit, $cropZoom) {
-    //The blur factor where > 1 is blurry, < 1 is sharp.
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imagick->resizeImage($width, $height, $filterType, $blur, $bestFit);
-
-    $cropWidth = $imagick->getImageWidth();
-    $cropHeight = $imagick->getImageHeight();
-
-    if ($cropZoom) {
-        $newWidth = $cropWidth / 2;
-        $newHeight = $cropHeight / 2;
-
-        $imagick->cropimage(
-            $newWidth,
-            $newHeight,
-            ($cropWidth - $newWidth) / 2,
-            ($cropHeight - $newHeight) / 2
-        );
-
-        $imagick->scaleimage(
-            $imagick->getImageWidth() * 4,
-            $imagick->getImageHeight() * 4
-        );
-    }
-
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/rollimage.xml b/reference/imagick/imagick/rollimage.xml
deleted file mode 100644
index 56cda4d772b4..000000000000
--- a/reference/imagick/imagick/rollimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.rollimage">
- <refnamediv>
-  <refname>Imagick::rollImage</refname>
-  <refpurpose>Offsets an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::rollImage</methodname>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Offsets an image as defined by x and y.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The X offset.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The Y offset.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::rollImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function rollImage($imagePath, $rollX, $rollY) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->rollimage($rollX, $rollY);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/rotateimage.xml b/reference/imagick/imagick/rotateimage.xml
deleted file mode 100644
index 941d010384da..000000000000
--- a/reference/imagick/imagick/rotateimage.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.rotateimage">
- <refnamediv>
-  <refname>Imagick::rotateImage</refname>
-  <refpurpose>Rotates an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::rotateImage</methodname>
-   <methodparam><type>mixed</type><parameter>background</parameter></methodparam>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Rotates an image the specified number of degrees. Empty
-   triangles left over from rotating the image are filled
-   with the background color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>background</parameter></term>
-     <listitem>
-      <para>
-       The background color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>degrees</parameter></term>
-     <listitem>
-      <para>
-       Rotation angle, in degrees. The rotation angle is interpreted as the
-       number of degrees to rotate the image clockwise.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::rotateImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function rotateImage($imagePath, $angle, $color) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->rotateimage($color, $angle);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/rotationalblurimage.xml b/reference/imagick/imagick/rotationalblurimage.xml
deleted file mode 100644
index 78b1903cbf6c..000000000000
--- a/reference/imagick/imagick/rotationalblurimage.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.rotationalblurimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::rotationalBlurImage</refname>
-  <refpurpose>Rotational blurs an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::rotationalBlurImage</methodname>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Rotational blurs an image.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <para>
-      The angle to apply the blur over.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      &imagick.parameter.channel;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::rotationalBlurImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function rotationalBlurImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->rotationalBlurImage(3);
-    $imagick->rotationalBlurImage(5);
-    $imagick->rotationalBlurImage(7);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/roundcorners.xml b/reference/imagick/imagick/roundcorners.xml
deleted file mode 100644
index a1feaee6a062..000000000000
--- a/reference/imagick/imagick/roundcorners.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.roundcorners">
- <refnamediv>
-  <refname>Imagick::roundCorners</refname>
-  <refpurpose>Rounds image corners</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::roundCorners</methodname>
-   <methodparam><type>float</type><parameter>x_rounding</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y_rounding</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>stroke_width</parameter><initializer>10</initializer></methodparam>   
-   <methodparam choice="opt"><type>float</type><parameter>displace</parameter><initializer>5</initializer></methodparam>   
-   <methodparam choice="opt"><type>float</type><parameter>size_correction</parameter><initializer>-6</initializer></methodparam>   
-  </methodsynopsis>
-  <para>
-   Rounds image corners. The first two parameters control the amount 
-   of rounding and the three last parameters can be used to fine-tune 
-   the rounding process. &imagick.method.available.0x629;
-   &imagick.method.not.available.0x700;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x_rounding</parameter></term>
-     <listitem>
-      <para>
-       x rounding
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y_rounding</parameter></term>
-     <listitem>
-      <para>
-       y rounding
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stroke_width</parameter></term>
-     <listitem>
-      <para>
-        stroke width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>displace</parameter></term>
-     <listitem>
-      <para>
-        image displace
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size_correction</parameter></term>
-     <listitem>
-      <para>
-        size correction
-      </para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::roundCorners</function>:</title>
-    <para>
-     Rounds the image corners
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$image = new Imagick();
-$image->newPseudoImage(100, 100, "magick:rose");
-$image->setImageFormat("png");
-
-$image->roundCorners(5,3);
-$image->writeImage("rounded.png");
-?>
-]]>
-    </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/imagick/imagick/sampleimage.xml b/reference/imagick/imagick/sampleimage.xml
deleted file mode 100644
index 42d458e13464..000000000000
--- a/reference/imagick/imagick/sampleimage.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.sampleimage">
- <refnamediv>
-  <refname>Imagick::sampleImage</refname>
-  <refpurpose>Scales an image with pixel sampling</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sampleImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales an image to the desired dimensions with pixel sampling.
-   Unlike other scaling methods, this method does not introduce
-   any additional color into the scaled image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/scaleimage.xml b/reference/imagick/imagick/scaleimage.xml
deleted file mode 100644
index 3e1e3ef5943d..000000000000
--- a/reference/imagick/imagick/scaleimage.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.scaleimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::scaleImage</refname>
-  <refpurpose>Scales the size of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::scaleImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>bestfit</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <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>
-  &imagick.bestfit.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <simpara>
-       The number of columns in the scaled image.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <simpara>
-       The number of rows in the scaled image.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bestfit</parameter></term>
-     <listitem>
-      <simpara>
-       Whether to fit the image within the given dimensions while preserving
-       the aspect ratio.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>legacy</parameter></term>
-     <listitem>
-      <simpara>
-       Optional <type>bool</type> parameter.
-       If set to true, the calculations are done with the small rounding bug
-       that existed in Imagick before 3.4.0. If set to false, the calculations
-       should produce the same results as the ImageMagick command-line tools.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL imagick 2.1.0</entry>
-      <entry>
-      Added optional fit parameter. This method now supports proportional scaling.
-      Pass zero as either parameter for proportional scaling.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL imagick 3.4.0</entry>
-      <entry>
-       Added the <parameter>legacy</parameter> parameter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::scaleImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function scaleImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->scaleImage(150, 150, true);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/segmentimage.xml b/reference/imagick/imagick/segmentimage.xml
deleted file mode 100644
index fed4e23304e8..000000000000
--- a/reference/imagick/imagick/segmentimage.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.segmentimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::segmentImage</refname>
-  <refpurpose>Segments an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::segmentImage</methodname>
-   <methodparam><type>int</type><parameter>COLORSPACE</parameter></methodparam>
-   <methodparam><type>float</type><parameter>cluster_threshold</parameter></methodparam>
-   <methodparam><type>float</type><parameter>smooth_threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>verbose</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Analyses the image and identifies units that are similar. &imagick.method.available.0x645;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>COLORSPACE</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.colorspace">COLORSPACE constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cluster_threshold</parameter></term>
-     <listitem>
-      <para>
-       A percentage describing minimum number of pixels 
-       contained in hexedra before it is considered valid.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>smooth_threshold</parameter></term>
-     <listitem>
-      <para>
-       Eliminates noise from the histogram.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>verbose</parameter></term>
-     <listitem>
-      <para>
-       Whether to output detailed information about recognised classes.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::segmentImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function segmentImage($imagePath, $colorSpace, $clusterThreshold, $smoothThreshold) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->segmentImage($colorSpace, $clusterThreshold, $smoothThreshold);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-segmentImage($imagePath, \Imagick::COLORSPACE_RGB, 5, 5);
-
-?>
-]]>
-      </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/imagick/imagick/selectiveblurimage.xml b/reference/imagick/imagick/selectiveblurimage.xml
deleted file mode 100644
index 4c5332a3e9b6..000000000000
--- a/reference/imagick/imagick/selectiveblurimage.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.selectiveblurimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::selectiveBlurImage</refname>
-  <refpurpose>Selectively blur an image within a contrast threshold</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::selectiveBlurImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Selectively blur an image within a contrast threshold. It is similar to the unsharpen mask that sharpens everything with contrast above a certain threshold.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sigma</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>threshold</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      &imagick.parameter.channel;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::selectiveBlurImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function selectiveBlurImage($imagePath, $radius, $sigma, $threshold, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->selectiveBlurImage($radius, $sigma, $threshold, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/separateimagechannel.xml b/reference/imagick/imagick/separateimagechannel.xml
deleted file mode 100644
index ec9606d4a608..000000000000
--- a/reference/imagick/imagick/separateimagechannel.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.separateimagechannel">
- <refnamediv>
-  <refname>Imagick::separateImageChannel</refname>
-  <refpurpose>Separates a channel from the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::separateImageChannel</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       Which 'channel' to return. For colorspaces other than RGB, you can still use the CHANNEL_RED, CHANNEL_GREEN, CHANNEL_BLUE constants to indicate the 1st, 2nd and 3rd channels.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::separateImageChannel</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function separateImageChannel($imagePath, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->separateimagechannel($channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-separateImageChannel($imagePath, \Imagick::CHANNEL_GREEN);
-
-?>
-]]>
-      </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/imagick/imagick/sepiatoneimage.xml b/reference/imagick/imagick/sepiatoneimage.xml
deleted file mode 100644
index 882814be8e12..000000000000
--- a/reference/imagick/imagick/sepiatoneimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.sepiatoneimage">
- <refnamediv>
-  <refname>Imagick::sepiaToneImage</refname>
-  <refpurpose>Sepia tones an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sepiaToneImage</methodname>
-   <methodparam><type>float</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a special effect to the image, similar to the effect achieved
-   in a photo darkroom by sepia toning.  Threshold ranges from 0 to
-   QuantumRange and is a measure of the extent of the sepia toning. A
-   threshold of 80 is a good starting point for a reasonable tone.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::sepiaToneImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function sepiaToneImage($imagePath, $sepia) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->sepiaToneImage($sepia);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setbackgroundcolor.xml b/reference/imagick/imagick/setbackgroundcolor.xml
deleted file mode 100644
index 8a0a67634aa6..000000000000
--- a/reference/imagick/imagick/setbackgroundcolor.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setbackgroundcolor">
- <refnamediv>
-  <refname>Imagick::setBackgroundColor</refname>
-  <refpurpose>Sets the object's default background color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setBackgroundColor</methodname>
-   <methodparam><type>mixed</type><parameter>background</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the object's default background color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>background</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as a parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/setcolorspace.xml b/reference/imagick/imagick/setcolorspace.xml
deleted file mode 100644
index 2e9860d320bf..000000000000
--- a/reference/imagick/imagick/setcolorspace.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setcolorspace">
- <refnamediv>
-  <refname>Imagick::setColorspace</refname>
-  <refpurpose>Set colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setColorspace</methodname>
-   <methodparam><type>int</type><parameter>COLORSPACE</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the global colorspace value for the object.
-   &imagick.method.available.0x657;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>COLORSPACE</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.colorspace">COLORSPACE constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setcompression.xml b/reference/imagick/imagick/setcompression.xml
deleted file mode 100644
index 8291334e7091..000000000000
--- a/reference/imagick/imagick/setcompression.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setcompression">
- <refnamediv>
-  <refname>Imagick::setCompression</refname>
-  <refpurpose>Sets the object's default compression type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setCompression</methodname>
-   <methodparam><type>int</type><parameter>compression</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the object's default compression type
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>compression</parameter></term>
-     <listitem>
-      <para>
-       The compression type. See the <link linkend="imagick.constants">Imagick::COMPRESSION_*</link> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setcompressionquality.xml b/reference/imagick/imagick/setcompressionquality.xml
deleted file mode 100644
index 39bcd63b8082..000000000000
--- a/reference/imagick/imagick/setcompressionquality.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setcompressionquality">
- <refnamediv>
-  <refname>Imagick::setCompressionQuality</refname>
-  <refpurpose>Sets the object's default compression quality</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setCompressionQuality</methodname>
-   <methodparam><type>int</type><parameter>quality</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the object's default compression quality.
-  </para>
-
-  <caution>
-   <para>
-    This method only works for new images e.g. those created through Imagick::newPseudoImage. For existing images you should use <methodname>Imagick::setImageCompressionQuality</methodname>.
-   </para>
-  </caution>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>quality</parameter></term>
-     <listitem>
-      <para>
-       An &integer; between 1 and 100, 1 = high compression, 100 low compression.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::setCompressionQuality</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setCompressionQuality($imagePath, $quality) {
-
-    $backgroundImagick = new \Imagick(realpath($imagePath));
-    $imagick = new \Imagick();
-    $imagick->setCompressionQuality($quality);
-    $imagick->newPseudoImage(
-        $backgroundImagick->getImageWidth(),
-        $backgroundImagick->getImageHeight(),
-        'canvas:white'
-    );
-
-    $imagick->compositeImage(
-        $backgroundImagick,
-        \Imagick::COMPOSITE_ATOP,
-        0,
-        0
-    );
-    
-    $imagick->setFormat("jpg");    
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setfilename.xml b/reference/imagick/imagick/setfilename.xml
deleted file mode 100644
index 8d573d56b6ea..000000000000
--- a/reference/imagick/imagick/setfilename.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setfilename">
- <refnamediv>
-  <refname>Imagick::setFilename</refname>
-  <refpurpose>Sets the filename before you read or write the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setFilename</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the filename before you read or write an image file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setfirstiterator.xml b/reference/imagick/imagick/setfirstiterator.xml
deleted file mode 100644
index f3551a972675..000000000000
--- a/reference/imagick/imagick/setfirstiterator.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setfirstiterator">
- <refnamediv>
-  <refname>Imagick::setFirstIterator</refname>
-  <refpurpose>Sets the Imagick iterator to the first image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setFirstIterator</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Sets the Imagick iterator to the first image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setfont.xml b/reference/imagick/imagick/setfont.xml
deleted file mode 100644
index e453e87e99b3..000000000000
--- a/reference/imagick/imagick/setfont.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.setfont" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::setFont</refname>
-  <refpurpose>Sets font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setFont</methodname>
-   <methodparam><type>string</type><parameter>font</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets object's font property. This method can be used for example to set font for
-   caption: pseudo-format. The font needs to be configured in ImageMagick configuration
-   or a file by the name of <parameter>font</parameter> must exist. This method should
-   not be confused with <function>ImagickDraw::setFont</function> which sets the font
-   for a specific ImagickDraw object.
-   &imagick.method.available.0x637;
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>font</parameter></term>
-     <listitem>
-      <para>
-       Font name or a filename
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>Imagick::setFont</function> example</title>
-    <para>
-     Example of using Imagick::setFont
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create new imagick object */
-$im = new Imagick();
-
-/* Set the font for the object */
-$im->setFont("example.ttf");
-
-/* Create new caption */
-$im->newPseudoImage(100, 100, "caption:Hello");
-
-/* Do something with the image */
-?>
-]]>
-    </programlisting>
-   </example>
-  </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setformat.xml b/reference/imagick/imagick/setformat.xml
deleted file mode 100644
index 9542137b313b..000000000000
--- a/reference/imagick/imagick/setformat.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setformat">
- <refnamediv>
-  <refname>Imagick::setFormat</refname>
-  <refpurpose>Sets the format of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setFormat</methodname>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the format of the Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setgravity.xml b/reference/imagick/imagick/setgravity.xml
deleted file mode 100644
index 7965b8171c82..000000000000
--- a/reference/imagick/imagick/setgravity.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setgravity">
- <refnamediv>
-  <refname>Imagick::setGravity</refname>
-  <refpurpose>Sets the gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setGravity</methodname>
-   <methodparam><type>int</type><parameter>gravity</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the global gravity property for the Imagick object.
-   &imagick.method.available.0x640;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gravity</parameter></term>
-     <listitem>
-      <para>
-       The gravity property. Refer to the list of 
-       <link linkend="imagick.constants.gravity">gravity constants</link>.
-      </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/imagick/imagick/setimage.xml b/reference/imagick/imagick/setimage.xml
deleted file mode 100644
index 06564b40a104..000000000000
--- a/reference/imagick/imagick/setimage.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimage">
- <refnamediv>
-  <refname>Imagick::setImage</refname>
-  <refpurpose>Replaces image in the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImage</methodname>
-   <methodparam><type>Imagick</type><parameter>replace</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Replaces the current image sequence with the image from replace object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>replace</parameter></term>
-     <listitem>
-      <para>
-       The replace Imagick object
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>A <function>Imagick::setImage</function> example</title>
-    <para>
-     An example of using Imagick::setImage()
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create the objects */
-$image = new Imagick('source.jpg');
-$replace = new Imagick('replace.jpg');
-
-/* source.jpg is replaced with replace.jpg */
-$image->setImage($replace);
-
-/* output the image */
-header('Content-type: image/jpeg');
-echo $image;
-
-?>
-]]>
-    </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/imagick/imagick/setimagealphachannel.xml b/reference/imagick/imagick/setimagealphachannel.xml
deleted file mode 100644
index 7bf6d8ab9d5a..000000000000
--- a/reference/imagick/imagick/setimagealphachannel.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagealphachannel">
- <refnamediv>
-  <refname>Imagick::setImageAlphaChannel</refname>
-  <refpurpose>Sets image alpha channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageAlphaChannel</methodname>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Activate or deactivate image alpha channel. The <parameter>mode</parameter> 
-   is one of the <constant>Imagick::ALPHACHANNEL_<replaceable>*</replaceable></constant> constants.
-   &imagick.method.available.0x638;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>Imagick::ALPHACHANNEL_<replaceable>*</replaceable></constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::setImageMatte</function></member>
-    <member> <link linkend="imagick.constants.alphachannel">Imagick Alpha Channel Constants</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/imagick/imagick/setimageartifact.xml b/reference/imagick/imagick/setimageartifact.xml
deleted file mode 100644
index 30b54d061d4c..000000000000
--- a/reference/imagick/imagick/setimageartifact.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageartifact">
- <refnamediv>
-  <refname>Imagick::setImageArtifact</refname>
-  <refpurpose>Set image artifact</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageArtifact</methodname>
-   <methodparam><type>string</type><parameter>artifact</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Associates an artifact with the image. The difference between image properties and 
-   image artifacts is that properties are public and artifacts are private.
-   &imagick.method.available.0x657;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>artifact</parameter></term>
-     <listitem>
-      <para>
-       The name of the artifact
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the artifact
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageArtifact</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setImageArtifact() {
-
-    $src1 = new \Imagick(realpath("./images/artifact/source1.png"));
-    $src2 = new \Imagick(realpath("./images/artifact/source2.png"));
-
-    $src2->setImageVirtualPixelMethod(\Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-    $src2->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-    $src1->compositeImage($src2, Imagick::COMPOSITE_MATHEMATICS, 0, 0);
-    
-    $src1->setImageFormat('png');
-    header("Content-Type: image/png");
-    echo $src1->getImagesBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageattribute.xml b/reference/imagick/imagick/setimageattribute.xml
deleted file mode 100644
index 23fe7c0083d1..000000000000
--- a/reference/imagick/imagick/setimageattribute.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.setimageattribute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::setImageAttribute</refname>
-  <refpurpose>Sets an image attribute</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageAttribute</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets an image attribute.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimagebackgroundcolor.xml b/reference/imagick/imagick/setimagebackgroundcolor.xml
deleted file mode 100644
index dac83aad59f9..000000000000
--- a/reference/imagick/imagick/setimagebackgroundcolor.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagebackgroundcolor">
- <refnamediv>
-  <refname>Imagick::setImageBackgroundColor</refname>
-  <refpurpose>Sets the image background color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageBackgroundColor</methodname>
-   <methodparam><type>mixed</type><parameter>background</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image background color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>background</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/setimagebias.xml b/reference/imagick/imagick/setimagebias.xml
deleted file mode 100644
index 8a0b9193c1c7..000000000000
--- a/reference/imagick/imagick/setimagebias.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagebias">
- <refnamediv>
-  <refname>Imagick::setImageBias</refname>
-  <refpurpose>Sets the image bias for any method that convolves an image</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageBias</methodname>
-   <methodparam><type>float</type><parameter>bias</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image bias for any method that convolves an image (e.g. Imagick::ConvolveImage()).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>bias</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageBias</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-//requires ImageMagick version 6.9.0-1 to have an effect on convolveImage
-function setImageBias($bias) {
-    $imagick = new \Imagick(realpath("images/stack.jpg"));
-
-    $xKernel = array(
-        -0.70, 0, 0.70,
-        -0.70, 0, 0.70,
-        -0.70, 0, 0.70
-    );
-
-    $imagick->setImageBias($bias * \Imagick::getQuantum());
-    $imagick->convolveImage($xKernel, \Imagick::CHANNEL_ALL);
-
-    $imagick->setImageFormat('png');
-    
-    header('Content-type: image/png');
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setimagebiasquantum.xml b/reference/imagick/imagick/setimagebiasquantum.xml
deleted file mode 100644
index 61931d477bf4..000000000000
--- a/reference/imagick/imagick/setimagebiasquantum.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.setimagebiasquantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::setImageBiasQuantum</refname>
-  <refpurpose>Sets the image bias</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Imagick::setImageBiasQuantum</methodname>
-   <methodparam><type>float</type><parameter>bias</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image bias. Bias should be scaled with <literal>0</literal> (no adjustment) to <literal>1</literal> (quantum value).
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bias</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageblueprimary.xml b/reference/imagick/imagick/setimageblueprimary.xml
deleted file mode 100644
index 1813fc6030bd..000000000000
--- a/reference/imagick/imagick/setimageblueprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageblueprimary">
- <refnamediv>
-  <refname>Imagick::setImageBluePrimary</refname>
-  <refpurpose>Sets the image chromaticity blue primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageBluePrimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image chromaticity blue primary point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagebordercolor.xml b/reference/imagick/imagick/setimagebordercolor.xml
deleted file mode 100644
index d9658b7274eb..000000000000
--- a/reference/imagick/imagick/setimagebordercolor.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagebordercolor">
- <refnamediv>
-  <refname>Imagick::setImageBorderColor</refname>
-  <refpurpose>Sets the image border color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageBorderColor</methodname>
-   <methodparam><type>mixed</type><parameter>border</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image border color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>border</parameter></term>
-     <listitem>
-      <para>
-       The border color
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as a parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/setimagechanneldepth.xml b/reference/imagick/imagick/setimagechanneldepth.xml
deleted file mode 100644
index f12aba4f1606..000000000000
--- a/reference/imagick/imagick/setimagechanneldepth.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagechanneldepth">
- <refnamediv>
-  <refname>Imagick::setImageChannelDepth</refname>
-  <refpurpose>Sets the depth of a particular image channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageChannelDepth</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>depth</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the depth of a particular image channel.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>depth</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageclipmask.xml b/reference/imagick/imagick/setimageclipmask.xml
deleted file mode 100644
index bd6a53be4689..000000000000
--- a/reference/imagick/imagick/setimageclipmask.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageclipmask">
- <refnamediv>
-  <refname>Imagick::setImageClipMask</refname>
-  <refpurpose>Sets image clip mask</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageClipMask</methodname>
-   <methodparam><type>Imagick</type><parameter>clip_mask</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets image clip mask from another Imagick object.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clip_mask</parameter></term>
-     <listitem>
-      <para>
-      The Imagick object containing the clip mask
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageClipMask</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setImageClipMask($imagePath) {
-    $imagick = new \Imagick();
-    $imagick->readImage(realpath($imagePath));
-
-    $width = $imagick->getImageWidth();
-    $height = $imagick->getImageHeight();
-
-    $clipMask = new \Imagick();
-    $clipMask->newPseudoImage(
-        $width,
-        $height,
-        "canvas:transparent"
-    );
-
-    $draw = new \ImagickDraw();
-    $draw->setFillColor('white');
-    $draw->circle(
-        $width / 2,
-        $height / 2,
-        ($width / 2) + ($width / 4),
-        $height / 2
-    );
-    $clipMask->drawImage($draw);
-    $imagick->setImageClipMask($clipMask);
-
-    $imagick->negateImage(false);
-    $imagick->setFormat("png");
-
-    header("Content-Type: image/png");
-    echo $imagick->getImagesBlob();
-    
-}
-
-?>
-]]>
-      </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/imagick/imagick/setimagecolormapcolor.xml b/reference/imagick/imagick/setimagecolormapcolor.xml
deleted file mode 100644
index e76b39bf8060..000000000000
--- a/reference/imagick/imagick/setimagecolormapcolor.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagecolormapcolor">
- <refnamediv>
-  <refname>Imagick::setImageColormapColor</refname>
-  <refpurpose>Sets the color of the specified colormap index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageColormapColor</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>ImagickPixel</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the color of the specified colormap index.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagecolorspace.xml b/reference/imagick/imagick/setimagecolorspace.xml
deleted file mode 100644
index ee5fc0cb5ff4..000000000000
--- a/reference/imagick/imagick/setimagecolorspace.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagecolorspace">
- <refnamediv>
-  <refname>Imagick::setImageColorspace</refname>
-  <refpurpose>Sets the image colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageColorspace</methodname>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image colorspace. This method should be used when creating new images. To change the colorspace of an existing image, you should use <methodname>Imagick::transformImageColorspace</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>colorspace</parameter></term>
-     <listitem>
-      <para>
-        One of the <link linkend="imagick.constants.colorspace">COLORSPACE constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagecompose.xml b/reference/imagick/imagick/setimagecompose.xml
deleted file mode 100644
index 8cee11e6344d..000000000000
--- a/reference/imagick/imagick/setimagecompose.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagecompose">
- <refnamediv>
-  <refname>Imagick::setImageCompose</refname>
-  <refpurpose>Sets the image composite operator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageCompose</methodname>
-   <methodparam><type>int</type><parameter>compose</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image composite operator, useful for specifying how
-   to composite the image thumbnail when using the
-   Imagick::montageImage() method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>compose</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagecompression.xml b/reference/imagick/imagick/setimagecompression.xml
deleted file mode 100644
index 1d68c6376b99..000000000000
--- a/reference/imagick/imagick/setimagecompression.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagecompression">
- <refnamediv>
-  <refname>Imagick::setImageCompression</refname>
-  <refpurpose>Sets the image compression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageCompression</methodname>
-   <methodparam><type>int</type><parameter>compression</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>compression</parameter></term>
-     <listitem>
-      <para>
-      One of the <constant>COMPRESSION</constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagecompressionquality.xml b/reference/imagick/imagick/setimagecompressionquality.xml
deleted file mode 100644
index 36dc7d7ec208..000000000000
--- a/reference/imagick/imagick/setimagecompressionquality.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagecompressionquality">
- <refnamediv>
-  <refname>Imagick::setImageCompressionQuality</refname>
-  <refpurpose>Sets the image compression quality</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageCompressionQuality</methodname>
-   <methodparam><type>int</type><parameter>quality</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image compression quality.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>quality</parameter></term>
-     <listitem>
-      <para>
-       The image compression quality as an integer
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageCompressionQuality</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setImageCompressionQuality($imagePath, $quality) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setImageCompressionQuality($quality);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setimagedelay.xml b/reference/imagick/imagick/setimagedelay.xml
deleted file mode 100644
index 1e9bcbfc3521..000000000000
--- a/reference/imagick/imagick/setimagedelay.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagedelay">
- <refnamediv>
-  <refname>Imagick::setImageDelay</refname>
-  <refpurpose>Sets the image delay</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageDelay</methodname>
-   <methodparam><type>int</type><parameter>delay</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image delay. For an animated image this is the amount of time that
-   this frame of the image should be displayed for, before displaying the next
-   frame.
-  </para>
-  <para>
-   The delay can be set individually for each frame in an image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>delay</parameter></term>
-     <listitem>
-      <para>
-       The amount of time expressed in 'ticks' that the image should be
-       displayed for. For animated GIFs there are 100 ticks per second, so a
-       value of 20 would be 20/100 of a second aka 1/5th of a second.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Modify animated Gif with <function>Imagick::setImageDelay</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// Modify an animated Gif so that it's frames are played at a variable speed,
-// varying between being shown for 50ms down to 0ms, which will cause the frame
-// to be skipped in most browsers.
-$imagick = new Imagick(realpath("Test.gif"));
-$imagick = $imagick->coalesceImages();
-
-$frameCount = 0;
-
-foreach ($imagick as $frame) {
-    $imagick->setImageDelay((($frameCount % 11) * 5));
-    $frameCount++;
-}
-
-$imagick = $imagick->deconstructImages();
-
-$imagick->writeImages("/path/to/save/output.gif", true);
-
-?>
-]]>
-    </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/imagick/imagick/setimagedepth.xml b/reference/imagick/imagick/setimagedepth.xml
deleted file mode 100644
index 57ab22712f22..000000000000
--- a/reference/imagick/imagick/setimagedepth.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagedepth">
- <refnamediv>
-  <refname>Imagick::setImageDepth</refname>
-  <refpurpose>Sets the image depth</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageDepth</methodname>
-   <methodparam><type>int</type><parameter>depth</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image depth.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>depth</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagedispose.xml b/reference/imagick/imagick/setimagedispose.xml
deleted file mode 100644
index 5c710f93cd7d..000000000000
--- a/reference/imagick/imagick/setimagedispose.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagedispose">
- <refnamediv>
-  <refname>Imagick::setImageDispose</refname>
-  <refpurpose>Sets the image disposal method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageDispose</methodname>
-   <methodparam><type>int</type><parameter>dispose</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image disposal method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dispose</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageextent.xml b/reference/imagick/imagick/setimageextent.xml
deleted file mode 100644
index f43372754e1b..000000000000
--- a/reference/imagick/imagick/setimageextent.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageextent">
- <refnamediv>
-  <refname>Imagick::setImageExtent</refname>
-  <refpurpose>Sets the image size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageExtent</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image size (i.e. columns &amp; rows).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagefilename.xml b/reference/imagick/imagick/setimagefilename.xml
deleted file mode 100644
index 1d03f228efad..000000000000
--- a/reference/imagick/imagick/setimagefilename.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagefilename">
- <refnamediv>
-  <refname>Imagick::setImageFilename</refname>
-  <refpurpose>Sets the filename of a particular image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageFilename</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the filename of a particular image in a sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageformat.xml b/reference/imagick/imagick/setimageformat.xml
deleted file mode 100644
index f5665ecf46ae..000000000000
--- a/reference/imagick/imagick/setimageformat.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageformat">
- <refnamediv>
-  <refname>Imagick::setImageFormat</refname>
-  <refpurpose>Sets the format of a particular image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageFormat</methodname>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the format of a particular image in a sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-       String presentation of the image format. Format support
-       depends on the ImageMagick installation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimagegamma.xml b/reference/imagick/imagick/setimagegamma.xml
deleted file mode 100644
index 3a8f2596294d..000000000000
--- a/reference/imagick/imagick/setimagegamma.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagegamma">
- <refnamediv>
-  <refname>Imagick::setImageGamma</refname>
-  <refpurpose>Sets the image gamma</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageGamma</methodname>
-   <methodparam><type>float</type><parameter>gamma</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image gamma.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gamma</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagegravity.xml b/reference/imagick/imagick/setimagegravity.xml
deleted file mode 100644
index 321dca15ef35..000000000000
--- a/reference/imagick/imagick/setimagegravity.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagegravity">
- <refnamediv>
-  <refname>Imagick::setImageGravity</refname>
-  <refpurpose>Sets the image gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageGravity</methodname>
-   <methodparam><type>int</type><parameter>gravity</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the gravity property for the current image. This method can be used 
-   to set the gravity property for a single image sequence.
-   &imagick.method.available.0x644;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gravity</parameter></term>
-     <listitem>
-      <para>
-       The gravity property. Refer to the list of 
-       <link linkend="imagick.constants.gravity">gravity constants</link>.
-      </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/imagick/imagick/setimagegreenprimary.xml b/reference/imagick/imagick/setimagegreenprimary.xml
deleted file mode 100644
index e55eb2075b4e..000000000000
--- a/reference/imagick/imagick/setimagegreenprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagegreenprimary">
- <refnamediv>
-  <refname>Imagick::setImageGreenPrimary</refname>
-  <refpurpose>Sets the image chromaticity green primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageGreenPrimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image chromaticity green primary point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageindex.xml b/reference/imagick/imagick/setimageindex.xml
deleted file mode 100644
index 9e6e5e3cb3b6..000000000000
--- a/reference/imagick/imagick/setimageindex.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageindex">
- <refnamediv>
-  <refname>Imagick::setImageIndex</refname>
-  <refpurpose>Set the iterator position</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageIndex</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the iterator to the position in the image list specified with the index
-   parameter. 
-  </para>
-  <para>
-   This method has been deprecated. See
-   <function>Imagick::setIteratorIndex</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-      The position to set the iterator to
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageinterlacescheme.xml b/reference/imagick/imagick/setimageinterlacescheme.xml
deleted file mode 100644
index c419c6deb869..000000000000
--- a/reference/imagick/imagick/setimageinterlacescheme.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageinterlacescheme">
- <refnamediv>
-  <refname>Imagick::setImageInterlaceScheme</refname>
-  <refpurpose>Sets the image compression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageInterlaceScheme</methodname>
-   <methodparam><type>int</type><parameter>interlace_scheme</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image compression.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>interlace_scheme</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageinterpolatemethod.xml b/reference/imagick/imagick/setimageinterpolatemethod.xml
deleted file mode 100644
index babc90adb928..000000000000
--- a/reference/imagick/imagick/setimageinterpolatemethod.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageinterpolatemethod">
- <refnamediv>
-  <refname>Imagick::setImageInterpolateMethod</refname>
-  <refpurpose>Sets the image interpolate pixel method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageInterpolateMethod</methodname>
-   <methodparam><type>int</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image interpolate pixel method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-       The method is one of the <constant>Imagick::INTERPOLATE_<replaceable>*</replaceable></constant> constants
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimageiterations.xml b/reference/imagick/imagick/setimageiterations.xml
deleted file mode 100644
index ab5e621657b6..000000000000
--- a/reference/imagick/imagick/setimageiterations.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageiterations">
- <refnamediv>
-  <refname>Imagick::setImageIterations</refname>
-  <refpurpose>Sets the image iterations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageIterations</methodname>
-   <methodparam><type>int</type><parameter>iterations</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the number of iterations an animated image is repeated.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>iterations</parameter></term>
-     <listitem>
-      <para>
-       The number of iterations the image should loop over. Set to '0' to loop
-       continuously.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::setImageIterations</function> usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$imagick = new Imagick(realpath("Test.gif"));
-
-$imagick = $imagick->coalesceImages();
-$imagick->setImageIterations(1);
-$imagick = $imagick->deconstructImages();
-
-$imagick->writeImages('/path/to/save/OnceOnly.gif', true);
-
-?>
-]]>
-    </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/imagick/imagick/setimagematte.xml b/reference/imagick/imagick/setimagematte.xml
deleted file mode 100644
index 06e7fa9a80c3..000000000000
--- a/reference/imagick/imagick/setimagematte.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagematte">
- <refnamediv>
-  <refname>Imagick::setImageMatte</refname>
-  <refpurpose>Sets the image matte channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageMatte</methodname>
-   <methodparam><type>bool</type><parameter>matte</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the image matte channel. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matte</parameter></term>
-     <listitem>
-      <para>
-       True activates the matte channel and false disables it.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimagemattecolor.xml b/reference/imagick/imagick/setimagemattecolor.xml
deleted file mode 100644
index e652b1a84d47..000000000000
--- a/reference/imagick/imagick/setimagemattecolor.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagemattecolor">
- <refnamediv>
-  <refname>Imagick::setImageMatteColor</refname>
-  <refpurpose>Sets the image matte color</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageMatteColor</methodname>
-   <methodparam><type>mixed</type><parameter>matte</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image matte color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>matte</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the parameter.
-        Previous versions allow only an ImagickPixel object.
-       </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/imagick/imagick/setimageopacity.xml b/reference/imagick/imagick/setimageopacity.xml
deleted file mode 100644
index 17c82dcc315f..000000000000
--- a/reference/imagick/imagick/setimageopacity.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageopacity">
- <refnamediv>
-  <refname>Imagick::setImageOpacity</refname>
-  <refpurpose>Sets the image opacity level</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageOpacity</methodname>
-   <methodparam><type>float</type><parameter>opacity</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the image to the specified opacity level. &imagick.method.available.0x631;
-   This method operates on all channels, which means that for example opacity value
-   of 0.5 will set all transparent areas to partially opaque. To add transparency to
-   areas that are not already transparent use <link linkend="imagick.evaluateimage">Imagick::evaluateImage()</link>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-       The level of transparency: 1.0 is fully opaque and 0.0 is fully
-       transparent.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>Imagick::setImageOpacity</function> example</title>
-    <para>
-     An example of using Imagick::setImageOpacity()
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create the object */
-$image = new Imagick('source.png');
-
-/* Set the opacity */
-$image->setImageOpacity(0.7);
-
-/* output the image */
-header('Content-type: image/png');
-echo $image;
-
-?>
-]]>
-    </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/imagick/imagick/setimageorientation.xml b/reference/imagick/imagick/setimageorientation.xml
deleted file mode 100644
index 238adb1bb3f1..000000000000
--- a/reference/imagick/imagick/setimageorientation.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageorientation">
- <refnamediv>
-  <refname>Imagick::setImageOrientation</refname>
-  <refpurpose>Sets the image orientation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageOrientation</methodname>
-   <methodparam><type>int</type><parameter>orientation</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets the image orientation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>orientation</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.orientation">orientation constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageOrientation</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-//Doesn't appear to do anything
-function setImageOrientation($imagePath, $orientationType) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setImageOrientation($orientationType);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setimagepage.xml b/reference/imagick/imagick/setimagepage.xml
deleted file mode 100644
index 6c7d26789bd0..000000000000
--- a/reference/imagick/imagick/setimagepage.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagepage">
- <refnamediv>
-  <refname>Imagick::setImagePage</refname>
-  <refpurpose>Sets the page geometry of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImagePage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the page geometry of the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</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>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageprofile.xml b/reference/imagick/imagick/setimageprofile.xml
deleted file mode 100644
index 45dd5b8b4623..000000000000
--- a/reference/imagick/imagick/setimageprofile.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageprofile">
- <refnamediv>
-  <refname>Imagick::setImageProfile</refname>
-  <refpurpose>Adds a named profile to the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageProfile</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>profile</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a named profile to the Imagick object.  If a profile
-   with the same name already exists, it is replaced. This
-   method differs from the Imagick::ProfileImage() method in
-   that it does not apply any CMS color profiles.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>profile</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageproperty.xml b/reference/imagick/imagick/setimageproperty.xml
deleted file mode 100644
index 05f76539c57e..000000000000
--- a/reference/imagick/imagick/setimageproperty.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageproperty">
- <refnamediv>
-  <refname>Imagick::setImageProperty</refname>
-  <refpurpose>Sets an image property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageProperty</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Sets a named property to the image. &imagick.method.available.0x632;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::setImageProperty</function>:</title>
-    <para>
-     Setting and getting image properties
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = new Imagick();
-$image->newImage(300, 200, "black");
-
-$image->setImageProperty('Exif:Make', 'Imagick');
-echo $image->getImageProperty('Exif:Make');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getImageProperty</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/imagick/imagick/setimageredprimary.xml b/reference/imagick/imagick/setimageredprimary.xml
deleted file mode 100644
index f01fcbf1c447..000000000000
--- a/reference/imagick/imagick/setimageredprimary.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageredprimary">
- <refnamediv>
-  <refname>Imagick::setImageRedPrimary</refname>
-  <refpurpose>Sets the image chromaticity red primary point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageRedPrimary</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image chromaticity red primary point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagerenderingintent.xml b/reference/imagick/imagick/setimagerenderingintent.xml
deleted file mode 100644
index c7bafb169bc5..000000000000
--- a/reference/imagick/imagick/setimagerenderingintent.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagerenderingintent">
- <refnamediv>
-  <refname>Imagick::setImageRenderingIntent</refname>
-  <refpurpose>Sets the image rendering intent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageRenderingIntent</methodname>
-   <methodparam><type>int</type><parameter>rendering_intent</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image rendering intent.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rendering_intent</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimageresolution.xml b/reference/imagick/imagick/setimageresolution.xml
deleted file mode 100644
index 5ff9c47ec5b4..000000000000
--- a/reference/imagick/imagick/setimageresolution.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageresolution">
- <refnamediv>
-  <refname>Imagick::setImageResolution</refname>
-  <refpurpose>Sets the image resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageResolution</methodname>
-   <methodparam><type>float</type><parameter>x_resolution</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y_resolution</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x_resolution</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y_resolution</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::setImageResolution</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setImageResolution($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setImageResolution(50, 50);
-    
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setimagescene.xml b/reference/imagick/imagick/setimagescene.xml
deleted file mode 100644
index 80f8af020f60..000000000000
--- a/reference/imagick/imagick/setimagescene.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagescene">
- <refnamediv>
-  <refname>Imagick::setImageScene</refname>
-  <refpurpose>Sets the image scene</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageScene</methodname>
-   <methodparam><type>int</type><parameter>scene</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image scene.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>scene</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setimagetickspersecond.xml b/reference/imagick/imagick/setimagetickspersecond.xml
deleted file mode 100644
index bee029842754..000000000000
--- a/reference/imagick/imagick/setimagetickspersecond.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagetickspersecond">
- <refnamediv>
-  <refname>Imagick::setImageTicksPerSecond</refname>
-  <refpurpose>Sets the image ticks-per-second</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageTicksPerSecond</methodname>
-   <methodparam><type>int</type><parameter>ticks_per_second</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adjust the amount of time that a frame of an animated image is displayed for.
-  </para>
-  <note>
-   <para>
-    For animated GIFs, this function does not change the number of 'image ticks'
-    per second, which is always defined as 100. Instead it adjusts the amount of
-    time that the frame is displayed for to simulate the change in 'ticks per
-    second'.
-   </para>
-   <para>
-    For example, for an animated GIF where each frame is displayed for 20 ticks
-    (1/5 of a second) when this method is called on each frame of that image
-    with an argument of <literal>50</literal> the frames are adjusted to be
-    displayed for 40 ticks (2/5 of a second) and the animation will play at half
-    the original speed.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ticks_per_second</parameter></term>
-     <listitem>
-      <para>
-       The duration for which an image should be displayed expressed in ticks
-       per second.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-    &reftitle.examples;
-  <para>
-   <example>
-    <title>Modify animated Gif with <function>Imagick::setImageTicksPerSecond</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// Modify an animated gif so the first half of the gif is played at half the
-// speed it currently is, and the second half to be played at double the speed
-// it currently is
-
-$imagick = new Imagick(realpath("Test.gif"));
-$imagick = $imagick->coalesceImages();
-
-$totalFrames = $imagick->getNumberImages();
-
-$frameCount = 0;
-
-foreach ($imagick as $frame) {
-    $imagick->setImageTicksPerSecond(50);
-    
-    if ($frameCount < ($totalFrames / 2)) {
-        // Modify the frame to be displayed for twice as long as it currently is
-        $imagick->setImageTicksPerSecond(50);
-    } else {
-        // Modify the frame to be displayed for half as long as it currently is
-        $imagick->setImageTicksPerSecond(200);
-    }
-
-    $frameCount++;
-}
-
-$imagick = $imagick->deconstructImages();
-
-$imagick->writeImages("/path/to/save/output.gif", true);
-
-?>
-]]>
-    </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/imagick/imagick/setimagetype.xml b/reference/imagick/imagick/setimagetype.xml
deleted file mode 100644
index 5f6b586017c7..000000000000
--- a/reference/imagick/imagick/setimagetype.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagetype">
- <refnamediv>
-  <refname>Imagick::setImageType</refname>
-  <refpurpose>Sets the image type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageType</methodname>
-   <methodparam><type>int</type><parameter>image_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts the image to the given type, which combines a color model with the
-   presence or absence of an alpha channel.
-   Depending on the type, this may change the colorspace, quantize the colors,
-   or change whether the image has an alpha channel.
-  </simpara>
-  <simpara>
-   <methodname>Imagick::setImageType</methodname> modifies the image itself.
-   To set the type that subsequent images are written with instead, use
-   <methodname>Imagick::setType</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>image_type</parameter></term>
-    <listitem>
-     <simpara>
-      One of the
-      <link linkend="imagick.constants.imagetype"><constant>imagick::IMGTYPE_<replaceable>*</replaceable></constant></link>
-      constants. <constant>imagick::IMGTYPE_UNDEFINED</constant> and
-      <constant>imagick::IMGTYPE_OPTIMIZE</constant> convert nothing, but are
-      still recorded on the image.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimageunits.xml b/reference/imagick/imagick/setimageunits.xml
deleted file mode 100644
index 2d2608dd2854..000000000000
--- a/reference/imagick/imagick/setimageunits.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimageunits">
- <refnamediv>
-  <refname>Imagick::setImageUnits</refname>
-  <refpurpose>Sets the image units of resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageUnits</methodname>
-   <methodparam><type>int</type><parameter>units</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image units of resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>units</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimagevirtualpixelmethod.xml b/reference/imagick/imagick/setimagevirtualpixelmethod.xml
deleted file mode 100644
index 8c2df9295580..000000000000
--- a/reference/imagick/imagick/setimagevirtualpixelmethod.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagevirtualpixelmethod">
- <refnamediv>
-  <refname>Imagick::setImageVirtualPixelMethod</refname>
-  <refpurpose>Sets the image virtual pixel method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageVirtualPixelMethod</methodname>
-   <methodparam><type>int</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image virtual pixel method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setimagewhitepoint.xml b/reference/imagick/imagick/setimagewhitepoint.xml
deleted file mode 100644
index 51115d6109db..000000000000
--- a/reference/imagick/imagick/setimagewhitepoint.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setimagewhitepoint">
- <refnamediv>
-  <refname>Imagick::setImageWhitePoint</refname>
-  <refpurpose>Sets the image chromaticity white point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setImageWhitePoint</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image chromaticity white point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setinterlacescheme.xml b/reference/imagick/imagick/setinterlacescheme.xml
deleted file mode 100644
index 50a1149dd36d..000000000000
--- a/reference/imagick/imagick/setinterlacescheme.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setinterlacescheme">
- <refnamediv>
-  <refname>Imagick::setInterlaceScheme</refname>
-  <refpurpose>Sets the image compression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setInterlaceScheme</methodname>
-   <methodparam><type>int</type><parameter>interlace_scheme</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image compression.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>interlace_scheme</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setiteratorindex.xml b/reference/imagick/imagick/setiteratorindex.xml
deleted file mode 100644
index af214d61b15c..000000000000
--- a/reference/imagick/imagick/setiteratorindex.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setiteratorindex">
- <refnamediv>
-  <refname>Imagick::setIteratorIndex</refname>
-  <refpurpose>Set the iterator position</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setIteratorIndex</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-  Set the iterator to the position in the image list specified with the index parameter.
-  &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-       The position to set the iterator to
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::setIteratorIndex</function>:</title>
-    <para>
-     Create images, set and get the iterator index
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$im = new Imagick();
-$im->newImage(100, 100, new ImagickPixel("red"));
-$im->newImage(100, 100, new ImagickPixel("green"));
-$im->newImage(100, 100, new ImagickPixel("blue"));
-
-$im->setIteratorIndex(1);
-echo $im->getIteratorIndex();
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getIteratorIndex</function></member>
-    <member><function>Imagick::getImageIndex</function></member>
-    <member><function>Imagick::setImageIndex</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/imagick/imagick/setlastiterator.xml b/reference/imagick/imagick/setlastiterator.xml
deleted file mode 100644
index a465b5ea0a61..000000000000
--- a/reference/imagick/imagick/setlastiterator.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setlastiterator">
- <refnamediv>
-  <refname>Imagick::setLastIterator</refname>
-  <refpurpose>Sets the Imagick iterator to the last image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setLastIterator</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Sets the Imagick iterator to the last image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setoption.xml b/reference/imagick/imagick/setoption.xml
deleted file mode 100644
index 458d482a4639..000000000000
--- a/reference/imagick/imagick/setoption.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setoption">
- <refnamediv>
-  <refname>Imagick::setOption</refname>
-  <refpurpose>Set an option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setOption</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Associates one or more options with the wand.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title>Attempt to reach '$extent' size<function>Imagick::setOption</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderJPG($extent) {
-        $imagePath = $this->control->getImagePath();
-        $imagick = new \Imagick(realpath($imagePath));
-        $imagick->setImageFormat('jpg');
-        $imagick->setOption('jpeg:extent', $extent);
-        header("Content-Type: image/jpg");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title> <function>Imagick::setOption</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderPNG($imagePath, $format) {
-
-        $imagick = new \Imagick(realpath($imagePath));
-        $imagick->setImageFormat('png');
-        $imagick->setOption('png:format', $format);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-    
-    //Save as 64bit PNG.
-    renderPNG($imagePath, 'png64');
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title> <function>Imagick::setOption</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderCustomBitDepthPNG() {
-        $imagePath = $this->control->getImagePath();
-        $imagick = new \Imagick(realpath($imagePath));
-        $imagick->setImageFormat('png');
-        
-        $imagick->setOption('png:bit-depth', '16');
-        $imagick->setOption('png:color-type', 6);
-        header("Content-Type: image/png");
-        $crash = true;
-        if ($crash) {
-            echo $imagick->getImageBlob();
-        }
-        else {
-            $tempFilename = tempnam('./', 'imagick');
-            $imagick->writeimage(realpath($tempFilename));
-            echo file_get_contents($tempFilename);
-        }
-    }
-
-?>
-]]>
-      </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/imagick/imagick/setpage.xml b/reference/imagick/imagick/setpage.xml
deleted file mode 100644
index 25f31d4f7d85..000000000000
--- a/reference/imagick/imagick/setpage.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setpage">
- <refnamediv>
-  <refname>Imagick::setPage</refname>
-  <refpurpose>Sets the page geometry of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setPage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the page geometry of the Imagick object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</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>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setpointsize.xml b/reference/imagick/imagick/setpointsize.xml
deleted file mode 100644
index 962699d3c22a..000000000000
--- a/reference/imagick/imagick/setpointsize.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setpointsize">
- <refnamediv>
-  <refname>Imagick::setPointSize</refname>
-  <refpurpose>Sets point size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setPointSize</methodname>
-   <methodparam><type>float</type><parameter>point_size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets object's point size property. This method can be used for example to set font size for 
-   caption: pseudo-format.
-   &imagick.method.available.0x637;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>point_size</parameter></term>
-     <listitem>
-      <para>
-       Point size
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>Imagick::setPointSize</function> example</title>
-    <para>
-     Example of using Imagick::setPointSize
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create new imagick object */
-$im = new Imagick();
-
-/* Set the font for the object */
-$im->setFont("example.ttf");
-
-/* Set the point size */
-$im->setPointSize(12);
-
-/* Create new caption */
-$im->newPseudoImage(100, 100, "caption:Hello");
-
-/* Do something with the image */
-?>
-]]>
-    </programlisting>
-   </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/setprogressmonitor.xml b/reference/imagick/imagick/setprogressmonitor.xml
deleted file mode 100644
index 071940cca2ac..000000000000
--- a/reference/imagick/imagick/setprogressmonitor.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.setprogressmonitor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::setProgressMonitor</refname>
-  <refpurpose>Set a callback to be called during processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setProgressMonitor</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set a callback that will be called during the processing of the Imagick image.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      The progress function to call. It should return true if image processing should continue, or false if it should be cancelled. The offset parameter indicates the progress and the span parameter indicates the total amount of work needed to be done.
-     </para>
-     
-     <methodsynopsis xmlns="http://docbook.org/ns/docbook">
-      <type>bool</type>
-      <methodname>
-       <replaceable>callback</replaceable>
-      </methodname>
-      <methodparam>
-       <type>mixed</type><parameter>offset</parameter>
-      </methodparam>
-      <methodparam>
-       <type>mixed</type>
-       <parameter>span</parameter>
-      </methodparam>
-     </methodsynopsis>
-
-     <caution>
-      <para>
-       The values passed to the callback function are not consistent. In particular the span parameter can increase during image processing. Because of this calculating the percentage complete of an image operation is not trivial.
-      </para>
-     </caution>
-     
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::setProgressMonitor</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $abortReason = null;
-        
-        try {
-            $imagick = new \Imagick(realpath($this->control->getImagePath()));
-            $startTime = time();
-
-            $callback = function ($offset, $span)  use ($startTime, &$abortReason) {
-                if (((100 * $offset) / $span)  > 20) {
-                    $abortReason = "Processing reached 20%";
-                    return false;
-                }
-
-                $nowTime = time();
-
-                if ($nowTime - $startTime > 5) {
-                    $abortReason = "Image processing took more than 5 seconds";
-                    return false;
-                }
-                if (($offset % 5) == 0) {
-                    echo "Progress: $offset / $span <br/>";
-                }
-                return true;
-            };
-
-            $imagick->setProgressMonitor($callback);
-
-            $imagick->waveImage(2, 15);
-
-            echo "Data len is: ".strlen($imagick->getImageBlob());
-        }
-        catch(\ImagickException $e) {
-            if ($abortReason != null) {
-                echo "Image processing was aborted: ".$abortReason."<br/>";
-            }
-            else {
-                echo "ImagickException caught: ".$e->getMessage()." Exception type is ".get_class($e);
-            }
-        }
-
-?>
-]]>
-      </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/imagick/imagick/setregistry.xml b/reference/imagick/imagick/setregistry.xml
deleted file mode 100644
index 9359bdd4876f..000000000000
--- a/reference/imagick/imagick/setregistry.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.setregistry" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::setRegistry</refname>
-  <refpurpose>Sets the ImageMagick registry entry named key to value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Imagick::setRegistry</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the ImageMagick registry entry named key to value. This is most
-   useful for setting "temporary-path" which controls where ImageMagick
-   creates temporary images e.g. while processing PDFs.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setresolution.xml b/reference/imagick/imagick/setresolution.xml
deleted file mode 100644
index 1695a465af1c..000000000000
--- a/reference/imagick/imagick/setresolution.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setresolution">
- <refnamediv>
-  <refname>Imagick::setResolution</refname>
-  <refpurpose>Sets the image resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setResolution</methodname>
-   <methodparam><type>float</type><parameter>x_resolution</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y_resolution</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image resolution.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x_resolution</parameter></term>
-     <listitem>
-      <para>
-       The horizontal resolution.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y_resolution</parameter></term>
-     <listitem>
-      <para>
-       The vertical resolution.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   <methodname>Imagick::setResolution</methodname> must be called before
-   loading or creating an image.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::setImageResolution</methodname></member>
-   <member><methodname>Imagick::getImageResolution</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/imagick/imagick/setresourcelimit.xml b/reference/imagick/imagick/setresourcelimit.xml
deleted file mode 100644
index 1732b3bbc300..000000000000
--- a/reference/imagick/imagick/setresourcelimit.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setresourcelimit">
- <refnamediv>
-  <refname>Imagick::setResourceLimit</refname>
-  <refpurpose>Sets the limit for a particular resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Imagick::setResourceLimit</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is used to modify the resource limits of the underlying ImageMagick
-   library.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       Refer to the list of <link 
-       linkend="imagick.constants.resourcetypes">resourcetype constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       One of the <link 
-       linkend="imagick.constants.resourcetypes">resourcetype constants</link>.
-       The unit depends on the type of the resource being limited.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::getResourceLimit</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/imagick/imagick/setsamplingfactors.xml b/reference/imagick/imagick/setsamplingfactors.xml
deleted file mode 100644
index 2a3685e4cc69..000000000000
--- a/reference/imagick/imagick/setsamplingfactors.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setsamplingfactors">
- <refnamediv>
-  <refname>Imagick::setSamplingFactors</refname>
-  <refpurpose>Sets the image sampling factors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setSamplingFactors</methodname>
-   <methodparam><type>array</type><parameter>factors</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the image sampling factors.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>factors</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::setSamplingFactors</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setSamplingFactors($imagePath) {
-
-    $imagePath = "../imagick/images/FineDetail.png";
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setImageFormat('jpg');
-    $imagick->setSamplingFactors(array('2x2', '1x1', '1x1'));
-
-    $compressed = $imagick->getImageBlob();
-
-    
-    $reopen = new \Imagick();
-    $reopen->readImageBlob($compressed);
-
-    $reopen->resizeImage(
-        $reopen->getImageWidth() * 4,
-        $reopen->getImageHeight() * 4,
-        \Imagick::FILTER_POINT,
-        1
-    );
-    
-    header("Content-Type: image/jpg");
-    echo $reopen->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/setsize.xml b/reference/imagick/imagick/setsize.xml
deleted file mode 100644
index 1eda83637c16..000000000000
--- a/reference/imagick/imagick/setsize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setsize">
- <refnamediv>
-  <refname>Imagick::setSize</refname>
-  <refpurpose>Sets the size of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setSize</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the size of the Imagick object. Set it before you read a raw image
-   format such as RGB, GRAY, or CMYK.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/setsizeoffset.xml b/reference/imagick/imagick/setsizeoffset.xml
deleted file mode 100644
index e071abd1d522..000000000000
--- a/reference/imagick/imagick/setsizeoffset.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.setsizeoffset">
- <refnamediv>
-  <refname>Imagick::setSizeOffset</refname>
-  <refpurpose>Sets the size and offset of the Imagick object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setSizeOffset</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the size and offset of the Imagick object. Set it before you read a
-   raw image format such as RGB, GRAY, or CMYK.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-       The width in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       The height in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The image offset.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/settype.xml b/reference/imagick/imagick/settype.xml
deleted file mode 100644
index 9ae3e92d0870..000000000000
--- a/reference/imagick/imagick/settype.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.settype">
- <refnamediv>
-  <refname>Imagick::setType</refname>
-  <refpurpose>Sets the image type attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::setType</methodname>
-   <methodparam><type>int</type><parameter>image_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the image type applied to images written subsequently.
-   To convert the current image instead, use
-   <methodname>Imagick::setImageType</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>image_type</parameter></term>
-    <listitem>
-     <simpara>
-      One of the
-      <link linkend="imagick.constants.imagetype"><constant>imagick::IMGTYPE_<replaceable>*</replaceable></constant></link>
-      constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/shadeimage.xml b/reference/imagick/imagick/shadeimage.xml
deleted file mode 100644
index 7e8edf7b66ca..000000000000
--- a/reference/imagick/imagick/shadeimage.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.shadeimage">
- <refnamediv>
-  <refname>Imagick::shadeImage</refname>
-  <refpurpose>Creates a 3D effect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::shadeImage</methodname>
-   <methodparam><type>bool</type><parameter>gray</parameter></methodparam>
-   <methodparam><type>float</type><parameter>azimuth</parameter></methodparam>
-   <methodparam><type>float</type><parameter>elevation</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Shines a distant light on an image to create a three-dimensional effect.
-   You control the positioning of the light with azimuth and elevation;
-   azimuth is measured in degrees off the x axis and elevation is measured
-   in pixels above the Z axis.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gray</parameter></term>
-     <listitem>
-      <para>
-       A value other than zero shades the intensity of each pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>azimuth</parameter></term>
-     <listitem>
-      <para>
-       Defines the light source direction.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>elevation</parameter></term>
-     <listitem>
-      <para>
-       Defines the light source direction.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws ImagickException on failure.
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::shadeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function shadeImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->shadeImage(true, 45, 20);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/shadowimage.xml b/reference/imagick/imagick/shadowimage.xml
deleted file mode 100644
index db62847e0bf7..000000000000
--- a/reference/imagick/imagick/shadowimage.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.shadowimage">
- <refnamediv>
-  <refname>Imagick::shadowImage</refname>
-  <refpurpose>Simulates an image shadow</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::shadowImage</methodname>
-   <methodparam><type>float</type><parameter>opacity</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Simulates an image shadow.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</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>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::shadowImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function shadowImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->shadowImage(0.4, 10, 50, 5);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/sharpenimage.xml b/reference/imagick/imagick/sharpenimage.xml
deleted file mode 100644
index c7180f3a4165..000000000000
--- a/reference/imagick/imagick/sharpenimage.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.sharpenimage">
- <refnamediv>
-  <refname>Imagick::sharpenImage</refname>
-  <refpurpose>Sharpens an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sharpenImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sharpens an image. We convolve the image with a Gaussian operator
-   of the given radius and standard deviation (sigma). For reasonable
-   results, the radius should be larger than sigma. Use a radius of
-   0 and <function>Imagick::sharpenImage</function> selects a suitable radius
-   for you.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::sharpenImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function sharpenImage($imagePath, $radius, $sigma, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->sharpenimage($radius, $sigma, $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/shaveimage.xml b/reference/imagick/imagick/shaveimage.xml
deleted file mode 100644
index d73be12635b6..000000000000
--- a/reference/imagick/imagick/shaveimage.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.shaveimage">
- <refnamediv>
-  <refname>Imagick::shaveImage</refname>
-  <refpurpose>Shaves pixels from the image edges</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::shaveImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shaves pixels from the image edges. It allocates the memory necessary for
-   the new Image structure and returns a pointer to the new image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::shaveImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function shaveImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->shaveImage(100, 50);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/shearimage.xml b/reference/imagick/imagick/shearimage.xml
deleted file mode 100644
index 4a4a01136b8d..000000000000
--- a/reference/imagick/imagick/shearimage.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.shearimage">
- <refnamediv>
-  <refname>Imagick::shearImage</refname>
-  <refpurpose>Creating a parallelogram</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::shearImage</methodname>
-   <methodparam><type>mixed</type><parameter>background</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x_shear</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y_shear</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Slides one edge of an image along the X or Y axis, creating a parallelogram.
-   An X direction shear slides an edge along the X axis, while a Y direction
-   shear slides an edge along the Y axis.  The amount of the shear is controlled
-   by a shear angle.  For X direction shears, x_shear is measured relative to
-   the Y axis, and similarly, for Y direction shears y_shear is measured
-   relative to the X axis.  Empty triangles left over from shearing the image
-   are filled with the background color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>background</parameter></term>
-     <listitem>
-      <para>
-       The background color
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x_shear</parameter></term>
-     <listitem>
-      <para>
-       The number of degrees to shear on the x axis
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y_shear</parameter></term>
-     <listitem>
-      <para>
-       The number of degrees to shear on the y axis
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::shearImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function shearImage($imagePath, $color, $shearX, $shearY) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->shearimage($color, $shearX, $shearY);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/sigmoidalcontrastimage.xml b/reference/imagick/imagick/sigmoidalcontrastimage.xml
deleted file mode 100644
index 52c774b97817..000000000000
--- a/reference/imagick/imagick/sigmoidalcontrastimage.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.sigmoidalcontrastimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::sigmoidalContrastImage</refname>
-  <refpurpose>Adjusts the contrast of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sigmoidalContrastImage</methodname>
-   <methodparam><type>bool</type><parameter>sharpen</parameter></methodparam>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>beta</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adjusts the contrast of an image with a non-linear sigmoidal contrast
-   algorithm. Increase the contrast of the image using a sigmoidal transfer
-   function without saturating highlights or shadows. <parameter>alpha</parameter> indicates
-   how much to increase the contrast: <literal>0.00</literal> is none; <literal>3.00</literal> is
-   typical; <literal>20.00</literal> is pushing it.
-   <parameter>beta</parameter> indicates where midtones fall in the resultant
-   image, as a fraction of the quantum range: <literal>0.0</literal> is white,
-   <literal>0.5</literal> is middle-gray, <literal>1.0</literal> is black
-   (multiply by <code>getQuantumRange()['quantumRangeLong']</code> to get the value to
-   pass).
-  </simpara>
-  <simpara>
-   See also <link xlink:href="&url.imagemagick.usage.color_mods.sigmoidal;">ImageMagick
-    Examples -- Color Modifications — Sigmoidal Non-linearity Contrast</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sharpen</parameter></term>
-     <listitem>
-      <simpara>
-       If &true; increase the contrast, if &false; decrease the contrast.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <simpara>
-       The amount of contrast to apply. <literal>1.00</literal> is very little, <literal>5.00</literal>
-       is a significant amount, <literal>20.00</literal> is extreme.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>beta</parameter></term>
-     <listitem>
-      <simpara>
-       Where the midpoint of the gradient will be. This value should be in the range <literal>0.00</literal>
-       to <literal>1.00</literal> - multiplied by the quantum value for ImageMagick.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <simpara>
-       Which color channels the contrast will be applied to.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </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;
-  <example>
-   <title>
-    Create a gradient image using <function>Imagick::sigmoidalContrastImage</function>
-    suitable for blending two images together smoothly, with the blending
-    defined by <parameter>alpha</parameter> and <parameter>beta</parameter>
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function generateBlendImage($width, $height, $alpha = 10, $beta = 0.5)
-{
-    $imagick = new Imagick();
-    $imagick->newPseudoImage($width, $height, 'gradient:black-white');
-    $quanta = $imagick->getQuantumRange();
-    $imagick->sigmoidalContrastImage(true, $alpha, $beta * $quanta["quantumRangeLong"]);
-
-    return $imagick;
-}
-]]>
-   </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/imagick/imagick/sketchimage.xml b/reference/imagick/imagick/sketchimage.xml
deleted file mode 100644
index 5436470e9111..000000000000
--- a/reference/imagick/imagick/sketchimage.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.sketchimage">
- <refnamediv>
-  <refname>Imagick::sketchImage</refname>
-  <refpurpose>Simulates a pencil sketch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sketchImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Simulates a pencil sketch. 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
-   Imagick::sketchImage() selects a suitable radius for you. Angle gives the
-   angle of the blurring motion. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the Gaussian, in pixels, not counting the center pixel
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-       The standard deviation of the Gaussian, in pixels.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle</parameter></term>
-     <listitem>
-      <para>
-       Apply the effect along this angle.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::sketchImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function sketchImage($imagePath, $radius, $sigma, $angle) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->sketchimage($radius, $sigma, $angle);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/smushimages.xml b/reference/imagick/imagick/smushimages.xml
deleted file mode 100644
index d8cda5e41c25..000000000000
--- a/reference/imagick/imagick/smushimages.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.smushimages" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::smushImages</refname>
-  <refpurpose>Takes all images from the current image pointer to the end of the image list and smushs them</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::smushImages</methodname>
-   <methodparam><type>bool</type><parameter>stack</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Takes all images from the current image pointer to the end of the image list and smushs
-   them to each other top-to-bottom if the stack parameter is true, otherwise left-to-right.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stack</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new smushed image.
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::smushImages</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function smushImages($imagePath, $imagePath2) {
-
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick2 = new \Imagick(realpath($imagePath2));
-
-    $imagick->addimage($imagick2);
-    $smushed = $imagick->smushImages(false, 50);
-    $smushed->setImageFormat('jpg');
-    header("Content-Type: image/jpg");
-    echo $smushed->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/solarizeimage.xml b/reference/imagick/imagick/solarizeimage.xml
deleted file mode 100644
index 127cae4ef0c0..000000000000
--- a/reference/imagick/imagick/solarizeimage.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.solarizeimage">
- <refnamediv>
-  <refname>Imagick::solarizeImage</refname>
-  <refpurpose>Applies a solarizing effect to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::solarizeImage</methodname>
-   <methodparam><type>int</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a special effect to the image, similar to the effect achieved in
-   a photo darkroom by selectively exposing areas of photo sensitive paper
-   to light. Threshold ranges from 0 to QuantumRange and is a measure of the
-   extent of the solarization.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::solarizeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function solarizeImage($imagePath, $solarizeThreshold) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->solarizeImage($solarizeThreshold * \Imagick::getQuantum());
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/sparsecolorimage.xml b/reference/imagick/imagick/sparsecolorimage.xml
deleted file mode 100644
index d25ed73f9c59..000000000000
--- a/reference/imagick/imagick/sparsecolorimage.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.sparsecolorimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::sparseColorImage</refname>
-  <refpurpose>Interpolates colors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::sparseColorImage</methodname>
-   <methodparam><type>int</type><parameter>SPARSE_METHOD</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arguments</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Given the arguments array containing numeric values this method interpolates
-   the colors found at those coordinates across the whole image using <parameter>sparse_method</parameter>.
-   &imagick.method.available.0x645;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>SPARSE_METHOD</parameter></term>
-     <listitem>
-      <para>
-       Refer to this list of <link linkend="imagick.constants.sparsecolormethod">sparse method constants</link>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arguments</parameter></term>
-     <listitem>
-      <para>
-       An array containing the coordinates. 
-       The array is in format <literal>array(1,1, 2,45)</literal>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.channel;
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title>SPARSECOLORMETHOD_BARYCENTRIC <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderImageBarycentric2() {
-        $points = [
-            [0.30, 0.10, 'red'],
-            [0.10, 0.80, 'blue'],
-            [0.70, 0.60, 'lime'],
-            [0.80, 0.20, 'yellow'],
-        ];
-        $imagick = createGradientImage(
-            400, 400,
-            $points,
-            \Imagick::SPARSECOLORMETHOD_BARYCENTRIC
-        );
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>SPARSECOLORMETHOD_BILINEAR <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderImageBilinear() {
-        $points = [[0.30, 0.10, 'red'], [0.10, 0.80, 'blue'], [0.70, 0.60, 'lime'], [0.80, 0.20, 'yellow'],];
-        $imagick = createGradientImage(500, 500, $points, \Imagick::SPARSECOLORMETHOD_BILINEAR);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>SPARSECOLORMETHOD_SPEPARDS <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderImageShepards() {
-        $points = [
-            [0.30, 0.10, 'red'],
-            [0.10, 0.80, 'blue'],
-            [0.70, 0.60, 'lime'],
-            [0.80, 0.20, 'yellow'],
-        ];
-        $imagick = createGradientImage(600, 600, $points, \Imagick::SPARSECOLORMETHOD_SPEPARDS);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>SPARSECOLORMETHOD_VORONOI <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderImageVoronoi() {
-        $points = [
-            [0.30, 0.10, 'red'],
-            [0.10, 0.80, 'blue'],
-            [0.70, 0.60, 'lime'],
-            [0.80, 0.20, 'yellow'],
-        ];
-        $imagick = createGradientImage(500, 500, $points, \Imagick::SPARSECOLORMETHOD_VORONOI);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>SPARSECOLORMETHOD_BARYCENTRIC <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    function renderImageBarycentric() {
-        $points = [
-            [0, 0, 'skyblue'],
-            [-1, 1, 'skyblue'],
-            [1, 1, 'black'],
-        ];
-        $imagick = createGradientImage(600, 200, $points, \Imagick::SPARSECOLORMETHOD_BARYCENTRIC);
-        header("Content-Type: image/png");
-        echo $imagick->getImageBlob();
-    }
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title>createGradientImage is used by other examples. <function>Imagick::sparseColorImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function createGradientImage($width, $height, $colorPoints, $sparseMethod, $absolute = false) {
-
-    $imagick = new \Imagick();
-    $imagick->newImage($width, $height, "white");
-    $imagick->setImageFormat("png");
-
-    $barycentricPoints = array();
-
-    foreach ($colorPoints as $colorPoint) {
-
-        if ($absolute == true) {
-            $barycentricPoints[] = $colorPoint[0];
-            $barycentricPoints[] = $colorPoint[1];
-        }
-        else {
-            $barycentricPoints[] = $colorPoint[0] * $width;
-            $barycentricPoints[] = $colorPoint[1] * $height;
-        }
-
-        if (is_string($colorPoint[2])) {
-            $imagickPixel = new \ImagickPixel($colorPoint[2]);
-        }
-        else if ($colorPoint[2] instanceof \ImagickPixel) {
-            $imagickPixel = $colorPoint[2];
-        }
-        else{
-            $errorMessage = sprintf(
-                "Value %s is neither a string nor an ImagickPixel class. Cannot use as a color.",
-                $colorPoint[2]
-            );
-
-            throw new \InvalidArgumentException(
-                $errorMessage
-            );
-        }
-
-        $red = $imagickPixel->getColorValue(\Imagick::COLOR_RED);
-        $green = $imagickPixel->getColorValue(\Imagick::COLOR_GREEN);
-        $blue = $imagickPixel->getColorValue(\Imagick::COLOR_BLUE);
-        $alpha = $imagickPixel->getColorValue(\Imagick::COLOR_ALPHA);
-
-        $barycentricPoints[] = $red;
-        $barycentricPoints[] = $green;
-        $barycentricPoints[] = $blue;
-        $barycentricPoints[] = $alpha;
-    }
-
-    $imagick->sparseColorImage($sparseMethod, $barycentricPoints);
-
-    return $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagick/spliceimage.xml b/reference/imagick/imagick/spliceimage.xml
deleted file mode 100644
index 565de3192c88..000000000000
--- a/reference/imagick/imagick/spliceimage.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.spliceimage">
- <refnamediv>
-  <refname>Imagick::spliceImage</refname>
-  <refpurpose>Splices a solid color into the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::spliceImage</methodname>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Splices a solid color into the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</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>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::spliceImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function spliceImage($imagePath, $startX, $startY, $width, $height) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->spliceImage($width, $height, $startX, $startY);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/spreadimage.xml b/reference/imagick/imagick/spreadimage.xml
deleted file mode 100644
index f6733148185b..000000000000
--- a/reference/imagick/imagick/spreadimage.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.spreadimage">
- <refnamediv>
-  <refname>Imagick::spreadImage</refname>
-  <refpurpose>Randomly displaces each pixel in a block</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::spreadImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Special effects method that randomly displaces each pixel in a block
-   defined by the radius parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::spreadImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function spreadImage($imagePath, $radius) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->spreadImage($radius);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/statisticimage.xml b/reference/imagick/imagick/statisticimage.xml
deleted file mode 100644
index ac8312b53f9e..000000000000
--- a/reference/imagick/imagick/statisticimage.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.statisticimage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::statisticImage</refname>
-  <refpurpose>Modifies image using a statistics function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::statisticImage</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Replace each pixel with corresponding statistic from the neighborhood of the specified width and height.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::statisticImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function statisticImage($imagePath, $statisticType, $width, $height, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imagick->statisticImage(
-        $statisticType,
-        $width,
-        $height,
-        $channel
-    );
-
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-statisticImage($imagePath, \Imagick::STATISTIC_MEDIAN, 5, 5, \Imagick::CHANNEL_DEFAULT);
-
-?>
-]]>
-      </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/imagick/imagick/steganoimage.xml b/reference/imagick/imagick/steganoimage.xml
deleted file mode 100644
index 35adaa9fcd31..000000000000
--- a/reference/imagick/imagick/steganoimage.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.steganoimage">
- <refnamediv>
-  <refname>Imagick::steganoImage</refname>
-  <refpurpose>Hides a digital watermark within the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::steganoImage</methodname>
-   <methodparam><type>Imagick</type><parameter>watermark_wand</parameter></methodparam>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Hides a digital watermark within the image. Recover the hidden watermark
-   later to prove that the authenticity of an image. Offset defines the start
-   position within the image to hide the watermark.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>watermark_wand</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/stereoimage.xml b/reference/imagick/imagick/stereoimage.xml
deleted file mode 100644
index 48817f7b0fd7..000000000000
--- a/reference/imagick/imagick/stereoimage.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.stereoimage">
- <refnamediv>
-  <refname>Imagick::stereoImage</refname>
-  <refpurpose>Composites two images</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::stereoImage</methodname>
-   <methodparam><type>Imagick</type><parameter>offset_wand</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Composites two images and produces a single image that is the composite
-   of a left and right image of a stereo pair.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>offset_wand</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/stripimage.xml b/reference/imagick/imagick/stripimage.xml
deleted file mode 100644
index 4c2f34d9b648..000000000000
--- a/reference/imagick/imagick/stripimage.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.stripimage">
- <refnamediv>
-  <refname>Imagick::stripImage</refname>
-  <refpurpose>Strips an image of all profiles and comments</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::stripImage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Strips an image of all profiles and comments.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/subimagematch.xml b/reference/imagick/imagick/subimagematch.xml
deleted file mode 100644
index 460fb0c49e1a..000000000000
--- a/reference/imagick/imagick/subimagematch.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.subimagematch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::subImageMatch</refname>
-  <refpurpose>Searches for a subimage in the current image and returns a similarity image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::subImageMatch</methodname>
-   <methodparam><type>Imagick</type><parameter>Imagick</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">offset</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter role="reference">similarity</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Searches for a subimage in the current image and returns a similarity image such that an exact match location is completely white and if none of the pixels match, black, otherwise some gray level in-between.
-   You can also pass in the optional parameters bestMatch and similarity. After calling the function similarity will be set to the 'score' of the similarity between the subimage and the matching position in the larger image, bestMatch will contain an associative array with elements x, y, width, height that describe the matching region.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>Imagick</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>similarity</parameter></term>
-    <listitem>
-     <para>
-      A new image that displays the amount of similarity at each pixel.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::subImageMatch</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function subImageMatch($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick2 = clone $imagick;
-    $imagick2->cropimage(40, 40, 250, 110);
-    $imagick2->vignetteimage(0, 1, 3, 3);
-
-    $similarity = null;
-    $bestMatch = null;
-    $comparison = $imagick->subImageMatch($imagick2, $bestMatch, $similarity);
-
-    $comparison->setImageFormat('png');
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/swirlimage.xml b/reference/imagick/imagick/swirlimage.xml
deleted file mode 100644
index e91eaa8f83d3..000000000000
--- a/reference/imagick/imagick/swirlimage.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.swirlimage">
- <refnamediv>
-  <refname>Imagick::swirlImage</refname>
-  <refpurpose>Swirls the pixels about the center of the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-
-   <type>bool</type><methodname>Imagick::swirlImage</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   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">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>degrees</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::swirlImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function swirlImage($imagePath, $swirl) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->swirlImage($swirl);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/textureimage.xml b/reference/imagick/imagick/textureimage.xml
deleted file mode 100644
index a942e652b742..000000000000
--- a/reference/imagick/imagick/textureimage.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.textureimage">
- <refnamediv>
-  <refname>Imagick::textureImage</refname>
-  <refpurpose>Repeatedly tiles the texture image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-
-   <type>Imagick</type><methodname>Imagick::textureImage</methodname>
-   <methodparam><type>Imagick</type><parameter>texture_wand</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Repeatedly tiles the texture image across and down the image canvas.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>texture_wand</parameter></term>
-     <listitem>
-      <para>
-       Imagick object to use as texture image
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new Imagick object that has the repeated texture applied.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   &imagick.imagick.throws;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::textureImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function textureImage($imagePath) {
-    $image = new \Imagick();
-    $image->newImage(640, 480, new \ImagickPixel('pink'));
-    $image->setImageFormat("jpg");
-    $texture = new \Imagick(realpath($imagePath));
-    $texture->scaleimage($image->getimagewidth() / 4, $image->getimageheight() / 4);
-    $image = $image->textureImage($texture);
-    header("Content-Type: image/jpg");
-    echo $image;
-}
-
-?>
-]]>
-      </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/imagick/imagick/thresholdimage.xml b/reference/imagick/imagick/thresholdimage.xml
deleted file mode 100644
index 1de2afd2aa90..000000000000
--- a/reference/imagick/imagick/thresholdimage.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.thresholdimage">
- <refnamediv>
-  <refname>Imagick::thresholdImage</refname>
-  <refpurpose>Changes the value of individual pixels based on a threshold</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::thresholdImage</methodname>
-   <methodparam><type>float</type><parameter>threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the value of individual pixels based on the intensity of each pixel
-   compared to threshold.  The result is a high-contrast, two color image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::thresholdImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function thresholdimage($imagePath, $threshold, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->thresholdimage($threshold * \Imagick::getQuantum(), $channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/thumbnailimage.xml b/reference/imagick/imagick/thumbnailimage.xml
deleted file mode 100644
index 9e800de383d7..000000000000
--- a/reference/imagick/imagick/thumbnailimage.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.thumbnailimage">
- <refnamediv>
-  <refname>Imagick::thumbnailImage</refname>
-  <refpurpose>Changes the size of an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::thumbnailImage</methodname>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>bestfit</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>fill</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <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 for each side. Both sides will be scaled down until
-   they match or are smaller than the parameter given for the side.
-  </para>
-  &imagick.bestfit.note;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>columns</parameter></term>
-     <listitem>
-      <para>
-      Image width
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      Image height
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bestfit</parameter></term>
-     <listitem>
-      <para>
-      Whether to force maximum values
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fill</parameter></term>
-     <listitem>
-      <para>
-       If the image does not fill the box completely then the box is filled with
-       image's background color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>legacy</parameter></term>
-     <listitem>
-      <para>
-       Round the smaller dimension down instead to the closest integer.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::thumbnailImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function thumbnailImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->setbackgroundcolor('rgb(64, 64, 64)');
-    $imagick->thumbnailImage(100, 100, true, true);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/tintimage.xml b/reference/imagick/imagick/tintimage.xml
deleted file mode 100644
index 3a597b6ae944..000000000000
--- a/reference/imagick/imagick/tintimage.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.tintimage">
- <refnamediv>
-  <refname>Imagick::tintImage</refname>
-  <refpurpose>Applies a color vector to each pixel in the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::tintImage</methodname>
-   <methodparam><type>mixed</type><parameter>tint</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>opacity</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>legacy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Applies a color vector to each pixel in the image. The length of the vector
-   is 0 for black and white and at its maximum for the midtones. The vector
-   weighing function is f(x)=(1-(4.0*((x-0.5)*(x-0.5)))).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>tint</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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="changelog">
-  &reftitle.changelog;
-  <para>
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as the first parameter and
-        a float representing the opacity value as the second parameter.
-        Previous versions allow only an ImagickPixel objects.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::tintImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function tintImage($r, $g, $b, $a) {
-    $a = $a / 100;
-
-    $imagick = new \Imagick();
-    $imagick->newPseudoImage(400, 400, 'gradient:black-white');
-
-    $tint = new \ImagickPixel("rgb($r, $g, $b)");
-    $opacity = new \ImagickPixel("rgb(128, 128, 128, $a)");
-    $imagick->tintImage($tint, $opacity);
-    $imagick->setImageFormat('png');
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/toString.xml b/reference/imagick/imagick/toString.xml
deleted file mode 100644
index 74f0b2e75257..000000000000
--- a/reference/imagick/imagick/toString.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::__toString</refname>
-  <refpurpose>Returns the image as a string</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>string</type><methodname>Imagick::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current image as string. This will only return a single image; it should not be used for Imagick objects that contain multiple images e.g. an animated GIF or PDF with multiple pages.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string content on success or an empty string on failure.
-  </para>
- </refsect1>
- 
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::getImageBlob</methodname></member>
-   <member><methodname>Imagick::getImagesBlob</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/imagick/imagick/transformimage.xml b/reference/imagick/imagick/transformimage.xml
deleted file mode 100644
index 00a4b8522d94..000000000000
--- a/reference/imagick/imagick/transformimage.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.transformimage">
- <refnamediv>
-  <refname>Imagick::transformImage</refname>
-  <refpurpose>Convenience method for setting crop size and the image geometry</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-   &imagick.deprecated.function-3-4-4;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Imagick</type><methodname>Imagick::transformImage</methodname>
-   <methodparam><type>string</type><parameter>crop</parameter></methodparam>
-   <methodparam><type>string</type><parameter>geometry</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   A convenience method for setting crop size and the image geometry from strings.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>crop</parameter></term>
-     <listitem>
-      <para>
-       A crop geometry string. This geometry defines a subregion of the image to crop.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>geometry</parameter></term>
-     <listitem>
-      <para>
-       An image geometry string. This geometry defines the final size of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an Imagick object containing the transformed image.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>Imagick::transformImage</function>:</title>
-    <para>
-     The example creates a 100x100 black image.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$image = new Imagick();
-$image->newImage(300, 200, "black");
-$new_image = $image->transformImage("100x100", "100x100");
-$new_image->writeImage('test_out.jpg');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::cropImage</function></member>
-    <member><function>Imagick::resizeImage</function></member>
-    <member><function>Imagick::thumbnailImage</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/imagick/imagick/transformimagecolorspace.xml b/reference/imagick/imagick/transformimagecolorspace.xml
deleted file mode 100644
index 299b951df06b..000000000000
--- a/reference/imagick/imagick/transformimagecolorspace.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagick.transformimagecolorspace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Imagick::transformImageColorspace</refname>
-
-  <refpurpose>Transforms an image to a new colorspace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-
-  <methodsynopsis role="oop">
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::transformImageColorspace</methodname>
-   <methodparam><type>int</type><parameter>colorspace</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Transforms an image to a new colorspace.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>colorspace</parameter></term>
-    <listitem>
-     <para>
-       The colorspace the image should be transformed to, one of the <link linkend="imagick.constants.colorspace">COLORSPACE constants</link> e.g. Imagick::COLORSPACE_CMYK.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="classname.methodname.example.basic">
-   <title><methodname>Imagick::transformImageColorspace</methodname> example</title>
-   <para>
-   Transforms an image to a new colorspace, and then extracts a single channel so that the individual channel values can be viewed.
-   </para>
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-function transformImageColorspace($imagePath, $colorSpace, $channel) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->transformimagecolorspace($colorSpace);
-    //channel should be one of the channel constants e.g. \Imagick::CHANNEL_BLUE 
-    $imagick->separateImageChannel($channel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-?>
-]]>
-   </programlisting>
-
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::setColorSpace</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/imagick/imagick/transparentpaintimage.xml b/reference/imagick/imagick/transparentpaintimage.xml
deleted file mode 100644
index 138f1dba032c..000000000000
--- a/reference/imagick/imagick/transparentpaintimage.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.transparentpaintimage">
- <refnamediv>
-  <refname>Imagick::transparentPaintImage</refname>
-  <refpurpose>Paints pixels transparent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::transparentPaintImage</methodname>
-   <methodparam><type>mixed</type><parameter>target</parameter></methodparam>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>invert</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Paints pixels matching the target color transparent.
-   &imagick.method.available.0x638;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>target</parameter></term>
-     <listitem>
-      <para>
-       The target color to paint
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.alpha;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       &imagick.parameter.fuzz;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>invert</parameter></term>
-     <listitem>
-      <para>
-       If &true; paints any pixel that does not match the target color.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::transparentPaintImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function transparentPaintImage($color, $alpha, $fuzz) {
-    $imagick = new \Imagick(realpath("images/BlueScreen.jpg"));
-
-    //Need to be in a format that supports transparency
-    $imagick->setimageformat('png');
-
-    $imagick->transparentPaintImage(
-        $color, $alpha, $fuzz * \Imagick::getQuantum(), false
-    );
-
-    //Not required, but helps tidy up left over pixels
-    $imagick->despeckleimage();
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/transposeimage.xml b/reference/imagick/imagick/transposeimage.xml
deleted file mode 100644
index 748a6d954e35..000000000000
--- a/reference/imagick/imagick/transposeimage.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.transposeimage">
- <refnamediv>
-  <refname>Imagick::transposeImage</refname>
-  <refpurpose>Creates a vertical mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::transposeImage</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Creates a vertical mirror image by reflecting the pixels 
-   around the central x-axis while rotating them 90-degrees.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::transposeImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function transposeImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->transposeImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/transverseimage.xml b/reference/imagick/imagick/transverseimage.xml
deleted file mode 100644
index bee828e0bd7a..000000000000
--- a/reference/imagick/imagick/transverseimage.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.transverseimage">
- <refnamediv>
-  <refname>Imagick::transverseImage</refname>
-  <refpurpose>Creates a horizontal mirror image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::transverseImage</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Creates a horizontal mirror image by reflecting the pixels around the
-   central y-axis while rotating them 270-degrees.
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::transverseImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function transverseImage($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->transverseImage();
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/trimimage.xml b/reference/imagick/imagick/trimimage.xml
deleted file mode 100644
index 94efd9752488..000000000000
--- a/reference/imagick/imagick/trimimage.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagick.trimimage" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Imagick::trimImage</refname>
-  <refpurpose>Remove edges from the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::trimImage</methodname>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Remove edges that are the background color from the image. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       By default target must match a particular pixel color exactly.
-       However, in many cases two colors may differ by a small amount.
-       The fuzz member of image defines how much tolerance is acceptable
-       to consider two colors as the same. This parameter represents the variation
-       on the quantum range.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-   <example>
-    <title>Using <function>Imagick::trimImage</function>:</title>
-    <para>
-     Trim an image, then display to the browser.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create the object and read the image in */
-$im = new Imagick("image.jpg");
-
-/* Trim the image. */
-$im->trimImage(0);
-
-/* Output the image */
-header("Content-Type: image/" . $im->getImageFormat());
-echo $im;
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>Imagick::getQuantumDepth</function></member>
-    <member><function>Imagick::getQuantumRange</function></member>
-    <member><function>imagecropauto</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/imagick/imagick/uniqueimagecolors.xml b/reference/imagick/imagick/uniqueimagecolors.xml
deleted file mode 100644
index 98faf6bd1e39..000000000000
--- a/reference/imagick/imagick/uniqueimagecolors.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.uniqueimagecolors">
- <refnamediv>
-  <refname>Imagick::uniqueImageColors</refname>
-  <refpurpose>Discards all but one of any pixel color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::uniqueImageColors</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   Discards all but one of any pixel color. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::uniqueImageColors</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function uniqueImageColors($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    //Reduce the image to 256 colours nicely.
-    $imagick->quantizeImage(256, \Imagick::COLORSPACE_YIQ, 0, false, false);
-    $imagick->uniqueImageColors();
-    $imagick->scaleimage($imagick->getImageWidth(), $imagick->getImageHeight() * 20);
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/unsharpmaskimage.xml b/reference/imagick/imagick/unsharpmaskimage.xml
deleted file mode 100644
index 42ce66a4e83c..000000000000
--- a/reference/imagick/imagick/unsharpmaskimage.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.unsharpmaskimage">
- <refnamediv>
-  <refname>Imagick::unsharpMaskImage</refname>
-  <refpurpose>Sharpens an image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::unsharpMaskImage</methodname>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sigma</parameter></methodparam>
-   <methodparam><type>float</type><parameter>amount</parameter></methodparam>
-   <methodparam><type>float</type><parameter>threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>channel</parameter><initializer>Imagick::CHANNEL_DEFAULT</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sharpens an image. 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 Imagick::UnsharpMaskImage() selects a
-   suitable radius for you.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sigma</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>amount</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>channel</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title> <function>Imagick::unsharpMaskImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function unsharpMaskImage($imagePath, $radius, $sigma, $amount, $unsharpThreshold) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->unsharpMaskImage($radius, $sigma, $amount, $unsharpThreshold);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/valid.xml b/reference/imagick/imagick/valid.xml
deleted file mode 100644
index 2a485d6328aa..000000000000
--- a/reference/imagick/imagick/valid.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.valid">
- <refnamediv>
-  <refname>Imagick::valid</refname>
-  <refpurpose>Checks if the current item is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::valid</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Checks if the current item is valid.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/vignetteimage.xml b/reference/imagick/imagick/vignetteimage.xml
deleted file mode 100644
index 2ed46a4003b2..000000000000
--- a/reference/imagick/imagick/vignetteimage.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.vignetteimage">
- <refnamediv>
-  <refname>Imagick::vignetteImage</refname>
-  <refpurpose>Adds vignette filter to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::vignetteImage</methodname>
-   <methodparam><type>float</type><parameter>blackPoint</parameter></methodparam>
-   <methodparam><type>float</type><parameter>whitePoint</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Softens the edges of the image in vignette style. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>blackPoint</parameter></term>
-     <listitem>
-      <para>
-       The black point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>whitePoint</parameter></term>
-     <listitem>
-      <para>
-       The white point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       X offset of the ellipse
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Y offset of the ellipse
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::vignetteImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function vignetteImage($imagePath, $blackPoint, $whitePoint, $x, $y) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->vignetteImage($blackPoint, $whitePoint, $x, $y);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/waveimage.xml b/reference/imagick/imagick/waveimage.xml
deleted file mode 100644
index 5543a44acc1c..000000000000
--- a/reference/imagick/imagick/waveimage.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.waveimage">
- <refnamediv>
-  <refname>Imagick::waveImage</refname>
-  <refpurpose>Applies wave filter to the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::waveImage</methodname>
-   <methodparam><type>float</type><parameter>amplitude</parameter></methodparam>
-   <methodparam><type>float</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Applies a wave filter to the image. 
-   &imagick.method.available.0x629;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>amplitude</parameter></term>
-     <listitem>
-      <para>
-       The amplitude of the wave.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>length</parameter></term>
-     <listitem>
-      <para>
-       The length of the wave.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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;
-  <para>
-    <example>
-      <title>WaveImage can be quite slow <function>Imagick::waveImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function waveImage($imagePath, $amplitude, $length) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->waveImage($amplitude, $length);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </programlisting>
-    </example>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagick/whitethresholdimage.xml b/reference/imagick/imagick/whitethresholdimage.xml
deleted file mode 100644
index 1e6f6c6f7141..000000000000
--- a/reference/imagick/imagick/whitethresholdimage.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.whitethresholdimage">
- <refnamediv>
-  <refname>Imagick::whiteThresholdImage</refname>
-  <refpurpose>Force all pixels above the threshold into white</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::whiteThresholdImage</methodname>
-   <methodparam><type>mixed</type><parameter>threshold</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Is like Imagick::ThresholdImage() but force all pixels above the threshold
-   into white while leaving all pixels below the threshold unchanged.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>threshold</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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>PECL imagick 2.1.0</entry>
-       <entry>
-        Now allows a string representing the color as a parameter.
-        Previous versions allow only an ImagickPixel object.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>Imagick::whiteThresholdImage</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function whiteThresholdImage($imagePath, $color) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->whiteThresholdImage($color);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagick/writeimage.xml b/reference/imagick/imagick/writeimage.xml
deleted file mode 100644
index 8847e3f6cbd9..000000000000
--- a/reference/imagick/imagick/writeimage.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.writeimage">
- <refnamediv>
-  <refname>Imagick::writeImage</refname>
-  <refpurpose>Writes an image to the specified filename</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::writeImage</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter><initializer>NULL</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 Imagick::readImage() or
-   Imagick::setImageFilename().
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       Filename where to write the image. The extension of the filename
-       defines the type of the file. 
-       Format can be forced regardless of file extension using format: prefix,
-       for example "jpg:test.png".
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/writeimagefile.xml b/reference/imagick/imagick/writeimagefile.xml
deleted file mode 100644
index bd75da4f0b0a..000000000000
--- a/reference/imagick/imagick/writeimagefile.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.writeimagefile">
- <refnamediv>
-  <refname>Imagick::writeImageFile</refname>
-  <refpurpose>Writes an image to a filehandle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::writeImageFile</methodname>
-   <methodparam><type>resource</type><parameter>filehandle</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Writes the image sequence to an open filehandle. The handle must be opened with
-   for example fopen. &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filehandle</parameter></term>
-     <listitem>
-      <para>
-       Filehandle where to write the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-       The image format.
-       The list of valid format specifiers depends on the compiled feature set of
-       ImageMagick, and can be queried at runtime via <methodname>Imagick::queryFormats</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::queryFormats</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/imagick/imagick/writeimages.xml b/reference/imagick/imagick/writeimages.xml
deleted file mode 100644
index ab931e3522a8..000000000000
--- a/reference/imagick/imagick/writeimages.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.writeimages">
- <refnamediv>
-  <refname>Imagick::writeImages</refname>
-  <refpurpose>Writes an image or image sequence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::writeImages</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>adjoin</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Writes an image or image sequence.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>adjoin</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagick/writeimagesfile.xml b/reference/imagick/imagick/writeimagesfile.xml
deleted file mode 100644
index 5145f37293d5..000000000000
--- a/reference/imagick/imagick/writeimagesfile.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagick.writeimagesfile">
- <refnamediv>
-  <refname>Imagick::writeImagesFile</refname>
-  <refpurpose>Writes frames to a filehandle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Imagick::writeImagesFile</methodname>
-   <methodparam><type>resource</type><parameter>filehandle</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Writes all image frames into an open filehandle. This method can be used to write
-   animated gifs or other multiframe images into open filehandle.
-   &imagick.method.available.0x636;
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filehandle</parameter></term>
-     <listitem>
-      <para>
-       Filehandle where to write the images.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>format</parameter></term>
-     <listitem>
-      <para>
-       The image format.
-       The list of valid format specifiers depends on the compiled feature set of
-       ImageMagick, and can be queried at runtime via <methodname>Imagick::queryFormats</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Imagick::queryFormats</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/imagick/imagickdraw.xml b/reference/imagick/imagickdraw.xml
deleted file mode 100644
index 85350b98bf0f..000000000000
--- a/reference/imagick/imagickdraw.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference role="class" xml:id="class.imagickdraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The <classname>ImagickDraw</classname> class</title>
- <titleabbrev>ImagickDraw</titleabbrev>
- <partintro>
-  <section xml:id="imagickdraw.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>ImagickDraw</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass><classname>ImagickDraw</classname></ooclass>
-    </classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickdraw')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-  </section>
- </partintro>
-
- &reference.imagick.entities.imagickdraw;
-</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/imagick/imagickdraw/affine.xml b/reference/imagick/imagickdraw/affine.xml
deleted file mode 100644
index 459783554bb4..000000000000
--- a/reference/imagick/imagickdraw/affine.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagickdraw.affine" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ImagickDraw::affine</refname>
-  <refpurpose>Adjusts the current affine transformation matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::affine</methodname>
-   <methodparam><type>array</type><parameter>affine</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Adjusts the current affine transformation matrix with the specified affine
-   transformation matrix.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>affine</parameter></term>
-     <listitem>
-      <para>
-       Affine matrix parameters
-      </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>ImagickDraw::affine</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function affine($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-
-    $PI = 3.141592653589794;
-    $angle = 60 * $PI / 360;
-
-    //Scale the drawing co-ordinates.
-    $affineScale = array("sx" => 1.75, "sy" => 1.75, "rx" => 0, "ry" => 0, "tx" => 0, "ty" => 0);
-
-    //Shear the drawing co-ordinates.
-    $affineShear = array("sx" => 1, "sy" => 1, "rx" => sin($angle), "ry" => -sin($angle), "tx" => 0, "ty" => 0);
-
-    //Rotate the drawing co-ordinates. The shear affine matrix
-    //produces incorrectly scaled drawings.
-    $affineRotate = array("sx" => cos($angle), "sy" => cos($angle), "rx" => sin($angle), "ry" => -sin($angle), "tx" => 0, "ty" => 0,);
-
-    //Translate (offset) the drawing
-    $affineTranslate = array("sx" => 1, "sy" => 1, "rx" => 0, "ry" => 0, "tx" => 30, "ty" => 30);
-
-    //The identity affine matrix
-    $affineIdentity = array("sx" => 1, "sy" => 1, "rx" => 0, "ry" => 0, "tx" => 0, "ty" => 0);
-
-    $examples = [$affineScale, $affineShear, $affineRotate, $affineTranslate, $affineIdentity,];
-
-    $count = 0;
-
-    foreach ($examples as $example) {
-        $draw->push();
-        $draw->translate(($count % 2) * 250, intval($count / 2) * 250);
-        $draw->translate(100, 100);
-        $draw->affine($example);
-        $draw->rectangle(-50, -50, 50, 50);
-        $draw->pop();
-        $count++;
-    }
-
-    //Create an image object which the draw commands can be rendered into
-    $image = new \Imagick();
-    $image->newImage(500, 750, $backgroundColor);
-    $image->setImageFormat("png");
-
-    //Render the draw commands in the ImagickDraw object 
-    //into the image.
-    $image->drawImage($draw);
-
-    //Send the image to the browser
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/annotation.xml b/reference/imagick/imagickdraw/annotation.xml
deleted file mode 100644
index fb7cceabbd16..000000000000
--- a/reference/imagick/imagickdraw/annotation.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.annotation">
- <refnamediv>
-  <refname>ImagickDraw::annotation</refname>
-  <refpurpose>Draws text on the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::annotation</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws text on the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The x coordinate where text is drawn
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The y coordinate where text is drawn
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to draw on the image
-      </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/imagick/imagickdraw/arc.xml b/reference/imagick/imagickdraw/arc.xml
deleted file mode 100644
index 09a2c4b0ae5e..000000000000
--- a/reference/imagick/imagickdraw/arc.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.arc">
- <refnamediv>
-  <refname>ImagickDraw::arc</refname>
-  <refpurpose>Draws an arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::arc</methodname>
-   <methodparam><type>float</type><parameter>start_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>start_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>start_angle</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end_angle</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws an arc falling within a specified bounding rectangle on the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>start_x</parameter></term>
-     <listitem>
-      <para>
-       Starting x ordinate of bounding rectangle
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>start_y</parameter></term>
-     <listitem>
-      <para>
-       starting y ordinate of bounding rectangle
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>end_x</parameter></term>
-     <listitem>
-      <para>
-       ending x ordinate of bounding rectangle
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>end_y</parameter></term>
-     <listitem>
-      <para>
-       ending y ordinate of bounding rectangle
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>start_angle</parameter></term>
-     <listitem>
-      <para>
-       starting degrees of rotation
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>end_angle</parameter></term>
-     <listitem>
-      <para>
-       ending degrees of rotation
-      </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>ImagickDraw::arc</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function arc($strokeColor, $fillColor, $backgroundColor, $startX, $startY, $endX, $endY, $startAngle, $endAngle) {
-
-    //Create a ImagickDraw object to draw into.
-    $draw = new \ImagickDraw();
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-
-    $draw->arc($startX, $startY, $endX, $endY, $startAngle, $endAngle);
-
-    //Create an image object which the draw commands can be rendered into
-    $image = new \Imagick();
-    $image->newImage(IMAGE_WIDTH, IMAGE_HEIGHT, $backgroundColor);
-    $image->setImageFormat("png");
-
-    //Render the draw commands in the ImagickDraw object 
-    //into the image.
-    $image->drawImage($draw);
-
-    //Send the image to the browser
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/bezier.xml b/reference/imagick/imagickdraw/bezier.xml
deleted file mode 100644
index 85731ffabd6d..000000000000
--- a/reference/imagick/imagickdraw/bezier.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.bezier">
- <refnamediv>
-  <refname>ImagickDraw::bezier</refname>
-  <refpurpose>Draws a bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::bezier</methodname>
-   <methodparam><type>array</type><parameter>coordinates</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a bezier curve through a set of points on the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>coordinates</parameter></term>
-     <listitem>
-      <para>
-       Multidimensional array like array( array( 'x' => 1, 'y' => 2 ), 
-       array( 'x' => 3, 'y' => 4 ) )
-      </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>ImagickDraw::bezier</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function bezier($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $strokeColor = new \ImagickPixel($strokeColor);
-    $fillColor = new \ImagickPixel($fillColor);
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-
-    $smoothPointsSet = [
-        [
-            ['x' => 10.0 * 5, 'y' => 10.0 * 5],
-            ['x' => 30.0 * 5, 'y' => 90.0 * 5],
-            ['x' => 25.0 * 5, 'y' => 10.0 * 5],
-            ['x' => 50.0 * 5, 'y' => 50.0 * 5],
-        ], 
-        [
-            ['x' => 50.0 * 5, 'y' => 50.0 * 5],
-            ['x' => 75.0 * 5, 'y' => 90.0 * 5],
-            ['x' => 70.0 * 5, 'y' => 10.0 * 5],
-            ['x' => 90.0 * 5, 'y' => 40.0 * 5],
-        ],
-    ];
-
-    foreach ($smoothPointsSet as $points) {
-        $draw->bezier($points);
-    }
-
-    $disjointPoints = [
-        [
-            ['x' => 10 * 5, 'y' => 10 * 5], 
-            ['x' => 30 * 5, 'y' => 90 * 5], 
-            ['x' => 25 * 5, 'y' => 10 * 5],
-            ['x' => 50 * 5, 'y' => 50 * 5],
-        ],
-        [
-            ['x' => 50 * 5, 'y' => 50 * 5], 
-            ['x' => 80 * 5, 'y' => 50 * 5],
-            ['x' => 70 * 5, 'y' => 10 * 5],
-            ['x' => 90 * 5, 'y' => 40 * 5],
-         ]
-    ];
-    $draw->translate(0, 200);
-
-    foreach ($disjointPoints as $points) {
-        $draw->bezier($points);
-    }
-
-    //Create an image object which the draw commands can be rendered into
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    //Render the draw commands in the ImagickDraw object 
-    //into the image.
-    $imagick->drawImage($draw);
-
-    //Send the image to the browser
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/circle.xml b/reference/imagick/imagickdraw/circle.xml
deleted file mode 100644
index 7a4f92fec77c..000000000000
--- a/reference/imagick/imagickdraw/circle.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.circle">
- <refnamediv>
-  <refname>ImagickDraw::circle</refname>
-  <refpurpose>Draws a circle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::circle</methodname>
-   <methodparam><type>float</type><parameter>origin_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>origin_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>perimeter_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>perimeter_y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a circle on the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>origin_x</parameter></term>
-     <listitem>
-      <para>
-       origin x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>origin_y</parameter></term>
-     <listitem>
-      <para>
-       origin y coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>perimeter_x</parameter></term>
-     <listitem>
-      <para>
-       perimeter x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>perimeter_y</parameter></term>
-     <listitem>
-      <para>
-       perimeter y coordinate
-      </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>ImagickDraw::circle</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function circle($strokeColor, $fillColor, $backgroundColor, $originX, $originY, $endX, $endY) {
-
-    //Create a ImagickDraw object to draw into.
-    $draw = new \ImagickDraw();
-
-    $strokeColor = new \ImagickPixel($strokeColor);
-    $fillColor = new \ImagickPixel($fillColor);
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->circle($originX, $originY, $endX, $endY);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/clear.xml b/reference/imagick/imagickdraw/clear.xml
deleted file mode 100644
index d506ffcc0751..000000000000
--- a/reference/imagick/imagickdraw/clear.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.clear">
- <refnamediv>
-  <refname>ImagickDraw::clear</refname>
-  <refpurpose>Clears the ImagickDraw</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Clears the ImagickDraw object of any accumulated commands, and resets the
-   settings it contains to their defaults.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <classname>ImagickDraw</classname> 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/imagick/imagickdraw/clone.xml b/reference/imagick/imagickdraw/clone.xml
deleted file mode 100644
index 3543304ef80a..000000000000
--- a/reference/imagick/imagickdraw/clone.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.clone">
- <refnamediv>
-  <refname>ImagickDraw::clone</refname>
-  <refpurpose>Makes an exact copy of the specified ImagickDraw object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickDraw</type><methodname>ImagickDraw::clone</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Makes an exact copy of the specified <classname>ImagickDraw</classname> object.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   returns an exact copy of the specified <classname>ImagickDraw</classname> 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/imagick/imagickdraw/color.xml b/reference/imagick/imagickdraw/color.xml
deleted file mode 100644
index 72b78a734b43..000000000000
--- a/reference/imagick/imagickdraw/color.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.color">
- <refnamediv>
-  <refname>ImagickDraw::color</refname>
-  <refpurpose>Draws color on image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::color</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>paint</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws color on image using the current fill color, starting at specified
-   position, and using specified paint method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the paint
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the paint
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>paint</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.paint">PAINT</link> constant
-       (<literal>imagick::PAINT_*</literal>).
-      </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/imagick/imagickdraw/comment.xml b/reference/imagick/imagickdraw/comment.xml
deleted file mode 100644
index 258d79df2fce..000000000000
--- a/reference/imagick/imagickdraw/comment.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.comment">
- <refnamediv>
-  <refname>ImagickDraw::comment</refname>
-  <refpurpose>Adds a comment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::comment</methodname>
-   <methodparam><type>string</type><parameter>comment</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Adds a comment to a vector output stream.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-       The comment string to add to vector output stream
-      </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/imagick/imagickdraw/composite.xml b/reference/imagick/imagickdraw/composite.xml
deleted file mode 100644
index 5257e1c2a8c3..000000000000
--- a/reference/imagick/imagickdraw/composite.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.composite">
- <refnamediv>
-  <refname>ImagickDraw::composite</refname>
-  <refpurpose>Composites an image onto the current image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::composite</methodname>
-   <methodparam><type>int</type><parameter>composite</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-   <methodparam><type>Imagick</type><parameter>image</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Composites an image onto the current image, using the specified
-   composition operator, specified position, and at the specified size.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>composite</parameter></term>
-     <listitem>
-      <para>
-       composition operator.
-       One of the <link linkend="imagick.constants.compositeop">Composite Operator</link> constant
-       (<literal>imagick::COMPOSITE_*</literal>).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the top left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the top left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       width of the composition image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       height of the composition image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>image</parameter></term>
-     <listitem>
-      <para>
-       the <classname>Imagick</classname> object where composition image is taken from.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::composite</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function composite($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setFillOpacity(1);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFont("../fonts/CANDY.TTF");
-    $draw->setFontSize(140);
-    $draw->rectangle(0, 0, 1000, 300);
-    $draw->setFillColor('white');
-    $draw->setfillopacity(1);
-    $draw->annotation(50, 180, "Lorem Ipsum!");
-
-    //Create an image object which the draw commands can be rendered into
-    $imagick = new \Imagick();
-    $imagick->newImage(1000, 302, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    //Render the draw commands in the ImagickDraw object 
-    //into the image.
-    $imagick->drawImage($draw);
-
-    //Send the image to the browser
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/construct.xml b/reference/imagick/imagickdraw/construct.xml
deleted file mode 100644
index 25d8af7b297b..000000000000
--- a/reference/imagick/imagickdraw/construct.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.construct">
- <refnamediv>
-  <refname>ImagickDraw::__construct</refname>
-  <refpurpose>The ImagickDraw constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="ImagickDraw">
-   <modifier>public</modifier> <methodname>ImagickDraw::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  &warn.undocumented.func;
-  <para>
-   The <classname>ImagickDraw</classname> constructor.
-  </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/imagick/imagickdraw/destroy.xml b/reference/imagick/imagickdraw/destroy.xml
deleted file mode 100644
index d0fb6d627989..000000000000
--- a/reference/imagick/imagickdraw/destroy.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.destroy">
- <refnamediv>
-  <refname>ImagickDraw::destroy</refname>
-  <refpurpose>Frees all associated resources</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::destroy</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Frees all resources associated with the <classname>ImagickDraw</classname> object.
-  </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/imagick/imagickdraw/ellipse.xml b/reference/imagick/imagickdraw/ellipse.xml
deleted file mode 100644
index 5f6dd30900c8..000000000000
--- a/reference/imagick/imagickdraw/ellipse.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.ellipse">
- <refnamediv>
-  <refname>ImagickDraw::ellipse</refname>
-  <refpurpose>Draws an ellipse on the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::ellipse</methodname>
-   <methodparam><type>float</type><parameter>origin_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>origin_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle_start</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle_end</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws an ellipse on the image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>origin_x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>origin_y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>radius_x</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>radius_y</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle_start</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>angle_end</parameter></term>
-     <listitem>
-      <para>
-      </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>ImagickDraw::ellipse</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function ellipse($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->ellipse(125, 70, 100, 50, 0, 360);
-    $draw->ellipse(350, 70, 100, 50, 0, 315);
-
-    $draw->push();
-    $draw->translate(125, 250);
-    $draw->rotate(30);
-    $draw->ellipse(0, 0, 100, 50, 0, 360);
-    $draw->pop();
-
-    $draw->push();
-    $draw->translate(350, 250);
-    $draw->rotate(30);
-    $draw->ellipse(0, 0, 100, 50, 0, 315);
-    $draw->pop();
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/getclippath.xml b/reference/imagick/imagickdraw/getclippath.xml
deleted file mode 100644
index 885fa4593d93..000000000000
--- a/reference/imagick/imagickdraw/getclippath.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getclippath">
- <refnamediv>
-  <refname>ImagickDraw::getClipPath</refname>
-  <refpurpose>Obtains the current clipping path ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>ImagickDraw::getClipPath</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Obtains the current clipping path ID.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the clip path ID or false if no clip path exists.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getcliprule.xml b/reference/imagick/imagickdraw/getcliprule.xml
deleted file mode 100644
index 00fe8665e6a7..000000000000
--- a/reference/imagick/imagickdraw/getcliprule.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getcliprule">
- <refnamediv>
-  <refname>ImagickDraw::getClipRule</refname>
-  <refpurpose>Returns the current polygon fill rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getClipRule</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the current polygon fill rule to be used by the clipping path.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
-   (<literal>imagick::FILLRULE_*</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/imagick/imagickdraw/getclipunits.xml b/reference/imagick/imagickdraw/getclipunits.xml
deleted file mode 100644
index 8c1074c7fc03..000000000000
--- a/reference/imagick/imagickdraw/getclipunits.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getclipunits">
- <refnamediv>
-  <refname>ImagickDraw::getClipUnits</refname>
-  <refpurpose>Returns the interpretation of clip path units</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getClipUnits</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the interpretation of clip path units.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an &integer; 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/imagick/imagickdraw/getfillcolor.xml b/reference/imagick/imagickdraw/getfillcolor.xml
deleted file mode 100644
index 7dea0ec16ded..000000000000
--- a/reference/imagick/imagickdraw/getfillcolor.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfillcolor">
- <refnamediv>
-  <refname>ImagickDraw::getFillColor</refname>
-  <refpurpose>Returns the fill color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>ImagickDraw::getFillColor</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the fill color used for drawing filled objects.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <classname>ImagickPixel</classname> 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/imagick/imagickdraw/getfillopacity.xml b/reference/imagick/imagickdraw/getfillopacity.xml
deleted file mode 100644
index f8e0452b4bfe..000000000000
--- a/reference/imagick/imagickdraw/getfillopacity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfillopacity">
- <refnamediv>
-  <refname>ImagickDraw::getFillOpacity</refname>
-  <refpurpose>Returns the opacity used when drawing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getFillOpacity</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the opacity used when drawing using the fill color or fill
-   texture.  Fully opaque is 1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The opacity. 
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getfillrule.xml b/reference/imagick/imagickdraw/getfillrule.xml
deleted file mode 100644
index 2bafde31d34c..000000000000
--- a/reference/imagick/imagickdraw/getfillrule.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfillrule">
- <refnamediv>
-  <refname>ImagickDraw::getFillRule</refname>
-  <refpurpose>Returns the fill rule</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getFillRule</methodname>
-   <void />
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the fill rule used while drawing polygons.
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
-   (<literal>imagick::FILLRULE_*</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/imagick/imagickdraw/getfont.xml b/reference/imagick/imagickdraw/getfont.xml
deleted file mode 100644
index 6dd772c9cc4f..000000000000
--- a/reference/imagick/imagickdraw/getfont.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfont">
- <refnamediv>
-  <refname>ImagickDraw::getFont</refname>
-  <refpurpose>Returns the font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ImagickDraw::getFont</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns a string specifying the font used when annotating with text. 
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string on success and false if no font is set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getfontfamily.xml b/reference/imagick/imagickdraw/getfontfamily.xml
deleted file mode 100644
index 4f7830729d0d..000000000000
--- a/reference/imagick/imagickdraw/getfontfamily.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfontfamily">
- <refnamediv>
-  <refname>ImagickDraw::getFontFamily</refname>
-  <refpurpose>Returns the font family</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ImagickDraw::getFontFamily</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the font family to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the font family currently selected or false if font family is not set. 
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getfontsize.xml b/reference/imagick/imagickdraw/getfontsize.xml
deleted file mode 100644
index a8a76e30625c..000000000000
--- a/reference/imagick/imagickdraw/getfontsize.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfontsize">
- <refnamediv>
-  <refname>ImagickDraw::getFontSize</refname>
-  <refpurpose>Returns the font pointsize</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getFontSize</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the font pointsize used when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the font size associated with the current <classname>ImagickDraw</classname> 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/imagick/imagickdraw/getfontstretch.xml b/reference/imagick/imagickdraw/getfontstretch.xml
deleted file mode 100644
index 856efd618fad..000000000000
--- a/reference/imagick/imagickdraw/getfontstretch.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.getfontstretch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::getFontStretch</refname>
-  <refpurpose>Gets the font stretch to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getFontStretch</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the font stretch to use when annotating with text. Returns a StretchType.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getfontstyle.xml b/reference/imagick/imagickdraw/getfontstyle.xml
deleted file mode 100644
index 456e47028b13..000000000000
--- a/reference/imagick/imagickdraw/getfontstyle.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfontstyle">
- <refnamediv>
-  <refname>ImagickDraw::getFontStyle</refname>
-  <refpurpose>Returns the font style</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getFontStyle</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the font style used when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getfontweight.xml b/reference/imagick/imagickdraw/getfontweight.xml
deleted file mode 100644
index b4e1b6351194..000000000000
--- a/reference/imagick/imagickdraw/getfontweight.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getfontweight">
- <refnamediv>
-  <refname>ImagickDraw::getFontWeight</refname>
-  <refpurpose>Returns the font weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getFontWeight</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the font weight used when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an &integer; on success and 0 if no weight is set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getgravity.xml b/reference/imagick/imagickdraw/getgravity.xml
deleted file mode 100644
index 3ea5eeab3c04..000000000000
--- a/reference/imagick/imagickdraw/getgravity.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getgravity">
- <refnamediv>
-  <refname>ImagickDraw::getGravity</refname>
-  <refpurpose>Returns the text placement gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getGravity</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the text placement gravity used when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokeantialias.xml b/reference/imagick/imagickdraw/getstrokeantialias.xml
deleted file mode 100644
index 1ebc04a0a259..000000000000
--- a/reference/imagick/imagickdraw/getstrokeantialias.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokeantialias">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeAntialias</refname>
-  <refpurpose>Returns the current stroke antialias setting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::getStrokeAntialias</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the current stroke antialias setting. Stroked outlines 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>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if antialiasing is on and &false; if it is off.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokecolor.xml b/reference/imagick/imagickdraw/getstrokecolor.xml
deleted file mode 100644
index e850b4960a2c..000000000000
--- a/reference/imagick/imagickdraw/getstrokecolor.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokecolor">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeColor</refname>
-  <refpurpose>Returns the color used for stroking object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>ImagickDraw::getStrokeColor</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the color used for stroking object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>stroke_color</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <classname>ImagickPixel</classname> object which describes the color.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokedasharray.xml b/reference/imagick/imagickdraw/getstrokedasharray.xml
deleted file mode 100644
index 492155545195..000000000000
--- a/reference/imagick/imagickdraw/getstrokedasharray.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokedasharray">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeDashArray</refname>
-  <refpurpose>Returns an array representing the pattern of dashes and gaps used to stroke paths</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickDraw::getStrokeDashArray</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns an array representing the pattern of dashes and gaps used to
-   stroke paths.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array on success and empty array if not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokedashoffset.xml b/reference/imagick/imagickdraw/getstrokedashoffset.xml
deleted file mode 100644
index c325e2dc5b5b..000000000000
--- a/reference/imagick/imagickdraw/getstrokedashoffset.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokedashoffset">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeDashOffset</refname>
-  <refpurpose>Returns the offset into the dash pattern to start the dash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getStrokeDashOffset</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the offset into the dash pattern to start the dash.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a float representing the offset and 0 if it's not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokelinecap.xml b/reference/imagick/imagickdraw/getstrokelinecap.xml
deleted file mode 100644
index f02f3d963319..000000000000
--- a/reference/imagick/imagickdraw/getstrokelinecap.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokelinecap">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeLineCap</refname>
-  <refpurpose>Returns the shape to be used at the end of open subpaths when they are stroked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getStrokeLineCap</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the shape to be used at the end of open subpaths when they are
-   stroked.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <link linkend="imagick.constants.linecap">LINECAP</link> constant
-   (<literal>imagick::LINECAP_*</literal>), or 0 if stroke linecap is not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokelinejoin.xml b/reference/imagick/imagickdraw/getstrokelinejoin.xml
deleted file mode 100644
index 6533b30bf696..000000000000
--- a/reference/imagick/imagickdraw/getstrokelinejoin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokelinejoin">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeLineJoin</refname>
-  <refpurpose>Returns the shape to be used at the corners of paths when they are stroked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getStrokeLineJoin</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the shape to be used at the corners of paths (or other vector
-   shapes) when they are stroked.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokemiterlimit.xml b/reference/imagick/imagickdraw/getstrokemiterlimit.xml
deleted file mode 100644
index 981a87e203f8..000000000000
--- a/reference/imagick/imagickdraw/getstrokemiterlimit.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokemiterlimit">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeMiterLimit</refname>
-  <refpurpose>Returns the stroke miter limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getStrokeMiterLimit</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the miter limit. When two line segments meet at a sharp angle and
-   miter joins have been specified for 'lineJoin', it is possible for the
-   miter to extend far beyond the thickness of the line stroking the path.
-   The 'miterLimit' imposes a limit on the ratio of the miter length to the
-   'lineWidth'.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an int describing the miter limit
-   and 0 if no miter limit is set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokeopacity.xml b/reference/imagick/imagickdraw/getstrokeopacity.xml
deleted file mode 100644
index 5a3be46fd24f..000000000000
--- a/reference/imagick/imagickdraw/getstrokeopacity.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokeopacity">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeOpacity</refname>
-  <refpurpose>Returns the opacity of stroked object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getStrokeOpacity</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the opacity of stroked object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>float</type> describing the opacity.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getstrokewidth.xml b/reference/imagick/imagickdraw/getstrokewidth.xml
deleted file mode 100644
index 0bd80c71be40..000000000000
--- a/reference/imagick/imagickdraw/getstrokewidth.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getstrokewidth">
- <refnamediv>
-  <refname>ImagickDraw::getStrokeWidth</refname>
-  <refpurpose>Returns the width of the stroke used to draw object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getStrokeWidth</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the width of the stroke used to draw object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>float</type> describing the stroke width.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextalignment.xml b/reference/imagick/imagickdraw/gettextalignment.xml
deleted file mode 100644
index 8010beb4711b..000000000000
--- a/reference/imagick/imagickdraw/gettextalignment.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextalignment">
- <refnamediv>
-  <refname>ImagickDraw::getTextAlignment</refname>
-  <refpurpose>Returns the text alignment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getTextAlignment</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the alignment applied when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <link linkend="imagick.constants.align">ALIGN</link> constant
-   (<literal>imagick::ALIGN_*</literal>), and 0 if no align is set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextantialias.xml b/reference/imagick/imagickdraw/gettextantialias.xml
deleted file mode 100644
index e20979e3408e..000000000000
--- a/reference/imagick/imagickdraw/gettextantialias.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextantialias">
- <refnamediv>
-  <refname>ImagickDraw::getTextAntialias</refname>
-  <refpurpose>Returns the current text antialias setting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::getTextAntialias</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the current text antialias setting, which determines whether text
-   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.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextdecoration.xml b/reference/imagick/imagickdraw/gettextdecoration.xml
deleted file mode 100644
index a7fe9aea3a3a..000000000000
--- a/reference/imagick/imagickdraw/gettextdecoration.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextdecoration">
- <refnamediv>
-  <refname>ImagickDraw::getTextDecoration</refname>
-  <refpurpose>Returns the text decoration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickDraw::getTextDecoration</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the decoration applied when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <link linkend="imagick.constants.decoration">DECORATION</link> constant
-   (<literal>imagick::DECORATION_*</literal>), and 0 if no decoration is set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextencoding.xml b/reference/imagick/imagickdraw/gettextencoding.xml
deleted file mode 100644
index 8e66dfadd380..000000000000
--- a/reference/imagick/imagickdraw/gettextencoding.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextencoding">
- <refnamediv>
-  <refname>ImagickDraw::getTextEncoding</refname>
-  <refpurpose>Returns the code set used for text annotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>false</type><type>string</type></type><methodname>ImagickDraw::getTextEncoding</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns a string which specifies the code set used for text annotations.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string specifying the code set
-   or false if text encoding is not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextinterlinespacing.xml b/reference/imagick/imagickdraw/gettextinterlinespacing.xml
deleted file mode 100644
index 6a54ce83cc12..000000000000
--- a/reference/imagick/imagickdraw/gettextinterlinespacing.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.gettextinterlinespacing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::getTextInterlineSpacing</refname>
-  <refpurpose>Gets the text interline spacing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getTextInterlineSpacing</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the text interline spacing.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextinterwordspacing.xml b/reference/imagick/imagickdraw/gettextinterwordspacing.xml
deleted file mode 100644
index af8b6c0f2d16..000000000000
--- a/reference/imagick/imagickdraw/gettextinterwordspacing.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.gettextinterwordspacing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::getTextInterwordSpacing</refname>
-  <refpurpose>Gets the text interword spacing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getTextInterwordSpacing</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the text interword spacing.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextkerning.xml b/reference/imagick/imagickdraw/gettextkerning.xml
deleted file mode 100644
index db5c2f92a91d..000000000000
--- a/reference/imagick/imagickdraw/gettextkerning.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.gettextkerning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::getTextKerning</refname>
-  <refpurpose>Gets the text kerning</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickDraw::getTextKerning</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the text kerning.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/gettextundercolor.xml b/reference/imagick/imagickdraw/gettextundercolor.xml
deleted file mode 100644
index bb4950443ff8..000000000000
--- a/reference/imagick/imagickdraw/gettextundercolor.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.gettextundercolor">
- <refnamediv>
-  <refname>ImagickDraw::getTextUnderColor</refname>
-  <refpurpose>Returns the text under color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ImagickPixel</type><methodname>ImagickDraw::getTextUnderColor</methodname>
-   <void />
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the color of a background rectangle to place under text annotations.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an <classname>ImagickPixel</classname> object describing the color.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/getvectorgraphics.xml b/reference/imagick/imagickdraw/getvectorgraphics.xml
deleted file mode 100644
index 86b06878caf0..000000000000
--- a/reference/imagick/imagickdraw/getvectorgraphics.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.getvectorgraphics">
- <refnamediv>
-  <refname>ImagickDraw::getVectorGraphics</refname>
-  <refpurpose>Returns a string containing vector graphics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ImagickDraw::getVectorGraphics</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns a string which specifies the vector graphics generated by any
-   graphics calls made since the <classname>ImagickDraw</classname> object was instantiated.  
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the vector graphics.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickdraw/line.xml b/reference/imagick/imagickdraw/line.xml
deleted file mode 100644
index 5c7d669a6eb7..000000000000
--- a/reference/imagick/imagickdraw/line.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.line">
- <refnamediv>
-  <refname>ImagickDraw::line</refname>
-  <refpurpose>Draws a line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::line</methodname>
-   <methodparam><type>float</type><parameter>start_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>start_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>end_y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a line on the image using the current stroke color, stroke opacity, and stroke width.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>start_x</parameter></term>
-     <listitem>
-      <para>
-       starting x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>start_y</parameter></term>
-     <listitem>
-      <para>
-       starting y coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>end_x</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>end_y</parameter></term>
-     <listitem>
-      <para>
-       ending y coordinate
-      </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>ImagickDraw::line</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function line($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->line(125, 70, 100, 50);
-    $draw->line(350, 170, 100, 150);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/matte.xml b/reference/imagick/imagickdraw/matte.xml
deleted file mode 100644
index 7b060a313d45..000000000000
--- a/reference/imagick/imagickdraw/matte.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.matte">
- <refnamediv>
-  <refname>ImagickDraw::matte</refname>
-  <refpurpose>Paints on the image's opacity channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::matte</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>paint</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Paints on the image's opacity channel in order to set effected pixels to
-   transparent, to influence the opacity of pixels.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the matte
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the matte
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>paint</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.paint">PAINT</link> constant
-       (<literal>imagick::PAINT_*</literal>).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::matte</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function matte($strokeColor, $fillColor, $backgroundColor, $paintType) {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->matte(120, 120, $paintType);    
-    $draw->rectangle(100, 100, 300, 200);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/pathclose.xml b/reference/imagick/imagickdraw/pathclose.xml
deleted file mode 100644
index fa6de5c20bb7..000000000000
--- a/reference/imagick/imagickdraw/pathclose.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathclose">
- <refnamediv>
-  <refname>ImagickDraw::pathClose</refname>
-  <refpurpose>Adds a path element to the current path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathClose</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Adds a path element to the current path which closes the current subpath
-   by drawing a straight line from the current point to the current subpath's
-   most recent starting point (usually, the most recent moveto point).
-  </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/imagick/imagickdraw/pathcurvetoabsolute.xml b/reference/imagick/imagickdraw/pathcurvetoabsolute.xml
deleted file mode 100644
index a1ccfe5be594..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetoabsolute.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetoabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToAbsolute</refname>
-  <refpurpose>Draws a cubic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a cubic Bezier curve from the current point to (x,y) using (x1,y1)
-   as the control point at the beginning of the curve and (x2,y2) as the
-   control point at the end of the curve using absolute coordinates. At the
-   end of the command, the new current point becomes the final (x,y)
-   coordinate pair used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x1</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the first control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y1</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the first control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x2</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the second control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y2</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the first control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the curve end
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the curve end
-      </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/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml
deleted file mode 100644
index 632fdac2d9e6..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbezierabsolute.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetoquadraticbezierabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToQuadraticBezierAbsolute</refname>
-  <refpurpose>Draws a quadratic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToQuadraticBezierAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x_end</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a quadratic Bezier curve from the current point to (x,y) using
-   (x1,y1) as the control point using absolute coordinates. At the end of the
-   command, the new current point becomes the final (x,y) coordinate pair
-   used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x1</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y1</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the  control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x_end</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the end point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the end point
-      </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>ImagickDraw::pathCurveToQuadraticBezierAbsolute</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function pathCurveToQuadraticBezierAbsolute($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->pathStart();
-    $draw->pathMoveToAbsolute(50,250);
-
-    // This specifies a quadratic bezier curve with the current position as the start
-    // point, the control point is the first two params, and the end point is the last two params.
-    $draw->pathCurveToQuadraticBezierAbsolute(
-        150,50, 
-        250,250
-    );
-
-    // This specifies a quadratic bezier curve with the current position as the start
-    // point, the control point is mirrored from the previous curves control point
-    // and the end point is defined by the x, y values.
-    $draw->pathCurveToQuadraticBezierSmoothAbsolute(
-        450,250
-    );
-
-    // This specifies a quadratic bezier curve with the current position as the start
-    // point, the control point is mirrored from the previous curves control point
-    // and the end point is defined relative from the current position by the x, y values.
-    $draw->pathCurveToQuadraticBezierSmoothRelative(
-        200,-100
-    );
-
-    $draw->pathFinish();
-
-    $imagick = new \Imagick();
-    $imagick->newImage(700, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/pathcurvetoquadraticbezierrelative.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbezierrelative.xml
deleted file mode 100644
index 8373a2473f9f..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbezierrelative.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetoquadraticbezierrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToQuadraticBezierRelative</refname>
-  <refpurpose>Draws a quadratic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToQuadraticBezierRelative</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x_end</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a quadratic Bezier curve from the current point to (x,y) using
-   (x1,y1) as the control point using relative coordinates. At the end of the
-   command, the new current point becomes the final (x,y) coordinate pair
-   used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x1</parameter></term>
-     <listitem>
-      <para>
-       starting x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y1</parameter></term>
-     <listitem>
-      <para>
-       starting y coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x_end</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       ending y coordinate
-      </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/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml
deleted file mode 100644
index da5f09f8104f..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothabsolute.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetoquadraticbeziersmoothabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToQuadraticBezierSmoothAbsolute</refname>
-  <refpurpose>Draws a quadratic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  
-  <para>
-   Draws a quadratic Bezier curve (using absolute coordinates) from the
-   current point to (x,y). The control point is assumed to be the reflection
-   of the control point on the previous command relative to the current point.
-   (If there is no previous command or if the previous command was not a
-   DrawPathCurveToQuadraticBezierAbsolute,
-   DrawPathCurveToQuadraticBezierRelative,
-   DrawPathCurveToQuadraticBezierSmoothAbsolut or
-   DrawPathCurveToQuadraticBezierSmoothRelative, assume the control point is
-   coincident with the current point.). At the end of the command, the new
-   current point becomes the final (x,y) coordinate pair used in the polybezier.
-  </para>
-  
-  <para>
-   This function cannot be used to continue a cubic Bezier curve smoothly. It can only continue from a quadratic curve smoothly.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       ending y coordinate
-      </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>ImagickDraw::pathCurveToQuadraticBezierSmoothAbsolute</methodname> example
-    </title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$draw = new \ImagickDraw();
-
-$draw->setStrokeOpacity(1);
-$draw->setStrokeColor("black");
-$draw->setFillColor("blue");
-
-$draw->setStrokeWidth(2);
-$draw->setFontSize(72);
-
-$draw->pathStart();
-$draw->pathMoveToAbsolute(50,250);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is the first two params, and the end point is the last two params.
-$draw->pathCurveToQuadraticBezierAbsolute(
-    150,50, 
-    250,250
-);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is mirrored from the previous curves control point
-// and the end point is defined by the x, y values.
-$draw->pathCurveToQuadraticBezierSmoothAbsolute(
-    450,250
-);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is mirrored from the previous curves control point
-// and the end point is defined relative from the current position by the x, y values.
-$draw->pathCurveToQuadraticBezierSmoothRelative(
-    200,-100
-);
-
-$draw->pathFinish();
-
-$imagick = new \Imagick();
-$imagick->newImage(700, 500, $backgroundColor);
-$imagick->setImageFormat("png");
-
-$imagick->drawImage($draw);
-
-header("Content-Type: image/png");
-echo $imagick->getImageBlob();
-?>
-]]>
-    </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/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml b/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml
deleted file mode 100644
index 7e09e96658d6..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetoquadraticbeziersmoothrelative.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetoquadraticbeziersmoothrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToQuadraticBezierSmoothRelative</refname>
-  <refpurpose>Draws a quadratic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToQuadraticBezierSmoothRelative</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a quadratic Bezier curve (using relative coordinates) from the
-   current point to (x, y). The control point is assumed to be the reflection
-   of the control point on the previous command relative to the current point.
-   (If there is no previous command or if the previous command was not a
-   DrawPathCurveToQuadraticBezierAbsolute, 
-   DrawPathCurveToQuadraticBezierRelative, 
-   DrawPathCurveToQuadraticBezierSmoothAbsolut or 
-   DrawPathCurveToQuadraticBezierSmoothRelative, assume the control point is
-   coincident with the current point). At the end of the command, the new
-   current point becomes the final (x, y) coordinate pair used in the
-   polybezier.
-  </para>
-  
-  <para>
-   This function cannot be used to continue a cubic Bezier curve smoothly. It can only continue from a quadratic curve smoothly.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       ending y coordinate
-      </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>ImagickDraw::pathCurveToQuadraticBezierSmoothRelative</methodname> example
-    </title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$draw = new \ImagickDraw();
-
-$draw->setStrokeOpacity(1);
-$draw->setStrokeColor("black");
-$draw->setFillColor("blue");
-
-$draw->setStrokeWidth(2);
-$draw->setFontSize(72);
-
-$draw->pathStart();
-$draw->pathMoveToAbsolute(50,250);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is the first two params, and the end point is the last two params.
-$draw->pathCurveToQuadraticBezierAbsolute(
-    150,50, 
-    250,250
-);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is mirrored from the previous curves control point
-// and the end point is defined by the x, y values.
-$draw->pathCurveToQuadraticBezierSmoothAbsolute(
-    450,250
-);
-
-// This specifies a quadratic bezier curve with the current position as the start
-// point, the control point is mirrored from the previous curves control point
-// and the end point is defined relative from the current position by the x, y values.
-$draw->pathCurveToQuadraticBezierSmoothRelative(
-    200,-100
-);
-
-$draw->pathFinish();
-
-$imagick = new \Imagick();
-$imagick->newImage(700, 500, $backgroundColor);
-$imagick->setImageFormat("png");
-
-$imagick->drawImage($draw);
-
-header("Content-Type: image/png");
-echo $imagick->getImageBlob();
-?>
-]]>
-    </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/imagick/imagickdraw/pathcurvetorelative.xml b/reference/imagick/imagickdraw/pathcurvetorelative.xml
deleted file mode 100644
index d9690d4f4c78..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetorelative.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetorelative">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToRelative</refname>
-  <refpurpose>Draws a cubic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToRelative</methodname>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a cubic Bezier curve from the current point to (x,y) using (x1,y1)
-   as the control point at the beginning of the curve and (x2,y2) as the
-   control point at the end of the curve using relative coordinates. At the
-   end of the command, the new current point becomes the final (x,y) 
-   coordinate pair used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x1</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of starting control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y1</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of starting control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x2</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of ending control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y2</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of ending control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       ending y coordinate
-      </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/imagick/imagickdraw/pathcurvetosmoothabsolute.xml b/reference/imagick/imagickdraw/pathcurvetosmoothabsolute.xml
deleted file mode 100644
index 4240bbf8ddf3..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetosmoothabsolute.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetosmoothabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToSmoothAbsolute</refname>
-  <refpurpose>Draws a cubic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToSmoothAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a cubic Bezier curve from the current point to (x,y) using absolute
-   coordinates. The first control point is assumed to be the reflection of the
-   second control point on the previous command relative to the current point.
-   (If there is no previous command or if the previous command was not an 
-   DrawPathCurveToAbsolute, DrawPathCurveToRelative, 
-   DrawPathCurveToSmoothAbsolute or DrawPathCurveToSmoothRelative, assume the
-   first control point is coincident with the current point.) (x2,y2) is the
-   second control point (i.e., the control point at the end of the curve).
-   At the end of the command, the new current point becomes the final (x,y)
-   coordinate pair used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x2</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the second control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y2</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the second control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the ending point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the ending point
-      </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/imagick/imagickdraw/pathcurvetosmoothrelative.xml b/reference/imagick/imagickdraw/pathcurvetosmoothrelative.xml
deleted file mode 100644
index 40c75a0e2512..000000000000
--- a/reference/imagick/imagickdraw/pathcurvetosmoothrelative.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathcurvetosmoothrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathCurveToSmoothRelative</refname>
-  <refpurpose>Draws a cubic Bezier curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathCurveToSmoothRelative</methodname>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a cubic Bezier curve from the current point to (x,y) using relative
-   coordinates. The first control point is assumed to be the reflection of
-   the second control point on the previous command relative to the current
-   point. (If there is no previous command or if the previous command was not
-   an DrawPathCurveToAbsolute, DrawPathCurveToRelative, 
-   DrawPathCurveToSmoothAbsolute or DrawPathCurveToSmoothRelative, assume the
-   first control point is coincident with the current point.) (x2,y2) is the
-   second control point (i.e., the control point at the end of the curve). At
-   the end of the command, the new current point becomes the final (x,y)
-   coordinate pair used in the polybezier.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x2</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the second control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y2</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the second control point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the ending point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the ending point
-      </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/imagick/imagickdraw/pathellipticarcabsolute.xml b/reference/imagick/imagickdraw/pathellipticarcabsolute.xml
deleted file mode 100644
index 86e2c24a1de5..000000000000
--- a/reference/imagick/imagickdraw/pathellipticarcabsolute.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathellipticarcabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathEllipticArcAbsolute</refname>
-  <refpurpose>Draws an elliptical arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathEllipticArcAbsolute</methodname>
-   <methodparam><type>float</type><parameter>rx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ry</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x_axis_rotation</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>large_arc</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws an elliptical arc from the current point to (x, y) using absolute
-   coordinates. The size and orientation of the ellipse are defined by two
-   radii (rx, ry) and an xAxisRotation, which indicates how the ellipse as
-   a whole is rotated relative to the current coordinate system. The center
-   (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 <parameter>large_arc</parameter> is &true; then draw the larger of the available
-   arcs. If <parameter>sweep</parameter> is true, then draw the arc matching a clock-wise
-   rotation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rx</parameter></term>
-     <listitem>
-      <para>
-       x radius
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ry</parameter></term>
-     <listitem>
-      <para>
-       y radius
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x_axis_rotation</parameter></term>
-     <listitem>
-      <para>
-       x axis rotation
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>large_arc</parameter></term>
-     <listitem>
-      <para>
-       large arc flag
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sweep</parameter></term>
-     <listitem>
-      <para>
-       sweep flag
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate
-      </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/imagick/imagickdraw/pathellipticarcrelative.xml b/reference/imagick/imagickdraw/pathellipticarcrelative.xml
deleted file mode 100644
index 3a87698636a6..000000000000
--- a/reference/imagick/imagickdraw/pathellipticarcrelative.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathellipticarcrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathEllipticArcRelative</refname>
-  <refpurpose>Draws an elliptical arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathEllipticArcRelative</methodname>
-   <methodparam><type>float</type><parameter>rx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ry</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x_axis_rotation</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>large_arc</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws an elliptical arc from the current point to (x, y) using relative
-   coordinates. The size and orientation of the ellipse are defined by two
-   radii (rx, ry) and an xAxisRotation, which indicates how the ellipse as
-   a whole is rotated relative to the current coordinate system. The center
-   (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 <parameter>large_arc</parameter> is &true; then draw the larger of the available
-   arcs. If <parameter>sweep</parameter> is true, then draw the arc matching a clock-wise
-   rotation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rx</parameter></term>
-     <listitem>
-      <para>
-       x radius
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ry</parameter></term>
-     <listitem>
-      <para>
-       y radius
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x_axis_rotation</parameter></term>
-     <listitem>
-      <para>
-       x axis rotation
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>large_arc</parameter></term>
-     <listitem>
-      <para>
-       large arc flag
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sweep</parameter></term>
-     <listitem>
-      <para>
-       sweep flag
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate
-      </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/imagick/imagickdraw/pathfinish.xml b/reference/imagick/imagickdraw/pathfinish.xml
deleted file mode 100644
index 39a873f45332..000000000000
--- a/reference/imagick/imagickdraw/pathfinish.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathfinish">
- <refnamediv>
-  <refname>ImagickDraw::pathFinish</refname>
-  <refpurpose>Terminates the current path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathFinish</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Terminates the current path.
-  </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/imagick/imagickdraw/pathlinetoabsolute.xml b/reference/imagick/imagickdraw/pathlinetoabsolute.xml
deleted file mode 100644
index 36365a0addce..000000000000
--- a/reference/imagick/imagickdraw/pathlinetoabsolute.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetoabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToAbsolute</refname>
-  <refpurpose>Draws a line path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a line path from the current point to the given coordinate using
-   absolute coordinates. The coordinate then becomes the new current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       starting x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       ending x coordinate
-      </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/imagick/imagickdraw/pathlinetohorizontalabsolute.xml b/reference/imagick/imagickdraw/pathlinetohorizontalabsolute.xml
deleted file mode 100644
index 003f1012c50a..000000000000
--- a/reference/imagick/imagickdraw/pathlinetohorizontalabsolute.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetohorizontalabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToHorizontalAbsolute</refname>
-  <refpurpose>Draws a horizontal line path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToHorizontalAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a horizontal line path from the current point to the target point
-   using absolute coordinates.  The target point then becomes the new
-   current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate
-      </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/imagick/imagickdraw/pathlinetohorizontalrelative.xml b/reference/imagick/imagickdraw/pathlinetohorizontalrelative.xml
deleted file mode 100644
index f23739af87e9..000000000000
--- a/reference/imagick/imagickdraw/pathlinetohorizontalrelative.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetohorizontalrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToHorizontalRelative</refname>
-  <refpurpose>Draws a horizontal line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToHorizontalRelative</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a horizontal line path from the current point to the target point
-   using relative coordinates.  The target point then becomes the new
-   current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate
-      </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/imagick/imagickdraw/pathlinetorelative.xml b/reference/imagick/imagickdraw/pathlinetorelative.xml
deleted file mode 100644
index 98cac1f63ccb..000000000000
--- a/reference/imagick/imagickdraw/pathlinetorelative.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetorelative">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToRelative</refname>
-  <refpurpose>Draws a line path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToRelative</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a line path from the current point to the given coordinate using
-   relative coordinates. The coordinate then becomes the new current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       starting x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       starting y coordinate
-      </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/imagick/imagickdraw/pathlinetoverticalabsolute.xml b/reference/imagick/imagickdraw/pathlinetoverticalabsolute.xml
deleted file mode 100644
index 07cdfcea7ddc..000000000000
--- a/reference/imagick/imagickdraw/pathlinetoverticalabsolute.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetoverticalabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToVerticalAbsolute</refname>
-  <refpurpose>Draws a vertical line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToVerticalAbsolute</methodname>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a vertical line path from the current point to the target point using
-   absolute coordinates.  The target point then becomes the new current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate
-      </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/imagick/imagickdraw/pathlinetoverticalrelative.xml b/reference/imagick/imagickdraw/pathlinetoverticalrelative.xml
deleted file mode 100644
index 8091d598dc7a..000000000000
--- a/reference/imagick/imagickdraw/pathlinetoverticalrelative.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathlinetoverticalrelative">
- <refnamediv>
-  <refname>ImagickDraw::pathLineToVerticalRelative</refname>
-  <refpurpose>Draws a vertical line path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathLineToVerticalRelative</methodname>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a vertical line path from the current point to the target point using
-   relative coordinates.  The target point then becomes the new current point.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate
-      </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/imagick/imagickdraw/pathmovetoabsolute.xml b/reference/imagick/imagickdraw/pathmovetoabsolute.xml
deleted file mode 100644
index 4df099dcdb36..000000000000
--- a/reference/imagick/imagickdraw/pathmovetoabsolute.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathmovetoabsolute">
- <refnamediv>
-  <refname>ImagickDraw::pathMoveToAbsolute</refname>
-  <refpurpose>Starts a new sub-path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathMoveToAbsolute</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Starts a new sub-path at the given coordinate using absolute coordinates.
-   The current point then becomes the specified coordinate.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the starting point
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the starting point
-      </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/imagick/imagickdraw/pathmovetorelative.xml b/reference/imagick/imagickdraw/pathmovetorelative.xml
deleted file mode 100644
index cd012443054e..000000000000
--- a/reference/imagick/imagickdraw/pathmovetorelative.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathmovetorelative">
- <refnamediv>
-  <refname>ImagickDraw::pathMoveToRelative</refname>
-  <refpurpose>Starts a new sub-path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathMoveToRelative</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Starts a new sub-path at the given coordinate using relative coordinates.
-   The current point then becomes the specified coordinate.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       target x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       target y coordinate
-      </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/imagick/imagickdraw/pathstart.xml b/reference/imagick/imagickdraw/pathstart.xml
deleted file mode 100644
index 515ef5319e38..000000000000
--- a/reference/imagick/imagickdraw/pathstart.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pathstart">
- <refnamediv>
-  <refname>ImagickDraw::pathStart</refname>
-  <refpurpose>Declares the start of a path drawing list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pathStart</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Declares the start of a path drawing list which is terminated by a matching
-   DrawPathFinish() command. All other DrawPath commands must be enclosed
-   between a and a DrawPathFinish() command. This is because path drawing
-   commands are subordinate commands and they do not function by themselves.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::pathStart</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function pathStart($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    $draw->pathStart();
-    $draw->pathMoveToAbsolute(50, 50);
-    $draw->pathLineToAbsolute(100, 50);
-    $draw->pathLineToRelative(0, 50);
-    $draw->pathLineToHorizontalRelative(-50);
-    $draw->pathFinish();
-
-    $draw->pathStart();
-    $draw->pathMoveToAbsolute(50, 50);
-    $draw->pathMoveToRelative(300, 0);
-    $draw->pathLineToRelative(50, 0);
-    $draw->pathLineToVerticalRelative(50);
-    $draw->pathLineToHorizontalAbsolute(350);
-    $draw->pathclose();
-    $draw->pathFinish();
-
-    $draw->pathStart();
-    $draw->pathMoveToAbsolute(50, 300);
-    $draw->pathCurveToAbsolute(50, 300, 100, 200, 300, 300);
-    $draw->pathLineToVerticalAbsolute(350);
-    $draw->pathFinish();
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/point.xml b/reference/imagick/imagickdraw/point.xml
deleted file mode 100644
index d5f1e040b4c4..000000000000
--- a/reference/imagick/imagickdraw/point.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.point">
- <refnamediv>
-  <refname>ImagickDraw::point</refname>
-  <refpurpose>Draws a point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::point</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a point using the current stroke color and stroke thickness at the specified coordinates.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       point's x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       point's y coordinate
-      </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>ImagickDraw::point</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function point($fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setFillColor($fillColor);
-
-    for ($x = 0; $x < 10000; $x++) {
-        $draw->point(rand(0, 500), rand(0, 500));
-    }
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/polygon.xml b/reference/imagick/imagickdraw/polygon.xml
deleted file mode 100644
index bf8e6837d659..000000000000
--- a/reference/imagick/imagickdraw/polygon.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.polygon">
- <refnamediv>
-  <refname>ImagickDraw::polygon</refname>
-  <refpurpose>Draws a polygon</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::polygon</methodname>
-   <methodparam><type>array</type><parameter>coordinates</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a polygon using the current stroke, stroke width, and fill color or
-   texture, using the specified array of coordinates.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>coordinates</parameter></term>
-     <listitem>
-      <para>
-       multidimensional array like array( array( 'x' => 3, 'y' => 4 ), array( 'x' => 2, 'y' => 6 ) );
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::polygon</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function polygon($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeWidth(4);
-
-    $draw->setFillColor($fillColor);
-
-    $points = [
-        ['x' => 40 * 5, 'y' => 10 * 5],
-        ['x' => 20 * 5, 'y' => 20 * 5], 
-        ['x' => 70 * 5, 'y' => 50 * 5], 
-        ['x' => 60 * 5, 'y' => 15 * 5],
-    ];
-
-    $draw->polygon($points);
-
-    $image = new \Imagick();
-    $image->newImage(500, 300, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/polyline.xml b/reference/imagick/imagickdraw/polyline.xml
deleted file mode 100644
index 453861019e38..000000000000
--- a/reference/imagick/imagickdraw/polyline.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.polyline">
- <refnamediv>
-  <refname>ImagickDraw::polyline</refname>
-  <refpurpose>Draws a polyline</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::polyline</methodname>
-   <methodparam><type>array</type><parameter>coordinates</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a polyline using the current stroke, stroke width, and fill color or
-   texture, using the specified array of coordinates.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>coordinates</parameter></term>
-     <listitem>
-      <para>
-       array of x and y coordinates: array( array( 'x' => 4, 'y' => 6 ), array( 'x' => 8, 'y' => 10 ) ) 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::polyline</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function polyline($strokeColor, $fillColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(5);
-
-    $points = [
-        ['x' => 40 * 5, 'y' => 10 * 5],
-        ['x' => 20 * 5, 'y' => 20 * 5],
-        ['x' => 70 * 5, 'y' => 50 * 5],
-        ['x' => 60 * 5, 'y' => 15 * 5]
-    ];
-
-    $draw->polyline($points);
-
-    $image = new \Imagick();
-    $image->newImage(500, 300, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/pop.xml b/reference/imagick/imagickdraw/pop.xml
deleted file mode 100644
index e9ac410855f9..000000000000
--- a/reference/imagick/imagickdraw/pop.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pop">
- <refnamediv>
-  <refname>ImagickDraw::pop</refname>
-  <refpurpose>Destroys the current ImagickDraw in the stack, and returns to the previously pushed ImagickDraw</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pop</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Destroys the current ImagickDraw in the stack, and returns to the
-   previously pushed ImagickDraw. Multiple ImagickDraws may exist. It is an
-   error to attempt to pop more ImagickDraws than have been pushed, and it is
-   proper form to pop all ImagickDraws which have been pushed.
-  </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/imagick/imagickdraw/popclippath.xml b/reference/imagick/imagickdraw/popclippath.xml
deleted file mode 100644
index 592f56f5bb30..000000000000
--- a/reference/imagick/imagickdraw/popclippath.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.popclippath">
- <refnamediv>
-  <refname>ImagickDraw::popClipPath</refname>
-  <refpurpose>Terminates a clip path definition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::popClipPath</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Terminates a clip path definition.
-  </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/imagick/imagickdraw/popdefs.xml b/reference/imagick/imagickdraw/popdefs.xml
deleted file mode 100644
index cdaeae9c887a..000000000000
--- a/reference/imagick/imagickdraw/popdefs.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.popdefs">
- <refnamediv>
-  <refname>ImagickDraw::popDefs</refname>
-  <refpurpose>Terminates a definition list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::popDefs</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Terminates a definition list.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::popDefs</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function popDefs($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setstrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-    $draw->pushDefs();
-    $draw->setStrokeColor('white');
-    $draw->rectangle(50, 50, 200, 200);
-    $draw->popDefs();
-
-    $draw->rectangle(300, 50, 450, 200);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/poppattern.xml b/reference/imagick/imagickdraw/poppattern.xml
deleted file mode 100644
index 66a6808178a0..000000000000
--- a/reference/imagick/imagickdraw/poppattern.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.poppattern">
- <refnamediv>
-  <refname>ImagickDraw::popPattern</refname>
-  <refpurpose>Terminates a pattern definition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::popPattern</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Terminates a pattern definition.
-  </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/imagick/imagickdraw/push.xml b/reference/imagick/imagickdraw/push.xml
deleted file mode 100644
index 1786c6177324..000000000000
--- a/reference/imagick/imagickdraw/push.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.push">
- <refnamediv>
-  <refname>ImagickDraw::push</refname>
-  <refpurpose>Clones the current ImagickDraw and pushes it to the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::push</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <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 <methodname>ImagickDraw::pop</methodname>. The ImagickDraws are stored on a
-   ImagickDraw stack. For every Pop there must have already been an equivalent
-   Push.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::push</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function push($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillModifiedColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-    $draw->push();
-    $draw->translate(50, 50);
-    $draw->rectangle(200, 200, 300, 300);
-    $draw->pop();
-    $draw->setFillColor($fillColor);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/pushclippath.xml b/reference/imagick/imagickdraw/pushclippath.xml
deleted file mode 100644
index 5835f62269bd..000000000000
--- a/reference/imagick/imagickdraw/pushclippath.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pushclippath">
- <refnamediv>
-  <refname>ImagickDraw::pushClipPath</refname>
-  <refpurpose>Starts a clip path definition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pushClipPath</methodname>
-   <methodparam><type>string</type><parameter>clip_mask_id</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Starts a clip path definition which is comprised of any number of drawing
-   commands and terminated by a <methodname>ImagickDraw::popClipPath</methodname> command.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clip_mask_id</parameter></term>
-     <listitem>
-      <para>
-       Clip mask Id
-      </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/imagick/imagickdraw/pushdefs.xml b/reference/imagick/imagickdraw/pushdefs.xml
deleted file mode 100644
index 9313c8115c60..000000000000
--- a/reference/imagick/imagickdraw/pushdefs.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pushdefs">
- <refnamediv>
-  <refname>ImagickDraw::pushDefs</refname>
-  <refpurpose>Indicates that following commands create named elements for early processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pushDefs</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   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>
- </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/imagick/imagickdraw/pushpattern.xml b/reference/imagick/imagickdraw/pushpattern.xml
deleted file mode 100644
index ab45479b5a7f..000000000000
--- a/reference/imagick/imagickdraw/pushpattern.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.pushpattern">
- <refnamediv>
-  <refname>ImagickDraw::pushPattern</refname>
-  <refpurpose>Indicates that subsequent commands up to a ImagickDraw::opPattern() command comprise the definition of a named pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::pushPattern</methodname>
-   <methodparam><type>string</type><parameter>pattern_id</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Indicates that subsequent commands up to a DrawPopPattern() command
-   comprise the definition of a named pattern. The pattern space is assigned
-   top left corner coordinates, a width and height, and becomes its own
-   drawing space.  Anything which can be drawn may be used in a pattern
-   definition. Named patterns may be used as stroke or brush definitions.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pattern_id</parameter></term>
-     <listitem>
-      <para>
-       the pattern Id
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the top-left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the top-left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       width of the pattern
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       height of the pattern
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::pushPattern</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function pushPattern($strokeColor, $fillColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(1);
-
-    $draw->pushPattern("MyFirstPattern", 0, 0, 50, 50);
-    for ($x = 0; $x < 50; $x += 10) {
-        for ($y = 0; $y < 50; $y += 5) {
-            $positionX = $x + (($y / 5) % 5);
-            $draw->rectangle($positionX, $y, $positionX + 5, $y + 5);
-        }
-    }
-    $draw->popPattern();
-
-    $draw->setFillOpacity(0);
-    $draw->rectangle(100, 100, 400, 400);
-    $draw->setFillOpacity(1);
-
-    $draw->setFillOpacity(1);
-
-    $draw->push();
-    $draw->setFillPatternURL('#MyFirstPattern');
-    $draw->setFillColor('yellow');
-    $draw->rectangle(100, 100, 400, 400);
-    $draw->pop();
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/rectangle.xml b/reference/imagick/imagickdraw/rectangle.xml
deleted file mode 100644
index e63a8a47d3ad..000000000000
--- a/reference/imagick/imagickdraw/rectangle.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.rectangle">
- <refnamediv>
-  <refname>ImagickDraw::rectangle</refname>
-  <refpurpose>Draws a rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::rectangle</methodname>
-   <methodparam><type>float</type><parameter>top_left_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>top_left_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bottom_right_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bottom_right_y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a rectangle given two coordinates and using the current stroke,
-   stroke width, and fill settings.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>top_left_x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>top_left_y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom_right_x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the bottom right corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom_right_y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the bottom right corner
-      </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>ImagickDraw::rectangle</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function rectangle($strokeColor, $fillColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-    $strokeColor = new \ImagickPixel($strokeColor);
-    $fillColor = new \ImagickPixel($fillColor);
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-
-    $draw->rectangle(200, 200, 300, 300);
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/render.xml b/reference/imagick/imagickdraw/render.xml
deleted file mode 100644
index dec3498f669e..000000000000
--- a/reference/imagick/imagickdraw/render.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.render">
- <refnamediv>
-  <refname>ImagickDraw::render</refname>
-  <refpurpose>Renders all preceding drawing commands onto the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::render</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Renders all preceding drawing commands onto the image.
-  </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/imagick/imagickdraw/resetvectorgraphics.xml b/reference/imagick/imagickdraw/resetvectorgraphics.xml
deleted file mode 100644
index 540f5aeedc31..000000000000
--- a/reference/imagick/imagickdraw/resetvectorgraphics.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.resetvectorgraphics" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::resetVectorGraphics</refname>
-  <refpurpose>Resets the vector graphics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::resetVectorGraphics</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Resets the vector graphics.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/rotate.xml b/reference/imagick/imagickdraw/rotate.xml
deleted file mode 100644
index 7ab60c73ec95..000000000000
--- a/reference/imagick/imagickdraw/rotate.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.rotate">
- <refnamediv>
-  <refname>ImagickDraw::rotate</refname>
-  <refpurpose>Applies the specified rotation to the current coordinate space</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::rotate</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Applies the specified rotation to the current coordinate space.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>degrees</parameter></term>
-     <listitem>
-      <para>
-       degrees to rotate.
-      </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>ImagickDraw::rotate</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function rotate($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor) {
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle(200, 200, 300, 300);
-    $draw->setFillColor($fillModifiedColor);
-    $draw->rotate(15);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/roundrectangle.xml b/reference/imagick/imagickdraw/roundrectangle.xml
deleted file mode 100644
index d113c20d1733..000000000000
--- a/reference/imagick/imagickdraw/roundrectangle.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.roundrectangle">
- <refnamediv>
-  <refname>ImagickDraw::roundRectangle</refname>
-  <refpurpose>Draws a rounded rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::roundRectangle</methodname>
-   <methodparam><type>float</type><parameter>top_left_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>top_left_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bottom_right_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bottom_right_y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rounding_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rounding_y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Draws a rounded rectangle given two coordinates, x &amp; y corner radiuses
-   and using the current stroke, stroke width, and fill settings.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>top_left_x</parameter></term>
-     <listitem>
-      <para>
-       x coordinate of the top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>top_left_y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the top left corner
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom_right_x</parameter></term>
-     <listitem>
-      <para>
-        x coordinate of the bottom right 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom_right_y</parameter></term>
-     <listitem>
-      <para>
-       y coordinate of the bottom right 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rounding_x</parameter></term>
-     <listitem>
-      <para>
-       x rounding
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rounding_y</parameter></term>
-     <listitem>
-      <para>
-       y rounding
-      </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>ImagickDraw::roundRectangle</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function roundRectangle($strokeColor, $fillColor, $backgroundColor, $startX, $startY, $endX, $endY, $roundX, $roundY) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-
-    $draw->roundRectangle($startX, $startY, $endX, $endY, $roundX, $roundY);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/scale.xml b/reference/imagick/imagickdraw/scale.xml
deleted file mode 100644
index a337dc9d8645..000000000000
--- a/reference/imagick/imagickdraw/scale.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.scale">
- <refnamediv>
-  <refname>ImagickDraw::scale</refname>
-  <refpurpose>Adjusts the scaling factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::scale</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Adjusts the scaling factor to apply in the horizontal and vertical
-   directions to the current coordinate space.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       horizontal factor
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       vertical factor
-      </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>ImagickDraw::scale</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function scale($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeWidth(4);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle(200, 200, 300, 300);
-    $draw->setFillColor($fillModifiedColor);
-    $draw->scale(1.4, 1.4);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setclippath.xml b/reference/imagick/imagickdraw/setclippath.xml
deleted file mode 100644
index 0e441e71e1b2..000000000000
--- a/reference/imagick/imagickdraw/setclippath.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setclippath">
- <refnamediv>
-  <refname>ImagickDraw::setClipPath</refname>
-  <refpurpose>Associates a named clipping path with the image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setClipPath</methodname>
-   <methodparam><type>string</type><parameter>clip_mask</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Associates a named clipping path with the image.  Only the areas drawn on
-   by the clipping path will be modified as long as it remains in effect.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clip_mask</parameter></term>
-     <listitem>
-      <para>
-       the clipping path name
-      </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>ImagickDraw::setClipPath</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setClipPath($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-
-    $clipPathName = 'testClipPath';
-
-    $draw->pushClipPath($clipPathName);
-    $draw->rectangle(0, 0, 250, 250);
-    $draw->popClipPath();
-    $draw->setClipPath($clipPathName);
-    $draw->rectangle(100, 100, 400, 400);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setcliprule.xml b/reference/imagick/imagickdraw/setcliprule.xml
deleted file mode 100644
index edf001bfb384..000000000000
--- a/reference/imagick/imagickdraw/setcliprule.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setcliprule">
- <refnamediv>
-  <refname>ImagickDraw::setClipRule</refname>
-  <refpurpose>Set the polygon fill rule to be used by the clipping path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setClipRule</methodname>
-   <methodparam><type>int</type><parameter>fillrule</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Set the polygon fill rule to be used by the clipping path.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fillrule</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
-       (<literal>imagick::FILLRULE_*</literal>).
-      </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>ImagickDraw::setClipRule</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setClipRule($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-    //\Imagick::FILLRULE_EVENODD
-    //\Imagick::FILLRULE_NONZERO
-
-    $clipPathName = 'testClipPath';
-    $draw->pushClipPath($clipPathName);
-    $draw->setClipRule(\Imagick::FILLRULE_EVENODD);
-    $draw->rectangle(0, 0, 300, 500);
-    $draw->rectangle(200, 0, 500, 500);
-    $draw->popClipPath();
-    $draw->setClipPath($clipPathName);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setclipunits.xml b/reference/imagick/imagickdraw/setclipunits.xml
deleted file mode 100644
index 1de7ed425ada..000000000000
--- a/reference/imagick/imagickdraw/setclipunits.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setclipunits">
- <refnamediv>
-  <refname>ImagickDraw::setClipUnits</refname>
-  <refpurpose>Sets the interpretation of clip path units</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setClipUnits</methodname>
-   <methodparam><type>int</type><parameter>pathunits</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the interpretation of clip path units.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>pathunits</parameter></term>
-     <listitem>
-      <para>
-       the number of clip units
-      </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>ImagickDraw::setClipUnits</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setClipUnits($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-    $clipPathName = 'testClipPath';
-    $draw->setClipUnits(\Imagick::RESOLUTION_PIXELSPERINCH);
-    $draw->pushClipPath($clipPathName);
-    $draw->rectangle(0, 0, 250, 250);
-    $draw->popClipPath();
-    $draw->setClipPath($clipPathName);
-
-    //RESOLUTION_PIXELSPERINCH
-    //RESOLUTION_PIXELSPERCENTIMETER
-
-    $draw->rectangle(200, 200, 300, 300);
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfillalpha.xml b/reference/imagick/imagickdraw/setfillalpha.xml
deleted file mode 100644
index 840a9b605fc9..000000000000
--- a/reference/imagick/imagickdraw/setfillalpha.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfillalpha">
- <refnamediv>
-  <refname>ImagickDraw::setFillAlpha</refname>
-  <refpurpose>Sets the opacity to use when drawing using the fill color or fill texture</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFillAlpha</methodname>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the opacity to use when drawing using the fill color or fill texture.
-   Fully opaque is 1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       fill alpha
-      </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>ImagickDraw::setFillAlpha</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFillAlpha($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-    $draw->rectangle(100, 200, 200, 300);
-    @$draw->setFillAlpha(0.4);
-    $draw->rectangle(300, 200, 400, 300);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfillcolor.xml b/reference/imagick/imagickdraw/setfillcolor.xml
deleted file mode 100644
index a393ecee1b3e..000000000000
--- a/reference/imagick/imagickdraw/setfillcolor.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfillcolor">
- <refnamediv>
-  <refname>ImagickDraw::setFillColor</refname>
-  <refpurpose>Sets the fill color to be used for drawing filled objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFillColor</methodname>
-   <methodparam><type class="union"><type>ImagickPixel</type><type>string</type></type><parameter>fill_color</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the fill color to be used for drawing filled objects.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fill_color</parameter></term>
-     <listitem>
-      <para>
-       ImagickPixel to use to set the color
-      </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>ImagickDraw::setFillColor</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFillColor($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(1.5);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle(50, 50, 150, 150);
-
-    $draw->setFillColor("rgb(200, 32, 32)");
-    $draw->rectangle(200, 50, 300, 150);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfillopacity.xml b/reference/imagick/imagickdraw/setfillopacity.xml
deleted file mode 100644
index 7cd6dba584dc..000000000000
--- a/reference/imagick/imagickdraw/setfillopacity.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfillopacity">
- <refnamediv>
-  <refname>ImagickDraw::setFillOpacity</refname>
-  <refpurpose>Sets the opacity to use when drawing using the fill color or fill texture</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFillOpacity</methodname>
-   <methodparam><type>float</type><parameter>opacity</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the opacity to use when drawing using the fill color or fill texture.
-   Fully opaque is 1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-       the fill opacity
-      </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>ImagickDraw::setFillOpacity</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFillOpacity($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeWidth(2);
-
-    $draw->rectangle(100, 200, 200, 300);
-
-    $draw->setFillOpacity(0.4);
-    $draw->rectangle(300, 200, 400, 300);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfillpatternurl.xml b/reference/imagick/imagickdraw/setfillpatternurl.xml
deleted file mode 100644
index ec37adff5b3f..000000000000
--- a/reference/imagick/imagickdraw/setfillpatternurl.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfillpatternurl">
- <refnamediv>
-  <refname>ImagickDraw::setFillPatternURL</refname>
-  <refpurpose>Sets the URL to use as a fill pattern for filling objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFillPatternURL</methodname>
-   <methodparam><type>string</type><parameter>fill_url</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the URL to use as a fill pattern for filling objects. Only local URLs
-   ("#identifier") are supported at this time. These local URLs are normally
-   created by defining a named fill pattern with DrawPushPattern/DrawPopPattern.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fill_url</parameter></term>
-     <listitem>
-      <para>
-       URL to use to obtain fill pattern.
-      </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/imagick/imagickdraw/setfillrule.xml b/reference/imagick/imagickdraw/setfillrule.xml
deleted file mode 100644
index 68b03784bc6e..000000000000
--- a/reference/imagick/imagickdraw/setfillrule.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfillrule">
- <refnamediv>
-  <refname>ImagickDraw::setFillRule</refname>
-  <refpurpose>Sets the fill rule to use while drawing polygons</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFillRule</methodname>
-   <methodparam><type>int</type><parameter>fillrule</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the fill rule to use while drawing polygons.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fillrule</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.fillrule">FILLRULE</link> constant
-       (<literal>imagick::FILLRULE_*</literal>).
-      </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>ImagickDraw::setFillRule</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFillRule($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $fillRules = [\Imagick::FILLRULE_NONZERO, \Imagick::FILLRULE_EVENODD];
-
-    $points = 11;
-    $size = 150;
-
-    $draw->translate(175, 160);
-
-    for ($x = 0; $x < 2; $x++) {
-        $draw->setFillRule($fillRules[$x]);
-        $draw->pathStart();
-        for ($n = 0; $n < $points * 2; $n++) {
-
-            if ($n >= $points) {
-                $angle = fmod($n * 360 * 4 / $points, 360) * pi() / 180;
-            }
-            else {
-                $angle = fmod($n * 360 * 3 / $points, 360) * pi() / 180;
-            }
-
-            $positionX = $size * sin($angle);
-            $positionY = $size * cos($angle);
-
-            if ($n == 0) {
-                $draw->pathMoveToAbsolute($positionX, $positionY);
-            }
-            else {
-                $draw->pathLineToAbsolute($positionX, $positionY);
-            }
-        }
-
-        $draw->pathClose();
-        $draw->pathFinish();
-
-        $draw->translate(325, 0);
-    }
-
-    $image = new \Imagick();
-    $image->newImage(700, 320, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfont.xml b/reference/imagick/imagickdraw/setfont.xml
deleted file mode 100644
index a82646f7b4d8..000000000000
--- a/reference/imagick/imagickdraw/setfont.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfont">
- <refnamediv>
-  <refname>ImagickDraw::setFont</refname>
-  <refpurpose>Sets the fully-specified font to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFont</methodname>
-   <methodparam><type>string</type><parameter>font_name</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the fully-specified font to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>font_name</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::setFont</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFont($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(36);
-
-    $draw->setFont("../fonts/Arial.ttf");
-    $draw->annotation(50, 50, "Lorem Ipsum!");
-
-    $draw->setFont("../fonts/Consolas.ttf");
-    $draw->annotation(50, 100, "Lorem Ipsum!");
-
-    $draw->setFont("../fonts/CANDY.TTF");
-    $draw->annotation(50, 150, "Lorem Ipsum!");
-
-    $draw->setFont("../fonts/Inconsolata-dz.otf");
-    $draw->annotation(50, 200, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 300, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfontfamily.xml b/reference/imagick/imagickdraw/setfontfamily.xml
deleted file mode 100644
index 91b25312c603..000000000000
--- a/reference/imagick/imagickdraw/setfontfamily.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfontfamily">
- <refnamediv>
-  <refname>ImagickDraw::setFontFamily</refname>
-  <refpurpose>Sets the font family to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFontFamily</methodname>
-   <methodparam><type>string</type><parameter>font_family</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the font family to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>font_family</parameter></term>
-     <listitem>
-      <para>
-       the font family
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::setFontFamily</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFontFamily($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $strokeColor = new \ImagickPixel($strokeColor);
-    $fillColor = new \ImagickPixel($fillColor);
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(2);
-
-    $draw->setFontSize(48);
-
-    $draw->setFontFamily("Times");
-    $draw->annotation(50, 50, "Lorem Ipsum!");
-
-    $draw->setFontFamily("AvantGarde");
-    $draw->annotation(50, 100, "Lorem Ipsum!");
-
-    $draw->setFontFamily("NewCenturySchlbk");    
-    $draw->annotation(50, 150, "Lorem Ipsum!");
-
-    $draw->setFontFamily("Palatino");
-    $draw->annotation(50, 200, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(450, 250, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfontsize.xml b/reference/imagick/imagickdraw/setfontsize.xml
deleted file mode 100644
index dd9af3e6f9a5..000000000000
--- a/reference/imagick/imagickdraw/setfontsize.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfontsize">
- <refnamediv>
-  <refname>ImagickDraw::setFontSize</refname>
-  <refpurpose>Sets the font pointsize to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFontSize</methodname>
-   <methodparam><type>float</type><parameter>point_size</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the font pointsize to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>point_size</parameter></term>
-     <listitem>
-      <para>
-       the point size
-      </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>ImagickDraw::setFontSize</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFontSize($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeOpacity(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFont("../fonts/Arial.ttf");
-
-    $sizes = [24, 36, 48, 60, 72];
-
-    foreach ($sizes as $size) {
-        $draw->setFontSize($size);
-        $draw->annotation(50, ($size * $size / 16), "Lorem Ipsum!");
-    }
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfontstretch.xml b/reference/imagick/imagickdraw/setfontstretch.xml
deleted file mode 100644
index cf330f7c6dc6..000000000000
--- a/reference/imagick/imagickdraw/setfontstretch.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfontstretch">
- <refnamediv>
-  <refname>ImagickDraw::setFontStretch</refname>
-  <refpurpose>Sets the font stretch to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFontStretch</methodname>
-   <methodparam><type>int</type><parameter>stretch</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the font stretch to use when annotating with text. The AnyStretch
-   enumeration acts as a wild-card "don't care" option.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>stretch</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.stretch">STRETCH</link> constant
-       (<literal>imagick::STRETCH_*</literal>).
-      </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>ImagickDraw::setFontStretch</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFontStretch($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(36);
-
-    $fontStretchTypes = [
-        \Imagick::STRETCH_ULTRACONDENSED, 
-        \Imagick::STRETCH_CONDENSED, 
-        \Imagick::STRETCH_SEMICONDENSED, 
-        \Imagick::STRETCH_SEMIEXPANDED, 
-        \Imagick::STRETCH_EXPANDED, 
-        \Imagick::STRETCH_EXTRAEXPANDED, 
-        \Imagick::STRETCH_ULTRAEXPANDED, 
-        \Imagick::STRETCH_ANY
-    ];
-
-    $offset = 0;
-    foreach ($fontStretchTypes as $fontStretch) {
-        $draw->setFontStretch($fontStretch);
-        $draw->annotation(50, 75 + $offset, "Lorem Ipsum!");
-        $offset += 50;
-    }
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfontstyle.xml b/reference/imagick/imagickdraw/setfontstyle.xml
deleted file mode 100644
index 99e01df9e335..000000000000
--- a/reference/imagick/imagickdraw/setfontstyle.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfontstyle">
- <refnamediv>
-  <refname>ImagickDraw::setFontStyle</refname>
-  <refpurpose>Sets the font style to use when annotating with text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFontStyle</methodname>
-   <methodparam><type>int</type><parameter>style</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the font style to use when annotating with text. The AnyStyle
-   enumeration acts as a wild-card "don't care" option.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>style</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.styles">STYLE</link> constant
-       (<literal>imagick::STYLE_*</literal>).
-      </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>ImagickDraw::setFontStyle</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFontStyle($fillColor, $strokeColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setFontSize(36);
-    $draw->setFontStyle(\Imagick::STYLE_NORMAL);
-    $draw->annotation(50, 50, "Lorem Ipsum!");
-
-    $draw->setFontStyle(\Imagick::STYLE_ITALIC);
-    $draw->annotation(50, 100, "Lorem Ipsum!");
-
-    $draw->setFontStyle(\Imagick::STYLE_OBLIQUE);
-    $draw->annotation(50, 150, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(350, 300, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setfontweight.xml b/reference/imagick/imagickdraw/setfontweight.xml
deleted file mode 100644
index 185a2f738825..000000000000
--- a/reference/imagick/imagickdraw/setfontweight.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setfontweight">
- <refnamediv>
-  <refname>ImagickDraw::setFontWeight</refname>
-  <refpurpose>Sets the font weight</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setFontWeight</methodname>
-   <methodparam><type>int</type><parameter>weight</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the font weight to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>weight</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::setFontWeight</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setFontWeight($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(1);
-
-    $draw->setFontSize(36);
-
-    $draw->setFontWeight(100);
-    $draw->annotation(50, 50, "Lorem Ipsum!");
-
-    $draw->setFontWeight(200);
-    $draw->annotation(50, 100, "Lorem Ipsum!");
-
-    $draw->setFontWeight(400);
-    $draw->annotation(50, 150, "Lorem Ipsum!");
-
-    $draw->setFontWeight(800);
-    $draw->annotation(50, 200, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setgravity.xml b/reference/imagick/imagickdraw/setgravity.xml
deleted file mode 100644
index 1f0e62536e26..000000000000
--- a/reference/imagick/imagickdraw/setgravity.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setgravity">
- <refnamediv>
-  <refname>ImagickDraw::setGravity</refname>
-  <refpurpose>Sets the text placement gravity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setGravity</methodname>
-   <methodparam><type>int</type><parameter>gravity</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the text placement gravity to use when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>gravity</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.gravity">GRAVITY</link> constant
-       (<literal>imagick::GRAVITY_*</literal>).
-      </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>ImagickDraw::setGravity</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setGravity($fillColor, $strokeColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setFontSize(24);
-
-    $gravitySettings = array(
-        \Imagick::GRAVITY_NORTHWEST => 'NorthWest',
-        \Imagick::GRAVITY_NORTH => 'North',
-        \Imagick::GRAVITY_NORTHEAST => 'NorthEast',
-        \Imagick::GRAVITY_WEST => 'West',
-        \Imagick::GRAVITY_CENTER => 'Centre',
-        \Imagick::GRAVITY_SOUTHWEST => 'SouthWest',
-        \Imagick::GRAVITY_SOUTH => 'South',
-        \Imagick::GRAVITY_SOUTHEAST => 'SouthEast',
-        \Imagick::GRAVITY_EAST => 'East'
-    );
-
-    $draw->setFont("../fonts/Arial.ttf");
-
-    foreach ($gravitySettings as $type => $description) {
-        $draw->setGravity($type);
-        $draw->annotation(50, 50, '"' . $description . '"');
-    }
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setresolution.xml b/reference/imagick/imagickdraw/setresolution.xml
deleted file mode 100644
index 3c2cc731631c..000000000000
--- a/reference/imagick/imagickdraw/setresolution.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.setresolution" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::setResolution</refname>
-  <refpurpose>Sets the resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setResolution</methodname>
-   <methodparam><type>float</type><parameter>resolution_x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>resolution_y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the resolution.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>resolution_x</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>resolution_y</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/setstrokealpha.xml b/reference/imagick/imagickdraw/setstrokealpha.xml
deleted file mode 100644
index d6b8c4922cfc..000000000000
--- a/reference/imagick/imagickdraw/setstrokealpha.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokealpha">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeAlpha</refname>
-  <refpurpose>Specifies the opacity of stroked object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeAlpha</methodname>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the opacity of stroked object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       opacity
-      </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>ImagickDraw::setStrokeAlpha</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeAlpha($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(4);
-    $draw->line(100, 100, 400, 145);
-    $draw->rectangle(100, 200, 225, 350);
-    $draw->setStrokeOpacity(0.1);
-    $draw->line(100, 120, 400, 165);
-    $draw->rectangle(275, 200, 400, 350);
-
-    $image = new \Imagick();
-    $image->newImage(500, 400, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokeantialias.xml b/reference/imagick/imagickdraw/setstrokeantialias.xml
deleted file mode 100644
index d2828bb87ffa..000000000000
--- a/reference/imagick/imagickdraw/setstrokeantialias.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokeantialias">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeAntialias</refname>
-  <refpurpose>Controls whether stroked outlines are antialiased</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeAntialias</methodname>
-   <methodparam><type>bool</type><parameter>enabled</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Controls whether stroked outlines are antialiased. Stroked outlines 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>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>enabled</parameter></term>
-     <listitem>
-      <para>
-       the antialias setting
-      </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>ImagickDraw::setStrokeAntialias</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeAntialias($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeAntialias(false);
-    $draw->line(100, 100, 400, 105);
-
-    $draw->line(100, 140, 400, 185);
-
-    $draw->setStrokeAntialias(true);
-    $draw->line(100, 110, 400, 115);
-    $draw->line(100, 150, 400, 195);
-
-    $image = new \Imagick();
-    $image->newImage(500, 250, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokecolor.xml b/reference/imagick/imagickdraw/setstrokecolor.xml
deleted file mode 100644
index 161149d4c804..000000000000
--- a/reference/imagick/imagickdraw/setstrokecolor.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokecolor">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeColor</refname>
-  <refpurpose>Sets the color used for stroking object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeColor</methodname>
-   <methodparam><type class="union"><type>ImagickPixel</type><type>string</type></type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the color used for stroking object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       the stroke color
-      </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>ImagickDraw::setStrokeColor</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeColor($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(5);
-
-    $draw->line(100, 100, 400, 145);
-    $draw->rectangle(100, 200, 225, 350);
-
-    $draw->setStrokeOpacity(0.1);
-    $draw->line(100, 120, 400, 165);
-    $draw->rectangle(275, 200, 400, 350);
-
-    $image = new \Imagick();
-    $image->newImage(500, 400, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokedasharray.xml b/reference/imagick/imagickdraw/setstrokedasharray.xml
deleted file mode 100644
index e443b96dfa5d..000000000000
--- a/reference/imagick/imagickdraw/setstrokedasharray.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokedasharray">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeDashArray</refname>
-  <refpurpose>Specifies the pattern of dashes and gaps used to stroke paths</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeDashArray</methodname>
-   <methodparam><type class="union"><type>array</type><type>null</type></type><parameter>dashes</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the pattern of dashes and gaps used to stroke paths. The
-   strokeDashArray represents an array of numbers that specify the lengths of
-   alternating dashes and gaps in pixels. If an odd number of values is
-   provided, then the list of values is repeated to yield an even number of
-   values. To remove an existing dash array, pass a zero number_elements
-   argument and null dash_array. A typical strokeDashArray_ array might
-   contain the members 5 3 2.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dashes</parameter></term>
-     <listitem>
-      <para>
-       array of floats
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::setStrokeDashArray</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeDashArray($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(4);
-
-    $draw->setStrokeDashArray([10, 10]);
-    $draw->rectangle(100, 50, 225, 175);
-
-    $draw->setStrokeDashArray([20, 5, 20, 5, 5, 5,]);
-    $draw->rectangle(275, 50, 400, 175);
-
-    $draw->setStrokeDashArray([20, 5, 20, 5, 5]);
-    $draw->rectangle(100, 200, 225, 350);
-
-    $draw->setStrokeDashArray([1, 1, 1, 1, 2, 2, 3, 3, 5, 5, 8, 8, 13, 13, 21, 21, 34, 34, 55, 55, 89, 89, 144, 144, 233, 233, 377, 377, 610, 610, 987, 987, 1597, 1597, 2584, 2584, 4181, 4181,]);
-
-    $draw->rectangle(275, 200, 400, 350);
-
-    $image = new \Imagick();
-    $image->newImage(500, 400, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokedashoffset.xml b/reference/imagick/imagickdraw/setstrokedashoffset.xml
deleted file mode 100644
index ce76725c7a87..000000000000
--- a/reference/imagick/imagickdraw/setstrokedashoffset.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokedashoffset">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeDashOffset</refname>
-  <refpurpose>Specifies the offset into the dash pattern to start the dash</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeDashOffset</methodname>
-   <methodparam><type>float</type><parameter>dash_offset</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the offset into the dash pattern to start the dash.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dash_offset</parameter></term>
-     <listitem>
-      <para>
-       dash offset
-      </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>ImagickDraw::setStrokeDashOffset</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeDashOffset($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(4);
-    $draw->setStrokeDashArray([20, 20]);
-    $draw->setStrokeDashOffset(0);
-    $draw->rectangle(100, 50, 225, 175);
-
-    //Start the dash effect halfway through the solid portion
-    $draw->setStrokeDashOffset(10);
-    $draw->rectangle(275, 50, 400, 175);
-
-    //Start the dash effect on the space portion
-    $draw->setStrokeDashOffset(20);
-    $draw->rectangle(100, 200, 225, 350);
-    $draw->setStrokeDashOffset(5);
-    $draw->rectangle(275, 200, 400, 350);
-
-    $image = new \Imagick();
-    $image->newImage(500, 400, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokelinecap.xml b/reference/imagick/imagickdraw/setstrokelinecap.xml
deleted file mode 100644
index 88d9a4cabb47..000000000000
--- a/reference/imagick/imagickdraw/setstrokelinecap.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokelinecap">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeLineCap</refname>
-  <refpurpose>Specifies the shape to be used at the end of open subpaths when they are stroked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeLineCap</methodname>
-   <methodparam><type>int</type><parameter>linecap</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the shape to be used at the end of open subpaths when they
-   are stroked.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>linecap</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.linecap">LINECAP</link> constant
-       (<literal>imagick::LINECAP_*</literal>).
-      </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>ImagickDraw::setStrokeLineCap</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeLineCap($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(25);
-
-    $lineTypes = [\Imagick::LINECAP_BUTT, \Imagick::LINECAP_ROUND, \Imagick::LINECAP_SQUARE,];
-
-    $offset = 0;
-
-    foreach ($lineTypes as $lineType) {
-        $draw->setStrokeLineCap($lineType);
-        $draw->line(50 + $offset, 50, 50 + $offset, 250);
-        $offset += 50;
-    }
-
-    $imagick = new \Imagick();
-    $imagick->newImage(300, 300, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokelinejoin.xml b/reference/imagick/imagickdraw/setstrokelinejoin.xml
deleted file mode 100644
index edb5260c4a2c..000000000000
--- a/reference/imagick/imagickdraw/setstrokelinejoin.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokelinejoin">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeLineJoin</refname>
-  <refpurpose>Specifies the shape to be used at the corners of paths when they are stroked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeLineJoin</methodname>
-   <methodparam><type>int</type><parameter>linejoin</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the shape to be used at the corners of paths (or other vector 
-   shapes) when they are stroked.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>linejoin</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.linejoin">LINEJOIN</link> constant
-       (<literal>imagick::LINEJOIN_*</literal>).
-      </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>ImagickDraw::setStrokeLineJoin</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeLineJoin($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-
-    $draw->setStrokeWidth(20);
-
-    $offset = 220;
-
-    $lineJoinStyle = [
-        \Imagick::LINEJOIN_MITER,
-        \Imagick::LINEJOIN_ROUND,
-        \Imagick::LINEJOIN_BEVEL,
-        ];
-
-    for ($x = 0; $x < count($lineJoinStyle); $x++) {
-        $draw->setStrokeLineJoin($lineJoinStyle[$x]);
-        $points = [
-            ['x' => 40 * 5, 'y' => 10 * 5 + $x * $offset],
-            ['x' => 20 * 5, 'y' => 20 * 5 + $x * $offset],
-            ['x' => 70 * 5, 'y' => 50 * 5 + $x * $offset],
-            ['x' => 40 * 5, 'y' => 10 * 5 + $x * $offset],
-        ];
-
-        $draw->polyline($points);
-    }
-
-    $image = new \Imagick();
-    $image->newImage(500, 700, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokemiterlimit.xml b/reference/imagick/imagickdraw/setstrokemiterlimit.xml
deleted file mode 100644
index cf6f15d2b251..000000000000
--- a/reference/imagick/imagickdraw/setstrokemiterlimit.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokemiterlimit">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeMiterLimit</refname>
-  <refpurpose>Specifies the miter limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeMiterLimit</methodname>
-   <methodparam><type>int</type><parameter>miterlimit</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the miter limit. When two line segments meet at a sharp angle
-   and miter joins have been specified for 'lineJoin', it is possible for
-   the miter to extend far beyond the thickness of the line stroking the 
-   path. The miterLimit' imposes a limit on the ratio of the miter length to
-   the 'lineWidth'.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>miterlimit</parameter></term>
-     <listitem>
-      <para>
-       the miter limit
-      </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>ImagickDraw::setStrokeMiterLimit</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeMiterLimit($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeOpacity(0.6);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(10);
-
-    $yOffset = 100;
-
-    $draw->setStrokeLineJoin(\Imagick::LINEJOIN_MITER);
-
-    for ($y = 0; $y < 3; $y++) {
-
-        $draw->setStrokeMiterLimit(40 * $y);
-
-        $points = [
-            ['x' => 22 * 3, 'y' => 15 * 4 + $y * $yOffset],
-            ['x' => 20 * 3, 'y' => 20 * 4 + $y * $yOffset],
-            ['x' => 70 * 5, 'y' => 45 * 4 + $y * $yOffset],
-        ];
-
-        $draw->polygon($points);
-    }
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    $image->setImageType(\Imagick::IMGTYPE_PALETTE);
-    $image->setImageCompressionQuality(100);
-    $image->stripImage();
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokeopacity.xml b/reference/imagick/imagickdraw/setstrokeopacity.xml
deleted file mode 100644
index e77a866e2b41..000000000000
--- a/reference/imagick/imagickdraw/setstrokeopacity.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokeopacity">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeOpacity</refname>
-  <refpurpose>Specifies the opacity of stroked object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeOpacity</methodname>
-   <methodparam><type>float</type><parameter>opacity</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the opacity of stroked object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>opacity</parameter></term>
-     <listitem>
-      <para>
-       stroke opacity. 1.0 is fully opaque
-      </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>ImagickDraw::setStrokeOpacity</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeOpacity($strokeColor, $fillColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(10);
-    $draw->setStrokeOpacity(1);
-    $draw->line(100, 80, 400, 125);
-    $draw->rectangle(25, 200, 150, 350);
-    $draw->setStrokeOpacity(0.5);
-    $draw->line(100, 100, 400, 145);
-    $draw->rectangle(200, 200, 325, 350);
-    $draw->setStrokeOpacity(0.2);
-    $draw->line(100, 120, 400, 165);
-    $draw->rectangle(375, 200, 500, 350);
-
-    $image = new \Imagick();
-    $image->newImage(550, 400, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setstrokepatternurl.xml b/reference/imagick/imagickdraw/setstrokepatternurl.xml
deleted file mode 100644
index e88602b8a720..000000000000
--- a/reference/imagick/imagickdraw/setstrokepatternurl.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokepatternurl">
- <refnamediv>
-  <refname>ImagickDraw::setStrokePatternURL</refname>
-  <refpurpose>Sets the pattern used for stroking object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokePatternURL</methodname>
-   <methodparam><type>string</type><parameter>stroke_url</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the pattern used for stroking object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>stroke_url</parameter></term>
-     <listitem>
-      <para>
-       stroke URL
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/setstrokewidth.xml b/reference/imagick/imagickdraw/setstrokewidth.xml
deleted file mode 100644
index bb275a7e4477..000000000000
--- a/reference/imagick/imagickdraw/setstrokewidth.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setstrokewidth">
- <refnamediv>
-  <refname>ImagickDraw::setStrokeWidth</refname>
-  <refpurpose>Sets the width of the stroke used to draw object outlines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setStrokeWidth</methodname>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the width of the stroke used to draw object outlines.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       stroke width
-      </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>ImagickDraw::setStrokeWidth</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setStrokeWidth($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeWidth(1);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->line(100, 100, 400, 145);
-    $draw->rectangle(100, 200, 225, 350);
-    $draw->setStrokeWidth(5);
-    $draw->line(100, 120, 400, 165);
-    $draw->rectangle(275, 200, 400, 350);
-
-    $image = new \Imagick();
-    $image->newImage(500, 400, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/settextalignment.xml b/reference/imagick/imagickdraw/settextalignment.xml
deleted file mode 100644
index c738b13b9e9a..000000000000
--- a/reference/imagick/imagickdraw/settextalignment.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.settextalignment">
- <refnamediv>
-  <refname>ImagickDraw::setTextAlignment</refname>
-  <refpurpose>Specifies a text alignment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextAlignment</methodname>
-   <methodparam><type>int</type><parameter>align</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies a text alignment to be applied when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>align</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.align">ALIGN</link> constant
-       (<literal>imagick::ALIGN_*</literal>).
-      </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>ImagickDraw::setTextAlignment</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setTextAlignment($strokeColor, $fillColor, $backgroundColor) {
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setFontSize(36);
-
-    $draw->setTextAlignment(\Imagick::ALIGN_LEFT);
-    $draw->annotation(250, 75, "Lorem Ipsum!");
-    $draw->setTextAlignment(\Imagick::ALIGN_CENTER);
-    $draw->annotation(250, 150, "Lorem Ipsum!");
-    $draw->setTextAlignment(\Imagick::ALIGN_RIGHT);
-    $draw->annotation(250, 225, "Lorem Ipsum!");
-    $draw->line(250, 0, 250, 500);
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/settextantialias.xml b/reference/imagick/imagickdraw/settextantialias.xml
deleted file mode 100644
index 3ba3469a4b8d..000000000000
--- a/reference/imagick/imagickdraw/settextantialias.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.settextantialias">
- <refnamediv>
-  <refname>ImagickDraw::setTextAntialias</refname>
-  <refpurpose>Controls whether text is antialiased</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextAntialias</methodname>
-   <methodparam><type>bool</type><parameter>antialias</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Controls whether text is antialiased. Text is antialiased by default.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>antialias</parameter></term>
-     <listitem>
-      <para>
-      </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>ImagickDraw::setTextAntialias</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setTextAntialias($fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-    $draw->setStrokeColor('none');
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(1);
-    $draw->setFontSize(32);
-    $draw->setTextAntialias(false);
-    $draw->annotation(5, 30, "Lorem Ipsum!");
-    $draw->setTextAntialias(true);
-    $draw->annotation(5, 65, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(220, 80, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    //Scale the image so that people can see the aliasing.
-    $imagick->scaleImage(220 * 6, 80 * 6);
-    $imagick->cropImage(640, 480, 0, 0);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/settextdecoration.xml b/reference/imagick/imagickdraw/settextdecoration.xml
deleted file mode 100644
index 629bbe0138c3..000000000000
--- a/reference/imagick/imagickdraw/settextdecoration.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.settextdecoration">
- <refnamediv>
-  <refname>ImagickDraw::setTextDecoration</refname>
-  <refpurpose>Specifies a decoration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextDecoration</methodname>
-   <methodparam><type>int</type><parameter>decoration</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies a decoration to be applied when annotating with text.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>decoration</parameter></term>
-     <listitem>
-      <para>
-       One of the <link linkend="imagick.constants.decoration">DECORATION</link> constant
-       (<literal>imagick::DECORATION_*</literal>).
-      </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>ImagickDraw::setTextDecoration</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setTextDecoration($strokeColor, $fillColor, $backgroundColor, $textDecoration) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-    $draw->setTextDecoration($textDecoration);
-    $draw->annotation(50, 75, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 200, $backgroundColor);
-    $imagick->setImageFormat("png");
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/settextencoding.xml b/reference/imagick/imagickdraw/settextencoding.xml
deleted file mode 100644
index 29e3666d4052..000000000000
--- a/reference/imagick/imagickdraw/settextencoding.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.settextencoding">
- <refnamediv>
-  <refname>ImagickDraw::setTextEncoding</refname>
-  <refpurpose>Specifies the text code set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextEncoding</methodname>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the code set to use for text annotations. The only
-   character encoding which may be specified at this time is "UTF-8" for
-   representing Unicode as a sequence of bytes. Specify an empty string to
-   set text encoding to the system's default. Successful text annotation
-   using Unicode may require fonts designed to support Unicode.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       the encoding name
-      </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/imagick/imagickdraw/settextinterlinespacing.xml b/reference/imagick/imagickdraw/settextinterlinespacing.xml
deleted file mode 100644
index f3fdda22a476..000000000000
--- a/reference/imagick/imagickdraw/settextinterlinespacing.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.settextinterlinespacing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::setTextInterlineSpacing</refname>
-  <refpurpose>Sets the text interline spacing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextInterlineSpacing</methodname>
-   <methodparam><type>float</type><parameter>spacing</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the text interline spacing.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>spacing</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/settextinterwordspacing.xml b/reference/imagick/imagickdraw/settextinterwordspacing.xml
deleted file mode 100644
index ebb1137f4d8b..000000000000
--- a/reference/imagick/imagickdraw/settextinterwordspacing.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.settextinterwordspacing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::setTextInterwordSpacing</refname>
-  <refpurpose>Sets the text interword spacing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextInterwordSpacing</methodname>
-   <methodparam><type>float</type><parameter>spacing</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the text interword spacing.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>spacing</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/settextkerning.xml b/reference/imagick/imagickdraw/settextkerning.xml
deleted file mode 100644
index 808e385f2ff8..000000000000
--- a/reference/imagick/imagickdraw/settextkerning.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickdraw.settextkerning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickDraw::setTextKerning</refname>
-  <refpurpose>Sets the text kerning</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextKerning</methodname>
-   <methodparam><type>float</type><parameter>kerning</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the text kerning
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>kerning</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickdraw/settextundercolor.xml b/reference/imagick/imagickdraw/settextundercolor.xml
deleted file mode 100644
index 9ffa21f85399..000000000000
--- a/reference/imagick/imagickdraw/settextundercolor.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.settextundercolor">
- <refnamediv>
-  <refname>ImagickDraw::setTextUnderColor</refname>
-  <refpurpose>Specifies the color of a background rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setTextUnderColor</methodname>
-   <methodparam><type class="union"><type>ImagickPixel</type><type>string</type></type><parameter>under_color</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Specifies the color of a background rectangle to place under text annotations.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>under_color</parameter></term>
-     <listitem>
-      <para>
-       the under color
-      </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>ImagickDraw::setTextUnderColor</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setTextUnderColor($strokeColor, $fillColor, $backgroundColor, $textUnderColor) {
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-    $draw->annotation(50, 75, "Lorem Ipsum!");
-    $draw->setTextUnderColor($textUnderColor);
-    $draw->annotation(50, 175, "Lorem Ipsum!");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setvectorgraphics.xml b/reference/imagick/imagickdraw/setvectorgraphics.xml
deleted file mode 100644
index a322a17dee36..000000000000
--- a/reference/imagick/imagickdraw/setvectorgraphics.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.setvectorgraphics">
- <refnamediv>
-  <refname>ImagickDraw::setVectorGraphics</refname>
-  <refpurpose>Sets the vector graphics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setVectorGraphics</methodname>
-   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the vector graphics associated with the specified ImagickDraw
-   object. Use this method with <methodname>ImagickDraw::getVectorGraphics</methodname> as a method
-   to persist the vector graphics state.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>xml</parameter></term>
-     <listitem>
-      <para>
-       xml containing the vector graphics
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title><function>ImagickDraw::setVectorGraphics</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setVectorGraphics() {
-    //Setup a draw object with some drawing in it.
-    $draw = new \ImagickDraw();
-    $draw->setFillColor("red");
-    $draw->circle(20, 20, 50, 50);
-    $draw->setFillColor("blue");
-    $draw->circle(50, 70, 50, 50);
-    $draw->rectangle(50, 120, 80, 150);
-
-    //Get the drawing as a string
-    $SVG = $draw->getVectorGraphics();
-    
-    //$svg is a string, and could be saved anywhere a string can be saved
-
-    //Use the saved drawing to generate a new draw object
-    $draw2 = new \ImagickDraw();
-    //Apparently the SVG text is missing the root element. 
-    $draw2->setVectorGraphics("<root>".$SVG."</root>");
-
-    $imagick = new \Imagick();
-    $imagick->newImage(200, 200, 'white');
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw2);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/setviewbox.xml b/reference/imagick/imagickdraw/setviewbox.xml
deleted file mode 100644
index c4a7633a8c6a..000000000000
--- a/reference/imagick/imagickdraw/setviewbox.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagickdraw.setviewbox" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ImagickDraw::setViewbox</refname>
-  <refpurpose>Sets the overall canvas size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::setViewbox</methodname>
-   <methodparam><type>int</type><parameter>left_x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>top_y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>right_x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bottom_y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the overall canvas size to be recorded with the drawing vector data.
-   Usually this will be specified using the same size as the canvas image.
-   When the vector data is saved to SVG or MVG formats, the viewbox is use to
-   specify the size of the canvas image that a viewer will render the vector
-   data on.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>left_x</parameter></term>
-     <listitem>
-      <para>
-       left x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>top_y</parameter></term>
-     <listitem>
-      <para>
-       left y coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>right_x</parameter></term>
-     <listitem>
-      <para>
-       right x coordinate
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom_y</parameter></term>
-     <listitem>
-      <para>
-       right y coordinate
-      </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>ImagickDraw::setViewBox</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setViewBox($strokeColor, $fillColor, $backgroundColor) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFontSize(72);
-
-    /*
-     
-    Sets the overall canvas size to be recorded with the drawing vector data. Usually this will be specified using the same size as the canvas image. When the vector data is saved to SVG or MVG formats, the viewbox is use to specify the size of the canvas image that a viewer will render the vector data on.
-    
-     */
-
-    $draw->circle(250, 250, 250, 0);
-    $draw->setviewbox(0, 0, 200, 200);
-    $draw->circle(125, 250, 250, 250);
-    $draw->translate(250, 125);
-    $draw->circle(0, 0, 125, 0);
-
-
-    $imagick = new \Imagick();
-    $imagick->newImage(500, 500, $backgroundColor);
-    $imagick->setImageFormat("png");
-
-    $imagick->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/skewx.xml b/reference/imagick/imagickdraw/skewx.xml
deleted file mode 100644
index 8aaf64231592..000000000000
--- a/reference/imagick/imagickdraw/skewx.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.skewx">
- <refnamediv>
-  <refname>ImagickDraw::skewX</refname>
-  <refpurpose>Skews the current coordinate system in the horizontal direction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::skewX</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Skews the current coordinate system in the horizontal direction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>degrees</parameter></term>
-     <listitem>
-      <para>
-       degrees to skew
-      </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>ImagickDraw::skewX</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function skewX($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor, 
-               $startX, $startY, $endX, $endY, $skew) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-    $draw->setFillColor($fillModifiedColor);
-    $draw->skewX($skew);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/skewy.xml b/reference/imagick/imagickdraw/skewy.xml
deleted file mode 100644
index c4b2cd636457..000000000000
--- a/reference/imagick/imagickdraw/skewy.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.skewy">
- <refnamediv>
-  <refname>ImagickDraw::skewY</refname>
-  <refpurpose>Skews the current coordinate system in the vertical direction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::skewY</methodname>
-   <methodparam><type>float</type><parameter>degrees</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Skews the current coordinate system in the vertical direction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>degrees</parameter></term>
-     <listitem>
-      <para>
-       degrees to skew
-      </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>ImagickDraw::skewY</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function skewY($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor, 
-               $startX, $startY, $endX, $endY, $skew) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setStrokeWidth(2);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-    $draw->setFillColor($fillModifiedColor);
-    $draw->skewY($skew);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdraw/translate.xml b/reference/imagick/imagickdraw/translate.xml
deleted file mode 100644
index f0c371c19e34..000000000000
--- a/reference/imagick/imagickdraw/translate.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickdraw.translate">
- <refnamediv>
-  <refname>ImagickDraw::translate</refname>
-  <refpurpose>Applies a translation to the current coordinate system</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickDraw::translate</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Applies a translation to the current coordinate system which moves the
-   coordinate system origin to the specified coordinate.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       horizontal translation
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       vertical translation
-      </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>ImagickDraw::translate</function> example</title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function translate($strokeColor, $fillColor, $backgroundColor, $fillModifiedColor, 
-                   $startX, $startY, $endX, $endY, $translateX, $translateY) {
-
-    $draw = new \ImagickDraw();
-
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-
-    $draw->setFillColor($fillModifiedColor);
-    $draw->translate($translateX, $translateY);
-    $draw->rectangle($startX, $startY, $endX, $endY);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, $backgroundColor);
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickdrawexception.xml b/reference/imagick/imagickdrawexception.xml
deleted file mode 100644
index a4a7465e17c2..000000000000
--- a/reference/imagick/imagickdrawexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference role="exception" xml:id="class.imagickdrawexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The ImagickDrawException class</title>
- <titleabbrev>ImagickDrawException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickDrawException intro -->
-  <section xml:id="imagickdrawexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickdrawexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>ImagickDrawException</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickDrawException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/imagick/imagickexception.xml b/reference/imagick/imagickexception.xml
deleted file mode 100644
index 11b90c849859..000000000000
--- a/reference/imagick/imagickexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference role="exception" xml:id="class.imagickexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The ImagickException class</title>
- <titleabbrev>ImagickException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickException intro -->
-  <section xml:id="imagickexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>ImagickException</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/imagick/imagickkernel.xml b/reference/imagick/imagickkernel.xml
deleted file mode 100644
index 4d355872a09b..000000000000
--- a/reference/imagick/imagickkernel.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.imagickkernel" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ImagickKernel class</title>
- <titleabbrev>ImagickKernel</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickKernel intro -->
-  <section xml:id="imagickkernel.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickkernel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ImagickKernel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickKernel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickkernel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.imagick.entities.imagickkernel;
-
-</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/imagick/imagickkernel/addkernel.xml b/reference/imagick/imagickkernel/addkernel.xml
deleted file mode 100644
index edeeac5509be..000000000000
--- a/reference/imagick/imagickkernel/addkernel.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.addkernel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::addKernel</refname>
-  <refpurpose>Attach another kernel to a kernel list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>ImagickKernel::addKernel</methodname>
-   <methodparam><type>ImagickKernel</type><parameter>ImagickKernel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Attach another kernel to this kernel to allow them to both be applied in a single morphology or filter function. Returns the new combined kernel.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ImagickKernel</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::addKernel</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function addKernel($imagePath) {
-    $matrix1 = [
-        [-1, -1, -1],
-        [ 0,  0,  0],
-        [ 1,  1,  1],
-    ];
-
-    $matrix2 = [
-        [-1,  0,  1],
-        [-1,  0,  1],
-        [-1,  0,  1],
-    ];
-
-    $kernel1 = ImagickKernel::fromMatrix($matrix1);
-    $kernel2 = ImagickKernel::fromMatrix($matrix2);
-    $kernel1->addKernel($kernel2);
-
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->filter($kernel1);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-
-}
-
-?>
-]]>
-      </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/imagick/imagickkernel/addunitykernel.xml b/reference/imagick/imagickkernel/addunitykernel.xml
deleted file mode 100644
index 67ba07c8d079..000000000000
--- a/reference/imagick/imagickkernel/addunitykernel.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.addunitykernel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::addUnityKernel</refname>
-  <refpurpose>Adds a Unity Kernel to the kernel list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>ImagickKernel::addUnityKernel</methodname>
-   <methodparam><type>float</type><parameter>scale</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a given amount of the 'Unity' Convolution Kernel to the given pre-scaled
-   and normalized Kernel. This in effect adds that amount of the original image
-   into the resulting convolution kernel. The resulting effect is to convert the
-   defined kernels into blended soft-blurs, unsharp kernels or into sharpening kernels.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::addUnityKernel</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-
-
-    function renderKernelTable($matrix) {
-        $output = "<table class='infoTable'>";
-    
-        foreach ($matrix as $row) {
-            $output .= "<tr>";
-            foreach ($row as $cell) {
-                $output .= "<td style='text-align:left'>";
-                if ($cell === false) {
-                    $output .= "false";
-                }
-                else {
-                    $output .= round($cell, 3);
-                }
-                $output .= "</td>";
-            }
-            $output .= "</tr>";
-        }
-    
-        $output .= "</table>";
-    
-        return $output;
-    }
-
-    $matrix = [
-        [-1, 0, -1],
-        [ 0, 4,  0],
-        [-1, 0, -1],
-    ];
-
-    $kernel = \ImagickKernel::fromMatrix($matrix);
-    $kernel->scale(1, \Imagick::NORMALIZE_KERNEL_VALUE);
-    $output = "Before adding unity kernel: <br/>";
-    $output .= renderKernelTable($kernel->getMatrix());
-    $kernel->addUnityKernel(0.5);
-    $output .= "After adding unity kernel: <br/>";
-    $output .= renderKernelTable($kernel->getMatrix());
-    
-    
-    $kernel->scale(1, \Imagick::NORMALIZE_KERNEL_VALUE);
-    $output .= "After renormalizing kernel: <br/>";
-    $output .= renderKernelTable($kernel->getMatrix());
-
-    echo $output;
-
-?>
-]]>
-      </programlisting>
-    </example>
-
-    <example>
-      <title> <function>ImagickKernel::addUnityKernel</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function addUnityKernel($imagePath) {
-
-    $matrix = [
-        [-1, 0, -1],
-        [ 0, 4,  0],
-        [-1, 0, -1],
-    ];
-
-    $kernel = ImagickKernel::fromMatrix($matrix);
-
-    $kernel->scale(4, \Imagick::NORMALIZE_KERNEL_VALUE);
-    $kernel->addUnityKernel(0.5);
-
-
-    $imagick = new \Imagick(realpath($imagePath));
-    $imagick->filter($kernel);
-    header("Content-Type: image/jpg");
-    echo $imagick->getImageBlob();
-
-}
-
-?>
-]]>
-      </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/imagick/imagickkernel/frombuiltin.xml b/reference/imagick/imagickkernel/frombuiltin.xml
deleted file mode 100644
index f5eae3ec7b27..000000000000
--- a/reference/imagick/imagickkernel/frombuiltin.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.frombuiltin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::fromBuiltIn</refname>
-  <refpurpose>Create a kernel from a builtin in kernel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ImagickKernel</type><methodname>ImagickKernel::fromBuiltin</methodname>
-   <methodparam><type>int</type><parameter>kernelType</parameter></methodparam>
-   <methodparam><type>string</type><parameter>kernelString</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a kernel from a builtin in kernel. See http://www.imagemagick.org/Usage/morphology/#kernel for examples. Currently the 'rotation' symbols are not supported. Example:
-   $diamondKernel = ImagickKernel::fromBuiltIn(\Imagick::KERNEL_DIAMOND, "2");
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>kerneltype</parameter></term>
-    <listitem>
-     <para>
-      The type of kernel to build e.g. \Imagick::KERNEL_DIAMOND
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>kernelString</parameter></term>
-    <listitem>
-     <para>
-      A string that describes the parameters e.g. "4,2.5"
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::fromBuiltin</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-
-function renderKernel(ImagickKernel $imagickKernel) {
-    $matrix = $imagickKernel->getMatrix();
-    
-    $imageMargin = 20;
-    
-    $tileSize = 20;
-    $tileSpace = 4;
-    $shadowSigma = 4;
-    $shadowDropX = 20;
-    $shadowDropY = 0;
-
-    $radius = ($tileSize / 2) * 0.9;
-    
-    $rows = count($matrix);
-    $columns = count($matrix[0]);
- 
-    $imagickDraw = new \ImagickDraw();
-
-    $imagickDraw->setFillColor('#afafaf');
-    $imagickDraw->setStrokeColor('none');
-    
-    $imagickDraw->translate($imageMargin, $imageMargin);
-    $imagickDraw->push();
-
-    ksort($matrix);
-    
-    foreach ($matrix as $row) {
-        ksort($row);
-        $imagickDraw->push();
-        foreach ($row as $cell) {
-            if ($cell !== false) {
-                $color = intval(255 * $cell);
-                $colorString = sprintf("rgb(%f, %f, %f)", $color, $color, $color);
-                $imagickDraw->setFillColor($colorString);
-                $imagickDraw->rectangle(0, 0, $tileSize, $tileSize);
-            }
-            $imagickDraw->translate(($tileSize + $tileSpace), 0);
-        }
-        $imagickDraw->pop();
-        $imagickDraw->translate(0, ($tileSize + $tileSpace));
-    }
-
-    $imagickDraw->pop();
-
-    $width = ($columns * $tileSize) + (($columns - 1) * $tileSpace);
-    $height = ($rows * $tileSize) + (($rows - 1) * $tileSpace);
-
-    $imagickDraw->push();
-    $imagickDraw->translate($width/2 , $height/2);
-    $imagickDraw->setFillColor('rgba(0, 0, 0, 0)');
-    $imagickDraw->setStrokeColor('white');
-    $imagickDraw->circle(0, 0, $radius - 1, 0);
-    $imagickDraw->setStrokeColor('black');
-    $imagickDraw->circle(0, 0, $radius, 0);
-    $imagickDraw->pop();
-
-    $canvasWidth = $width + (2 * $imageMargin); 
-    $canvasHeight = $height + (2 * $imageMargin);
-
-    $kernel = new \Imagick();
-    $kernel->newPseudoImage(
-        $canvasWidth,
-        $canvasHeight,
-        'canvas:none'
-    );
-
-    $kernel->setImageFormat('png');
-    $kernel->drawImage($imagickDraw);
- 
-    /* create drop shadow on it's own layer */
-    $canvas = $kernel->clone();
-    $canvas->setImageBackgroundColor(new \ImagickPixel('rgb(0, 0, 0)'));
-    $canvas->shadowImage(100, $shadowSigma, $shadowDropX, $shadowDropY);
-
-    $canvas->setImagePage($canvasWidth, $canvasHeight, -5, -5);
-    $canvas->cropImage($canvasWidth, $canvasHeight, 0, 0);
-    
-    /* composite original text_layer onto shadow_layer */
-    $canvas->compositeImage($kernel, \Imagick::COMPOSITE_OVER, 0, 0);
-    $canvas->setImageFormat('png');
-
-    return $canvas;
-}
-
-
-function createFromBuiltin($kernelType, $kernelFirstTerm, $kernelSecondTerm, $kernelThirdTerm) {
-    $string = '';
-
-    if ($kernelFirstTerm != false && strlen(trim($kernelFirstTerm)) != 0) {
-        $string .= $kernelFirstTerm;
-
-        if ($kernelSecondTerm != false && strlen(trim($kernelSecondTerm)) != 0) {
-            $string .= ','.$kernelSecondTerm;
-            if ($kernelThirdTerm != false && strlen(trim($kernelThirdTerm)) != 0) {
-                $string .= ','.$kernelThirdTerm;
-            }
-        }
-    }
-
-    $kernel = ImagickKernel::fromBuiltIn(
-        $kernelType,
-        $string
-    );
-
-    return $kernel;
-}
-    
-function fromBuiltin($kernelType, $kernelFirstTerm, $kernelSecondTerm, $kernelThirdTerm) {
-    $diamondKernel = createFromBuiltin($kernelType, $kernelFirstTerm, $kernelSecondTerm, $kernelThirdTerm);
-    $imagick = renderKernel($diamondKernel);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-fromBuiltin(\Imagick::KERNEL_DIAMOND, 2, false, false);
-
-
-?>
-]]>
-      </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/imagick/imagickkernel/frommatrix.xml b/reference/imagick/imagickkernel/frommatrix.xml
deleted file mode 100644
index b9b1af695444..000000000000
--- a/reference/imagick/imagickkernel/frommatrix.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.frommatrix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::fromMatrix</refname>
-  <refpurpose>Create a kernel from a 2d matrix of values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ImagickKernel</type><methodname>ImagickKernel::fromMatrix</methodname>
-   <methodparam><type>array</type><parameter>matrix</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>origin</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a kernel from an 2d matrix of values. Each value should either be a float
-   (if the element should be used) or 'false' if the element should be skipped. For
-   matrices that are odd sizes in both dimensions the origin pixel will default
-   to the centre of the kernel. For all other kernel sizes the origin pixel must be specified.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>array</parameter></term>
-    <listitem>
-     <para>
-      A matrix (i.e. 2d array) of values that define the kernel. Each element should be either a float value, or FALSE if that element shouldn't be used by the kernel.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>array</parameter></term>
-    <listitem>
-     <para>
-      Which element of the kernel should be used as the origin pixel. e.g. For a 3x3 matrix specifying the origin as [2, 2] would specify that the bottom right element should be the origin pixel.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The generated ImagickKernel.
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::fromMatrix</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-function renderKernel(ImagickKernel $imagickKernel) {
-    $matrix = $imagickKernel->getMatrix();
-    
-    $imageMargin = 20;
-    
-    $tileSize = 20;
-    $tileSpace = 4;
-    $shadowSigma = 4;
-    $shadowDropX = 20;
-    $shadowDropY = 0;
-
-    $radius = ($tileSize / 2) * 0.9;
-    
-    $rows = count($matrix);
-    $columns = count($matrix[0]);
- 
-    $imagickDraw = new \ImagickDraw();
-
-    $imagickDraw->setFillColor('#afafaf');
-    $imagickDraw->setStrokeColor('none');
-    
-    $imagickDraw->translate($imageMargin, $imageMargin);
-    $imagickDraw->push();
-
-    ksort($matrix);
-    
-    foreach ($matrix as $row) {
-        ksort($row);
-        $imagickDraw->push();
-        foreach ($row as $cell) {
-            if ($cell !== false) {
-                $color = intval(255 * $cell);
-                $colorString = sprintf("rgb(%f, %f, %f)", $color, $color, $color);
-                $imagickDraw->setFillColor($colorString);
-                $imagickDraw->rectangle(0, 0, $tileSize, $tileSize);
-            }
-            $imagickDraw->translate(($tileSize + $tileSpace), 0);
-        }
-        $imagickDraw->pop();
-        $imagickDraw->translate(0, ($tileSize + $tileSpace));
-    }
-
-    $imagickDraw->pop();
-
-    $width = ($columns * $tileSize) + (($columns - 1) * $tileSpace);
-    $height = ($rows * $tileSize) + (($rows - 1) * $tileSpace);
-
-    $imagickDraw->push();
-    $imagickDraw->translate($width/2 , $height/2);
-    $imagickDraw->setFillColor('rgba(0, 0, 0, 0)');
-    $imagickDraw->setStrokeColor('white');
-    $imagickDraw->circle(0, 0, $radius - 1, 0);
-    $imagickDraw->setStrokeColor('black');
-    $imagickDraw->circle(0, 0, $radius, 0);
-    $imagickDraw->pop();
-
-    $canvasWidth = $width + (2 * $imageMargin); 
-    $canvasHeight = $height + (2 * $imageMargin);
-
-    $kernel = new \Imagick();
-    $kernel->newPseudoImage(
-        $canvasWidth,
-        $canvasHeight,
-        'canvas:none'
-    );
-
-    $kernel->setImageFormat('png');
-    $kernel->drawImage($imagickDraw);
- 
-    /* create drop shadow on it's own layer */
-    $canvas = $kernel->clone();
-    $canvas->setImageBackgroundColor(new \ImagickPixel('rgb(0, 0, 0)'));
-    $canvas->shadowImage(100, $shadowSigma, $shadowDropX, $shadowDropY);
-
-    $canvas->setImagePage($canvasWidth, $canvasHeight, -5, -5);
-    $canvas->cropImage($canvasWidth, $canvasHeight, 0, 0);
-    
-    /* composite original text_layer onto shadow_layer */
-    $canvas->compositeImage($kernel, \Imagick::COMPOSITE_OVER, 0, 0);
-    $canvas->setImageFormat('png');
-
-    return $canvas;
-}
-
-function createFromMatrix() {
-    $matrix = [
-        [0.5, 0, 0.2],
-        [0, 1, 0],
-        [0.9, 0, false],
-    ];
-
-    $kernel = \ImagickKernel::fromMatrix($matrix);
-
-    return $kernel;
-}
-    
-function fromMatrix() {
-    $kernel = createFromMatrix();
-    $imagick = renderKernel($kernel);
-
-    header("Content-Type: image/png");
-    echo $imagick->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickkernel/getmatrix.xml b/reference/imagick/imagickkernel/getmatrix.xml
deleted file mode 100644
index 574c498d3cde..000000000000
--- a/reference/imagick/imagickkernel/getmatrix.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.getmatrix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::getMatrix</refname>
-  <refpurpose>Get the 2d matrix of values used in this kernel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickKernel::getMatrix</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the 2d matrix of values used in this kernel. The elements are either
-   float for elements that are used or 'false' if the element should be skipped.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A matrix (2d array) of the values that represent the kernel.
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::getMatrix</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-
-function renderKernelTable($matrix) {
-    $output = "<table class='infoTable'>";
-
-    foreach ($matrix as $row) {
-        $output .= "<tr>";
-        foreach ($row as $cell) {
-            $output .= "<td style='text-align:left'>";
-            if ($cell === false) {
-                $output .= "false";
-            }
-            else {
-                $output .= round($cell, 3);
-            }
-            $output .= "</td>";
-        }
-        $output .= "</tr>";
-    }
-
-    $output .= "</table>";
-
-    return $output;
-}
-
-    $output = "The built-in kernel name 'ring' with parameters of '2,3.5':<br/>";
-    $kernel = \ImagickKernel::fromBuiltIn(
-        \Imagick::KERNEL_RING,
-        "2,3.5"
-    );
-    $matrix = $kernel->getMatrix();
-    $output .= renderKernelTable($matrix);
-
-    echo $output;
-
-?>
-]]>
-      </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/imagick/imagickkernel/scale.xml b/reference/imagick/imagickkernel/scale.xml
deleted file mode 100644
index 41ab37f0c700..000000000000
--- a/reference/imagick/imagickkernel/scale.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.scale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::scale</refname>
-  <refpurpose>Scales a kernel list by the given amount</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>ImagickKernel::scale</methodname>
-   <methodparam><type>float</type><parameter>scale</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>normalizeFlag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scales the given kernel list by the given amount, with or without
-   normalization of the sum of the kernel values (as per given flags).
-
-   The exact behaviour of this function depends on the normalization type being used
-   please see http://www.imagemagick.org/api/morphology.php#ScaleKernelInfo for details.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <para>
-
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>normalizeFlag</parameter></term>
-     <listitem>
-      <para>
-       <simplelist>
-        <member>Imagick::NORMALIZE_KERNEL_NONE</member>
-        <member>Imagick::NORMALIZE_KERNEL_VALUE</member>
-        <member>Imagick::NORMALIZE_KERNEL_CORRELATE</member>
-        <member>Imagick::NORMALIZE_KERNEL_PERCENT</member>
-       </simplelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::scale</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-
-    function renderKernelTable($matrix) {
-        $output = "<table class='infoTable'>";
-    
-        foreach ($matrix as $row) {
-            $output .= "<tr>";
-            foreach ($row as $cell) {
-                $output .= "<td style='text-align:left'>";
-                if ($cell === false) {
-                    $output .= "false";
-                }
-                else {
-                    $output .= round($cell, 3);
-                }
-                $output .= "</td>";
-            }
-            $output .= "</tr>";
-        }
-    
-        $output .= "</table>";
-    
-        return $output;
-    }
-
-
-    $output = "";
-    
-    $matrix = [
-        [-1, 0, -1],
-        [ 0, 4,  0],
-        [-1, 0, -1],
-    ];
-
-    $kernel = \ImagickKernel::fromMatrix($matrix);
-    $kernelClone = clone $kernel;
-
-    $output .= "Start kernel<br/>";
-    $output .= renderKernelTable($kernel->getMatrix());
-    
-    
-    $output .= "Scaling with NORMALIZE_KERNEL_VALUE. The  <br/>";
-    $kernel->scale(2, \Imagick::NORMALIZE_KERNEL_VALUE);
-    $output .= renderKernelTable($kernel->getMatrix());
-
-
-    $kernel = clone $kernelClone;
-    $output .= "Scaling by percent<br/>";
-    $kernel->scale(2, \Imagick::NORMALIZE_KERNEL_PERCENT);
-    $output .= renderKernelTable($kernel->getMatrix());
-    
-    $matrix2 = [
-        [-1, -1, 1],
-        [ -1, false,  1],
-        [1, 1, 1],
-    ];
-    
-    $kernel = \ImagickKernel::fromMatrix($matrix2);
-    $output .= "Scaling by correlate<br/>";
-    $kernel->scale(1, \Imagick::NORMALIZE_KERNEL_CORRELATE);
-    $output .= renderKernelTable($kernel->getMatrix());
-
-    return $output; 
-?>
-]]>
-      </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/imagick/imagickkernel/separate.xml b/reference/imagick/imagickkernel/separate.xml
deleted file mode 100644
index 40fe0beb0e31..000000000000
--- a/reference/imagick/imagickkernel/separate.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickkernel.separate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickKernel::separate</refname>
-  <refpurpose>Separates a linked set of kernels and returns an array of ImagickKernels</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickKernel::separate</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Separates a linked set of kernels and returns an array of ImagickKernels.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickKernel::separate</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-
-
-    
-    function renderKernelTable($matrix) {
-
-        $output = "<table class='infoTable'>";
-        foreach ($matrix as $row) {
-            $output .= "<tr>";
-            foreach ($row as $cell) {
-                $output .= "<td style='text-align:left'>";
-                if ($cell === false) {
-                    $output .= "false";
-                }
-                else {
-                    $output .= round($cell, 3);
-                }
-                $output .= "</td>";
-            }
-            $output .= "</tr>";
-        }
-    
-        $output .= "</table>";
-    
-        return $output;
-    }
-
-
-    $matrix = [
-        [-1, 0, -1],
-        [ 0, 4,  0],
-        [-1, 0, -1],
-    ];
-
-    $kernel = \ImagickKernel::fromMatrix($matrix);
-    $kernel->scale(4, \Imagick::NORMALIZE_KERNEL_VALUE);
-    $diamondKernel = \ImagickKernel::fromBuiltIn(
-        \Imagick::KERNEL_DIAMOND,
-        "2"
-    );
-
-    $kernel->addKernel($diamondKernel);
-    
-    $kernelList = $kernel->separate();
-    
-    $output = '';
-    $count = 0;
-    foreach ($kernelList as $kernel) {
-        $output .= "<br/>Kernel $count<br/>";
-        $output .= renderKernelTable($kernel->getMatrix());
-        $count++;
-    }
-
-    return $output;
-
-?>
-]]>
-      </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/imagick/imagickkernelexception.xml b/reference/imagick/imagickkernelexception.xml
deleted file mode 100644
index 712bf1e9e17b..000000000000
--- a/reference/imagick/imagickkernelexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.imagickkernelexception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ImagickKernelException class</title>
- <titleabbrev>ImagickKernelException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickKernelException intro -->
-  <section xml:id="imagickkernelexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickkernelexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ImagickKernelException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickKernelException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/imagick/imagickpixel.xml b/reference/imagick/imagickpixel.xml
deleted file mode 100644
index 699686f4bae6..000000000000
--- a/reference/imagick/imagickpixel.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference role="class" xml:id="class.imagickpixel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The <classname>ImagickPixel</classname> class</title>
- <titleabbrev>ImagickPixel</titleabbrev>
- <partintro>
-  <section xml:id="imagickpixel.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>ImagickPixel</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass><classname>ImagickPixel</classname></ooclass>
-    </classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickpixel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-  </section>
- </partintro>
- &reference.imagick.entities.imagickpixel;
-</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/imagick/imagickpixel/clear.xml b/reference/imagick/imagickpixel/clear.xml
deleted file mode 100644
index 6257adef10d9..000000000000
--- a/reference/imagick/imagickpixel/clear.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.clear">
- <refnamediv>
-  <refname>ImagickPixel::clear</refname>
-  <refpurpose>Clears resources associated with this object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Clears the ImagickPixel object, leaving it in a fresh state. This also
-   unsets any color associated with the object.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixel/construct.xml b/reference/imagick/imagickpixel/construct.xml
deleted file mode 100644
index 59e249d52fdd..000000000000
--- a/reference/imagick/imagickpixel/construct.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.construct">
- <refnamediv>
-  <refname>ImagickPixel::__construct</refname>
-  <refpurpose>The ImagickPixel constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>ImagickPixel::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Constructs an ImagickPixel object. If a color is specified, the object is
-   constructed and then initialised with that color before being returned.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The optional color string to use as the initial value of this object.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an ImagickPixel object on success, throwing ImagickPixelException on
-   failure.
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixel::construct</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function construct() {
-
-    $columns = 4;
-    
-    $exampleColors = array(
-        "rgba(100%, 0%, 0%, 0.5)",
-        "hsb(33.3333%, 100%,  75%)", // medium green
-        "hsl(120, 255,   191.25)", //medium green
-        "graya(50%, 0.5)", //  semi-transparent mid gray
-        "LightCoral", "none", //"cmyk(0.9, 0.48, 0.83, 0.50)",
-        "#f00", //  #rgb
-        "#ff0000", //  #rrggbb
-        "#ff0000ff", //  #rrggbbaa
-        "#ffff00000000", //  #rrrrggggbbbb
-        "#ffff00000000ffff", //  #rrrrggggbbbbaaaa
-        "rgb(255, 0, 0)", //  an integer in the range 0—255 for each component
-        "rgb(100.0%, 0.0%, 0.0%)", //  a float in the range 0—100% for each component
-        "rgb(255, 0, 0)", //  range 0 - 255
-        "rgba(255, 0, 0, 1.0)", //  the same, with an explicit alpha value
-        "rgb(100%, 0%, 0%)", //  range 0.0% - 100.0%
-        "rgba(100%, 0%, 0%, 1.0)", //  the same, with an explicit alpha value
-    );
-
-    $draw = new \ImagickDraw();
-    $count = 0;
-    $black = new \ImagickPixel('rgb(0, 0, 0)');
-
-    foreach ($exampleColors as $exampleColor) {
-        $color = new \ImagickPixel($exampleColor);
-
-        $draw->setstrokewidth(1.0);
-        $draw->setStrokeColor($black);
-        $draw->setFillColor($color);
-        $offsetX = ($count % $columns) * 50 + 5;
-        $offsetY = intval($count / $columns) * 50 + 5;
-        $draw->rectangle(0 + $offsetX, 0 + $offsetY, 40 + $offsetX, 40 + $offsetY);
-        $count++;
-    }
-
-    $image = new \Imagick();
-    $image->newImage(350, 350, "blue");
-    $image->setImageFormat("png");
-    $image->drawImage($draw);
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickpixel/destroy.xml b/reference/imagick/imagickpixel/destroy.xml
deleted file mode 100644
index 1a45dae91947..000000000000
--- a/reference/imagick/imagickpixel/destroy.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.destroy">
- <refnamediv>
-  <refname>ImagickPixel::destroy</refname>
-  <refpurpose>Deallocates resources associated with this object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::destroy</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Deallocates any resources used by the ImagickPixel object, and unsets any
-   associated color. The object should not be used after the destroy function
-   has been called.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixel/getcolor.xml b/reference/imagick/imagickpixel/getcolor.xml
deleted file mode 100644
index 7bd38098f945..000000000000
--- a/reference/imagick/imagickpixel/getcolor.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.getcolor">
- <refnamediv>
-  <refname>ImagickPixel::getColor</refname>
-  <refpurpose>Returns the color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixel::getColor</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>normalized</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the color described by the ImagickPixel object, as an array. If the color has an
-   opacity channel set, this is provided as a fourth value in the list.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>normalized</parameter></term>
-     <listitem>
-      <para>
-       Normalize the color values. Possible values are <literal>0</literal>,
-       <literal>1</literal> or <literal>2</literal>.
-      </para>
-
-      <table>
-       <title>
-        List of possible values for <parameter>normalized</parameter>
-       </title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry><parameter>normalized</parameter></entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>
-           <literal>0</literal>
-          </entry>
-          <entry>
-           The RGB values are returned as <type>int</type>s in the range <literal>0</literal>
-           to <literal>255</literal> (inclusive.)
-           The alpha value is returned as <type>int</type> and is either <literal>0</literal>
-           or <literal>1</literal>.
-          </entry>
-         </row>
-         <row>
-          <entry>
-           <literal>1</literal>
-          </entry>
-          <entry>
-           The RGBA values are returned as <type>float</type>s in the range <literal>0</literal>
-           to <literal>1</literal> (inclusive.)
-          </entry>
-         </row>
-         <row>
-          <entry>
-           <literal>2</literal>
-          </entry>
-          <entry>
-           The RGBA values are returned as <type>int</type>s in the range <literal>0</literal>
-           to <literal>255</literal> (inclusive.)
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of channel values. Throws ImagickPixelException on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::getColor</function> usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-//Create an ImagickPixel with the predefined color 'brown'
-$color = new ImagickPixel('brown');
-
-//Set the color to have an alpha of 25%
-$color->setColorValue(Imagick::COLOR_ALPHA, 64 / 256.0);
-
-$colorInfo = $color->getColor();
-
-echo "Standard values".PHP_EOL;
-print_r($colorInfo);
-
-$colorInfo = $color->getColor(1);
-
-echo "Normalized values:".PHP_EOL;
-print_r($colorInfo);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-    <![CDATA[
-Standard values
-Array
-(
-    [r] => 165
-    [g] => 42
-    [b] => 42
-    [a] => 0
-)
-Normalized values:
-Array
-(
-    [r] => 0.64705882352941
-    [g] => 0.16470588235294
-    [b] => 0.16470588235294
-    [a] => 0.25000381475547
-)
-    ]]>
-    </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/imagick/imagickpixel/getcolorasstring.xml b/reference/imagick/imagickpixel/getcolorasstring.xml
deleted file mode 100644
index d8ebf44c11fc..000000000000
--- a/reference/imagick/imagickpixel/getcolorasstring.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.getcolorasstring">
- <refnamediv>
-  <refname>ImagickPixel::getColorAsString</refname>
-  <refpurpose>Returns the color as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ImagickPixel::getColorAsString</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the color of the ImagickPixel object as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the color of the ImagickPixel object as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::getColorAsString</function> usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-//Create an ImagickPixel with the predefined color 'brown'
-$color = new ImagickPixel('brown');
-
-$color->setColorValue(Imagick::COLOR_ALPHA, 64 / 256.0);
-
-$colorInfo = $color->getColorAsString();
-
-print_r($colorInfo);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-rgb(165,42,42)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Alpha not returned</title>
-   <para>
-      This function does not return the alpha value of the color in the string.
-   </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/imagick/imagickpixel/getcolorcount.xml b/reference/imagick/imagickpixel/getcolorcount.xml
deleted file mode 100644
index 8c091ec431bb..000000000000
--- a/reference/imagick/imagickpixel/getcolorcount.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.getcolorcount">
- <refnamediv>
-  <refname>ImagickPixel::getColorCount</refname>
-  <refpurpose>Returns the color count associated with this color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickPixel::getColorCount</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the color count associated with this color.
-  </para>
-  <para>The color count is the number of pixels in the image that have the same color as this ImagickPixel.
-  </para>
-  <para>
-   ImagickPixel::getColorCount appears to only work for ImagickPixel objects created through Imagick::getImageHistogram()
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the color count as an integer on success, throws
-  ImagickPixelException on failure.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-      <title>ImagickPixel <function>getColorCount</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-    $imagick = new \Imagick();
-    $imagick->newPseudoImage(640, 480, "magick:logo");
-    $histogramElements = $imagick->getImageHistogram();
-    $lastColor = array_pop($histogramElements);
-    echo "Last pixel color count is: ".$lastColor->getColorCount();
-?>
-]]>
-      </programlisting>
-        <para>
-The output for this will be similar to:
-    </para>
-    <screen role="php">
-<![CDATA[
-Last pixel color count is: 256244
-]]>
-    </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/imagick/imagickpixel/getcolorquantum.xml b/reference/imagick/imagickpixel/getcolorquantum.xml
deleted file mode 100644
index c2d479e8cc4c..000000000000
--- a/reference/imagick/imagickpixel/getcolorquantum.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.getcolorquantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::getColorQuantum</refname>
-  <refpurpose>Returns the color of the pixel in an array as Quantum values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixel::getColorQuantum</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the color of the pixel in an array as Quantum values. If ImageMagick was compiled
-   as HDRI these will be floats, otherwise they will be integers.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with keys <literal>"r"</literal>, <literal>"g"</literal>,
-   <literal>"b"</literal>, <literal>"a"</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/imagick/imagickpixel/getcolorvalue.xml b/reference/imagick/imagickpixel/getcolorvalue.xml
deleted file mode 100644
index e47179bda350..000000000000
--- a/reference/imagick/imagickpixel/getcolorvalue.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.getcolorvalue">
- <refnamediv>
-  <refname>ImagickPixel::getColorValue</refname>
-  <refpurpose>Gets the normalized value of the provided color channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>ImagickPixel::getColorValue</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves the value of the color channel specified, as a floating-point
-   number between 0 and 1.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The color to get the value of, specified as one of the Imagick color
-       constants. This can be one of the RGB colors, CMYK colors, alpha and
-       opacity e.g (Imagick::COLOR_BLUE, Imagick::COLOR_MAGENTA).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The value of the channel, as a normalized floating-point number, throwing
-   ImagickPixelException on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::getColorValue</function> usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-    
-$color = new ImagickPixel('rgba(90%, 20%, 20%, 0.75)');
-
-echo "Alpha value is ".$color->getColorValue(Imagick::COLOR_ALPHA).PHP_EOL;
-echo "".PHP_EOL;
-echo "Red value is ".$color->getColorValue(Imagick::COLOR_RED).PHP_EOL;
-echo "Green value is ".$color->getColorValue(Imagick::COLOR_GREEN).PHP_EOL;
-echo "Blue value is ".$color->getColorValue(Imagick::COLOR_BLUE).PHP_EOL;
-echo "".PHP_EOL;
-echo "Cyan value is ".$color->getColorValue(Imagick::COLOR_CYAN).PHP_EOL;
-echo "Magenta value is ".$color->getColorValue(Imagick::COLOR_MAGENTA).PHP_EOL;
-echo "Yellow value is ".$color->getColorValue(Imagick::COLOR_YELLOW).PHP_EOL;
-echo "Black value is ".$color->getColorValue(Imagick::COLOR_BLACK).PHP_EOL;
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Alpha value is 0.74999618524453
-
-Red value is 0.90000762951095
-Green value is 0.2
-Blue value is 0.2
-
-Cyan value is 0.90000762951095
-Magenta value is 0.2
-Yellow value is 0.2
-Black value is 0
-]]>
-    </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/imagick/imagickpixel/getcolorvaluequantum.xml b/reference/imagick/imagickpixel/getcolorvaluequantum.xml
deleted file mode 100644
index bee7eb3cb506..000000000000
--- a/reference/imagick/imagickpixel/getcolorvaluequantum.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.getcolorvaluequantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::getColorValueQuantum</refname>
-  <refpurpose>Gets the quantum value of a color in the ImagickPixel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>float</type></type><methodname>ImagickPixel::getColorValueQuantum</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the quantum value of a color in the ImagickPixel. Return value is a float if ImageMagick was compiled with HDRI, otherwise an integer.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The quantum value of the color element. Float if ImageMagick was compiled with HDRI, otherwise an int.
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixel::getColorValueQuantum</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        $color = new \ImagickPixel('rgb(128, 5, 255)');
-        $colorRed = $color->getColorValueQuantum(\Imagick::COLOR_RED);
-        $colorGreen = $color->getColorValueQuantum(\Imagick::COLOR_GREEN);
-        $colorBlue = $color->getColorValueQuantum(\Imagick::COLOR_BLUE);
-        $colorAlpha = $color->getColorValueQuantum(\Imagick::COLOR_ALPHA);
-
-        printf(
-            "Red: %s Green: %s  Blue %s Alpha: %s",
-            $colorRed,
-            $colorGreen,
-            $colorBlue,
-            $colorAlpha
-        );
-
-?>
-]]>
-      </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/imagick/imagickpixel/gethsl.xml b/reference/imagick/imagickpixel/gethsl.xml
deleted file mode 100644
index 48fff13df9eb..000000000000
--- a/reference/imagick/imagickpixel/gethsl.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.gethsl">
- <refnamediv>
-  <refname>ImagickPixel::getHSL</refname>
-  <refpurpose>Returns the normalized HSL color of the ImagickPixel object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixel::getHSL</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Returns the normalized HSL color described by the ImagickPixel object,
-   with each of the three values as floating point numbers between 0.0
-   and 1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the HSL value in an array with the keys "hue",
-   "saturation", and "luminosity". Throws ImagickPixelException on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::getHSL</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$color = new ImagickPixel('rgb(90%, 10%, 10%)');
-
-$colorInfo = $color->getHSL();
-
-print_r($colorInfo);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [hue] => 0
-    [saturation] => 0.80001220740379
-    [luminosity] => 0.50000762951095
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Available with ImageMagick library version 6.2.9 and higher.
-   </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/imagick/imagickpixel/getindex.xml b/reference/imagick/imagickpixel/getindex.xml
deleted file mode 100644
index 73eeacb2530e..000000000000
--- a/reference/imagick/imagickpixel/getindex.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.getindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::getIndex</refname>
-  <refpurpose>Gets the colormap index of the pixel wand</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickPixel::getIndex</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the colormap index of the pixel wand.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixel/ispixelsimilar.xml b/reference/imagick/imagickpixel/ispixelsimilar.xml
deleted file mode 100644
index bffea0051043..000000000000
--- a/reference/imagick/imagickpixel/ispixelsimilar.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.ispixelsimilar">
- <refnamediv>
-  <refname>ImagickPixel::isPixelSimilar</refname>
-  <refpurpose>Check the distance between this color and another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::isPixelSimilar</methodname>
-   <methodparam><type>ImagickPixel</type><parameter>color</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks the distance between the color described by this ImagickPixel
-   object and that of the provided object, by plotting their RGB values
-   on the color cube. If the distance between the two points is less than
-   the fuzz value given, the colors are similar.
-   This method replaces <link linkend="imagickpixel.issimilar">ImagickPixel::isSimilar()</link>
-   and correctly normalises the fuzz value to ImageMagick QuantumRange.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The ImagickPixel object to compare this object against.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The maximum distance within which to consider these colors as similar.
-       The theoretical maximum for this value is the square root of three
-       (1.732).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixel/ispixelsimilarquantum.xml b/reference/imagick/imagickpixel/ispixelsimilarquantum.xml
deleted file mode 100644
index a7938489cf6e..000000000000
--- a/reference/imagick/imagickpixel/ispixelsimilarquantum.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.ispixelsimilarquantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::isPixelSimilarQuantum</refname>
-  <refpurpose>Returns whether two colors differ by less than the specified distance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::isPixelSimilarQuantum</methodname>
-   <methodparam><type>string</type><parameter>color</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns true if the distance between two colors is less than the specified distance.
-   The fuzz value should be in the range 0-QuantumRange.
-   The maximum value represents the longest possible distance in the colorspace.
-   e.g. from RGB(0, 0, 0) to RGB(255, 255, 255) for the RGB colorspace
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fuzz</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixel/issimilar.xml b/reference/imagick/imagickpixel/issimilar.xml
deleted file mode 100644
index 9d553ccf0d8e..000000000000
--- a/reference/imagick/imagickpixel/issimilar.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.issimilar">
- <refnamediv>
-  <refname>ImagickPixel::isSimilar</refname>
-  <refpurpose>Check the distance between this color and another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::isSimilar</methodname>
-   <methodparam><type>ImagickPixel</type><parameter>color</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fuzz</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Checks the distance between the color described by this ImagickPixel
-   object and that of the provided object, by plotting their RGB values
-   on the color cube. If the distance between the two points is less than
-   the fuzz value given, the colors are similar.
-   Deprecated in favour of <link linkend="imagickpixel.ispixelsimilar">ImagickPixel::isPixelSimilar()</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The ImagickPixel object to compare this object against.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fuzz</parameter></term>
-     <listitem>
-      <para>
-       The maximum distance within which to consider these colors as similar.
-       The theoretical maximum for this value is the square root of three
-       (1.732).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixel::isSimilar</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-        // The tests below are written with the maximum distance expressed as 255
-        // so we need to scale them by the square root of 3 - the diagonal length
-        // of a unit cube.
-        $root3 = 1.732050807568877;
-
-        $tests = array(
-            ['rgb(245, 0, 0)',      'rgb(255, 0, 0)',   9 / $root3,         false,],
-            ['rgb(245, 0, 0)',      'rgb(255, 0, 0)',  10 / $root3,         true,],
-            ['rgb(0, 0, 0)',        'rgb(7, 7, 0)',     9 / $root3,         false,],
-            ['rgb(0, 0, 0)',        'rgb(7, 7, 0)',    10 / $root3,         true,],
-            ['rgba(0, 0, 0, 1)',    'rgba(7, 7, 0, 1)', 9 / $root3,         false,],
-            ['rgba(0, 0, 0, 1)',    'rgba(7, 7, 0, 1)',    10 / $root3,     true,],
-            ['rgb(128, 128, 128)',  'rgb(128, 128, 120)',   7 / $root3,     false,],
-            ['rgb(128, 128, 128)',  'rgb(128, 128, 120)',   8 / $root3,     true,],
-            ['rgb(0, 0, 0)',        'rgb(255, 255, 255)',   254.9,          false,],
-            ['rgb(0, 0, 0)',        'rgb(255, 255, 255)',   255,            true,],
-            ['rgb(255, 0, 0)',      'rgb(0, 255, 255)',     254.9,          false,],
-            ['rgb(255, 0, 0)',      'rgb(0, 255, 255)',     255,            true,],
-            ['black',               'rgba(0, 0, 0)',        0.0,            true],
-            ['black',               'rgba(10, 0, 0, 1.0)',  10.0 / $root3,  true],);
-
-        $output = "<table width='100%' class='infoTable'><thead>
-                <tr>
-                <th>
-                Color 1
-                </th>
-                <th>
-                Color 2
-                </th>
-                <th>
-                    Test distance * 255
-                </th>
-                <th>
-                    Is within distance
-                </th>
-                </tr>
-        </thead>";
-
-        $output .= "<tbody>";
-
-        foreach ($tests as $testInfo) {
-            $color1 = $testInfo[0];
-            $color2 = $testInfo[1];
-            $distance = $testInfo[2];
-            $expectation = $testInfo[3];
-            $testDistance = ($distance / 255.0);
-
-            $color1Pixel = new \ImagickPixel($color1);
-            $color2Pixel = new \ImagickPixel($color2);
-
-            $isSimilar = $color1Pixel->isPixelSimilar($color2Pixel, $testDistance);
-
-
-            if ($isSimilar !== $expectation) {
-                echo "Test distance failed. Color [$color1] compared to color [$color2] is not within distance $testDistance FAILED.".NL;
-            }
-
-            $layout = "<tr>
-                <td>%s</td>
-                <td>%s</td>
-                <td>%s</td>
-                <td style='text-align: center;'>%s</td>
-            </tr>";
-            
-            $output .= sprintf(
-                $layout,
-                $color1,
-                $color2,
-                $distance,
-                $isSimilar ? 'yes' : 'no'
-            );
-        }
-
-        $output .= "</tbody></table>";
-        
-        return $output;
-
-?>
-]]>
-      </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/imagick/imagickpixel/setcolor.xml b/reference/imagick/imagickpixel/setcolor.xml
deleted file mode 100644
index 2bc18b3e4401..000000000000
--- a/reference/imagick/imagickpixel/setcolor.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.setcolor">
- <refnamediv>
-  <refname>ImagickPixel::setColor</refname>
-  <refpurpose>Sets the color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setColor</methodname>
-   <methodparam><type>string</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the color described by the ImagickPixel object, with a string
-   (e.g. "blue", "#0000ff", "rgb(0,0,255)", "cmyk(100,100,100,10)", etc.).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       The color definition to use in order to initialise the
-       ImagickPixel object.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns &true; if the specified color was set, &false; otherwise.
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixel::setColor</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setColor() {
-    $draw = new \ImagickDraw();
-
-    $strokeColor = new \ImagickPixel('green');
-    $fillColor = new \ImagickPixel();
-    $fillColor->setColor('rgba(100%, 75%, 0%, 1.0)');
-
-    $draw->setstrokewidth(3.0);
-    $draw->setStrokeColor($strokeColor);
-    $draw->setFillColor($fillColor);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $image = new \Imagick();
-    $image->newImage(500, 500, "SteelBlue2");
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickpixel/setcolorcount.xml b/reference/imagick/imagickpixel/setcolorcount.xml
deleted file mode 100644
index 6c32bfac6ef8..000000000000
--- a/reference/imagick/imagickpixel/setcolorcount.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.setcolorcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::setColorCount</refname>
-  <refpurpose>Sets the color count associated with this color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setcolorcount</methodname>
-   <methodparam><type>int</type><parameter>colorCount</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the color count associated with this color.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>colorCount</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixel/setcolorvalue.xml b/reference/imagick/imagickpixel/setcolorvalue.xml
deleted file mode 100644
index d28d35cf3924..000000000000
--- a/reference/imagick/imagickpixel/setcolorvalue.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.setcolorvalue">
- <refnamediv>
-  <refname>ImagickPixel::setColorValue</refname>
-  <refpurpose>Sets the normalized value of one of the channels</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setColorValue</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <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 an ImagickPixel object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>color</parameter></term>
-     <listitem>
-      <para>
-       One of the Imagick color constants e.g. \Imagick::COLOR_GREEN or \Imagick::COLOR_ALPHA.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value to set this channel to, ranging from 0 to 1.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic <function>Imagick::setColorValue</function> usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$color  = new \ImagickPixel('firebrick');
-
-$color->setColorValue(Imagick::COLOR_ALPHA, 0.5);
-
-print_r($color->getcolor(true));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [r] => 0.69803921568627
-    [g] => 0.13333333333333
-    [b] => 0.13333333333333
-    [a] => 0.50000762951095
-)
-]]>
-    </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/imagick/imagickpixel/setcolorvaluequantum.xml b/reference/imagick/imagickpixel/setcolorvaluequantum.xml
deleted file mode 100644
index c70c3adeec0a..000000000000
--- a/reference/imagick/imagickpixel/setcolorvaluequantum.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.setcolorvaluequantum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::setColorValueQuantum</refname>
-  <refpurpose>Sets the quantum value of a color element of the ImagickPixel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setColorValueQuantum</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>float</type></type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the quantum value of a color element of the ImagickPixel.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      Which color element to set e.g. \Imagick::COLOR_GREEN.
-     </para>
-    </listitem>
-   </varlistentry>
-
-
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The quantum value to set the color element to. This should be a float if ImageMagick was compiled with HDRI otherwise an int in the range 0 to Imagick::getQuantum().
-     </para>
-    </listitem>
-   </varlistentry>
-   
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixel::setColorValueQuantum</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setColorValueQuantum() {
-    $image = new \Imagick();
-
-    $quantumRange = $image->getQuantumRange();
-
-    $draw = new \ImagickDraw();
-    $color = new \ImagickPixel('blue');
-    $color->setcolorValueQuantum(\Imagick::COLOR_RED, 128 * $quantumRange['quantumRangeLong'] / 256);
-
-    $draw->setstrokewidth(1.0);
-    $draw->setStrokeColor($color);
-    $draw->setFillColor($color);
-    $draw->rectangle(200, 200, 300, 300);
-
-    $image->newImage(500, 500, "SteelBlue2");
-    $image->setImageFormat("png");
-
-    $image->drawImage($draw);
-
-    header("Content-Type: image/png");
-    echo $image->getImageBlob();
-}
-
-?>
-]]>
-      </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/imagick/imagickpixel/sethsl.xml b/reference/imagick/imagickpixel/sethsl.xml
deleted file mode 100644
index 492b10cd0efc..000000000000
--- a/reference/imagick/imagickpixel/sethsl.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixel.sethsl">
- <refnamediv>
-  <refname>ImagickPixel::setHSL</refname>
-  <refpurpose>Sets the normalized HSL color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setHSL</methodname>
-   <methodparam><type>float</type><parameter>hue</parameter></methodparam>
-   <methodparam><type>float</type><parameter>saturation</parameter></methodparam>
-   <methodparam><type>float</type><parameter>luminosity</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the color described by the ImagickPixel object using normalized
-   values for hue, saturation and luminosity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>hue</parameter></term>
-     <listitem>
-      <para>
-       The normalized value for hue, described as a fractional arc
-       (between 0 and 1) of the hue circle, where the zero value is
-       red.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>saturation</parameter></term>
-     <listitem>
-      <para>
-       The normalized value for saturation, with 1 as full saturation.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>luminosity</parameter></term>
-     <listitem>
-      <para>
-       The normalized value for luminosity, on a scale from black at
-       0 to white at 1, with the full HS value at 0.5 luminosity.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Use <function>ImagickPixel::setHSL</function> to modify a color</title>
-    <programlisting role="php">
-        <![CDATA[
-<?php
-
-//Create an almost pure red color
-$color = new ImagickPixel('rgb(90%, 10%, 10%)');
-
-//Get it's HSL values
-$colorInfo = $color->getHSL();
-
-//Rotate the hue by 180 degrees
-$newHue = $colorInfo['hue'] + 0.5;
-if ($newHue > 1) {
-    $newHue = $newHue - 1;
-}
-
-//Set the ImagickPixel to the new color
-$colorInfo = $color->setHSL($newHue, $colorInfo['saturation'], $colorInfo['luminosity']);
-
-//Check that the new color is blue/green
-$colorInfo = $color->getcolor();
-print_r($colorInfo);
-
-?>
-        ]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [r] => 26
-    [g] => 230
-    [b] => 230
-    [a] => 255
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Available with ImageMagick library version 6.2.9 and higher.
-   </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/imagick/imagickpixel/setindex.xml b/reference/imagick/imagickpixel/setindex.xml
deleted file mode 100644
index 0a2dec909c20..000000000000
--- a/reference/imagick/imagickpixel/setindex.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="imagickpixel.setindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ImagickPixel::setIndex</refname>
-  <refpurpose>Sets the colormap index of the pixel wand</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixel::setIndex</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the colormap index of the pixel wand.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixelexception.xml b/reference/imagick/imagickpixelexception.xml
deleted file mode 100644
index f2cb22a4359c..000000000000
--- a/reference/imagick/imagickpixelexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference role="exception" xml:id="class.imagickpixelexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The ImagickPixelException class</title>
- <titleabbrev>ImagickPixelException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickPixelException intro -->
-  <section xml:id="imagickpixelexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickpixelexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>ImagickPixelException</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickPixelException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/imagick/imagickpixeliterator.xml b/reference/imagick/imagickpixeliterator.xml
deleted file mode 100644
index ee49a611484e..000000000000
--- a/reference/imagick/imagickpixeliterator.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference role="class" xml:id="class.imagickpixeliterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The <classname>ImagickPixelIterator</classname> class</title>
- <titleabbrev>ImagickPixelIterator</titleabbrev>
- <partintro>
-  <section xml:id="imagickpixeliterator.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>ImagickPixelIterator</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass><classname>ImagickPixelIterator</classname></ooclass>
-    </classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.imagickpixeliterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-  </section>
- </partintro>
- &reference.imagick.entities.imagickpixeliterator;
-</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/imagick/imagickpixeliterator/clear.xml b/reference/imagick/imagickpixeliterator/clear.xml
deleted file mode 100644
index 49a29b06dfa4..000000000000
--- a/reference/imagick/imagickpixeliterator/clear.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.clear">
- <refnamediv>
-  <refname>ImagickPixelIterator::clear</refname>
-  <refpurpose>Clear resources associated with a PixelIterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Clear resources associated with a PixelIterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixelIterator::clear</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function clear($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imageIterator = $imagick->getPixelRegionIterator(100, 100, 250, 200);
-
-    /* Loop through pixel rows */
-    foreach ($imageIterator as $pixels) { 
-        /** @var $pixel \ImagickPixel */
-        /* Loop through the pixels in the row (columns) */
-        foreach ($pixels as $column => $pixel) { 
-            if ($column % 2) {
-                /* Paint every second pixel black*/
-                $pixel->setColor("rgba(0, 0, 0, 0)"); 
-            }
-        }
-        /* Sync the iterator, this is important to do on each iteration */
-        $imageIterator->syncIterator();
-    }
-
-    $imageIterator->clear();
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagickpixeliterator/construct.xml b/reference/imagick/imagickpixeliterator/construct.xml
deleted file mode 100644
index 5044d7fee92c..000000000000
--- a/reference/imagick/imagickpixeliterator/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.construct">
- <refnamediv>
-  <refname>ImagickPixelIterator::__construct</refname>
-  <refpurpose>The ImagickPixelIterator constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>ImagickPixelIterator::__construct</methodname>
-   <methodparam><type>Imagick</type><parameter>wand</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   The ImagickPixelIterator constructor
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixelIterator::construct</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function construct($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imageIterator = new \ImagickPixelIterator($imagick);
-
-    /* Loop through pixel rows */
-    foreach ($imageIterator as $pixels) { 
-        /* Loop through the pixels in the row (columns) */
-        foreach ($pixels as $column => $pixel) { 
-            /** @var $pixel \ImagickPixel */
-            if ($column % 2) {
-                /* Paint every second pixel black*/
-                $pixel->setColor("rgba(0, 0, 0, 0)");
-            }
-        }
-        /* Sync the iterator, this is important to do on each iteration */
-        $imageIterator->syncIterator();
-    }
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagickpixeliterator/destroy.xml b/reference/imagick/imagickpixeliterator/destroy.xml
deleted file mode 100644
index c8ca29ce0f26..000000000000
--- a/reference/imagick/imagickpixeliterator/destroy.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.destroy">
- <refnamediv>
-  <refname>ImagickPixelIterator::destroy</refname>
-  <refpurpose>Deallocates resources associated with a PixelIterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::destroy</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Deallocates resources associated with a PixelIterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixeliterator/getcurrentiteratorrow.xml b/reference/imagick/imagickpixeliterator/getcurrentiteratorrow.xml
deleted file mode 100644
index dab069089080..000000000000
--- a/reference/imagick/imagickpixeliterator/getcurrentiteratorrow.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.getcurrentiteratorrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::getCurrentIteratorRow</refname>
-  <refpurpose>Returns the current row of ImagickPixel objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixelIterator::getCurrentIteratorRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the current row as an array of ImagickPixel objects from the pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a row as an array of ImagickPixel objects that can themselves be 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/imagick/imagickpixeliterator/getiteratorrow.xml b/reference/imagick/imagickpixeliterator/getiteratorrow.xml
deleted file mode 100644
index 0c69227ca481..000000000000
--- a/reference/imagick/imagickpixeliterator/getiteratorrow.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.getiteratorrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::getIteratorRow</refname>
-  <refpurpose>Returns the current pixel iterator row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ImagickPixelIterator::getIteratorRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the current pixel iterator row.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the integer offset of the row, throwing
-   ImagickPixelIteratorException on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixeliterator/getnextiteratorrow.xml b/reference/imagick/imagickpixeliterator/getnextiteratorrow.xml
deleted file mode 100644
index a5bfbdb72321..000000000000
--- a/reference/imagick/imagickpixeliterator/getnextiteratorrow.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.getnextiteratorrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::getNextIteratorRow</refname>
-  <refpurpose>Returns the next row of the pixel iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixelIterator::getNextIteratorRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the next row as an array of pixel wands from the pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the next row as an array of ImagickPixel objects, throwing
-   ImagickPixelIteratorException on error.
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixelIterator::getNextIteratorRow</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function getNextIteratorRow($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imageIterator = $imagick->getPixelIterator();
-
-    $count = 0;
-    while ($pixels = $imageIterator->getNextIteratorRow()) {
-        if (($count % 3) == 0) {
-            /* Loop through the pixels in the row (columns) */
-            foreach ($pixels as $column => $pixel) { 
-                /** @var $pixel \ImagickPixel */
-                if ($column % 2) {
-                    /* Paint every second pixel black*/
-                    $pixel->setColor("rgba(0, 0, 0, 0)");
-                }
-            }
-            /* Sync the iterator, this is important to do on each iteration */
-            $imageIterator->syncIterator(); 
-        }
-
-        $count += 1;
-    }
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagickpixeliterator/getpreviousiteratorrow.xml b/reference/imagick/imagickpixeliterator/getpreviousiteratorrow.xml
deleted file mode 100644
index a976c6f14518..000000000000
--- a/reference/imagick/imagickpixeliterator/getpreviousiteratorrow.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.getpreviousiteratorrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::getPreviousIteratorRow</refname>
-  <refpurpose>Returns the previous row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ImagickPixelIterator::getPreviousIteratorRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns the previous row as an array of pixel wands from the pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the previous row as an array of ImagickPixelWand objects from the
-   ImagickPixelIterator, throwing ImagickPixelIteratorException on error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixeliterator/newpixeliterator.xml b/reference/imagick/imagickpixeliterator/newpixeliterator.xml
deleted file mode 100644
index d32e9b165208..000000000000
--- a/reference/imagick/imagickpixeliterator/newpixeliterator.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.newpixeliterator">
- <refnamediv>
-  <refname>ImagickPixelIterator::newPixelIterator</refname>
-  <refpurpose>Returns a new pixel iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::newPixelIterator</methodname>
-   <methodparam><type>Imagick</type><parameter>wand</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns a new pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success; Throwing ImagickPixelIteratorException.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixeliterator/newpixelregioniterator.xml b/reference/imagick/imagickpixeliterator/newpixelregioniterator.xml
deleted file mode 100644
index b7ed0771f054..000000000000
--- a/reference/imagick/imagickpixeliterator/newpixelregioniterator.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.newpixelregioniterator">
- <refnamediv>
-  <refname>ImagickPixelIterator::newPixelRegionIterator</refname>
-  <refpurpose>Returns a new pixel iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::newPixelRegionIterator</methodname>
-   <methodparam><type>Imagick</type><parameter>wand</parameter></methodparam>
-   <methodparam><type>int</type><parameter>x</parameter></methodparam>
-   <methodparam><type>int</type><parameter>y</parameter></methodparam>
-   <methodparam><type>int</type><parameter>columns</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Returns a new pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>wand</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>columns</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a new ImagickPixelIterator on success; on failure, throws
-   ImagickPixelIteratorException.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/imagick/imagickpixeliterator/resetiterator.xml b/reference/imagick/imagickpixeliterator/resetiterator.xml
deleted file mode 100644
index 2ac2f65e3fe9..000000000000
--- a/reference/imagick/imagickpixeliterator/resetiterator.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="imagickpixeliterator.resetiterator" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ImagickPixelIterator::resetIterator</refname>
-  <refpurpose>Resets the pixel iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::resetIterator</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Resets the pixel iterator.  Use it in conjunction with
-   ImagickPixelIterator::getNextIteratorRow() to iterate over all the pixels
-   in a pixel container.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixelIterator::resetIterator</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function resetIterator($imagePath) {
-
-    $imagick = new \Imagick(realpath($imagePath));
-
-    $imageIterator = $imagick->getPixelIterator();
-
-    /* Loop through pixel rows */
-    foreach ($imageIterator as $pixels) {
-        /* Loop through the pixels in the row (columns) */
-        foreach ($pixels as $column => $pixel) {
-            /** @var $pixel \ImagickPixel */
-            if ($column % 2) {
-
-                /* Make every second pixel 25% red*/
-                $pixel->setColorValue(\Imagick::COLOR_RED, 64); 
-            }
-        }
-        /* Sync the iterator, this is important to do on each iteration */
-        $imageIterator->syncIterator();
-    }
-
-    $imageIterator->resetiterator();
-
-    /* Loop through pixel rows */
-    foreach ($imageIterator as $pixels) {
-        /* Loop through the pixels in the row (columns) */
-        foreach ($pixels as $column => $pixel) {
-            /** @var $pixel \ImagickPixel */
-            if ($column % 3) {
-                $pixel->setColorValue(\Imagick::COLOR_BLUE, 64); /* Make every second pixel a little blue*/
-                //$pixel->setColor("rgba(0, 0, 128, 0)"); /* Paint every second pixel black*/
-            }
-        }
-        $imageIterator->syncIterator(); /* Sync the iterator, this is important to do on each iteration */
-    }
-
-    $imageIterator->clear();
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagickpixeliterator/setiteratorfirstrow.xml b/reference/imagick/imagickpixeliterator/setiteratorfirstrow.xml
deleted file mode 100644
index 0a445142663b..000000000000
--- a/reference/imagick/imagickpixeliterator/setiteratorfirstrow.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.setiteratorfirstrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::setIteratorFirstRow</refname>
-  <refpurpose>Sets the pixel iterator to the first pixel row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::setIteratorFirstRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the pixel iterator to the first pixel row.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixeliterator/setiteratorlastrow.xml b/reference/imagick/imagickpixeliterator/setiteratorlastrow.xml
deleted file mode 100644
index bfe368a4df7b..000000000000
--- a/reference/imagick/imagickpixeliterator/setiteratorlastrow.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.setiteratorlastrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::setIteratorLastRow</refname>
-  <refpurpose>Sets the pixel iterator to the last pixel row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::setIteratorLastRow</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Sets the pixel iterator to the last pixel row.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixeliterator/setiteratorrow.xml b/reference/imagick/imagickpixeliterator/setiteratorrow.xml
deleted file mode 100644
index 5198a8483db9..000000000000
--- a/reference/imagick/imagickpixeliterator/setiteratorrow.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.setiteratorrow">
- <refnamediv>
-  <refname>ImagickPixelIterator::setIteratorRow</refname>
-  <refpurpose>Set the pixel iterator row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::setIteratorRow</methodname>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Set the pixel iterator row.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>row</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.return.success;
-  </para>
- </refsect1>
-
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-    <example>
-      <title> <function>ImagickPixelIterator::setIteratorRow</function></title>
-      <programlisting role="php">
-      <![CDATA[
-<?php
-function setIteratorRow($imagePath) {
-    $imagick = new \Imagick(realpath($imagePath));
-    $imageIterator = $imagick->getPixelRegionIterator(200, 100, 200, 200);
-
-    for ($x = 0; $x < 20; $x++) {        
-        $imageIterator->setIteratorRow($x * 5);
-        $pixels = $imageIterator->getCurrentIteratorRow();
-        /* Loop through the pixels in the row (columns) */
-        foreach ($pixels as $pixel) {
-            /** @var $pixel \ImagickPixel */
-            /* Paint every second pixel black*/
-            $pixel->setColor("rgba(0, 0, 0, 0)"); 
-        }
-
-        /* Sync the iterator, this is important to do on each iteration */
-        $imageIterator->syncIterator();
-    }
-
-    header("Content-Type: image/jpg");
-    echo $imagick;
-}
-
-?>
-]]>
-      </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/imagick/imagickpixeliterator/synciterator.xml b/reference/imagick/imagickpixeliterator/synciterator.xml
deleted file mode 100644
index 780bc01cafdc..000000000000
--- a/reference/imagick/imagickpixeliterator/synciterator.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="imagickpixeliterator.synciterator">
- <refnamediv>
-  <refname>ImagickPixelIterator::syncIterator</refname>
-  <refpurpose>Syncs the pixel iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ImagickPixelIterator::syncIterator</methodname>
-   <void/>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <para>
-   Syncs the pixel iterator.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &imagick.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/imagick/imagickpixeliteratorexception.xml b/reference/imagick/imagickpixeliteratorexception.xml
deleted file mode 100644
index 8ce45c77ccfa..000000000000
--- a/reference/imagick/imagickpixeliteratorexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference role="exception" xml:id="class.imagickpixeliteratorexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The ImagickPixelIteratorException class</title>
- <titleabbrev>ImagickPixelIteratorException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ImagickPixelIteratorException intro -->
-  <section xml:id="imagickpixeliteratorexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="imagickpixeliteratorexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>ImagickPixelIteratorException</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ImagickPixelIteratorException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/imagick/ini.xml b/reference/imagick/ini.xml
deleted file mode 100644
index 1bdabf490ede..000000000000
--- a/reference/imagick/ini.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="imagick.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Imagick configuration options</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.imagick.locale-fix">imagick.locale_fix</link></entry>
-      <entry>&false;</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since Imagick 2.1.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.imagick.progress-monitor">imagick.progress_monitor</link></entry>
-      <entry>&false;</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available since Imagick 2.2.2</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.imagick.skip-version-check">imagick.skip_version_check</link></entry>
-      <entry>&false;</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available since Imagick 3.3.0</entry>
-     </row>     
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
- 
- &ini.descriptions.title;
- 
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.imagick.locale-fix">
-    <term>
-     <parameter>imagick.locale_fix</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Fixes a drawing bug with locales that use '<literal>,</literal>' as
-      float separators.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.imagick.progress-monitor">
-    <term>
-     <parameter>imagick.progress_monitor</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Used to enable the image progress monitor.
-      <!-- @TODO Fix me when documenting Imagick::setImageProgressmonitor -->
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.imagick.skip-version-check">
-    <term>
-     <parameter>imagick.skip_version_check</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      When Imagick is loaded, it checks the version number of ImageMagick that it was compiled against, with the version number that is currently being used and will give a warning if they don't match. This warning can be suppressed by enabling this ini setting.
-     </para>
-     <para>Using a version of Imagick that was compiled against a different version of ImageMagick than the one being used is not recommended. Although it may appear to work, it can lead to random crashes or other undefined behaviour. 
-     </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/imagick/setup.xml b/reference/imagick/setup.xml
deleted file mode 100644
index 718c0873dd88..000000000000
--- a/reference/imagick/setup.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="imagick.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="imagick.requirements">
-  &reftitle.required;
-  <section xml:id="imagick.requirements.nix">
-   <title>Installation requirements on non-Windows platforms</title>
-   <para>
-    ImageMagick &gt;= 6.2.4 is required. The amount of
-    file formats supported by Imagick depends entirely upon the amount
-    of formats supported by your ImageMagick installation. For example,
-    Imagemagick requires ghostscript to conduct PDF operations.
-   </para>
-  </section>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- <section xml:id="imagick.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;imagick">&url.pecl.package;imagick</link>.
-  </para>
-  <note>
-   <simpara>The official name of this extension is <emphasis>imagick</emphasis>.</simpara>
-  </note>
-  <para>
-    Windows users can download prebuilt DLL from the <link xlink:href="&url.pecl.package;imagick">PECL</link> website.
-    These packages already contain the extension DLL (<filename>php_imagick.dll</filename>)
-    which needs to be put into the <link linkend="ini.extension-dir">extension_dir</link>.
-    They also contain the ImageMagick DLLs, which need to be put somewhere in the <envar>PATH</envar>.
-    As of Imagick 3.6.0, they also contain XML configuration files in <filename>config</filename>;
-    to use these instead of the built-in defaults, they need to put into <literal>%USERPROFILE%/.config/ImageMagick</literal>,
-    or alternatively in the path given by the environment variable <envar>MAGICK_CONFIGURE_PATH</envar>.
-    Refer to the <link xlink:href="&url.imagemagick;script/resources.php">ImageMagick configuration files documentation</link>
-    for further details.
-  </para>
- </section>
- <!-- }}} -->
-
- &reference.imagick.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/imagick/versions.xml b/reference/imagick/versions.xml
deleted file mode 100644
index 35d82cc37bc9..000000000000
--- a/reference/imagick/versions.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='imagickexception' from='PECL imagick 3'/>
- <function name='imagickdrawexception' from='PECL imagick 3'/>
- <function name='imagickpixeliteratorexception' from='PECL imagick 3'/>
- <function name='imagickpixelexception' from='PECL imagick 3'/>
- <function name='imagickkernelexception' from='PECL imagick 3'/>
-
- <function name='Imagick' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::adaptiveblurimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::adaptiveresizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::adaptivesharpenimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::adaptivethresholdimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::addimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::addnoiseimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::affinetransformimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::animateImages' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::annotateimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::appendimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::autoLevelImage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::averageimages' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::blackthresholdimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::blueShiftImage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::blurimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::borderimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::brightnesscontrastImage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::charcoalimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::chopimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::clampImage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::clear' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::clipimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::clipimagepath' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::clippathimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::clone' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.1.0'/>
- <function name='Imagick::clutimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::coalesceimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::colorfloodfillimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::colorizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::colormatriximage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::combineimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::commentimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::compareimagechannels' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::compareimagelayers' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::compareimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::compositeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::__construct' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::contrastimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::contraststretchimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::convolveimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::count' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::cropimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::cropthumbnailimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::current' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::cyclecolormapimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::deconstructimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::decipherimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::deleteimageartifact' from='PECL imagick 3'/>
- <function name='Imagick::deleteimageproperty' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::deskewimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::despeckleimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::destroy' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::displayimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::displayimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::distortimage' from='PECL imagick 2 &gt;= 2.0.1, PECL imagick 3'/>
- <function name='Imagick::drawimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::edgeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::embossimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::encipherimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::enhanceimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::equalizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::evaluateimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::exportimagepixels' from='PECL imagick 2 &gt;=2.3.0, PECL imagick 3'/>
- <function name='Imagick::extentImage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::filter' from='PECL imagick 3 &gt;= 3.3.0' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::flattenimages' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::flipimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::floodfillpaintimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::flopimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::forwardfouriertransformimage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::frameimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::functionimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::fximage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::gammaimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::gaussianblurimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getcolorspace' from='PECL imagick 3'/>
- <function name='Imagick::getcompression' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getcompressionquality' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getcopyright' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getfilename' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getfont' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::getformat' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getgravity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::gethomeurl' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagealphachannel' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::getimageartifact' from='PECL imagick 3'/>
- <function name='Imagick::getimageattribute' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagebackgroundcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageblob' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageblueprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagebordercolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagechanneldepth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagechanneldistortion' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagechanneldistortions' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::getimagechannelextrema' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getImagechannelkurtosis' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::getimagechannelmean' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagechannelrange' from='PECL imagick 2 &gt;= 2.2.1, PECL imagick 3'/>
- <function name='Imagick::getimagechannelstatistics' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageclipmask' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagecolormapcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagecolors' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagecolorspace' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagecompose' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagecompression' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::getimagecompressionquality' from='PECL imagick 2 &gt;= 2.2.2, PECL imagick 3'/>
- <function name='Imagick::getimagedelay' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagedepth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagedispose' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagedistortion' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageextrema' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagefilename' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageformat' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagegamma' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagegeometry' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagegravity' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::getimagegreenprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageheight' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagehistogram' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageindex' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimageinterlacescheme' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageinterpolatemethod' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageiterations' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagelength' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagematte' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagemattecolor' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagemimetype' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::getimageorientation' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagepage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagepixelcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getpointsize' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::getimageprofile' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageprofiles' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageproperties' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageproperty' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageredprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageregion' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagerenderingintent' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageresolution' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagesblob' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagescene' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagesignature' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagesize' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::getimagetickspersecond' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagetotalinkdensity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagetype' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimageunits' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagevirtualpixelmethod' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagewhitepoint' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getimagewidth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getinterlacescheme' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getiteratorindex' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getnumberimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getoption' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getpackagename' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getpage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getpixeliterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getpixelregioniterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getspointsize' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::getquantum' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::getquantumdepth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getquantumrange' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getregistry' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::getreleasedate' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getresource' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getresourcelimit' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getsamplingfactors' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getsize' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getsizeoffset' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::getversion' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::haldclutimage' from='PECL imagick 3'/>
- <function name='Imagick::hasnextimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::haspreviousimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::identifyformat' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::identifyimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::implodeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::importimagepixels' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::inversefouriertransformimage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::labelimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::levelimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::linearstretchimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::liquidrescaleimage' from='PECL imagick 2 &gt;= 2.2.0, PECL imagick 3'/>
- <function name='Imagick::listregistry' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::magnifyimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::mapimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::mattefloodfillimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::medianfilterimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::mergeimagelayers' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::minifyimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::modulateimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::montageimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::morphimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::morphology' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::mosaicimages' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::motionblurimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::negateimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::newimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::newpseudoimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::nextimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::normalizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::oilpaintimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::opaquepaintimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::optimizeimagelayers' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::orderedposterizeimage' from='PECL imagick 2 &gt;= 2.2.2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::paintfloodfillimage' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::paintopaqueimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::painttransparentimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::pingimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::pingimageblob' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::pingimagefile' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::polaroidimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::posterizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::previewimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::previousimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::profileimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::quantizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::quantizeimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::queryfontmetrics' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::queryfonts' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::queryformats' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::radialblurimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::raiseimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::randomthresholdimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::readimageblob' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::readimagefile' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::readimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::readimages' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::recolorimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::reducenoiseimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::remapimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::removeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::removeimageprofile' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::render' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::resampleimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::resetimagepage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::resizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::rollimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::rotateimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::rotationalblurimage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::roundcorners' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::sampleimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::scaleimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::segmentimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::selectiveblurimage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::separateimagechannel' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::sepiatoneimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setbackgroundcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setcolorspace' from='PECL imagick 3'/>
- <function name='Imagick::setcompression' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setcompressionquality' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setfilename' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setfirstiterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setfont' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::setformat' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setgravity' from='PECL imagick 2 &gt;= 2.2.0, PECL imagick 3'/>
- <function name='Imagick::setimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagealphachannel' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::setimageartifact' from='PECL imagick 3'/>
- <function name='Imagick::setimageattribute' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimagebackgroundcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagebias' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimagebiasquantum' from='PECL imagick 3 &gt;= 3.3.0' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimageblueprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagebordercolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagechanneldepth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageclipmask' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimagecolormapcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagecolorspace' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagecompose' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagecompression' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagecompressionquality' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagedelay' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagedepth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagedispose' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageextent' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagefilename' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageformat' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagegamma' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagegravity' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::setimagegreenprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageindex' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimageinterlacescheme' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageinterpolatemethod' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageiterations' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagematte' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagemattecolor' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimageopacity' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::setimageorientation' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagepage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageprofile' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageproperty' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageredprimary' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagerenderingintent' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageresolution' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagescene' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagetickspersecond' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagetype' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimageunits' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagevirtualpixelmethod' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setimagewhitepoint' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setinterlacescheme' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setiteratorindex' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setlastiterator' from='PECL imagick 2 &gt;= 2.0.1, PECL imagick 3'/>
- <function name='Imagick::setoption' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setpage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setpointsize' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='Imagick::setprogressmonitor' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::setregistry' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::setresolution' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setresourcelimit' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setsamplingfactors' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setsize' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::setsizeoffset' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::settype' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::shadeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::shadowimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::sharpenimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::shaveimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::shearimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::sigmoidalcontrastimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::sketchimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::smushimages' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::solarizeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::sparsecolorimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::spliceimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::spreadimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::spreadimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::steganoimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::stereoimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::statisticimage' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::stripimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::subimagematch' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='Imagick::swirlimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::textureimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::thresholdimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::thumbnailimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::__tostring' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::tintimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::transformimage' from='PECL imagick 2, PECL imagick 3' deprecated='PECL imagick 3.4.4'/>
- <function name='Imagick::transformimagecolorspace' from='PECL imagick 3'/>
- <function name='Imagick::transparentpaintimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::transposeimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::transverseimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::trimimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::uniqueimagecolors' from='PECL imagick 2,PECL imagick 3'/>
- <function name='Imagick::unsharpmaskimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::valid' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::vignetteimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::waveimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::whitethresholdimage' from='PECL imagick 2, PECL imagick 3'/>
- <function name='Imagick::writeimage' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::writeimagefile' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::writeimages' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='Imagick::writeimagesfile' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
-
- <function name='ImagickDraw' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::affine' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::annotation' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::arc' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::bezier' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::circle' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::clear' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::clone' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::color' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::comment' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::composite' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::__construct' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::destroy' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::ellipse' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getclippath' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getcliprule' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getclipunits' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfillcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfillopacity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfillrule' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfont' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfontfamily' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfontsize' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfontstretch' from='PECL imagick 2 &gt;=2.3.0, PECL imagick 3'/>
- <function name='ImagickDraw::getfontstyle' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getfontweight' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getgravity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokeantialias' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokecolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokedasharray' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokedashoffset' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokelinecap' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokelinejoin' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokemiterlimit' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokeopacity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getstrokewidth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::gettextalignment' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::gettextantialias' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::gettextdecoration' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::gettextencoding' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::gettextinterlinespacing' from='PECL imagick 3 &gt;= 3.1.0'/>
- <function name='ImagickDraw::gettextinterwordspacing' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3 &gt;= 3.1.0'/>
- <function name='ImagickDraw::gettextkerning' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3 &gt;= 3.1.0'/>
- <function name='ImagickDraw::gettextundercolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::getvectorgraphics' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::line' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::matte' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathclose' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetoabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetoquadraticbezierabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetoquadraticbezierrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetoquadraticbeziersmoothabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetoquadraticbeziersmoothrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetorelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetosmoothabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathcurvetosmoothrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathellipticarcabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathellipticarcrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathfinish' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathlinetoabsolute' from='PECL imagick 2'/>
- <function name='ImagickDraw::pathlinetohorizontalabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathlinetohorizontalrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathlinetorelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathlinetoverticalabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathlinetoverticalrelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathmovetoabsolute' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathmovetorelative' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pathstart' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::point' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::polygon' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::polyline' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pop' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::popclippath' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::popdefs' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::poppattern' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::push' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pushclippath' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pushdefs' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::pushpattern' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::rectangle' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::render' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::resetvectorgraphics' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::rotate' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::roundrectangle' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::scale' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setclippath' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setcliprule' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setclipunits' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfillalpha' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfillcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfillopacity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfillpatternurl' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfillrule' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfont' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfontfamily' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfontsize' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfontstretch' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfontstyle' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setfontweight' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setgravity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setresolution' from='PECL imagick 3 &gt;= 3.1.0'/>
- <function name='ImagickDraw::setstrokealpha' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokeantialias' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokecolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokedasharray' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokedashoffset' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokelinecap' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokelinejoin' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokemiterlimit' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokeopacity' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokepatternurl' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setstrokewidth' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::settextalignment' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::settextantialias' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::settextdecoration' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::settextencoding' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::settextinterlinespacing' from='PECL imagick 3 &gt;= 3.1.0'/>
- <function name='ImagickDraw::settextinterwordspacing' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='ImagickDraw::settextkerning' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='ImagickDraw::settextundercolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setvectorgraphics' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::setviewbox' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::skewx' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::skewy' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickDraw::translate' from='PECL imagick 2, PECL imagick 3'/>
-
- <function name='ImagickPixel' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::__construct' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::clear' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::clone' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='ImagickPixel::destroy' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::getcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::getcolorasstring' from='PECL imagick 2 &gt;= 2.1.0, PECL imagick 3'/>
- <function name='ImagickPixel::getcolorcount' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::getcolorvalue' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::getcolorvaluequantum' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='ImagickPixel::gethsl' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::getindex' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
- <function name='ImagickPixel::ispixelsimilar' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='ImagickPixel::ispixelsimilarquantum' from='PECL imagick 3 &gt;= 3.3.0'/>
- <function name='ImagickPixel::issimilar' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::setcolor' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::setcolorcount' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::setcolorvalue' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::setcolorvaluequantum' from='PECL imagick 2 &gt;=2.3.0, PECL imagick 3'/>
- <function name='ImagickPixel::sethsl' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixel::setindex' from='PECL imagick 2 &gt;= 2.3.0, PECL imagick 3'/>
-
- <function name='ImagickPixelIterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::__construct' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::clear' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::destroy' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::getcurrentiteratorrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::getiteratorrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::getnextiteratorrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::getpreviousiteratorrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::newpixeliterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::newpixelregioniterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::resetiterator' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::setiteratorfirstrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::setiteratorlastrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::setiteratorrow' from='PECL imagick 2, PECL imagick 3'/>
- <function name='ImagickPixelIterator::synciterator' from='PECL imagick 2, PECL imagick 3'/>
-
- <function name='ImagickKernel' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::fromMatrix' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::fromBuiltin' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::addKernel' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::getMatrix' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::separate' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::scale' from='PECL imagick &gt;= 3.3.0'/>
- <function name='ImagickKernel::addUnityKernel' from='PECL imagick &gt;= 3.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
--->
diff --git a/reference/inotify/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/inotify/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/inotify/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/inotify/book.xml b/reference/inotify/book.xml
deleted file mode 100644
index 61d71ba98b8c..000000000000
--- a/reference/inotify/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.inotify">
- <?phpdoc extension-membership="pecl" ?>
- <title>Inotify</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.inotify">
-  &reftitle.intro;
-  <simpara>
-   The inotify extension exposes the inotify functions <function>inotify_init</function>,
-   <function>inotify_add_watch</function> and <function>inotify_rm_watch</function>.
-  </simpara>
-  <simpara>
-   As the C <function>inotify_init</function> function returns a file descriptor, PHP's
-   <function>inotify_init</function> returns a stream resource, usable with standard
-   stream functions, like <function>stream_select</function>, <function>stream_set_blocking</function>
-   and <function>fclose</function>. <function>inotify_read</function> replaces the C way of reading inotify
-   events.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.inotify.setup;
- &reference.inotify.constants;
- &reference.inotify.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/inotify/constants.xml b/reference/inotify/constants.xml
deleted file mode 100644
index bdfade340bbd..000000000000
--- a/reference/inotify/constants.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="inotify.constants" xmlns="http://docbook.org/ns/docbook">
-  &reftitle.constants;
-  &extension.constants;
-  <variablelist xml:id="inotify.constants.events">
-   <title>Inotify constants usable with <function>inotify_add_watch</function> and/or returned by <function>inotify_read</function></title>
-   <varlistentry xml:id="constant.in-access">
-    <term>
-     <constant>IN_ACCESS</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File was accessed (read) (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-modify">
-    <term>
-     <constant>IN_MODIFY</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File was modified (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-attrib">
-    <term>
-     <constant>IN_ATTRIB</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Metadata changed (e.g. permissions, mtime, etc.) (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-close-write">
-    <term>
-     <constant>IN_CLOSE_WRITE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File opened for writing was closed (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-close-nowrite">
-    <term>
-     <constant>IN_CLOSE_NOWRITE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File not opened for writing was closed (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-open">
-    <term>
-     <constant>IN_OPEN</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File was opened (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-moved-to">
-    <term>
-     <constant>IN_MOVED_TO</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File moved into watched directory (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-moved-from">
-    <term>
-     <constant>IN_MOVED_FROM</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File moved out of watched directory (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-create">
-    <term>
-     <constant>IN_CREATE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File or directory created in watched directory (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-delete">
-    <term>
-     <constant>IN_DELETE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File or directory deleted in watched directory (*)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-delete-self">
-    <term>
-     <constant>IN_DELETE_SELF</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Watched file or directory was deleted
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-move-self">
-    <term>
-     <constant>IN_MOVE_SELF</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Watch file or directory was moved
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-close">
-    <term>
-     <constant>IN_CLOSE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Equals to IN_CLOSE_WRITE | IN_CLOSE_NOWRITE
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-move">
-    <term>
-     <constant>IN_MOVE</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Equals to IN_MOVED_FROM | IN_MOVED_TO
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-all-events">
-    <term>
-     <constant>IN_ALL_EVENTS</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Bitmask of all the above constants
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-unmount">
-    <term>
-     <constant>IN_UNMOUNT</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File system containing watched object was unmounted
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-q-overflow">
-    <term>
-     <constant>IN_Q_OVERFLOW</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Event queue overflowed (wd is -1 for this event)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-ignored">
-    <term>
-     <constant>IN_IGNORED</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Watch was removed (explicitly by <function>inotify_rm_watch</function>
-      or because file was removed or filesystem unmounted
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-isdir">
-    <term>
-     <constant>IN_ISDIR</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Subject of this event is a directory
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-onlydir">
-    <term>
-     <constant>IN_ONLYDIR</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Only watch pathname if it is a directory (Since Linux 2.6.15)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-dont-follow">
-    <term>
-     <constant>IN_DONT_FOLLOW</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Do not dereference pathname if it is a symlink (Since Linux 2.6.15)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-mask-add">
-    <term>
-     <constant>IN_MASK_ADD</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Add events to watch mask for this pathname if it already exists
-      (instead of replacing mask).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.in-oneshot">
-    <term>
-     <constant>IN_ONESHOT</constant>
-      (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Monitor pathname for one event, then remove from watch list.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <note>
-   <simpara>
-    The events marked with an asterisk (*) above can occur for files in watched
-    directories.
-   </simpara>
-  </note>
-</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/inotify/functions/inotify-add-watch.xml b/reference/inotify/functions/inotify-add-watch.xml
deleted file mode 100644
index 2516456c8b69..000000000000
--- a/reference/inotify/functions/inotify-add-watch.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.inotify-add-watch">
- <refnamediv>
-  <refname>inotify_add_watch</refname>
-  <refpurpose>Add a watch to an initialized inotify instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>inotify_add_watch</methodname>
-   <methodparam><type>resource</type><parameter>inotify_instance</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pathname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mask</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>inotify_add_watch</function> adds a new watch or modify an
-   existing watch for the file or directory specified in
-   <parameter>pathname</parameter>.
-  </simpara>
-  <simpara>
-   Using <function>inotify_add_watch</function> on a watched object replaces
-   the existing watch. Using the <constant>IN_MASK_ADD</constant> constant
-   adds (OR) events to the existing watch.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>inotify_instance</parameter></term>
-    <listitem>
-     <simpara>
-      &inotify.instance.description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pathname</parameter></term>
-    <listitem>
-     <simpara>
-      File or directory to watch
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mask</parameter></term>
-    <listitem>
-     <simpara>
-      Events to watch for. See <link linkend="inotify.constants">&ReservedConstants;</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   The return value is a unique (inotify instance wide) watch descriptor,
-   &return.falseforfailure;.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>inotify_init</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/inotify/functions/inotify-init.xml b/reference/inotify/functions/inotify-init.xml
deleted file mode 100644
index bd1043e5c504..000000000000
--- a/reference/inotify/functions/inotify-init.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.inotify-init">
- <refnamediv>
-  <refname>inotify_init</refname>
-  <refpurpose>Initialize an inotify instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>inotify_init</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Initialize an inotify instance for use with
-   <function>inotify_add_watch</function>
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   A stream resource or &false; on error.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <para>
-   <example xml:id="inotify-init.example.basic"><!-- {{{ -->
-    <title>Example usage of inotify</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Open an inotify instance
-$fd = inotify_init();
-
-// Watch __FILE__ for metadata changes (e.g. mtime)
-$watch_descriptor = inotify_add_watch($fd, __FILE__, IN_ATTRIB);
-
-// generate an event
-touch(__FILE__);
-
-// Read events
-$events = inotify_read($fd);
-print_r($events);
-
-// The following methods allows to use inotify functions without blocking on inotify_read():
-
-// - Using stream_select() on $fd:
-$read = array($fd);
-$write = null;
-$except = null;
-stream_select($read,$write,$except,0);
-
-// - Using stream_set_blocking() on $fd
-stream_set_blocking($fd, 0);
-inotify_read($fd); // Does no block, and return false if no events are pending
-
-// - Using inotify_queue_len() to check if event queue is not empty
-$queue_len = inotify_queue_len($fd); // If > 0, inotify_read() will not block
-
-// Stop watching __FILE__ for metadata changes
-inotify_rm_watch($fd, $watch_descriptor);
-
-// Close the inotify instance
-// This may have closed all watches if this was not already done
-fclose($fd);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(
-  array(
-    'wd' => 1,     // Equals $watch_descriptor
-    'mask' => 4,   // IN_ATTRIB bit is set
-    'cookie' => 0, // unique id to connect related events (e.g.
-                   // IN_MOVE_FROM and IN_MOVE_TO events)
-    'name' => '',  // the name of a file (e.g. if we monitored changes
-                   // in a directory)
-  ),
-);
-]]>
-    </screen>
-   </example><!-- }}} -->
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>inotify_add_watch</function></member>
-   <member><function>inotify_rm_watch</function></member>
-   <member><function>inotify_queue_len</function></member>
-   <member><function>inotify_read</function></member>
-   <member><function>fclose</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/inotify/functions/inotify-queue-len.xml b/reference/inotify/functions/inotify-queue-len.xml
deleted file mode 100644
index 713b4c49f158..000000000000
--- a/reference/inotify/functions/inotify-queue-len.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.inotify-queue-len">
- <refnamediv>
-  <refname>inotify_queue_len</refname>
-  <refpurpose>Return a number upper than zero if there are pending events</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>inotify_queue_len</methodname>
-   <methodparam><type>resource</type><parameter>inotify_instance</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function allows to know if <function>inotify_read</function> will block or not.
-   If a number upper than zero is returned, there are pending events and
-   <function>inotify_read</function> will not block.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>inotify_instance</parameter></term>
-    <listitem>
-     <simpara>
-      &inotify.instance.description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a number upper than zero if there are pending events.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>inotify_init</function></member>
-   <member><function>stream_select</function></member>
-   <member><function>stream_set_blocking</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/inotify/functions/inotify-read.xml b/reference/inotify/functions/inotify-read.xml
deleted file mode 100644
index ad3515f46a9b..000000000000
--- a/reference/inotify/functions/inotify-read.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.inotify-read">
- <refnamediv>
-  <refname>inotify_read</refname>
-  <refpurpose>Read events from an inotify instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>inotify_read</methodname>
-   <methodparam><type>resource</type><parameter>inotify_instance</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Read inotify events from an inotify instance.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>inotify_instance</parameter></term>
-    <listitem>
-     <simpara>
-      &inotify.instance.description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   An array of inotify events or &false; if no events was pending and
-   <parameter>inotify_instance</parameter> is non-blocking. Each event is an array with the following keys:
-   <simplelist>
-    <member>wd is a watch descriptor returned by
-     <function>inotify_add_watch</function></member>
-    <member>mask is a bit mask of <link linkend="inotify.constants">events</link></member>
-    <member>cookie is a unique id to connect related events (e.g. <constant>IN_MOVE_FROM</constant>
-     and <constant>IN_MOVE_TO</constant>)</member>
-    <member>name is the name of a file (e.g. if a file was modified in a
-     watched directory)</member>
-   </simplelist>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>inotify_init</function></member>
-   <member><function>stream_select</function></member>
-   <member><function>stream_set_blocking</function></member>
-   <member><function>inotify_queue_len</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/inotify/functions/inotify-rm-watch.xml b/reference/inotify/functions/inotify-rm-watch.xml
deleted file mode 100644
index 04dd2590562a..000000000000
--- a/reference/inotify/functions/inotify-rm-watch.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.inotify-rm-watch">
- <refnamediv>
-  <refname>inotify_rm_watch</refname>
-  <refpurpose>Remove an existing watch from an inotify instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>inotify_rm_watch</methodname>
-   <methodparam><type>resource</type><parameter>inotify_instance</parameter></methodparam>
-   <methodparam><type>int</type><parameter>watch_descriptor</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>inotify_rm_watch</function> removes the watch
-   <parameter>watch_descriptor</parameter> from the inotify instance
-   <parameter>inotify_instance</parameter>.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>inotify_instance</parameter></term>
-    <listitem>
-     <simpara>
-      &inotify.instance.description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watch_descriptor</parameter></term>
-    <listitem>
-     <simpara>
-      Watch to remove from the instance
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>inotify_init</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/inotify/reference.xml b/reference/inotify/reference.xml
deleted file mode 100644
index 880f1ca04f62..000000000000
--- a/reference/inotify/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.inotify" xmlns="http://docbook.org/ns/docbook">
- <title>Inotify &Functions;</title>
-
- &reference.inotify.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/inotify/setup.xml b/reference/inotify/setup.xml
deleted file mode 100644
index 747befe7483b..000000000000
--- a/reference/inotify/setup.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="inotify.setup">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- <section xml:id="inotify.install">
-  &reftitle.setup;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;inotify">&url.pecl.package;inotify</link>.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="inotify.resources">
-  &reftitle.resources;
-  <simpara>
-   This extension defines a stream resource returned by
-   <function>inotify_init</function>.
-  </simpara>
- </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/inotify/versions.xml b/reference/inotify/versions.xml
deleted file mode 100644
index ad592f56f4d6..000000000000
--- a/reference/inotify/versions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='inotify_add_watch' from='PECL inotify &gt;= 0.1.2'/>
- <function name='inotify_init' from='PECL inotify &gt;= 0.1.2'/>
- <function name='inotify_queue_len' from='PECL inotify &gt;= 0.1.2'/>
- <function name='inotify_read' from='PECL inotify &gt;= 0.1.2'/>
- <function name='inotify_rm_watch' from='PECL inotify &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/libxml/book.xml b/reference/libxml/book.xml
index cca0ad9440be..beda26e9ae28 100644
--- a/reference/libxml/book.xml
+++ b/reference/libxml/book.xml
@@ -8,20 +8,20 @@
  <!-- {{{ preface -->
  <preface xml:id="intro.libxml">
   &reftitle.intro;
-  <para>
+  <simpara>
    These functions/constants are available as of PHP 5.1.0, and
    the following core extensions rely on this libxml extension:
    <link linkend="book.dom">DOM</link>,
    <link linkend="book.libxml">libxml</link>,
    <link linkend="book.simplexml">SimpleXML</link>,
    <link linkend="book.soap">SOAP</link>,
-   <link linkend="book.wddx">WDDX</link>,
+   <link xlink:href="../extensions/book.wddx.php">WDDX</link>,
    <link linkend="book.xsl">XSL</link>,
    <link linkend="book.xml">XML</link>,
    <link linkend="book.xmlreader">XMLReader</link>,
-   <link linkend="book.xmlrpc">XMLRPC</link>&listendand;
+   <link xlink:href="../extensions/book.xmlrpc.php">XMLRPC</link>&listendand;
    <link linkend="book.xmlwriter">XMLWriter</link>.
-  </para>
+  </simpara>
  </preface>
  <!-- }}} -->
  
diff --git a/reference/lua/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/lua/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/lua/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/lua/book.xml b/reference/lua/book.xml
deleted file mode 100644
index 6c4a36c15409..000000000000
--- a/reference/lua/book.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.lua">
- <?phpdoc extension-membership="pecl" ?>
- <title>Lua</title>
- <titleabbrev>Lua</titleabbrev>
-
- <preface xml:id="intro.lua">
-  &reftitle.intro;
-  <simpara>
-   "Lua is a powerful, fast, light-weight, embeddable scripting language."
-   This extension embeds the lua interpreter and offers an OO-API to lua
-   variables and functions.
-  </simpara>
- </preface>
-
- &reference.lua.setup;
-
- &reference.lua.lua;
- &reference.lua.luaclosure;
- &reference.lua.luaexception;
-</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/lua/configure.xml b/reference/lua/configure.xml
deleted file mode 100644
index 65fd36c3c987..000000000000
--- a/reference/lua/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;lua">&url.pecl.package;lua</link>
- </simpara>
-
-
-</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/lua/lua.xml b/reference/lua/lua.xml
deleted file mode 100644
index 73cdbb42f89e..000000000000
--- a/reference/lua/lua.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.lua" role="class">
-
- <title>The Lua class</title>
- <titleabbrev>Lua</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Lua intro -->
-  <section xml:id="lua.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="lua.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Lua</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Lua</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="lua.constants.lua-version">Lua::LUA_VERSION</varname>
-     <initializer>Lua 5.1.4</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.lua')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis)"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Lua constants -->
-  <section xml:id="lua.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="lua.constants.lua-version">
-     <term><constant>Lua::LUA_VERSION</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.lua.entities.lua;
-
-</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/lua/lua/assign.xml b/reference/lua/lua/assign.xml
deleted file mode 100644
index 4b474fc50d30..000000000000
--- a/reference/lua/lua/assign.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.assign">
- <refnamediv>
-  <refname>Lua::assign</refname>
-  <refpurpose>Assign a PHP variable to Lua</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::assign</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <varname>$this</varname> or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Lua::assign</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lua = new Lua();
-$lua->assign("php_var", array(1=>1, 2, 3)); //lua table index begin with 1
-$lua->eval(<<<CODE
-    print(php_var);
-CODE
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
- (
-     [1] => 1
-     [2] => 2
-     [3] => 3
- )
-]]>
-   </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/lua/lua/call.xml b/reference/lua/lua/call.xml
deleted file mode 100644
index 2e07d4683226..000000000000
--- a/reference/lua/lua/call.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.call">
- <refnamediv>
-  <refname>Lua::call</refname>
-  <refname>Lua::__call</refname>
-  <refpurpose>Call Lua functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::call</methodname>
-   <methodparam><type>callable</type><parameter>lua_func</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>use_self</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::__call</methodname>
-   <methodparam><type>callable</type><parameter>lua_func</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>use_self</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lua_func</parameter></term>
-    <listitem>
-     <simpara>
-       Function name in lua
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-       Arguments passed to the Lua function
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>use_self</parameter></term>
-    <listitem>
-     <simpara>
-       Whether to use <literal>self</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns result of the called function, &null; for wrong arguments or
-   &false; on other failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Lua::call</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lua = new Lua();
-$lua->eval(<<<CODE
-    function dummy(foo, bar)
-        print(foo, ",", bar)
-    end
-CODE
-);
-$lua->call("dummy", array("Lua", "geiliable\n"));
-$lua->dummy("Lua", "geiliable"); // __call()
-var_dump($lua->call(array("table", "concat"), array(array(1=>1, 2=>2, 3=>3), "-")));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Lua,geiliable
-Lua,geiliable
-string(5) "1-2-3"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="object.call">__call()</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/lua/lua/construct.xml b/reference/lua/lua/construct.xml
deleted file mode 100644
index 5e43fd610bcc..000000000000
--- a/reference/lua/lua/construct.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.construct">
- <refnamediv>
-  <refname>Lua::__construct</refname>
-  <refpurpose>Lua constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Lua::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>lua_script_file</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lua_script_file</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/lua/lua/eval.xml b/reference/lua/lua/eval.xml
deleted file mode 100644
index 2e8c7581fc9a..000000000000
--- a/reference/lua/lua/eval.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.eval">
- <refnamediv>
-  <refname>Lua::eval</refname>
-  <refpurpose>Evaluate a string as Lua code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::eval</methodname>
-   <methodparam><type>string</type><parameter>statements</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>statements</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns result of evaled code, &null; for wrong arguments or &false; on
-   other failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Lua::eval</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lua = new Lua();
-$lua->eval(<<<CODE
-    print(2);
-CODE
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-2
-]]>
-   </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/lua/lua/getversion.xml b/reference/lua/lua/getversion.xml
deleted file mode 100644
index 2b376965e5c8..000000000000
--- a/reference/lua/lua/getversion.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.getversion">
- <refnamediv>
-  <refname>Lua::getVersion</refname>
-  <refpurpose>The getversion purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Lua::getVersion</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <varname linkend="lua.constants.lua-version">Lua::LUA_VERSION</varname>.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/lua/lua/include.xml b/reference/lua/lua/include.xml
deleted file mode 100644
index 8444b0b1333c..000000000000
--- a/reference/lua/lua/include.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.include">
- <refnamediv>
-  <refname>Lua::include</refname>
-  <refpurpose>Parse a Lua script file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::include</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns result of included code, &null; for wrong arguments or &false; on
-   other failure.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/lua/lua/registercallback.xml b/reference/lua/lua/registercallback.xml
deleted file mode 100644
index 29a527bf7154..000000000000
--- a/reference/lua/lua/registercallback.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.registercallback">
- <refnamediv>
-  <refname>Lua::registerCallback</refname>
-  <refpurpose>Register a PHP function to Lua</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Lua::registerCallback</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Register a PHP function to Lua as a function named "$name"
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      A valid PHP function callback
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <varname>$this</varname>, &null; for wrong arguments or &false; on
-   other failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Lua::registerCallback</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lua = new Lua();
-$lua->registerCallback("echo", "var_dump");
-$lua->eval(<<<CODE
-    echo({1, 2, 3});
-CODE
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(3) {
-  [1]=>
-  float(1)
-  [2]=>
-  float(2)
-  [3]=>
-  float(3)
-}
-]]>
-   </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/lua/luaclosure.xml b/reference/lua/luaclosure.xml
deleted file mode 100644
index 6b6e14f7a779..000000000000
--- a/reference/lua/luaclosure.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luaclosure" role="class">
-
- <title>The LuaClosure class</title>
- <titleabbrev>LuaClosure</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaClosure intro -->
-  <section xml:id="luaclosure.intro">
-   &reftitle.intro;
-   <simpara>
-     LuaClosure is a wrapper class for LUA_TFUNCTION which could be return from
-     calling to Lua function.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luaclosure.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaClosure</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaClosure</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.luaclosure')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.lua.entities.luaclosure;
-
-</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/lua/luaclosure/invoke.xml b/reference/lua/luaclosure/invoke.xml
deleted file mode 100644
index 7251581e3cf7..000000000000
--- a/reference/lua/luaclosure/invoke.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luaclosure.invoke">
- <refnamediv>
-  <refname>LuaClosure::__invoke</refname>
-  <refpurpose>Invoke luaclosure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaClosure::__invoke</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>LuaClosure::__invoke</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$lua = new Lua();
-$closure = $lua->eval(<<<CODE
-    return (function ()
-        print("hello world")
-    end)
-CODE
-);
-
-$lua->call($closure);
-$closure();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-hello worldhello world
-]]>
-   </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/lua/luaexception.xml b/reference/lua/luaexception.xml
deleted file mode 100644
index 9547be2269c3..000000000000
--- a/reference/lua/luaexception.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luaexception" role="class">
-
- <title>The LuaException class</title>
- <titleabbrev>LuaException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaException intro -->
-  <section xml:id="luaexception.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luaexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
-</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/lua/setup.xml b/reference/lua/setup.xml
deleted file mode 100644
index 6b80c9a83125..000000000000
--- a/reference/lua/setup.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lua.setup">
- &reftitle.setup;
-
- <section xml:id="lua.requirements">
-  &reftitle.required;
-  <simpara>
-   To use this extension, you will need Lua installed, available on the <link xlink:href="&url.lua;">Lua homepage</link>
-  </simpara>
- </section>
-
- <section xml:id="lua.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;lua">&url.pecl.package;lua</link>.
-  </simpara>
- </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/lua/versions.xml b/reference/lua/versions.xml
deleted file mode 100644
index d1093ca738a1..000000000000
--- a/reference/lua/versions.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
- <function name='lua' from='PECL lua &gt;=0.9.0'/>
- <function name='luaclosure' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::__construct' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::__call' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::eval' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::include' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::call' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::assign' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::register' from='PECL lua &gt;=0.9.0'/>
- <function name='lua::getversion' from='PECL lua &gt;=0.9.0'/>
- <function name='luaclosure::invoke' from='PECL lua &gt;=0.9.0'/>
- <function name='luaclosure::__invoke' from='PECL lua &gt;=0.9.0'/>
-
- <function name='luaexception' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::__clone' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::__construct' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::getmessage' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::getcode' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::getfile' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::getline' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::gettrace' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::gettraceasstring' from='PECL lua &gt;=0.9.0'/>
- <function name='luaexception::__tostring' from='PECL lua &gt;=0.9.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/luasandbox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/luasandbox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/luasandbox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/luasandbox/book.xml b/reference/luasandbox/book.xml
deleted file mode 100644
index 80a38d33d0c2..000000000000
--- a/reference/luasandbox/book.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.luasandbox">
- <?phpdoc extension-membership="pecl" ?>
- <title>LuaSandbox</title>
- <titleabbrev>LuaSandbox</titleabbrev>
-
- <preface xml:id="intro.luasandbox">
-  &reftitle.intro;
-  <simpara>
-   LuaSandbox is an extension for PHP 7 and PHP 8 to allow safely
-   running untrusted Lua 5.1 code from within PHP.
-  </simpara>
-  <para>
-   Differences compared to the <link linkend="book.lua">Lua</link> extension:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      LuaSandbox has support for time and memory limits.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      LuaSandbox provides a default-safe environment for running untrusted code.
-      Stock Lua functions were reviewed for security, and several were patched
-      accordingly.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      LuaSandbox has a PHP interface which is more complex, precise and powerful,
-      but it is less convenient for developers.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      LuaSandbox supports only Lua 5.1. It is difficult to change this, because
-      LuaSandbox uses heavily modified Lua standard libraries, and
-      due to the lack of backwards compatibility between major Lua versions.
-      LuaSandbox aims to maximise backwards compatibility with user-supplied
-      scripts.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </preface>
-
- &reference.luasandbox.setup;
- &reference.luasandbox.differences;
- &reference.luasandbox.examples;
-
-
- &reference.luasandbox.luasandbox;
- &reference.luasandbox.luasandboxfunction;
- &reference.luasandbox.luasandboxerror;
- &reference.luasandbox.luasandboxerrorerror;
- &reference.luasandbox.luasandboxfatalerror;
- &reference.luasandbox.luasandboxmemoryerror;
- &reference.luasandbox.luasandboxruntimeerror;
- &reference.luasandbox.luasandboxsyntaxerror;
- &reference.luasandbox.luasandboxtimeouterror;
-
-</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/luasandbox/configure.xml b/reference/luasandbox/configure.xml
deleted file mode 100644
index eb561590f7ff..000000000000
--- a/reference/luasandbox/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;luasandbox">&url.pecl.package;luasandbox</link>
- </simpara>
-
-</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/luasandbox/differences.xml b/reference/luasandbox/differences.xml
deleted file mode 100644
index be344b1a8a83..000000000000
--- a/reference/luasandbox/differences.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="reference.luasandbox.differences">
- <title>Differences from Standard Lua</title>
-
- <simpara>
-  LuaSandbox provides a sandboxed environment which differs in some ways from standard Lua 5.1.
- </simpara>
-
- <simplesect xml:id="reference.luasandbox.differences.unavailable">
-  <title>Features that are not available</title>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <literal>dofile()</literal>, <literal>loadfile()</literal>, and the <literal>io</literal> package, as they allow direct filesystem access. If needed, filesystem access should be done via PHP callbacks.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     The <literal>package</literal> package, including <literal>require()</literal> and <literal>module()</literal>, as it depends heavily on direct filesystem access. A pure-Lua rewrite such as that used in the MediaWiki Scribunto extension may be used instead.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>load()</literal> and <literal>loadstring()</literal>, to allow for static analysis of Lua code.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>print()</literal>, since it outputs to standard output. If needed, output should be done via PHP callbacks.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Most of the <literal>os</literal> package, as it allows manipulation of the process and executing of other processes.
-    </simpara>
-    <itemizedlist>
-     <listitem>
-      <simpara>
-       <literal>os.clock()</literal>, <literal>os.date()</literal>, <literal>os.difftime()</literal>, and <literal>os.time()</literal> remain available.
-      </simpara>
-     </listitem>
-    </itemizedlist>
-   </listitem>
-   <listitem>
-    <simpara>
-     Most of the <literal>debug</literal> package, as it allows manipulation of Lua state and metadata in ways that can break sandboxing.
-    </simpara>
-    <itemizedlist>
-     <listitem>
-      <simpara>
-       <literal>debug.traceback()</literal> remains available.
-       </simpara>
-     </listitem>
-    </itemizedlist>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>string.dump()</literal>, as it may expose internal data.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>collectgarbage()</literal>, <literal>gcinfo()</literal>, and the <literal>coroutine</literal> package have not been reviewed for security.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </simplesect>
-
- <simplesect xml:id="reference.luasandbox.differences.modified">
-  <title>Features that have been modified</title>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <literal>pcall()</literal> and <literal>xpcall()</literal> cannot catch certain errors, particularly timeout errors.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>tostring()</literal> does not include pointer addresses.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>string.match()</literal> has been patched to limit the recursion depth and to periodically check for a timeout.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>math.random()</literal> and <literal>math.randomseed()</literal> are replaced with versions that don't share state with PHP's <literal>rand()</literal>.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     The Lua 5.2 <literal>__pairs</literal> and <literal>__ipairs</literal> metamethods are supported by <literal>pairs()</literal> and <literal>ipairs()</literal>.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </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/luasandbox/examples.xml b/reference/luasandbox/examples.xml
deleted file mode 100644
index 6dbe9380e56b..000000000000
--- a/reference/luasandbox/examples.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.examples">
- &reftitle.examples;
-
- <!-- Add one or more of these <section>'s, with one ore more <example>'s -->
- <!-- Make sure each xml:id is unique -->
- <section xml:id="luasandbox.examples-basic">
-  <title>Basic usage for LuaSandbox</title>
-  <simpara>
-   Once you've compiled PHP with LuaSandbox support, you can begin using LuaSandbox to safely run user-provided Lua code.
-  </simpara>
-  <example>
-   <title>Execute some Lua code</title>
-   <programlisting role="php" xml:id="luasandbox.examples.uniqueidhere">
-<![CDATA[
-<?php
-
-$sandbox = new LuaSandbox;
-$sandbox->setMemoryLimit( 50 * 1024 * 1024 );
-$sandbox->setCPULimit( 10 );
-
-// Register some functions in the Lua environment
-
-function frobnosticate( $v ) {
-    return [ $v + 42 ];
-}
-
-$sandbox->registerLibrary( 'php', [
-    'frobnosticate' => 'frobnosticate',
-    'output' => function ( $string ) {
-        echo "$string\n";
-    },
-    'error' => function () {
-        throw new LuaSandboxRuntimeError( "Something is wrong" );
-    }
-] );
-
-// Execute some Lua code, including callbacks into PHP and into Lua
-
-$luaCode = <<<EOF
-php.output( "Hello, world" );
-
-return "Hi", function ( v )
-    return php.frobnosticate( v + 200 )
-end
-EOF;
-
-list( $hi, $frob ) = $sandbox->loadString( $luaCode )->call();
-assert( $frob->call( 4000 ) === [ 4242 ] );
-
-// PHP-thrown LuaSandboxRuntimeError exceptions can be caught inside Lua
-
-list( $ok, $message ) = $sandbox->loadString( 'return pcall( php.error )' )->call();
-assert( !$ok );
-assert( $message === 'Something is wrong' );
-
-?>
-]]>
-   </programlisting>
-  </example>
- </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/luasandbox/luasandbox.xml b/reference/luasandbox/luasandbox.xml
deleted file mode 100644
index a9abd647d5d4..000000000000
--- a/reference/luasandbox/luasandbox.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandbox" role="class">
-
- <title>The LuaSandbox class</title>
- <titleabbrev>LuaSandbox</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandbox intro -->
-  <section xml:id="luasandbox.intro">
-   &reftitle.intro;
-   <simpara>
-    The LuaSandbox class creates a Lua environment and allows for execution of
-    Lua code.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandbox.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandbox</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandbox</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandbox.constants.samples">LuaSandbox::SAMPLES</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandbox.constants.seconds">LuaSandbox::SECONDS</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandbox.constants.percent">LuaSandbox::PERCENT</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.luasandbox')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ LuaSandbox constants -->
-  <section xml:id="luasandbox.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="luasandbox.constants.samples">
-     <term><constant>LuaSandbox::SAMPLES</constant></term>
-     <listitem>
-      <simpara>
-       Used with <methodname>LuaSandbox::getProfilerFunctionReport</methodname> to return timings in samples.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="luasandbox.constants.seconds">
-     <term><constant>LuaSandbox::SECONDS</constant></term>
-     <listitem>
-      <simpara>
-       Used with <methodname>LuaSandbox::getProfilerFunctionReport</methodname> to return timings in seconds.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="luasandbox.constants.percent">
-     <term><constant>LuaSandbox::PERCENT</constant></term>
-     <listitem>
-      <simpara>
-       Used with <methodname>LuaSandbox::getProfilerFunctionReport</methodname> to return timings in percentages of the total.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.luasandbox.entities.luasandbox;
-
-</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/luasandbox/luasandbox/callfunction.xml b/reference/luasandbox/luasandbox/callfunction.xml
deleted file mode 100644
index 1e96f4863b84..000000000000
--- a/reference/luasandbox/luasandbox/callfunction.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.callfunction">
- <refnamediv>
-  <refname>LuaSandbox::callFunction</refname>
-  <refpurpose>Call a function in a Lua global variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>bool</type></type><methodname>LuaSandbox::callFunction</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Calls a function in a Lua global variable.
-  </simpara>
-  <simpara>
-   If the name contains "." characters, the function is located via
-   recursive table accesses, as if the name were a Lua expression.
-  </simpara>
-  <simpara>
-   If the variable does not exist, or is not a function, false will be
-   returned and a warning issued.
-  </simpara>
-  <simpara>
-   For more information about calling Lua functions and the return values,
-   see <methodname>LuaSandboxFunction::call</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      Lua variable name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-      Arguments to the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> of values returned by the Lua function, which may be empty, &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Calling a Lua function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// Call Lua's string.match
-$captures = $sandbox->callFunction( 'string.match', $string, $pattern );
-
-?>
-]]>
-   </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/luasandbox/luasandbox/disableprofiler.xml b/reference/luasandbox/luasandbox/disableprofiler.xml
deleted file mode 100644
index 7df8d3af8e42..000000000000
--- a/reference/luasandbox/luasandbox/disableprofiler.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.disableprofiler">
- <refnamediv>
-  <refname>LuaSandbox::disableProfiler</refname>
-  <refpurpose>Disable the profiler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaSandbox::disableProfiler</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Disables the profiler.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::enableProfiler</methodname></member>
-   <member><methodname>LuaSandbox::getProfilerFunctionReport</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/luasandbox/luasandbox/enableprofiler.xml b/reference/luasandbox/luasandbox/enableprofiler.xml
deleted file mode 100644
index cc920f65b2ee..000000000000
--- a/reference/luasandbox/luasandbox/enableprofiler.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.enableprofiler">
- <refnamediv>
-  <refname>LuaSandbox::enableProfiler</refname>
-  <refpurpose>Enable the profiler.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>LuaSandbox::enableProfiler</methodname>
-   <methodparam choice="opt"><type>float</type><parameter>period</parameter><initializer>0.02</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Enables the profiler. Profiling will begin when Lua code is entered.
-  </simpara>
-  <simpara>
-   The profiler periodically samples the Lua environment to record the
-   running function. Testing indicates that at least on Linux, setting a
-   period less than 1ms will lead to a high overrun count but no
-   performance problems.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>period</parameter></term>
-    <listitem>
-     <simpara>
-      Sampling period in seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a boolean indicating whether the profiler is enabled.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::disableProfiler</methodname></member>
-   <member><methodname>LuaSandbox::getProfilerFunctionReport</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/luasandbox/luasandbox/getcpuusage.xml b/reference/luasandbox/luasandbox/getcpuusage.xml
deleted file mode 100644
index 39282100a4ff..000000000000
--- a/reference/luasandbox/luasandbox/getcpuusage.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.getcpuusage">
- <refnamediv>
-  <refname>LuaSandbox::getCPUUsage</refname>
-  <refpurpose>Fetch the current CPU time usage of the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>LuaSandbox::getCPUUsage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Fetches the current CPU time usage of the Lua environment.
-  </simpara>
-  <simpara>
-   This includes time spent in PHP callbacks.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current CPU time usage in seconds.
-  </simpara>
-  <note>
-   <simpara>
-    On Windows, this function always returns zero. On operating systems that do
-    not support <constant>CLOCK_THREAD_CPUTIME_ID</constant>, such as FreeBSD
-    and Mac OS X, this function will return the elapsed wall-clock time, not
-    CPU time.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::getMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::getPeakMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::setCPULimit</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/luasandbox/luasandbox/getmemoryusage.xml b/reference/luasandbox/luasandbox/getmemoryusage.xml
deleted file mode 100644
index 1a59767ba5e0..000000000000
--- a/reference/luasandbox/luasandbox/getmemoryusage.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.getmemoryusage">
- <refnamediv>
-  <refname>LuaSandbox::getMemoryUsage</refname>
-  <refpurpose>Fetch the current memory usage of the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>LuaSandbox::getMemoryUsage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Fetches the current memory usage of the Lua environment.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current memory usage in bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::getPeakMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::getCPUUsage</methodname></member>
-   <member><methodname>LuaSandbox::setMemoryLimit</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/luasandbox/luasandbox/getpeakmemoryusage.xml b/reference/luasandbox/luasandbox/getpeakmemoryusage.xml
deleted file mode 100644
index f152100c800d..000000000000
--- a/reference/luasandbox/luasandbox/getpeakmemoryusage.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.getpeakmemoryusage">
- <refnamediv>
-  <refname>LuaSandbox::getPeakMemoryUsage</refname>
-  <refpurpose>Fetch the peak memory usage of the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>LuaSandbox::getPeakMemoryUsage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Fetches the peak memory usage of the Lua environment.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the peak memory usage in bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::getMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::getCPUUsage</methodname></member>
-   <member><methodname>LuaSandbox::setMemoryLimit</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/luasandbox/luasandbox/getprofilerfunctionreport.xml b/reference/luasandbox/luasandbox/getprofilerfunctionreport.xml
deleted file mode 100644
index 6301d38a94df..000000000000
--- a/reference/luasandbox/luasandbox/getprofilerfunctionreport.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.getprofilerfunctionreport">
- <refnamediv>
-  <refname>LuaSandbox::getProfilerFunctionReport</refname>
-  <refpurpose>Fetch profiler data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>LuaSandbox::getProfilerFunctionReport</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>units</parameter><initializer>LuaSandbox::SECONDS</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   For a profiling instance previously started by
-   <methodname>LuaSandbox::enableProfiler</methodname>, get a
-   report of the cost of each function.
-  </simpara>
-  <simpara>
-   The measurement unit used for the cost is determined by the
-   <varname>$units</varname> parameter:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><constant>LuaSandbox::SAMPLES</constant></term>
-    <listitem><simpara>Measure in number of samples.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><constant>LuaSandbox::SECONDS</constant></term>
-    <listitem><simpara>Measure in seconds of CPU time.</simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><constant>LuaSandbox::PERCENT</constant></term>
-    <listitem><simpara>Measure percentage of CPU time.</simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>units</parameter></term>
-    <listitem>
-     <simpara>
-      Measurement unit constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns profiler measurements, sorted in descending order, as an associative
-   <type>array</type>. Keys are the Lua function names (with source file and line
-   defined in angle brackets), values are the measurements as <type>int</type>
-   or <type>float</type>.
-  </simpara>
-  <note>
-   <simpara>
-    On Windows, this function always returns an empty array. On operating systems that do
-    not support <constant>CLOCK_THREAD_CPUTIME_ID</constant>, such as FreeBSD
-    and Mac OS X, this function will report the elapsed wall-clock time, not
-    CPU time.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Profiling Lua code</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// Start the profiler
-$sandbox->enableProfiler( 0.01 );
-
-// ... Execute some Lua code here ...
-
-// Fetch the profiler data
-$data = $sandbox->getProfilerFunctionReport();
-
-?>
-]]>
-   </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/luasandbox/luasandbox/getversioninfo.xml b/reference/luasandbox/luasandbox/getversioninfo.xml
deleted file mode 100644
index 69d1b7d5ef48..000000000000
--- a/reference/luasandbox/luasandbox/getversioninfo.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.getversioninfo">
- <refnamediv>
-  <refname>LuaSandbox::getVersionInfo</refname>
-  <refpurpose>Return the versions of LuaSandbox and Lua</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>LuaSandbox::getVersionInfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the versions of LuaSandbox and Lua.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with two keys:
-  </simpara>
-  <informaltable>
-   <tgroup cols="3">
-    <thead>
-     <row><entry>element</entry><entry>type</entry><entry>description</entry></row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>LuaSandbox</entry>
-      <entry><type>string</type></entry>
-      <entry>The version of the LuaSandbox extension.</entry>
-     </row>
-     <row>
-      <entry>Lua</entry>
-      <entry><type>string</type></entry>
-      <entry>The library name and version as defined by the LUA_RELEASE macro, for example, "Lua 5.1.5".</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/luasandbox/luasandbox/loadbinary.xml b/reference/luasandbox/luasandbox/loadbinary.xml
deleted file mode 100644
index 3be70973a698..000000000000
--- a/reference/luasandbox/luasandbox/loadbinary.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.loadbinary">
- <refnamediv>
-  <refname>LuaSandbox::loadBinary</refname>
-  <refpurpose>Load a precompiled binary chunk into the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>LuaSandboxFunction</type><methodname>LuaSandbox::loadBinary</methodname>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>chunkName</parameter><initializer>''</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Loads data generated by <methodname>LuaSandboxFunction::dump</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>code</parameter></term>
-    <listitem>
-     <simpara>
-      Data from <methodname>LuaSandboxFunction::dump</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>chunkName</parameter></term>
-    <listitem>
-     <simpara>
-      Name for the loaded function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>LuaSandboxFunction</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::loadString</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/luasandbox/luasandbox/loadstring.xml b/reference/luasandbox/luasandbox/loadstring.xml
deleted file mode 100644
index ed71a7fd82f5..000000000000
--- a/reference/luasandbox/luasandbox/loadstring.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.loadstring">
- <refnamediv>
-  <refname>LuaSandbox::loadString</refname>
-  <refpurpose>Load Lua code into the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>LuaSandboxFunction</type><methodname>LuaSandbox::loadString</methodname>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>chunkName</parameter><initializer>''</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Loads Lua code into the Lua environment.
-  </simpara>
-  <simpara>
-   This is the equivalent of standard Lua's <literal>loadstring()</literal> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>code</parameter></term>
-    <listitem>
-     <simpara>
-      Lua code.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>chunkName</parameter></term>
-    <listitem>
-     <simpara>
-      Name for the loaded chunk, for use in error traces.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>LuaSandboxFunction</classname> which, when executed, will execute the passed <varname>$code</varname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Loading code into Lua</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// Load the code
-$function = $sandbox->loadString(
-<<<CODE
-    return "Hello, world"
-CODE
-);
-
-// Execute the loaded code
-var_dump( $function->call() );
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  string(12) "Hello, world"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::registerLibrary</methodname></member>
-   <member><methodname>LuaSandbox::wrapPhpFunction</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/luasandbox/luasandbox/pauseusagetimer.xml b/reference/luasandbox/luasandbox/pauseusagetimer.xml
deleted file mode 100644
index 8bf4d7b0fb06..000000000000
--- a/reference/luasandbox/luasandbox/pauseusagetimer.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.pauseusagetimer">
- <refnamediv>
-  <refname>LuaSandbox::pauseUsageTimer</refname>
-  <refpurpose>Pause the CPU usage timer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>LuaSandbox::pauseUsageTimer</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Pauses the CPU usage timer.
-  </simpara>
-  <simpara>
-   This only has effect when called from within a callback from Lua. When
-   execution returns to Lua, the timer will be automatically unpaused. If
-   a new call into Lua is made, the timer will be unpaused for the
-   duration of that call.
-  </simpara>
-  <simpara>
-   If a PHP callback calls into Lua again with timer not paused, and then
-   that Lua function calls into PHP again, the second PHP call will not be
-   able to pause the timer. The logic is that even though the second PHP
-   call would avoid counting the CPU usage against the limit, the first
-   call still counts it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>bool</type> indicating whether the timer is now paused.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Manipulating the usage timer</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox and set a CPU limit
-$sandbox = new LuaSandbox();
-$sandbox->setCPULimit( 1 );
-
-function doWait( $t ) {
-    $end = microtime( true ) + $t;
-    while ( microtime( true ) < $end ) {
-        // waste CPU cycles
-    }
-}
-
-// Register a PHP callback
-$sandbox->registerLibrary( 'php', [
-    'test' => function () use ( $sandbox ) {
-        $sandbox->pauseUsageTimer();
-        doWait( 5 );
-
-        $sandbox->unpauseUsageTimer();
-        doWait( 0.1 );
-    },
-    'test2' => function () use ( $sandbox ) {
-        $sandbox->pauseUsageTimer();
-        $sandbox->unpauseUsageTimer();
-        doWait( 1.1 );
-    }
-] );
-
-echo "This should not time out...\n";
-$sandbox->loadString( 'php.test()' )->call();
-
-echo "This should time out.\n";
-try {
-    $sandbox->loadString( 'php.test2()' )->call();
-    echo "It did not?\n";
-} catch ( LuaSandboxTimeoutError $ex ) {
-    echo "It did! " . $ex->getMessage() . "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This should not time out...
-This should time out.
-It did! The maximum execution time for this script was exceeded
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::setCPULimit</methodname></member>
-   <member><methodname>LuaSandbox::unpauseUsageTimer</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/luasandbox/luasandbox/registerlibrary.xml b/reference/luasandbox/luasandbox/registerlibrary.xml
deleted file mode 100644
index 0e19cfbca64b..000000000000
--- a/reference/luasandbox/luasandbox/registerlibrary.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.registerlibrary">
- <refnamediv>
-  <refname>LuaSandbox::registerLibrary</refname>
-  <refpurpose>Register a set of PHP functions as a Lua library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaSandbox::registerLibrary</methodname>
-   <methodparam><type>string</type><parameter>libname</parameter></methodparam>
-   <methodparam><type>array</type><parameter>functions</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Registers a set of PHP functions as a Lua library, so that Lua can call
-   the relevant PHP code.
-  </simpara>
-  <simpara>
-   For more information about calling Lua functions and the return values,
-   see <methodname>LuaSandboxFunction::call</methodname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>libname</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the library. In the Lua state, the global variable of this
-      name will be set to the table of functions. If the table already exists,
-      the new functions will be added to it.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>functions</parameter></term>
-    <listitem>
-     <simpara>
-      An <type>array</type>, where each key is a function name, and each value is a
-      corresponding PHP <type>callable</type>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Registering PHP functions to call from Lua</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// Register some functions in the Lua environment
-
-function frobnosticate( $v ) {
-    return [ $v + 42 ];
-}
-
-$sandbox->registerLibrary( 'php', [
-    'frobnosticate' => 'frobnosticate',
-    'output' => function ( $string ) {
-        echo "$string\n";
-    },
-    'error' => function () {
-        throw new LuaSandboxRuntimeError( "Something is wrong" );
-    }
-] );
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::loadString</methodname></member>
-   <member><methodname>LuaSandbox::wrapPhpFunction</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/luasandbox/luasandbox/setcpulimit.xml b/reference/luasandbox/luasandbox/setcpulimit.xml
deleted file mode 100644
index cb8ff4e2cac2..000000000000
--- a/reference/luasandbox/luasandbox/setcpulimit.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.setcpulimit">
- <refnamediv>
-  <refname>LuaSandbox::setCPULimit</refname>
-  <refpurpose>Set the CPU time limit for the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaSandbox::setCPULimit</methodname>
-   <methodparam><type class="union"><type>float</type><type>bool</type></type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the CPU time limit for the Lua environment.
-  </simpara>
-  <simpara>
-   If the total user and system time used by the environment after the call
-   to this method exceeds this limit, a <classname>LuaSandboxTimeoutError</classname>
-   exception is thrown.
-  </simpara>
-  <simpara>
-   Time used in PHP callbacks is included in the limit.
-  </simpara>
-  <simpara>
-   Setting the time limit from a callback while Lua is running causes the
-   timer to be reset, or started if it was not already running.
-  </simpara>
-  <note>
-   <simpara>
-    On Windows, the CPU limit will be ignored. On operating systems that do
-    not support <constant>CLOCK_THREAD_CPUTIME_ID</constant>, such as FreeBSD
-    and Mac OS X, wall-clock time rather than CPU time will be limited.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Limit as a <type>float</type> in seconds, or &false; for no limit.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Calling a Lua function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// set a time limit
-$sandbox->setCPULimit( 2 );
-
-// Run Lua code
-$sandbox->loadString( 'while true do end' )->call();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error:  Uncaught LuaSandboxTimeoutError: The maximum execution time for this script was exceeded
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::getCPUUsage</methodname></member>
-   <member><methodname>LuaSandbox::setMemoryLimit</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/luasandbox/luasandbox/setmemorylimit.xml b/reference/luasandbox/luasandbox/setmemorylimit.xml
deleted file mode 100644
index 4a64f37847fd..000000000000
--- a/reference/luasandbox/luasandbox/setmemorylimit.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.setmemorylimit">
- <refnamediv>
-  <refname>LuaSandbox::setMemoryLimit</refname>
-  <refpurpose>Set the memory limit for the Lua environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaSandbox::setMemoryLimit</methodname>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the memory limit for the Lua environment.
-  </simpara>
-  <simpara>
-   If this limit is exceeded, a <classname>LuaSandboxMemoryError</classname>
-   exception is thrown.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Memory limit in bytes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Calling a Lua function</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// create a new LuaSandbox
-$sandbox = new LuaSandbox();
-
-// set a memory limit
-$sandbox->setMemoryLimit( 50 * 1024 * 1024 );
-
-// Run Lua code
-$sandbox->loadString( 'local x = "x"; while true do x = x .. x; end' )->call();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error:  Uncaught LuaSandboxMemoryError: not enough memory
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::getMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::getPeakMemoryUsage</methodname></member>
-   <member><methodname>LuaSandbox::setCPULimit</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/luasandbox/luasandbox/unpauseusagetimer.xml b/reference/luasandbox/luasandbox/unpauseusagetimer.xml
deleted file mode 100644
index 37127b11d01e..000000000000
--- a/reference/luasandbox/luasandbox/unpauseusagetimer.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.unpauseusagetimer">
- <refnamediv>
-  <refname>LuaSandbox::unpauseUsageTimer</refname>
-  <refpurpose>Unpause the timer paused by <methodname>LuaSandbox::pauseUsageTimer</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>LuaSandbox::unpauseUsageTimer</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Unpauses the timer paused by <methodname>LuaSandbox::pauseUsageTimer</methodname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::pauseUsageTimer</methodname></member>
-   <member><methodname>LuaSandbox::setCPULimit</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/luasandbox/luasandbox/wrapphpfunction.xml b/reference/luasandbox/luasandbox/wrapphpfunction.xml
deleted file mode 100644
index 079360c6840f..000000000000
--- a/reference/luasandbox/luasandbox/wrapphpfunction.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.wrapphpfunction">
- <refnamediv>
-  <refname>LuaSandbox::wrapPhpFunction</refname>
-  <refpurpose>Wrap a PHP callable in a <classname>LuaSandboxFunction</classname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>LuaSandboxFunction</type><methodname>LuaSandbox::wrapPhpFunction</methodname>
-   <methodparam><type>callable</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Wraps a PHP callable in a <classname>LuaSandboxFunction</classname>, so it
-   can be passed into Lua as an anonymous function.
-  </simpara>
-  <simpara>
-   The function must return either an array of values (which may be empty),
-   or &null; which is equivalent to returning the empty array.
-  </simpara>
-  <simpara>
-   Exceptions will be raised as errors in Lua, however only
-   <classname>LuaSandboxRuntimeError</classname> exceptions may be caught
-   inside Lua with <literal>pcall()</literal> or <literal>xpcall()</literal>.
-  </simpara>
-  <simpara>
-   For more information about calling Lua functions and the return values,
-   see <methodname>LuaSandboxFunction::call</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <simpara>
-      Callable to wrap.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>LuaSandboxFunction</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>LuaSandbox::loadString</methodname></member>
-   <member><methodname>LuaSandbox::registerLibrary</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/luasandbox/luasandboxerror.xml b/reference/luasandbox/luasandboxerror.xml
deleted file mode 100644
index f653f279f0d6..000000000000
--- a/reference/luasandbox/luasandboxerror.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxerror" role="class">
-
- <title>The LuaSandboxError class</title>
- <titleabbrev>LuaSandboxError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxError intro -->
-  <section xml:id="luasandboxerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class for LuaSandbox exceptions
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandboxerror.constants.run">LuaSandboxError::RUN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandboxerror.constants.syntax">LuaSandboxError::SYNTAX</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandboxerror.constants.mem">LuaSandboxError::MEM</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="luasandboxerror.constants.err">LuaSandboxError::ERR</varname>
-     <initializer>5</initializer>
-    </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.luasandboxerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ LuaSandboxError constants -->
-  <section xml:id="luasandboxerror.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="luasandboxerror.constants.run">
-     <term><constant>LuaSandboxError::RUN</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="luasandboxerror.constants.syntax">
-     <term><constant>LuaSandboxError::SYNTAX</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="luasandboxerror.constants.mem">
-     <term><constant>LuaSandboxError::MEM</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="luasandboxerror.constants.err">
-     <term><constant>LuaSandboxError::ERR</constant></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxerror; -->
-
-</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/luasandbox/luasandboxerrorerror.xml b/reference/luasandbox/luasandboxerrorerror.xml
deleted file mode 100644
index 95f7f5dbe6e7..000000000000
--- a/reference/luasandbox/luasandboxerrorerror.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxerrorerror" role="class">
-
- <title>The LuaSandboxErrorError class</title>
- <titleabbrev>LuaSandboxErrorError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxErrorError intro -->
-  <section xml:id="luasandboxerrorerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown when Lua encounters an error inside an error handler.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxerrorerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxErrorError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxErrorError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxFatalError</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.luasandboxerrorerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxerrorerror; -->
-
-</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/luasandbox/luasandboxfatalerror.xml b/reference/luasandbox/luasandboxfatalerror.xml
deleted file mode 100644
index ae9f253532c5..000000000000
--- a/reference/luasandbox/luasandboxfatalerror.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxfatalerror" role="class">
-
- <title>The LuaSandboxFatalError class</title>
- <titleabbrev>LuaSandboxFatalError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxFatalError intro -->
-  <section xml:id="luasandboxfatalerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Uncatchable LuaSandbox exceptions.
-   </simpara>
-   <simpara>
-    These may not be caught inside Lua using
-    <literal>pcall()</literal> or <literal>xpcall()</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxfatalerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxFatalError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxFatalError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxError</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.luasandboxfatalerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxfatalerror; -->
-
-</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/luasandbox/luasandboxfunction.xml b/reference/luasandbox/luasandboxfunction.xml
deleted file mode 100644
index a967c4be5e93..000000000000
--- a/reference/luasandbox/luasandboxfunction.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxfunction" role="class">
-
- <title>The LuaSandboxFunction class</title>
- <titleabbrev>LuaSandboxFunction</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxFunction intro -->
-  <section xml:id="luasandboxfunction.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a Lua function, allowing it to be called from PHP.
-   </simpara>
-   <simpara>
-    A LuaSandboxFunction may be obtained as a return value from Lua, as a parameter
-    passed to a callback from Lua, or by using
-    <methodname>LuaSandbox::wrapPhpFunction</methodname>,
-    <methodname>LuaSandbox::loadString</methodname>, or
-    <methodname>LuaSandbox::loadBinary</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxfunction.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxFunction</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxFunction</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.luasandboxfunction')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.luasandbox.entities.luasandboxfunction;
-
-</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/luasandbox/luasandboxfunction/call.xml b/reference/luasandbox/luasandboxfunction/call.xml
deleted file mode 100644
index c0536015e9a5..000000000000
--- a/reference/luasandbox/luasandboxfunction/call.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandboxfunction.call">
- <refnamediv>
-  <refname>LuaSandboxFunction::call</refname>
-  <refpurpose>Call a Lua function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>bool</type></type><methodname>LuaSandboxFunction::call</methodname>
-   <methodparam rep="repeat"><type>string</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Calls a Lua function.
-  </simpara>
-  <simpara>
-   Errors considered to be the fault of the PHP code will result in the
-   function returning &false; and <constant>E_WARNING</constant>
-   being raised, for example, a <type>resource</type> type being used as an
-   argument. Lua errors will result in a <classname>LuaSandboxRuntimeError</classname>
-   exception being thrown.
-  </simpara>
-  <simpara>
-   PHP and Lua types are converted as follows:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>PHP &null; is Lua <literal>nil</literal>, and vice versa.</simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     PHP <type>int</type>s and <type>float</type>s are converted to Lua
-     numbers. Infinity and <constant>NAN</constant> are supported.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Lua numbers without a fractional part between approximately <literal>-2**53</literal>
-     and <literal>2**53</literal> are converted to PHP <type>int</type>s, with others
-     being converted to PHP <type>float</type>s.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>PHP <type>bool</type>s are Lua booleans, and vice versa.</simpara>
-   </listitem>
-   <listitem>
-    <simpara>PHP <type>string</type>s are Lua strings, and vice versa.</simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Lua functions are PHP <classname>LuaSandboxFunction</classname> objects, and vice versa.
-     General PHP <type>callable</type>s are not supported.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     PHP <type>array</type>s are converted to Lua tables, and vice versa.
-    </simpara>
-    <itemizedlist>
-     <listitem>
-      <simpara>
-       Note that Lua typically indexes arrays from 1, while PHP indexes
-       arrays from 0. No adjustment is made for these differing
-       conventions.
-      </simpara>
-     </listitem>
-     <listitem>
-      <simpara>Self-referential arrays are not supported in either direction.</simpara>
-     </listitem>
-     <listitem>
-      <simpara>PHP references are dereferenced.</simpara>
-     </listitem>
-     <listitem>
-      <simpara>
-       Lua <literal>__pairs</literal> and <literal>__ipairs</literal> are processed.
-       <literal>__index</literal> is ignored.
-      </simpara>
-     </listitem>
-     <listitem>
-      <simpara>
-       When converting from PHP to Lua, integer keys between
-       <literal>-2**53</literal> and <literal>2**53</literal> are represented
-       as Lua numbers. All other keys are represented as Lua strings.
-      </simpara>
-     </listitem>
-     <listitem>
-      <simpara>
-       When converting from Lua to PHP, keys other than strings and
-       numbers will result in an error, as will collisions when converting
-       numbers to strings or vice versa (since PHP considers things like
-       <literal>$a[0]</literal> and <literal>$a["0"]</literal> as being equivalent).
-      </simpara>
-     </listitem>
-    </itemizedlist>
-   </listitem>
-   <listitem>
-    <simpara>
-     All other types are unsupported and will raise an error/exception,
-     including general PHP <type>object</type>s and Lua userdata and thread types.
-    </simpara>
-   </listitem>
-  </itemizedlist>
-  <simpara>
-   Lua functions inherently return a list of results. So on success, this
-   method returns an <type>array</type> containing all of the values returned by Lua,
-   with <type>int</type> keys starting from zero. Lua may return no results, in
-   which case an empty array is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-      Arguments passed to the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> of values returned by the function, which may be empty,
-   &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/luasandbox/luasandboxfunction/construct.xml b/reference/luasandbox/luasandboxfunction/construct.xml
deleted file mode 100644
index ae94d0972b3b..000000000000
--- a/reference/luasandbox/luasandboxfunction/construct.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandboxfunction.construct">
- <refnamediv>
-  <refname>LuaSandboxFunction::__construct</refname>
-  <refpurpose>Unused</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>LuaSandboxFunction::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   <classname>LuaSandboxFunction</classname> are obtained as a return value from Lua,
-   as a parameter passed to a callback from Lua, or by using
-   <methodname>LuaSandbox::wrapPhpFunction</methodname>,
-   <methodname>LuaSandbox::loadString</methodname>, or
-   <methodname>LuaSandbox::loadBinary</methodname>. They cannot be constructed directly.
-  </simpara>
-
- </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/luasandbox/luasandboxfunction/dump.xml b/reference/luasandbox/luasandboxfunction/dump.xml
deleted file mode 100644
index 4c76c59ee129..000000000000
--- a/reference/luasandbox/luasandboxfunction/dump.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandboxfunction.dump">
- <refnamediv>
-  <refname>LuaSandboxFunction::dump</refname>
-  <refpurpose>Dump the function as a binary blob</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>LuaSandboxFunction::dump</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Dumps the function as a binary blob.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string that may be passed to <methodname>LuaSandbox::loadBinary</methodname>.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/luasandbox/luasandboxmemoryerror.xml b/reference/luasandbox/luasandboxmemoryerror.xml
deleted file mode 100644
index 9ae6439a924d..000000000000
--- a/reference/luasandbox/luasandboxmemoryerror.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxmemoryerror" role="class">
-
- <title>The LuaSandboxMemoryError class</title>
- <titleabbrev>LuaSandboxMemoryError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxMemoryError intro -->
-  <section xml:id="luasandboxmemoryerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown when Lua cannot allocate memory.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxmemoryerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxMemoryError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxMemoryError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxFatalError</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.luasandboxmemoryerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="luasandboxmemoryerror.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><methodname>LuaSandbox::setMemoryLimit</methodname></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxmemoryerror; -->
-
-</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/luasandbox/luasandboxruntimeerror.xml b/reference/luasandbox/luasandboxruntimeerror.xml
deleted file mode 100644
index 68a40b2c1d2e..000000000000
--- a/reference/luasandbox/luasandboxruntimeerror.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxruntimeerror" role="class">
-
- <title>The LuaSandboxRuntimeError class</title>
- <titleabbrev>LuaSandboxRuntimeError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxRuntimeError intro -->
-  <section xml:id="luasandboxruntimeerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Catchable LuaSandbox runtime exceptions.
-   </simpara>
-   <simpara>
-    These may be caught inside Lua using
-    <literal>pcall()</literal> or <literal>xpcall()</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxruntimeerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxRuntimeError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxRuntimeError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxError</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.luasandboxruntimeerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxruntimeerror; -->
-
-</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/luasandbox/luasandboxsyntaxerror.xml b/reference/luasandbox/luasandboxsyntaxerror.xml
deleted file mode 100644
index 75c2ae450954..000000000000
--- a/reference/luasandbox/luasandboxsyntaxerror.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxsyntaxerror" role="class">
-
- <title>The LuaSandboxSyntaxError class</title>
- <titleabbrev>LuaSandboxSyntaxError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxSyntaxError intro -->
-  <section xml:id="luasandboxsyntaxerror.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown when Lua code cannot be parsed.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxsyntaxerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxSyntaxError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxSyntaxError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxFatalError</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.luasandboxsyntaxerror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxsyntaxerror; -->
-
-</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/luasandbox/luasandboxtimeouterror.xml b/reference/luasandbox/luasandboxtimeouterror.xml
deleted file mode 100644
index 978f453b4ae9..000000000000
--- a/reference/luasandbox/luasandboxtimeouterror.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.luasandboxtimeouterror" role="class">
-
- <title>The LuaSandboxTimeoutError class</title>
- <titleabbrev>LuaSandboxTimeoutError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ LuaSandboxTimeoutError intro -->
-  <section xml:id="luasandboxtimeouterror.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown when the configured CPU time limit is exceeded.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="luasandboxtimeouterror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>LuaSandboxTimeoutError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>LuaSandboxTimeoutError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LuaSandboxFatalError</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.luasandboxtimeouterror')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="luasandboxtimeouterror.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><methodname>LuaSandbox::setCPULimit</methodname></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- <!-- &reference.luasandbox.entities.luasandboxtimeouterror; -->
-
-</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/luasandbox/setup.xml b/reference/luasandbox/setup.xml
deleted file mode 100644
index c85c1ab55f86..000000000000
--- a/reference/luasandbox/setup.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="luasandbox.setup">
- &reftitle.setup;
-
- <section xml:id="luasandbox.requirements">
-  &reftitle.required;
-  <simpara>
-   To use this extension, Lua 5.1 will need to be installed, available on the <link xlink:href="&url.lua;">Lua homepage</link>.
-  </simpara>
-  <simpara>
-   To make full use of the timer features, LuaSandbox should be installed on
-   Linux.
-  </simpara>
-  <simpara>
-   If FreeBSD or Mac OS X is used, only real (wall-clock) time is
-   supported, the functions purporting to return CPU time will actually return
-   wall clock time.
-  </simpara>
-  <simpara>
-   If Windows is used, no timer functions will be supported. The time limits
-   will be inoperable.
-  </simpara>
- </section>
-
- <section xml:id="luasandbox.installation">
-  &reftitle.install;
-
-  <para>
-   If the operating system is Debian 10 or later, or Ubuntu 18.04 or later, then
-   LuaSandbox should typically be installed from the package
-   <literal>php-luasandbox</literal>:
-
-   <programlisting role="shell">
-<![CDATA[
-sudo apt-get install php-luasandbox
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   To install LuaSandbox using <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&url.pie;">PIE</link>,
-   run the following command:
-   <programlisting role="shell">
-<![CDATA[
-pie install wikimedia/luasandbox
-]]>
-   </programlisting>
-  </para>
-
-  <note>
-   <simpara>
-    Old releases can be found in the <link xlink:href="&url.pecl.package;luasandbox">LuaSandbox PECL package</link>.
-   </simpara>
-  </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/luasandbox/versions.xml b/reference/luasandbox/versions.xml
deleted file mode 100644
index 46cb2ea3561c..000000000000
--- a/reference/luasandbox/versions.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='luasandbox' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::getversioninfo' from='PECL luasandbox &gt;= 1.6.0'/>
- <function name='luasandbox::loadstring' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::loadbinary' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::setmemorylimit' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::getmemoryusage' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::getpeakmemoryusage' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::setcpulimit' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::getcpuusage' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::pauseusagetimer' from='PECL luasandbox &gt;= 1.4.0'/>
- <function name='luasandbox::unpauseusagetimer' from='PECL luasandbox &gt;= 1.4.0'/>
- <function name='luasandbox::enableprofiler' from='PECL luasandbox &gt;= 1.1.0'/>
- <function name='luasandbox::disableprofiler' from='PECL luasandbox &gt;= 1.1.0'/>
- <function name='luasandbox::getprofilerfunctionreport' from='PECL luasandbox &gt;= 1.1.0'/>
- <function name='luasandbox::callfunction' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandbox::wrapphpfunction' from='PECL luasandbox &gt;= 1.2.0'/>
- <function name='luasandbox::registerlibrary' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxruntimeerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxfatalerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxsyntaxerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxmemoryerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxerrorerror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxtimeouterror' from='PECL luasandbox &gt;= 1.0.0'/>
-
- <function name='luasandboxfunction' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandboxfunction::__construct' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandboxfunction::call' from='PECL luasandbox &gt;= 1.0.0'/>
- <function name='luasandboxfunction::dump' from='PECL luasandbox &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/lzf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/lzf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/lzf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/lzf/book.xml b/reference/lzf/book.xml
deleted file mode 100644
index 25ab569d17f6..000000000000
--- a/reference/lzf/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.lzf">
- <?phpdoc extension-membership="pecl" ?>
- <title>LZF</title>
- <titleabbrev>LZF</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.lzf">
-  &reftitle.intro;
-  <simpara>
-   LZF is a very fast compression algorithm, ideal for saving space with
-   only slight speed cost. It can be optimized for speed or space at the
-   time of compilation. This extension is using <link xlink:href="&url.liblzf;">liblzf</link>
-   library by Marc Lehmann for its operations.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.lzf.setup;
- &reference.lzf.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/lzf/configure.xml b/reference/lzf/configure.xml
deleted file mode 100644
index 9b1298b62f32..000000000000
--- a/reference/lzf/configure.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="lzf.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;lzf">&url.pecl.package;lzf</link>.
- </simpara>
- <simpara>
-  In order to use these functions you must compile PHP with lzf support
-  by using the <option role="configure">--with-lzf[=DIR]</option>
-  configure option.  You may also pass
-  <option role="configure">--enable-lzf-better-compression</option> to
-  optimize LZF for space rather than speed.
- </simpara>
- <simpara>
-  Windows users will enable <filename>php_lzf.dll</filename> inside
-  of &php.ini; in order to use these functions.
- </simpara>
-</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/lzf/functions/lzf-compress.xml b/reference/lzf/functions/lzf-compress.xml
deleted file mode 100644
index d091ce41689e..000000000000
--- a/reference/lzf/functions/lzf-compress.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.lzf-compress">
- <refnamediv>
-  <refname>lzf_compress</refname>
-  <refpurpose>
-   LZF compression
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>lzf_compress</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>lzf_compress</function> compresses the given
-   <parameter>data</parameter> string using LZF encoding.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The string to compress.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the compressed data or &false; if an error occurred.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>lzf_decompress</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/lzf/functions/lzf-decompress.xml b/reference/lzf/functions/lzf-decompress.xml
deleted file mode 100644
index af37ed29b193..000000000000
--- a/reference/lzf/functions/lzf-decompress.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.lzf-decompress">
- <refnamediv>
-  <refname>lzf_decompress</refname>
-  <refpurpose>
-   LZF decompression
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>lzf_decompress</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>lzf_compress</function> decompresses the given
-   <parameter>data</parameter> string containing lzf encoded data.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The compressed string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the decompressed data or &false; if an error occurred.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>lzf_compress</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/lzf/functions/lzf-optimized-for.xml b/reference/lzf/functions/lzf-optimized-for.xml
deleted file mode 100644
index c7e694995b52..000000000000
--- a/reference/lzf/functions/lzf-optimized-for.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.0. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.lzf-optimized-for">
- <refnamediv>
-  <refname>lzf_optimized_for</refname>
-  <refpurpose>
-   Determines what LZF extension was optimized for
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>lzf_optimized_for</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Determines what was LZF extension optimized for during compilation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns 1 if LZF was optimized for speed, 0 for compression.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/lzf/reference.xml b/reference/lzf/reference.xml
deleted file mode 100644
index a6306154a943..000000000000
--- a/reference/lzf/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.lzf" xmlns="http://docbook.org/ns/docbook">
- <title>LZF &Functions;</title>
-
- &reference.lzf.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/lzf/setup.xml b/reference/lzf/setup.xml
deleted file mode 100644
index 07070ab9058d..000000000000
--- a/reference/lzf/setup.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="lzf.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.lzf.configure;
- <!-- }}} -->
-
-</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/lzf/versions.xml b/reference/lzf/versions.xml
deleted file mode 100644
index 6306aac69496..000000000000
--- a/reference/lzf/versions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='lzf_compress' from='PECL lzf &gt;= 0.1.0'/>
- <function name='lzf_decompress' from='PECL lzf &gt;= 0.1.0'/>
- <function name='lzf_optimized_for' from='PECL lzf &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/mailparse/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mailparse/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mailparse/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mailparse/book.xml b/reference/mailparse/book.xml
deleted file mode 100644
index 7cd4d94f5947..000000000000
--- a/reference/mailparse/book.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.mailparse">
- <?phpdoc extension-membership="pecl" ?>
- <title>Mailparse</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.mailparse">
-  &reftitle.intro;
-  <simpara>
-   Mailparse is an extension for parsing and working with email messages.
-   It can deal with <link xlink:href="&url.rfc;822">RFC 822</link> and <link xlink:href="&url.rfc;2045">RFC 2045</link> (<literal>MIME</literal>) compliant
-   messages.
-  </simpara>
-  <simpara>
-   Mailparse is stream based, which means that it does not keep in-memory
-   copies of the files it processes - so it is very resource efficient when
-   dealing with large messages.
-  </simpara>
-  <note>
-   <simpara>
-    Mailparse requires the <link linkend="book.mbstring">mbstring</link>
-    extension, and mbstring must be loaded before mailparse.
-   </simpara>
-  </note>
- </preface>
- <!-- }}} -->
-
- &reference.mailparse.setup;
- &reference.mailparse.constants;
- <!-- FIXME: Apparently this is a class.. -->
- &reference.mailparse.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/mailparse/configure.xml b/reference/mailparse/configure.xml
deleted file mode 100644
index e92c20f59df4..000000000000
--- a/reference/mailparse/configure.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mailparse.installation">
- &reftitle.install;
- <simpara xml:id="mailparse.configure">
-  &pecl.moved;
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mailparse">&url.pecl.package;mailparse</link>.
- </simpara>
- <simpara>
-  In order to use these functions you must compile PHP with mailparse support
-  by using the <option role="configure">--enable-mailparse</option> configure
-  option.
- </simpara>
- <simpara>
-  Windows users will enable <filename>php_mailparse.dll</filename> inside
-  of &php.ini; in order to use these functions.
-  &pecl.windows.download.avail;
- </simpara>
- <simpara>
-  It is necessary that the <link linkend="ref.mbstring">mbstring</link>
-  extension is loaded before mailparse.
- </simpara>
-</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/mailparse/constants.xml b/reference/mailparse/constants.xml
deleted file mode 100644
index 0664f9274bb1..000000000000
--- a/reference/mailparse/constants.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="mailparse.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.mailparse-extract-output">
-   <term>
-    <constant>MAILPARSE_EXTRACT_OUTPUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.mailparse-extract-stream">
-   <term>
-    <constant>MAILPARSE_EXTRACT_STREAM</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.mailparse-extract-return">
-   <term>
-    <constant>MAILPARSE_EXTRACT_RETURN</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/mailparse/functions/mailparse-determine-best-xfer-encoding.xml b/reference/mailparse/functions/mailparse-determine-best-xfer-encoding.xml
deleted file mode 100644
index 69306365475d..000000000000
--- a/reference/mailparse/functions/mailparse-determine-best-xfer-encoding.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.mailparse-determine-best-xfer-encoding">
- <refnamediv>
-  <refname>mailparse_determine_best_xfer_encoding</refname>
-  <refpurpose>Gets the best way of encoding</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mailparse_determine_best_xfer_encoding</methodname>
-   <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Figures out the best way of encoding the content read from the given file
-   pointer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fp</parameter></term>
-    <listitem>
-     <simpara>
-      A valid file pointer, which must be seek-able.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns one of the character encodings supported by the
-   <link linkend="ref.mbstring">mbstring</link> module.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mailparse_determine_best_xfer_encoding</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$fp = fopen('somemail.eml', 'r');
-echo 'Best encoding: ' . mailparse_determine_best_xfer_encoding($fp);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Best encoding: 7bit
-]]>
-   </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/mailparse/functions/mailparse-msg-create.xml b/reference/mailparse/functions/mailparse-msg-create.xml
deleted file mode 100644
index f37f1997d5cc..000000000000
--- a/reference/mailparse/functions/mailparse-msg-create.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-create">
- <refnamediv>
-  <refname>mailparse_msg_create</refname>
-  <refpurpose>Create a mime mail resource</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mailparse_msg_create</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Create a <literal>MIME</literal> mail resource.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a handle that can be used to parse a message.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    It is recommended to call <function>mailparse_msg_free</function> on the result
-    of this function, when it is no longer needed, to avoid memory leaks.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_free</function></member>
-   <member><function>mailparse_msg_parse_file</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/mailparse/functions/mailparse-msg-extract-part-file.xml b/reference/mailparse/functions/mailparse-msg-extract-part-file.xml
deleted file mode 100644
index f10de454f80a..000000000000
--- a/reference/mailparse/functions/mailparse-msg-extract-part-file.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.mailparse-msg-extract-part-file">
- <refnamediv>
-  <refname>mailparse_msg_extract_part_file</refname>
-  <refpurpose>Extracts/decodes a message section</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mailparse_msg_extract_part_file</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callbackfunc</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Extracts/decodes a message section from the supplied filename.
-  </simpara>
-  <simpara>
-   The contents of the section will be decoded according to their transfer
-   encoding - base64, quoted-printable and uuencoded text are supported.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource, created with
-      <function>mailparse_msg_create</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Can be a file name or a valid stream resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callbackfunc</parameter></term>
-    <listitem>
-     <simpara>
-      If set, this must be either a valid callback that will be passed the
-      extracted section, or &null; to make this function return the
-      extracted section.
-     </simpara>
-     <simpara>
-      If not specified, the contents will be sent to "stdout".
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If <parameter>callbackfunc</parameter> is not &null; returns &true; on
-   success.
-  </simpara>
-  <simpara>
-   If <parameter>callbackfunc</parameter> is set to &null;, returns the
-   extracted section as a string.
-  </simpara>
-  <simpara>
-   Returns &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_extract_part</function></member>
-   <member><function>mailparse_msg_extract_whole_part_file</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/mailparse/functions/mailparse-msg-extract-part.xml b/reference/mailparse/functions/mailparse-msg-extract-part.xml
deleted file mode 100644
index 46b70f18b475..000000000000
--- a/reference/mailparse/functions/mailparse-msg-extract-part.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-extract-part">
- <refnamediv>
-  <refname>mailparse_msg_extract_part</refname>
-  <refpurpose>
-   Extracts/decodes a message section
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mailparse_msg_extract_part</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-   <methodparam><type>string</type><parameter>msgbody</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callbackfunc</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>msgbody</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callbackfunc</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_extract_part_file</function></member>
-   <member><function>mailparse_msg_extract_whole_part_file</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/mailparse/functions/mailparse-msg-extract-whole-part-file.xml b/reference/mailparse/functions/mailparse-msg-extract-whole-part-file.xml
deleted file mode 100644
index ff37575c2920..000000000000
--- a/reference/mailparse/functions/mailparse-msg-extract-whole-part-file.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-extract-whole-part-file">
- <refnamediv>
-  <refname>mailparse_msg_extract_whole_part_file</refname>
-  <refpurpose>Extracts a message section including headers without decoding the transfer encoding</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mailparse_msg_extract_whole_part_file</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callbackfunc</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callbackfunc</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_extract_part</function></member>
-   <member><function>mailparse_msg_extract_part_file</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/mailparse/functions/mailparse-msg-free.xml b/reference/mailparse/functions/mailparse-msg-free.xml
deleted file mode 100644
index ded38f4977fc..000000000000
--- a/reference/mailparse/functions/mailparse-msg-free.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-free">
- <refnamediv>
-  <refname>mailparse_msg_free</refname>
-  <refpurpose>Frees a MIME resource</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mailparse_msg_free</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Frees a <literal>MIME</literal> resource.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource allocated by
-      <function>mailparse_msg_create</function> or
-      <function>mailparse_msg_parse_file</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_create</function></member>
-   <member><function>mailparse_msg_parse_file</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/mailparse/functions/mailparse-msg-get-part-data.xml b/reference/mailparse/functions/mailparse-msg-get-part-data.xml
deleted file mode 100644
index cb50d978e354..000000000000
--- a/reference/mailparse/functions/mailparse-msg-get-part-data.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-get-part-data">
- <refnamediv>
-  <refname>mailparse_msg_get_part_data</refname>
-  <refpurpose>Returns an associative array of info about the message</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mailparse_msg_get_part_data</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </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/mailparse/functions/mailparse-msg-get-part.xml b/reference/mailparse/functions/mailparse-msg-get-part.xml
deleted file mode 100644
index c8d2fc15c861..000000000000
--- a/reference/mailparse/functions/mailparse-msg-get-part.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-get-part">
- <refnamediv>
-  <refname>mailparse_msg_get_part</refname>
-  <refpurpose>Returns a handle on a given section in a mimemessage</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mailparse_msg_get_part</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mimesection</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mimesection</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </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/mailparse/functions/mailparse-msg-get-structure.xml b/reference/mailparse/functions/mailparse-msg-get-structure.xml
deleted file mode 100644
index 155e343515a1..000000000000
--- a/reference/mailparse/functions/mailparse-msg-get-structure.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-get-structure">
- <refnamediv>
-  <refname>mailparse_msg_get_structure</refname>
-  <refpurpose>Returns an array of mime section names in the supplied message</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mailparse_msg_get_structure</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </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/mailparse/functions/mailparse-msg-parse-file.xml b/reference/mailparse/functions/mailparse-msg-parse-file.xml
deleted file mode 100644
index 6bcf82ba8a61..000000000000
--- a/reference/mailparse/functions/mailparse-msg-parse-file.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-parse-file">
- <refnamediv>
-  <refname>mailparse_msg_parse_file</refname>
-  <refpurpose>Parses a file</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mailparse_msg_parse_file</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Parses a file.
-   This is the optimal way of parsing a mail file that you have on disk.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the file holding the message.
-      The file is opened and streamed through the parser.
-     </simpara>
-     <note>
-      <simpara>
-       The message contained in <parameter>filename</parameter> is supposed to end with a newline
-       (<literal>CRLF</literal>); otherwise the last line of the message will not be parsed.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <literal>MIME</literal> resource representing the structure, or
-   &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    It is recommended to call <function>mailparse_msg_free</function> on the result
-    of this function, when it is no longer needed, to avoid memory leaks.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mailparse_msg_free</function></member>
-   <member><function>mailparse_msg_create</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/mailparse/functions/mailparse-msg-parse.xml b/reference/mailparse/functions/mailparse-msg-parse.xml
deleted file mode 100644
index 1b07ae0b809d..000000000000
--- a/reference/mailparse/functions/mailparse-msg-parse.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-msg-parse">
- <refnamediv>
-  <refname>mailparse_msg_parse</refname>
-  <refpurpose>Incrementally parse data into buffer</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mailparse_msg_parse</methodname>
-   <methodparam><type>resource</type><parameter>mimemail</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Incrementally parse data into the supplied mime mail resource.
-  </simpara>
-  <simpara>
-   This function allow you to stream portions of a file at a time, rather
-   than read and parse the whole thing.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mimemail</parameter></term>
-    <listitem>
-     <simpara>
-      A valid <literal>MIME</literal> resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <note>
-      <simpara>
-       The final chunk of <parameter>data</parameter> is supposed to end with a newline
-       (<literal>CRLF</literal>); otherwise the last line of the message will not be parsed.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mailparse/functions/mailparse-rfc822-parse-addresses.xml b/reference/mailparse/functions/mailparse-rfc822-parse-addresses.xml
deleted file mode 100644
index b30da0866bd6..000000000000
--- a/reference/mailparse/functions/mailparse-rfc822-parse-addresses.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mailparse-rfc822-parse-addresses">
- <refnamediv>
-  <refname>mailparse_rfc822_parse_addresses</refname>
-  <refpurpose>Parse RFC 822 compliant addresses</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mailparse_rfc822_parse_addresses</methodname>
-   <methodparam><type>string</type><parameter>addresses</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Parses a <link xlink:href="&url.rfc;822">RFC 822</link> compliant recipient
-   list, such as that found in the <literal>To:</literal> header.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>addresses</parameter></term>
-    <listitem>
-     <simpara>
-      A string containing addresses, like in:
-      <literal>Wez Furlong &lt;wez@example.com&gt;, doe@example.com</literal>
-     </simpara>
-     <note>
-      <simpara>
-       This string must not include the header name.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of associative arrays with the following keys for each
-   recipient:
-   <informaltable>
-    <tgroup cols="2">
-     <tbody>
-      <row>
-       <entry><literal>display</literal></entry>
-       <entry>
-        The recipient name, for display purpose. If this part is not set for a
-        recipient, this key will hold the same value as
-        <literal>address</literal>.
-       </entry>
-      </row>
-      <row>
-       <entry><literal>address</literal></entry>
-       <entry>The email address</entry>
-      </row>
-      <row>
-       <entry><literal>is_group</literal></entry>
-       <entry>&true; if the recipient is a newsgroup, &false; otherwise.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mailparse_rfc822_parse_addresses</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$to = 'Wez Furlong <wez@example.com>, doe@example.com';
-var_dump(mailparse_rfc822_parse_addresses($to));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(3) {
-    ["display"]=>
-    string(11) "Wez Furlong"
-    ["address"]=>
-    string(15) "wez@example.com"
-    ["is_group"]=>
-    bool(false)
-  }
-  [1]=>
-  array(3) {
-    ["display"]=>
-    string(15) "doe@example.com"
-    ["address"]=>
-    string(15) "doe@example.com"
-    ["is_group"]=>
-    bool(false)
-  }
-}
-]]>
-   </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/mailparse/functions/mailparse-stream-encode.xml b/reference/mailparse/functions/mailparse-stream-encode.xml
deleted file mode 100644
index 41c37cf96761..000000000000
--- a/reference/mailparse/functions/mailparse-stream-encode.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-stream-encode">
- <refnamediv>
-  <refname>mailparse_stream_encode</refname>
-  <refpurpose>
-   Streams data from source file pointer, apply encoding and write to destfp
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mailparse_stream_encode</methodname>
-   <methodparam><type>resource</type><parameter>sourcefp</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>destfp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Streams data from the source file pointer, apply
-   <parameter>encoding</parameter> and write to the destination file pointer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sourcefp</parameter></term>
-    <listitem>
-     <simpara>
-      A valid file handle. The file is streamed through the parser.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>destfp</parameter></term>
-    <listitem>
-     <simpara>
-      The destination file handle in which the encoded data will be written.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>encoding</parameter></term>
-    <listitem>
-     <simpara>
-      One of the character encodings supported by the
-      <link linkend="ref.mbstring">mbstring</link> module.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mailparse_stream_encode</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// email.eml contents: hello, this is some text=hello.
-$fp = fopen('email.eml', 'r');
-
-$dest = tmpfile();
-
-mailparse_stream_encode($fp, $dest, "quoted-printable");
-
-rewind($dest);
-
-// Display new file contents
-fpassthru($dest);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-hello, this is some text=3Dhello.
-]]>
-   </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/mailparse/functions/mailparse-uudecode-all.xml b/reference/mailparse/functions/mailparse-uudecode-all.xml
deleted file mode 100644
index 12ae26833c6a..000000000000
--- a/reference/mailparse/functions/mailparse-uudecode-all.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mailparse-uudecode-all">
- <refnamediv>
-  <refname>mailparse_uudecode_all</refname>
-  <refpurpose>
-   Scans the data from fp and extract each embedded uuencoded file
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mailparse_uudecode_all</methodname>
-   <methodparam><type>resource</type><parameter>fp</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Scans the data from the given file pointer and extract each embedded
-   uuencoded file into a temporary file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fp</parameter></term>
-    <listitem>
-     <simpara>
-      A valid file pointer.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of associative arrays listing filename information.
-   <informaltable>
-    <tgroup cols="2">
-     <tbody>
-      <row>
-       <entry><literal>filename</literal></entry>
-       <entry>Path to the temporary file name created</entry>
-      </row>
-      <row>
-       <entry><literal>origfilename</literal></entry>
-       <entry>The original filename, for uuencoded parts only</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-   The first filename entry is the message body. The next entries are the
-   decoded uuencoded files.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mailparse_uudecode_all</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$text = <<<EOD
-To: fred@example.com
-
-hello, this is some text hello.
-blah blah blah.
-
-begin 644 test.txt
-/=&AI<R!I<R!A('1E<W0*
-`
-end
-
-EOD;
-
-$fp = tmpfile();
-fwrite($fp, $text);
-
-$data = mailparse_uudecode_all($fp);
-
-echo "BODY\n";
-readfile($data[0]["filename"]);
-echo "UUE ({$data[1]['origfilename']})\n";
-readfile($data[1]["filename"]);
-
-// Clean up
-unlink($data[0]["filename"]);
-unlink($data[1]["filename"]);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-BODY
-To: fred@example.com
-
-hello, this is some text hello.
-blah blah blah.
-
-UUE (test.txt)
-this is a test
-]]>
-   </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/mailparse/reference.xml b/reference/mailparse/reference.xml
deleted file mode 100644
index d72ed1681589..000000000000
--- a/reference/mailparse/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <reference xml:id="ref.mailparse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Mailparse &Functions;</title>
-
-&reference.mailparse.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/mailparse/setup.xml b/reference/mailparse/setup.xml
deleted file mode 100644
index 5abf24b0bc49..000000000000
--- a/reference/mailparse/setup.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mailparse.setup">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.mailparse.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- <section xml:id="mailparse.configuration">
-  &reftitle.runtime;
-  &extension.runtime;
-  <para>
-   <table>
-    <title>Mailparse &ConfigureOptions;</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry>&Name;</entry>
-       <entry>&Default;</entry>
-       <entry>&Changeable;</entry>
-       <entry>&Changelog;</entry>
-      </row>
-     </thead>
-     <tbody xml:id="mailparse.configuration.list">
-      <row>
-       <entry><link linkend="ini.mailparse.def_charset">mailparse.def_charset</link></entry>
-       <entry>"us-ascii"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
-       <entry/>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-   &ini.php.constants;
-  </para>
-
-  &ini.descriptions.title;
-
-  <variablelist>
-   <varlistentry xml:id="ini.mailparse.def_charset">
-    <term>
-     <parameter>mailparse.def_charset</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      The default character set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="mailparse.resources">
-  &reftitle.resources;
-  <simpara>
-   Mailparse defines the resource type <literal>mailparse_mail_structure</literal>,
-   which is returned by <function>mailparse_msg_create</function> and
-   <function>mailparse_msg_parse_file</function>.
-  </simpara>
- </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/mailparse/versions.xml b/reference/mailparse/versions.xml
deleted file mode 100644
index 636430fd2ad3..000000000000
--- a/reference/mailparse/versions.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='mailparse_determine_best_xfer_encoding' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_create' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_extract_part_file' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_extract_part' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_extract_whole_part_file' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_free' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_get_part_data' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_get_part' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_get_structure' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_parse_file' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_msg_parse' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_rfc822_parse_addresses' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_stream_encode' from='PECL mailparse &gt;= 0.9.0'/>
- <function name='mailparse_uudecode_all' from='PECL mailparse &gt;= 0.9.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/mcrypt/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mcrypt/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mcrypt/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mcrypt/book.xml b/reference/mcrypt/book.xml
deleted file mode 100644
index 91393f5eed5a..000000000000
--- a/reference/mcrypt/book.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.mcrypt">
- <?phpdoc extension-membership="pecl" ?>
- <title>Mcrypt</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.mcrypt">
-  &reftitle.intro;
-  <warning>
-   &warn.deprecated.feature.7-1-0.removed.7-2-0.alternatives;
-   <simplelist role="alternatives">
-    <member>
-     <link linkend="book.sodium">Sodium</link>
-     (available as of PHP 7.2.0)
-    </member>
-    <member>
-     <link linkend="book.openssl">OpenSSL</link>
-    </member>
-   </simplelist>
-  </warning>
-
-  <note>
-   <simpara>
-    &pecl.moved-ver;7.2.0.
-   </simpara>
-  </note>
-
-  <simpara>
-   This is an interface to the mcrypt library, which supports a wide
-   variety of block algorithms such as DES, TripleDES, Blowfish
-   (default), 3-WAY, SAFER-SK64, SAFER-SK128, TWOFISH, TEA, RC2 and
-   GOST in CBC, OFB, CFB and ECB cipher modes. Additionally, it
-   supports RC6 and IDEA which are considered "non-free".
-   CFB/OFB are 8bit by default.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.mcrypt.setup;
- &reference.mcrypt.constants;
- &reference.mcrypt.ciphers;
- &reference.mcrypt.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/mcrypt/ciphers.xml b/reference/mcrypt/ciphers.xml
deleted file mode 100644
index a06cd654991f..000000000000
--- a/reference/mcrypt/ciphers.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.ciphers">
- <title>Mcrypt ciphers</title>
- <para>
-  Here is a list of ciphers which are currently supported by the mcrypt
-  extension.  For a complete list of supported ciphers, see the defines at
-  the end of <filename>mcrypt.h</filename>. The general rule with the
-  mcrypt-2.2.x API is that you can access the cipher from PHP with
-  MCRYPT_ciphername. With the libmcrypt-2.4.x and libmcrypt-2.5.x API these constants also work,
-  but it is possible to specify the name of the cipher as a string with a
-  call to <function>mcrypt_module_open</function>.
-  <itemizedlist>
-   <listitem><simpara>MCRYPT_3DES</simpara></listitem>
-   <listitem><simpara>MCRYPT_ARCFOUR_IV (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_ARCFOUR (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_BLOWFISH</simpara></listitem>
-   <listitem><simpara>MCRYPT_CAST_128</simpara></listitem>
-   <listitem><simpara>MCRYPT_CAST_256</simpara></listitem>
-   <listitem><simpara>MCRYPT_CRYPT</simpara></listitem>
-   <listitem><simpara>MCRYPT_DES</simpara></listitem>
-   <listitem><simpara>MCRYPT_DES_COMPAT (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_ENIGMA (libmcrypt &gt; 2.4.x only, alias for MCRYPT_CRYPT)</simpara></listitem>
-   <listitem><simpara>MCRYPT_GOST</simpara></listitem>
-   <listitem><simpara>MCRYPT_IDEA (non-free)</simpara></listitem>
-   <listitem><simpara>MCRYPT_LOKI97 (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_MARS (libmcrypt &gt; 2.4.x only, non-free)</simpara></listitem>
-   <listitem><simpara>MCRYPT_PANAMA (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RIJNDAEL_128 (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RIJNDAEL_192 (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RIJNDAEL_256 (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC2</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC4 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC6 (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC6_128 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC6_192 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_RC6_256 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SAFER64</simpara></listitem>
-   <listitem><simpara>MCRYPT_SAFER128</simpara></listitem>
-   <listitem><simpara>MCRYPT_SAFERPLUS (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SERPENT(libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SERPENT_128 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SERPENT_192 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SERPENT_256 (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_SKIPJACK (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_TEAN (libmcrypt 2.2.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_THREEWAY</simpara></listitem>
-   <listitem><simpara>MCRYPT_TRIPLEDES (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_TWOFISH (for older mcrypt 2.x versions, or mcrypt &gt; 2.4.x )</simpara></listitem>
-   <listitem><simpara>MCRYPT_TWOFISH128 (TWOFISHxxx are available in newer 2.x versions, but not in the 2.4.x versions)</simpara></listitem>
-   <listitem><simpara>MCRYPT_TWOFISH192</simpara></listitem>
-   <listitem><simpara>MCRYPT_TWOFISH256</simpara></listitem>
-   <listitem><simpara>MCRYPT_WAKE (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-   <listitem><simpara>MCRYPT_XTEA (libmcrypt &gt; 2.4.x only)</simpara></listitem>
-  </itemizedlist>
- </para>
- <simpara>
-  You must (in <constant>CFB</constant> and <constant>OFB</constant> mode)
-  or can (in <constant>CBC</constant> mode) supply an
-  initialization vector (IV) to the respective cipher function. The
-  IV must be unique and must be the same when
-  decrypting/encrypting. With data which is stored encrypted, you
-  can take the output of a function of the index under which the
-  data is stored (e.g.  the MD5 key of the filename).
-  Alternatively, you can transmit the IV together with the encrypted
-  data (see chapter 9.3 of &book.applied.cryptography; for a
-  discussion of this topic).
- </simpara>
-</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/configure.xml b/reference/mcrypt/configure.xml
deleted file mode 100644
index 500529191e41..000000000000
--- a/reference/mcrypt/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved-ver;7.2.0
- </simpara>
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;mcrypt">&url.pecl.package;mcrypt</link>.
- </simpara>
-</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/mcrypt/constants.xml b/reference/mcrypt/constants.xml
deleted file mode 100644
index 60ace1d467ed..000000000000
--- a/reference/mcrypt/constants.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="mcrypt.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  Mcrypt can operate in four block cipher modes (<literal>CBC</literal>,
-  <literal>OFB</literal>, <literal>CFB</literal>, and
-  <literal>ECB</literal>). If linked against libmcrypt-2.4.x or higher the
-  functions can also operate in the block cipher mode <literal>nOFB</literal>
-  and in <literal>STREAM</literal> mode. Below you find a list with all
-  supported encryption modes together with the constants that are
-  defined for the encryption mode.  For a more complete reference and
-  discussion see &book.applied.cryptography;.
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_ECB</constant> (<literal>electronic
-     codebook</literal>) is a block cipher mode that is generally
-     unsuitable for most purposes. The use of this mode is not recommended.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_CBC</constant> (<literal>cipher block
-     chaining</literal>) is a block cipher mode that is significantly
-     more secure than <literal>ECB</literal> mode.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_CFB</constant> (<literal>cipher
-     feedback, in 8-bit mode</literal>) is a stream cipher mode.
-     It is recommended to use <literal>NCFB</literal> mode rather
-     than <literal>CFB</literal> mode.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_OFB</constant> (<literal>output feedback, in
-     8-bit mode</literal>) is a stream cipher mode comparable to <literal>CFB</literal>, but
-     can be used in applications where error propagation cannot
-     be tolerated.
-     It is recommended to use <literal>NOFB</literal> mode rather
-     than <literal>OFB</literal> mode.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_NOFB</constant> (<literal>output feedback,
-     in n-bit mode</literal>) is comparable to <literal>OFB</literal> mode,
-     but operates on the full block size of the algorithm.
-    </simpara>
-   </listitem> 
-   <listitem>
-    <simpara>
-     <constant>MCRYPT_MODE_STREAM</constant> is an extra mode to include
-     some stream algorithms like <literal>"WAKE"</literal> or <literal>"RC4"</literal>.
-    </simpara>
-   </listitem> 
-  </itemizedlist>
- </para>
- 
- <para>
-  Mcrypt supports some other modes of operation for which there are no predefined constants.
-  They can be utilised by passing a string in place of the missing constants.
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <literal>"ctr"</literal> (<literal>counter mode</literal>) is a stream cipher mode.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>"ncfb"</literal> (<literal>cipher feedback,
-     in n-bit mode</literal>) is comparable to <literal>CFB</literal> mode, 
-     but operates on the full block size of the algorithm.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </para>
-
- <para>
-  Some other mode and random device constants:
-  <variablelist>
-   <varlistentry xml:id="constant.mcrypt-encrypt">
-    <term>
-     <constant>MCRYPT_ENCRYPT</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mcrypt-decrypt">
-    <term>
-     <constant>MCRYPT_DECRYPT</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mcrypt-dev-random">
-    <term>
-     <constant>MCRYPT_DEV_RANDOM</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mcrypt-dev-urandom">
-    <term>
-     <constant>MCRYPT_DEV_URANDOM</constant> 
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mcrypt-rand">
-    <term>
-     <constant>MCRYPT_RAND</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:
--->
diff --git a/reference/mcrypt/functions/mcrypt-create-iv.xml b/reference/mcrypt/functions/mcrypt-create-iv.xml
deleted file mode 100644
index 7af8c29d42ec..000000000000
--- a/reference/mcrypt/functions/mcrypt-create-iv.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mcrypt-create-iv">
- <refnamediv>
-  <refname>mcrypt_create_iv</refname>
-  <refpurpose>Creates an initialization vector (IV) from a random source</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &warn.deprecated.function.7-1-0.removed.7-2-0.alternatives;
-   <simplelist role="alternatives">
-    <member><function>random_bytes</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_create_iv</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>source</parameter><initializer>MCRYPT_DEV_URANDOM</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates an initialization vector (IV) from a random source.
-  </simpara>
-  <simpara>
-   The IV is only meant to give an alternative seed to the encryption
-   routines. This IV does not need to be secret at all, though it can be
-   desirable. You even can send it along with your ciphertext without
-   losing security.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      The size of the IV.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      The source of the IV. The source can be
-      <constant>MCRYPT_RAND</constant> (system random number generator),
-      <constant>MCRYPT_DEV_RANDOM</constant> (read data from
-      <filename>/dev/random</filename>) and
-      <constant>MCRYPT_DEV_URANDOM</constant> (read data from
-      <filename>/dev/urandom</filename>). Prior to 5.3.0,
-      <constant>MCRYPT_RAND</constant> was the only one supported on Windows.
-     </simpara>
-     <simpara>
-      Note that the default value of this parameter was
-      <constant>MCRYPT_DEV_RANDOM</constant> prior to PHP 5.6.0.
-     </simpara>
-     <note>
-      <simpara>
-       Note that <constant>MCRYPT_DEV_RANDOM</constant> may block until more
-       entropy is available.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the initialization vector, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_create_iv</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $size = mcrypt_get_iv_size(MCRYPT_CAST_256, MCRYPT_MODE_CFB);
-    $iv = mcrypt_create_iv($size, MCRYPT_DEV_RANDOM);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mcrypt.iv;">&url.mcrypt.iv;</link></member>
-   <member><link xlink:href="&url.mcrypt.bcm;">&url.mcrypt.bcm;</link></member>
-   <member>Chapter 9.3 of &book.applied.cryptography;</member>
-   <member><function>random_bytes</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/mcrypt/functions/mcrypt-decrypt.xml b/reference/mcrypt/functions/mcrypt-decrypt.xml
deleted file mode 100644
index 2badcdb1c2c4..000000000000
--- a/reference/mcrypt/functions/mcrypt-decrypt.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-decrypt">
- <refnamediv>
-  <refname>mcrypt_decrypt</refname>
-  <refpurpose>Decrypts crypttext with given parameters</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mcrypt_decrypt</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>string</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decrypts the <parameter>data</parameter> and returns the unencrypted data.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key with which the data was encrypted. If the provided key size is
-      not supported by the cipher, the function will emit a warning and return &false;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The data that will be decrypted with the given <parameter>cipher</parameter>
-      and <parameter>mode</parameter>. If the size of the data is not n * blocksize,
-      the data will be padded with '<literal>\0</literal>'.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>iv</parameter></term>
-    <listitem>
-     &mcrypt.parameter.iv.strict;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the decrypted data as a string &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_encrypt</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/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml b/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml
deleted file mode 100644
index 9d0c348a98a5..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-algorithms-name.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-algorithms-name">
- <refnamediv>
-  <refname>mcrypt_enc_get_algorithms_name</refname>
-  <refpurpose>Returns the name of the opened algorithm</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_enc_get_algorithms_name</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the name of the algorithm.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the name of the opened algorithm as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_enc_get_algorithms_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$td = mcrypt_module_open(MCRYPT_CAST_256, '', MCRYPT_MODE_CFB, '');
-echo mcrypt_enc_get_algorithms_name($td). "\n";
-
-$td = mcrypt_module_open('cast-256', '', MCRYPT_MODE_CFB, '');
-echo mcrypt_enc_get_algorithms_name($td). "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-CAST-256
-CAST-256
-]]>
-   </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/mcrypt/functions/mcrypt-enc-get-block-size.xml b/reference/mcrypt/functions/mcrypt-enc-get-block-size.xml
deleted file mode 100644
index e4b559e77a93..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-block-size.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-block-size">
- <refnamediv>
-  <refname>mcrypt_enc_get_block_size</refname>
-  <refpurpose>Returns the blocksize of the opened algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_enc_get_block_size</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the blocksize of the opened algorithm.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the block size of the specified algorithm in bytes.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-get-iv-size.xml b/reference/mcrypt/functions/mcrypt-enc-get-iv-size.xml
deleted file mode 100644
index 7f3b74caff64..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-iv-size.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-iv-size">
- <refnamediv>
-  <refname>mcrypt_enc_get_iv_size</refname>
-  <refpurpose>Returns the size of the IV of the opened algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_enc_get_iv_size</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the size of the IV of the algorithm specified by the
-   encryption descriptor in bytes. An IV is used in cbc, cfb and ofb modes,
-   and in some algorithms in stream mode.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the size of the IV, or 0 if the IV is ignored by the algorithm.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-get-key-size.xml b/reference/mcrypt/functions/mcrypt-enc-get-key-size.xml
deleted file mode 100644
index 5dc131634a64..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-key-size.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-key-size">
- <refnamediv>
-  <refname>mcrypt_enc_get_key_size</refname>
-  <refpurpose>Returns the maximum supported keysize of the opened mode</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_enc_get_key_size</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the maximum supported key size of the algorithm in bytes.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the maximum supported key size of the algorithm in bytes.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-get-modes-name.xml b/reference/mcrypt/functions/mcrypt-enc-get-modes-name.xml
deleted file mode 100644
index 016557583d2a..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-modes-name.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-modes-name">
- <refnamediv>
-  <refname>mcrypt_enc_get_modes_name</refname>
-  <refpurpose>Returns the name of the opened mode</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_enc_get_modes_name</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns the name of the mode.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the name as a string.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_enc_get_modes_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$td = mcrypt_module_open (MCRYPT_CAST_256, '', MCRYPT_MODE_CFB, '');
-echo mcrypt_enc_get_modes_name($td). "\n";
-
-$td = mcrypt_module_open ('cast-256', '', 'ecb', '');
-echo mcrypt_enc_get_modes_name($td). "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-CFB
-ECB
-]]>
-   </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/mcrypt/functions/mcrypt-enc-get-supported-key-sizes.xml b/reference/mcrypt/functions/mcrypt-enc-get-supported-key-sizes.xml
deleted file mode 100644
index b1db0d632cb9..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-get-supported-key-sizes.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-get-supported-key-sizes">
- <refnamediv>
-  <refname>mcrypt_enc_get_supported_key_sizes</refname>
-  <refpurpose>Returns an array with the supported keysizes of the opened algorithm</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mcrypt_enc_get_supported_key_sizes</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the supported key sizes of the opened algorithm.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the key sizes supported by the algorithm
-   specified by the encryption descriptor. If it returns an empty
-   array then all key sizes between 1 and
-   <function>mcrypt_enc_get_key_size</function> are supported by the
-   algorithm.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_enc_get_supported_key_sizes</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $td = mcrypt_module_open('rijndael-256', '', 'ecb', '');
-    var_dump(mcrypt_enc_get_supported_key_sizes($td));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  int(16)
-  [1]=>
-  int(24)
-  [2]=>
-  int(32)
-}
-]]>
-   </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/mcrypt/functions/mcrypt-enc-is-block-algorithm-mode.xml b/reference/mcrypt/functions/mcrypt-enc-is-block-algorithm-mode.xml
deleted file mode 100644
index 4fde77e22cbe..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-is-block-algorithm-mode.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-is-block-algorithm-mode">
- <refnamediv>
-  <refname>mcrypt_enc_is_block_algorithm_mode</refname>
-  <refpurpose>Checks whether the encryption of the opened mode works on blocks</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_enc_is_block_algorithm_mode</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Tells whether the algorithm of the opened mode works on blocks (e.g.
-   &false; for stream, and &true; for cbc, cfb, ofb)..
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the mode is for use with block algorithms, otherwise it
-   returns &false;.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-is-block-algorithm.xml b/reference/mcrypt/functions/mcrypt-enc-is-block-algorithm.xml
deleted file mode 100644
index 635df7391ef5..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-is-block-algorithm.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-is-block-algorithm">
- <refnamediv>
-  <refname>mcrypt_enc_is_block_algorithm</refname>
-  <refpurpose>Checks whether the algorithm of the opened mode is a block algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_enc_is_block_algorithm</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Tells whether the algorithm of the opened mode is a block algorithm.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the algorithm is a block algorithm or &false; if it is
-   a stream one.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-is-block-mode.xml b/reference/mcrypt/functions/mcrypt-enc-is-block-mode.xml
deleted file mode 100644
index 94186970b12e..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-is-block-mode.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-is-block-mode">
- <refnamediv>
-  <refname>mcrypt_enc_is_block_mode</refname>
-  <refpurpose>Checks whether the opened mode outputs blocks</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_enc_is_block_mode</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Tells whether the opened mode outputs blocks (e.g. &true; for cbc and ecb,
-   and &false; for cfb and stream).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the mode outputs blocks of bytes,
-   or &false; if it outputs just bytes.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-enc-self-test.xml b/reference/mcrypt/functions/mcrypt-enc-self-test.xml
deleted file mode 100644
index 263526c9dd50..000000000000
--- a/reference/mcrypt/functions/mcrypt-enc-self-test.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-enc-self-test">
- <refnamediv>
-  <refname>mcrypt_enc_self_test</refname>
-  <refpurpose>Runs a self test on the opened module</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_enc_self_test</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function runs the self test on the algorithm specified by the
-   descriptor <parameter>td</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <literal>0</literal> on success and a negative &integer; on failure.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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
deleted file mode 100644
index cec4be3fe4cc..000000000000
--- a/reference/mcrypt/functions/mcrypt-encrypt.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-encrypt">
- <refnamediv>
-  <refname>mcrypt_encrypt</refname>
-  <refpurpose>Encrypts plaintext with given parameters</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mcrypt_encrypt</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>string</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encrypts the data and returns it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key with which the data will be encrypted. If the provided key size is
-      not supported by the cipher, the function will emit a warning and return &false;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The data that will be encrypted with the given <parameter>cipher</parameter>
-      and <parameter>mode</parameter>. If the size of the data is not n * blocksize,
-      the data will be padded with '<literal>\0</literal>'.
-     </simpara>
-     <simpara>
-      The returned crypttext can be larger than the size of the data that was
-      given by <parameter>data</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>iv</parameter></term>
-    <listitem>
-     &mcrypt.parameter.iv.strict;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the encrypted data as a string &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_encrypt</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    # --- ENCRYPTION ---
-
-    # the key should be random binary, use scrypt, bcrypt or PBKDF2 to
-    # convert a string into a key
-    # key is specified using hexadecimal
-    $key = pack('H*', "bcb04b7e103a0cd8b54763051cef08bc55abe029fdebae5e1d417e2ffb2a00a3");
-
-    # show key size use either 16, 24 or 32 byte keys for AES-128, 192
-    # and 256 respectively
-    $key_size =  strlen($key);
-    echo "Key size: " . $key_size . "\n";
-
-    $plaintext = "This string was AES-256 / CBC / ZeroBytePadding encrypted.";
-
-    # create a random IV to use with CBC encoding
-    $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
-    $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-
-    # creates a cipher text compatible with AES (Rijndael block size = 128)
-    # to keep the text confidential
-    # only suitable for encoded input that never ends with value 00h
-    # (because of default zero padding)
-    $ciphertext = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key,
-                                 $plaintext, MCRYPT_MODE_CBC, $iv);
-
-    # prepend the IV for it to be available for decryption
-    $ciphertext = $iv . $ciphertext;
-
-    # encode the resulting cipher text so it can be represented by a string
-    $ciphertext_base64 = base64_encode($ciphertext);
-
-    echo  $ciphertext_base64 . "\n";
-
-    # === WARNING ===
-
-    # Resulting cipher text has no integrity or authenticity added
-    # and is not protected against padding oracle attacks.
-
-    # --- DECRYPTION ---
-
-    $ciphertext_dec = base64_decode($ciphertext_base64);
-
-    # retrieves the IV, iv_size should be created using mcrypt_get_iv_size()
-    $iv_dec = substr($ciphertext_dec, 0, $iv_size);
-
-    # retrieves the cipher text (everything except the $iv_size in the front)
-    $ciphertext_dec = substr($ciphertext_dec, $iv_size);
-
-    # may remove 00h valued characters from end of plain text
-    $plaintext_dec = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key,
-                                    $ciphertext_dec, MCRYPT_MODE_CBC, $iv_dec);
-
-    echo  $plaintext_dec . "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Key size: 32
-ENJW8mS2KaJoNB5E5CoSAAu0xARgsR1bdzFWpEn+poYw45q+73az5kYi4j+0haevext1dGrcW8Qi59txfCBV8BBj3bzRP3dFCp3CPQSJ8eU=
-This string was AES-256 / CBC / ZeroBytePadding encrypted.
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_decrypt</function></member>
-   <member><function>mcrypt_module_open</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/mcrypt/functions/mcrypt-generic-deinit.xml b/reference/mcrypt/functions/mcrypt-generic-deinit.xml
deleted file mode 100644
index 8bfa1b85cbb4..000000000000
--- a/reference/mcrypt/functions/mcrypt-generic-deinit.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-generic-deinit">
- <refnamediv>
-  <refname>mcrypt_generic_deinit</refname>
-  <refpurpose>This function deinitializes an encryption module</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_generic_deinit</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function terminates encryption specified by the encryption
-   descriptor (<parameter>td</parameter>). It clears all buffers, but does
-   not close the module.  You need to call
-   <function>mcrypt_module_close</function> yourself. (But PHP does this for
-   you at the end of the script.)
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_module_open</function></member>
-   <member><function>mcrypt_generic_init</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/mcrypt/functions/mcrypt-generic-init.xml b/reference/mcrypt/functions/mcrypt-generic-init.xml
deleted file mode 100644
index 4d117af8d300..000000000000
--- a/reference/mcrypt/functions/mcrypt-generic-init.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-generic-init">
- <refnamediv>
-  <refname>mcrypt_generic_init</refname>
-  <refpurpose>This function initializes all buffers needed for encryption</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_generic_init</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>iv</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   You need to call this function before every call to
-   <function>mcrypt_generic</function> or
-   <function>mdecrypt_generic</function>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The maximum length of the key should be the one obtained by calling
-      <function>mcrypt_enc_get_key_size</function> and every value smaller
-      than this is legal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>iv</parameter></term>
-    <listitem>
-     <simpara>
-      The IV should normally have the size of the algorithms block size, but
-      you must obtain the size by calling
-      <function>mcrypt_enc_get_iv_size</function>. IV is ignored in ECB. IV
-      MUST exist in CFB, CBC, STREAM, nOFB and OFB modes. It needs to be
-      random and unique (but not secret). The same IV must be used for
-      encryption/decryption. If you do not want to use it you should set it
-      to zeros, but this is not recommended.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The function returns a negative value on error: -3 when the key length
-   was incorrect, -4 when there was a memory allocation problem and any
-   other return value is an unknown error. If an error occurs a warning will
-   be displayed accordingly. &false; is returned if incorrect parameters
-   were passed.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_module_open</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/mcrypt/functions/mcrypt-generic.xml b/reference/mcrypt/functions/mcrypt-generic.xml
deleted file mode 100644
index 550ae900f6cc..000000000000
--- a/reference/mcrypt/functions/mcrypt-generic.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-generic">
- <refnamediv>
-  <refname>mcrypt_generic</refname>
-  <refpurpose>This function encrypts data</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_generic</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function encrypts data. The data is padded with "<literal>\0</literal>"
-   to make sure the length of the data is n * blocksize. This
-   function returns the encrypted data. Note that the length
-   of the returned string can in fact be longer than the input,
-   due to the padding of the data.
-  </simpara>
-  <simpara>
-   If you want to store the encrypted data in a database make sure to store
-   the entire string as returned by mcrypt_generic, or the string will not
-   entirely decrypt properly.  If your original string is 10 characters long
-   and the block size is 8 (use
-   <function>mcrypt_enc_get_block_size</function> to determine the
-   blocksize), you would need at least 16 characters in your database field.
-   Note the string returned by <function>mdecrypt_generic</function> will be
-   16 characters as well...use rtrim($str, "\0") to remove the padding.
-  </simpara>
-  <simpara>
-   If you are for example storing the data in a MySQL database remember that
-   varchar fields automatically have trailing spaces removed during
-   insertion. As encrypted data can end in a space (ASCII 32), the data will
-   be damaged by this removal.  Store data in a tinyblob/tinytext (or
-   larger) field instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-     <simpara>
-      The encryption handle should always be initialized with
-      <function>mcrypt_generic_init</function> with a key and an IV before
-      calling this function. Where the encryption is done, you should free the
-      encryption buffers by calling <function>mcrypt_generic_deinit</function>.
-      See <function>mcrypt_module_open</function> for an example.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The data to encrypt.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the encrypted data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mdecrypt_generic</function></member>
-   <member><function>mcrypt_generic_init</function></member>
-   <member><function>mcrypt_generic_deinit</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/mcrypt/functions/mcrypt-get-block-size.xml b/reference/mcrypt/functions/mcrypt-get-block-size.xml
deleted file mode 100644
index aaa2ff9df0cf..000000000000
--- a/reference/mcrypt/functions/mcrypt-get-block-size.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-get-block-size">
- <refnamediv>
-  <refname>mcrypt_get_block_size</refname>
-  <refpurpose>Gets the block size of the specified cipher</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mcrypt_get_block_size</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mcrypt_get_block_size</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or 2.5.x.
-  </simpara>
-  <simpara>
-   <function>mcrypt_get_block_size</function> is used to get the
-   size of a block of the specified <parameter>cipher</parameter> (in
-   combination with an encryption mode).
-  </simpara>
-  <simpara>
-   It is more useful to use the <function>mcrypt_enc_get_block_size</function>
-   function as this uses the resource returned by
-   <function>mcrypt_module_open</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the algorithm block size in bytes &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_get_block_size</function> example</title>
-   <simpara>
-    This example shows how to use this function when linked against libmcrypt
-    2.4.x and 2.5.x.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-echo mcrypt_get_block_size('tripledes', 'ecb'); // 8
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_get_key_size</function></member>
-   <member><function>mcrypt_enc_get_block_size</function></member>
-   <member><function>mcrypt_encrypt</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/mcrypt/functions/mcrypt-get-cipher-name.xml b/reference/mcrypt/functions/mcrypt-get-cipher-name.xml
deleted file mode 100644
index 40e89ba5c821..000000000000
--- a/reference/mcrypt/functions/mcrypt-get-cipher-name.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-get-cipher-name">
- <refnamediv>
-  <refname>mcrypt_get_cipher_name</refname>
-  <refpurpose>Gets the name of the specified cipher</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_get_cipher_name</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>mcrypt_get_cipher_name</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mcrypt_get_cipher_name</function> is used to get the
-   name of the specified cipher.
-  </simpara>
-  <simpara>
-   <function>mcrypt_get_cipher_name</function> takes the cipher
-   number as an argument (libmcrypt 2.2.x) or takes the cipher name
-   as an argument (libmcrypt 2.4.x or higher) and returns the name of the cipher
-   or &false;, if the cipher does not exist.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This function returns the name of the cipher or &false; if the cipher does
-   not exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_get_cipher_name</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-   $cipher = MCRYPT_TripleDES;
-
-   echo mcrypt_get_cipher_name($cipher);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-3DES
-]]>
-   </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/mcrypt/functions/mcrypt-get-iv-size.xml b/reference/mcrypt/functions/mcrypt-get-iv-size.xml
deleted file mode 100644
index e728ad62ad59..000000000000
--- a/reference/mcrypt/functions/mcrypt-get-iv-size.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-get-iv-size">
- <refnamediv>
-  <refname>mcrypt_get_iv_size</refname>
-  <refpurpose>Returns the size of the IV belonging to a specific cipher/mode combination</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_get_iv_size</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the size of the IV belonging to a specific
-   <parameter>cipher</parameter>/<parameter>mode</parameter> combination.
-  </simpara>
-  <simpara>
-   It is more useful to use the <function>mcrypt_enc_get_iv_size</function>
-   function as this uses the resource returned by
-   <function>mcrypt_module_open</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-     <simpara>
-      The IV is ignored in ECB mode as this mode does not require it. You will
-      need to have the same IV (think: starting point) both at encryption and
-      decryption stages, otherwise your encryption will fail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the size of the Initialization Vector (IV) in bytes. On error the
-   function returns &false;. If the IV is ignored in the specified cipher/mode
-   combination zero is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_get_iv_size</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    echo mcrypt_get_iv_size(MCRYPT_CAST_256, MCRYPT_MODE_CFB) . "\n";
-
-    echo mcrypt_get_iv_size('des', 'ecb') . "\n";
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_get_block_size</function></member>
-   <member><function>mcrypt_enc_get_iv_size</function></member>
-   <member><function>mcrypt_create_iv</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/mcrypt/functions/mcrypt-get-key-size.xml b/reference/mcrypt/functions/mcrypt-get-key-size.xml
deleted file mode 100644
index d5c27164aacf..000000000000
--- a/reference/mcrypt/functions/mcrypt-get-key-size.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-get-key-size">
- <refnamediv>
-  <refname>mcrypt_get_key_size</refname>
-  <refpurpose>Gets the key size of the specified cipher</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mcrypt_get_key_size</methodname>
-   <methodparam><type>int</type><parameter>cipher</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mcrypt_get_key_size</methodname>
-   <methodparam><type>string</type><parameter>cipher</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The first prototype is when linked against libmcrypt 2.2.x, the
-   second when linked against libmcrypt 2.4.x or 2.5.x.
-  </simpara>
-  <simpara>
-   <function>mcrypt_get_key_size</function> is used to get the size
-   of a key of the specified <parameter>cipher</parameter> (in
-   combination with an encryption mode).
-  </simpara>
-  <simpara>
-   It is more useful to use the <function>mcrypt_enc_get_key_size</function>
-   function as this uses the resource returned by <function>mcrypt_module_open</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cipher</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the maximum supported key size of the algorithm in bytes
-   &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_get_key_size</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    echo mcrypt_get_key_size('tripledes', 'ecb');
-?>
-]]>
-   </programlisting>
-   <simpara>
-    The example above shows how to use this function when
-    linked against libmcrypt 2.4.x or 2.5.x.
-   </simpara>
-   &example.outputs;
-   <screen>
-<![CDATA[
-24
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_get_block_size</function></member>
-   <member><function>mcrypt_enc_get_key_size</function></member>
-   <member><function>mcrypt_encrypt</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/mcrypt/functions/mcrypt-list-algorithms.xml b/reference/mcrypt/functions/mcrypt-list-algorithms.xml
deleted file mode 100644
index 4b1e797eddb9..000000000000
--- a/reference/mcrypt/functions/mcrypt-list-algorithms.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-list-algorithms">
- <refnamediv>
-  <refname>mcrypt_list_algorithms</refname>
-  <refpurpose>Gets an array of all supported ciphers</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mcrypt_list_algorithms</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter><initializer>ini_get("mcrypt.algorithms_dir")</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the list of all supported algorithms in the
-   <parameter>lib_dir</parameter> parameter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the directory where all algorithms are located. If not
-      specified, the value of the <literal>mcrypt.algorithms_dir</literal>
-      &php.ini; directive is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with all the supported algorithms.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_list_algorithms</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$algorithms = mcrypt_list_algorithms();
-print_r($algorithms);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => cast-128
-    [1] => gost
-    [2] => rijndael-128
-    [3] => twofish
-    [4] => arcfour
-    [5] => cast-256
-    [6] => loki97
-    [7] => rijndael-192
-    [8] => saferplus
-    [9] => wake
-    [10] => blowfish-compat
-    [11] => des
-    [12] => rijndael-256
-    [13] => serpent
-    [14] => xtea
-    [15] => blowfish
-    [16] => enigma
-    [17] => rc2
-    [18] => tripledes
-)
-]]>
-   </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/mcrypt/functions/mcrypt-list-modes.xml b/reference/mcrypt/functions/mcrypt-list-modes.xml
deleted file mode 100644
index 7267e9eb46fa..000000000000
--- a/reference/mcrypt/functions/mcrypt-list-modes.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-list-modes">
- <refnamediv>
-  <refname>mcrypt_list_modes</refname>
-  <refpurpose>Gets an array of all supported modes</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mcrypt_list_modes</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter><initializer>ini_get("mcrypt.modes_dir")</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the list of all supported modes in the
-   <parameter>lib_dir</parameter> parameter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the directory where all modes are located. If not
-      specified, the value of the <literal>mcrypt.modes_dir</literal>
-      &php.ini; directive is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with all the supported modes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_list_modes</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $modes = mcrypt_list_modes();
-
-    foreach ($modes as $mode) {
-        echo "$mode <br />\n";
-    }
-?>
-]]>
-   </programlisting>
-   <simpara>
-    The example above will produce a list with all supported
-    algorithms in the default mode directory. If it is not set
-    with the <literal>mcrypt.modes_dir</literal> &php.ini;
-    directive, the default directory of mcrypt is used (which
-    is <filename>/usr/local/lib/libmcrypt</filename>).
-   </simpara>
-  </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/mcrypt/functions/mcrypt-module-close.xml b/reference/mcrypt/functions/mcrypt-module-close.xml
deleted file mode 100644
index b6cc358fb6ba..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-close.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-close">
- <refnamediv>
-  <refname>mcrypt_module_close</refname>
-  <refpurpose>Closes the mcrypt module</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_module_close</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Closes the specified encryption handle.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      The encryption descriptor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_module_open</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/mcrypt/functions/mcrypt-module-get-algo-block-size.xml b/reference/mcrypt/functions/mcrypt-module-get-algo-block-size.xml
deleted file mode 100644
index 434c8139240f..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-get-algo-block-size.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-get-algo-block-size">
- <refnamediv>
-  <refname>mcrypt_module_get_algo_block_size</refname>
-  <refpurpose>Returns the blocksize of the specified algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_module_get_algo_block_size</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the blocksize of the specified algorithm.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     <simpara>
-      The algorithm name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      This optional parameter can contain the location where the mode module
-      is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the block size of the algorithm specified in bytes.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-module-get-algo-key-size.xml b/reference/mcrypt/functions/mcrypt-module-get-algo-key-size.xml
deleted file mode 100644
index 0a953cb0b925..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-get-algo-key-size.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-get-algo-key-size">
- <refnamediv>
-  <refname>mcrypt_module_get_algo_key_size</refname>
-  <refpurpose>Returns the maximum supported keysize of the opened mode</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mcrypt_module_get_algo_key_size</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the maximum supported keysize of the opened mode.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     <simpara>
-      The algorithm name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      This optional parameter can contain the location where the mode module
-      is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This function returns the maximum supported key size of the
-   algorithm specified in bytes.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-module-get-supported-key-sizes.xml b/reference/mcrypt/functions/mcrypt-module-get-supported-key-sizes.xml
deleted file mode 100644
index 17f614a68c21..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-get-supported-key-sizes.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-get-supported-key-sizes">
- <refnamediv>
-  <refname>mcrypt_module_get_supported_key_sizes</refname>
-  <refpurpose>Returns an array with the supported keysizes of the opened algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mcrypt_module_get_supported_key_sizes</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an array with the key sizes supported by the specified algorithm.
-   If it returns an empty array then all key sizes between 1 and
-   <function>mcrypt_module_get_algo_key_size</function> are supported by the
-   algorithm.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     <simpara>
-      The algorithm to be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <parameter>lib_dir</parameter> parameter can contain the
-      location where the algorithm module is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the key sizes supported by the specified algorithm.
-   If it returns an empty array then all key sizes between 1 and
-   <function>mcrypt_module_get_algo_key_size</function> are supported by the
-   algorithm.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_enc_get_supported_key_sizes</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/mcrypt/functions/mcrypt-module-is-block-algorithm-mode.xml b/reference/mcrypt/functions/mcrypt-module-is-block-algorithm-mode.xml
deleted file mode 100644
index 9c4d16fd89db..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-is-block-algorithm-mode.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-is-block-algorithm-mode">
- <refnamediv>
-  <refname>mcrypt_module_is_block_algorithm_mode</refname>
-  <refpurpose>Returns if the specified module is a block algorithm or not</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_module_is_block_algorithm_mode</methodname>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns &true; if the mode is for use with block
-   algorithms, otherwise it returns &false;. (e.g. &false; for stream, and
-   &true; for cbc, cfb, ofb).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-      The mode to check.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <parameter>lib_dir</parameter> parameter can contain the
-      location where the algorithm module is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This function returns &true; if the mode is for use with block
-   algorithms, otherwise it returns &false;. (e.g. &false; for stream, and
-   &true; for cbc, cfb, ofb).
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-module-is-block-algorithm.xml b/reference/mcrypt/functions/mcrypt-module-is-block-algorithm.xml
deleted file mode 100644
index e19866c7e9e2..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-is-block-algorithm.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-is-block-algorithm">
- <refnamediv>
-  <refname>mcrypt_module_is_block_algorithm</refname>
-  <refpurpose>This function checks whether the specified algorithm is a block algorithm</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_module_is_block_algorithm</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns &true; if the specified algorithm is a block
-   algorithm, or &false; if it is a stream one.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     <simpara>
-      The algorithm to check.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <parameter>lib_dir</parameter> parameter can contain the
-      location where the algorithm module is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This function returns &true; if the specified algorithm is a block
-   algorithm, or &false; if it is a stream one.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-module-is-block-mode.xml b/reference/mcrypt/functions/mcrypt-module-is-block-mode.xml
deleted file mode 100644
index 7c24a7fab02c..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-is-block-mode.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-is-block-mode">
- <refnamediv>
-  <refname>mcrypt_module_is_block_mode</refname>
-  <refpurpose>Returns if the specified mode outputs blocks or not</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_module_is_block_mode</methodname>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function returns &true; if the mode outputs blocks of bytes or
-   &false; if it outputs just bytes. (e.g. &true; for cbc and ecb, and
-   &false; for cfb and stream).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <parameter>lib_dir</parameter> parameter can contain the
-      location where the algorithm module is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This function returns &true; if the mode outputs blocks of bytes or
-   &false; if it outputs just bytes. (e.g. &true; for cbc and ecb, and
-   &false; for cfb and stream).
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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-module-open.xml b/reference/mcrypt/functions/mcrypt-module-open.xml
deleted file mode 100644
index df6223025063..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-open.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-open">
- <refnamediv>
-  <refname>mcrypt_module_open</refname>
-  <refpurpose>Opens the module of the algorithm and the mode to be used</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mcrypt_module_open</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam><type>string</type><parameter>algorithm_directory</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mode_directory</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function opens the module of the algorithm and the mode to be used.
-   The name of the algorithm is specified in algorithm, e.g. <literal>"twofish"</literal> or is
-   one of the <constant>MCRYPT_ciphername</constant> constants.  The module is closed by calling
-   <function>mcrypt_module_close</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>algorithm_directory</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>algorithm_directory</parameter> parameter is used to locate
-      the encryption module. When you supply a directory name, it is used.  When
-      you set it to an empty string (<literal>""</literal>), the value set by the
-      <literal>mcrypt.algorithms_dir</literal> &php.ini; directive is used. When
-      it is not set, the default directory that is used is the one that was compiled
-      into libmcrypt (usually <filename>/usr/local/lib/libmcrypt</filename>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     &mcrypt.parameter.mode;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode_directory</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>mode_directory</parameter> parameter is used to locate
-      the encryption module. When you supply a directory name, it is used.  When
-      you set it to an empty string (<literal>""</literal>), the value set by the
-      <literal>mcrypt.modes_dir</literal> &php.ini; directive is used. When
-      it is not set, the default directory that is used is the one that was compiled-in
-      into libmcrypt (usually <filename>/usr/local/lib/libmcrypt</filename>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Normally it returns an encryption descriptor, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_module_open</function> Examples</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $td = mcrypt_module_open(MCRYPT_DES, '',
-        MCRYPT_MODE_ECB, '/usr/lib/mcrypt-modes');
-
-    $td = mcrypt_module_open('rijndael-256', '', 'ofb', '');
-?>
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The first line in the example above will try to open the <literal>DES</literal> cipher from
-   the default directory and the <literal>ECB</literal> mode from the directory
-   <filename>/usr/lib/mcrypt-modes</filename>. The second example uses
-   strings as name for the cipher and mode, this only works when the
-   extension is linked against libmcrypt 2.4.x or 2.5.x.
-  </simpara>
-
-  <example>
-   <title>Using <function>mcrypt_module_open</function> in encryption</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    /* Open the cipher */
-    $td = mcrypt_module_open('rijndael-256', '', 'ofb', '');
-
-    /* Create the IV and determine the keysize length, use MCRYPT_RAND
-     * on Windows instead */
-    $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_DEV_RANDOM);
-    $ks = mcrypt_enc_get_key_size($td);
-
-    /* Create key (example only: MD5 is not a good hash algorithm for this) */
-    $key = substr(hash('md5', 'very secret key'), 0, $ks);
-
-    /* Intialize encryption */
-    mcrypt_generic_init($td, $key, $iv);
-
-    /* Encrypt data */
-    $encrypted = mcrypt_generic($td, 'This is very important data');
-
-    /* Terminate encryption handler */
-    mcrypt_generic_deinit($td);
-
-    /* Initialize encryption module for decryption */
-    mcrypt_generic_init($td, $key, $iv);
-
-    /* Decrypt encrypted string */
-    $decrypted = mdecrypt_generic($td, $encrypted);
-
-    /* Terminate decryption handle and close module */
-    mcrypt_generic_deinit($td);
-    mcrypt_module_close($td);
-
-    /* Show string */
-    echo trim($decrypted) . "\n";
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_module_close</function></member>
-   <member><function>mcrypt_generic</function></member>
-   <member><function>mdecrypt_generic</function></member>
-   <member><function>mcrypt_generic_init</function></member>
-   <member><function>mcrypt_generic_deinit</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/mcrypt/functions/mcrypt-module-self-test.xml b/reference/mcrypt/functions/mcrypt-module-self-test.xml
deleted file mode 100644
index 6f3d575c79f5..000000000000
--- a/reference/mcrypt/functions/mcrypt-module-self-test.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mcrypt-module-self-test">
- <refnamediv>
-  <refname>mcrypt_module_self_test</refname>
-  <refpurpose>This function runs a self test on the specified module</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mcrypt_module_self_test</methodname>
-   <methodparam><type>string</type><parameter>algorithm</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>lib_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function runs the self test on the algorithm specified.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>algorithm</parameter></term>
-    <listitem>
-     &mcrypt.parameter.cipher;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lib_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <parameter>lib_dir</parameter> parameter can contain the
-      location where the algorithm module is on the system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The function returns &true; if the self test succeeds, or &false; when it
-   fails.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mcrypt_module_self_test</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(mcrypt_module_self_test(MCRYPT_RIJNDAEL_128)) . "\n";
-var_dump(mcrypt_module_self_test(MCRYPT_BOGUS_CYPHER));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </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/mcrypt/functions/mdecrypt-generic.xml b/reference/mcrypt/functions/mdecrypt-generic.xml
deleted file mode 100644
index c4fc9f3e68cd..000000000000
--- a/reference/mcrypt/functions/mdecrypt-generic.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mdecrypt-generic">
- <refnamediv>
-  <refname>mdecrypt_generic</refname>
-  <refpurpose>Decrypts data</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
-  &warn.deprecated.function-7-1-0.removed-7-2-0;
- </refsynopsisdiv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mdecrypt_generic</methodname>
-   <methodparam><type>resource</type><parameter>td</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function decrypts data. Note that the length of the returned string
-   can in fact be longer than the unencrypted string, due to the padding of
-   the data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>td</parameter></term>
-    <listitem>
-     <simpara>
-      An encryption descriptor returned by
-      <function>mcrypt_module_open</function>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Encrypted data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns decrypted string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mdecrypt_generic</function> Example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    /* Data */
-    $key = 'this is a very long key, even too long for the cipher';
-    $plain_text = 'very important data';
-
-    /* Open module, and create IV */
-    $td = mcrypt_module_open('des', '', 'ecb', '');
-    $key = substr($key, 0, mcrypt_enc_get_key_size($td));
-    $iv_size = mcrypt_enc_get_iv_size($td);
-    $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
-
-    /* Initialize encryption handle */
-    if (mcrypt_generic_init($td, $key, $iv) != -1) {
-
-        /* Encrypt data */
-        $c_t = mcrypt_generic($td, $plain_text);
-        mcrypt_generic_deinit($td);
-
-        /* Reinitialize buffers for decryption */
-        mcrypt_generic_init($td, $key, $iv);
-        $p_t = mdecrypt_generic($td, $c_t);
-
-        /* Clean up */
-        mcrypt_generic_deinit($td);
-        mcrypt_module_close($td);
-    }
-
-    if (strncmp($p_t, $plain_text, strlen($plain_text)) == 0) {
-        echo "ok\n";
-    } else {
-        echo "error\n";
-    }
-?>
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The example above shows how to check if the data before the encryption is
-   the same as the data after the decryption. It is very important to
-   reinitialize the encryption buffer with
-   <function>mcrypt_generic_init</function> before you try to decrypt the
-   data.
-  </simpara>
-  <simpara>
-   The decryption handle should always be initialized with
-   <function>mcrypt_generic_init</function> with a key and an IV before
-   calling this function. Where the encryption is done, you should free the
-   encryption buffers by calling <function>mcrypt_generic_deinit</function>.
-   See <function>mcrypt_module_open</function> for an example.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mcrypt_generic</function></member>
-   <member><function>mcrypt_generic_init</function></member>
-   <member><function>mcrypt_generic_deinit</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/mcrypt/ini.xml b/reference/mcrypt/ini.xml
deleted file mode 100644
index 6bdc65bece87..000000000000
--- a/reference/mcrypt/ini.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="mcrypt.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
- <table>
-  <title>Mcrypt configuration options</title>
-  <tgroup cols="4">
-   <thead>
-    <row>
-     <entry>&Name;</entry>
-     <entry>&Default;</entry>
-     <entry>&Changeable;</entry>
-     <entry>&Changelog;</entry>
-    </row>
-   </thead>
-   <tbody xml:id="mcrypt.configuration.list">
-    <row>
-     <entry><link linkend="ini.mcrypt.algorithms-dir">mcrypt.algorithms_dir</link></entry>
-     <entry>&null;</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-    <row>
-     <entry><link linkend="ini.mcrypt.modes-dir">mcrypt.modes_dir</link></entry>
-     <entry>&null;</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry/>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
- &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
- <variablelist>
-  <varlistentry xml:id="ini.mcrypt.algorithms-dir">
-   <term>
-    <parameter>mcrypt.algorithms_dir</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     The directory that contains the algorithms. Defaults to the directories
-     compiled within libmcrypt, which is typically
-     <emphasis>/usr/local/lib/libmcrypt</emphasis>.  See
-     <function>mcrypt_list_algorithms</function> for additional details.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="ini.mcrypt.modes-dir">
-   <term>
-    <parameter>mcrypt.modes_dir</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     The directory that contains the modes. Defaults to the directories
-     compiled within libmcrypt, which is typically
-     <emphasis>/usr/local/lib/libmcrypt</emphasis>.  See
-     <function>mcrypt_list_modes</function> for additional details.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
-</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/mcrypt/reference.xml b/reference/mcrypt/reference.xml
deleted file mode 100644
index 86f9568504e8..000000000000
--- a/reference/mcrypt/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mcrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mcrypt &Functions;</title>
-
- &reference.mcrypt.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/mcrypt/setup.xml b/reference/mcrypt/setup.xml
deleted file mode 100644
index 43b8607cfd19..000000000000
--- a/reference/mcrypt/setup.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mcrypt.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="mcrypt.requirements">
-  &reftitle.required;
-  <simpara>
-   These functions work using <link xlink:href="&url.mcrypt;">mcrypt</link>.
-   To use it, download <filename>libmcrypt-x.x.tar.gz</filename> from <link xlink:href="&url.mcrypt;">&url.mcrypt;</link> and follow the included
-   installation instructions.
-  </simpara>
-  <simpara>
-  libmcrypt Version 2.5.6 or greater is required.
-  </simpara>
-  <simpara>
-   Windows users will find the library is the PHP 5.2 Windows binaries release.
-   PHP 5.3 Windows binaries uses the static version of the MCrypt library, no
-   DLL are needed.
-  </simpara>
-  <simpara>
-   If you linked against libmcrypt 2.4.x or higher, the following additional
-   block algorithms are supported: CAST, LOKI97, RIJNDAEL, SAFERPLUS,
-   SERPENT and the following stream ciphers: ENIGMA (crypt), PANAMA, RC4 and
-   WAKE. With libmcrypt 2.4.x or higher another cipher mode is also
-   available; nOFB.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.mcrypt.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.mcrypt.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="mcrypt.resources">
-  &reftitle.resources;
-  <simpara>
-   <function>mcrypt_module_open</function> returns an encryption descriptor.
-  </simpara>
- </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/mcrypt/versions.xml b/reference/mcrypt/versions.xml
deleted file mode 100644
index eb87a808cf3c..000000000000
--- a/reference/mcrypt/versions.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <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_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"/>
- <function name="mcrypt_enc_get_key_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_modes_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_supported_key_sizes" 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_is_block_algorithm" 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_is_block_algorithm_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_enc_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_enc_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_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_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"/>
- <function name="mcrypt_get_iv_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_get_key_size" from="PHP 4, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
- <function name="mcrypt_list_algorithms" from="PHP 4 &gt;= 4.0.2, PHP 5, PHP 7 &lt; 7.2.0, PECL mcrypt &gt;= 1.0.0"/>
- <function name="mcrypt_list_modes" 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_close" 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_get_algo_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_module_get_algo_key_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_module_get_supported_key_sizes" 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_is_block_algorithm" 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_is_block_algorithm_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_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="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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/memcache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/memcache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/memcache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/memcache/book.xml b/reference/memcache/book.xml
deleted file mode 100644
index ec195c02fa23..000000000000
--- a/reference/memcache/book.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.memcache">
- <?phpdoc extension-membership="pecl" ?>
- <title>Memcache</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.memcache">
-  &reftitle.intro;
-  <simpara>
-   Memcache module provides handy procedural and object-oriented interface
-   to memcached, highly effective caching daemon, which was especially
-   designed to decrease database load in dynamic web applications.
-  </simpara>
-  <simpara>
-   The Memcache module also provides a <link linkend="ref.session">session</link> handler (<literal>memcache</literal>).
-  </simpara>
-  <simpara>
-   More information about memcached can be found at <link xlink:href="&url.memcache;">&url.memcache;</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.memcache.setup;
- &reference.memcache.constants;
- &reference.memcache.examples;
- &reference.memcache.memcache;
- &reference.memcache.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/memcache/configure.xml b/reference/memcache/configure.xml
deleted file mode 100644
index 01e07b98bfe1..000000000000
--- a/reference/memcache/configure.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;memcache">&url.pecl.package;memcache</link>.
- </simpara>
- <note>
-  <simpara>
-   It's possible to disable memcache session handler support. The 'pecl install' option
-   prompts for this (default is enabled) however when compiling statically into PHP the
-   <option role="configure">--disable-memcache-session</option> configure option may be
-   used.
-  </simpara>
- </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/memcache/constants.xml b/reference/memcache/constants.xml
deleted file mode 100644
index 67a24e962bbf..000000000000
--- a/reference/memcache/constants.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id='memcache.constants' xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- <table>
-  <title>Memcache Constants</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.memcache-compressed">
-      <entry>
-       <constant>MEMCACHE_COMPRESSED</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       Used to turn on-the-fly data compression on with
-       <function>Memcache::set</function>,
-       <function>Memcache::add</function>&listendand;
-       <function>Memcache::replace</function>.
-      </entry>
-     </row>
-     <row xml:id="constant.memcache-have-session">
-      <entry>
-       <constant>MEMCACHE_HAVE_SESSION</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       1 if this Memcache session handler is available, 0 otherwise.
-      </entry>
-     </row>
-     <row xml:id="constant.memcache-user1">
-      <entry>
-       <constant>MEMCACHE_USER1</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       Used to turn user-defined application flag on with
-       <function>Memcache::set</function>,
-       <function>Memcache::add</function>&listendand;
-       <function>Memcache::replace</function>.
-      </entry>
-     </row>
-     <row xml:id="constant.memcache-user2">
-      <entry>
-       <constant>MEMCACHE_USER2</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       Used to turn user-defined application flag on with
-       <function>Memcache::set</function>,
-       <function>Memcache::add</function>&listendand;
-       <function>Memcache::replace</function>.
-      </entry>
-     </row>
-     <row xml:id="constant.memcache-user3">
-      <entry>
-       <constant>MEMCACHE_USER3</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       Used to turn user-defined application flag on with
-       <function>Memcache::set</function>,
-       <function>Memcache::add</function>&listendand;
-       <function>Memcache::replace</function>.
-      </entry>
-     </row>
-     <row xml:id="constant.memcache-user4">
-      <entry>
-       <constant>MEMCACHE_USER4</constant>
-       (<type>int</type>)
-      </entry>
-      <entry>
-       Used to turn user-defined application flag on with
-       <function>Memcache::set</function>,
-       <function>Memcache::add</function>&listendand;
-       <function>Memcache::replace</function>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-</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/memcache/examples.xml b/reference/memcache/examples.xml
deleted file mode 100644
index cc49a39c64e5..000000000000
--- a/reference/memcache/examples.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.examples">
- &reftitle.examples;
- <section xml:id="memcache.examples-overview">
-  <title>Basic usage</title>
-  <example>
-   <title>memcache extension overview example</title>
-   <simpara>
-    In this example, an object is being saved in the cache and then
-    retrieved back. Object and other non-scalar types are serialized
-    before saving, so it's impossible to store resources (i.e. connection
-    identifiers and others) in the cache.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$memcache = new Memcache;
-$memcache->connect('localhost', 11211) or die ("Could not connect");
-
-$version = $memcache->getVersion();
-echo "Server's version: ".$version."<br/>\n";
-
-$tmp_object = new stdClass;
-$tmp_object->str_attr = 'test';
-$tmp_object->int_attr = 123;
-
-$memcache->set('key', $tmp_object, false, 10) or die ("Failed to save data at the server");
-echo "Store data in the cache (data will expire in 10 seconds)<br/>\n";
-
-$get_result = $memcache->get('key');
-echo "Data from the cache:<br/>\n";
-
-var_dump($get_result);
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Using memcache session handler</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$session_save_path = "tcp://$host:$port?persistent=1&weight=2&timeout=2&retry_interval=10,  ,tcp://$host:$port  ";
-ini_set('session.save_handler', 'memcache');
-ini_set('session.save_path', $session_save_path);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </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/memcache/functions/memcache-debug.xml b/reference/memcache/functions/memcache-debug.xml
deleted file mode 100644
index ee4c10dbf367..000000000000
--- a/reference/memcache/functions/memcache-debug.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.memcache-debug">
- <refnamediv>
-  <refname>memcache_debug</refname>
-  <refpurpose>Turn debug output on/off</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_debug</methodname>
-   <methodparam><type>bool</type><parameter>on_off</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   <function>memcache_debug</function> turns on debug output if parameter
-   <parameter>on_off</parameter> is equal to &true; and turns off if it's
-   &false;.
-   <note>
-    <simpara>
-     <function>memcache_debug</function> is accessible only if PHP was built
-     with --enable-debug option and always returns &true; in this case.
-     Otherwise, this function has no effect and always returns &false;.
-    </simpara>
-   </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>on_off</parameter></term>
-    <listitem>
-     <simpara>
-      Turns debug output on if equals to &true;.
-      Turns debug output off if equals to &false;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if PHP was built with --enable-debug option, otherwise
-   returns &false;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/memcache/ini.xml b/reference/memcache/ini.xml
deleted file mode 100644
index 3a6bf69c9330..000000000000
--- a/reference/memcache/ini.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="memcache.ini">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Memcache Configuration Options</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="memcache.ini.list">
-     <row>
-      <entry><link linkend="ini.memcache.allow-failover">memcache.allow_failover</link></entry>
-      <entry>"1"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.0.2.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.max-failover-attempts">memcache.max_failover_attempts</link></entry>
-      <entry>"20"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.chunk-size">memcache.chunk_size</link></entry>
-      <entry>"8192"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.0.2.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.default-port">memcache.default_port</link></entry>
-      <entry>"11211"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.0.2.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.hash-strategy">memcache.hash_strategy</link></entry>
-      <entry>"standard"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.hash-function">memcache.hash_function</link></entry>
-      <entry>"crc32"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available since memcache 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.protocol">memcache.protocol</link></entry>
-      <entry>ascii</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 3.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.redundancy">memcache.redundancy</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 3.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.session-redundancy">memcache.session_redundancy</link></entry>
-      <entry>2</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 3.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.compress-threshold">memcache.compress_threshold</link></entry>
-      <entry>20000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 3.0.3</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.lock-timeout">memcache.lock_timeout</link></entry>
-      <entry>15</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 3.0.4</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  <table>
-   <title>Session Configuration Options Affecting Memcache Behavior</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="memcache.ini.list.extra">
-     <row>
-      <entry><link linkend="ini.memcache.save-handler">session.save_handler</link></entry>
-      <entry>"files"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 2.1.2</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcache.save-path">session.save_path</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Supported since memcache 2.1.2</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
-&ini.descriptions.title;
-
-<variablelist>
-
- <varlistentry xml:id="ini.memcache.allow-failover">
-  <term>
-   <parameter>memcache.allow_failover</parameter>
-   <type>bool</type>
-  </term>
-  <listitem>
-   <simpara>
-    Whether to transparently failover to other servers on
-    errors.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.max-failover-attempts">
-  <term>
-   <parameter>memcache.max_failover_attempts</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    Defines how many servers to try when setting and getting data.
-    Used only in conjunction with memcache.allow_failover.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.chunk-size">
-  <term>
-   <parameter>memcache.chunk_size</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    Data will be transferred in chunks of this size, setting
-    the value lower requires more network writes. Try
-    increasing this value to 32768 if noticing otherwise
-    inexplicable slowdowns.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.default-port">
-  <term>
-   <parameter>memcache.default_port</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default TCP port number to use when connecting to
-    the memcached server if no other port is specified.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.hash-strategy">
-  <term>
-   <parameter>memcache.hash_strategy</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    Controls which strategy to use when mapping keys to servers. Set this value to
-    <literal>consistent</literal> to enable consistent hashing which allows servers
-    to be added or removed from the pool without causing keys to be remapped.
-    Setting this value to <literal>standard</literal> results in the old strategy
-    being used.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.hash-function">
-  <term>
-   <parameter>memcache.hash_function</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    Controls which hash function to apply when mapping keys to servers, <literal>crc32</literal>
-    uses the standard CRC32 hash while <literal>fnv</literal> uses FNV-1a.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.protocol">
-  <term>
-   <parameter>memcache.protocol</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.redundancy">
-  <term>
-   <parameter>memcache.redundancy</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.session-redundancy">
-  <term>
-   <parameter>memcache.session_redundancy</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.compress-threshold">
-  <term>
-   <parameter>memcache.compress_threshold</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.lock-timeout">
-  <term>
-   <parameter>memcache.lock_timeout</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.save-handler">
-  <term>
-   <parameter>session.save_handler</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    Use memcache as a session handler by setting this value to <literal>memcache</literal>.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.memcache.save-path">
-  <term>
-   <parameter>session.save_path</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    Defines a comma separated of server urls to use for session storage, for example
-    <literal>"tcp://host1:11211, tcp://host2:11211"</literal>.
-   </simpara>
-   <simpara>
-    Each url may contain parameters which are applied to that server, they are the same
-    as for the <function>Memcache::addServer</function> method. For example
-    <literal>"tcp://host1:11211?persistent=1&amp;weight=1&amp;timeout=1&amp;retry_interval=15"</literal>
-   </simpara>
-  </listitem>
- </varlistentry>
-
-</variablelist>
-</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/memcache/memcache.xml b/reference/memcache/memcache.xml
deleted file mode 100644
index 33ae22e739f2..000000000000
--- a/reference/memcache/memcache.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.memcache" role="class">
-
- <title>The Memcache class</title>
- <titleabbrev>Memcache</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Memcache intro -->
-  <section xml:id="memcache.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a connection to a set of memcache servers.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="memcache.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Memcache</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Memcache</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcache')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.memcache.entities.memcache;
-
-</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/memcache/memcache/add.xml b/reference/memcache/memcache/add.xml
deleted file mode 100644
index f5a3dec95280..000000000000
--- a/reference/memcache/memcache/add.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.add">
- <refnamediv>
-  <refname>Memcache::add</refname>
-  <refname>memcache_add</refname>
-  <refpurpose>Add an item to the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_add</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::add</function> stores variable
-   <parameter>var</parameter> with <parameter>key</parameter> only if such
-   key doesn't exist at the server yet.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key that will be associated with the item.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>var</parameter></term>
-    <listitem>
-     <simpara>
-      The variable to store. Strings and integers are stored as is, other
-      types are stored serialized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Use <constant>MEMCACHE_COMPRESSED</constant> to store the item
-      compressed (uses zlib).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expire</parameter></term>
-    <listitem>
-     <simpara>
-      Expiration time of the item. If it's equal to zero, the item will never
-      expire. You can also use Unix timestamp or a number of seconds starting
-      from current time, but in the latter case the number of seconds may not
-      exceed 2592000 (30 days).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-   Returns &false; if such key already exist. For the rest
-   <function>Memcache::add</function> behaves similarly to
-   <function>Memcache::set</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::add</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$memcache_obj = memcache_connect("localhost", 11211);
-
-/* procedural API */
-memcache_add($memcache_obj, 'var_key', 'test variable', false, 30);
-
-/* OO API */
-$memcache_obj->add('var_key', 'test variable', false, 30);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::set</function></member>
-   <member><function>Memcache::replace</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/memcache/memcache/addserver.xml b/reference/memcache/memcache/addserver.xml
deleted file mode 100644
index 61ba70babba1..000000000000
--- a/reference/memcache/memcache/addserver.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.addserver">
- <refnamediv>
-  <refname>Memcache::addServer</refname>
-  <refname>memcache_add_server</refname>
-  <refpurpose>Add a memcached server to connection pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::addServer</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>persistent</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>weight</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>retry_interval</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>status</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>failure_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeoutms</parameter></methodparam>
-  </methodsynopsis>
-    <methodsynopsis>
-   <type>bool</type><methodname>memcache_add_server</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>persistent</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>weight</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>retry_interval</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>status</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>failure_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeoutms</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::addServer</function> adds a server to the connection pool.
-  </simpara>
-
-  <simpara>
-   When using this method (as opposed to <function>Memcache::connect</function> and
-   <function>Memcache::pconnect</function>) the network connection is not established
-   until actually needed. Thus there is no overhead in adding a large number of servers
-   to the pool, even though they might not all be used.
-  </simpara>
-
-  <simpara>
-   Failover may occur at any stage in any of the methods, as long as other
-   servers are available the request the user won't notice. Any kind of
-   socket or Memcached server level errors (except out-of-memory) may trigger
-   the failover. Normal client errors such as adding an existing key will not
-   trigger a failover.
-  </simpara>
-
-  <note>
-   <simpara>
-    This function has been added to Memcache version 2.0.0.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the host where memcached is listening for connections. This parameter
-      may also specify other transports like <literal>unix:///path/to/memcached.sock</literal>
-      to use UNIX domain sockets, in this case <parameter>port</parameter> must also
-      be set to <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the port where memcached is listening for connections.
-      Set this
-      parameter to <literal>0</literal> when using UNIX domain sockets.
-     </simpara>
-     <simpara>
-      Please note: <parameter>port</parameter> defaults to
-      <link linkend="ini.memcache.default-port">memcache.default_port</link>
-      if not specified. For this reason it is wise to specify the port
-      explicitly in this method call.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>persistent</parameter></term>
-    <listitem>
-     <simpara>
-      Controls the use of a persistent connection. Default to &true;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>weight</parameter></term>
-    <listitem>
-     <simpara>
-      Number of buckets to create for this server which in turn control its
-      probability of it being selected. The probability is relative to the
-      total weight of all servers.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      Value in seconds which will be used for connecting to the daemon. Think
-      twice before changing the default value of 1 second - you can lose all
-      the advantages of caching if your connection is too slow.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>retry_interval</parameter></term>
-    <listitem>
-     <simpara>
-      Controls how often a failed server will be retried, the default value
-      is 15 seconds. Setting this parameter to -1 disables automatic retry.
-      Neither this nor the <parameter>persistent</parameter> parameter has any
-      effect when the extension is loaded dynamically via <function>dl</function>.
-     </simpara>
-     <simpara>
-      Each failed connection struct has its own timeout and before it has expired
-      the struct will be skipped when selecting backends to serve a request. Once
-      expired the connection will be successfully reconnected or marked as failed
-      for another <parameter>retry_interval</parameter> seconds. The typical
-      effect is that each web server child will retry the connection about every
-      <parameter>retry_interval</parameter> seconds when serving a page.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>status</parameter></term>
-    <listitem>
-     <simpara>
-      Controls if the server should be flagged as online. Setting this parameter
-      to &false; and <parameter>retry_interval</parameter> to -1 allows a failed
-      server to be kept in the pool so as not to affect the key distribution
-      algorithm. Requests for this server will then failover or fail immediately
-      depending on the <parameter>memcache.allow_failover</parameter> setting.
-      Default to &true;, meaning the server should be considered online.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>failure_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Allows the user to specify a callback function to run upon encountering an
-      error. The callback is run before failover is attempted. The function takes
-      two parameters, the hostname and port of the failed server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeoutms</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::addServer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* OO API */
-
-$memcache = new Memcache;
-$memcache->addServer('memcache_host', 11211);
-$memcache->addServer('memcache_host2', 11211);
-
-/* procedural API */
-
-$memcache_obj = memcache_connect('memcache_host', 11211);
-memcache_add_server($memcache_obj, 'memcache_host2', 11211);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <simpara>
-    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.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::connect</function></member>
-   <member><function>Memcache::pconnect</function></member>
-   <member><function>Memcache::close</function></member>
-   <member><function>Memcache::setServerParams</function></member>
-   <member><function>Memcache::getServerStatus</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/memcache/memcache/close.xml b/reference/memcache/memcache/close.xml
deleted file mode 100644
index 2f54184ff767..000000000000
--- a/reference/memcache/memcache/close.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.close">
- <refnamediv>
-  <refname>Memcache::close</refname>
-  <refname>memcache_close</refname>
-  <refpurpose>Close memcached server connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::close</methodname>
-   <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_close</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::close</function> closes connection to memcached
-   server. This function doesn't close persistent connections, which are
-   closed only during web-server shutdown/restart.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-/*
-do something here...
-*/
-memcache_close($memcache_obj);
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-/*
-do something here...
-*/
-$memcache_obj->close();
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::connect</function></member>
-   <member><function>Memcache::pconnect</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/memcache/memcache/connect.xml b/reference/memcache/memcache/connect.xml
deleted file mode 100644
index ef293eeeef63..000000000000
--- a/reference/memcache/memcache/connect.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.connect">
- <refnamediv>
-  <refname>Memcache::connect</refname>
-  <refname>memcache_connect</refname>
-  <refpurpose>Open memcached server connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>Memcache</type><methodname>memcache_connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::connect</function> establishes a connection to the
-   memcached server.
-   The connection, which was opened using
-   <function>Memcache::connect</function> will be automatically closed at the
-   end of script execution. Also you can close it with
-   <function>Memcache::close</function>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the host where memcached is listening for connections. This parameter
-      may also specify other transports like <literal>unix:///path/to/memcached.sock</literal>
-      to use UNIX domain sockets, in this case <parameter>port</parameter> must also
-      be set to <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the port where memcached is listening for connections. Set this
-      parameter to <literal>0</literal> when using UNIX domain sockets.
-     </simpara>
-     <simpara>
-       Please note: <parameter>port</parameter> defaults to
-       <link linkend="ini.memcache.default-port">memcache.default_port</link>
-       if not specified. For this reason it is wise to specify the port
-       explicitly in this method call.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      Value in seconds which will be used for connecting to the daemon. Think
-      twice before changing the default value of 1 second - you can lose all
-      the advantages of caching if your connection is too slow.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::connect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-
-$memcache_obj = memcache_connect('memcache_host', 11211);
-
-/* OO API */
-
-$memcache = new Memcache;
-$memcache->connect('memcache_host', 11211);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <simpara>
-    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.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::pconnect</function></member>
-   <member><function>Memcache::close</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/memcache/memcache/decrement.xml b/reference/memcache/memcache/decrement.xml
deleted file mode 100644
index 580024582440..000000000000
--- a/reference/memcache/memcache/decrement.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.decrement">
- <refnamediv>
-  <refname>Memcache::decrement</refname>
-  <refname>memcache_decrement</refname>
-  <refpurpose>Decrement item's value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>Memcache::decrement</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>memcache_decrement</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   <function>Memcache::decrement</function> decrements value of the
-   item by <parameter>value</parameter>. Similarly to
-   <function>Memcache::increment</function>, current value of the item is
-   being converted to numerical and after that <parameter>value</parameter>
-   is subtracted.
-   <note>
-    <simpara>
-     New item's value will not be less than zero.
-    </simpara>
-   </note>
-   <note>
-    <simpara>
-     Do not use <function>Memcache::decrement</function> with item, which was
-     stored compressed, because consequent call to
-     <function>Memcache::get</function> will fail.
-    </simpara>
-   </note>
-   <function>Memcache::decrement</function> <emphasis>does not</emphasis>
-   create an item if it didn't exist.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      Key of the item do decrement.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      Decrement the item by <parameter>value</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns item's new value on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::decrement</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-/* decrement item by 2 */
-$new_value = memcache_decrement($memcache_obj, 'test_item', 2);
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-/* decrement item by 3 */
-$new_value = $memcache_obj->decrement('test_item', 3);
-?>
-]]>
-    </programlisting>
-   </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::increment</function></member>
-   <member><function>Memcache::replace</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/memcache/memcache/delete.xml b/reference/memcache/memcache/delete.xml
deleted file mode 100644
index 86735bc33c27..000000000000
--- a/reference/memcache/memcache/delete.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.delete">
- <refnamediv>
-  <refname>Memcache::delete</refname>
-  <refname>memcache_delete</refname>
-  <refpurpose>Delete item from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::delete</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>exptime</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_delete</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>exptime</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::delete</function> deletes an item with the <parameter>key</parameter>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key associated with the item to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>exptime</parameter></term>
-    <listitem>
-     <simpara>
-      This deprecated parameter is not supported, and defaults to <literal>0</literal> seconds.
-      Do not use this parameter.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL memcache 3.0.5</entry>
-      <entry>
-       The <parameter>exptime</parameter> is deprecated, and should not be supplied.
-       Values other than <literal>0</literal> may cause unexpected errors.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::delete</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-
-/* item will be deleted by the server */
-memcache_delete($memcache_obj, 'key_to_delete');
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-
-$memcache_obj->delete('key_to_delete');
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::set</function></member>
-   <member><function>Memcache::replace</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/memcache/memcache/flush.xml b/reference/memcache/memcache/flush.xml
deleted file mode 100644
index e971b01b9018..000000000000
--- a/reference/memcache/memcache/flush.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.flush">
- <refnamediv>
-  <refname>Memcache::flush</refname>
-  <refname>memcache_flush</refname>
-  <refpurpose>Flush all existing items at the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::flush</methodname>
-   <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_flush</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::flush</function> immediately invalidates all
-   existing items. <function>Memcache::flush</function> doesn't
-   actually free any resources, it only marks all the items as expired, so
-   occupied memory will be overwritten by new items.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::flush</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-
-memcache_flush($memcache_obj);
-
-/* OO API */
-
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-
-$memcache_obj->flush();
-
-?>
-]]>
-   </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/memcache/memcache/get.xml b/reference/memcache/memcache/get.xml
deleted file mode 100644
index 3a99ff1ceac7..000000000000
--- a/reference/memcache/memcache/get.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.get">
- <refnamediv>
-  <refname>Memcache::get</refname>
-  <refname>memcache_get</refname>
-  <refpurpose>Retrieve item from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>Memcache::get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>Memcache::get</methodname>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">flags</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>string</type><methodname>memcache_get</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>memcache_get</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">flags</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::get</function> returns previously stored data of
-   an item, if such <parameter>key</parameter> exists on the server at this
-   moment.
-  </simpara>
-
-  <simpara>
-   You can pass array of keys to <function>Memcache::get</function> to get
-   array of values. The result array will contain only found key-value pairs.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key or array of keys to fetch.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      If present, flags fetched along with the values will be written to this parameter. These
-      flags are the same as the ones given to for example <function>Memcache::set</function>.
-      The lowest byte of the int is reserved for pecl/memcache internal usage (e.g. to indicate
-      compression and serialization status).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value associated with the <parameter>key</parameter> or
-   an array of found key-value pairs when <parameter>key</parameter> is an <type>array</type>.
-   Returns &false; on failure, <parameter>key</parameter> is not found or
-   <parameter>key</parameter> is an empty <type>array</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::get</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-$var = memcache_get($memcache_obj, 'some_key');
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-$var = $memcache_obj->get('some_key');
-
-/*
-You also can use array of keys as a parameter.
-If such item wasn't found at the server, the result
-array simply will not include such key.
-*/
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-$var = memcache_get($memcache_obj, Array('some_key', 'another_key'));
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-$var = $memcache_obj->get(Array('some_key', 'second_key'));
-
-?>
-]]>
-   </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/memcache/memcache/getextendedstats.xml b/reference/memcache/memcache/getextendedstats.xml
deleted file mode 100644
index b32b1b0f0ac6..000000000000
--- a/reference/memcache/memcache/getextendedstats.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.getextendedstats">
- <refnamediv>
-  <refname>Memcache::getExtendedStats</refname>
-  <refname>memcache_get_extended_stats</refname>
-  <refpurpose>Get statistics from all servers in pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>Memcache::getExtendedStats</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slabid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>100</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>array</type><methodname>memcache_get_extended_stats</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slabid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>100</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::getExtendedStats</function> returns a two-dimensional
-   associative array with server statistics. Array keys correspond to
-   host:port of server and values contain the individual server statistics.
-   A failed server will have its corresponding entry set to &false;.
-  </simpara>
-
-  <note>
-   <simpara>
-    This function has been added to Memcache version 2.0.0.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <simpara>
-       The type of statistics to fetch. Valid values are {reset,
-       malloc, maps, cachedump, slabs, items, sizes}. According to
-       the memcached protocol spec these additional arguments "are
-       subject to change for the convenience of memcache developers".
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>slabid</parameter></term>
-     <listitem>
-      <simpara>
-       Used in conjunction with <parameter>type</parameter> set to
-       cachedump to identify the slab to dump from. The cachedump
-       command ties up the server and is strictly to be used for
-       debugging purposes.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <simpara>
-       Used in conjunction with <parameter>type</parameter> set to
-       cachedump to limit the number of entries to dump.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-   <warning>
-    <simpara>
-     The cachedump stat type has been removed from the memcached daemon
-     due to security reasons.
-    </simpara>
-   </warning>
-  </para>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a two-dimensional associative array of server statistics or &false;
-   on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::getExtendedStats</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $memcache_obj = new Memcache;
-    $memcache_obj->addServer('memcache_host', 11211);
-    $memcache_obj->addServer('failed_host', 11211);
-
-    $stats = $memcache_obj->getExtendedStats();
-    print_r($stats);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [memcache_host:11211] => Array
-        (
-            [pid] => 3756
-            [uptime] => 603011
-            [time] => 1133810435
-            [version] => 1.1.12
-            [rusage_user] => 0.451931
-            [rusage_system] => 0.634903
-            [curr_items] => 2483
-            [total_items] => 3079
-            [bytes] => 2718136
-            [curr_connections] => 2
-            [total_connections] => 807
-            [connection_structures] => 13
-            [cmd_get] => 9748
-            [cmd_set] => 3096
-            [get_hits] => 5976
-            [get_misses] => 3772
-            [bytes_read] => 3448968
-            [bytes_written] => 2318883
-            [limit_maxbytes] => 33554432
-        )
-
-    [failed_host:11211] => false
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::getVersion</function></member>
-   <member><function>Memcache::getStats</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/memcache/memcache/getserverstatus.xml b/reference/memcache/memcache/getserverstatus.xml
deleted file mode 100644
index 84c35385add5..000000000000
--- a/reference/memcache/memcache/getserverstatus.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.getserverstatus">
- <refnamediv>
-  <refname>Memcache::getServerStatus</refname>
-  <refname>memcache_get_server_status</refname>
-  <refpurpose>Returns server status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>Memcache::getServerStatus</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>memcache_get_server_status</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::getServerStatus</function> returns a the servers
-   online/offline status.
-  </simpara>
-
-  <note>
-   <simpara>
-    This function has been added to Memcache version 2.1.0.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the host where memcached is listening for connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the port where memcached is listening for connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a the servers status. 0 if server is failed, non-zero otherwise
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::getServerStatus</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* OO API */
-$memcache = new Memcache;
-$memcache->addServer('memcache_host', 11211);
-echo $memcache->getServerStatus('memcache_host', 11211);
-
-/* procedural API */
-$memcache = memcache_connect('memcache_host', 11211);
-echo memcache_get_server_status($memcache, 'memcache_host', 11211);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::addServer</function></member>
-   <member><function>Memcache::setServerParams</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/memcache/memcache/getstats.xml b/reference/memcache/memcache/getstats.xml
deleted file mode 100644
index e05e1381edd3..000000000000
--- a/reference/memcache/memcache/getstats.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.getstats">
- <refnamediv>
-  <refname>Memcache::getStats</refname>
-  <refname>memcache_get_stats</refname>
-  <refpurpose>Get statistics of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>Memcache::getStats</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slabid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>100</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>memcache_get_stats</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slabid</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>100</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::getStats</function> returns an associative array
-   with server's statistics. Array keys correspond to stats parameters and
-   values to parameter's values.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <simpara>
-      The type of statistics to fetch. Valid values are {reset,
-      malloc, maps, cachedump, slabs, items, sizes}. According to
-      the memcached protocol spec these additional arguments "are
-      subject to change for the convenience of memcache developers".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slabid</parameter></term>
-    <listitem>
-     <simpara>
-      Used in conjunction with <parameter>type</parameter> set to
-      cachedump to identify the slab to dump from. The cachedump
-      command ties up the server and is strictly to be used for
-      debugging purposes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Used in conjunction with <parameter>type</parameter> set to
-      cachedump to limit the number of entries to dump.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array of server statistics&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::getVersion</function></member>
-   <member><function>Memcache::getExtendedStats</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/memcache/memcache/getversion.xml b/reference/memcache/memcache/getversion.xml
deleted file mode 100644
index 4ee8a4b5878d..000000000000
--- a/reference/memcache/memcache/getversion.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.getversion">
- <refnamediv>
-  <refname>Memcache::getVersion</refname>
-  <refname>memcache_get_version</refname>
-  <refpurpose>Return version of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>Memcache::getVersion</methodname>
-   <void/>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>memcache_get_version</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::getVersion</function> returns a string with server's
-   version number.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string of server version number&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::getVersion</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* OO API */
-$memcache = new Memcache;
-$memcache->connect('memcache_host', 11211);
-echo $memcache->getVersion();
-
-/* procedural API */
-$memcache = memcache_connect('memcache_host', 11211);
-echo memcache_get_version($memcache);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::getExtendedStats</function></member>
-   <member><function>Memcache::getStats</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/memcache/memcache/increment.xml b/reference/memcache/memcache/increment.xml
deleted file mode 100644
index 341c99fcc54e..000000000000
--- a/reference/memcache/memcache/increment.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.increment">
- <refnamediv>
-  <refname>Memcache::increment</refname>
-  <refname>memcache_increment</refname>
-  <refpurpose>Increment item's value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>Memcache::increment</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>memcache_increment</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   <function>Memcache::increment</function> increments value of an item by
-   the specified <parameter>value</parameter>. If item specified by
-   <parameter>key</parameter> was not numeric and cannot be converted to a
-   number, it will change its value to <parameter>value</parameter>.
-   <function>Memcache::increment</function> <emphasis>does not</emphasis>
-   create an item if it doesn't already exist.
-   <note>
-    <simpara>
-     Do not use <function>Memcache::increment</function> with items that have been
-     stored compressed because subsequent calls to
-     <function>Memcache::get</function> will fail.
-    </simpara>
-   </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      Key of the item to increment.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      Increment the item by <parameter>value</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns new items value on success &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::increment</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-/* increment counter by 2 */
-$current_value = memcache_increment($memcache_obj, 'counter', 2);
-
-/* OO API */
-$memcache_obj = new Memcache;
-$memcache_obj->connect('memcache_host', 11211);
-/* increment counter by 3 */
-$current_value = $memcache_obj->increment('counter', 3);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::decrement</function></member>
-   <member><function>Memcache::replace</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/memcache/memcache/pconnect.xml b/reference/memcache/memcache/pconnect.xml
deleted file mode 100644
index ed09e4fce1c3..000000000000
--- a/reference/memcache/memcache/pconnect.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.pconnect">
- <refnamediv>
-  <refname>Memcache::pconnect</refname>
-  <refname>memcache_pconnect</refname>
-  <refpurpose>Open memcached server persistent connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::pconnect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>Memcache</type><methodname>Memcache::pconnect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::pconnect</function> is similar to
-   <function>Memcache::connect</function> with the difference, that
-   the connection it establishes is persistent.
-   This connection is not closed after the end of script execution and
-   by <function>Memcache::close</function> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the host where memcached is listening for connections. This parameter
-      may also specify other transports like <literal>unix:///path/to/memcached.sock</literal>
-      to use UNIX domain sockets, in this case <parameter>port</parameter> must also
-      be set to <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the port where memcached is listening for connections. Set this
-      parameter to <literal>0</literal> when using UNIX domain sockets.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      Value in seconds which will be used for connecting to the daemon. Think
-      twice before changing the default value of 1 second - you can lose all
-      the advantages of caching if your connection is too slow.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a Memcache object&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::pconnect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* procedural API */
-$memcache_obj = memcache_pconnect('memcache_host', 11211);
-
-/* OO API */
-
-$memcache_obj = new Memcache;
-$memcache_obj->pconnect('memcache_host', 11211);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::connect</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/memcache/memcache/replace.xml b/reference/memcache/memcache/replace.xml
deleted file mode 100644
index 4891a4196ad4..000000000000
--- a/reference/memcache/memcache/replace.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.replace">
- <refnamediv>
-  <refname>Memcache::replace</refname>
-  <refname>memcache_replace</refname>
-  <refpurpose>Replace value of the existing item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::replace</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_replace</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::replace</function> should be used to replace value of
-   existing item with <parameter>key</parameter>. In case if item with such
-   key doesn't exists, <function>Memcache::replace</function> returns
-   &false;. For the rest <function>Memcache::replace</function> behaves
-   similarly to <function>Memcache::set</function>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key that will be associated with the item.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>var</parameter></term>
-    <listitem>
-     <simpara>
-      The variable to store. Strings and integers are stored as is, other
-      types are stored serialized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Use <constant>MEMCACHE_COMPRESSED</constant> to store the item
-      compressed (uses zlib).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expire</parameter></term>
-    <listitem>
-     <simpara>
-      Expiration time of the item. If it's equal to zero, the item will never
-      expire. You can also use Unix timestamp or a number of seconds starting
-      from current time, but in the latter case the number of seconds may not
-      exceed 2592000 (30 days).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::replace</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$memcache_obj = memcache_connect('memcache_host', 11211);
-
-/* procedural API */
-memcache_replace($memcache_obj, "test_key", "some variable", false, 30);
-
-/* OO API */
-$memcache_obj->replace("test_key", "some variable", false, 30);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::set</function></member>
-   <member><function>Memcache::add</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/memcache/memcache/set.xml b/reference/memcache/memcache/set.xml
deleted file mode 100644
index 98145f3ff00e..000000000000
--- a/reference/memcache/memcache/set.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.set">
- <refnamediv>
-  <refname>Memcache::set</refname>
-  <refname>memcache_set</refname>
-  <refpurpose>Store data at the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::set</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_set</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expire</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   <function>Memcache::set</function> stores an item
-   <parameter>var</parameter> with <parameter>key</parameter> on the
-   memcached server. Parameter <parameter>expire</parameter> is expiration
-   time in seconds. If it's 0, the item never expires (but memcached server
-   doesn't guarantee this item to be stored all the time, it could be deleted
-   from the cache to make place for other items).
-   You can use <constant>MEMCACHE_COMPRESSED</constant> constant as
-   <parameter>flag</parameter> value if you want to use on-the-fly
-   compression (uses zlib).
-   <note>
-    <simpara>
-     Remember that resource variables (i.e. file and connection descriptors)
-     cannot be stored in the cache, because they cannot be adequately
-     represented in serialized state.
-    </simpara>
-   </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key that will be associated with the item.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>var</parameter></term>
-    <listitem>
-     <simpara>
-      The variable to store. Strings and integers are stored as is, other
-      types are stored serialized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Use <constant>MEMCACHE_COMPRESSED</constant> to store the item
-      compressed (uses zlib).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expire</parameter></term>
-    <listitem>
-     <simpara>
-      Expiration time of the item. If it's equal to zero, the item will never
-      expire. You can also use Unix timestamp or a number of seconds starting
-      from current time, but in the latter case the number of seconds may not
-      exceed 2592000 (30 days).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcache::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* procedural API */
-
-/* connect to memcached server */
-$memcache_obj = memcache_connect('memcache_host', 11211);
-
-/*
-set value of item with key 'var_key'
-using 0 as flag value, compression is not used
-expire time is 30 seconds
-*/
-memcache_set($memcache_obj, 'var_key', 'some variable', 0, 30);
-
-echo memcache_get($memcache_obj, 'var_key');
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title><function>Memcache::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* OO API */
-
-$memcache_obj = new Memcache;
-
-/* connect to memcached server */
-$memcache_obj->connect('memcache_host', 11211);
-
-/*
-set value of item with key 'var_key', using on-the-fly compression
-expire time is 50 seconds
-*/
-$memcache_obj->set('var_key', 'some really big variable', MEMCACHE_COMPRESSED, 50);
-
-echo $memcache_obj->get('var_key');
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::add</function></member>
-   <member><function>Memcache::replace</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/memcache/memcache/setcompressthreshold.xml b/reference/memcache/memcache/setcompressthreshold.xml
deleted file mode 100644
index 22b77de801af..000000000000
--- a/reference/memcache/memcache/setcompressthreshold.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.setcompressthreshold">
- <refnamediv>
-  <refname>Memcache::setCompressThreshold</refname>
-  <refname>memcache_set_compress_threshold</refname>
-  <refpurpose>Enable automatic compression of large values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::setCompressThreshold</methodname>
-   <methodparam><type>int</type><parameter>threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>min_savings</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_set_compress_threshold</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>int</type><parameter>threshold</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>min_savings</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::setCompressThreshold</function> enables automatic
-   compression of large values.
-  </simpara>
-
-  <note>
-   <simpara>
-    This function has been added to Memcache version 2.0.0.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>threshold</parameter></term>
-    <listitem>
-     <simpara>
-      Controls the minimum value length before attempting to compress automatically.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>min_saving</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the minimum amount of savings to actually store the value
-      compressed. The supplied value must be between 0 and 1. Default value
-      is 0.2 giving a minimum 20% compression savings.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::setCompressThreshold</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* OO API */
-
-$memcache_obj = new Memcache;
-$memcache_obj->addServer('memcache_host', 11211);
-$memcache_obj->setCompressThreshold(20000, 0.2);
-
-/* procedural API */
-
-$memcache_obj = memcache_connect('memcache_host', 11211);
-memcache_set_compress_threshold($memcache_obj, 20000, 0.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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/memcache/memcache/setserverparams.xml b/reference/memcache/memcache/setserverparams.xml
deleted file mode 100644
index a6547952c8af..000000000000
--- a/reference/memcache/memcache/setserverparams.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="memcache.setserverparams">
- <refnamediv>
-  <refname>Memcache::setServerParams</refname>
-  <refname>memcache_set_server_params</refname>
-  <refpurpose>Changes server parameters and status at runtime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>Memcache::setServerParams</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>retry_interval</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>status</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>failure_callback</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>memcache_set_server_params</methodname>
-   <methodparam><type>Memcache</type><parameter>memcache</parameter></methodparam>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>11211</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>retry_interval</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>status</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>failure_callback</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   <function>Memcache::setServerParams</function> changes server parameters at runtime.
-  </simpara>
-
-  <note>
-   <simpara>
-    This function has been added to Memcache version 2.1.0.
-   </simpara>
-  </note>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the host where memcached is listening for connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      Point to the port where memcached is listening for connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      Value in seconds which will be used for connecting to the daemon. Think
-      twice before changing the default value of 1 second - you can lose all
-      the advantages of caching if your connection is too slow.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>retry_interval</parameter></term>
-    <listitem>
-     <simpara>
-      Controls how often a failed server will be retried, the default value
-      is 15 seconds. Setting this parameter to -1 disables automatic retry.
-      Neither this nor the <parameter>persistent</parameter> parameter has any
-      effect when the extension is loaded dynamically via <function>dl</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>status</parameter></term>
-    <listitem>
-     <simpara>
-      Controls if the server should be flagged as online. Setting this parameter
-      to &false; and <parameter>retry_interval</parameter> to -1 allows a failed
-      server to be kept in the pool so as not to affect the key distribution
-      algorithm. Requests for this server will then failover or fail immediately
-      depending on the <parameter>memcache.allow_failover</parameter> setting.
-      Default to &true;, meaning the server should be considered online.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>failure_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Allows the user to specify a callback function to run upon encountering an
-      error. The callback is run before failover is attempted. The function takes
-      two parameters, the hostname and port of the failed server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Memcache::setServerParams</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function _callback_memcache_failure($host, $port) {
-    print "memcache '$host:$port' failed";
-}
-
-/* OO API */
-
-$memcache = new Memcache;
-
-// Add the server in offline mode
-$memcache->addServer('memcache_host', 11211, false, 1, 1, -1, false);
-
-// Bring the server back online
-$memcache->setServerParams('memcache_host', 11211, 1, 15, true, '_callback_memcache_failure');
-
-/* procedural API */
-
-$memcache_obj = memcache_connect('memcache_host', 11211);
-memcache_set_server_params($memcache_obj, 'memcache_host', 11211, 1, 15, true, '_callback_memcache_failure');
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Memcache::addServer</function></member>
-   <member><function>Memcache::getServerStatus</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/memcache/reference.xml b/reference/memcache/reference.xml
deleted file mode 100644
index 343a6e3f8391..000000000000
--- a/reference/memcache/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.memcache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Memcache &Functions;</title>
- &reference.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/memcache/setup.xml b/reference/memcache/setup.xml
deleted file mode 100644
index 2a435844bd31..000000000000
--- a/reference/memcache/setup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="memcache.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="memcache.requirements">
-  &reftitle.required;
-  <simpara>
-   This module uses functions of <link xlink:href="&url.zlib;">zlib</link>
-   to support on-the-fly data compression. Zlib is required to install
-   this module.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.memcache.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.memcache.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="memcache.resources">
-  &reftitle.resources;
-  <simpara>
-   There is only one resource type used in memcache module - it's
-   the link identifier for a cache server connection.
-  </simpara>
- </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/memcache/versions.xml b/reference/memcache/versions.xml
deleted file mode 100644
index 44bca1ce5d4e..000000000000
--- a/reference/memcache/versions.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='memcache' from='PECL memcache &gt;= 0.2.0'/>
- <function name='memcache::add' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::addServer' from='PECL memcache &gt;= 2.0.0'/>
- <function name='Memcache::close' from='PECL memcache &gt;= 0.4.0'/>
- <function name='Memcache::connect' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::debug' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::decrement' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::delete' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::flush' from='PECL memcache &gt;= 1.0.0'/>
- <function name='Memcache::get' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::getExtendedStats' from='PECL memcache &gt;= 2.0.0'/>
- <function name='Memcache::getServerStatus' from='PECL memcache &gt;= 2.1.0'/>
- <function name='Memcache::getStats' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::getVersion' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::increment' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::pconnect' from='PECL memcache &gt;= 0.4.0'/>
- <function name='Memcache::replace' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::set' from='PECL memcache &gt;= 0.2.0'/>
- <function name='Memcache::setCompressThreshold' from='PECL memcache &gt;= 2.0.0'/>
- <function name='Memcache::setServerParams' from='PECL memcache &gt;= 2.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/memcached/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/memcached/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/memcached/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/memcached/book.xml b/reference/memcached/book.xml
deleted file mode 100644
index d9bbe22643b1..000000000000
--- a/reference/memcached/book.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.memcached">
-  &reftitle.intro;
-  <para>
-   <link xlink:href="&url.memcache;">memcached</link> is a high-performance,
-   distributed memory object caching system, generic in nature, but intended
-   for use in speeding up dynamic web applications by alleviating database
-   load.
-  </para>
-  <para>
-   This extension uses the libmemcached library to provide an API for communicating
-   with memcached servers. It also provides a <link linkend="ref.session">session</link> handler
-   (<literal>memcached</literal>).
-  </para>
-  <para>
-   Information about libmemcached can be found at <link
-   xlink:href="&url.libmemcached;">&url.libmemcached;</link>.
-  </para>
- </preface>
-
- &reference.memcached.setup;
- &reference.memcached.constants;
- &reference.memcached.expiration;
- &reference.memcached.callbacks;
- &reference.memcached.sessions;
- &reference.memcached.memcached;
- &reference.memcached.memcachedexception;
-
-</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/memcached/callbacks.xml b/reference/memcached/callbacks.xml
deleted file mode 100644
index 223a06f4f21a..000000000000
--- a/reference/memcached/callbacks.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="memcached.callbacks" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Callbacks</title>
-
- <section xml:id="memcached.callbacks.result">
-  <title>Result callbacks</title>
-  <para>
-   Result <type>callable</type>s are invoked by
-   <methodname>Memcached::getDelayed</methodname> or
-   <methodname>Memcached::getDelayedBykey</methodname> methods for each item in
-   the result set. The callback is passed the Memcached object and the array
-   with the item information. The callback does not have to return anything.
-  </para>
-  <example>
-   <title>Result callback example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-$items = array(
-    'key1' => 'value1',
-    'key2' => 'value2',
-    'key3' => 'value3'
-);
-$m->setMulti($items);
-$m->getDelayed(array('key1', 'key3'), true, 'result_cb');
-
-function result_cb($memc, $item)
-{
-    var_dump($item);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["key"]=>
-  string(4) "key1"
-  ["value"]=>
-  string(6) "value1"
-  ["cas"]=>
-  float(49)
-}
-array(3) {
-  ["key"]=>
-  string(4) "key3"
-  ["value"]=>
-  string(6) "value3"
-  ["cas"]=>
-  float(50)
-}
-]]>
-   </screen>
-  </example>
- </section>
-
- <section xml:id="memcached.callbacks.read-through">
-  <title>Read-through cache callbacks</title>
-  <para>
-   Read-through cache callbacks are invoked when an item cannot be retrieved
-   from the server. The callback is passed the Memcached object, the requested
-   key, and the by-reference value variable. The callback is responsible for
-   setting the value and returning true or false. If the callback returns true,
-   Memcached will store the populated value on the server and return it to the
-   original calling function. Only <methodname>Memcached::get</methodname> and
-   <methodname>Memcached::getByKey</methodname> support these callbacks,
-   because the memcache protocol does not provide information on which keys
-   were not found in the multi-key request.
-  </para>
-  <example>
-   <title>Read-through callback example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$profile_info = $m->get('user:'.$user_id, 'user_info_cb');
-
-function user_info_cb($memc, $key, &$value)
-{
-    $user_id = substr($key, 5);
-    /* lookup profile info in the DB */
-    /* ... */
-    $value = $profile_info;
-    return true;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </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/memcached/configure.xml b/reference/memcached/configure.xml
deleted file mode 100644
index 5ea873c36bb9..000000000000
--- a/reference/memcached/configure.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="memcached.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;memcached">&url.pecl.package;memcached</link>.
- </para>
- <para>
-  If libmemcached is installed in a non-standard location, use <option
-     role="configure">--with-libmemcached-dir=DIR</option> switch, where DIR is the
-  libmemcached install prefix. This directory has to contain the
-    <filename>include/libmemcached/memcached.h</filename> file.
- </para>
- <para>
-  Zlib is required for compression support. To specify non-standard
-  installation of Zlib, use <option
-   role="configure">--with-zlib-dir=DIR</option> switch, where DIR is the Zlib
-  install prefix.
- </para>
- <para>
-  Session handler support is enabled by default. To disable it, use <option
-   role="configure">--disable-memcached-session</option> switch.
- </para>
- <para>
-  SASL authentication support is disabled by default. To enable it, use
-  <option role="configure">--enable-memcached-sasl</option> switch. This
-  requires that libsasl2 has been installed and that libmemcached has been
-  built with SASL support enabled.
- </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/memcached/constants.xml b/reference/memcached/constants.xml
deleted file mode 100644
index 29dfba336ec7..000000000000
--- a/reference/memcached/constants.xml
+++ /dev/null
@@ -1,951 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="memcached.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-
-  <varlistentry xml:id="memcached.constants.opt-compression">
-   <term><constant>Memcached::OPT_COMPRESSION</constant></term>
-   <listitem>
-    <simpara>
-     Enables or disables payload compression. When enabled,
-     item values longer than a certain threshold (currently 2000 bytes) will be
-     compressed during storage and decompressed during retrieval
-     transparently. The threshold can be configured using the
-     <link linkend="ini.memcached.compression-threshold">memcached.compression_threshold</link>
-     ini setting.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &true;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-compression-type">
-   <term><constant>Memcached::OPT_COMPRESSION_TYPE</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the compression algorithm to use, if compression is enabled.
-     The valid algorithms are <constant>Memcached::COMPRESSION_FASTLZ</constant>,
-     <constant>Memcached::COMPRESSION_ZLIB</constant> and
-     <constant>Memcached::COMPRESSION_ZSTD</constant>.
-    </simpara>
-    <para>Type: <type>int</type>, default: <constant>Memcached::COMPRESSION_FASTLZ</constant>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.compression-fastlz">
-   <term><constant>Memcached::COMPRESSION_FASTLZ</constant></term>
-   <listitem>
-    <simpara>
-     The FASTLZ compression algorithm.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.compression-zlib">
-   <term><constant>Memcached::COMPRESSION_ZLIB</constant></term>
-   <listitem>
-    <simpara>The ZLIB compression algorithm.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.compression-zstd">
-   <term><constant>Memcached::COMPRESSION_ZSTD</constant></term>
-   <listitem>
-    <simpara>
-     The ZSTD compression algorithm.
-    </simpara>
-    <simpara>
-     Available as of Memcached 3.3.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-compression-level">
-   <term><constant>Memcached::OPT_COMPRESSION_LEVEL</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the compression level to use, if compression is enabled.
-    </simpara>
-    <simplelist>
-     <member><constant>Memcached::COMPRESSION_FASTLZ</constant> does not support compression levels.</member>
-     <member><constant>Memcached::COMPRESSION_ZSTD</constant>: minimum level is <literal>-22</literal> and maximum level is <literal>22</literal>.</member>
-     <member><constant>Memcached::COMPRESSION_ZLIB</constant>: minimum level is <literal>0</literal> and maximum level is <literal>9</literal>.</member>
-    </simplelist>
-    <para>Type: <type>int</type>, default: <literal>3</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-serializer">
-   <term><constant>Memcached::OPT_SERIALIZER</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the serializer to use for serializing non-scalar values.
-     The valid serializers are <constant>Memcached::SERIALIZER_PHP</constant>,
-     <constant>Memcached::SERIALIZER_IGBINARY</constant>,
-     <constant>Memcached::SERIALIZER_JSON</constant>,
-     <constant>Memcached::SERIALIZER_JSON_ARRAY</constant> and
-     <constant>Memcached::SERIALIZER_MSGPACK</constant>.
-    </simpara>
-    <para>
-     Type: <type>int</type>, default: <constant>Memcached::SERIALIZER_IGBINARY</constant> if available,
-     then <constant>Memcached::SERIALIZER_MSGPACK</constant> if available,
-     then <constant>Memcached::SERIALIZER_PHP</constant>.
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.serializer-php">
-   <term><constant>Memcached::SERIALIZER_PHP</constant></term>
-   <listitem>
-    <para>The default PHP serializer.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.serializer-igbinary">
-   <term><constant>Memcached::SERIALIZER_IGBINARY</constant></term>
-   <listitem>
-    <simpara>
-     The <link linkend="book.igbinary">igbinary</link> serializer.
-     Instead of textual representation it stores PHP data structures in a
-     compact binary form, resulting in space and time gains.
-    </simpara>
-    <simpara>
-     This serializer is supported only if memcached is configured with
-     <option>--enable-memcached-igbinary</option> option and the
-     <link linkend="intro.igbinary">igbinary</link> extension is loaded.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.serializer-json">
-   <term><constant>Memcached::SERIALIZER_JSON</constant></term>
-   <listitem>
-    <para>The JSON serializer. This serializer deserializes JSON to an object.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.serializer-json-array">
-   <term><constant>Memcached::SERIALIZER_JSON_ARRAY</constant></term>
-   <listitem>
-    <simpara>
-     The JSON array serializer.
-     This serializer deserializes JSON to an associative array
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.serializer-msgpack">
-   <term><constant>Memcached::SERIALIZER_MSGPACK</constant></term>
-   <listitem>
-    <simpara>
-     The <link xlink:href="&url.pecl.package;msgpack">MessagePack</link> serializer.
-    </simpara>
-    <simpara>
-     This serializer is supported only if memcached is configured with
-     <option>--enable-memcached-msgpack</option> option and the
-     <literal>msgpack</literal> extension is loaded.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-prefix-key">
-   <term><constant>Memcached::OPT_PREFIX_KEY</constant></term>
-   <listitem>
-    <simpara>
-     This can be used to create a "domain" for your item keys. The value
-     specified here will be prefixed to each of the keys. It cannot be
-     longer than <literal>128</literal> characters and will reduce the
-     maximum available key size. The prefix is applied only to the item keys,
-     not to the server keys.
-    </simpara>
-    <para>Type: <type>string</type>, default: <literal>""</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-hash">
-   <term><constant>Memcached::OPT_HASH</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the hashing algorithm used for the item keys. The valid
-     values are supplied via <constant>Memcached::HASH_<replaceable>*</replaceable></constant> constants.
-     Each hash algorithm has its advantages and its disadvantages. Go with the
-     default if you don't know or don't care.
-    </simpara>
-    <para>Type: <type>int</type>, default: <constant>Memcached::HASH_DEFAULT</constant></para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-default">
-   <term><constant>Memcached::HASH_DEFAULT</constant></term>
-   <listitem>
-    <para>The default (Jenkins one-at-a-time) item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-md5">
-   <term><constant>Memcached::HASH_MD5</constant></term>
-   <listitem>
-    <para>MD5 item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-crc">
-   <term><constant>Memcached::HASH_CRC</constant></term>
-   <listitem>
-    <para>CRC item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-fnv1-64">
-   <term><constant>Memcached::HASH_FNV1_64</constant></term>
-   <listitem>
-    <para>FNV1_64 item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-fnv1a-64">
-   <term><constant>Memcached::HASH_FNV1A_64</constant></term>
-   <listitem>
-    <para>FNV1_64A item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-fnv1-32">
-   <term><constant>Memcached::HASH_FNV1_32</constant></term>
-   <listitem>
-    <para>FNV1_32 item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-fnv1a-32">
-   <term><constant>Memcached::HASH_FNV1A_32</constant></term>
-   <listitem>
-    <para>FNV1_32A item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-hsieh">
-   <term><constant>Memcached::HASH_HSIEH</constant></term>
-   <listitem>
-    <para>Hsieh item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.hash-murmur">
-   <term><constant>Memcached::HASH_MURMUR</constant></term>
-   <listitem>
-    <para>Murmur item key hashing algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-distribution">
-   <term><constant>Memcached::OPT_DISTRIBUTION</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the method of distributing item keys to the servers.
-     Currently supported methods are modulo and consistent hashing. Consistent
-     hashing delivers better distribution and allows servers to be added to
-     the cluster with minimal cache losses.
-    </simpara>
-    <para>Type: <type>int</type>, default: <constant>Memcached::DISTRIBUTION_MODULA</constant>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.distribution-modula">
-   <term><constant>Memcached::DISTRIBUTION_MODULA</constant></term>
-   <listitem>
-    <para>Modulo-based key distribution algorithm.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.distribution-consistent">
-   <term><constant>Memcached::DISTRIBUTION_CONSISTENT</constant></term>
-   <listitem>
-    <para>Consistent hashing key distribution algorithm (based on libketama).</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.distribution-virtual-bucket">
-   <term><constant>Memcached::DISTRIBUTION_VIRTUAL_BUCKET</constant></term>
-   <listitem>
-    <simpara>
-     Virtual Bucket hashing key distribution algorithm (also called vbucket).
-    </simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-libketama-compatible">
-   <term><constant>Memcached::OPT_LIBKETAMA_COMPATIBLE</constant></term>
-   <listitem>
-    <para>
-     Enables or disables compatibility with libketama-like behavior. When
-     enabled, the item key hashing algorithm is set to MD5 and distribution is
-     set to be weighted consistent hashing distribution. This is useful
-     because other libketama-based clients (Python, Ruby, etc.) with the same
-     server configuration will be able to access the keys transparently.
-    </para>
-    <note>
-     <para>
-      It is highly recommended to enable this option if you want to use
-      consistent hashing, and it may be enabled by default in future
-      releases.
-     </para>
-    </note>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-libketama-hash">
-   <term><constant>Memcached::OPT_LIBKETAMA_HASH</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the hashing algorithm for host mapping.
-    </simpara>
-    <para>Type: <type>int</type>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-tcp-keepalive">
-   <term><constant>Memcached::OPT_TCP_KEEPALIVE</constant></term>
-   <listitem>
-    <simpara>
-     Enables TCP keep alive.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-buffer-writes">
-   <term><constant>Memcached::OPT_BUFFER_WRITES</constant></term>
-   <listitem>
-    <simpara>
-     Enables or disables buffered I/O. Enabling buffered I/O causes
-     storage commands to "buffer" instead of being sent. Any action that
-     retrieves data causes this buffer to be sent to the remote connection.
-     Quitting the connection or closing down the connection will also cause
-     the buffered data to be pushed to the remote connection.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-binary-protocol">
-   <term><constant>Memcached::OPT_BINARY_PROTOCOL</constant></term>
-   <listitem>
-    <simpara>
-     Enable the use of the binary protocol. Please note that you cannot
-     toggle this option on an open connection.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-no-block">
-   <term><constant>Memcached::OPT_NO_BLOCK</constant></term>
-   <listitem>
-    <simpara>
-     Enables or disables asynchronous I/O. This is the fastest transport
-     available for storage functions.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-noreply">
-   <term><constant>Memcached::OPT_NOREPLY</constant></term>
-   <listitem>
-    <simpara>
-     Enables or disables ignoring the result of storage commands
-     (set, add, replace, append, prepend, delete, increment, decrement, etc.).
-     Storage commands will be sent without spending time waiting for a reply
-     (there would be no reply).
-     Retrieval commands such as <methodname>Memcached::get</methodname> are unaffected by this setting.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-tcp-nodelay">
-   <term><constant>Memcached::OPT_TCP_NODELAY</constant></term>
-   <listitem>
-    <simpara>
-     Enables or disables the no-delay feature for connecting sockets (may
-     be faster in some environments).
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-socket-send-size">
-   <term><constant>Memcached::OPT_SOCKET_SEND_SIZE</constant></term>
-   <listitem>
-    <simpara>The maximum socket send buffer in bytes.</simpara>
-    <para>
-     Type: <type>int</type>, default: varies by platform/kernel
-     configuration.
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-socket-recv-size">
-   <term><constant>Memcached::OPT_SOCKET_RECV_SIZE</constant></term>
-   <listitem>
-    <simpara>The maximum socket receive buffer in bytes.</simpara>
-    <para>
-     Type: <type>int</type>, default: varies by platform/kernel
-     configuration.
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-connect-timeout">
-   <term><constant>Memcached::OPT_CONNECT_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>
-     In non-blocking mode this set the value of the timeout during socket
-     connection, in milliseconds.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>1000</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-retry-timeout">
-   <term><constant>Memcached::OPT_RETRY_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>
-     The amount of time, in seconds, to wait until retrying a failed
-     connection attempt.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>2</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-dead-timeout">
-   <term><constant>Memcached::OPT_DEAD_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>
-     The amount of time, in seconds, to wait until retrying dead servers.
-     <literal>0</literal> means no retry.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>0</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-send-timeout">
-   <term><constant>Memcached::OPT_SEND_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>
-     Socket sending timeout, in microseconds. In cases where you cannot
-     use non-blocking I/O this will allow you to still have timeouts on the
-     sending of data.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>0</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-recv-timeout">
-   <term><constant>Memcached::OPT_RECV_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>
-     Socket reading timeout, in microseconds. In cases where you cannot
-     use non-blocking I/O this will allow you to still have timeouts on the
-     reading of data.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>0</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-poll-timeout">
-   <term><constant>Memcached::OPT_POLL_TIMEOUT</constant></term>
-   <listitem>
-    <simpara>Timeout for connection polling, in milliseconds.</simpara>
-    <para>Type: <type>int</type>, default: <literal>1000</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-cache-lookups">
-   <term><constant>Memcached::OPT_CACHE_LOOKUPS</constant></term>
-   <listitem>
-    <simpara>Enables or disables caching of DNS lookups.</simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-server-failure-limit">
-   <term><constant>Memcached::OPT_SERVER_FAILURE_LIMIT</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the failure limit for server connection attempts.
-     The server will be removed after this many continuous connection failures.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>5</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-server-timeout-limit">
-   <term><constant>Memcached::OPT_SERVER_TIMEOUT_LIMIT</constant></term>
-   <listitem>
-    <simpara>
-     Specifies the timeout limit for server connection attempts.
-     The server will be removed after this many continuous connection timeouts.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>0</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-auto-eject-hosts">
-   <term><constant>Memcached::OPT_AUTO_EJECT_HOSTS</constant></term>
-   <listitem>
-    <para>
-     Removes disabled servers from the list. Use together with
-     <constant>Memcached::OPT_SERVER_FAILURE_LIMIT</constant> and
-     <constant>Memcached::OPT_SERVER_TIMEOUT_LIMIT</constant>.
-    </para>
-    <note>
-     <para>
-      This option is replaced by
-      <constant>Memcached::OPT_REMOVE_FAILED_SERVERS</constant>.
-     </para>
-    </note>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-verify-key">
-   <term><constant>Memcached::OPT_VERIFY_KEY</constant></term>
-   <listitem>
-    <simpara>
-     Enables verification of keys by memcached.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-use-udp">
-   <term><constant>Memcached::OPT_USE_UDP</constant></term>
-   <listitem>
-    <simpara>
-     Uses UDP instead of TCP.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-number-of-replicas">
-   <term><constant>Memcached::OPT_NUMBER_OF_REPLICAS</constant></term>
-   <listitem>
-    <simpara>
-     Stores this many replicas of each item on different servers.
-    </simpara>
-    <para>Type: <type>int</type>, default: <literal>0</literal>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-randomize-replica-reads">
-   <term><constant>Memcached::OPT_RANDOMIZE_REPLICA_READS</constant></term>
-   <listitem>
-    <simpara>
-     Randomizes replica read server.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.opt-remove-failed-servers">
-   <term><constant>Memcached::OPT_REMOVE_FAILED_SERVERS</constant></term>
-   <listitem>
-    <simpara>
-     Removes disabled servers from the list. Use together with
-     <constant>Memcached::OPT_SERVER_FAILURE_LIMIT</constant> and
-     <constant>Memcached::OPT_SERVER_TIMEOUT_LIMIT</constant>.
-    </simpara>
-    <para>Type: <type>bool</type>, default: &false;.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-igbinary">
-   <term><constant>Memcached::HAVE_IGBINARY</constant></term>
-   <listitem>
-    <simpara>Indicates whether igbinary serializer support is available.</simpara>
-    <para>Type: <type>bool</type>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-json">
-   <term><constant>Memcached::HAVE_JSON</constant></term>
-   <listitem>
-    <simpara>Indicates whether JSON serializer support is available.</simpara>
-    <para>Type: <type>bool</type>.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-msgpack">
-   <term><constant>Memcached::HAVE_MSGPACK</constant></term>
-   <listitem>
-    <simpara>Indicates whether MessagePack serializer support is available.</simpara>
-    <para>Type: <type>bool</type>.</para>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-zstd">
-   <term><constant>Memcached::HAVE_ZSTD</constant></term>
-   <listitem>
-    <simpara>Indicates whether ZSTD compression support is available.</simpara>
-    <para>Type: <type>bool</type>.</para>
-    <para>Available as of Memcached 3.3.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-encoding">
-   <term><constant>Memcached::HAVE_ENCODING</constant></term>
-   <listitem>
-    <simpara>
-     Indicates whether data encryption using
-     <methodname>Memcached::setEncodingKey</methodname> is supported.
-    </simpara>
-    <para>Type: <type>bool</type>.</para>
-    <para>Available as of Memcached 3.1.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-session">
-   <term><constant>Memcached::HAVE_SESSION</constant></term>
-   <listitem>
-    <para>Type: <type>bool</type>.</para>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.have-sasl">
-   <term><constant>Memcached::HAVE_SASL</constant></term>
-   <listitem>
-    <para>Type: <type>bool</type>.</para>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.get-extended">
-   <term><constant>Memcached::GET_EXTENDED</constant></term>
-   <listitem>
-    <para>
-     A flag for <methodname>Memcached::get</methodname>, <methodname>Memcached::getMulti</methodname> and
-     <methodname>Memcached::getMultiByKey</methodname> to ensure that the CAS token values
-     are returned as well.
-    </para>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.get-preserve-order">
-   <term><constant>Memcached::GET_PRESERVE_ORDER</constant></term>
-   <listitem>
-    <para>
-     A flag for <methodname>Memcached::getMulti</methodname> and
-     <methodname>Memcached::getMultiByKey</methodname> to ensure that the keys are
-     returned in the same order as they were requested in. Non-existing keys
-     get a default value of &null;.
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-success">
-   <term><constant>Memcached::RES_SUCCESS</constant></term>
-   <listitem>
-    <para>The operation was successful.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-failure">
-   <term><constant>Memcached::RES_FAILURE</constant></term>
-   <listitem>
-    <para>The operation failed in some fashion.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-host-lookup-failure">
-   <term><constant>Memcached::RES_HOST_LOOKUP_FAILURE</constant></term>
-   <listitem>
-    <para>DNS lookup failed.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-unknown-read-failure">
-   <term><constant>Memcached::RES_UNKNOWN_READ_FAILURE</constant></term>
-   <listitem>
-    <para>Failed to read network data.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-protocol-error">
-   <term><constant>Memcached::RES_PROTOCOL_ERROR</constant></term>
-   <listitem>
-    <para>Bad command in memcached protocol.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-client-error">
-   <term><constant>Memcached::RES_CLIENT_ERROR</constant></term>
-   <listitem>
-    <para>Error on the client side.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-server-error">
-   <term><constant>Memcached::RES_SERVER_ERROR</constant></term>
-   <listitem>
-    <para>Error on the server side.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-write-failure">
-   <term><constant>Memcached::RES_WRITE_FAILURE</constant></term>
-   <listitem>
-    <para>Failed to write network data.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-data-exists">
-   <term><constant>Memcached::RES_DATA_EXISTS</constant></term>
-   <listitem>
-    <para>Failed to do compare-and-swap: item you are trying to store has been
-     modified since you last fetched it.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-notstored">
-   <term><constant>Memcached::RES_NOTSTORED</constant></term>
-   <listitem>
-    <para>
-     Item was not stored: but not because of an error. This normally
-     means that either the condition for an "add" or a "replace" command
-     wasn't met, or that the item is in a delete queue.
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-notfound">
-   <term><constant>Memcached::RES_NOTFOUND</constant></term>
-   <listitem>
-    <para>
-     Item with this key was not found (with "get" operation or "cas"
-     operations).
-    </para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-partial-read">
-   <term><constant>Memcached::RES_PARTIAL_READ</constant></term>
-   <listitem>
-    <para>Partial network data read error.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-some-errors">
-   <term><constant>Memcached::RES_SOME_ERRORS</constant></term>
-   <listitem>
-    <para>Some errors occurred during multi-get.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-no-servers">
-   <term><constant>Memcached::RES_NO_SERVERS</constant></term>
-   <listitem>
-    <para>Server list is empty.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-end">
-   <term><constant>Memcached::RES_END</constant></term>
-   <listitem>
-    <para>End of result set.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-errno">
-   <term><constant>Memcached::RES_ERRNO</constant></term>
-   <listitem>
-    <para>System error.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-buffered">
-   <term><constant>Memcached::RES_BUFFERED</constant></term>
-   <listitem>
-    <para>The operation was buffered.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-timeout">
-   <term><constant>Memcached::RES_TIMEOUT</constant></term>
-   <listitem>
-    <para>The operation timed out.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-bad-key-provided">
-   <term><constant>Memcached::RES_BAD_KEY_PROVIDED</constant></term>
-   <listitem>
-    <para>Bad key.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-stored">
-   <term><constant>Memcached::RES_STORED</constant></term>
-   <listitem>
-    <simpara>Item stored.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-deleted">
-   <term><constant>Memcached::RES_DELETED</constant></term>
-   <listitem>
-    <simpara>Item deleted.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-stat">
-   <term><constant>Memcached::RES_STAT</constant></term>
-   <listitem>
-    <simpara>Statistics.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-item">
-   <term><constant>Memcached::RES_ITEM</constant></term>
-   <listitem>
-    <simpara>Item.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-not-supported">
-   <term><constant>Memcached::RES_NOT_SUPPORTED</constant></term>
-   <listitem>
-    <simpara>Not supported.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-fetch-notfinished">
-   <term><constant>Memcached::RES_FETCH_NOTFINISHED</constant></term>
-   <listitem>
-    <simpara>Fetch not finished.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-server-marked-dead">
-   <term><constant>Memcached::RES_SERVER_MARKED_DEAD</constant></term>
-   <listitem>
-    <simpara>Server marked dead.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-unknown-stat-key">
-   <term><constant>Memcached::RES_UNKNOWN_STAT_KEY</constant></term>
-   <listitem>
-    <simpara>Unknown stat key.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-invalid-host-protocol">
-   <term><constant>Memcached::RES_INVALID_HOST_PROTOCOL</constant></term>
-   <listitem>
-    <simpara>Invalid host protocol.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-memory-allocation-failure">
-   <term><constant>Memcached::RES_MEMORY_ALLOCATION_FAILURE</constant></term>
-   <listitem>
-    <simpara>Memory allocation failure.</simpara>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-connection-socket-create-failure">
-   <term><constant>Memcached::RES_CONNECTION_SOCKET_CREATE_FAILURE</constant></term>
-   <listitem>
-    <para>Failed to create network socket.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-payload-failure">
-   <term><constant>Memcached::RES_PAYLOAD_FAILURE</constant></term>
-   <listitem>
-    <para>Payload failure: could not compress/decompress or serialize/unserialize the value.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-auth-problem">
-   <term><constant>Memcached::RES_AUTH_PROBLEM</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-auth-failure">
-   <term><constant>Memcached::RES_AUTH_FAILURE</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-auth-continue">
-   <term><constant>Memcached::RES_AUTH_CONTINUE</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-e2big">
-   <term><constant>Memcached::RES_E2BIG</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-key-too-big">
-   <term><constant>Memcached::RES_KEY_TOO_BIG</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-server-temporarily-disabled">
-   <term><constant>Memcached::RES_SERVER_TEMPORARILY_DISABLED</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="memcached.constants.res-server-memory-allocation-failure">
-   <term><constant>Memcached::RES_SERVER_MEMORY_ALLOCATION_FAILURE</constant></term>
-   <listitem>
-    <para>Available as of Memcached 3.0.0.</para>
-   </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/memcached/expiration.xml b/reference/memcached/expiration.xml
deleted file mode 100644
index a596cacd1ece..000000000000
--- a/reference/memcached/expiration.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="memcached.expiration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Expiration Times</title>
- <para>
-  Some storage commands involve sending an expiration value (relative to an
-  item or to an operation requested by the client) to the server. In all such
-  cases, the actual value sent may either be Unix time (number of seconds
-  since January 1, 1970, as an integer), or a number of seconds starting from
-  current time. In the latter case, this number of seconds may not exceed
-  60*60*24*30 (number of seconds in 30 days); if the expiration value is
-  larger than that, the server will consider it to be real Unix time value
-  rather than an offset from current time.
- </para>
- <para>
-  If the expiration value is <literal>0</literal> (the default), the item
-  never expires (although it may be deleted from the server to make place for
-  other items). 
- </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/memcached/ini.xml b/reference/memcached/ini.xml
deleted file mode 100644
index f1eb326565c5..000000000000
--- a/reference/memcached/ini.xml
+++ /dev/null
@@ -1,682 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="memcached.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Memcached &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.memcached.sess-locking">memcached.sess_locking</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-consistent-hash">memcached.sess_consistent_hash</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.1.0. Default value is <literal>On</literal> as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-binary">memcached.sess_binary</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.0.0. Replaced by <literal>memcached.sess_binary_protocol</literal> as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-lock-wait">memcached.sess_lock_wait</link></entry>
-      <entry>150000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0. Removed as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-prefix">memcached.sess_prefix</link></entry>
-      <entry>memc.sess.key.</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-number-of-replicas">memcached.sess_number_of_replicas</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-randomize-replica-read">memcached.sess_randomize_replica_read</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-remove-failed">memcached.sess_remove_failed</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.1.0. Replaced by <literal>memcached.sess_remove_failed_servers</literal> as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.compression-type">memcached.compression_type</link></entry>
-      <entry>fastlz</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.compression-factor">memcached.compression_factor</link></entry>
-      <entry>1.3</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.compression-threshold">memcached.compression_threshold</link></entry>
-      <entry>2000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.serializer">memcached.serializer</link></entry>
-      <entry>igbinary</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 0.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.use-sasl">memcached.use_sasl</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.2.0. Removed as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.default-binary-protocol">memcached.default_binary_protocol</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.default-connect-timeout">memcached.default_connect_timeout</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.default-consistent-hash">memcached.default_consistent_hash</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-binary-protocol">memcached.sess_binary_protocol</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0. Replace <literal>memcached.sess_binary</literal>.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-connect-timeout">memcached.sess_connect_timeout</link></entry>
-       <entry>1000</entry>
-       <entry><constant>INI_ALL</constant></entry>
-       <entry>Available as of memcached 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-consistent-hash-type">memcached.sess_consistent_hash_type</link></entry>
-      <entry>ketama</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.1.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-lock-expire">memcached.sess_lock_expire</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-lock-retries">memcached.sess_lock_retries</link></entry>
-      <entry>5</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-lock-wait-max">memcached.sess_lock_wait_max</link></entry>
-      <entry>150</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0. Default value <literal>150</literal> as of memcached 3.1.0 (previously <literal>2000</literal>).</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-lock-wait-min">memcached.sess_lock_wait_min</link></entry>
-      <entry>150</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0. Default value <literal>150</literal> as of memcached 3.1.0 (previously <literal>1000</literal>).</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-persistent">memcached.sess_persistent</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-remove-failed-servers">memcached.sess_remove_failed_servers</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0. Replace <literal>memcached.sess_remove_failed</literal>.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-server-failure-limit">memcached.sess_server_failure_limit</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 3.0.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-sasl-password">memcached.sess_sasl_password</link></entry>
-      <entry>null</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.sess-sasl-username">memcached.sess_sasl_username</link></entry>
-      <entry>null</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of memcached 2.2.0.</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.memcached.store-retry-count">memcached.store_retry_count</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>
-       Available as of memcached 2.2.0.
-       Default value <literal>0</literal> as of memcached 3.2.0
-       (previously <literal>2</literal>).
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.memcached.sess-locking">
-     <term>
-      <parameter>memcached.sess_locking</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Use session locking. Valid values: <literal>On</literal>, <literal>Off</literal>, the default is <literal>On</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-consistent-hash">
-     <term>
-      <parameter>memcached.sess_consistent_hash</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       If set to <literal>On</literal>, consistent hashing (libketama) is used for session handling.
-       When consistent hashing is used,
-       one can add or remove cache node(s) without messing up too much with existing keys.
-       Default is <literal>On</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-binary">
-     <term>
-      <parameter>memcached.sess_binary</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Use memcached session binary mode. Libmemcached replicas only work if
-       binary mode is enabled. The default is <literal>Off</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-lock-wait">
-     <term>
-      <parameter>memcached.sess_lock_wait</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Session spin lock retry wait time in microseconds. Be careful when
-       setting this value. Valid values are integers, where <literal>0</literal> is interpreted
-       as the default value. Negative values result in a reduces locking to a
-       try lock. The default is <literal>150000</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-prefix">
-     <term>
-      <parameter>memcached.sess_prefix</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Memcached session key prefix. Valid values are strings less than 219
-       bytes long. The default value is <literal>memc.sess.key</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-number-of-replicas">
-     <term>
-      <parameter>memcached.sess_number_of_replicas</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Write data to a number of additional memcached servers. This is "poor man's HA" as libmemcached calls it.
-       If this value is positive and <literal>sess_remove_failed_servers</literal> is enabled
-       when a memcached server fails the session will continue to be available from a replica.
-       However, if the failed memcache server becomes available again it will read the session
-       from there which could have old data or no data at all.
-       Default is <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-randomize-replica-read">
-     <term>
-      <parameter>memcached.sess_randomize_replica_read</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Memcached session replica read randomize.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-remove-failed">
-     <term>
-      <parameter>memcached.sess_remove_failed</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Allow failed memcached server to automatically be removed.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.compression-type">
-     <term>
-      <parameter>memcached.compression_type</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Set the compression type, valid values are: <literal>fastlz</literal>, <literal>zlib</literal>.
-       The default is <literal>fastlz</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.compression-factor">
-     <term>
-      <parameter>memcached.compression_factor</parameter>
-      <type>float</type>
-     </term>
-     <listitem>
-      <para>
-       Compression factor. Store compressed value only if the compression
-       factor (saving) exceeds the set limit. Store compressed if:
-       <literal>plain_len &gt; comp_len * factor</literal>. The default value
-       is <literal>1.3</literal> (23% space saving).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.compression-threshold">
-     <term>
-      <parameter>memcached.compression_threshold</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The compression threshold. Do not compress serialized values below this
-       threshold. The default is <literal>2000</literal> bytes.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.serializer">
-     <term>
-      <parameter>memcached.serializer</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Set the default serializer for new memcached objects. Valid values
-       are: <literal>php</literal>, <literal>igbinary</literal>, <literal>json</literal>,
-       <literal>json_array</literal>, <literal>msgpack</literal>.
-      </para>
-      <variablelist>
-       <varlistentry>
-        <term>json</term>
-        <listitem>
-         <para>
-          Standard PHP JSON encoding. This serializer is fast and compact but
-          only works on UTF-8 encoded data and does not fully implement
-          serializing. See the JSON extension. Available as of memcached 0.2.0.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>json_array</term>
-        <listitem>
-         <para>
-          As <literal>json</literal>, but decodes into arrays. Available as of memcached 2.0.0.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>php</term>
-        <listitem>
-         <para>
-          The standard PHP serializer.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>igbinary</term>
-        <listitem>
-         <para>
-          A binary serializer. Available as of memcached 0.1.4.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>msgpack</term>
-        <listitem>
-         <para>
-          A cross-language binary serializer. Available as of memcached 2.2.0.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-      <para>
-       The default is <literal>igbinary</literal> if available, then <literal>msgpack</literal> if
-       available, then <literal>php</literal> otherwise.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.use-sasl">
-     <term>
-      <parameter>memcached.use_sasl</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Use SASL authentication for connections. Valid values: <literal>On</literal>, <literal>Off</literal>. The
-       default is <literal>Off</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.default-binary-protocol">
-     <term>
-      <parameter>memcached.default_binary_protocol</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Sets the default memcached protocol for new connections. (To configure the memcached protocol for
-       connections used by sessions, use <literal>memcached.sess_binary_protocol</literal> instead.)
-
-       If set to <literal>On</literal>, the memcached binary protocol is used by default.
-       If set to <literal>Off</literal>, the memcached text protocol is used.
-       Default is <literal>Off</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.default-connect-timeout">
-     <term>
-      <parameter>memcached.default_connect_timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Sets the default memcached connection timeout for new connections.
-       (To configure the memcached connection timeout for sessions, use <literal>memcached.sess_connect_timeout</literal> instead.)
-
-       In non-blocking mode this changes the value of the timeout.
-       During socket connection in milliseconds.
-       Specifying <literal>-1</literal> means an infinite timeout.
-       Specifying <literal>0</literal> means using the memcached library's default connection timeout.
-       Default is <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.default-consistent-hash">
-     <term>
-      <parameter>memcached.default_consistent_hash</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Sets the default for consistent hashing for new connections.
-       (To configure consistent hashing for session connections,
-       use <literal>memcached.sess_consistent_hash</literal> instead.)
-
-       If set to <literal>On</literal>, consistent hashing (libketama) is used for
-       session handling. When consistent hashing is used, one can add or remove cache node(s)
-       without messing up too much with existing keys default is <literal>Off</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-binary-protocol">
-     <term>
-      <parameter>memcached.sess_binary_protocol</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Use the memcached binary protocol for memcached sessions instead of the text protocol.
-       libmemcached replicas only work if the binary mode is enabled.
-       However, certain proxies (such as twemproxy) will only work if the binary protocol is disabled.
-       Default is <literal>On</literal> as of libmemcached 1.0.18.
-       Prior to libmemcached 1.0.18, the default was <literal>Off</literal>.
-      </para>
-      <note>
-       <simpara>
-        In previous versions of php-memcached, this setting was called
-        <literal>memcached.sess_binary</literal>.
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-connect-timeout">
-     <term>
-      <parameter>memcached.sess_connect_timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       memcached connect timeout value
-       In non-blocking mode this changes the value of the timeout
-       during socket connection in milliseconds.
-       Specifying <literal>-1</literal> means an infinite timeout.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-consistent-hash-type">
-     <term>
-      <parameter>memcached.sess_consistent_hash_type</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Memcached session consistent hash type.
-       If set to <literal>ketama</literal>, consistent hashing (libketama)
-       is used for session handling.
-       If set to <literal>ketama_weighted</literal>, weighted consistent hashing (libketama)
-       is used for session handling.
-       Default is <literal>ketama</literal>.
-       Prior to php-memcached 3.0, the default was <literal>ketama_weighted</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-lock-expire">
-     <term>
-      <parameter>memcached.sess_lock_expire</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The time, in seconds, before a lock should release itself.
-       Setting to <literal>0</literal> results in the default behaviour,
-       which is to use PHP's <literal>max_execution_time</literal>.
-       Default is <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-lock-retries">
-     <term>
-      <parameter>memcached.sess_lock_retries</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The number of times to retry locking the session lock, not including the first attempt.
-       Default is <literal>5</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-lock-wait-max">
-     <term>
-      <parameter>memcached.sess_lock_wait_max</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The maximum time, in milliseconds, to wait between session lock attempts.
-       The default is <literal>150</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-lock-wait-min">
-     <term>
-      <parameter>memcached.sess_lock_wait_min</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The minimum time, in milliseconds, to wait between session lock attempts.
-       This value is double on each lock retry until <literal>memcached.sess_lock_wait_max</literal> is
-       reached, after which any further retries will take
-       <literal>memcached.sess_lock_wait_max</literal> seconds.
-       The default is <literal>150</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-persistent">
-     <term>
-      <parameter>memcached.sess_persistent</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Whether or not to re-use the memcached connections corresponding to the value(s) of
-       <literal>session.save_path</literal> after the execution of the script ends. Don't use this if
-       certain settings (e.g. SASL settings, sess_binary_protocol) would be overridden between requests.
-       Default is <literal>Off</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-remove-failed-servers">
-     <term>
-      <parameter>memcached.sess_remove_failed_servers</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Allow failed memcached server to automatically be removed.
-       Default is <literal>Off</literal>.
-      </para>
-      <note>
-       <simpara>
-        In previous versions of php-memcached, this setting was called
-        <literal>memcached.sess_remove_failed</literal>.
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-server-failure-limit">
-     <term>
-      <parameter>memcached.sess_server_failure_limit</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Set this value to enable the server be removed after
-       configured number of continuous times connection failure.
-       Default is <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-sasl-password">
-     <term>
-      <parameter>memcached.sess_sasl_password</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Session SASL password.
-       Both username and password need to be set for SASL to be enabled.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.sess-sasl-username">
-     <term>
-      <parameter>memcached.sess_sasl_username</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Session SASL username.
-       Both username and password need to be set for SASL to be enabled.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.memcached.store-retry-count">
-     <term>
-      <parameter>memcached.store_retry_count</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       The amount of retries for failed store commands.
-       This mechanism allows transparent fail-over to secondary servers when
-       set/increment/decrement/setMulti operations fail on
-       the desired server in a multi-server environment.
-       The default is <literal>2</literal>.
-      </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/memcached/memcached.xml b/reference/memcached/memcached.xml
deleted file mode 100644
index c05f72351f73..000000000000
--- a/reference/memcached/memcached.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.memcached" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Memcached class</title>
- <titleabbrev>Memcached</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Memcached intro -->
-  <section xml:id="memcached.intro">
-   &reftitle.intro;
-   <para>
-    Represents a connection to a set of memcached servers.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="memcached.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass>
-     <classname>Memcached</classname>
-    </ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Memcached</classname>
-     </ooclass>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Memcached'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.memcached')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Memcached'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
- </partintro>
-
- &reference.memcached.entities.memcached;
-
-</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/memcached/memcached/add.xml b/reference/memcached/memcached/add.xml
deleted file mode 100644
index e78dba2484b2..000000000000
--- a/reference/memcached/memcached/add.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::add</refname>
-  <refpurpose>Add an item under a new key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::add</function> is similar to
-   <methodname>Memcached::set</methodname>, but the operation fails if the
-   <parameter>key</parameter> already exists on the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key already exists.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::addByKey</methodname></member>
-    <member><methodname>Memcached::set</methodname></member>
-    <member><methodname>Memcached::replace</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/memcached/memcached/addbykey.xml b/reference/memcached/memcached/addbykey.xml
deleted file mode 100644
index d4a98f1d1995..000000000000
--- a/reference/memcached/memcached/addbykey.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.addbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::addByKey</refname>
-  <refpurpose>Add an item under a new key on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::addByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::addByKey</function> is functionally equivalent to
-   <methodname>Memcached::add</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server. This is useful if you need
-   to keep a bunch of related keys on a certain server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key already exists.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::add</methodname></member>
-    <member><methodname>Memcached::set</methodname></member>
-    <member><methodname>Memcached::replace</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/memcached/memcached/addserver.xml b/reference/memcached/memcached/addserver.xml
deleted file mode 100644
index c6c5df84a057..000000000000
--- a/reference/memcached/memcached/addserver.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.addserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::addServer</refname>
-  <refpurpose>Add a server to the server pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::addServer</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>weight</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::addServer</function> adds the specified server to the
-   server pool. No connection is established to the server at this time, but
-   if you are using consistent key distribution option (via
-   <constant>Memcached::DISTRIBUTION_CONSISTENT</constant> or
-   <constant>Memcached::OPT_LIBKETAMA_COMPATIBLE</constant>), some of the
-   internal data structures will have to be updated. Thus, if you need to add
-   multiple servers, it is better to use
-   <methodname>Memcached::addServers</methodname> as the update then happens
-   only once.
-  </para>
-  <para>
-   The same server may appear multiple times in the server pool, because no
-   duplication checks are made. This is not advisable; instead, use the
-   <parameter>weight</parameter> option to increase the selection weighting of
-   this server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>host</parameter></term>
-     <listitem>
-      <para>
-       The hostname of the memcache server. If the hostname is invalid,
-       data-related operations will set 
-       <constant>Memcached::RES_HOST_LOOKUP_FAILURE</constant> result code. As
-       of version 2.0.0b1, this parameter may also specify the path of a unix
-       socket filepath ex. <literal>/path/to/memcached.sock</literal>
-       to use UNIX domain sockets, in this case <parameter>port</parameter>
-       must also be set to <literal>0</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-     <listitem>
-      <para>
-       The port on which memcache is running. Usually, this is
-       <literal>11211</literal>. As of version 2.0.0b1, set this parameter to <literal>0</literal> when 
-       using UNIX domain sockets.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>weight</parameter></term>
-     <listitem>
-      <para>
-       The weight of the server relative to the total weight of all the
-       servers in the pool. This controls the probability of the server being
-       selected for operations. This is used only with consistent distribution
-       option and usually corresponds to the amount of memory available to
-       memcache on that server.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::addServer</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-
-/* Add 2 servers, so that the second one
-   is twice as likely to be selected. */
-$m->addServer('mem1.domain.com', 11211, 33);
-$m->addServer('mem2.domain.com', 11211, 67);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::addServers</methodname></member>
-    <member><methodname>Memcached::resetServerList</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/memcached/memcached/addservers.xml b/reference/memcached/memcached/addservers.xml
deleted file mode 100644
index 4bb99510a413..000000000000
--- a/reference/memcached/memcached/addservers.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.addservers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::addServers</refname>
-  <refpurpose>Add multiple servers to the server pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::addServers</methodname>
-   <methodparam><type>array</type><parameter>servers</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::addServers</function> adds
-   <parameter>servers</parameter> to the server pool. Each entry in
-   <parameter>servers</parameter> is supposed to be an array containing hostname,
-   port, and, optionally, weight of the server. No connection is established
-   to the servers at this time.
-  </para>
-  <para>
-   The same server may appear multiple times in the server pool, because no
-   duplication checks are made. This is not advisable; instead, use the
-   <parameter>weight</parameter> option to increase the selection weighting of
-   this server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>array</parameter></term>
-     <listitem>
-      <para>
-       Array of the servers to add to the pool.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::addServers</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-
-$servers = array(
-    array('mem1.domain.com', 11211, 33),
-    array('mem2.domain.com', 11211, 67)
-);
-$m->addServers($servers);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::addServer</methodname></member>
-    <member><methodname>Memcached::resetServerList</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/memcached/memcached/append.xml b/reference/memcached/memcached/append.xml
deleted file mode 100644
index 9a402ed7f29b..000000000000
--- a/reference/memcached/memcached/append.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::append</refname>
-  <refpurpose>Append data to an existing item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Memcached::append</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::append</function> appends the given
-   <parameter>value</parameter> string to the value of an existing item. The
-   reason that <parameter>value</parameter> is forced to be a string is
-   that appending mixed types is not well-defined.
-  </para>
-  <note>
-   <para>
-    If the <constant>Memcached::OPT_COMPRESSION</constant> is enabled, the
-    operation will fail and a warning will be issued, because appending
-    compressed data to a value that is potentially already compressed is not
-    possible.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The string to append.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   Returns &null; when compression is on.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
-   compression is enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::append</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-$m->setOption(Memcached::OPT_COMPRESSION, false);
-
-$m->set('foo', 'abc');
-$m->append('foo', 'def');
-var_dump($m->get('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(6) "abcdef"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::appendByKey</methodname></member>
-    <member><methodname>Memcached::prepend</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/memcached/memcached/appendbykey.xml b/reference/memcached/memcached/appendbykey.xml
deleted file mode 100644
index 756b4bdcc39a..000000000000
--- a/reference/memcached/memcached/appendbykey.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.appendbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::appendByKey</refname>
-  <refpurpose>Append data to an existing item on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Memcached::appendByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::appendByKey</function> is functionally equivalent to
-   <methodname>Memcached::append</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The string to append.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   Returns &null; when compression is on.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
-   compression is enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::append</methodname></member>
-    <member><methodname>Memcached::prepend</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/memcached/memcached/cas.xml b/reference/memcached/memcached/cas.xml
deleted file mode 100644
index 40d6e2c5aa19..000000000000
--- a/reference/memcached/memcached/cas.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.cas" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::cas</refname>
-  <refpurpose>Compare and swap an item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::cas</methodname>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>cas_token</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::cas</function> performs a "check and set" operation,
-   so that the item will be stored only if no other client has updated it
-   since it was last fetched by this client. The check is done via the
-   <parameter>cas_token</parameter> parameter which is a unique 64-bit
-   value assigned to the existing item by memcache. See the documentation for 
-   <methodname>Memcached::get*</methodname> methods for how to obtain this
-   token. Note that the token is represented as a float due to the
-   limitations of PHP's integer space.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>cas_token</parameter></term>
-     <listitem>
-      <para>
-       Unique value associated with the existing item. Generated by memcache.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_DATA_EXISTS</constant> if the item you are trying
-   to store has been modified since you last fetched it.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::cas</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-do {
-    /* fetch IP list and its token */
-    $ips = $m->get('ip_block', null, $cas);
-    /* if list doesn't exist yet, create it and do
-       an atomic add which will fail if someone else already added it */
-    if ($m->getResultCode() == Memcached::RES_NOTFOUND) {
-        $ips = array($_SERVER['REMOTE_ADDR']);
-        $m->add('ip_block', $ips);
-    /* otherwise, add IP to the list and store via compare-and-swap
-       with the token, which will fail if someone else updated the list */
-    } else { 
-        $ips[] = $_SERVER['REMOTE_ADDR'];
-        $m->cas($cas, 'ip_block', $ips);
-    }   
-} while ($m->getResultCode() != Memcached::RES_SUCCESS);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::casByKey</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/memcached/memcached/casbykey.xml b/reference/memcached/memcached/casbykey.xml
deleted file mode 100644
index 1b192d27a090..000000000000
--- a/reference/memcached/memcached/casbykey.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.casbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::casByKey</refname>
-  <refpurpose>Compare and swap an item on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::casByKey</methodname>
-   <methodparam><type class="union"><type>string</type><type>int</type><type>float</type></type><parameter>cas_token</parameter></methodparam>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::casByKey</function> is functionally equivalent to
-   <methodname>Memcached::cas</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server. This is useful if you need
-   to keep a bunch of related keys on a certain server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>cas_token</parameter></term>
-     <listitem>
-      <para>
-       Unique value associated with the existing item. Generated by memcache.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_DATA_EXISTS</constant> if the item you are trying
-   to store has been modified since you last fetched it.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::cas</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/memcached/memcached/construct.xml b/reference/memcached/memcached/construct.xml
deleted file mode 100644
index 9bb6dfefafe7..000000000000
--- a/reference/memcached/memcached/construct.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::__construct</refname>
-  <refpurpose>Create a Memcached instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="Memcached">
-   <modifier>public</modifier> <methodname>Memcached::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>persistent_id</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>connection_str</parameter><initializer>&null;</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Creates a Memcached instance representing the connection to the memcache
-   servers.
-  </para>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>persistent_id</parameter></term>
-     <listitem>
-      <para>
-       By default the Memcached instances are destroyed at the end of the
-       request. To create an instance that persists between requests, use
-       <parameter>persistent_id</parameter> to specify a unique ID for the
-       instance. All instances created with the same
-       <parameter>persistent_id</parameter> will share the same connection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callback</parameter></term>
-     <listitem>
-      <methodsynopsis>
-       <type>void</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>Memcached</type><parameter>memcached</parameter></methodparam>
-       <methodparam><type class="union"><type>string</type><type>null</type></type><parameter>persistent_id</parameter></methodparam>
-      </methodsynopsis>
-      <simpara>
-       The <parameter>callback</parameter> parameter is called when the
-       connection is established. It should be a valid PHP <type>callable</type>
-       that receive the <classname>Memcached</classname> object as its first
-       parameter, and <parameter>persistent_id</parameter> as its second.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>connection_str</parameter></term>
-     <listitem>
-      <para>
-       This parameter is used to pass additional connection options to
-       the memcache servers, such as a server weight in a cluster.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating a Memcached object</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Create a regular instance */
-$m = new Memcached();
-echo get_class($m);
-
-/* Create a persistent instance */
-$m2 = new Memcached('story_pool');
-$m3 = new Memcached('story_pool');
-
-/* now $m2 and $m3 share the same connection */
-?>
-]]>
-    </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/memcached/memcached/decrement.xml b/reference/memcached/memcached/decrement.xml
deleted file mode 100644
index 8f0e0ab038c8..000000000000
--- a/reference/memcached/memcached/decrement.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.decrement" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::decrement</refname>
-  <refpurpose>Decrement numeric item's value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Memcached::decrement</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>initial_value</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiry</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::decrement</function> decrements a numeric item's value
-   by the specified <parameter>offset</parameter>. If the item's value is not
-   numeric, an error will result. If the operation would
-   decrease the value below 0, the new value will be 0.
-   <function>Memcached::decrement</function> will set the item to the
-   <parameter>initial_value</parameter> parameter if the key doesn't exist.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to decrement.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The amount by which to decrement the item's value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>initial_value</parameter></term>
-     <listitem>
-      <para>
-       The value to set the item to if it doesn't currently exist.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiry</parameter></term>
-     <listitem>
-      <para>
-       The expiry time to set on the item.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns item's new value on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::decrement</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('counter', 5);
-$n = $m->decrement('counter');
-var_dump($n);
-
-$n = $m->decrement('counter', 10);
-var_dump($n);
-
-var_dump($m->get('counter'));
-
-$m->set('counter', 'abc');
-$n = $m->increment('counter');
-// ^ will fail due to item value not being numeric
-var_dump($n);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(4)
-int(0)
-int(0)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::increment</methodname></member>
-    <member><methodname>Memcached::incrementByKey</methodname></member>
-    <member><methodname>Memcached::decrementByKey</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/memcached/memcached/decrementbykey.xml b/reference/memcached/memcached/decrementbykey.xml
deleted file mode 100644
index b4de2b90b064..000000000000
--- a/reference/memcached/memcached/decrementbykey.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.decrementbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::decrementByKey</refname>
-  <refpurpose>Decrement numeric item's value, stored on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Memcached::decrementByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>initial_value</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiry</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::decrementByKey</function> decrements a numeric item's
-   value by the specified <parameter>offset</parameter>. If the item's value
-   is not numeric, an error will result. If the operation
-   would decrease the value below 0, the new value will be 0.
-   <function>Memcached::decrementByKey</function> will set the item to the
-   <parameter>initial_value</parameter> parameter if the key doesn't exist.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to decrement.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The amount by which to decrement the item's value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>initial_value</parameter></term>
-     <listitem>
-      <para>
-       The value to set the item to if it doesn't currently exist.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiry</parameter></term>
-     <listitem>
-      <para>
-       The expiry time to set on the item.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns item's new value on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::decrement</methodname></member>
-    <member><methodname>Memcached::increment</methodname></member>
-    <member><methodname>Memcached::incrementByKey</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/memcached/memcached/delete.xml b/reference/memcached/memcached/delete.xml
deleted file mode 100644
index c2b0baa8e83e..000000000000
--- a/reference/memcached/memcached/delete.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::delete</refname>
-  <refpurpose>Delete an item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::delete</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>time</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Delete the <parameter>key</parameter> from the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key to be deleted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>time</parameter></term>
-     <listitem>
-      <para>
-       The amount of time the server will wait to delete the item.
-      </para>
-      &memcached.note.delete-time;
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTFOUND</constant> if the key does not exist.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::delete</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->delete('key1');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::deleteByKey</methodname></member>
-    <member><methodname>Memcached::deleteMulti</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/memcached/memcached/deletebykey.xml b/reference/memcached/memcached/deletebykey.xml
deleted file mode 100644
index c987e525b3d2..000000000000
--- a/reference/memcached/memcached/deletebykey.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.deletebykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::deleteByKey</refname>
-  <refpurpose>Delete an item from a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::deleteByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>time</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::deleteByKey</function> is functionally equivalent to
-   <methodname>Memcached::delete</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key to be deleted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>time</parameter></term>
-     <listitem>
-      <para>
-       The amount of time the server will wait to delete the item.
-      </para>
-      &memcached.note.delete-time;
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTFOUND</constant> if the key does not exist.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::delete</methodname></member>
-    <member><methodname>Memcached::deleteMulti</methodname></member>
-    <member><methodname>Memcached::deleteMultiByKey</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/memcached/memcached/deletemulti.xml b/reference/memcached/memcached/deletemulti.xml
deleted file mode 100644
index ef8b8bbe4626..000000000000
--- a/reference/memcached/memcached/deletemulti.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.deletemulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::deleteMulti</refname>
-  <refpurpose>Delete multiple items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::deleteMulti</methodname>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>time</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Delete the array of <parameter>keys</parameter> from the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       The keys to be deleted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>time</parameter></term>
-     <listitem>
-      <para>
-       The amount of time the server will wait to delete the items.
-      </para>
-      &memcached.note.delete-time;
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &memcached.result.delete-multi;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::delete</methodname></member>
-    <member><methodname>Memcached::deleteByKey</methodname></member>
-    <member><methodname>Memcached::deleteMultiByKey</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/memcached/memcached/deletemultibykey.xml b/reference/memcached/memcached/deletemultibykey.xml
deleted file mode 100644
index 9b489cf852ef..000000000000
--- a/reference/memcached/memcached/deletemultibykey.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.deletemultibykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::deleteMultiByKey</refname>
-  <refpurpose>Delete multiple items from a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::deleteMultiByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>time</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::deleteMultiByKey</function> is functionally equivalent to
-   <methodname>Memcached::deleteMulti</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>keys</parameter> to a specific server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       The keys to be deleted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>time</parameter></term>
-     <listitem>
-      <para>
-       The amount of time the server will wait to delete the items.
-      </para>
-      &memcached.note.delete-time;
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &memcached.result.delete-multi;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::delete</methodname></member>
-    <member><methodname>Memcached::deleteByKey</methodname></member>
-    <member><methodname>Memcached::deleteMulti</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/memcached/memcached/fetch.xml b/reference/memcached/memcached/fetch.xml
deleted file mode 100644
index 04bf6411ffac..000000000000
--- a/reference/memcached/memcached/fetch.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.fetch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::fetch</refname>
-  <refpurpose>Fetch the next result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::fetch</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::fetch</function> retrieves the next result from the
-   last request.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the next result or &false; otherwise.
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_END</constant> if result set is exhausted.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::fetch</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('int', 99);
-$m->set('string', 'a simple string');
-$m->set('array', array(11, 12));
-
-$m->getDelayed(array('int', 'array'), true);
-while ($result = $m->fetch()) {
-    var_dump($result);
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(3) {
-  ["key"]=>
-  string(3) "int"
-  ["value"]=>
-  int(99)
-  ["cas"]=>
-  float(2363)
-}
-array(3) {
-  ["key"]=>
-  string(5) "array"
-  ["value"]=>
-  array(2) {
-    [0]=>
-    int(11)
-    [1]=>
-    int(12)
-  }
-  ["cas"]=>
-  float(2365)
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::fetchAll</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/fetchall.xml b/reference/memcached/memcached/fetchall.xml
deleted file mode 100644
index c579694cd249..000000000000
--- a/reference/memcached/memcached/fetchall.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.fetchall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::fetchAll</refname>
-  <refpurpose>Fetch all the remaining results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::fetchAll</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::fetchAll</function> retrieves all the remaining
-   results from the last request.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the results&return.falseforfailure;.
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getDelayed</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('int', 99);
-$m->set('string', 'a simple string');
-$m->set('array', array(11, 12));
-
-$m->getDelayed(array('int', 'array'), true);
-var_dump($m->fetchAll());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(3) {
-    ["key"]=>
-    string(3) "int"
-    ["value"]=>
-    int(99)
-    ["cas"]=>
-    float(2363)
-  }
-  [1]=>
-  array(3) {
-    ["key"]=>
-    string(5) "array"
-    ["value"]=>
-    array(2) {
-      [0]=>
-      int(11)
-      [1]=>
-      int(12)
-    }
-    ["cas"]=>
-    float(2365)
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::fetch</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/flush.xml b/reference/memcached/memcached/flush.xml
deleted file mode 100644
index 85afd18b5418..000000000000
--- a/reference/memcached/memcached/flush.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.flush" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::flush</refname>
-  <refpurpose>Invalidate all items in the cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::flush</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>delay</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::flush</function> invalidates all existing cache items
-   immediately (by default) or after the <parameter>delay</parameter>
-   specified. After invalidation none of the items will be returned in
-   response to a retrieval command (unless it's stored again under the same
-   key after <function>Memcached::flush</function> has invalidated the items).
-   The flush does not actually free all the memory taken up by the existing
-   items; that will happen gradually as new items are stored.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>delay</parameter></term>
-     <listitem>
-      <para>
-       Number of seconds to wait before invalidating the items.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::flush</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-/* flush all items in 10 seconds */
-$m->flush(10);
-?>
-]]>
-    </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/memcached/memcached/get.xml b/reference/memcached/memcached/get.xml
deleted file mode 100644
index 493bfb549142..000000000000
--- a/reference/memcached/memcached/get.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::get</refname>
-  <refpurpose>Retrieve an item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>mixed</type><methodname>Memcached::get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>cache_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>get_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::get</function> returns the item that was previously
-   stored under the <parameter>key</parameter>. If the item is found and
-   the <parameter>get_flags</parameter> is given <constant>Memcached::GET_EXTENDED</constant>,
-   it will also return the CAS token value for the item. See
-   <methodname>Memcached::cas</methodname> for how to use CAS tokens.
-   <link linkend="memcached.callbacks">Read-through caching callback</link> may be
-   specified via <parameter>cache_cb</parameter> parameter.
-  </para>
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to retrieve.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cache_cb</parameter></term>
-     <listitem>
-      <para>
-       Read-through caching callback or &null;.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>get_flags</parameter></term>
-     <listitem>
-      <para>
-       Flags to control the returned result. When <constant>Memcached::GET_EXTENDED</constant>
-       is given, the function will also return the CAS token.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value stored in the cache or &false; otherwise.
-   If the <parameter>get_flags</parameter> is set to <constant>Memcached::GET_EXTENDED</constant>,
-   an array containing the value and the CAS token is returned instead of only the value.
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTFOUND</constant> if the key 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>
-     <row>
-      <entry>PECL memcached 3.0.0</entry>
-      <entry>
-       The <parameter role="reference">cas_token</parameter> parameter was removed.
-       Instead <parameter>get_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>
-   <example>
-    <title><function>Memcached::get</function> example #1</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('foo', 100);
-var_dump($m->get('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(100)
-]]>
-    </screen>
-   </example>
-   <example>
-    <title><function>Memcached::get</function> example #2</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-if (!($ip = $m->get('ip_block'))) {
-    if ($m->getResultCode() == Memcached::RES_NOTFOUND) {
-        $ip = array();
-        $m->set('ip_block', $ip);
-    } else {
-        /* log error */
-        /* ...       */
-    }
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getByKey</methodname></member>
-    <member><methodname>Memcached::getMulti</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/getallkeys.xml b/reference/memcached/memcached/getallkeys.xml
deleted file mode 100644
index c69666ff3e73..000000000000
--- a/reference/memcached/memcached/getallkeys.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getallkeys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getAllKeys</refname>
-  <refpurpose>Gets the keys stored on all the servers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getAllKeys</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getAllKeys</function> queries each memcache server
-   and retrieves an array of all keys stored on them at that point in time.
-   This is not an atomic operation, so it isn't a truly consistent snapshot of
-   the keys at point in time. As memcache doesn't guarantee to return all keys
-   you also cannot assume that all keys have been returned.
-  </para>
-  <note>
-   <para>
-    This method is intended for debugging purposes and should not be used at scale!
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the keys stored on all the servers 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/memcached/memcached/getbykey.xml b/reference/memcached/memcached/getbykey.xml
deleted file mode 100644
index 3138e8f39611..000000000000
--- a/reference/memcached/memcached/getbykey.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getByKey</refname>
-  <refpurpose>Retrieve an item from a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>mixed</type><methodname>Memcached::getByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>cache_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>get_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getByKey</function> is functionally equivalent to
-   <methodname>Memcached::get</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to fetch.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>cache_cb</parameter></term>
-     <listitem>
-      <para>
-       Read-through caching callback or &null;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>get_flags</parameter></term>
-     <listitem>
-      <para>
-       Flags to control the returned result. When value of <constant>Memcached::GET_EXTENDED</constant>
-       is given will return the CAS token.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value stored in the cache or &false; otherwise.
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTFOUND</constant> if the key 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>
-     <row>
-      <entry>PECL memcached 3.0.0</entry>
-      <entry>
-       The <parameter role="reference">cas_token</parameter> parameter was removed.
-       Instead <parameter>get_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>
-   <simplelist>
-    <member><methodname>Memcached::get</methodname></member>
-    <member><methodname>Memcached::getMulti</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/getdelayed.xml b/reference/memcached/memcached/getdelayed.xml
deleted file mode 100644
index 2c0ef5889c50..000000000000
--- a/reference/memcached/memcached/getdelayed.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getdelayed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getDelayed</refname>
-  <refpurpose>Request multiple items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::getDelayed</methodname>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>with_cas</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>value_cb</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getDelayed</function> issues a request to memcache for
-   multiple items the keys of which are specified in the
-   <parameter>keys</parameter> array. The method does not wait for response
-   and returns right away. When you are ready to collect the items, call
-   either <methodname>Memcached::fetch</methodname> or
-   <methodname>Memcached::fetchAll</methodname>. If <parameter>with_cas</parameter>
-   is true, the CAS token values will also be requested.
-  </para>
-  <para>
-   Instead of fetching the results explicitly, you can specify a <link linkend="memcached.callbacks">result callback</link> via
-   <parameter>value_cb</parameter> parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       Array of keys to request.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>with_cas</parameter></term>
-     <listitem>
-      <para>
-       Whether to request CAS token values also.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value_cb</parameter></term>
-     <listitem>
-      <para>
-       The result callback or &null;.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getDelayed</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('int', 99);
-$m->set('string', 'a simple string');
-$m->set('array', array(11, 12));
-
-$m->getDelayed(array('int', 'array'), true);
-var_dump($m->fetchAll());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(3) {
-    ["key"]=>
-    string(3) "int"
-    ["value"]=>
-    int(99)
-    ["cas"]=>
-    float(2363)
-  }
-  [1]=>
-  array(3) {
-    ["key"]=>
-    string(5) "array"
-    ["value"]=>
-    array(2) {
-      [0]=>
-      int(11)
-      [1]=>
-      int(12)
-    }
-    ["cas"]=>
-    float(2365)
-  }
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getDelayedByKey</methodname></member>
-    <member><methodname>Memcached::fetch</methodname></member>
-    <member><methodname>Memcached::fetchAll</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/memcached/memcached/getdelayedbykey.xml b/reference/memcached/memcached/getdelayedbykey.xml
deleted file mode 100644
index 92f4c76a709b..000000000000
--- a/reference/memcached/memcached/getdelayedbykey.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getdelayedbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getDelayedByKey</refname>
-  <refpurpose>Request multiple items from a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::getDelayedByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>with_cas</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>value_cb</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getDelayedByKey</function> is functionally equivalent to
-   <methodname>Memcached::getDelayed</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>keys</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       Array of keys to request.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>with_cas</parameter></term>
-     <listitem>
-      <para>
-       Whether to request CAS token values also.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value_cb</parameter></term>
-     <listitem>
-      <para>
-       The result callback or &null;.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getDelayed</methodname></member>
-    <member><methodname>Memcached::fetch</methodname></member>
-    <member><methodname>Memcached::fetchAll</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/memcached/memcached/getmulti.xml b/reference/memcached/memcached/getmulti.xml
deleted file mode 100644
index 169c59447ab8..000000000000
--- a/reference/memcached/memcached/getmulti.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getmulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getMulti</refname>
-  <refpurpose>Retrieve multiple items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getMulti</methodname>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>get_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getMulti</function> is similar to
-   <methodname>Memcached::get</methodname>, but instead of a single key
-   item, it retrieves multiple items the keys of which are specified in the
-   <parameter>keys</parameter> array.
-   <note>
-    <para>
-     Before v3.0 a second argument <parameter role="reference">cas_tokens</parameter> was in use.
-     It was filled with the CAS token values for the found items.
-     The <parameter role="reference">cas_tokens</parameter> parameter was removed in v3.0 of the extension.
-     It was replaced with a new flag <constant>Memcached::GET_EXTENDED</constant>
-     that needs is to be used as the value for <parameter>get_flags</parameter>.
-    </para>
-   </note>
-  </para>
-  <para>
-   The <parameter>get_flags</parameter> parameter can be used to specify
-   additional options for <function>Memcached::getMulti</function>.
-   <constant>Memcached::GET_PRESERVE_ORDER</constant> ensures that the
-   keys are returned in the same order as they were requested in.
-   <constant>Memcached::GET_EXTENDED</constant> ensures that the
-   CAS tokens will be fetched too.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       Array of keys to retrieve.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>get_flags</parameter></term>
-     <listitem>
-      <para>
-       The flags for the get operation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the array of found items&return.falseforfailure;.
-   &memcached.result.getresultcode;
-  </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>
-   <example>
-    <title><function>Memcached::getMulti</function> example for Memcached v3</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Valid for v3 of the extension
-
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$items = array(
-    'key1' => 'value1',
-    'key2' => 'value2',
-    'key3' => 'value3'
-);
-$m->setMulti($items);
-$result = $m->getMulti(array('key1', 'key3', 'badkey'));
-var_dump($result);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["key1"]=>
-  string(6) "value1"
-  ["key3"]=>
-  string(6) "value3"
-}
-]]>
-    </screen>
-   </example>
-  </para>
-
-  <para>
-   <example>
-    <title><function>Memcached::getMulti</function> example for Memcached v1 and v2</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Valid for v1 and v2 of the extension
-
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$items = array(
-    'key1' => 'value1',
-    'key2' => 'value2',
-    'key3' => 'value3'
-);
-$m->setMulti($items);
-$result = $m->getMulti(array('key1', 'key3', 'badkey'), $cas);
-var_dump($result, $cas);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["key1"]=>
-  string(6) "value1"
-  ["key3"]=>
-  string(6) "value3"
-}
-array(2) {
-  ["key1"]=>
-  float(2360)
-  ["key3"]=>
-  float(2362)
-}
-]]>
-    </screen>
-   </example>
-  </para>
-
-  <para>
-   <example>
-    <title><constant>Memcached::GET_PRESERVE_ORDER</constant> example for Memcached v3</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Valid for v3 of the extension
-
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$data = array(
-    'foo' => 'foo-data',
-    'bar' => 'bar-data',
-    'baz' => 'baz-data',
-    'lol' => 'lol-data',
-    'kek' => 'kek-data',
-);
-
-$m->setMulti($data, 3600);
-
-$keys = array_keys($data);
-$keys[] = 'zoo';
-$got = $m->getMulti($keys, Memcached::GET_PRESERVE_ORDER);
-
-foreach ($got as $k => $v) {
-    echo "$k $v\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-foo foo-data
-bar bar-data
-baz baz-data
-lol lol-data
-kek kek-data
-zoo 
-]]>
-    </screen>
-   </example>
-  </para>
-
-  <para>
-   <example>
-    <title><constant>Memcached::GET_PRESERVE_ORDER</constant> example for Memcached v1 and v2</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Valid for v1 and v2 of the extension
-
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$data = array(
-    'foo' => 'foo-data',
-    'bar' => 'bar-data',
-    'baz' => 'baz-data',
-    'lol' => 'lol-data',
-    'kek' => 'kek-data',
-);
-
-$m->setMulti($data, 3600);
-
-$null = null;
-$keys = array_keys($data);
-$keys[] = 'zoo';
-$got = $m->getMulti($keys, $null, Memcached::GET_PRESERVE_ORDER);
-
-foreach ($got as $k => $v) {
-    echo "$k $v\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-foo foo-data
-bar bar-data
-baz baz-data
-lol lol-data
-kek kek-data
-zoo 
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getMultiByKey</methodname></member>
-    <member><methodname>Memcached::get</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/getmultibykey.xml b/reference/memcached/memcached/getmultibykey.xml
deleted file mode 100644
index 5196d24dd9cf..000000000000
--- a/reference/memcached/memcached/getmultibykey.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getmultibykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getMultiByKey</refname>
-  <refpurpose>Retrieve multiple items from a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getMultiByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>get_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getMultiByKey</function> is functionally equivalent to
-   <methodname>Memcached::getMulti</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>keys</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>keys</parameter></term>
-     <listitem>
-      <para>
-       Array of keys to retrieve.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>get_flags</parameter></term>
-     <listitem>
-      <para>
-       The flags for the get operation.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the array of found items&return.falseforfailure;.
-   &memcached.result.getresultcode;
-  </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>
-   <simplelist>
-    <member><methodname>Memcached::getMulti</methodname></member>
-    <member><methodname>Memcached::get</methodname></member>
-    <member><methodname>Memcached::getDelayed</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/memcached/memcached/getoption.xml b/reference/memcached/memcached/getoption.xml
deleted file mode 100644
index a2b146faad6a..000000000000
--- a/reference/memcached/memcached/getoption.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getOption</refname>
-  <refpurpose>Retrieve a Memcached option value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>mixed</type><methodname>Memcached::getOption</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method returns 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.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>option</parameter></term>
-     <listitem>
-      <para>
-       One of the <literal>Memcached::OPT_*</literal> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the requested option, or &false; on
-   error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Retrieving Memcached options</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-var_dump($m->getOption(Memcached::OPT_COMPRESSION));
-var_dump($m->getOption(Memcached::OPT_POLL_TIMEOUT));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-int(1000)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getOption</methodname></member>
-    <member><methodname>Memcached::setOption</methodname></member>
-    <member><link linkend="memcached.constants">Memcached Constants</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/memcached/memcached/getresultcode.xml b/reference/memcached/memcached/getresultcode.xml
deleted file mode 100644
index a94bed4236c4..000000000000
--- a/reference/memcached/memcached/getresultcode.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getresultcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getResultCode</refname>
-  <refpurpose>Return the result code of the last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>int</type><methodname>Memcached::getResultCode</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getResultCode</function> returns one of the
-   <constant>Memcached::RES_<replaceable>*</replaceable></constant> constants that is the result of the
-   last executed Memcached method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Result code of the last Memcached operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getResultCode</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->add('foo', 'bar');
-if ($m->getResultCode() == Memcached::RES_NOTSTORED) {
-    /* ... */
-}
-?>
-]]>
-    </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/memcached/memcached/getresultmessage.xml b/reference/memcached/memcached/getresultmessage.xml
deleted file mode 100644
index 4d8c5dd6c612..000000000000
--- a/reference/memcached/memcached/getresultmessage.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getresultmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getResultMessage</refname>
-  <refpurpose>Return the message describing the result of the last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>string</type><methodname>Memcached::getResultMessage</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getResultMessage</function> returns a string that
-   describes the result code of the last executed Memcached method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Message describing the result of the last Memcached operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getResultMessage</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->add('foo', 'bar'); // first time should succeed
-$m->add('foo', 'bar');
-echo $m->getResultMessage(),"\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-NOT STORED
-]]>
-    </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/memcached/memcached/getserverbykey.xml b/reference/memcached/memcached/getserverbykey.xml
deleted file mode 100644
index b1f784a8fdb9..000000000000
--- a/reference/memcached/memcached/getserverbykey.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getserverbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getServerByKey</refname>
-  <refpurpose>Map a key to a server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getServerByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getServerByKey</function> returns the server that
-   would be selected by a particular <parameter>server_key</parameter> in all
-   the <function>Memcached::*ByKey</function> operations.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing three keys of <literal>host</literal>,
-   <literal>port</literal>, and <literal>weight</literal> on success&return.falseforfailure;.
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getServerByKey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServers(array(
-    array('mem1.domain.com', 11211, 40),
-    array('mem2.domain.com', 11211, 40),
-    array('mem3.domain.com', 11211, 20),
-));
-
-$m->setOption(Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
-
-var_dump($m->getServerByKey('user'));
-var_dump($m->getServerByKey('log'));
-var_dump($m->getServerByKey('ip'));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(3) {
-  ["host"]=>
-  string(15) "mem3.domain.com"
-  ["port"]=>
-  int(11211)
-  ["weight"]=>
-  int(20)
-}
-array(3) {
-  ["host"]=>
-  string(15) "mem2.domain.com"
-  ["port"]=>
-  int(11211)
-  ["weight"]=>
-  int(40)
-}
-array(3) {
-  ["host"]=>
-  string(15) "mem2.domain.com"
-  ["port"]=>
-  int(11211)
-  ["weight"]=>
-  int(40)
-}
-]]>
-    </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/memcached/memcached/getserverlist.xml b/reference/memcached/memcached/getserverlist.xml
deleted file mode 100644
index ca7e053a1af0..000000000000
--- a/reference/memcached/memcached/getserverlist.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getserverlist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getServerList</refname>
-  <refpurpose>Get the list of the servers in the pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>array</type><methodname>Memcached::getServerList</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getServerList</function> returns the list of all
-   servers that are in its server pool.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The list of all servers in the server pool.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getServerList</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServers(array(
-    array('mem1.domain.com', 11211, 20),
-    array('mem2.domain.com', 11311, 80),
-));
-var_dump($m->getServerList());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(3) {
-    ["host"]=>
-    string(15) "mem1.domain.com"
-    ["port"]=>
-    int(11211)
-    ["weight"]=>
-    int(20)
-  }
-  [1]=>
-  array(3) {
-    ["host"]=>
-    string(15) "mem2.domain.com"
-    ["port"]=>
-    int(11311)
-    ["weight"]=>
-    int(80)
-  }
-}
-]]>
-    </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/memcached/memcached/getstats.xml b/reference/memcached/memcached/getstats.xml
deleted file mode 100644
index b42ade783e87..000000000000
--- a/reference/memcached/memcached/getstats.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getstats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getStats</refname>
-  <refpurpose>Get server pool statistics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getStats</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>type</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getStats</function> returns an array containing the
-   state of all available memcache servers. See
-   <link xlink:href="&url.memcache.protocol;">memcache protocol</link>
-   specification for details on these statistics.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of statistics to fetch.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of server statistics, one entry per server, &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getStats</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-print_r($m->getStats());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Array
-(
-    [localhost:11211] => Array
-        (
-            [pid] => 4933
-            [uptime] => 786123
-            [threads] => 1
-            [time] => 1233868010
-            [pointer_size] => 32
-            [rusage_user_seconds] => 0
-            [rusage_user_microseconds] => 140000
-            [rusage_system_seconds] => 23
-            [rusage_system_microseconds] => 210000
-            [curr_items] => 145
-            [total_items] => 2374
-            [limit_maxbytes] => 67108864
-            [curr_connections] => 2
-            [total_connections] => 151
-            [connection_structures] => 3
-            [bytes] => 20345
-            [cmd_get] => 213343
-            [cmd_set] => 2381
-            [get_hits] => 204223
-            [get_misses] => 9120
-            [evictions] => 0
-            [bytes_read] => 9092476
-            [bytes_written] => 15420512
-            [version] => 1.2.6
-        )
-
-)
-]]>
-    </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/memcached/memcached/getversion.xml b/reference/memcached/memcached/getversion.xml
deleted file mode 100644
index eb0e79fbeb83..000000000000
--- a/reference/memcached/memcached/getversion.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.getversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::getVersion</refname>
-  <refpurpose>Get server pool version info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>Memcached::getVersion</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::getVersion</function> returns an array containing the
-   version info for all available memcache servers.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of server versions, one entry per server.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::getVersion</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-print_r($m->getVersion());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Array
-(
-    [localhost:11211] => 1.2.6
-)
-]]>
-    </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/memcached/memcached/increment.xml b/reference/memcached/memcached/increment.xml
deleted file mode 100644
index 5625689521b5..000000000000
--- a/reference/memcached/memcached/increment.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.increment" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::increment</refname>
-  <refpurpose>Increment numeric item's value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Memcached::increment</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>initial_value</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiry</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::increment</function> increments a numeric item's value
-   by the specified <parameter>offset</parameter>. If the item's value is not
-   numeric, an error will result.
-   <function>Memcached::increment</function> will set the item to the
-   <parameter>initial_value</parameter> parameter if the key doesn't exist.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to increment.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The amount by which to increment the item's value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>initial_value</parameter></term>
-     <listitem>
-      <para>
-       The value to set the item to if it doesn't currently exist.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiry</parameter></term>
-     <listitem>
-      <para>
-       The expiry time to set on the item.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns new item's value on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::increment</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('counter', 0);
-$m->increment('counter');
-$n = $m->increment('counter', 10);
-var_dump($n);
-
-$m->set('counter', 'abc');
-$n = $m->increment('counter');
-// ^ will fail due to item value not being numeric
-var_dump($n);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(11)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::decrement</methodname></member>
-    <member><methodname>Memcached::decrementByKey</methodname></member>
-    <member><methodname>Memcached::incrementByKey</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/memcached/memcached/incrementbykey.xml b/reference/memcached/memcached/incrementbykey.xml
deleted file mode 100644
index 1e8cc8d7517c..000000000000
--- a/reference/memcached/memcached/incrementbykey.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.incrementbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::incrementByKey</refname>
-  <refpurpose>Increment numeric item's value, stored on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Memcached::incrementByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>initial_value</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiry</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::incrementByKey</function> increments a numeric item's value
-   by the specified <parameter>offset</parameter>. If the item's value is not
-   numeric, an error will result.
-   <function>Memcached::incrementByKey</function> will set the item to the
-   <parameter>initial_value</parameter> parameter if the key doesn't exist.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to increment.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The amount by which to increment the item's value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>initial_value</parameter></term>
-     <listitem>
-      <para>
-       The value to set the item to if it doesn't currently exist.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiry</parameter></term>
-     <listitem>
-      <para>
-       The expiry time to set on the item.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns new item's value on success&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::decrement</methodname></member>
-    <member><methodname>Memcached::decrementByKey</methodname></member>
-    <member><methodname>Memcached::increment</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/memcached/memcached/ispersistent.xml b/reference/memcached/memcached/ispersistent.xml
deleted file mode 100644
index 52a183663a68..000000000000
--- a/reference/memcached/memcached/ispersistent.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.ispersistent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::isPersistent</refname>
-  <refpurpose>Check if a persistent connection to memcache is being used</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::isPersistent</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::isPersistent</function> checks if the connections to
-   the memcache servers are persistent connections.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if Memcache instance uses a persistent connection, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::isPristine</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/memcached/memcached/ispristine.xml b/reference/memcached/memcached/ispristine.xml
deleted file mode 100644
index 5052afaef167..000000000000
--- a/reference/memcached/memcached/ispristine.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.ispristine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::isPristine</refname>
-  <refpurpose>Check if the instance was recently created</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::isPristine</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::isPristine</function> checks if the Memcache instance
-   was recently created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if instance is recently created, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::isPersistent</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/memcached/memcached/prepend.xml b/reference/memcached/memcached/prepend.xml
deleted file mode 100644
index 25a204bd4252..000000000000
--- a/reference/memcached/memcached/prepend.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.prepend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::prepend</refname>
-  <refpurpose>Prepend data to an existing item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Memcached::prepend</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::prepend</function> prepends the given
-   <parameter>value</parameter> string to the value of an existing item. The
-   reason that <parameter>value</parameter> is forced to be a string is
-   that prepending mixed types is not well-defined.
-  </para>
-  <note>
-   <para>
-    If the <constant>Memcached::OPT_COMPRESSION</constant> is enabled, the
-    operation will fail and a warning will be issued, because prepending
-    compressed data to a value that is potentially already compressed is not
-    possible.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to prepend the data to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The string to prepend.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   Returns &null; when compression is on.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
-   compression is enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::prepend</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-$m->setOption(Memcached::OPT_COMPRESSION, false);
-
-$m->set('foo', 'abc');
-$m->prepend('foo', 'def');
-var_dump($m->get('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(6) "defabc"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::prependByKey</methodname></member>
-    <member><methodname>Memcached::append</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/memcached/memcached/prependbykey.xml b/reference/memcached/memcached/prependbykey.xml
deleted file mode 100644
index c89f14a79b6d..000000000000
--- a/reference/memcached/memcached/prependbykey.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.prependbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::prependByKey</refname>
-  <refpurpose>Prepend data to an existing item on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Memcached::prependByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::prependByKey</function> is functionally equivalent to
-   <methodname>Memcached::prepend</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of the item to prepend the data to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The string to prepend.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   Returns &null; when compression is on.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Returns &null; and raises an <constant>E_WARNING</constant> when
-   compression is enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::prepend</methodname></member>
-    <member><methodname>Memcached::append</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/memcached/memcached/quit.xml b/reference/memcached/memcached/quit.xml
deleted file mode 100644
index ad3c3e51526c..000000000000
--- a/reference/memcached/memcached/quit.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.quit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::quit</refname>
-  <refpurpose>Close any open connections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::quit</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::quit</function> closes any open connections to the
-   memcache servers.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/memcached/memcached/replace.xml b/reference/memcached/memcached/replace.xml
deleted file mode 100644
index fdae37c0189f..000000000000
--- a/reference/memcached/memcached/replace.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.replace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::replace</refname>
-  <refpurpose>Replace the item under an existing key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::replace</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::replace</function> is similar to
-   <methodname>Memcached::set</methodname>, but the operation fails if the
-   <parameter>key</parameter> does not exist on the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::replaceByKey</methodname></member>
-    <member><methodname>Memcached::set</methodname></member>
-    <member><methodname>Memcached::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/memcached/memcached/replacebykey.xml b/reference/memcached/memcached/replacebykey.xml
deleted file mode 100644
index 589410783657..000000000000
--- a/reference/memcached/memcached/replacebykey.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.replacebykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::replaceByKey</refname>
-  <refpurpose>Replace the item under an existing key on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::replaceByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::replaceByKey</function> is functionally equivalent to
-   <methodname>Memcached::replace</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server. This is useful if you need
-   to keep a bunch of related keys on a certain server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   The <methodname>Memcached::getResultCode</methodname> will return
-   <constant>Memcached::RES_NOTSTORED</constant> if the key does not exist.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::replace</methodname></member>
-    <member><methodname>Memcached::set</methodname></member>
-    <member><methodname>Memcached::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/memcached/memcached/resetserverlist.xml b/reference/memcached/memcached/resetserverlist.xml
deleted file mode 100644
index 4c6a55a58647..000000000000
--- a/reference/memcached/memcached/resetserverlist.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.resetserverlist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::resetServerList</refname>
-  <refpurpose>Clears all servers from the server list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::resetServerList</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::resetserverlist</function> removes all memcache
-   servers from the known server list, resetting it back to empty.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::addServer</methodname></member>
-    <member><methodname>Memcached::addServers</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/memcached/memcached/set.xml b/reference/memcached/memcached/set.xml
deleted file mode 100644
index 4e335ceb3e4e..000000000000
--- a/reference/memcached/memcached/set.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::set</refname>
-  <refpurpose>Store an item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::set</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::set</function> stores the <parameter>value</parameter>
-   on a memcache server under the specified <parameter>key</parameter>. The
-   <parameter>expiration</parameter> parameter can be used to control when the
-   value is considered expired.
-  </para>
-  <para>
-   The value can be any valid PHP type except for resources, because those
-   cannot be represented in a serialized form. If the
-   <constant>Memcached::OPT_COMPRESSION</constant> option is turned on, the
-   serialized value will also be compressed before storage.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::set</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$m->set('int', 99);
-$m->set('string', 'a simple string');
-$m->set('array', array(11, 12));
-/* expire 'object' key in 5 minutes */
-$m->set('object', new stdClass, time() + 300);
-
-
-var_dump($m->get('int'));
-var_dump($m->get('string'));
-var_dump($m->get('array'));
-var_dump($m->get('object'));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-int(99)
-string(15) "a simple string"
-array(2) {
-  [0]=>
-  int(11)
-  [1]=>
-  int(12)
-}
-object(stdClass)#1 (0) {
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::setByKey</methodname></member>
-    <member><methodname>Memcached::add</methodname></member>
-    <member><methodname>Memcached::replace</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/memcached/memcached/setbykey.xml b/reference/memcached/memcached/setbykey.xml
deleted file mode 100644
index 815f71bdd17f..000000000000
--- a/reference/memcached/memcached/setbykey.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setByKey</refname>
-  <refpurpose>Store an item on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::setByKey</function> is functionally equivalent to
-   <methodname>Memcached::set</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server. This is useful if you need
-   to keep a bunch of related keys on a certain server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.value;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::setByKey</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-/* keep IP blocks on a certain server */
-$m->setByKey('api-cache', 'block-ip:169.254.253.252', 1);
-$m->setByKey('api-cache', 'block-ip:169.127.127.202', 1);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::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/memcached/memcached/setencodingkey.xml b/reference/memcached/memcached/setencodingkey.xml
deleted file mode 100644
index 5d5ff3884931..000000000000
--- a/reference/memcached/memcached/setencodingkey.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setencodingkey" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>Memcached::setEncodingKey</refname>
-  <refpurpose>Set AES encryption key for data in Memcached</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setEncodingKey</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This method sets the AES encryption/decryption key for data written to and read from Memcached.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The AES key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Memcached::get</methodname></member>
-   <member><methodname>Memcached::add</methodname></member>
-   <member><methodname>Memcached::set</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/memcached/memcached/setmulti.xml b/reference/memcached/memcached/setmulti.xml
deleted file mode 100644
index 144afe825846..000000000000
--- a/reference/memcached/memcached/setmulti.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setmulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setMulti</refname>
-  <refpurpose>Store multiple items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setMulti</methodname>
-   <methodparam><type>array</type><parameter>items</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::setMulti</function> is similar to
-   <methodname>Memcached::set</methodname>, but instead of a single key/value
-   item, it works on multiple items specified in
-   <parameter>items</parameter>. The <parameter>expiration</parameter> time
-   applies to all the items at once.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>items</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.items;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Memcached::setMulti</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-$m->addServer('localhost', 11211);
-
-$items = array(
-    'key1' => 'value1',
-    'key2' => 'value2',
-    'key3' => 'value3'
-);
-$m->setMulti($items, time() + 300);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::setMultiByKey</methodname></member>
-    <member><methodname>Memcached::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/memcached/memcached/setmultibykey.xml b/reference/memcached/memcached/setmultibykey.xml
deleted file mode 100644
index 1709bb50ada6..000000000000
--- a/reference/memcached/memcached/setmultibykey.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setmultibykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setMultiByKey</refname>
-  <refpurpose>Store multiple items on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setMultiByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>items</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::setMultiByKey</function> is functionally equivalent to
-   <methodname>Memcached::setMulti</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the keys from
-   <parameter>items</parameter> to a specific server. This is useful if you
-   need to keep a bunch of related keys on a certain server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>items</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.items;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::setMulti</methodname></member>
-    <member><methodname>Memcached::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/memcached/memcached/setoption.xml b/reference/memcached/memcached/setoption.xml
deleted file mode 100644
index a790fc6dc183..000000000000
--- a/reference/memcached/memcached/setoption.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setoption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setOption</refname>
-  <refpurpose>Set a Memcached option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setOption</methodname>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <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.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>option</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>Memcached::OPT_<replaceable>*</replaceable></constant> 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>
-          <constant>Memcached::OPT_HASH</constant> requires
-          <constant>Memcached::HASH_<replaceable>*</replaceable></constant>
-          values.
-         </member>
-         <member>
-          <constant>Memcached::OPT_DISTRIBUTION</constant> requires
-          <constant>Memcached::DISTRIBUTION_<replaceable>*</replaceable></constant>
-          values.
-         </member>
-         <member>
-          <constant>Memcached::OPT_SERIALIZER</constant> requires
-          <constant>Memcached::SERIALIZER_<replaceable>*</replaceable></constant>
-          values.
-         </member>
-         <member>
-          <constant>Memcached::OPT_COMPRESSION_TYPE</constant> requires
-          <constant>Memcached::COMPRESSION_<replaceable>*</replaceable></constant>
-          values.
-         </member>
-        </simplelist>
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Setting a Memcached option</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-var_dump($m->getOption(Memcached::OPT_HASH) == Memcached::HASH_DEFAULT);
-$m->setOption(Memcached::OPT_HASH, Memcached::HASH_MURMUR);
-$m->setOption(Memcached::OPT_PREFIX_KEY, "widgets");
-echo "Prefix key is now: ", $m->getOption(Memcached::OPT_PREFIX_KEY), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-Prefix key is now: widgets
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getOption</methodname></member>
-    <member><methodname>Memcached::setOptions</methodname></member>
-    <member><link linkend="memcached.constants">Memcached Constants</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/memcached/memcached/setoptions.xml b/reference/memcached/memcached/setoptions.xml
deleted file mode 100644
index f5debf114e4e..000000000000
--- a/reference/memcached/memcached/setoptions.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setoptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setOptions</refname>
-  <refpurpose>Set Memcached options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setOptions</methodname>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::setOptions</function> is a variation of the
-   <methodname>Memcached::setOption</methodname> that takes an array of
-   options to be set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      An associative array of options where the key is the option to set and
-      the value is the new value for the option.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Setting Memcached options</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$m = new Memcached();
-var_dump($m->getOption(Memcached::OPT_HASH) == Memcached::HASH_DEFAULT);
-
-$m->setOptions(array(Memcached::OPT_HASH => Memcached::HASH_MURMUR, Memcached::OPT_PREFIX_KEY => "widgets"));
-
-var_dump($m->getOption(Memcached::OPT_HASH) == Memcached::HASH_DEFAULT);
-echo "Prefix key is now: ", $m->getOption(Memcached::OPT_PREFIX_KEY), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-Prefix key is now: widgets
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::getOption</methodname></member>
-    <member><methodname>Memcached::setOption</methodname></member>
-    <member><link linkend="memcached.constants">Memcached Constants</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/memcached/memcached/setsaslauthdata.xml b/reference/memcached/memcached/setsaslauthdata.xml
deleted file mode 100644
index 63cfd1c04de6..000000000000
--- a/reference/memcached/memcached/setsaslauthdata.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.setsaslauthdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::setSaslAuthData</refname>
-  <refpurpose>Set the credentials to use for authentication</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::setSaslAuthData</methodname>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::setSaslAuthData</function> sets the username and
-   password that should be used for SASL authentication with the memcache
-   servers.
-  </para>
-  <para>
-   <emphasis>This method is only available when the memcached extension is
-    built with SASL support.</emphasis> Please refer to
-   <link linkend="memcached.setup">Memcached setup</link> for how to do this.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       The username to use for authentication.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>password</parameter></term>
-     <listitem>
-      <para>
-       The password to use for authentication.
-      </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/memcached/memcached/touch.xml b/reference/memcached/memcached/touch.xml
deleted file mode 100644
index cb50f310d701..000000000000
--- a/reference/memcached/memcached/touch.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.touch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::touch</refname>
-  <refpurpose>Set a new expiration on an item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::touch</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::touch</function> sets a new expiration value on the given key.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::touchByKey</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/memcached/memcached/touchbykey.xml b/reference/memcached/memcached/touchbykey.xml
deleted file mode 100644
index 5c77f6127b4e..000000000000
--- a/reference/memcached/memcached/touchbykey.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="memcached.touchbykey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Memcached::touchByKey</refname>
-  <refpurpose>Set a new expiration on an item on a specific server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Memcached">
-   <modifier>public</modifier> <type>bool</type><methodname>Memcached::touchByKey</methodname>
-   <methodparam><type>string</type><parameter>server_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>expiration</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>Memcached::touchByKey</function> is functionally equivalent to
-   <methodname>Memcached::touch</methodname>, except that the free-form
-   <parameter>server_key</parameter> can be used to map the
-   <parameter>key</parameter> to a specific server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>server_key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.server_key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.key;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expiration</parameter></term>
-     <listitem>
-      <para>
-       &memcached.parameter.expiration;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   &memcached.result.getresultcode;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Memcached::touch</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/memcached/memcachedexception.xml b/reference/memcached/memcachedexception.xml
deleted file mode 100644
index 3c10b5007bcb..000000000000
--- a/reference/memcached/memcachedexception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.memcachedexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The MemcachedException class</title>
- <titleabbrev>MemcachedException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MemcachedException intro -->
-  <section xml:id="memcachedexception.intro">
-   &reftitle.intro;
-   <para>
-    
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="memcachedexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MemcachedException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MemcachedException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
-</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/memcached/sessions.xml b/reference/memcached/sessions.xml
deleted file mode 100644
index f9cc49362c07..000000000000
--- a/reference/memcached/sessions.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="memcached.sessions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Sessions support</title>
- <para>Memcached provides a custom session handler that can be used to store
-  user sessions in memcache. A completely separate memcached instance is used
-  for that internally, so you can use a different server pool if necessary. The
-  session keys are stored under the prefix
-  <literal>memc.sess.key.</literal>, so be aware of this if you use the
-  same server pool for sessions and generic caching.</para>
- <para>
-  <variablelist>
-
-   <varlistentry xml:id="memcache.sessions.save-handler">
-    <term>
-     <parameter>session.save_handler</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Set to <literal>memcached</literal> to enable sessions support.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="memcache.sessions.save-path">
-    <term>
-     <parameter>session.save_path</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Defines a comma separated of <literal>hostname:port</literal> entries to
-      use for session server pool, for example
-      <literal>"sess1:11211, sess2:11211"</literal>.
-     </para>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </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/memcached/setup.xml b/reference/memcached/setup.xml
deleted file mode 100644
index 6590fe5cf767..000000000000
--- a/reference/memcached/setup.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="memcached.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="memcached.requirements">
-  &reftitle.required;
-  <para>
-   This extension requires <link
-    xlink:href="&url.libmemcached;">libmemcached</link> client library
-   (version 1.0.0 or greater). For SASL authentication support, libmemcached
-   must be built with SASL enabled.
-  </para>
-  <para>
-   Since version 0.2.0, this extension requires PHP version 5.2.0 or higher.
-  </para>
- </section>
-
- <!-- {{{ Installation -->
- &reference.memcached.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.memcached.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/memcached/versions.xml b/reference/memcached/versions.xml
deleted file mode 100644
index b9e16d9ed0d3..000000000000
--- a/reference/memcached/versions.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='memcached' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::__construct' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::add' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::addByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::addServer' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::addServers' from='PECL memcached &gt;= 0.1.1'/>
- <function name='memcached::append' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::appendByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::cas' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::casByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::decrement' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::decrementByKey' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::delete' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::deleteByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::deleteMulti' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::deleteMultiByKey' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::fetch' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::fetchAll' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::flush' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::get' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getAllKeys' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::getByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getDelayed' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getDelayedByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getMulti' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getMultiByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getOption' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getResultCode' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getResultMessage' from='PECL memcached &gt;= 1.0.0'/>
- <function name='memcached::getServerByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getServerList' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getStats' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::getVersion' from='PECL memcached &gt;= 0.1.5'/>
- <function name='memcached::increment' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::incrementByKey' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::isPersistent' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::isPristine' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::prepend' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::prependByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::quit' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::replace' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::replaceByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::resetServerList' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::set' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::setByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::setEncodingKey' from='PECL memcached &gt;= 3.1.0'/>
- <function name='memcached::setMulti' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::setMultiByKey' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::setOption' from='PECL memcached &gt;= 0.1.0'/>
- <function name='memcached::setOptions' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::setSaslAuthData' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::touch' from='PECL memcached &gt;= 2.0.0'/>
- <function name='memcached::touchByKey' from='PECL memcached &gt;= 2.0.0'/>
-
- <function name='memcachedexception' from='PECL memcached &gt;= 0.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/misc/functions/hrtime.xml b/reference/misc/functions/hrtime.xml
index 70f93f2e8704..af41c854644b 100644
--- a/reference/misc/functions/hrtime.xml
+++ b/reference/misc/functions/hrtime.xml
@@ -101,7 +101,7 @@ Array
  <refsect1 role="seealso">
   &reftitle.seealso;
   <simplelist>
-   <member>The <link linkend="book.hrtime">High resolution timing</link> extension</member>
+   <member>The <link xlink:href="../extensions/book.hrtime.php">High resolution timing</link> extension</member>
    <member><function>microtime</function></member>
    <member><function>time_nanosleep</function></member>
   </simplelist>
diff --git a/reference/mongodb/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mongodb/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mongodb/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mongodb/architecture.xml b/reference/mongodb/architecture.xml
deleted file mode 100644
index e65963e526c8..000000000000
--- a/reference/mongodb/architecture.xml
+++ /dev/null
@@ -1,991 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="mongodb.architecture" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <titleabbrev>Driver Architecture and Internals</titleabbrev>
- <title>Explains the driver architecture, and special features</title>
-
- <section xml:id="mongodb.overview">
-  <titleabbrev>Architecture</titleabbrev>
-  <title>Architecture Overview</title>
-
-  <simpara>
-   This article explains how all the different components of the PHP driver fit
-   together, from base system libraries, through the extension, and to the PHP
-   libraries on top.
-  </simpara>
-
-  <para>
-   <mediaobject>
-    <alt>
-     MongoDB PHP Driver Architecture Diagram. The lowest level of the driver is
-     our system libraries: libmongoc, libbson, and libmongocrypt. The middle
-     level is the MongoDB PHP extension. The upper level is PHP userland and
-     includes the MongoDB PHP library and higher-level packages such as
-     framework integrations and applications.
-    </alt>
-    <imageobject>
-     <imagedata fileref="en/reference/mongodb/images/driver_arch.svg" width="625" depth="450" format="SVG" />
-    </imageobject>
-   </mediaobject>
-  </para>
-
-  <simpara>
-   At the top of this stack sits a
-   <link xlink:href="&url.mongodb.library;">PHP library</link>,
-   which is distributed as a
-   <link xlink:href="&url.packagist.package;mongodb/mongodb">Composer package</link>.
-   This library provides an API consistent with other MongoDB
-   <link xlink:href="&url.mongodb.drivers;">drivers</link>
-   and implements various cross-driver
-   <link xlink:href="&url.mongodb.specs;">specifications</link>.
-   While the extension can be used directly, the library has minimal overhead and
-   should be a common dependency for most applications built with MongoDB.
-  </simpara>
-
-  <para>
-   Sitting below that library is a PHP extension, which is distributed through
-   <link xlink:href="&url.pecl.package;mongodb">PECL</link>.
-   The extension forms the glue between PHP and our system libraries
-   (<link xlink:href="&url.mongodb.libmongoc;">libmongoc</link>,
-   <link xlink:href="&url.mongodb.libbson;">libbson</link>, and
-   <link xlink:href="&url.mongodb.libmongocrypt;">libmongocrypt</link>).
-   Its public API provides only the most essential functionality:
-
-   <simplelist>
-    <member>Connection management</member>
-    <member>BSON encoding and decoding</member>
-    <member>Object document serialization (to support ODM libraries)</member>
-    <member>Executing commands, queries, and write operations</member>
-    <member>Handling cursors for command and query results</member>
-   </simplelist>
-  </para>
-
-  <para>
-   <table>
-    <title>Driver Source Code and JIRA Projects</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Project</entry>
-       <entry>GitHub</entry>
-       <entry>JIRA</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PHP Library</entry>
-       <entry><link xlink:href="&url.mongodb.github.phplib;">mongodb/mongo-php-library</link></entry>
-       <entry><link xlink:href="&url.mongodb.jira.phplib;">PHPLIB</link></entry>
-      </row>
-      <row>
-       <entry>PHP Extension</entry>
-       <entry><link xlink:href="&url.mongodb.github.phpc;">mongodb/mongo-php-driver</link></entry>
-       <entry><link xlink:href="&url.mongodb.jira.phpc;">PHPC</link></entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
-
- <section xml:id="mongodb.connection-handling">
-  <titleabbrev>Connections</titleabbrev>
-  <title>Connection handling and persistence</title>
-
-  &mongodb.note.forking;
-
-  <section>
-   <title>Connection and topology persistence (PHP version since 1.2.0)</title>
-
-   <simpara>
-    All versions of the extension since 1.2.0 persist the
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> client object in
-    the PHP worker process, which allows it to re-use database connections,
-    authentication states, <emphasis>and</emphasis> topology information across
-    multiple requests.
-   </simpara>
-
-   <simpara>
-    When <methodname>MongoDB\Driver\Manager::__construct</methodname> is
-    invoked, a hash is created from its arguments (i.e. URI string and array
-    options). The extension will attempt to find a previously persisted
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> client object for
-    that hash. If an existing client cannot be found for the hash, a new client
-    will be created and persisted for future use. This behavior can be disabled
-    via the <literal>"disableClientPersistence"</literal> driver option.
-   </simpara>
-
-   <simpara>
-    Each client contains its own database connections and a view of the server
-    topology (e.g. standalone, replica set, shard cluster). By persisting the
-    client between PHP requests, the extension is able to re-use established
-    database connections and remove the need for
-    <link xlink:href="&url.mongodb.sdam;">discovering the server topology</link>
-    on each request.
-   </simpara>
-
-   <simpara>
-    Consider the following example:
-   </simpara>
-
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$managers = [
-    new MongoDB\Driver\Manager('mongodb://127.0.0.1'),
-    new MongoDB\Driver\Manager('mongodb://127.0.0.1'),
-    new MongoDB\Driver\Manager('mongodb://127.0.0.1:27017'),
-    new MongoDB\Driver\Manager('mongodb://rs1.example.com,rs2.example.com/', ['replicaSet' => 'myReplicaSet']),
-];
-
-foreach ($managers as $manager) {
-    $manager->executeCommand('test', new MongoDB\Driver\Command(['ping' => 1]));
-}
-
-?>
-]]>
-   </programlisting>
-
-   <simpara>
-    The first two Manager objects will share the same
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> client since
-    their constructor arguments are identical. The third and fourth objects will
-    each use their own client. In total, three clients will be created and the
-    PHP worker executing this script will open two connections to
-    <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 extension discovers additional members of the replica set after
-    issuing <literal>hello</literal> commands, it will open additional
-    connections to those servers as well.
-   </simpara>
-
-   <simpara>
-    If the same worker executes the script again in a second request, the three
-    clients will be re-used and no new connections will be made. Depending on
-    how long ago the previous request was served, the extension may need to
-    issue additional <literal>hello</literal> commands to update its view of the
-    topologies.
-   </simpara>
-  </section>
-
-  <section>
-   <title>Socket persistence (PHP versions before 1.2.0)</title>
-
-   <simpara>
-    Versions of the extension before 1.2.0 utilize PHP&apos;s Streams API for
-    database connections, using an API within
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> to designate
-    custom handlers for socket communication; however, a new libmongoc client is
-    created for each <classname>MongoDB\Driver\Manager</classname>. As a result,
-    the extension persists individual database connections but not
-    authentication state or topology information. This means that the extension
-    needs to issue commands at the start of each request to authenticate and
-    <link xlink:href="&url.mongodb.sdam;">discover the server topology</link>.
-   </simpara>
-
-   <simpara>
-    Database connections are persisted by a hash derived from the server&apos;s
-    host, port, and the URI string used to construct the
-    <classname>MongoDB\Driver\Manager</classname>. The constructor&apos;s array
-    options are not included in this hash.
-   </simpara>
-
-   <note>
-    <simpara>
-     Versions of the extension &gt;= 1.1.8 and &lt; 1.2.0 do not persist sockets
-     for SSL connections. See
-     <link xlink:href="&url.mongodb.jira.phpc;-720">PHPC-720</link> for
-     additional information.
-    </simpara>
-   </note>
-
-   <simpara>
-    Despite its shortcomings with persisting SSL connections when and topology
-    information, this version of the extension supports all
-    <link linkend="context.ssl">SSL context options</link> since it uses
-    PHP&apos;s Streams API.
-   </simpara>
-  </section>
- </section>
-
- <section xml:id="mongodb.persistence">
-  <titleabbrev>Persisting Data</titleabbrev>
-  <title>Serialization and deserialization of PHP variables into MongoDB</title>
-
-  <simpara>
-   This document discusses how compound structures (i.e. documents, arrays, and
-   objects) are converted between BSON and PHP values.
-  </simpara>
-
-  <section xml:id="mongodb.persistence.serialization">
-   <title>Serialization to BSON</title>
-
-   <section>
-    <title>Arrays</title>
-
-    <simpara>
-     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>.
-    </simpara>
-
-    <simpara>
-     If the array is not packed — i.e. having associative (string) keys, the
-     keys don't start at 0, or when there are gaps:: <emphasis>BSON
-     object</emphasis>
-    </simpara>
-
-    <simpara>
-     A top-level (root) document, <emphasis>always</emphasis> serializes as a
-     BSON document.
-    </simpara>
-
-    <section>
-     <title>Examples</title>
-
-     <simpara>
-      These serialize as a BSON array:
-     </simpara>
-
-     <programlisting role="text">
-<![CDATA[
-[ 8, 5, 2, 3 ] => [ 8, 5, 2, 3 ]
-[ 0 => 4, 1 => 9 ] => [ 4, 9 ]
-]]>
-     </programlisting>
-
-     <simpara>
-      These serialize as a BSON document:
-     </simpara>
-
-     <programlisting role="text">
-<![CDATA[
-[ 0 => 1, 2 => 8, 3 => 12 ] => { "0" : 1, "2" : 8, "3" : 12 }
-[ "foo" => 42 ] => { "foo" : 42 }
-[ 1 => 9, 0 => 10 ] => { "1" : 9, "0" : 10 }
-]]>
-     </programlisting>
-
-     <simpara>
-      Note that the five examples are <emphasis>extracts</emphasis> of a full
-      document, and represent only <emphasis>one</emphasis> value inside a
-      document.
-     </simpara>
-
-    </section>
-   </section>
-
-   <section>
-    <title>Objects</title>
-
-     <simpara>
-      If an object is of the <classname>stdClass</classname> class, serialize
-      as a <emphasis>BSON document</emphasis>.
-     </simpara>
-
-     <simpara>
-      If an object is a supported class that implements
-      <interfacename>MongoDB\BSON\Type</interfacename>, then use the BSON
-      serialization logic for that specific type.
-      <interfacename>MongoDB\BSON\Type</interfacename> instances (excluding
-      <interfacename>MongoDB\BSON\Serializable</interfacename> may only be
-      serialized as a document field value. Attempting to serialize such an
-      object as a root document will throw a
-      <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-     </simpara>
-
-     <simpara>
-      If an object is of an unknown class implementing the
-      <interfacename>MongoDB\BSON\Type</interfacename> interface, then throw a
-      <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-     </simpara>
-
-     <simpara>
-      If an object is of any other class, without implementing any special
-      interface, serialize as a <emphasis>BSON document</emphasis>. Keep only
-      <emphasis>public</emphasis> properties, and ignore
-      <emphasis>protected</emphasis> and <emphasis>private</emphasis>
-      properties.
-     </simpara>
-
-     <simpara>
-      If an object is of a class that implements the
-      <interfacename>MongoDB\BSON\Serializable</interfacename> interface, call
-      <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname> and use
-      the returned array or <classname>stdClass</classname> to serialize as a
-      BSON document or array. The BSON type will be determined by the following:
-     </simpara>
-
-     <para>
-      <orderedlist>
-       <listitem>
-        <simpara>Root documents must be serialized as a BSON
-        document.
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <interfacename>MongoDB\BSON\Persistable</interfacename> objects must be
-         serialized as a BSON document.
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         If <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-         returns a packed array, serialize as a BSON array.
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         If <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-         returns a non-packed array or <classname>stdClass</classname>,
-         serialize as a BSON document.
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         If <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-         did not return an array or <classname>stdClass</classname>, throw an
-         <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-         exception.
-        </simpara>
-       </listitem>
-      </orderedlist>
-     </para>
-
-     <simpara>
-      If an object is of a class that implements the
-      <interfacename>MongoDB\BSON\Persistable</interfacename> interface (which
-      implies <interfacename>MongoDB\BSON\Serializable</interfacename>), obtain
-      the properties in a similar way as in the previous paragraphs, but
-      <emphasis>also</emphasis> add an additional property
-      <property>__pclass</property> as a Binary value, with subtype
-      <literal>0x80</literal> and data bearing the fully qualified class name
-      of the object that is being serialized.
-     </simpara>
-
-     <simpara>
-      The <property>__pclass</property> property is added to the array or
-      object returned by
-      <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>, which
-      means it will overwrite any <property>__pclass</property> key/property in
-      the <methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-      return value. If you want to avoid this behaviour and set your own
-      <property>__pclass</property> value, you must <emphasis>not</emphasis>
-      implement <interfacename>MongoDB\BSON\Persistable</interfacename> and
-      should instead implement
-      <interfacename>MongoDB\BSON\Serializable</interfacename> directly.
-     </simpara>
-
-     <section>
-      <title>Examples</title>
-
-      <programlisting role="php">
-<![CDATA[
-<?php
-
-class stdClass
-{
-    public $foo = 42;
-} // => {"foo": 42}
-
-class MyClass
-{
-    public $foo = 42;
-    protected $prot = 'wine';
-    private $fpr = 'cheese';
-} // => {"foo": 42}
-
-class AnotherClass1 implements MongoDB\BSON\Serializable
-{
-    public $foo = 42;
-    protected $prot = 'wine';
-    private $fpr = 'cheese';
-
-    public function bsonSerialize(): array
-    {
-        return ['foo' => $this->foo, 'prot' => $this->prot];
-    }
-} // => {"foo": 42, "prot": "wine"}
-
-class AnotherClass2 implements MongoDB\BSON\Serializable
-{
-    public $foo = 42;
-
-    public function bsonSerialize(): self
-    {
-        return $this;
-    }
-} // => MongoDB\Driver\Exception\UnexpectedValueException("bsonSerialize() did not return an array or stdClass")
-
-class AnotherClass3 implements MongoDB\BSON\Serializable
-{
-    private $elements = ['foo', 'bar'];
-
-    public function bsonSerialize(): array
-    {
-        return $this->elements;
-    }
-} // => {"0": "foo", "1": "bar"}
-
-/**
- * Nesting Serializable classes
- */
-
-class AnotherClass4 implements MongoDB\BSON\Serializable
-{
-    private $elements = [0 => 'foo', 2 => 'bar'];
-
-    public function bsonSerialize(): array
-    {
-        return $this->elements;
-    }
-} // => {"0": "foo", "2": "bar"}
-
-class ContainerClass1 implements MongoDB\BSON\Serializable
-{
-    public $things;
-
-    public function __construct()
-    {
-        $this->things = new AnotherClass4();
-    }
-
-    function bsonSerialize(): array
-    {
-        return ['things' => $this->things];
-    }
-} // => {"things": {"0": "foo", "2": "bar"}}
-
-
-class AnotherClass5 implements MongoDB\BSON\Serializable
-{
-    private $elements = [0 => 'foo', 2 => 'bar'];
-
-    public function bsonSerialize(): array
-    {
-        return array_values($this->elements);
-    }
-} // => {"0": "foo", "1": "bar"} as a root class
-  //    ["foo", "bar"] as a nested value
-
-class ContainerClass2 implements MongoDB\BSON\Serializable
-{
-    public $things;
-
-    public function __construct()
-    {
-        $this->things = new AnotherClass5();
-    }
-
-    public function bsonSerialize(): array
-    {
-        return ['things' => $this->things];
-    }
-} // => {"things": ["foo", "bar"]}
-
-
-class AnotherClass6 implements MongoDB\BSON\Serializable
-{
-    private $elements = ['foo', 'bar'];
-
-    function bsonSerialize(): object
-    {
-        return (object) $this->elements;
-    }
-} // => {"0": "foo", "1": "bar"}
-
-class ContainerClass3 implements MongoDB\BSON\Serializable
-{
-    public $things;
-
-    public function __construct()
-    {
-        $this->things = new AnotherClass6();
-    }
-
-    public function bsonSerialize(): array
-    {
-        return ['things' => $this->things];
-    }
-} // => {"things": {"0": "foo", "1": "bar"}}
-
-class UpperClass implements MongoDB\BSON\Persistable
-{
-    public $foo = 42;
-    protected $prot = 'wine';
-    private $fpr = 'cheese';
-
-    private $data;
-
-    public function bsonUnserialize(array $data): void
-    {
-        $this->data = $data;
-    }
-
-    public function bsonSerialize(): array
-    {
-        return ['foo' => $this->foo, 'prot' => $this->prot];
-    }
-} // => {"foo": 42, "prot": "wine", "__pclass": {"$type": "80", "$binary": "VXBwZXJDbGFzcw=="}}
-
-?>
-]]>
-     </programlisting>
-    </section>
-   </section>
-  </section>
-
-  <section xml:id="mongodb.persistence.deserialization">
-   <title>Deserialization from BSON</title>
-
-   &mongodb.warning.duplicate-keys;
-
-   <simpara>
-    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
-    impossible to infer the original BSON type. By default, the
-    <code>mongodb</code> extension addresses this concern by ensuring that BSON
-    arrays and documents are converted to PHP arrays and objects, respectively.
-   </simpara>
-   <simpara>
-    For compound types, there are three data types:
-   </simpara>
-
-   <para>
-    <variablelist>
-     <varlistentry>
-      <term>root</term>
-      <listitem>
-       <simpara>
-        refers to the top-level BSON document <emphasis>only</emphasis>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>document</term>
-      <listitem>
-       <simpara>
-        refers to embedded BSON documents <emphasis>only</emphasis>
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>array</term>
-      <listitem>
-       <simpara>
-        refers to a BSON array
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <para>
-    Besides the three collective types, it is also possible to configure
-    specific fields in your document to map to the data types mentioned below.
-    As an example, the following type map allows you to
-    map each embedded document within an <literal>"addresses"</literal> array to
-    an <classname>Address</classname> class <emphasis>and</emphasis> each
-    <literal>"city"</literal> field within those embedded address documents to
-    a <classname>City</classname> class:
-
-    <programlisting role="text">
-<![CDATA[
-[
-    'fieldPaths' => [
-        'addresses.$' => 'MyProject\Address',
-        'addresses.$.city' => 'MyProject\City',
-    ],
-]
-]]>
-    </programlisting>
-   </para>
-
-   <simpara>
-    Each of those three data types, as well as the field specific mappings,
-    can be mapped against different PHP types. The possible mapping values
-    are:
-   </simpara>
-
-   <para>
-    <variablelist>
-     <varlistentry>
-      <term><emphasis>not set</emphasis> or <type>NULL</type> (default)</term>
-      <listitem>
-       <para>
-        <itemizedlist>
-         <listitem>
-          <simpara>
-           A BSON array will be deserialized as a PHP <type>array</type>.
-          </simpara>
-         </listitem>
-         <listitem>
-          <simpara>
-           A BSON document (root or embedded) without a
-           <property>__pclass</property> property
-           <footnote xml:id="mongodb.pclass">
-            <simpara>
-             A __pclass property is only deemed to exist if
-             there exists a property with that name, and it is a Binary value,
-             and the sub-type of the Binary value is 0x80. If any of these three
-             conditions is not met, the __pclass property does not exist and
-             should be treated as any other normal property.
-            </simpara>
-           </footnote>
-           becomes a PHP <classname>stdClass</classname> object, with each
-           BSON document key set as a public <classname>stdClass</classname>
-           property.
-          </simpara>
-         </listitem>
-         <listitem>
-          <simpara>
-           A BSON document (root or embedded) with a
-           <property>__pclass</property> property <footnoteref linkend="mongodb.pclass"/> becomes a PHP object of
-           the class name as defined by the <property>__pclass</property>
-           property.
-          </simpara>
-          <simpara>
-           If the named class implements the
-           <interfacename>MongoDB\BSON\Persistable</interfacename> interface,
-           then the properties of the BSON document, including the
-           <property>__pclass</property> property, are sent as an associative
-           array to the
-           <methodname>MongoDB\BSON\Unserializable::bsonUnserialize</methodname>
-           function to initialise the object's properties.
-          </simpara>
-          <simpara>
-           If the named class does not exist or does not implement the
-           <interfacename>MongoDB\BSON\Persistable</interfacename> interface,
-           <classname>stdClass</classname> will be used and each BSON document
-           key (including <property>__pclass</property>) will be set as a
-           public <classname>stdClass</classname> property.
-          </simpara>
-          <simpara>
-           The <property>__pclass</property> functionality relies on the
-           property being part of a retrieved MongoDB document. If you use a
-           <link linkend="mongodb-driver-query.construct-queryOptions">projection</link>
-           when querying for documents, you need to include the
-           <property>__pclass</property> field in the projection for this
-           functionality to work.
-          </simpara>
-         </listitem>
-        </itemizedlist>
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>"array"</literal></term>
-      <listitem>
-       <simpara>
-        Turns a BSON array or BSON document into a PHP array. There will be no
-        special treatment of a <property>__pclass</property> property <footnoteref linkend="mongodb.pclass"/>,
-        but it may be set as an element in the returned array if it was
-        present in the BSON document.
-       </simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>"object"</literal> or <literal>"stdClass"</literal></term>
-      <listitem>
-       <simpara>
-        Turns a BSON array or BSON document into a
-        <classname>stdClass</classname> object. There will be no special
-        treatment of a <property>__pclass</property> property <footnoteref linkend="mongodb.pclass"/>, but it may
-        be set as a public property in the returned object if it was present
-        in the BSON document.
-       </simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><literal>"bson"</literal></term>
-      <listitem>
-       <simpara>
-        Turns a BSON array into a <classname>MongoDB\BSON\PackedArray</classname>
-        and a BSON document into a <classname>MongoDB\BSON\Document</classname>,
-        regardless of whether the BSON document has a <property>__pclass</property>
-        property <footnoteref linkend="mongodb.pclass"/>.
-       </simpara>
-       <note>
-        <simpara>
-         The <literal>bson</literal> value is only available for the three root
-         types, not in the field specific mappings.
-        </simpara>
-       </note>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term>any other string</term>
-      <listitem>
-       <simpara>
-        Defines the class name that the BSON array or BSON object should be
-        deserialized as. For BSON objects that include
-        <property>__pclass</property> properties, that class will take
-        priority.
-       </simpara>
-
-       <simpara>
-        If the named class does not exist, is not concrete (i.e. it is
-        abstract or an interface), or does not implement
-        <interfacename>MongoDB\BSON\Unserializable</interfacename> then an
-        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-        exception is thrown.
-       </simpara>
-
-       <simpara>
-        If the BSON object has a <property>__pclass</property> property and
-        that class exists and implements
-        <interfacename>MongoDB\BSON\Persistable</interfacename> it will
-        supersede the class provided in the type map.
-       </simpara>
-
-       <simpara>
-        The properties of the BSON document, <emphasis>including</emphasis>
-        the <property>__pclass</property> property if it exists, will be sent
-        as an associative array to the
-        <methodname>MongoDB\BSON\Unserializable::bsonUnserialize</methodname>
-        function to initialise the object's properties.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-
-   <section xml:id="mongodb.persistence.typemaps">
-    <title>TypeMaps</title>
-
-     <simpara>
-      TypeMaps can be set through the
-      <methodname>MongoDB\Driver\Cursor::setTypeMap</methodname> method on a
-      <classname>MongoDB\Driver\Cursor</classname> object, or the
-      <literal>$typeMap</literal> argument of
-      <function>MongoDB\BSON\toPHP</function>,
-      <methodname>MongoDB\BSON\Document::toPHP</methodname>, and
-      <methodname>MongoDB\BSON\PackedArray::toPHP</methodname>. Each of the three
-      classes (<emphasis>root</emphasis>, <emphasis>document</emphasis>, and
-      <emphasis>array</emphasis>) can be individually set, in addition to the
-      field specific types.
-     </simpara>
-
-     <simpara>
-      If the value in the map is <type>NULL</type>, it means the same as the
-      <emphasis>default</emphasis> value for that item.
-     </simpara>
-    </section>
-
-    <section>
-     <title>Examples</title>
-
-     <simpara>
-      These examples use the following classes:
-     </simpara>
-
-     <para>
-      <variablelist>
-       <varlistentry>
-        <term>MyClass</term>
-        <listitem>
-         <simpara>
-          which does <emphasis>not</emphasis> implement any interface
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>YourClass</term>
-        <listitem>
-         <simpara>
-          which implements
-          <interfacename>MongoDB\BSON\Unserializable</interfacename>
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>OurClass</term>
-        <listitem>
-         <simpara>
-          which implements
-          <interfacename>MongoDB\BSON\Persistable</interfacename>
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term>TheirClass</term>
-        <listitem>
-         <simpara>
-          which extends OurClass
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-
-     <para>
-      The <methodname>MongoDB\BSON\Unserializable::bsonUnserialize</methodname>
-      method of YourClass, OurClass, TheirClass iterate over the array and set
-      the properties without modifications. It <emphasis>also</emphasis> sets
-      the <literal>$unserialized</literal> property to &true;:
-
-      <programlisting role="php">
-<![CDATA[
-<?php
-
-function bsonUnserialize( array $map )
-{
-    foreach ( $map as $k => $value )
-    {
-        $this->$k = $value;
-    }
-    $this->unserialized = true;
-}
-]]>
-      </programlisting>
-     </para>
-
-     <para>
-      <programlisting role="text">
-<![CDATA[
-/* typemap: [] (all defaults) */
-{ "foo": "yes", "bar" : false }
-  -> stdClass { $foo => 'yes', $bar => false }
-
-{ "foo": "no", "array" : [ 5, 6 ] }
-  -> stdClass { $foo => 'no', $array => [ 5, 6 ] }
-
-{ "foo": "no", "obj" : { "embedded" : 3.14 } }
-  -> stdClass { $foo => 'no', $obj => stdClass { $embedded => 3.14 } }
-
-{ "foo": "yes", "__pclass": "MyClass" }
-  -> stdClass { $foo => 'yes', $__pclass => 'MyClass' }
-
-{ "foo": "yes", "__pclass": { "$type" : "80", "$binary" : "MyClass" } }
-  -> stdClass { $foo => 'yes', $__pclass => Binary(0x80, 'MyClass') }
-
-{ "foo": "yes", "__pclass": { "$type" : "80", "$binary" : "YourClass") }
-  -> stdClass { $foo => 'yes', $__pclass => Binary(0x80, 'YourClass') }
-
-{ "foo": "yes", "__pclass": { "$type" : "80", "$binary" : "OurClass") }
-  -> OurClass { $foo => 'yes', $__pclass => Binary(0x80, 'OurClass'), $unserialized => true }
-
-{ "foo": "yes", "__pclass": { "$type" : "44", "$binary" : "YourClass") }
-  -> stdClass { $foo => 'yes', $__pclass => Binary(0x44, 'YourClass') }
-]]>
-      </programlisting>
-     </para>
-
-     <para>
-      <programlisting role="text">
-<![CDATA[
-/* typemap: [ "root" => "MissingClass" ] */
-{ "foo": "yes" }
-  -> MongoDB\Driver\Exception\InvalidArgumentException("MissingClass does not exist")
-
-/* typemap: [ "root" => "MyClass" ] */
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "MyClass" } }
-  -> MongoDB\Driver\Exception\InvalidArgumentException("MyClass does not implement Unserializable interface")
-
-/* typemap: [ "root" => "MongoDB\BSON\Unserializable" ] */
-{ "foo": "yes" }
-  -> MongoDB\Driver\Exception\InvalidArgumentException("Unserializable is not a concrete class")
-
-/* typemap: [ "root" => "YourClass" ] */
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "MongoDB\BSON\Unserializable" } }
-  -> YourClass { $foo => "yes", $__pclass => Binary(0x80, "MongoDB\BSON\Unserializable"), $unserialized => true }
-
-/* typemap: [ "root" => "YourClass" ] */
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "MyClass" } }
-  -> YourClass { $foo => "yes", $__pclass => Binary(0x80, "MyClass"), $unserialized => true }
-
-/* typemap: [ "root" => "YourClass" ] */
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "OurClass" } }
-  -> OurClass { $foo => "yes", $__pclass => Binary(0x80, "OurClass"), $unserialized => true }
-
-/* typemap: [ "root" => "YourClass" ] */
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "TheirClass" } }
-  -> TheirClass { $foo => "yes", $__pclass => Binary(0x80, "TheirClass"), $unserialized => true }
-
-/* typemap: [ "root" => "OurClass" ] */
-{ foo: "yes", "__pclass" : { "$type": "80", "$binary": "TheirClass" } }
-  -> TheirClass { $foo => "yes", $__pclass => Binary(0x80, "TheirClass"), $unserialized => true }
-]]>
-      </programlisting>
-     </para>
-
-     <para>
-      <programlisting role="text">
-<![CDATA[
-/* typemap: [ 'root' => 'YourClass' ] */
-{ foo: "yes", "__pclass" : { "$type": "80", "$binary": "YourClass" } }
-  -> YourClass { $foo => 'yes', $__pclass => Binary(0x80, 'YourClass'), $unserialized => true }
-]]>
-      </programlisting>
-     </para>
-
-     <para>
-      <programlisting role="text">
-<![CDATA[
-/* typemap: [ 'root' => 'array', 'document' => 'array' ] */
-{ "foo": "yes", "bar" : false }
-  -> [ "foo" => "yes", "bar" => false ]
-
-{ "foo": "no", "array" : [ 5, 6 ] }
-  -> [ "foo" => "no", "array" => [ 5, 6 ] ]
-
-{ "foo": "no", "obj" : { "embedded" : 3.14 } }
-  -> [ "foo" => "no", "obj" => [ "embedded => 3.14 ] ]
-
-{ "foo": "yes", "__pclass": "MyClass" }
-  -> [ "foo" => "yes", "__pclass" => "MyClass" ]
-
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "MyClass" } }
-  -> [ "foo" => "yes", "__pclass" => Binary(0x80, "MyClass") ]
-
-{ "foo": "yes", "__pclass" : { "$type": "80", "$binary": "OurClass" } }
-  -> [ "foo" => "yes", "__pclass" => Binary(0x80, "OurClass") ]
-]]>
-      </programlisting>
-     </para>
-
-     <para>
-      <programlisting role="text">
-<![CDATA[
-/* typemap: [ 'root' => 'object', 'document' => 'object' ] */
-{ "foo": "yes", "__pclass": { "$type": "80", "$binary": "MyClass" } }
-  -> stdClass { $foo => "yes", "__pclass" => Binary(0x80, "MyClass") }
-]]>
-      </programlisting>
-     </para>
-
-   </section>
-  </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/mongodb/book.xml b/reference/mongodb/book.xml
deleted file mode 100644
index 8f3f46e04f68..000000000000
--- a/reference/mongodb/book.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<book xml:id="book.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>MongoDB Extension</title>
- <titleabbrev>MongoDB</titleabbrev>
-
- <info xml:id="info.mongodb">
-  <abstract>
-   <simpara>
-    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:
-    <link linkend="class.mongodb-driver-command">commands</link>,
-    <link linkend="class.mongodb-driver-query">queries</link>,
-    <link linkend="class.mongodb-driver-bulkwrite">writes</link>,
-    <link linkend="class.mongodb-driver-manager">connection management</link>,
-    and <link linkend="mongodb.bson">BSON serialization</link>.
-   </simpara>
-   <simpara>
-    Userland PHP libraries that depend on this extension may provide higher
-    level APIs, such as query builders, individual command helper methods, and
-    GridFS. Application developers should consider using this extension in
-    conjunction with the
-    <link xlink:href="&url.mongodb.library;">MongoDB PHP library</link>, which
-    implements the same higher level APIs found in MongoDB drivers for other
-    languages. This separation of concerns allows the extension to focus on
-    essential features for which an extension implementation is paramount for
-    performance.
-   </simpara>
-  </abstract>
- </info>
-
-  &reference.mongodb.setup;
-  &reference.mongodb.constants;
-  &reference.mongodb.tutorial;
-  &reference.mongodb.architecture;
-  &reference.mongodb.security;
-
-  &reference.mongodb.mongodb;
-  &reference.mongodb.bson;
-  &reference.mongodb.monitoring;
-  &reference.mongodb.exceptions;
-</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/mongodb/bson.xml b/reference/mongodb/bson.xml
deleted file mode 100644
index ca46af976487..000000000000
--- a/reference/mongodb/bson.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <part xml:id="mongodb.bson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <?phpdoc extension-membership="pecl" ?>
-  <title>MongoDB BSON Classes and Functions</title>
-  <titleabbrev>MongoDB\BSON</titleabbrev>
-
-  <reference xml:id="ref.bson.functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-   <title>&Functions;</title>
-   &reference.mongodb.functions.entities.bson;
-  </reference>
-
-  &reference.mongodb.bson.document;
-  &reference.mongodb.bson.packedarray;
-  &reference.mongodb.bson.iterator;
-
-  &reference.mongodb.bson.binary;
-  &reference.mongodb.bson.vectortype;
-  &reference.mongodb.bson.decimal128;
-  &reference.mongodb.bson.javascript;
-  &reference.mongodb.bson.maxkey;
-  &reference.mongodb.bson.minkey;
-  &reference.mongodb.bson.objectid;
-  &reference.mongodb.bson.regex;
-  &reference.mongodb.bson.timestamp;
-  &reference.mongodb.bson.utcdatetime;
-
-  &reference.mongodb.bson.type;
-  &reference.mongodb.bson.persistable;
-  &reference.mongodb.bson.serializable;
-  &reference.mongodb.bson.unserializable;
-
-  &reference.mongodb.bson.binaryinterface;
-  &reference.mongodb.bson.decimal128interface;
-  &reference.mongodb.bson.javascriptinterface;
-  &reference.mongodb.bson.maxkeyinterface;
-  &reference.mongodb.bson.minkeyinterface;
-  &reference.mongodb.bson.objectidinterface;
-  &reference.mongodb.bson.regexinterface;
-  &reference.mongodb.bson.timestampinterface;
-  &reference.mongodb.bson.utcdatetimeinterface;
-
-  &reference.mongodb.bson.dbpointer;
-  &reference.mongodb.bson.int64;
-  &reference.mongodb.bson.symbol;
-  &reference.mongodb.bson.undefined;
- </part>
diff --git a/reference/mongodb/bson/binary.xml b/reference/mongodb/bson/binary.xml
deleted file mode 100644
index 2649cc6424c2..000000000000
--- a/reference/mongodb/bson/binary.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-binary" role="class" 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\BSON\Binary class</title>
- <titleabbrev>MongoDB\BSON\Binary</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Binary intro -->
-  <section xml:id="mongodb-bson-binary.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for binary data (i.e. array of bytes). Binary values also have a
-    subtype, which is used to indicate what kind of data is in the byte array.
-    Subtypes from zero to 127 are predefined or reserved. Subtypes from 128-255
-    are user-defined.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-binary.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Binary</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Binary</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\BinaryInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-generic">MongoDB\BSON\Binary::TYPE_GENERIC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-function">MongoDB\BSON\Binary::TYPE_FUNCTION</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-old-binary">MongoDB\BSON\Binary::TYPE_OLD_BINARY</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-old-uuid">MongoDB\BSON\Binary::TYPE_OLD_UUID</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-uuid">MongoDB\BSON\Binary::TYPE_UUID</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-md5">MongoDB\BSON\Binary::TYPE_MD5</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-encrypted">MongoDB\BSON\Binary::TYPE_ENCRYPTED</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-column">MongoDB\BSON\Binary::TYPE_COLUMN</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-sensitive">MongoDB\BSON\Binary::TYPE_SENSITIVE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-vector">MongoDB\BSON\Binary::TYPE_VECTOR</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-bson-binary.constants.type-user-defined">MongoDB\BSON\Binary::TYPE_USER_DEFINED</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-binary')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\BSON\Binary constants -->
-  <section xml:id="mongodb-bson-binary.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-generic">
-     <term><constant>MongoDB\BSON\Binary::TYPE_GENERIC</constant></term>
-     <listitem>
-      <simpara>Generic binary data.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-function">
-     <term><constant>MongoDB\BSON\Binary::TYPE_FUNCTION</constant></term>
-     <listitem>
-      <simpara>Function.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-old-binary">
-     <term><constant>MongoDB\BSON\Binary::TYPE_OLD_BINARY</constant></term>
-     <listitem>
-      <simpara>Generic binary data (deprecated in favor of <constant>MongoDB\BSON\Binary::TYPE_GENERIC</constant>).</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-old-uuid">
-     <term><constant>MongoDB\BSON\Binary::TYPE_OLD_UUID</constant></term>
-     <listitem>
-      <simpara>
-       Universally unique identifier (deprecated in favor of
-       <constant>MongoDB\BSON\Binary::TYPE_UUID</constant>). When using this
-       type, the Binary&apos;s data should be 16 bytes in length.
-      </simpara>
-      <simpara>
-       Historically, other drivers encoded values with this type based on their
-       language conventions (e.g. varying endianness), which makes it
-       non-portable. The PHP extension applies no special handling for encoding
-       or decoding data with this type.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-uuid">
-     <term><constant>MongoDB\BSON\Binary::TYPE_UUID</constant></term>
-     <listitem>
-      <simpara>
-       Universally unique identifier. When using this type, the Binary&apos;s
-       data should be 16 bytes in length and encoded according to
-       <link xlink:href="&url.rfc;4122">RFC 4122</link>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-md5">
-     <term><constant>MongoDB\BSON\Binary::TYPE_MD5</constant></term>
-     <listitem>
-      <simpara>MD5 hash. When using this type, the Binary&apos;s data should be 16 bytes in length.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-encrypted">
-     <term><constant>MongoDB\BSON\Binary::TYPE_ENCRYPTED</constant></term>
-     <listitem>
-      <simpara>Encrypted value. This subtype is used for client-side encryption.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-column">
-     <term><constant>MongoDB\BSON\Binary::TYPE_COLUMN</constant></term>
-     <listitem>
-      <simpara>Column data. This subtype is used for time-series collections.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-sensitive">
-     <term><constant>MongoDB\BSON\Binary::TYPE_SENSITIVE</constant></term>
-     <listitem>
-      <simpara>
-       Sensitive data. This subtype is used for sensitive data that should be
-       excluded from server-side logging when possible.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-vector">
-     <term><constant>MongoDB\BSON\Binary::TYPE_VECTOR</constant></term>
-     <listitem>
-      <simpara>
-       Vector data. This subtype is used to efficiently store vector data for
-       use with MongoDB&apos;s vector search.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-bson-binary.constants.type-user-defined">
-     <term><constant>MongoDB\BSON\Binary::TYPE_USER_DEFINED</constant></term>
-     <listitem>
-      <simpara>
-       User-defined type. While types between 0 and 127 are predefined or
-       reserved, types between 128 and 255 are user-defined and may be used for
-       anything.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.2.0</entry>
-       <entry>
-        Added <constant>MongoDB\BSON\Binary::TYPE_VECTOR</constant>, as well as the
-        <methodname>MongoDB\BSON\Binary::fromVector</methodname>,
-        <methodname>MongoDB\BSON\Binary::getVectorType</methodname>, and
-        <methodname>MongoDB\BSON\Binary::toArray</methodname> functions.
-       </entry>
-      </row>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.17.0</entry>
-       <entry>
-        Added <constant>MongoDB\BSON\Binary::TYPE_SENSITIVE</constant>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        <simpara>
-         Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-        </simpara>
-        <simpara>
-         Added <constant>MongoDB\BSON\Binary::TYPE_COLUMN</constant>.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.7.0</entry>
-       <entry>
-        Added <constant>MongoDB\BSON\Binary::TYPE_ENCRYPTED</constant>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\BinaryInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.binary;
-
-</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/mongodb/bson/binary/construct.xml b/reference/mongodb/bson/binary/construct.xml
deleted file mode 100644
index 959c1d89244e..000000000000
--- a/reference/mongodb/bson/binary/construct.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::__construct</refname>
-  <refpurpose>Construct a new Binary</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Binary::__construct</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>MongoDB\BSON\Binary::TYPE_GENERIC</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      Binary data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter> (<type>int</type>)</term>
-    <listitem>
-     <simpara>
-      Unsigned 8-bit integer denoting the data&apos;s type. Defaults to <constant>MongoDB\BSON\Binary::TYPE_GENERIC</constant> if not specified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>type</parameter> is not an unsigned 8-bit integer.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>type</parameter> is <constant>MongoDB\BSON\Binary::TYPE_UUID</constant> or <constant>MongoDB\BSON\Binary::TYPE_OLD_UUID</constant> and <parameter>data</parameter> is not exactly 16 bytes in length.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.15.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>type</parameter> parameter defaults to
-        <constant>MongoDB\BSON\Binary::TYPE_GENERIC</constant> if not specified.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-        is thrown if <parameter>type</parameter> is
-        <constant>MongoDB\BSON\Binary::TYPE_UUID</constant> or
-        <constant>MongoDB\BSON\Binary::TYPE_OLD_UUID</constant> and
-        <parameter>data</parameter> is not exactly 16 bytes in length.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.1.3</entry>
-      <entry>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-        is thrown if <parameter>type</parameter> is not an unsigned 8-bit
-        integer.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Binary::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$binary = new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC);
-var_dump($binary);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Binary)#1 (2) {
-  ["data"]=>
-  string(3) "foo"
-  ["type"]=>
-  int(0)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binary/fromvector.xml b/reference/mongodb/bson/binary/fromvector.xml
deleted file mode 100644
index 92cdf2ac8cf9..000000000000
--- a/reference/mongodb/bson/binary/fromvector.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.fromvector" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::fromVector</refname>
-  <refpurpose>Creates a new binary with subtype <constant>MongoDB\BSON\Binary::SUBTYPE_VECTOR</constant> from the given array and vector type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>MongoDB\BSON\Binary</type><methodname>MongoDB\BSON\Binary::fromVector</methodname>
-   <methodparam><type>array</type><parameter>vector</parameter></methodparam>
-   <methodparam><type>MongoDB\BSON\VectorType</type><parameter>vectorType</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>vector</parameter> (<type>array</type>)</term>
-    <listitem>
-     <para>
-      An array of values representing the vector data. The type of each value must match the type indicated by the <parameter>vectorType</parameter> parameter:
-      <itemizedlist>
-       <listitem><simpara>for <constant>MongoDB\BSON\VectorType::Float32</constant>, each value must be a <type>float</type></simpara></listitem>
-       <listitem><simpara>for <constant>MongoDB\BSON\VectorType::Int8</constant>, each value must be an 8-bit <type>int</type>, i.e. from <literal>-127</literal> to <literal>128</literal></simpara></listitem>
-       <listitem><simpara>for <constant>MongoDB\BSON\VectorType::PackedBit</constant>, each value must be a <type>bool</type> or 1-bit <type>int</type>, i.e. <literal>0</literal> or <literal>1</literal></simpara></listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vectorType</parameter> (<type>MongoDB\BSON\VectorType</type>)</term>
-    <listitem>
-     <simpara>
-      The vector data type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new Binary with subtype <constant>MongoDB\BSON\Binary::SUBTYPE_VECTOR</constant>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Binary::toArray</methodname></member>
-   <member><methodname>MongoDB\BSON\Binary::getVectorType</methodname></member>
-   <member><enumname>MongoDB\BSON\VectorType</enumname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binary/getdata.xml b/reference/mongodb/bson/binary/getdata.xml
deleted file mode 100644
index f2ed51e56d4a..000000000000
--- a/reference/mongodb/bson/binary/getdata.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.getdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::getData</refname>
-  <refpurpose>Returns the Binary&apos;s data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Binary::getData</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Binary&apos;s data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Binary::getData</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$binary = new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC);
-var_dump($binary->getData());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "foo"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binary/gettype.xml b/reference/mongodb/bson/binary/gettype.xml
deleted file mode 100644
index fd1d29f11928..000000000000
--- a/reference/mongodb/bson/binary/gettype.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::getType</refname>
-  <refpurpose>Returns the Binary&apos;s type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\Binary::getType</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Binary&apos;s type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Binary::getType</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$binary = new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC);
-var_dump($binary->getType());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(0)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binary/getvectortype.xml b/reference/mongodb/bson/binary/getvectortype.xml
deleted file mode 100644
index d858645fedb1..000000000000
--- a/reference/mongodb/bson/binary/getvectortype.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.getvectortype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::getVectorType</refname>
-  <refpurpose>Returns the data type for a Binary with the vector subtype</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\VectorType</type><methodname>MongoDB\BSON\Binary::getVectorType</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the data type of the Binary vector.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\LogicException</classname> if the subtype is not <constant>MongoDB\BSON\Binary::SUBTYPE_VECTOR</constant>.</member>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</link></member>
-   <member><enumname>MongoDB\BSON\VectorType</enumname></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/bson/binary/jsonserialize.xml b/reference/mongodb/bson/binary/jsonserialize.xml
deleted file mode 100644
index 8aa93754fd77..000000000000
--- a/reference/mongodb/bson/binary/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Binary::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Binary</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/binary/toarray.xml b/reference/mongodb/bson/binary/toarray.xml
deleted file mode 100644
index e73e98115eb5..000000000000
--- a/reference/mongodb/bson/binary/toarray.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::toArray</refname>
-  <refpurpose>Returns the vector as an array for a Binary with subtype <constant>MongoDB\BSON\Binary::SUBTYPE_VECTOR</constant></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\BSON\Binary::toArray</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array containing the vector data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\LogicException</classname> if the subtype is not <constant>MongoDB\BSON\Binary::SUBTYPE_VECTOR</constant>.</member>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Binary::fromVector</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binary/tostring.xml b/reference/mongodb/bson/binary/tostring.xml
deleted file mode 100644
index 38dab03888fa..000000000000
--- a/reference/mongodb/bson/binary/tostring.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binary.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Binary::__toString</refname>
-  <refpurpose>Returns the Binary&apos;s data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Binary::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   &info.method.alias; <methodname>MongoDB\BSON\Binary::getData</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Binary&apos;s data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Binary::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump((string) new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "foo"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Binary::getData</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/binaryinterface.xml b/reference/mongodb/bson/binaryinterface.xml
deleted file mode 100644
index 12892959fc87..000000000000
--- a/reference/mongodb/bson/binaryinterface.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-binaryinterface" role="class" 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\BSON\BinaryInterface interface</title>
- <titleabbrev>MongoDB\BSON\BinaryInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-binaryinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by <classname>MongoDB\BSON\Binary</classname>
-    to be used as a parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-binaryinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\BinaryInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\BinaryInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-binaryinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.binaryinterface;
-
-</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/mongodb/bson/binaryinterface/getdata.xml b/reference/mongodb/bson/binaryinterface/getdata.xml
deleted file mode 100644
index 9d0c42a9eca6..000000000000
--- a/reference/mongodb/bson/binaryinterface/getdata.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binaryinterface.getdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\BinaryInterface::getData</refname>
-  <refpurpose>Returns the BinaryInterface&apos;s data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\BinaryInterface::getData</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the BinaryInterface&apos;s data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Binary::getData</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/mongodb/bson/binaryinterface/gettype.xml b/reference/mongodb/bson/binaryinterface/gettype.xml
deleted file mode 100644
index d9b425936f4c..000000000000
--- a/reference/mongodb/bson/binaryinterface/gettype.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binaryinterface.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\BinaryInterface::getType</refname>
-  <refpurpose>Returns the BinaryInterface&apos;s type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\BinaryInterface::getType</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the BinaryInterface&apos;s type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Binary::getType</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/mongodb/bson/binaryinterface/tostring.xml b/reference/mongodb/bson/binaryinterface/tostring.xml
deleted file mode 100644
index 435f6b84783c..000000000000
--- a/reference/mongodb/bson/binaryinterface/tostring.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-binaryinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\BinaryInterface::__toString</refname>
-  <refpurpose>Returns the BinaryInterface&apos;s data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\BinaryInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   &info.method.alias; <methodname>MongoDB\BSON\BinaryInterface::getData</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the BinaryInterface&apos;s data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\BinaryInterface::getData</methodname></member>
-   <member><methodname>MongoDB\BSON\Binary::__toString</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/mongodb/bson/dbpointer.xml b/reference/mongodb/bson/dbpointer.xml
deleted file mode 100644
index 0f75b3fdba56..000000000000
--- a/reference/mongodb/bson/dbpointer.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-dbpointer" role="class" 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\BSON\DBPointer class</title>
- <titleabbrev>MongoDB\BSON\DBPointer</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\DBPointer intro -->
-  <section xml:id="mongodb-bson-dbpointer.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for the "DBPointer" type. This BSON type is deprecated, and this
-    class can not be instantiated. It will be created from a BSON DBPointer
-    type while converting BSON to PHP, and can also be converted back into
-    BSON while storing documents in the database.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-dbpointer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\DBPointer</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\DBPointer</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-dbpointer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.dbpointer;
-
-</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/mongodb/bson/dbpointer/construct.xml b/reference/mongodb/bson/dbpointer/construct.xml
deleted file mode 100644
index 2b8064c6b2c2..000000000000
--- a/reference/mongodb/bson/dbpointer/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-dbpointer.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\DBPointer::__construct</refname>
-  <refpurpose>Construct a new DBPointer (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\DBPointer::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\DBPointer</classname> objects are created through
-   conversion from a deprecated BSON type and cannot be constructed directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/dbpointer/jsonserialize.xml b/reference/mongodb/bson/dbpointer/jsonserialize.xml
deleted file mode 100644
index 71d996e04a98..000000000000
--- a/reference/mongodb/bson/dbpointer/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-dbpointer.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\DBPointer::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\DBPointer::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\DBPointer</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/dbpointer/tostring.xml b/reference/mongodb/bson/dbpointer/tostring.xml
deleted file mode 100644
index 314af969581e..000000000000
--- a/reference/mongodb/bson/dbpointer/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-dbpointer.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\DBPointer::__toString</refname>
-  <refpurpose>Returns an empty string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\DBPointer::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an empty string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/decimal128.xml b/reference/mongodb/bson/decimal128.xml
deleted file mode 100644
index 17d5f2a02a3c..000000000000
--- a/reference/mongodb/bson/decimal128.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-decimal128" role="class" 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\BSON\Decimal128 class</title>
- <titleabbrev>MongoDB\BSON\Decimal128</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Decimal128 intro -->
-  <section xml:id="mongodb-bson-decimal128.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for the
-    <link xlink:href="&url.mongodb.wiki.decimal128;">Decimal128 floating-point format</link>,
-    which supports numbers with up to 34 decimal digits (i.e. significant
-    digits) and an exponent range of −6143 to +6144.
-   </simpara>
-   <simpara>
-    Unlike the double BSON type (i.e. <type>float</type> in PHP), which only
-    stores an approximation of the decimal values, the decimal data type stores
-    the exact value. For example, <literal>MongoDB\BSON\Decimal128('9.99')</literal>
-    has a precise value of 9.99 where as a double 9.99 would have an approximate
-    value of 9.9900000000000002131628….
-   </simpara>
-   &mongodb.note.decimal128;
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-decimal128.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Decimal128</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Decimal128</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Decimal128Interface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-decimal128')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\Decimal128Interface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.decimal128;
-
-</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/mongodb/bson/decimal128/construct.xml b/reference/mongodb/bson/decimal128/construct.xml
deleted file mode 100644
index 48b29afe4d00..000000000000
--- a/reference/mongodb/bson/decimal128/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-decimal128.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Decimal128::__construct</refname>
-  <refpurpose>Construct a new Decimal128</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Decimal128::__construct</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  &mongodb.note.decimal128;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      A decimal string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>value</parameter> is not a valid decimal string.</member>
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Decimal128::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(new MongoDB\BSON\Decimal128(1234.5678));
-var_dump(new MongoDB\BSON\Decimal128(NAN));
-var_dump(new MongoDB\BSON\Decimal128(INF));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Decimal128)#1 (1) {
-  ["dec"]=>
-  string(9) "1234.5678"
-}
-object(MongoDB\BSON\Decimal128)#1 (1) {
-  ["dec"]=>
-  string(3) "NaN"
-}
-object(MongoDB\BSON\Decimal128)#1 (1) {
-  ["dec"]=>
-  string(8) "Infinity"
-}
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.wiki.decimal128;">Decimal128 floating-point format</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/decimal128/jsonserialize.xml b/reference/mongodb/bson/decimal128/jsonserialize.xml
deleted file mode 100644
index a4fc5aecf001..000000000000
--- a/reference/mongodb/bson/decimal128/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-decimal128.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Decimal128::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Decimal128::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Decimal128</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/decimal128/tostring.xml b/reference/mongodb/bson/decimal128/tostring.xml
deleted file mode 100644
index b31ead105a7d..000000000000
--- a/reference/mongodb/bson/decimal128/tostring.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-decimal128.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Decimal128::__toString</refname>
-  <refpurpose>Returns the string representation of this Decimal128</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Decimal128::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Decimal128.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Decimal128::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump((string) new MongoDB\BSON\Decimal128(1234.5678));
-var_dump((string) new MongoDB\BSON\Decimal128(NAN));
-var_dump((string) new MongoDB\BSON\Decimal128(INF));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(9) "1234.5678"
-string(3) "NaN"
-string(8) "Infinity"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.wiki.decimal128;">Decimal128 floating-point format</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/decimal128interface.xml b/reference/mongodb/bson/decimal128interface.xml
deleted file mode 100644
index a1ec9a7581df..000000000000
--- a/reference/mongodb/bson/decimal128interface.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-decimal128interface" role="class" 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\BSON\Decimal128Interface interface</title>
- <titleabbrev>MongoDB\BSON\Decimal128Interface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-decimal128interface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\BSON\Decimal128</classname> to be used as a parameter,
-    return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-decimal128interface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Decimal128Interface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\Decimal128Interface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-decimal128interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.decimal128interface;
-
-</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/mongodb/bson/decimal128interface/tostring.xml b/reference/mongodb/bson/decimal128interface/tostring.xml
deleted file mode 100644
index 2b2a0f589ccc..000000000000
--- a/reference/mongodb/bson/decimal128interface/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-decimal128interface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Decimal128Interface::__toString</refname>
-  <refpurpose>Returns the string representation of this Decimal128Interface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Decimal128Interface::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Decimal128Interface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Decimal128::__toString</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/mongodb/bson/document.xml b/reference/mongodb/bson/document.xml
deleted file mode 100644
index 20af840bb2f0..000000000000
--- a/reference/mongodb/bson/document.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-document" role="class" 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\BSON\Document class</title>
- <titleabbrev>MongoDB\BSON\Document</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Document intro -->
-  <section xml:id="mongodb-bson-document.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a BSON document. This class is used when reading data as raw BSON
-    and cannot be modified.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-document.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Document</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Document</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</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.mongodb-bson-document')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.17.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\Type</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.document;
-
-</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/mongodb/bson/document/construct.xml b/reference/mongodb/bson/document/construct.xml
deleted file mode 100644
index 58594d517d87..000000000000
--- a/reference/mongodb/bson/document/construct.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::__construct</refname>
-  <refpurpose>Construct a new BSON document (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\Document::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\Document</classname> objects are created through
-   static factory methods and cannot be instantiated directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromPHP</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::fromBSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/frombson.xml b/reference/mongodb/bson/document/frombson.xml
deleted file mode 100644
index 87a76ce07127..000000000000
--- a/reference/mongodb/bson/document/frombson.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.frombson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::fromBSON</refname>
-  <refpurpose>Construct a new document instance from a BSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>static</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Document</type><methodname>MongoDB\BSON\Document::fromBSON</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bson</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      A string containing a document in BSON format.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\BSON\Document</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if <parameter>bson</parameter> is an invalid BSON string or contains more than a single document.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromPHP</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/fromjson.xml b/reference/mongodb/bson/document/fromjson.xml
deleted file mode 100644
index 23e460fb9eb8..000000000000
--- a/reference/mongodb/bson/document/fromjson.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.fromjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::fromJSON</refname>
-  <refpurpose>Construct a new document instance from a JSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>static</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Document</type><methodname>MongoDB\BSON\Document::fromJSON</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts an
-   <link xlink:href="&url.mongodb.docs.extendedjson;">extended JSON</link>
-   string to its BSON representation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      JSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\BSON\Document</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if
-    the JSON value cannot be converted to a BSON document (e.g. due to a syntax
-    error).
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromPHP</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::fromBSON</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/fromphp.xml b/reference/mongodb/bson/document/fromphp.xml
deleted file mode 100644
index 1f6fba507429..000000000000
--- a/reference/mongodb/bson/document/fromphp.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.fromphp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::fromPHP</refname>
-  <refpurpose>Construct a new document instance from PHP data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>static</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Document</type><methodname>MongoDB\BSON\Document::fromPHP</methodname>
-   <methodparam><type class="union"><type>object</type><type>array</type></type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter> (<type class="union"><type>object</type><type>array</type></type>)</term>
-    <listitem>
-     <simpara>
-      A PHP object or array containing the document. When passing an array with
-      numeric keys, the numeric values are converted to strings and used as
-      document keys.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\BSON\Document</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromBSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/get.xml b/reference/mongodb/bson/document/get.xml
deleted file mode 100644
index c9f4186e1f1c..000000000000
--- a/reference/mongodb/bson/document/get.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::get</refname>
-  <refpurpose>Returns the value of a key in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Document::get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      The key to retrieve from the document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value associated with the given key. If the key is not present in
-   the document, an exception is thrown.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON document,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the key is not present in the document.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::has</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/getiterator.xml b/reference/mongodb/bson/document/getiterator.xml
deleted file mode 100644
index 1992625f6daa..000000000000
--- a/reference/mongodb/bson/document/getiterator.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::getIterator</refname>
-  <refpurpose>Returns an iterator for the BSON document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Iterator</type><methodname>MongoDB\BSON\Document::getIterator</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\BSON\Iterator</classname> instance that can be
-   used to iterate over all keys in the document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if the BSON iterator could not be initialized.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/has.xml b/reference/mongodb/bson/document/has.xml
deleted file mode 100644
index 88c0f473b2df..000000000000
--- a/reference/mongodb/bson/document/has.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.has" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::has</refname>
-  <refpurpose>Returns whether a key is present in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\BSON\Document::has</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      The key to look for in the document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the key is present in the document and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::get</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/offsetexists.xml b/reference/mongodb/bson/document/offsetexists.xml
deleted file mode 100644
index 2acc0669943f..000000000000
--- a/reference/mongodb/bson/document/offsetexists.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetexists" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::offsetExists</refname>
-  <refpurpose>Returns whether a key is present in the document</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\Document">
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\BSON\Document::offsetExists</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The key to look for in the document.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the key is present in the document and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>ArrayAccess::offsetExists</methodname></member>
-    <member><methodname>MongoDB\BSON\Document::has</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/mongodb/bson/document/offsetget.xml b/reference/mongodb/bson/document/offsetget.xml
deleted file mode 100644
index 8463b5aef5cc..000000000000
--- a/reference/mongodb/bson/document/offsetget.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetget" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::offsetGet</refname>
-  <refpurpose>Returns the value of a key in the document</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\Document">
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Document::offsetGet</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The key to retrieve from the document.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value associated with the given key. If the key is not present in
-   the document, an exception is thrown.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON document,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the key is not present in the document.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>ArrayAccess::offsetGet</methodname></member>
-    <member><methodname>MongoDB\BSON\Document::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/mongodb/bson/document/offsetset.xml b/reference/mongodb/bson/document/offsetset.xml
deleted file mode 100644
index 9109ac6b5e76..000000000000
--- a/reference/mongodb/bson/document/offsetset.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::offsetSet</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\Document">
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\Document::offsetSet</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Sets the value at the specified <parameter>key</parameter> to <parameter>value</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index being set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <simpara>
-       The new value for the <parameter>key</parameter>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Always throws a <classname>MongoDB\Driver\Exception\LogicException</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/mongodb/bson/document/offsetunset.xml b/reference/mongodb/bson/document/offsetunset.xml
deleted file mode 100644
index b175dabf8700..000000000000
--- a/reference/mongodb/bson/document/offsetunset.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-document.offsetunset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::offsetUnset</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\Document">
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\Document::offsetUnset</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unsets the value at the specified index.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index being unset.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Always throws a <classname>MongoDB\Driver\Exception\LogicException</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/mongodb/bson/document/tocanonicalextendedjson.xml b/reference/mongodb/bson/document/tocanonicalextendedjson.xml
deleted file mode 100644
index 55413c48df96..000000000000
--- a/reference/mongodb/bson/document/tocanonicalextendedjson.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.tocanonicalextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::toCanonicalExtendedJSON</refname>
-  <refpurpose>Returns the Canonical Extended JSON representation of the BSON document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Converts the BSON document to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">Canonical Extended JSON</link>
-   representation. The canonical format prefers type fidelity at the expense of
-   concise output and is most suited for producing output that can be converted
-   back to BSON without any loss of type information (e.g. numeric types will
-   remain differentiated).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the
-   <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">Canonical Extended JSON</link>
-   representation of the BSON document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-
-$documents = [
-    [ 'null' => null ],
-    [ 'boolean' => true ],
-    [ 'string' => 'foo' ],
-    [ 'int32' => 123 ],
-    [ 'int64' => 4294967295 ],
-    [ 'double' => 1.0 ],
-    [ 'nan' => NAN ],
-    [ 'pos_inf' => INF ],
-    [ 'neg_inf' => -INF ],
-    [ 'array' => [ 'foo', 'bar' ]],
-    [ 'document' => [ 'foo' => 'bar' ]],
-    [ 'oid' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
-    [ 'dec128' => new MongoDB\BSON\Decimal128('1234.5678') ],
-    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
-    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
-    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
-    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
-    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
-    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
-    [ 'minkey' => new MongoDB\BSON\MinKey ],
-    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
-];
-
-foreach ($documents as $document) {
-    $bson = MongoDB\BSON\Document::fromPHP($document);
-    echo $bson->toCanonicalExtendedJSON(), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-    <![CDATA[
-{ "null" : null }
-{ "boolean" : true }
-{ "string" : "foo" }
-{ "int32" : { "$numberInt" : "123" } }
-{ "int64" : { "$numberLong" : "4294967295"} }
-{ "double" : { "$numberDouble" : "1.0" } }
-{ "nan" : { "$numberDouble" : "NaN" } }
-{ "pos_inf" : { "$numberDouble" : "Infinity" } }
-{ "neg_inf" : { "$numberDouble" : "-Infinity" } }
-{ "array" : [ "foo", "bar" ] }
-{ "document" : { "foo" : "bar" } }
-{ "oid" : { "$oid" : "56315a7c6118fd1b920270b1" } }
-{ "dec128" : { "$numberDecimal" : "1234.5678" } }
-{ "binary" : { "$binary" : { "base64": "Zm9v", "subType" : "00" } } }
-{ "date" : { "$date" : { "$numberLong" : "1445990400000" } } }
-{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
-{ "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } }
-{ "code" : { "$code" : "function() { return 1; }" } }
-{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : { "$numberInt" : "1" } } } }
-{ "minkey" : { "$minKey" : 1 } }
-{ "maxkey" : { "$maxKey" : 1 } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/tophp.xml b/reference/mongodb/bson/document/tophp.xml
deleted file mode 100644
index 3aad47e7d5e7..000000000000
--- a/reference/mongodb/bson/document/tophp.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.tophp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::toPHP</refname>
-  <refpurpose>Returns the PHP representation of the BSON document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>object</type></type><methodname>MongoDB\BSON\Document::toPHP</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>typeMap</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unserializes the BSON document to its PHP representation. The
-   <parameter>typeMap</parameter> parameter may be used to control the PHP types
-   used for converting BSON arrays and documents (both root and embedded).
-  </simpara>
-  &mongodb.warning.duplicate-keys;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.typeMap;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The decoded PHP value.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON document,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-    a class in the type map cannot be instantiated or does not implement
-    <interfacename>MongoDB\BSON\Unserializable</interfacename>.
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\toPHP</function></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/torelaxedextendedjson.xml b/reference/mongodb/bson/document/torelaxedextendedjson.xml
deleted file mode 100644
index 569f7a0d5754..000000000000
--- a/reference/mongodb/bson/document/torelaxedextendedjson.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.torelaxedextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::toRelaxedExtendedJSON</refname>
-  <refpurpose>Returns the Relaxed Extended JSON representation of the BSON document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Converts the BSON document to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#relaxed-extended-json-example">Relaxed Extended JSON</link>
-   representation. The relaxed format prefers use of JSON type primitives at the
-   expense of type fidelity and is most suited for producing output that can be
-   easily consumed by web APIs and humans.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the
-   <link xlink:href="&url.mongodb.specs.extendedjson;#relaxed-extended-json-example">Relaxed Extended JSON</link>
-   representation of the BSON document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-
-$documents = [
-    [ 'null' => null ],
-    [ 'boolean' => true ],
-    [ 'string' => 'foo' ],
-    [ 'int32' => 123 ],
-    [ 'int64' => 4294967295 ],
-    [ 'double' => 1.0 ],
-    [ 'nan' => NAN ],
-    [ 'pos_inf' => INF ],
-    [ 'neg_inf' => -INF ],
-    [ 'array' => [ 'foo', 'bar' ]],
-    [ 'document' => [ 'foo' => 'bar' ]],
-    [ 'oid' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
-    [ 'dec128' => new MongoDB\BSON\Decimal128('1234.5678') ],
-    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
-    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
-    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
-    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
-    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
-    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
-    [ 'minkey' => new MongoDB\BSON\MinKey ],
-    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
-];
-
-foreach ($documents as $document) {
-    $bson = MongoDB\BSON\Document::fromPHP($document);
-    echo $bson->toRelaxedExtendedJSON(), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-    <![CDATA[
-{ "null" : null }
-{ "boolean" : true }
-{ "string" : "foo" }
-{ "int32" : 123 }
-{ "int64" : 4294967295 }
-{ "double" : 1.0 }
-{ "nan" : { "$numberDouble" : "NaN" } }
-{ "pos_inf" : { "$numberDouble" : "Infinity" } }
-{ "neg_inf" : { "$numberDouble" : "-Infinity" } }
-{ "array" : [ "foo", "bar" ] }
-{ "document" : { "foo" : "bar" } }
-{ "oid" : { "$oid" : "56315a7c6118fd1b920270b1" } }
-{ "dec128" : { "$numberDecimal" : "1234.5678" } }
-{ "binary" : { "$binary" : { "base64": "Zm9v", "subType" : "00" } } }
-{ "date" : { "$date" : "2015-10-28T00:00:00Z" } }
-{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
-{ "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } }
-{ "code" : { "$code" : "function() { return 1; }" } }
-{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } }
-{ "minkey" : { "$minKey" : 1 } }
-{ "maxkey" : { "$maxKey" : 1 } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/document/tostring.xml b/reference/mongodb/bson/document/tostring.xml
deleted file mode 100644
index 4cf5f2beb84f..000000000000
--- a/reference/mongodb/bson/document/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-document.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Document::__toString</refname>
-  <refpurpose>Returns the string representation of this BSON Document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Document::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this document as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/int64.xml b/reference/mongodb/bson/int64.xml
deleted file mode 100644
index 20696326f869..000000000000
--- a/reference/mongodb/bson/int64.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-int64" role="class" 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\BSON\Int64 class</title>
- <titleabbrev>MongoDB\BSON\Int64</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Int64 intro -->
-  <section xml:id="mongodb-bson-int64.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for a 64-bit integer. When decoding BSON to PHP data, this class
-    is used when a 64-bit integer cannot be represented as a PHP integer on
-    32-bit platforms. These objects support overloaded
-    <link linkend="language.operators.arithmetic">arithmetic</link>,
-    <link linkend="language.operators.bitwise">bitwise</link>, and
-    <link linkend="language.operators.comparison">comparison</link> operators.
-   </simpara>
-   <simpara>
-    When working with raw BSON data through the
-    <classname>MongoDB\BSON\Document</classname>,
-    <classname>MongoDB\BSON\PackedArray</classname>, and
-    <classname>MongoDB\BSON\Iterator</classname> classes, any 64-bit integer
-    will be returned as an instance of this class, regardless of platform and
-    whether the value can be represented as a PHP integer. This ensures that
-    values can be roundtripped without changing the type.
-   </simpara>
-   <simpara>
-    During BSON encoding, objects of this class will convert back to a 64-bit
-    integer type, even when the value would fit in a 32-bit integer. This
-    allows explicitly storing values as 64-bit integers in BSON.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-int64.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Int64</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Int64</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-int64')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.16.0</entry>
-       <entry>
-        The class can now be instantiated on all platforms. Added support for
-        overloaded arithmetic, bitwise, and comparison operators.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.int64;
-
-</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/mongodb/bson/int64/construct.xml b/reference/mongodb/bson/int64/construct.xml
deleted file mode 100644
index 955f62c20341..000000000000
--- a/reference/mongodb/bson/int64/construct.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-int64.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Int64::__construct</refname>
-  <refpurpose>Construct a new Int64</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Int64::__construct</methodname>
-   <methodparam><type class="union"><type>int</type><type>string</type></type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a new <classname>MongoDB\BSON\Int64</classname> instance for the
-   given integer value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter> (<type class="union"><type>int</type><type>string</type></type>)</term>
-    <listitem>
-     <simpara>
-      The value to assign to the <classname>Int64</classname> instance. This
-      value can be provided as an <type>int</type> or <type>string</type>, the
-      latter being required on 32-bit platforms to represent 64-bit values.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </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 mongodb 1.16.0</entry>
-      <entry>
-       <simpara>
-        This method was made public to support creating Int64 instances when
-        working with raw BSON.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if string <parameter>value</parameter> cannot be parsed as a 64-bit integer.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/int64/jsonserialize.xml b/reference/mongodb/bson/int64/jsonserialize.xml
deleted file mode 100644
index b0739436e75b..000000000000
--- a/reference/mongodb/bson/int64/jsonserialize.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-int64.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Int64::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Int64::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Int64</classname>.
-  </simpara>
-  <note>
-   <simpara>
-    The output is consistent with the
-    <function>MongoDB\BSON\toCanonicalExtendedJSON</function> function, which
-    uses the
-    <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">canonical</link>
-    extended JSON format. This differs from other BSON classes, which use the
-    driver-specific legacy extended JSON format
-    (<function>MongoDB\BSON\toJSON</function>), in order to ensure that the
-    64-bit integer value is correctly represented on 32-bit platforms.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/int64/tostring.xml b/reference/mongodb/bson/int64/tostring.xml
deleted file mode 100644
index 0a8f2e5b99bf..000000000000
--- a/reference/mongodb/bson/int64/tostring.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-int64.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Int64::__toString</refname>
-  <refpurpose>Returns the string representation of this Int64</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Int64::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Int64.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Int64::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$int64 = new MongoDB\BSON\Int64('9223372036854775807');
-
-var_dump((string) $int64);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(19) "9223372036854775807"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/iterator.xml b/reference/mongodb/bson/iterator.xml
deleted file mode 100644
index 51ba20ade7fe..000000000000
--- a/reference/mongodb/bson/iterator.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-iterator" role="class" 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\BSON\Iterator class</title>
- <titleabbrev>MongoDB\BSON\Iterator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Iterator intro -->
-  <section xml:id="mongodb-bson-iterator.intro">
-   &reftitle.intro;
-   <simpara>
-    Iterator used to iterate a BSON document or array.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-iterator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Iterator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Iterator</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.mongodb-bson-iterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.iterator;
-
-</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/mongodb/bson/iterator/construct.xml b/reference/mongodb/bson/iterator/construct.xml
deleted file mode 100644
index 0c24fe263502..000000000000
--- a/reference/mongodb/bson/iterator/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-iterator.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::__construct</refname>
-  <refpurpose>Construct a new BSON iterator (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\Iterator::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\Iterator</classname> objects are created by calling
-   <methodname>MongoDB\BSON\Document::getIterator</methodname> or
-   <methodname>MongoDB\BSON\PackedArray::getIterator</methodname> and cannot be
-   instantiated directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::getIterator</methodname></member>
-   <member><methodname>MongoDB\BSON\PackedArray::getIterator</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/iterator/current.xml b/reference/mongodb/bson/iterator/current.xml
deleted file mode 100644
index 28c3ccf329ba..000000000000
--- a/reference/mongodb/bson/iterator/current.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-iterator.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::current</refname>
-  <refpurpose>Returns the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Iterator::current</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value of the current element.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON structure,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\LogicException</classname> if the iterator is not valid.</member>
-  </simplelist>
- </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/mongodb/bson/iterator/key.xml b/reference/mongodb/bson/iterator/key.xml
deleted file mode 100644
index 902d0f3fb29a..000000000000
--- a/reference/mongodb/bson/iterator/key.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-iterator.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::key</refname>
-  <refpurpose>Returns the key of the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type></type><methodname>MongoDB\BSON\Iterator::key</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key of the current element. When iterating a BSON document, the
-   key will always be a <type>string</type>. When iterating a BSON array, the
-   key will be an <type>int</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\LogicException</classname> if the iterator is not valid.</member>
-  </simplelist>
- </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/mongodb/bson/iterator/next.xml b/reference/mongodb/bson/iterator/next.xml
deleted file mode 100644
index e4e1cea444d4..000000000000
--- a/reference/mongodb/bson/iterator/next.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-iterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::next</refname>
-  <refpurpose>Advances the iterator to next element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\Iterator::next</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/mongodb/bson/iterator/rewind.xml b/reference/mongodb/bson/iterator/rewind.xml
deleted file mode 100644
index 3b29ba9ec01c..000000000000
--- a/reference/mongodb/bson/iterator/rewind.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-iterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::rewind</refname>
-  <refpurpose>Rewinds the Iterator to the first element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\Iterator::rewind</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/mongodb/bson/iterator/valid.xml b/reference/mongodb/bson/iterator/valid.xml
deleted file mode 100644
index 692699c4891f..000000000000
--- a/reference/mongodb/bson/iterator/valid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-iterator.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Iterator::valid</refname>
-  <refpurpose>Checks if current position is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB\BSON\Iterator::valid</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the current iterator position is valid, &false; otherwise.
-  </simpara>
- </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/mongodb/bson/javascript.xml b/reference/mongodb/bson/javascript.xml
deleted file mode 100644
index e3f5635e66da..000000000000
--- a/reference/mongodb/bson/javascript.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-javascript" role="class" 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\BSON\Javascript class</title>
- <titleabbrev>MongoDB\BSON\Javascript</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Javascript intro -->
-  <section xml:id="mongodb-bson-javascript.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for Javascript code. An optional scope document may be specified
-    that maps identifiers to values and defines the scope in which the code
-    should be evaluated by the server.
-   </simpara>
-   <note>
-    <simpara>
-     This BSON type is mainly used when executing database commands that take a
-     Javascript function as a parameter, such as
-     <link xlink:href="&url.mongodb.docs;reference/command/mapReduce/">mapReduce</link>.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-javascript.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Javascript</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Javascript</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\JavascriptInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-javascript')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\JavascriptInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.javascript;
-
-</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/mongodb/bson/javascript/construct.xml b/reference/mongodb/bson/javascript/construct.xml
deleted file mode 100644
index 3ddff9dcd562..000000000000
--- a/reference/mongodb/bson/javascript/construct.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascript.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Javascript::__construct</refname>
-  <refpurpose>Construct a new Javascript</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Javascript::__construct</methodname>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>object</type><type>null</type></type><parameter>scope</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>code</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      Javascript code.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>scope</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      Javascript scope.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>code</parameter> contains null bytes.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-        is thrown if <parameter>code</parameter> contains null bytes.
-        Previously, values would be truncated at the first null byte.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Javascript::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$code = new MongoDB\BSON\Javascript('function() { return 1; }');
-var_dump($code);
-
-$codews = new MongoDB\BSON\Javascript('function() { return foo; }', ['foo' => 'bar']);
-var_dump($codews);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Javascript)#1 (2) {
-  ["javascript"]=>
-  string(24) "function() { return 1; }"
-  ["scope"]=>
-  object(stdClass)#2 (0) {
-  }
-}
-object(MongoDB\BSON\Javascript)#2 (2) {
-  ["javascript"]=>
-  string(26) "function() { return foo; }"
-  ["scope"]=>
-  object(stdClass)#1 (1) {
-    ["foo"]=>
-    string(3) "bar"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/javascript/getcode.xml b/reference/mongodb/bson/javascript/getcode.xml
deleted file mode 100644
index df2ed9431866..000000000000
--- a/reference/mongodb/bson/javascript/getcode.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascript.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Javascript::getCode</refname>
-  <refpurpose>Returns the Javascript&apos;s code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Javascript::getCode</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Javascript&apos;s code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Javascript::getCode</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$js = new MongoDB\BSON\Javascript('function foo(bar) { return bar; }');
-var_dump($js->getCode());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(33) "function foo(bar) { return bar; }"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/javascript/getscope.xml b/reference/mongodb/bson/javascript/getscope.xml
deleted file mode 100644
index 4edb7bd35460..000000000000
--- a/reference/mongodb/bson/javascript/getscope.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascript.getscope" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Javascript::getScope</refname>
-  <refpurpose>Returns the Javascript&apos;s scope document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\BSON\Javascript::getScope</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Javascript&apos;s scope document, or &null; if the is no scope.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Javascript::getScope</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$js = new MongoDB\BSON\Javascript('function foo(bar) { return bar; }');
-var_dump($js->getScope());
-
-$js = new MongoDB\BSON\Javascript('function foo() { return foo; }', ['foo' => 42]);
-var_dump($js->getScope());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-NULL
-object(stdClass)#1 (1) {
-  ["foo"]=>
-  int(42)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/javascript/jsonserialize.xml b/reference/mongodb/bson/javascript/jsonserialize.xml
deleted file mode 100644
index 897fb6fbf4ce..000000000000
--- a/reference/mongodb/bson/javascript/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascript.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Javascript::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Javascript::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Javascript</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/javascript/tostring.xml b/reference/mongodb/bson/javascript/tostring.xml
deleted file mode 100644
index ac38d5311609..000000000000
--- a/reference/mongodb/bson/javascript/tostring.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascript.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Javascript::__toString</refname>
-  <refpurpose>Returns the Javascript&apos;s code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Javascript::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   &info.method.alias; <methodname>MongoDB\BSON\Javascript::getCode</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Javascript&apos;s code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Javascript::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump((string) new MongoDB\BSON\Javascript('function foo(bar) { return bar; }'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(33) "function foo(bar) { return bar; }"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Javascript::getCode</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/javascriptinterface.xml b/reference/mongodb/bson/javascriptinterface.xml
deleted file mode 100644
index e7eb147f2053..000000000000
--- a/reference/mongodb/bson/javascriptinterface.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-javascriptinterface" role="class" 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\BSON\JavascriptInterface interface</title>
- <titleabbrev>MongoDB\BSON\JavascriptInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-javascriptinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\BSON\Javascript</classname> to be used as a parameter,
-    return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-javascriptinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\JavascriptInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\JavascriptInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-javascriptinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.javascriptinterface;
-
-</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/mongodb/bson/javascriptinterface/getcode.xml b/reference/mongodb/bson/javascriptinterface/getcode.xml
deleted file mode 100644
index ed08bade2a81..000000000000
--- a/reference/mongodb/bson/javascriptinterface/getcode.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascriptinterface.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\JavascriptInterface::getCode</refname>
-  <refpurpose>Returns the JavascriptInterface&apos;s code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\JavascriptInterface::getCode</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the JavascriptInterface&apos;s code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Javascript::getCode</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/mongodb/bson/javascriptinterface/getscope.xml b/reference/mongodb/bson/javascriptinterface/getscope.xml
deleted file mode 100644
index 67b5ddbf398d..000000000000
--- a/reference/mongodb/bson/javascriptinterface/getscope.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascriptinterface.getscope" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\JavascriptInterface::getScope</refname>
-  <refpurpose>Returns the JavascriptInterface&apos;s scope document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\BSON\JavascriptInterface::getScope</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the JavascriptInterface&apos;s scope document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Javascript::getScope</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/mongodb/bson/javascriptinterface/tostring.xml b/reference/mongodb/bson/javascriptinterface/tostring.xml
deleted file mode 100644
index 767fa1d2962a..000000000000
--- a/reference/mongodb/bson/javascriptinterface/tostring.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-javascriptinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\JavascriptInterface::__toString</refname>
-  <refpurpose>Returns the JavascriptInterface&apos;s code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\JavascriptInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   &info.method.alias; <methodname>MongoDB\BSON\JavascriptInterface::getCode</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the JavascriptInterface&apos;s code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\JavascriptInterface::getCode</methodname></member>
-   <member><methodname>MongoDB\BSON\Javascript::__toString</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/mongodb/bson/maxkey.xml b/reference/mongodb/bson/maxkey.xml
deleted file mode 100644
index c110090327e1..000000000000
--- a/reference/mongodb/bson/maxkey.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-maxkey" role="class" 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\BSON\MaxKey class</title>
- <titleabbrev>MongoDB\BSON\MaxKey</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\MaxKey intro -->
-  <section xml:id="mongodb-bson-maxkey.intro">
-   &reftitle.intro;
-   <simpara>
-    Special BSON type which compares higher than all other possible BSON element
-    values.
-   </simpara>
-   <note>
-    <simpara>
-     This is an internal MongoDB type used for indexing and sharding.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-maxkey.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\MaxKey</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\MaxKey</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\MaxKeyInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-maxkey')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\MaxKeyInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.maxkey;
-
-</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/mongodb/bson/maxkey/construct.xml b/reference/mongodb/bson/maxkey/construct.xml
deleted file mode 100644
index 5b5e25c70c3a..000000000000
--- a/reference/mongodb/bson/maxkey/construct.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-bson-maxkey.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\MaxKey::__construct</refname>
-  <refpurpose>Construct a new MaxKey</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\MaxKey::__construct</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\MaxKey::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(new MongoDB\BSON\MaxKey());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\MaxKey)#1 (0) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/maxkey/jsonserialize.xml b/reference/mongodb/bson/maxkey/jsonserialize.xml
deleted file mode 100644
index b30e8d095947..000000000000
--- a/reference/mongodb/bson/maxkey/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-maxkey.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\MaxKey::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\MaxKey::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\MaxKey</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/maxkeyinterface.xml b/reference/mongodb/bson/maxkeyinterface.xml
deleted file mode 100644
index 9a8e70a3a038..000000000000
--- a/reference/mongodb/bson/maxkeyinterface.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-maxkeyinterface" role="class" 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\BSON\MaxKeyInterface interface</title>
- <titleabbrev>MongoDB\BSON\MaxKeyInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-maxkeyinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by <classname>MongoDB\BSON\MaxKey</classname>
-    to be used as a parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-maxkeyinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\MaxKeyInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\MaxKeyInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-   </classsynopsis>
-
-   <simpara>
-    This interface has no methods.
-   </simpara>
-  </section>
- </partintro>
-
-</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/mongodb/bson/minkey.xml b/reference/mongodb/bson/minkey.xml
deleted file mode 100644
index e0b8ec05686c..000000000000
--- a/reference/mongodb/bson/minkey.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-minkey" role="class" 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\BSON\MinKey class</title>
- <titleabbrev>MongoDB\BSON\MinKey</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\MinKey intro -->
-  <section xml:id="mongodb-bson-minkey.intro">
-   &reftitle.intro;
-   <simpara>
-    Special BSON type which compares lower than all other possible BSON element
-    values.
-   </simpara>
-   <note>
-    <simpara>
-     This is an internal MongoDB type used for indexing and sharding.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-minkey.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\MinKey</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\MinKey</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\MinKeyInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-minkey')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\MinKeyInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.minkey;
-
-</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/mongodb/bson/minkey/construct.xml b/reference/mongodb/bson/minkey/construct.xml
deleted file mode 100644
index 6d7ceae548b4..000000000000
--- a/reference/mongodb/bson/minkey/construct.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="mongodb-bson-minkey.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\MinKey::__construct</refname>
-  <refpurpose>Construct a new MinKey</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\MinKey::__construct</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\MinKey::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(new MongoDB\BSON\MinKey());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\MinKey)#1 (0) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/minkey/jsonserialize.xml b/reference/mongodb/bson/minkey/jsonserialize.xml
deleted file mode 100644
index 2ed71f5f0089..000000000000
--- a/reference/mongodb/bson/minkey/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-minkey.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\MinKey::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\MinKey::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\MinKey</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/minkeyinterface.xml b/reference/mongodb/bson/minkeyinterface.xml
deleted file mode 100644
index a8a4dbd81c34..000000000000
--- a/reference/mongodb/bson/minkeyinterface.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-minkeyinterface" role="class" 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\BSON\MinKeyInterface interface</title>
- <titleabbrev>MongoDB\BSON\MinKeyInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-minkeyinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by <classname>MongoDB\BSON\MinKey</classname>
-    to be used as a parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-minkeyinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\MinKeyInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\MinKeyInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-   </classsynopsis>
-
-   <simpara>
-    This interface has no methods.
-   </simpara>
-  </section>
- </partintro>
-
-</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/mongodb/bson/objectid.xml b/reference/mongodb/bson/objectid.xml
deleted file mode 100644
index cdc091b9c1dd..000000000000
--- a/reference/mongodb/bson/objectid.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-objectid" role="class" 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\BSON\ObjectId class</title>
- <titleabbrev>MongoDB\BSON\ObjectId</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\ObjectId intro -->
-  <section xml:id="mongodb-bson-objectid.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for an
-    <link xlink:href="&url.mongodb.docs.bson;#objectid">ObjectId</link>. The
-    value consists of 12 bytes, where the first four bytes are a timestamp
-    that reflect the ObjectId's creation. Specifically, the value consists of:
-   </simpara>
-   <itemizedlist>
-    <listitem><simpara>a 4-byte value representing the seconds since the Unix epoch,</simpara></listitem>
-    <listitem><simpara>a 5-byte random number unique to a machine and process, and</simpara></listitem>
-    <listitem><simpara>a 3-byte counter, starting with a random value.</simpara></listitem>
-   </itemizedlist>
-   <simpara>
-    In MongoDB, each document stored in a collection requires a unique
-    <literal>_id</literal> field that acts as a primary key. If an inserted
-    document omits the <literal>_id</literal> field, the extension automatically
-    generates an ObjectId for the <literal>_id</literal> field.
-   </simpara>
-   <simpara>
-    Using ObjectIds for the <literal>_id</literal> field provides the following
-    additional benefits:
-   </simpara>
-   <itemizedlist>
-    <listitem><simpara>The creation time of the ObjectId may be accessed using the <methodname>MongoDB\BSON\ObjectId::getTimestamp</methodname> method.</simpara></listitem>
-    <listitem><simpara>Sorting on an <literal>_id</literal> field that stores ObjectId values is roughly equivalent to sorting by creation time.</simpara></listitem>
-   </itemizedlist>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-objectid.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\ObjectId</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\ObjectId</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\ObjectIdInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-objectid')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        <simpara>
-         Renamed from <literal>MongoDB\BSON\ObjectID</literal> to
-         <literal>MongoDB\BSON\ObjectId</literal>.
-        </simpara>
-        <simpara>
-         Implements <interfacename>MongoDB\BSON\ObjectIdInterface</interfacename>.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.objectid;
-
-</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/mongodb/bson/objectid/construct.xml b/reference/mongodb/bson/objectid/construct.xml
deleted file mode 100644
index e47250b04d54..000000000000
--- a/reference/mongodb/bson/objectid/construct.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectid.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectId::__construct</refname>
-  <refpurpose>Construct a new ObjectId</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\ObjectId::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>id</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      A 24-character hexadecimal string. If not provided, the extension will
-      generate an ObjectId.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>id</parameter> is not a 24-character hexadecimal string.</member>
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\ObjectId::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(new MongoDB\BSON\ObjectId());
-
-var_dump(new MongoDB\BSON\ObjectId('000000000000000000000001'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\ObjectId)#1 (1) {
-  ["oid"]=>
-  string(24) "56732d3dda14d81214634921"
-}
-object(MongoDB\BSON\ObjectId)#1 (1) {
-  ["oid"]=>
-  string(24) "000000000000000000000001"
-}
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.objectid;">ObjectId Reference</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;#objectid">BSON Types: ObjectId</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/bson/objectid/gettimestamp.xml b/reference/mongodb/bson/objectid/gettimestamp.xml
deleted file mode 100644
index 692ebfb8f265..000000000000
--- a/reference/mongodb/bson/objectid/gettimestamp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectid.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectId::getTimestamp</refname>
-  <refpurpose>Returns the timestamp component of this ObjectId</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\ObjectId::getTimestamp</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The timestamp component of an ObjectId is its most significant 32 bits, which
-   denotes the number of seconds since the Unix epoch. This value is read as an
-   unsigned 32-bit integer with big-endian byte order.
-  </simpara>
-  &mongodb.note.uint32;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timestamp component of this ObjectId.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\ObjectId::getTimestamp</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump((new MongoDB\BSON\ObjectId())->getTimestamp());
-
-var_dump((new MongoDB\BSON\ObjectId('0000002a0000000000000000'))->getTimestamp());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-integer(1484854719)
-integer(42)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.objectid;">ObjectId Reference</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;#objectid">BSON Types: ObjectId</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/bson/objectid/jsonserialize.xml b/reference/mongodb/bson/objectid/jsonserialize.xml
deleted file mode 100644
index a1da1e483737..000000000000
--- a/reference/mongodb/bson/objectid/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectid.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectId::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\ObjectId::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\ObjectId</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/objectid/tostring.xml b/reference/mongodb/bson/objectid/tostring.xml
deleted file mode 100644
index 30d1f95e28b3..000000000000
--- a/reference/mongodb/bson/objectid/tostring.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectid.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectId::__toString</refname>
-  <refpurpose>Returns the hexadecimal representation of this ObjectId</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\ObjectId::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hexadecimal representation of this ObjectId.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\ObjectId::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump((string) new MongoDB\BSON\ObjectId());
-var_dump((string) new MongoDB\BSON\ObjectId('000000000000000000000001'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(24) "56731b49da14d8747d701211"
-string(24) "000000000000000000000001"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.objectid;">ObjectId Reference</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;#objectid">BSON Types: ObjectId</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/bson/objectidinterface.xml b/reference/mongodb/bson/objectidinterface.xml
deleted file mode 100644
index 5bd8a81d848a..000000000000
--- a/reference/mongodb/bson/objectidinterface.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-objectidinterface" role="class" 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\BSON\ObjectIdInterface interface</title>
- <titleabbrev>MongoDB\BSON\ObjectIdInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-objectidinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\BSON\ObjectId</classname> to be used as a parameter,
-    return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-objectidinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\ObjectIdInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\ObjectIdInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-objectidinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.objectidinterface;
-
-</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/mongodb/bson/objectidinterface/gettimestamp.xml b/reference/mongodb/bson/objectidinterface/gettimestamp.xml
deleted file mode 100644
index c9fc395c18a3..000000000000
--- a/reference/mongodb/bson/objectidinterface/gettimestamp.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectidinterface.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectIdInterface::getTimestamp</refname>
-  <refpurpose>Returns the timestamp component of this ObjectIdInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\ObjectIdInterface::getTimestamp</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timestamp component of this ObjectIdInterface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\ObjectId::getTimestamp</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/mongodb/bson/objectidinterface/tostring.xml b/reference/mongodb/bson/objectidinterface/tostring.xml
deleted file mode 100644
index 2ddb803d845f..000000000000
--- a/reference/mongodb/bson/objectidinterface/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-objectidinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\ObjectIdInterface::__toString</refname>
-  <refpurpose>Returns the hexadecimal representation of this ObjectIdInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\ObjectIdInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hexadecimal representation of this ObjectIdInterface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\ObjectId::__toString</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/mongodb/bson/packedarray.xml b/reference/mongodb/bson/packedarray.xml
deleted file mode 100644
index 4ec141476f51..000000000000
--- a/reference/mongodb/bson/packedarray.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-packedarray" role="class" 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\BSON\PackedArray class</title>
- <titleabbrev>MongoDB\BSON\PackedArray</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\PackedArray intro -->
-  <section xml:id="mongodb-bson-packedarray.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a BSON array. This class is used when reading data as raw BSON
-    and cannot be modified.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-packedarray.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\PackedArray</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\PackedArray</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</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.mongodb-bson-packedarray')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.17.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\Type</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.17.0</entry>
-       <entry>
-        <classname>MongoDB\BSON\PackedArray</classname> cannot be serialized
-        in contexts where a BSON document is expected. In earlier versions,
-        the BSON array would have been converted to a document.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.packedarray;
-
-</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/mongodb/bson/packedarray/construct.xml b/reference/mongodb/bson/packedarray/construct.xml
deleted file mode 100644
index c00592605b64..000000000000
--- a/reference/mongodb/bson/packedarray/construct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::__construct</refname>
-  <refpurpose>Construct a new BSON array (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\PackedArray::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\PackedArray</classname> objects are created through
-   static factory methods and cannot be instantiated directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::fromPHP</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/fromjson.xml b/reference/mongodb/bson/packedarray/fromjson.xml
deleted file mode 100644
index d671f426d6c6..000000000000
--- a/reference/mongodb/bson/packedarray/fromjson.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.fromjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::fromJSON</refname>
-  <refpurpose>Construct a new BSON array instance from a JSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>static</modifier> <modifier>public</modifier> <type>MongoDB\BSON\PackedArray</type><methodname>MongoDB\BSON\PackedArray::fromJSON</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts an
-   <link xlink:href="&url.mongodb.docs.extendedjson;">extended JSON</link>
-   string to its BSON representation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      JSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\BSON\PackedArray</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if
-    the JSON value cannot be converted to a BSON array (e.g. due to a syntax
-    error).
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB\BSON\PackedArray::fromJSON</methodname> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-
-$json = '[ "foo", { "$numberInt" : "123" }, { "$numberLong" : "4294967295" }, { "$oid" : "56315a7c6118fd1b920270b1" } ]';
-$packedArray = MongoDB\BSON\PackedArray::fromJSON($json);
-var_dump($packedArray);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-    <![CDATA[
-object(MongoDB\BSON\PackedArray)#1 (2) {
-  ["data"]=>
-  string(68) "MQAAAAIwAAQAAABmb28AEDEAewAAABIyAP////8AAAAABzMAVjFafGEY/RuSAnCxAA=="
-  ["value"]=>
-  array(4) {
-    [0]=>
-    string(3) "foo"
-    [1]=>
-    int(123)
-    [2]=>
-    int(4294967295)
-    [3]=>
-    object(MongoDB\BSON\ObjectId)#2 (1) {
-      ["oid"]=>
-      string(24) "56315a7c6118fd1b920270b1"
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::fromPHP</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/packedarray/fromphp.xml b/reference/mongodb/bson/packedarray/fromphp.xml
deleted file mode 100644
index aaa46329e4f5..000000000000
--- a/reference/mongodb/bson/packedarray/fromphp.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.fromphp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::fromPHP</refname>
-  <refpurpose>Construct a new BSON array instance from PHP data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>static</modifier> <modifier>public</modifier> <type>MongoDB\BSON\PackedArray</type><methodname>MongoDB\BSON\PackedArray::fromPHP</methodname>
-   <methodparam><type>array</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter> (<type>array</type>)</term>
-    <listitem>
-     <simpara>
-      The PHP array to convert to a BSON array. The array must be a list (i.e.
-      have sequential numeric keys starting with <literal>0</literal>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\BSON\PackedArray</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if the given array is not a list (i.e. has sequential numeric keys starting with <literal>0</literal>).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/get.xml b/reference/mongodb/bson/packedarray/get.xml
deleted file mode 100644
index 6f89e44cb7ee..000000000000
--- a/reference/mongodb/bson/packedarray/get.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::get</refname>
-  <refpurpose>Returns the value of an index in the array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\PackedArray::get</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter> (<type>int</type>)</term>
-    <listitem>
-     <simpara>
-      The index to retrieve from the array.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value associated with the given index. If the index is not
-   present in the array, an exception is thrown.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON array,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the index is not present in the array.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::has</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/getiterator.xml b/reference/mongodb/bson/packedarray/getiterator.xml
deleted file mode 100644
index a96fd1a1d684..000000000000
--- a/reference/mongodb/bson/packedarray/getiterator.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.getiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::getIterator</refname>
-  <refpurpose>Returns an iterator for the BSON array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Iterator</type><methodname>MongoDB\BSON\PackedArray::getIterator</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\BSON\Iterator</classname> instance that can be
-   used to iterate over all indexes in the array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if the BSON iterator could not be initialized.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/has.xml b/reference/mongodb/bson/packedarray/has.xml
deleted file mode 100644
index bea5d2aa26f5..000000000000
--- a/reference/mongodb/bson/packedarray/has.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.has" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::has</refname>
-  <refpurpose>Returns whether a index is present in the array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\BSON\PackedArray::has</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter> (<type>int</type>)</term>
-    <listitem>
-     <simpara>
-      The index to look for in the array.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the index is present in the array and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::get</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/offsetexists.xml b/reference/mongodb/bson/packedarray/offsetexists.xml
deleted file mode 100644
index 7f2ff74a8568..000000000000
--- a/reference/mongodb/bson/packedarray/offsetexists.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetexists" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::offsetExists</refname>
-  <refpurpose>Returns whether a index is present in the array</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\PackedArray">
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\BSON\PackedArray::offsetExists</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index to look for in the array.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the index is present in the array and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>ArrayAccess::offsetExists</methodname></member>
-    <member><methodname>MongoDB\BSON\PackedArray::has</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/offsetget.xml b/reference/mongodb/bson/packedarray/offsetget.xml
deleted file mode 100644
index 46b38b6fdc3f..000000000000
--- a/reference/mongodb/bson/packedarray/offsetget.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetget" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::offsetGet</refname>
-  <refpurpose>Returns the value of an index in the array</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\PackedArray">
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\PackedArray::offsetGet</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index to retrieve from the array. Only <type>int</type> is supported.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value associated with the given index. If the index is not
-   present in the array, an exception is thrown.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON array,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the index is not present in the array.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>ArrayAccess::offsetGet</methodname></member>
-    <member><methodname>MongoDB\BSON\PackedArray::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/mongodb/bson/packedarray/offsetset.xml b/reference/mongodb/bson/packedarray/offsetset.xml
deleted file mode 100644
index edf95ca9dce2..000000000000
--- a/reference/mongodb/bson/packedarray/offsetset.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::offsetSet</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\PackedArray">
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\PackedArray::offsetSet</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Sets the value at the specified <parameter>key</parameter> to <parameter>value</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index being set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <simpara>
-       The new value for the <parameter>key</parameter>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Always throws a <classname>MongoDB\Driver\Exception\LogicException</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/mongodb/bson/packedarray/offsetunset.xml b/reference/mongodb/bson/packedarray/offsetunset.xml
deleted file mode 100644
index 6ecaead40668..000000000000
--- a/reference/mongodb/bson/packedarray/offsetunset.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.offsetunset" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::offsetUnset</refname>
-  <refpurpose>Implementation of <type>ArrayAccess</type></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="MongoDB\BSON\PackedArray">
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\PackedArray::offsetUnset</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unsets the value at the specified index.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <simpara>
-       The index being unset.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Always throws a <classname>MongoDB\Driver\Exception\LogicException</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/mongodb/bson/packedarray/tocanonicalextendedjson.xml b/reference/mongodb/bson/packedarray/tocanonicalextendedjson.xml
deleted file mode 100644
index 59d5d8c6c9ca..000000000000
--- a/reference/mongodb/bson/packedarray/tocanonicalextendedjson.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.tocanonicalextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::toCanonicalExtendedJSON</refname>
-  <refpurpose>Returns the Canonical Extended JSON representation of the BSON array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\PackedArray::toCanonicalExtendedJSON</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Converts the BSON array to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">Canonical Extended JSON</link>
-   representation. The canonical format prefers type fidelity at the expense of
-   concise output and is most suited for producing output that can be converted
-   back to BSON without any loss of type information (e.g. numeric types will
-   remain differentiated).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the
-   <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">Canonical Extended JSON</link>
-   representation of the BSON array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB\BSON\PackedArray::toCanonicalExtendedJSON</methodname> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-
-$array = [
-    'foo',
-    123,
-    4294967295,
-    new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1'),
-];
-
-$packedArray = MongoDB\BSON\PackedArray::fromPHP($array);
-echo $packedArray->toCanonicalExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-    <![CDATA[
-[ "foo", { "$numberInt" : "123" }, { "$numberLong" : "4294967295" }, { "$oid" : "56315a7c6118fd1b920270b1" } ]
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\PackedArray::toRelaxedExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/packedarray/tophp.xml b/reference/mongodb/bson/packedarray/tophp.xml
deleted file mode 100644
index 45304188f1bd..000000000000
--- a/reference/mongodb/bson/packedarray/tophp.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.tophp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::toPHP</refname>
-  <refpurpose>Returns the PHP representation of the BSON array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>object</type></type><methodname>MongoDB\BSON\PackedArray::toPHP</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>typeMap</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.typeMap;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The decoded PHP value.
-  </simpara>
-  <note>
-   <simpara>
-    When encountering a value encoded as 64-bit integer in the BSON array,
-    the return value of this method will be a
-    <classname>MongoDB\BSON\Int64</classname> instance.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-    a class in the type map cannot be instantiated or does not implement
-    <interfacename>MongoDB\BSON\Unserializable</interfacename>.
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\toPHP</function></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/packedarray/torelaxedextendedjson.xml b/reference/mongodb/bson/packedarray/torelaxedextendedjson.xml
deleted file mode 100644
index c59f74b06b9b..000000000000
--- a/reference/mongodb/bson/packedarray/torelaxedextendedjson.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mongodb-bson-packedarray.torelaxedextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::toRelaxedExtendedJSON</refname>
-  <refpurpose>Returns the Relaxed Extended JSON representation of the BSON array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\PackedArray::toRelaxedExtendedJSON</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Converts the BSON array to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#relaxed-extended-json-example">Relaxed Extended JSON</link>
-   representation. The relaxed format prefers use of JSON type primitives at the
-   expense of type fidelity and is most suited for producing output that can be
-   easily consumed by web APIs and humans.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the
-   <link xlink:href="&url.mongodb.specs.extendedjson;#relaxed-extended-json-example">Relaxed Extended JSON</link>
-   representation of the BSON array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>MongoDB\BSON\PackedArray::toRelaxedExtendedJSON</methodname> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-
-$array = [
-    'foo',
-    123,
-    4294967295,
-    new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1'),
-];
-
-$packedArray = MongoDB\BSON\PackedArray::fromPHP($array);
-echo $packedArray->toRelaxedExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-    <![CDATA[
-[ "foo", 123, 4294967295, { "$oid" : "56315a7c6118fd1b920270b1" } ]
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\PackedArray::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\PackedArray::toCanonicalExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/packedarray/tostring.xml b/reference/mongodb/bson/packedarray/tostring.xml
deleted file mode 100644
index f0ae7dddec6f..000000000000
--- a/reference/mongodb/bson/packedarray/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-packedarray.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\PackedArray::__toString</refname>
-  <refpurpose>Returns the string representation of this BSON array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\PackedArray::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this array as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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-packedarray:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/bson/persistable.xml b/reference/mongodb/bson/persistable.xml
deleted file mode 100644
index 38a65446953e..000000000000
--- a/reference/mongodb/bson/persistable.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-persistable" role="class" 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\BSON\Persistable interface</title>
- <titleabbrev>MongoDB\BSON\Persistable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Persistable intro -->
-  <section xml:id="mongodb-bson-persistable.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes may implement this interface to take advantage of automatic ODM
-    (object document mapping) behavior in the extension. During serialization,
-    the extension will inject a <property>__pclass</property> property
-    containing the PHP class name into the data returned by
-    <function>MongoDB\BSON\Serializable::bsonSerialize</function>. During
-    unserialization, the same <property>__pclass</property> property will then
-    be used to infer the PHP class (independent of any
-    <link linkend="mongodb.persistence.typemaps">type map</link> configuration)
-    to be constructed before
-    <function>MongoDB\BSON\Unserializable::bsonUnserialize</function> is
-    invoked. See <xref linkend="mongodb.persistence"/> for additional
-    information.
-   </simpara>
-   <note>
-    <simpara>
-     Even if <function>MongoDB\BSON\Serializable::bsonSerialize</function> would
-     return a sequential array, injection of the <property>__pclass</property>
-     property will cause the object to be serialized as a BSON document.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-persistable.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Persistable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\Persistable</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Unserializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-persistable')/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.mongodb-bson-serializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-unserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.persistable;
-
-</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/mongodb/bson/persistable/bsonserialize.xml b/reference/mongodb/bson/persistable/bsonserialize.xml
deleted file mode 100644
index 1990b5c92473..000000000000
--- a/reference/mongodb/bson/persistable/bsonserialize.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-persistable.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Persistable::bsonSerialize</refname>
-  <refpurpose>Provides an array or document to serialize as BSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>stdClass</type><type>MongoDB\BSON\Document</type></type><methodname>MongoDB\BSON\Persistable::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Called during serialization of the object to BSON. The method must return an
-   <type>array</type>, <classname>stdClass</classname>, or
-   <classname>MongoDB\BSON\Document</classname>.
-  </simpara>
-  <simpara>
-   The return value will always be serialized as a BSON document. The serialized
-   document will include a field containing the class name of the object. For
-   this reason, it is not possible to return a
-   <classname>MongoDB\BSON\PackedArray</classname> instance in this method.
-  </simpara>
-  <simpara>
-   Users are encouraged to include an <property>_id</property> property (e.g. a
-   <classname>MongoDB\BSON\ObjectId</classname> initialized in the constructor)
-   when returning data for a BSON root document. In the absence of an
-   <property>_id</property> property, the extension or server will generate a
-   <classname>MongoDB\BSON\ObjectId</classname> for insert or upsert
-   operations, respectively.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type>, <classname>stdClass</classname>, or <classname>MongoDB\BSON\Document</classname>
-   to be serialized as a BSON document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.tentative-return-types-enforced;
-     <row>
-      <entry>PECL mongodb 1.17.0</entry>
-      <entry>
-       <simpara>
-        This method may now also return <classname>MongoDB\BSON\Document</classname>
-        instances in addition to <type>array</type> and <classname>stdClass</classname>.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\Serializable::bsonSerialize</function></member>
-   <member><function>MongoDB\BSON\Unserializable::bsonUnserialize</function></member>
-   <member><interfacename>MongoDB\BSON\Persistable</interfacename></member>
-   <member><xref linkend="mongodb.persistence"/></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/bson/regex.xml b/reference/mongodb/bson/regex.xml
deleted file mode 100644
index aba85a913103..000000000000
--- a/reference/mongodb/bson/regex.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-regex" role="class" 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\BSON\Regex class</title>
- <titleabbrev>MongoDB\BSON\Regex</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Regex intro -->
-  <section xml:id="mongodb-bson-regex.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for a regular expression pattern and optional
-    <link xlink:href="&url.mongodb.docs.regex;#op._S_options">flags</link>.
-   </simpara>
-   <note>
-    <simpara>
-     This BSON type is mainly used when querying the database. Alternatively,
-     the
-     <link xlink:href="&url.mongodb.docs;reference/operator/query/regex">$regex</link>
-     query operator may be used.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-regex.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Regex</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Regex</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\RegexInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-regex')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\RegexInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.regex;
-
-</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/mongodb/bson/regex/construct.xml b/reference/mongodb/bson/regex/construct.xml
deleted file mode 100644
index b22c5ce9b32d..000000000000
--- a/reference/mongodb/bson/regex/construct.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regex.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Regex::__construct</refname>
-  <refpurpose>Construct a new Regex</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Regex::__construct</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>flags</parameter><initializer>""</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pattern</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      The regular expression pattern.
-     </simpara>
-     <note>
-      <simpara>
-       The pattern should not be wrapped with delimiter characters.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      The <link xlink:href="&url.mongodb.docs.regex;#op._S_options">regular
-      expression flags</link>. Characters in this argument will be sorted
-      alphabetically.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>pattern</parameter> or <parameter>flags</parameter> contain null bytes.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>flags</parameter> argument is optional and defaults to
-        an empty string.
-       </simpara>
-       <simpara>
-        Characters in the <parameter>flags</parameter> argument will be sorted
-        alphabetically when a Regex is constructed. Previously, the characters
-        were stored in the order provided.
-       </simpara>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-        is thrown if <parameter>pattern</parameter> or
-        <parameter>flags</parameter> contain null bytes. Previously, values
-        would be truncated at the first null byte.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Regex::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$regex = new MongoDB\BSON\Regex('^foo', 'i');
-var_dump($regex);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Regex)#1 (2) {
-  ["pattern"]=>
-  string(4) "^foo"
-  ["flags"]=>
-  string(1) "i"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</link></member>
-   <member><link xlink:href="&url.mongodb.docs.regex;#op._S_options">Supported regular expression flags</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/bson/regex/getflags.xml b/reference/mongodb/bson/regex/getflags.xml
deleted file mode 100644
index a1c375c3868c..000000000000
--- a/reference/mongodb/bson/regex/getflags.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regex.getflags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Regex::getFlags</refname>
-  <refpurpose>Returns the Regex&apos;s flags</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Regex::getFlags</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Regex&apos;s flags.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Regex::getFlags</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$regex = new MongoDB\BSON\Regex('regex', 'i');
-var_dump($regex->getFlags());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(1) "i"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</link></member>
-   <member><link xlink:href="&url.mongodb.docs.regex;#op._S_options">Supported regular expression flags</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/bson/regex/getpattern.xml b/reference/mongodb/bson/regex/getpattern.xml
deleted file mode 100644
index 5b7457fa9c01..000000000000
--- a/reference/mongodb/bson/regex/getpattern.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regex.getpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Regex::getPattern</refname>
-  <refpurpose>Returns the Regex&apos;s pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Regex::getPattern</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Regex&apos;s pattern.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Regex::getPattern</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$regex = new MongoDB\BSON\Regex('regex', 'i');
-var_dump($regex->getPattern());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "regex"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/regex/jsonserialize.xml b/reference/mongodb/bson/regex/jsonserialize.xml
deleted file mode 100644
index 5ad23a0a6868..000000000000
--- a/reference/mongodb/bson/regex/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regex.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Regex::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Regex::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Regex</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/regex/tostring.xml b/reference/mongodb/bson/regex/tostring.xml
deleted file mode 100644
index 951f5db64c25..000000000000
--- a/reference/mongodb/bson/regex/tostring.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regex.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Regex::__toString</refname>
-  <refpurpose>Returns the string representation of this Regex</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Regex::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Regex.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Regex::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$regex = new MongoDB\BSON\Regex('regex', 'i');
-var_dump((string) $regex);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(8) "/regex/i"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/regexinterface.xml b/reference/mongodb/bson/regexinterface.xml
deleted file mode 100644
index e1764c5360f1..000000000000
--- a/reference/mongodb/bson/regexinterface.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-regexinterface" role="class" 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\BSON\RegexInterface interface</title>
- <titleabbrev>MongoDB\BSON\RegexInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-regexinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by <classname>MongoDB\BSON\Regex</classname>
-    to be used as a parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-regexinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\RegexInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\RegexInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-regexinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.regexinterface;
-
-</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/mongodb/bson/regexinterface/getflags.xml b/reference/mongodb/bson/regexinterface/getflags.xml
deleted file mode 100644
index 9dc14aaa4c44..000000000000
--- a/reference/mongodb/bson/regexinterface/getflags.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regexinterface.getflags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\RegexInterface::getFlags</refname>
-  <refpurpose>Returns the RegexInterface&apos;s flags</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\RegexInterface::getFlags</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the RegexInterface&apos;s flags.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Regex::getFlags</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/mongodb/bson/regexinterface/getpattern.xml b/reference/mongodb/bson/regexinterface/getpattern.xml
deleted file mode 100644
index c4a027f50e9a..000000000000
--- a/reference/mongodb/bson/regexinterface/getpattern.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regexinterface.getpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\RegexInterface::getPattern</refname>
-  <refpurpose>Returns the RegexInterface&apos;s pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\RegexInterface::getPattern</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the RegexInterface&apos;s pattern.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Regex::getPattern</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/mongodb/bson/regexinterface/tostring.xml b/reference/mongodb/bson/regexinterface/tostring.xml
deleted file mode 100644
index dced9001cf33..000000000000
--- a/reference/mongodb/bson/regexinterface/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-regexinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\RegexInterface::__toString</refname>
-  <refpurpose>Returns the string representation of this RegexInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\RegexInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this RegexInterface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Regex::__toString</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/mongodb/bson/serializable.xml b/reference/mongodb/bson/serializable.xml
deleted file mode 100644
index c422b91541d9..000000000000
--- a/reference/mongodb/bson/serializable.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-serializable" role="class" 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\BSON\Serializable interface</title>
- <titleabbrev>MongoDB\BSON\Serializable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Serializable intro -->
-  <section xml:id="mongodb-bson-serializable.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes that implement this interface may return data to be serialized as a
-    BSON array or document in lieu of the object&apos;s public properties.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-serializable.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Serializable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\Serializable</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-serializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.serializable;
-
-</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/mongodb/bson/serializable/bsonserialize.xml b/reference/mongodb/bson/serializable/bsonserialize.xml
deleted file mode 100644
index bdf8e55d5089..000000000000
--- a/reference/mongodb/bson/serializable/bsonserialize.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-serializable.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Serializable::bsonSerialize</refname>
-  <refpurpose>Provides an array or document to serialize as BSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>stdClass</type><type>MongoDB\BSON\Document</type><type>MongoDB\BSON\PackedArray</type></type><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Called during serialization of the object to BSON. The method must return an
-   <type>array</type>, <classname>stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
-   or <classname>MongoDB\BSON\PackedArray</classname>.
-  </simpara>
-  <simpara>
-   Root documents (e.g. a
-   <interfacename>MongoDB\BSON\Serializable</interfacename> passed to
-   <methodname>MongoDB\BSON\Document::fromPHP</methodname>) will always be
-   serialized as a BSON document. For field values, associative arrays and
-   <classname>stdClass</classname> instances will be serialized as a BSON
-   document and sequential arrays (i.e. sequential, numeric indexes starting at
-   <literal>0</literal>) will be serialized as a BSON array.
-  </simpara>
-  <simpara>
-   Users are encouraged to include an <property>_id</property> property (e.g. a
-   <classname>MongoDB\BSON\ObjectId</classname> initialized in the constructor)
-   when returning data for a BSON root document. In the absence of an
-   <property>_id</property> property, the extension or server will generate a
-   <classname>MongoDB\BSON\ObjectId</classname> for insert or upsert
-   operations, respectively.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type>, <classname>stdClass</classname>, <classname>MongoDB\BSON\Document</classname>,
-   or <classname>MongoDB\BSON\PackedArray</classname> to be serialized as a BSON
-   array or document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.tentative-return-types-enforced;
-     <row>
-      <entry>PECL mongodb 1.17.0</entry>
-      <entry>
-       <simpara>
-        The return type was changed from <type class="union"><type>array</type><type>object</type></type>.
-        Instead of <type>object</type>, the return type now specifies <classname>stdClass</classname>.
-        Classes that implement this interface must be changed to no longer
-        declare an <type>object</type> return type. As the return type is
-        tentative, a deprecation warning is emitted on PHP 8.1 and newer.
-       </simpara>
-       <simpara>
-        In addition to the changes above, the extension now also supports
-        returning instances of <classname>MongoDB\BSON\Document</classname>
-        and <classname>MongoDB\BSON\PackedArray</classname>. Please note that
-        any <classname>MongoDB\BSON\PackedArray</classname> instances returned
-        are silently converted to objects when stored as root documents. They
-        are stored as arrays when used as an embedded field value.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Serializable::bsonSerialize</function> returning an associative array for root document</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyDocument implements MongoDB\BSON\Serializable
-{
-    private $id;
-
-    function __construct()
-    {
-        $this->id = new MongoDB\BSON\ObjectId;
-    }
-
-    function bsonSerialize(): array
-    {
-        return ['_id' => $this->id, 'foo' => 'bar'];
-    }
-}
-
-echo MongoDB\BSON\Document::fromPHP(new MyDocument)->toRelaxedExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-{ "_id" : { "$oid" : "56cccdcada14d8755a58c591" }, "foo" : "bar" }
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB\BSON\Serializable::bsonSerialize</function> returning a sequential array for root document</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyArray implements MongoDB\BSON\Serializable
-{
-    function bsonSerialize(): array
-    {
-        return [1, 2, 3];
-    }
-}
-
-echo MongoDB\BSON\Document::fromPHP(new MyArray)->toRelaxedExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "0" : 1, "1" : 2, "2" : 3 }
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB\BSON\Serializable::bsonSerialize</function> returning an associative array for document field</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyDocument implements MongoDB\BSON\Serializable
-{
-    function bsonSerialize(): array
-    {
-        return ['foo' => 'bar'];
-    }
-}
-
-$value = ['document' => new MyDocument];
-
-echo MongoDB\BSON\Document::fromPHP($value)->toRelaxedExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "document" : { "foo" : "bar" } }
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB\BSON\Serializable::bsonSerialize</function> returning a sequential array for document field</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyArray implements MongoDB\BSON\Serializable
-{
-    function bsonSerialize(): array
-    {
-        return [1, 2, 3];
-    }
-}
-
-$value = ['array' => new MyArray];
-
-echo MongoDB\BSON\Document::fromPHP($value)->toRelaxedExtendedJSON(), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "array" : [ 1, 2, 3 ] }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\Unserializable::bsonUnserialize</function></member>
-   <member><interfacename>MongoDB\BSON\Persistable</interfacename></member>
-   <member><xref linkend="mongodb.persistence"/></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/bson/symbol.xml b/reference/mongodb/bson/symbol.xml
deleted file mode 100644
index 0040c943b191..000000000000
--- a/reference/mongodb/bson/symbol.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-symbol" role="class" 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\BSON\Symbol class</title>
- <titleabbrev>MongoDB\BSON\Symbol</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Symbol intro -->
-  <section xml:id="mongodb-bson-symbol.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for the "Symbol" type. This BSON type is deprecated, and this
-    class can not be instantiated. It will be created from a BSON symbol
-    type while converting BSON to PHP, and can also be converted back into
-    BSON while storing documents in the database.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-symbol.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Symbol</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Symbol</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-symbol')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.symbol;
-
-</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/mongodb/bson/symbol/construct.xml b/reference/mongodb/bson/symbol/construct.xml
deleted file mode 100644
index 377c971ddceb..000000000000
--- a/reference/mongodb/bson/symbol/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-symbol.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Symbol::__construct</refname>
-  <refpurpose>Construct a new Symbol (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\Symbol::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\Symbol</classname> objects are created through
-   conversion from a deprecated BSON type and cannot be constructed directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/symbol/jsonserialize.xml b/reference/mongodb/bson/symbol/jsonserialize.xml
deleted file mode 100644
index 531156ff7655..000000000000
--- a/reference/mongodb/bson/symbol/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-symbol.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Symbol::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Symbol::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Symbol</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/symbol/tostring.xml b/reference/mongodb/bson/symbol/tostring.xml
deleted file mode 100644
index 1599ec296c0b..000000000000
--- a/reference/mongodb/bson/symbol/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-symbol.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Symbol::__toString</refname>
-  <refpurpose>Returns the Symbol as a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Symbol::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Symbol.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/timestamp.xml b/reference/mongodb/bson/timestamp.xml
deleted file mode 100644
index 3169aa1c3644..000000000000
--- a/reference/mongodb/bson/timestamp.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-timestamp" role="class" 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\BSON\Timestamp class</title>
- <titleabbrev>MongoDB\BSON\Timestamp</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Timestamp intro -->
-  <section xml:id="mongodb-bson-timestamp.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a
-    <link xlink:href="&url.mongodb.docs.bson;#timestamps">BSON timestamp</link>,
-    The value consists of a 4-byte timestamp (i.e. seconds since the epoch) and
-    a 4-byte increment.
-   </simpara>
-   <note>
-    <simpara>
-     This is an internal MongoDB type used for replication and sharding. It is
-     not intended for general date storage
-     (<classname>MongoDB\BSON\UTCDateTime</classname> should be used instead).
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-timestamp.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Timestamp</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Timestamp</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\TimestampInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-timestamp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\TimestampInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.timestamp;
-
-</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/mongodb/bson/timestamp/construct.xml b/reference/mongodb/bson/timestamp/construct.xml
deleted file mode 100644
index 4955b2c2abf3..000000000000
--- a/reference/mongodb/bson/timestamp/construct.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestamp.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Timestamp::__construct</refname>
-  <refpurpose>Construct a new Timestamp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\Timestamp::__construct</methodname>
-   <methodparam><type>int</type><parameter>increment</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timestamp</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>increment</parameter> (<type>int</type>)</term>
-    <listitem>
-     <simpara>
-      32-bit integer denoting the incrementing ordinal for operations within a
-      given second.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timestamp</parameter> (<type>int</type>)</term>
-    <listitem>
-     <simpara>
-      32-bit integer denoting seconds since the Unix epoch.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Timestamp::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$timestamp = new MongoDB\BSON\Timestamp(1234, 5678);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Timestamp)#1 (2) {
-  ["increment"]=>
-  int(1234)
-  ["timestamp"]=>
-  int(5678)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#timestamps">BSON Types: Timestamps</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/bson/timestamp/getincrement.xml b/reference/mongodb/bson/timestamp/getincrement.xml
deleted file mode 100644
index 9a9c1a9b2225..000000000000
--- a/reference/mongodb/bson/timestamp/getincrement.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestamp.getincrement" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Timestamp::getIncrement</refname>
-  <refpurpose>Returns the increment component of this Timestamp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\Timestamp::getIncrement</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The increment component of a Timestamp is its least significant 32 bits,
-   which denotes the incrementing ordinal for operations within a given second.
-   This value is read as an unsigned 32-bit integer with big-endian byte order.
-  </simpara>
-  &mongodb.note.uint32;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the increment component of this Timestamp.
-  </simpara>
-  <warning>
-   <simpara>
-    On 32-bit systems this method may return a negative number. Although the
-    increment and timestamp parts of the BSON timestamp type consists of two
-    unsigned 32-bit values, PHP can not represent these on 32-bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#timestamps">BSON Types: Timestamps</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/bson/timestamp/gettimestamp.xml b/reference/mongodb/bson/timestamp/gettimestamp.xml
deleted file mode 100644
index 52051dc607b1..000000000000
--- a/reference/mongodb/bson/timestamp/gettimestamp.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestamp.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Timestamp::getTimestamp</refname>
-  <refpurpose>Returns the timestamp component of this Timestamp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\Timestamp::getTimestamp</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The timestamp component of a Timestamp is its most significant 32 bits, which
-   denotes the number of seconds since the Unix epoch. This value is read as an
-   unsigned 32-bit integer with big-endian byte order.
-  </simpara>
-  &mongodb.note.uint32;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timestamp component of this Timestamp.
-  </simpara>
-  <warning>
-   <simpara>
-    On 32-bit systems this method may return a negative number. Although the
-    increment and timestamp parts of the BSON timestamp type consists of two
-    unsigned 32-bit values, PHP can not represent these on 32-bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#timestamps">BSON Types: Timestamps</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/bson/timestamp/jsonserialize.xml b/reference/mongodb/bson/timestamp/jsonserialize.xml
deleted file mode 100644
index 536f01d4295e..000000000000
--- a/reference/mongodb/bson/timestamp/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestamp.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Timestamp::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Timestamp::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Timestamp</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/timestamp/tostring.xml b/reference/mongodb/bson/timestamp/tostring.xml
deleted file mode 100644
index f0109ac51a5a..000000000000
--- a/reference/mongodb/bson/timestamp/tostring.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestamp.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Timestamp::__toString</refname>
-  <refpurpose>Returns the string representation of this Timestamp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Timestamp::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this Timestamp.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Timestamp::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$timestamp = new MongoDB\BSON\Timestamp(1234, 5678);
-var_dump((string) $timestamp);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "[1234:5678]"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#timestamps">BSON Types: Timestamps</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/bson/timestampinterface.xml b/reference/mongodb/bson/timestampinterface.xml
deleted file mode 100644
index f2b6967ab91f..000000000000
--- a/reference/mongodb/bson/timestampinterface.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-timestampinterface" role="class" 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\BSON\TimestampInterface interface</title>
- <titleabbrev>MongoDB\BSON\TimestampInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-timestampinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\BSON\Timestamp</classname> to be used as a
-    parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-timestampinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\TimestampInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\TimestampInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-timestampinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.timestampinterface;
-
-</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/mongodb/bson/timestampinterface/getincrement.xml b/reference/mongodb/bson/timestampinterface/getincrement.xml
deleted file mode 100644
index d34ba20c6996..000000000000
--- a/reference/mongodb/bson/timestampinterface/getincrement.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestampinterface.getincrement" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\TimestampInterface::getIncrement</refname>
-  <refpurpose>Returns the increment component of this TimestampInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\TimestampInterface::getIncrement</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the increment component of this TimestampInterface.
-  </simpara>
-  <warning>
-   <simpara>
-    On 32-bit systems this method may return a negative number. Although the
-    increment and timestamp parts of the BSON timestamp type consists of two
-    unsigned 32-bit values, PHP can not represent these on 32-bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Timestamp::getIncrement</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/mongodb/bson/timestampinterface/gettimestamp.xml b/reference/mongodb/bson/timestampinterface/gettimestamp.xml
deleted file mode 100644
index e5c05ccbd782..000000000000
--- a/reference/mongodb/bson/timestampinterface/gettimestamp.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestampinterface.gettimestamp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\TimestampInterface::getTimestamp</refname>
-  <refpurpose>Returns the timestamp component of this TimestampInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\BSON\TimestampInterface::getTimestamp</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timestamp component of this TimestampInterface.
-  </simpara>
-  <warning>
-   <simpara>
-    On 32-bit systems this method may return a negative number. Although the
-    increment and timestamp parts of the BSON timestamp type consists of two
-    unsigned 32-bit values, PHP can not represent these on 32-bit platforms.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Timestamp::getTimestamp</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/mongodb/bson/timestampinterface/tostring.xml b/reference/mongodb/bson/timestampinterface/tostring.xml
deleted file mode 100644
index 9c60d392be1e..000000000000
--- a/reference/mongodb/bson/timestampinterface/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-timestampinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\TimestampInterface::__toString</refname>
-  <refpurpose>Returns the string representation of this TimestampInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\TimestampInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this TimestampInterface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Timestamp::__toString</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/mongodb/bson/type.xml b/reference/mongodb/bson/type.xml
deleted file mode 100644
index a0962ac8c0d6..000000000000
--- a/reference/mongodb/bson/type.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-type" role="class" 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\BSON\Type interface</title>
- <titleabbrev>MongoDB\BSON\Type</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Type intro -->
-  <section xml:id="mongodb-bson-type.intro">
-   &reftitle.intro;
-   <simpara>
-    Abstract base interface that should not be implemented directly.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-type.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Type</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\Type</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-   <simpara>
-    This interface has no methods. Its only purpose is to be the base interface
-    for all BSON type classes.
-   </simpara>
-
-  </section>
-
- </partintro>
-
-</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/mongodb/bson/undefined.xml b/reference/mongodb/bson/undefined.xml
deleted file mode 100644
index 992676c79b58..000000000000
--- a/reference/mongodb/bson/undefined.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-undefined" role="class" 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\BSON\Undefined class</title>
- <titleabbrev>MongoDB\BSON\Undefined</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Undefined intro -->
-  <section xml:id="mongodb-bson-undefined.intro">
-   &reftitle.intro;
-   <simpara>
-    BSON type for the "Undefined" type. This BSON type is deprecated, and this
-    class can not be instantiated. It will be created from a BSON undefined
-    type while converting BSON to PHP, and can also be converted back into
-    BSON while storing documents in the database.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-undefined.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Undefined</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\Undefined</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-undefined')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.undefined;
-
-</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/mongodb/bson/undefined/construct.xml b/reference/mongodb/bson/undefined/construct.xml
deleted file mode 100644
index 925ed8ec2141..000000000000
--- a/reference/mongodb/bson/undefined/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-undefined.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Undefined::__construct</refname>
-  <refpurpose>Construct a new Undefined (unused)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\BSON\Undefined::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\BSON\Undefined</classname> objects are created through
-   conversion from a deprecated BSON type and cannot be constructed directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/undefined/jsonserialize.xml b/reference/mongodb/bson/undefined/jsonserialize.xml
deleted file mode 100644
index 1e1fbac25743..000000000000
--- a/reference/mongodb/bson/undefined/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-undefined.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Undefined::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\Undefined::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\Undefined</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/undefined/tostring.xml b/reference/mongodb/bson/undefined/tostring.xml
deleted file mode 100644
index 0fd0d71818ec..000000000000
--- a/reference/mongodb/bson/undefined/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-undefined.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Undefined::__toString</refname>
-  <refpurpose>Returns an empty string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\Undefined::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an empty string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;">BSON Types</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/bson/unserializable.xml b/reference/mongodb/bson/unserializable.xml
deleted file mode 100644
index ea084db32df0..000000000000
--- a/reference/mongodb/bson/unserializable.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-unserializable" role="class" 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\BSON\Unserializable interface</title>
- <titleabbrev>MongoDB\BSON\Unserializable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\Unserializable intro -->
-  <section xml:id="mongodb-bson-unserializable.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes that implement this interface may be specified in a
-    <link linkend="mongodb.persistence.typemaps">type map</link> for
-    unserializing BSON arrays and documents (both root and embedded).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-unserializable.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\Unserializable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\Unserializable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-unserializable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.unserializable;
-
-</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/mongodb/bson/unserializable/bsonunserialize.xml b/reference/mongodb/bson/unserializable/bsonunserialize.xml
deleted file mode 100644
index f2fafa69aa4c..000000000000
--- a/reference/mongodb/bson/unserializable/bsonunserialize.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-unserializable.bsonunserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\Unserializable::bsonUnserialize</refname>
-  <refpurpose>Constructs the object from a BSON array or document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\BSON\Unserializable::bsonUnserialize</methodname>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Called during unserialization of the object from BSON. The properties of the
-   BSON array or document will be passed to the method as an <type>array</type>.
-  </simpara>
-  <simpara>
-   Remember to check for an <property>_id</property> property when handling data
-   from a BSON document.
-  </simpara>
-  <note>
-   <simpara>
-    This method acts as the
-    <link linkend="language.oop5.decon.constructor">constructor</link> of the
-    object. The <link linkend="object.construct">__construct()</link> method
-    will <emphasis>not</emphasis> be called after this method.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter> (<type>array</type>)</term>
-    <listitem>
-     <simpara>
-      Properties within the BSON array or document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The return value from this method is ignored.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.tentative-return-types-enforced;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\Unserializable::bsonUnserialize</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-class MyDocument implements MongoDB\BSON\Unserializable
-{
-    private $data = [];
-
-    function bsonUnserialize(array $data): void
-    {
-        $this->data = $data;
-    }
-}
-
-$bson = MongoDB\BSON\Document::fromJSON('{ "foo": "bar" }');
-
-var_dump($bson->toPHP(['root' => 'MyDocument']));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MyDocument)#1 (1) {
-  ["data":"MyDocument":private]=>
-  array(1) {
-    ["foo"]=>
-    string(3) "bar"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\Serializable::bsonSerialize</function></member>
-   <member><interfacename>MongoDB\BSON\Persistable</interfacename></member>
-   <member><xref linkend="mongodb.persistence"/></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/bson/utcdatetime.xml b/reference/mongodb/bson/utcdatetime.xml
deleted file mode 100644
index 13875ed36d0f..000000000000
--- a/reference/mongodb/bson/utcdatetime.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-utcdatetime" role="class" 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\BSON\UTCDateTime class</title>
- <titleabbrev>MongoDB\BSON\UTCDateTime</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\BSON\UTCDatetime intro -->
-  <section xml:id="mongodb-bson-utcdatetime.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a
-    <link xlink:href="&url.mongodb.docs.bson;#date">BSON date</link>. The value
-    is a 64-bit integer that represents the number of milliseconds since the
-    Unix epoch (Jan 1, 1970). Negative values represent dates before 1970.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-bson-utcdatetime.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\UTCDateTime</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\BSON\UTCDateTime</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\UTCDateTimeInterface</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Type</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>JsonSerializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-utcdatetime')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.serializable-interface-removed;
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.3.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\UTCDateTimeInterface</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename> and
-        <interfacename>JsonSerializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.bson.entities.utcdatetime;
-
-</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/mongodb/bson/utcdatetime/construct.xml b/reference/mongodb/bson/utcdatetime/construct.xml
deleted file mode 100644
index 5c4473ce2d12..000000000000
--- a/reference/mongodb/bson/utcdatetime/construct.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetime.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTime::__construct</refname>
-  <refpurpose>Construct a new UTCDateTime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\BSON\UTCDateTime::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type>DateTimeInterface</type><type>null</type></type><parameter>milliseconds</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>milliseconds</parameter> (<type class="union"><type>int</type><type>MongoDB\BSON\Int64</type><type>DateTimeInterface</type><type>null</type></type>)</term>
-    <listitem>
-     <simpara>
-      Number of milliseconds since the Unix epoch (Jan 1, 1970). Negative values
-      represent dates before 1970. This value may be provided as a 64-bit
-      <type>int</type>. For compatibility on 32-bit systems, this parameter
-      may also be provided as a <classname>MongoDB\BSON\Int64</classname>.
-     </simpara>
-     <simpara>
-      If the argument is a <classname>DateTimeInterface</classname>, the number
-      of milliseconds since the Unix epoch will be derived from that value.
-     </simpara>
-     <simpara>
-      If this argument is &null;, the current time will be used by default.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>milliseconds</parameter> no longer accepts a
-        <type>string</type> or <type>float</type> argument.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>milliseconds</parameter> argument now accepts a
-        <classname>MongoDB\BSON\Int64</classname> object (for compatibility on
-        32-bit platforms). Specifying a <type>string</type> or
-        <type>float</type> is deprecated.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>milliseconds</parameter> argument is optional and
-        defaults to &null; (i.e. current time). The argument also accepts a
-        <classname>DateTimeInterface</classname>, which may be used to derive
-        the number of milliseconds since the Unix epoch. Previously, only
-        <type>int</type>, <type>float</type>, and <type>string</type> types
-        were accepted.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\UTCDateTime::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(new MongoDB\BSON\UTCDateTime);
-
-var_dump(new MongoDB\BSON\UTCDateTime(new DateTime));
-
-var_dump(new MongoDB\BSON\UTCDateTime(1416445411987));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\UTCDateTime)#1 (1) {
-  ["milliseconds"]=>
-  string(13) "1484852905560"
-}
-object(MongoDB\BSON\UTCDateTime)#1 (1) {
-  ["milliseconds"]=>
-  string(13) "1484852905560"
-}
-object(MongoDB\BSON\UTCDateTime)#1 (1) {
-  ["milliseconds"]=>
-  string(13) "1416445411987"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#date">BSON Types: Date</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/bson/utcdatetime/jsonserialize.xml b/reference/mongodb/bson/utcdatetime/jsonserialize.xml
deleted file mode 100644
index 872a4bf4635d..000000000000
--- a/reference/mongodb/bson/utcdatetime/jsonserialize.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetime.jsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTime::jsonSerialize</refname>
-  <refpurpose>Returns a representation that can be converted to JSON</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\BSON\UTCDateTime::jsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data which can be serialized by <function>json_encode</function> to
-   produce an extended JSON representation of the
-   <classname>MongoDB\BSON\UTCDateTime</classname>.
-  </simpara>
-  &mongodb.note.extended-json;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>JsonSerializable::jsonSerialize</methodname></member>
-   <member><function>json_encode</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</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/bson/utcdatetime/todatetime.xml b/reference/mongodb/bson/utcdatetime/todatetime.xml
deleted file mode 100644
index 5327be347d7a..000000000000
--- a/reference/mongodb/bson/utcdatetime/todatetime.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetime.todatetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTime::toDateTime</refname>
-  <refpurpose>Returns the DateTime representation of this UTCDateTime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>DateTime</type><methodname>MongoDB\BSON\UTCDateTime::toDateTime</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>DateTime</classname> representation of this
-   UTCDateTime. The returned <classname>DateTime</classname> will use the UTC
-   time zone.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\UTCDatetime::toDateTime</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$utcdatetime = new MongoDB\BSON\UTCDateTime(1416445411987);
-$datetime = $utcdatetime->toDateTime();
-var_dump($datetime->format('r'));
-var_dump($datetime->format('U.u'));
-var_dump($datetime->getTimezone());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(31) "Thu, 20 Nov 2014 01:03:31 +0000"
-string(17) "1416445411.987000"
-object(DateTimeZone)#3 (2) {
-  ["timezone_type"]=>
-  int(1)
-  ["timezone"]=>
-  string(6) "+00:00"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;#date">BSON Types: Date</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/bson/utcdatetime/todatetimeimmutable.xml b/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml
deleted file mode 100644
index 493c4ab19f57..000000000000
--- a/reference/mongodb/bson/utcdatetime/todatetimeimmutable.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetime.todatetimeimmutable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</refname>
-  <refpurpose>Returns the DateTimeImmutable representation of this UTCDateTime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>DateTimeImmutable</classname> representation of this
-   UTCDateTime. The returned <classname>DateTimeImmutable</classname> will use the UTC
-   time zone.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\UTCDatetime::toDateTimeImmutable</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$utcdatetime = new MongoDB\BSON\UTCDateTime(1416445411987);
-$datetime = $utcdatetime->toDateTimeImmutable();
-var_dump($datetime->format('r'));
-var_dump($datetime->format('U.u'));
-var_dump($datetime->getTimezone());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(31) "Thu, 20 Nov 2014 01:03:31 +0000"
-string(17) "1416445411.987000"
-object(DateTimeZone)#3 (2) {
-  ["timezone_type"]=>
-  int(1)
-  ["timezone"]=>
-  string(6) "+00:00"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\UTCDateTime::toDateTime</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;#date">BSON Types: Date</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/bson/utcdatetime/tostring.xml b/reference/mongodb/bson/utcdatetime/tostring.xml
deleted file mode 100644
index 91ca268e1e1b..000000000000
--- a/reference/mongodb/bson/utcdatetime/tostring.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetime.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTime::__toString</refname>
-  <refpurpose>Returns the string representation of this UTCDateTime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\UTCDateTime::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this UTCDateTime.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\UTCDateTime::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$utcdatetime = new MongoDB\BSON\UTCDateTime(1416445411987);
-var_dump((string) $utcdatetime);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(13) "1416445411987"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.bson;#date">BSON Types: Date</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/bson/utcdatetimeinterface.xml b/reference/mongodb/bson/utcdatetimeinterface.xml
deleted file mode 100644
index f9ae03b65b7c..000000000000
--- a/reference/mongodb/bson/utcdatetimeinterface.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-bson-utcdatetimeinterface" role="class" 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\BSON\UTCDateTimeInterface interface</title>
- <titleabbrev>MongoDB\BSON\UTCDateTimeInterface</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-utcdatetimeinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\BSON\UTCDateTime</classname> to be used as a
-    parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-utcdatetimeinterface.synopsis">
-   &reftitle.classsynopsis;
-   <classsynopsis>
-    <ooclass><classname>MongoDB\BSON\UTCDateTimeInterface</classname></ooclass>
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\BSON\UTCDateTimeInterface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-bson-utcdatetimeinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.bson.entities.utcdatetimeinterface;
-
-</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/mongodb/bson/utcdatetimeinterface/todatetime.xml b/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml
deleted file mode 100644
index d1570087b873..000000000000
--- a/reference/mongodb/bson/utcdatetimeinterface/todatetime.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetimeinterface.todatetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTimeInterface::toDateTime</refname>
-  <refpurpose>Returns the DateTime representation of this UTCDateTimeInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>DateTime</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTime</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>DateTime</classname> representation of this
-   UTCDateTimeInterface. The returned <classname>DateTime</classname> should use
-   the UTC time zone.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\UTCDateTime::toDateTime</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/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml b/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml
deleted file mode 100644
index 6e0beec3ae95..000000000000
--- a/reference/mongodb/bson/utcdatetimeinterface/todatetimeimmutable.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetimeinterface.todatetimeimmutable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTimeInterface::toDateTimeImmutable</refname>
-  <refpurpose>Returns the DateTimeImmutable representation of this UTCDateTimeInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>DateTimeImmutable</type><methodname>MongoDB\BSON\UTCDateTimeInterface::toDateTimeImmutable</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>DateTimeImmutable</classname> representation of this
-   UTCDateTimeInterface. The returned <classname>DateTimeImmutable</classname> will use the UTC
-   time zone.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\UTCDateTime::toDateTimeImmutable</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/mongodb/bson/utcdatetimeinterface/tostring.xml b/reference/mongodb/bson/utcdatetimeinterface/tostring.xml
deleted file mode 100644
index f84fca9d87ac..000000000000
--- a/reference/mongodb/bson/utcdatetimeinterface/tostring.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-bson-utcdatetimeinterface.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\UTCDateTimeInterface::__toString</refname>
-  <refpurpose>Returns the string representation of this UTCDateTimeInterface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\BSON\UTCDateTimeInterface::__toString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string representation of this UTCDateTimeInterface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\UTCDateTime::__toString</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/mongodb/bson/vectortype.xml b/reference/mongodb/bson/vectortype.xml
deleted file mode 100644
index 90a0396be362..000000000000
--- a/reference/mongodb/bson/vectortype.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="enum.mongodb-bson-vectortype" role="enum" 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\BSON\VectorType enum</title>
- <titleabbrev>MongoDB\BSON\VectorType</titleabbrev>
-
- <partintro>
-  <section xml:id="mongodb-bson-vectortype.intro">
-   &reftitle.intro;
-   <simpara>
-    The <enumname>MongoDB\BSON\VectorType</enumname> enum is used to specify the type of
-    vector data stored in a <classname>MongoDB\BSON\Binary</classname> with
-    subtype <constant>MongoDB\BSON\Binary::TYPE_VECTOR</constant>.
-   </simpara>
-  </section>
-
-  <section xml:id="mongodb-bson-vectortype.synopsis">
-   &reftitle.enumsynopsis;
-
-   <enumsynopsis>
-    <enumname>MongoDB\BSON\VectorType</enumname>
-
-    <enumitem>
-     <enumidentifier>Float32</enumidentifier>
-     <enumitemdescription>
-      Each element in the vector is a 32-bit floating point value.
-     </enumitemdescription>
-    </enumitem>
-
-    <enumitem>
-     <enumidentifier>Int8</enumidentifier>
-     <enumitemdescription>
-      Each element in the vector is an 8-bit integer value.
-     </enumitemdescription>
-    </enumitem>
-
-    <enumitem>
-     <enumidentifier>PackedBit</enumidentifier>
-     <enumitemdescription>
-      Each element in the vector is a 1-bit value. When creating vectors of this
-      type, you may pass either <type>bool</type> or 1-bit <type>int</type> values, i.e. <literal>0</literal> or <literal>1</literal>.
-     </enumitemdescription>
-    </enumitem>
-   </enumsynopsis>
-  </section>
- </partintro>
-</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/mongodb/configure.xml b/reference/mongodb/configure.xml
deleted file mode 100644
index b43044fa6a59..000000000000
--- a/reference/mongodb/configure.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mongodb.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <section xml:id="mongodb.installation.pie">
-  <title>Installing the MongoDB PHP Extension with PIE</title>
-
-   &pecl.moving.to.pie;
-
-   <para>
-    To install the MongoDB extension using PIE, run the following command:
-    <programlisting role="shell">
-<![CDATA[
-pie install mongodb/mongodb-extension
-]]>
-    </programlisting>
-   </para>
-
- </section>
-
- <section xml:id="mongodb.installation.pecl">
-  <title>Installing the MongoDB PHP Extension with PECL</title>
-
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;mongodb">&url.pecl.package;mongodb</link>
-  </simpara>
-
-  <para>
-   Linux, Unix, and macOS users may run the following command to install the
-   extension:
-   <programlisting role="shell">
-<![CDATA[
-$ sudo pecl install mongodb
-]]>
-   </programlisting>
-  </para>
-
-  <simpara>
-   On systems with multiple version of PHP installed (e.g. macOS default,
-   Homebrew), each version of PHP
-   will have its own <link linkend="install.pecl">pecl</link>
-   command and &php.ini; file(s). Additionally, each PHP environments (e.g.
-   CLI, web) may use separate &php.ini; files.
-  </simpara>
-
-  <para>
-   As of extension version 1.17.0, PECL will prompt for various
-   <literal>configure</literal> options. To install the extension with default
-   options in a non-interactive script, empty string input may be piped to
-   <literal>pecl install</literal> using the <literal>yes</literal> command:
-   <programlisting role="shell">
-<![CDATA[
-$ yes '' | sudo pecl install mongodb
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   A complete list of supported <literal>configure</literal> options can be
-   found in the <literal>package.xml</literal> file included in the PECL
-   package. To install the extension with specific <literal>configure</literal>
-   options in a non-interactive script, the
-   <literal>--configureoptions</literal> option for
-   <literal>pecl install</literal> may be used:
-   <programlisting role="shell">
-<![CDATA[
-$ sudo pecl install --configureoptions='with-mongodb-system-libs="yes" enable-mongodb-developer-flags="no"' mongodb
-]]>
-   </programlisting>
-  </para>
-
-  <simpara>
-   By default, installing the extension via PECL will use bundled versions of
-   <link xlink:href="&url.mongodb.libbson;">libbson</link>,
-   <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link>, and
-   <link xlink:href="&url.mongodb.libmongocrypt;">libmongocrypt</link> and attempt to
-   automatically configure them.
-  </simpara>
-
-  <note>
-   <simpara>
-    If the build process fails to find an SSL library, check that the
-    development packages (e.g. <literal>libssl-dev</literal>) and
-    <link xlink:href="&url.mongodb.wiki.pkg-config;">pkg-config</link> are both
-    installed. If that does not resolve the problem, consider using the
-    <link linkend="mongodb.installation.manual">manual installation</link>
-    process.
-   </simpara>
-  </note>
-
-  <para>
-   Finally, add the following line to the &php.ini; file for each environment
-   that will need to use the extension:
-   <programlisting role="ini">
-<![CDATA[
-extension=mongodb.so
-]]>
-   </programlisting>
-  </para>
- </section>
-
- <section xml:id="mongodb.installation.homebrew">
-  <title>Installing the MongoDB PHP Extension on macOS with Homebrew</title>
-
-  <simpara>
-   <link xlink:href="&url.brew.1.5.0;">Homebrew 1.5.0</link>
-   deprecated the <link xlink:href="&url.mac.homebrew;">Homebrew/php tap</link>
-   and removed formulae for individual PHP extensions. Going forward, macOS
-   users are advised to install the
-   <link xlink:href="&url.brew.php;">php</link> formula
-   and follow the standard
-   <link linkend="mongodb.installation.pecl">PECL installation instructions</link>
-   using the <link linkend="install.pecl">pecl</link> command provided by the
-   Homebrew PHP installation.
-  </simpara>
-  <para>
-   Alternatively, the
-   <link xlink:href="https://github.com/shivammathur/homebrew-extensions">shivammathur/extensions tap</link>
-   provides formulae for individual PHP extensions. For example, to install the
-   extension for PHP 8.4, run:
-   <programlisting role="shell">
-<![CDATA[
-$ brew install shivammathur/extensions/mongodb@8.4
-]]>
-   </programlisting>
-   Please note that only the latest extension version is available in brew.
-  </para>
-  <note>
-   <title>Install required dependencies</title>
-   <simpara>
-    To ensure that SSL support can be configured correctly, make sure that the
-    <literal>openssl</literal> and <literal>pkgconf</literal> formulae are
-    installed. If either of these packages are missing, the extension will be
-    compiled with Secure Transport, which can lead to compatibility issues.
-   </simpara>
-  </note>
- </section>
-
- <section xml:id="mongodb.installation.windows">
-  <title>Installing the MongoDB PHP Extension on Windows</title>
-
-  <simpara>
-   Precompiled binaries are attached to the project's
-   <link xlink:href="&url.mongodb.github.new;/releases/">Github releases</link>.
-   Archives are published for various combinations of PHP version, thread safety
-   (TS or NTS), and architecture (x86 or x64). Determining the correct archive
-   for the PHP environment and extract the <filename>php_mongodb.dll</filename>
-   file to the extension directory ("ext" by default).
-  </simpara>
-
-  <para>
-   Add the following line to the &php.ini; file for each environment that will
-   need to use the extension:
-   <programlisting role="ini">
-<![CDATA[
-extension=php_mongodb.dll
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Failure to select the correct binary will result in an error when attempting
-   to load the extension DLL at runtime:
-   <programlisting role="txt">
-<![CDATA[
-PHP Warning:  PHP Startup: Unable to load dynamic library 'mongodb'
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Ensure that the downloaded DLL corresponds to the following PHP runtime
-   properties:
-   <simplelist>
-    <member>PHP version (<constant>PHP_VERSION</constant>)</member>
-    <member>Thread safety (<constant>PHP_ZTS</constant>)</member>
-    <member>Architecture (<constant>PHP_INT_SIZE</constant>)</member>
-   </simplelist>
-  </para>
-
-  <simpara>
-   In addition to the aforementioned constants, these properties can also be
-   inferred from <function>phpinfo</function>. If a system has multiple PHP
-   runtimes installed, double-check that the <function>phpinfo</function> output
-   is for the correct environment.
-  </simpara>
-
-  <note>
-   <title>Additional DLL dependencies for Windows Users</title>
-   <simpara>
-    &ext.windows.path.dll;
-    <filename>libsasl.dll</filename>
-   </simpara>
-  </note>
- </section>
-
- <section xml:id="mongodb.installation.manual">
-  <title>Building the MongoDB PHP Driver from source</title>
-
-  <para>
-   For developers and users interested in the latest bugfixes, the extension
-   may be compiled from the latest source code on
-   <link xlink:href="&url.mongodb.github.new;">Github</link>. Run the following
-   commands to clone and build the project:
-   <programlisting role="shell">
-<![CDATA[
-$ git clone https://github.com/mongodb/mongo-php-driver.git
-$ cd mongo-php-driver
-$ git submodule update --init
-$ phpize
-$ ./configure
-$ make all
-$ sudo make install
-]]>
-   </programlisting>
-  </para>
-
-  <simpara>
-   On systems with multiple version of PHP installed (e.g. macOS default,
-   Homebrew), each version of PHP
-   will have its own <link linkend="install.pecl.phpize">phpize</link>
-   command and &php.ini; file(s). Additionally, each PHP environments (e.g.
-   CLI, web) may use separate &php.ini; files.
-  </simpara>
-
-  <simpara>
-   By default, the extension will use bundled versions of
-   <link xlink:href="&url.mongodb.libbson;">libbson</link>,
-   <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link>, and
-   <link xlink:href="&url.mongodb.libmongocrypt;">libmongocrypt</link> and
-   attempt to configure them automatically. If these libraries are already
-   installed as system libraries, the extension can utilize them by
-   specifying <literal>--with-mongodb-system-libs=yes</literal> as an option to
-   <literal>configure</literal>.
-  </simpara>
-
-  <simpara>
-   For a complete list of <literal>configure</literal> options, run
-   <command>configure --help</command>.
-  </simpara>
-
-  <simpara>
-   When using bundled versions of libmongoc and libmongocrypt, the extension
-   will also attempt to select an SSL library according to the
-   <literal>--with-mongodb-ssl</literal> <literal>configure</literal> option.
-   As of extension version 1.17.0, OpenSSL is always preferred by default.
-   Previously, Secure Transport was the default on macOS and OpenSSL was the
-   default on all other platforms.
-  </simpara>
-
-  <note>
-   <simpara>
-    If the build process fails to find an SSL library, check that the
-    development packages (e.g. <literal>libssl-dev</literal>) and
-    <link xlink:href="&url.mongodb.wiki.pkg-config;">pkg-config</link> are both
-    installed.
-   </simpara>
-
-   <simpara>
-    When using Homebrew on macOS, it is common for a system to have multiple
-    versions of OpenSSL installed. To ensure that the desired version of OpenSSL
-    is selected, the <literal>PKG_CONFIG_PATH</literal> environment variable may
-    be used to control the search path for <literal>pkg-config</literal>.
-   </simpara>
-  </note>
-
-  <para>
-   The final build step, <command>make install</command>, will report where
-   <filename>mongodb.so</filename> has been installed, similar to:
-   <programlisting role="txt">
-<![CDATA[
-Installing shared extensions:     /usr/lib/php/extensions/debug-non-zts-20220829/
-]]>
-   </programlisting>
-  </para>
-
-  <para>
-   Ensure that the <link linkend="ini.extension-dir">extension_dir</link> option
-   in &php.ini; points to the directory where <filename>mongodb.so</filename>
-   was installed. The option may be queried by running:
-   <programlisting role="shell">
-<![CDATA[
-$ php -i | grep extension_dir
-  extension_dir => /usr/lib/php/extensions/debug-non-zts-20220829 =>
-                   /usr/lib/php/extensions/debug-non-zts-20220829
-]]>
-   </programlisting>
-  </para>
-
-  <simpara>
-   If the directories differ, either change
-   <link linkend="ini.extension-dir">extension_dir</link> in &php.ini; or
-   manually move <filename>mongodb.so</filename> to the correct directory.
-  </simpara>
-
-  <para>
-   Finally, add the following line to the &php.ini; file for each environment
-   that will need to use the extension:
-   <programlisting role="ini">
-<![CDATA[
-extension=mongodb.so
-]]>
-   </programlisting>
-  </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/mongodb/constants.xml b/reference/mongodb/constants.xml
deleted file mode 100644
index 955fe521f806..000000000000
--- a/reference/mongodb/constants.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mongodb.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.mongodb-version">
-    <term>
-     <constant>MONGODB_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      x.y.z style version number of the extension
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mongodb-stability">
-    <term>
-     <constant>MONGODB_STABILITY</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Current stability (alpha/beta/stable)
-     </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/mongodb/exceptions.xml b/reference/mongodb/exceptions.xml
deleted file mode 100644
index a819727c8fc3..000000000000
--- a/reference/mongodb/exceptions.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <part xml:id="mongodb.exceptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <titleabbrev>MongoDB\Driver\Exception</titleabbrev>
-  <title>Exception classes</title>
-
-  &reference.mongodb.mongodb.driver.exception.authenticationexception;
-  &reference.mongodb.mongodb.driver.exception.bulkwriteexception;
-  &reference.mongodb.mongodb.driver.exception.bulkwritecommandexception;
-  &reference.mongodb.mongodb.driver.exception.commandexception;
-  &reference.mongodb.mongodb.driver.exception.connectionexception;
-  &reference.mongodb.mongodb.driver.exception.connectiontimeoutexception;
-  &reference.mongodb.mongodb.driver.exception.encryptionexception;
-  &reference.mongodb.mongodb.driver.exception.exception;
-  &reference.mongodb.mongodb.driver.exception.executiontimeoutexception;
-  &reference.mongodb.mongodb.driver.exception.invalidargumentexception;
-  &reference.mongodb.mongodb.driver.exception.logicexception;
-  &reference.mongodb.mongodb.driver.exception.runtimeexception;
-  &reference.mongodb.mongodb.driver.exception.serverexception;
-  &reference.mongodb.mongodb.driver.exception.sslconnectionexception;
-  &reference.mongodb.mongodb.driver.exception.unexpectedvalueexception;
-  &reference.mongodb.mongodb.driver.exception.writeexception;
-
-  <article xml:id="mongodb.exceptions.tree">
-   <titleabbrev>Class Tree</titleabbrev>
-   <title>MongoDB Exception Class Tree</title>
-
-   <simpara>
-    The class hierarchy for MongoDB exceptions is modeled after that of the
-    <link linkend="spl.exceptions">SPL Exceptions</link>. Base classes extend
-    their SPL counterpart and all exception classes in the extension implement
-    the <classname>MongoDB\Driver\Exception\Exception</classname> interface.
-   </simpara>
-
-   <itemizedlist>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\LogicException</classname> (extends <classname>LogicException</classname>)</simpara></listitem>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> (extends <classname>InvalidArgumentException</classname>)</simpara></listitem>
-    <listitem><simpara><classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> (extends <classname>UnexpectedValueException</classname>)</simpara></listitem>
-    <listitem>
-     <simpara><classname>MongoDB\Driver\Exception\RuntimeException</classname> (extends <classname>RuntimeException</classname>)</simpara>
-     <itemizedlist>
-      <listitem>
-       <simpara><classname>MongoDB\Driver\Exception\ConnectionException</classname></simpara>
-       <itemizedlist>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\AuthenticationException</classname></simpara></listitem>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\ConnectionTimeoutException</classname></simpara></listitem>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\SSLConnectionException</classname> (deprecated)</simpara></listitem>
-       </itemizedlist>
-      </listitem>
-      <listitem><simpara><classname>MongoDB\Driver\Exception\EncryptionException</classname></simpara></listitem>
-      <listitem>
-       <simpara><classname>MongoDB\Driver\Exception\ServerException</classname></simpara>
-       <itemizedlist>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\BulkWriteCommandException</classname></simpara></listitem>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\CommandException</classname></simpara></listitem>
-        <listitem><simpara><classname>MongoDB\Driver\Exception\ExecutionTimeoutException</classname></simpara></listitem>
-        <listitem>
-         <simpara><classname>MongoDB\Driver\Exception\WriteException</classname> (deprecated)</simpara>
-         <itemizedlist>
-          <listitem><simpara><classname>MongoDB\Driver\Exception\BulkWriteException</classname></simpara></listitem>
-         </itemizedlist>
-        </listitem>
-       </itemizedlist>
-      </listitem>
-     </itemizedlist>
-    </listitem>
-   </itemizedlist>
-  </article>
-
- </part>
diff --git a/reference/mongodb/functions/bson/fromjson.xml b/reference/mongodb/functions/bson/fromjson.xml
deleted file mode 100644
index a91e0e0b2df1..000000000000
--- a/reference/mongodb/functions/bson/fromjson.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-fromjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\fromJSON</refname>
-  <refpurpose>Returns the BSON representation of a JSON value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::fromJSON</methodname> instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>MongoDB\BSON\fromJSON</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts an
-   <link xlink:href="&url.mongodb.docs.extendedjson;">extended JSON</link>
-   string to its BSON representation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      JSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The serialized BSON document as a binary string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if
-    the JSON value cannot be converted to BSON (e.g. due to a syntax error).
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\fromJSON</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$json = '{ "_id": { "$oid": "563143b280d2387c91807965" } }';
-$bson = MongoDB\BSON\fromJSON($json);
-$value = MongoDB\BSON\toPHP($bson);
-var_dump($value);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (1) {
-  ["_id"]=>
-  object(MongoDB\BSON\ObjectId)#1 (1) {
-    ["oid"]=>
-    string(24) "563143b280d2387c91807965"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><function>MongoDB\BSON\toJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</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/functions/bson/fromphp.xml b/reference/mongodb/functions/bson/fromphp.xml
deleted file mode 100644
index d7d45261bc52..000000000000
--- a/reference/mongodb/functions/bson/fromphp.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-fromphp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\fromPHP</refname>
-  <refpurpose>Returns the BSON representation of a PHP value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::fromPHP</methodname> instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>MongoDB\BSON\fromPHP</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Serializes a PHP array or object (e.g. document) to its
-   <link xlink:href="&url.mongodb.docs.bson;">BSON</link> representation. The
-   returned binary string will describe a BSON document.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      PHP value to be serialized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The serialized BSON document as a binary string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname> if
-    the PHP value cannot be converted to BSON. Possible reasons include, but are
-    not limited to, encountering an unexpected
-    <interfacename>MongoDB\BSON\Type</interfacename> instance or
-    <function>MongoDB\BSON\Serializable::bsonSerialize</function> failing to
-    return an <type>array</type> or <classname>stdClass</classname>.
-   </member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\fromPHP</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bson = MongoDB\BSON\fromPHP(['foo' => 1]);
-echo bin2hex($bson), "\n";
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-0e00000010666f6f000100000000
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromPHP</methodname></member>
-   <member><function>MongoDB\BSON\toPHP</function></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</link></member>
-   <member><xref linkend="mongodb.persistence"/></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/functions/bson/tocanonicalextendedjson.xml b/reference/mongodb/functions/bson/tocanonicalextendedjson.xml
deleted file mode 100644
index 63f8cde31402..000000000000
--- a/reference/mongodb/functions/bson/tocanonicalextendedjson.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-tocanonicalextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\toCanonicalExtendedJSON</refname>
-  <refpurpose>Returns the Canonical Extended JSON representation of a BSON value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>MongoDB\BSON\toCanonicalExtendedJSON</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts a BSON string to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#canonical-extended-json-example">Canonical Extended JSON</link>
-   representation. The canonical format prefers type fidelity at the expense of
-   concise output and is most suited for producing output that can be converted
-   back to BSON without any loss of type information (e.g. numeric types will
-   remain differentiated).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bson</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      BSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The converted JSON value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.bson.unexpected;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\toCanonicalExtendedJSON</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$documents = [
-    [ 'null' => null ],
-    [ 'boolean' => true ],
-    [ 'string' => 'foo' ],
-    [ 'int32' => 123 ],
-    [ 'int64' => 4294967295 ],
-    [ 'double' => 1.0, ],
-    [ 'nan' => NAN ],
-    [ 'pos_inf' => INF ],
-    [ 'neg_inf' => -INF ],
-    [ 'array' => [ 'foo', 'bar' ]],
-    [ 'document' => [ 'foo' => 'bar' ]],
-    [ 'oid' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
-    [ 'dec128' => new MongoDB\BSON\Decimal128('1234.5678') ],
-    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
-    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
-    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
-    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
-    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
-    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
-    [ 'minkey' => new MongoDB\BSON\MinKey ],
-    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
-];
-
-foreach ($documents as $document) {
-    $bson = MongoDB\BSON\fromPHP($document);
-    echo MongoDB\BSON\toCanonicalExtendedJSON($bson), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "null" : null }
-{ "boolean" : true }
-{ "string" : "foo" }
-{ "int32" : { "$numberInt" : "123" } }
-{ "int64" : { "$numberLong" : "4294967295"} }
-{ "double" : { "$numberDouble" : "1.0" } }
-{ "nan" : { "$numberDouble" : "NaN" } }
-{ "pos_inf" : { "$numberDouble" : "Infinity" } }
-{ "neg_inf" : { "$numberDouble" : "-Infinity" } }
-{ "array" : [ "foo", "bar" ] }
-{ "document" : { "foo" : "bar" } }
-{ "oid" : { "$oid" : "56315a7c6118fd1b920270b1" } }
-{ "dec128" : { "$numberDecimal" : "1234.5678" } }
-{ "binary" : { "$binary" : { "base64": "Zm9v", "subType" : "00" } } }
-{ "date" : { "$date" : { "$numberLong" : "1445990400000" } } }
-{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
-{ "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } }
-{ "code" : { "$code" : "function() { return 1; }" } }
-{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : { "$numberInt" : "1" } } } }
-{ "minkey" : { "$minKey" : 1 } }
-{ "maxkey" : { "$maxKey" : 1 } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\fromJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</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/functions/bson/tojson.xml b/reference/mongodb/functions/bson/tojson.xml
deleted file mode 100644
index 44d1aff0d19b..000000000000
--- a/reference/mongodb/functions/bson/tojson.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-tojson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\toJSON</refname>
-  <refpurpose>Returns the Legacy Extended JSON representation of a BSON value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::toCanonicalExtendedJSON</methodname> or
-    <methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>MongoDB\BSON\toJSON</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts a BSON string to its
-   <link xlink:href="&url.mongodb.docs.extendedjson;">Legacy Extended JSON</link>
-   representation.
-  </simpara>
-  <note>
-   <simpara>
-    There exist several JSON formats for representing BSON. This function
-    implements the "strict mode" defined in
-    <link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link>,
-    which has been superseded by the canonical and relaxed formats defined in
-    the
-    <link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON Specification</link>
-    and implemented by <function>MongoDB\BSON\toCanonicalExtendedJSON</function>
-    and <function>MongoDB\BSON\toRelaxedExtendedJSON</function>, respectively.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    <link xlink:href="&url.json;">JSON</link> does not support
-    <link linkend="language.types.float.nan"><constant>NAN</constant></link> and
-    <link linkend="function.is-infinite"><constant>INF</constant></link> and
-    MongoDB&apos;s Legacy Extended JSON format does not define an alternative
-    representation for these values
-    (<link xlink:href="&url.mongodb.libbson;">libbson</link> will output
-    <literal>nan</literal> and <literal>inf</literal> literals, which may not be
-    parsed as valid JSON). If you are working with BSON that may contain
-    non-finite numbers, please use
-    <function>MongoDB\BSON\toCanonicalExtendedJSON</function> or
-    <function>MongoDB\BSON\toRelaxedExtendedJSON</function>.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bson</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      BSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The converted JSON value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.bson.unexpected;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\toJSON</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$documents = [
-    [ 'null' => null ],
-    [ 'boolean' => true ],
-    [ 'string' => 'foo' ],
-    [ 'int32' => 123 ],
-    [ 'int64' => 4294967295 ],
-    [ 'double' => 1.0, ],
-    [ 'nan' => NAN ],
-    [ 'pos_inf' => INF ],
-    [ 'neg_inf' => -INF ],
-    [ 'array' => [ 'foo', 'bar' ]],
-    [ 'document' => [ 'foo' => 'bar' ]],
-    [ 'oid' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
-    [ 'dec128' => new MongoDB\BSON\Decimal128('1234.5678') ],
-    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
-    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
-    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
-    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
-    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
-    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
-    [ 'minkey' => new MongoDB\BSON\MinKey ],
-    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
-];
-
-foreach ($documents as $document) {
-    $bson = MongoDB\BSON\fromPHP($document);
-    echo MongoDB\BSON\toJSON($bson), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "null" : null }
-{ "boolean" : true }
-{ "string" : "foo" }
-{ "int32" : 123 }
-{ "int64" : 4294967295 }
-{ "double" : 1.0 }
-{ "nan" : nan }
-{ "pos_inf" : inf }
-{ "neg_inf" : -inf }
-{ "array" : [ "foo", "bar" ] }
-{ "document" : { "foo" : "bar" } }
-{ "oid" : { "$oid" : "56315a7c6118fd1b920270b1" } }
-{ "dec128" : { "$numberDecimal" : "1234.5678" } }
-{ "binary" : { "$binary" : "Zm9v", "$type" : "00" } }
-{ "date" : { "$date" : 1445990400000 } }
-{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
-{ "regex" : { "$regex" : "pattern", "$options" : "i" } }
-{ "code" : { "$code" : "function() { return 1; }" } }
-{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } }
-{ "minkey" : { "$minKey" : 1 } }
-{ "maxkey" : { "$maxKey" : 1 } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\BSON\fromJSON</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><function>MongoDB\BSON\toRelaxedExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.docs.extendedjson;">MongoDB Extended JSON</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</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/functions/bson/tophp.xml b/reference/mongodb/functions/bson/tophp.xml
deleted file mode 100644
index 55fd33728a67..000000000000
--- a/reference/mongodb/functions/bson/tophp.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-tophp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\toPHP</refname>
-  <refpurpose>Returns the PHP representation of a BSON value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::toPHP</methodname> instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>object</type></type><methodname>MongoDB\BSON\toPHP</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>typeMap</parameter><initializer>array()</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unserializes a BSON document (i.e. binary string) to its PHP representation.
-   The <parameter>typeMap</parameter> parameter may be used to control the PHP
-   types used for converting BSON arrays and documents (both root and embedded).
-  </simpara>
-  &mongodb.warning.duplicate-keys;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bson</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      BSON value to be unserialized.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mongodb.parameter.typeMap;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The unserialized PHP value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-    a class in the type map cannot be instantiated or does not implement
-    <interfacename>MongoDB\BSON\Unserializable</interfacename>.
-   </member>
-   &mongodb.throws.bson.unexpected;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       <simpara>
-        If the input contains an unsupported, deprecated BSON type, the
-        extension will now no longer log a warning to the debug log, but instead
-        will create an object representing this type.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.2</entry>
-      <entry>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-        is no longer thrown if the input contains an unsupported, deprecated
-        BSON type. Such types will be ignored (as they were in versions before
-        1.3.0), although the extension will now log a warning to the debug log
-        (see: <link linkend="ini.mongodb.debug">mongodb.debug</link>).
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <simpara>
-        <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-        is thrown if the input contains an unsupported, deprecated BSON type.
-        Previously, such types were ignored.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\toPHP</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bson = hex2bin('0e00000010666f6f000100000000');
-$value = MongoDB\BSON\toPHP($bson);
-var_dump($value);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(stdClass)#1 (1) {
-  ["foo"]=>
-  int(1)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::toPHP</methodname></member>
-   <member><function>MongoDB\BSON\fromPHP</function></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</link></member>
-   <member><xref linkend="mongodb.persistence"/></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/functions/bson/torelaxedextendedjson.xml b/reference/mongodb/functions/bson/torelaxedextendedjson.xml
deleted file mode 100644
index e767d51aedfe..000000000000
--- a/reference/mongodb/functions/bson/torelaxedextendedjson.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mongodb.bson-torelaxedextendedjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\BSON\toRelaxedExtendedJSON</refname>
-  <refpurpose>Returns the Relaxed Extended JSON representation of a BSON value</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>MongoDB\BSON\toRelaxedExtendedJSON</methodname>
-   <methodparam><type>string</type><parameter>bson</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts a BSON string to its
-   <link xlink:href="&url.mongodb.specs.extendedjson;#relaxed-extended-json-example">Relaxed Extended JSON</link>
-   representation. The relaxed format prefers use of JSON type primitives at the
-   expense of type fidelity and is most suited for producing output that can be
-   easily consumed by web APIs and humans.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bson</parameter> (<type>string</type>)</term>
-    <listitem>
-     <simpara>
-      BSON value to be converted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The converted JSON value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.bson.unexpected;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.function-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\BSON\toRelaxedExtendedJSON</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$documents = [
-    [ 'null' => null ],
-    [ 'boolean' => true ],
-    [ 'string' => 'foo' ],
-    [ 'int32' => 123 ],
-    [ 'int64' => 4294967295 ],
-    [ 'double' => 1.0, ],
-    [ 'nan' => NAN ],
-    [ 'pos_inf' => INF ],
-    [ 'neg_inf' => -INF ],
-    [ 'array' => [ 'foo', 'bar' ]],
-    [ 'document' => [ 'foo' => 'bar' ]],
-    [ 'oid' => new MongoDB\BSON\ObjectId('56315a7c6118fd1b920270b1') ],
-    [ 'dec128' => new MongoDB\BSON\Decimal128('1234.5678') ],
-    [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
-    [ 'date' => new MongoDB\BSON\UTCDateTime(1445990400000) ],
-    [ 'timestamp' => new MongoDB\BSON\Timestamp(1234, 5678) ],
-    [ 'regex' => new MongoDB\BSON\Regex('pattern', 'i') ],
-    [ 'code' => new MongoDB\BSON\Javascript('function() { return 1; }') ],
-    [ 'code_ws' => new MongoDB\BSON\Javascript('function() { return a; }', ['a' => 1]) ],
-    [ 'minkey' => new MongoDB\BSON\MinKey ],
-    [ 'maxkey' => new MongoDB\BSON\MaxKey ],
-];
-
-foreach ($documents as $document) {
-    $bson = MongoDB\BSON\fromPHP($document);
-    echo MongoDB\BSON\toRelaxedExtendedJSON($bson), "\n";
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-{ "null" : null }
-{ "boolean" : true }
-{ "string" : "foo" }
-{ "int32" : 123 }
-{ "int64" : 4294967295 }
-{ "double" : 1.0 }
-{ "nan" : { "$numberDouble" : "NaN" } }
-{ "pos_inf" : { "$numberDouble" : "Infinity" } }
-{ "neg_inf" : { "$numberDouble" : "-Infinity" } }
-{ "array" : [ "foo", "bar" ] }
-{ "document" : { "foo" : "bar" } }
-{ "oid" : { "$oid" : "56315a7c6118fd1b920270b1" } }
-{ "dec128" : { "$numberDecimal" : "1234.5678" } }
-{ "binary" : { "$binary" : { "base64": "Zm9v", "subType" : "00" } } }
-{ "date" : { "$date" : "2015-10-28T00:00:00Z" } }
-{ "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } }
-{ "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } }
-{ "code" : { "$code" : "function() { return 1; }" } }
-{ "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } }
-{ "minkey" : { "$minKey" : 1 } }
-{ "maxkey" : { "$maxKey" : 1 } }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Document::fromJSON</methodname></member>
-   <member><methodname>MongoDB\BSON\Document::toRelaxedExtendedJSON</methodname></member>
-   <member><function>MongoDB\BSON\fromJSON</function></member>
-   <member><function>MongoDB\BSON\toCanonicalExtendedJSON</function></member>
-   <member><link xlink:href="&url.mongodb.specs.extendedjson;">Extended JSON</link></member>
-   <member><link xlink:href="&url.mongodb.docs.bson;">MongoDB BSON</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/functions/driver/monitoring/addsubscriber.xml b/reference/mongodb/functions/driver/monitoring/addsubscriber.xml
deleted file mode 100644
index 38f749792790..000000000000
--- a/reference/mongodb/functions/driver/monitoring/addsubscriber.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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 monitoring event subscriber globally</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>MongoDB\Driver\Monitoring\addSubscriber</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Registers a monitoring event subscriber globally. The subscriber will be
-   notified of all events in the extension for any Manager.
-  </simpara>
-  <note>
-   <simpara>
-    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>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>subscriber</parameter> (<type>MongoDB\Driver\Monitoring\Subscriber</type>)</term>
-    <listitem>
-     <simpara>
-      A monitoring event subscriber to register globally.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <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\Manager::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/functions/driver/monitoring/removesubscriber.xml b/reference/mongodb/functions/driver/monitoring/removesubscriber.xml
deleted file mode 100644
index f5d9db72ff09..000000000000
--- a/reference/mongodb/functions/driver/monitoring/removesubscriber.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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 a monitoring event subscriber globally</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>MongoDB\Driver\Monitoring\removeSubscriber</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\Subscriber</type><parameter>subscriber</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Unregisters a monitoring event subscriber globally.
-  </simpara>
-  <note>
-   <simpara>
-    If <parameter>subscriber</parameter> is not already registered globally,
-    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>
-     <simpara>
-      A monitoring event subscriber to unregister globally.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <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\Manager::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/images/driver_arch.svg b/reference/mongodb/images/driver_arch.svg
deleted file mode 100644
index a978d2cbbeb9..000000000000
--- a/reference/mongodb/images/driver_arch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" viewBox="0.0 0.0 623.6902887139107 448.6771653543307" fill="none" stroke="none" stroke-linecap="square" stroke-miterlimit="10" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><clipPath id="p.0"><path d="m0 0l623.6903 0l0 448.67715l-623.6903 0l0 -448.67715z" clip-rule="nonzero"/></clipPath><g clip-path="url(#p.0)"><path fill="#000000" fill-opacity="0.0" d="m0 0l623.6903 0l0 448.67715l-623.6903 0z" fill-rule="evenodd"/><path fill="#cfe2f3" d="m80.661415 206.87172l0 0c0 -9.146942 7.4150696 -16.562012 16.562012 -16.562012l502.21457 0c4.392517 0 8.605103 1.7449188 11.711121 4.8509064c3.105957 3.1059723 4.850891 7.3185883 4.850891 11.711105l0 66.24605c0 9.146973 -7.415039 16.562012 -16.562012 16.562012l-502.21457 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m80.661415 206.87172l0 0c0 -9.146942 7.4150696 -16.562012 16.562012 -16.562012l502.21457 0c4.392517 0 8.605103 1.7449188 11.711121 4.8509064c3.105957 3.1059723 4.850891 7.3185883 4.850891 11.711105l0 66.24605c0 9.146973 -7.415039 16.562012 -16.562012 16.562012l-502.21457 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path fill="#000000" d="m277.8716 238.91475l0 -13.359375l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.890625q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.640625q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.78125zm10.740448 7.0l0 -13.359375l1.765625 0l0 5.484375l6.9375 0l0 -5.484375l1.765625 0l0 13.359375l-1.765625 0l0 -6.296875l-6.9375 0l0 6.296875l-1.765625 0zm13.410431 0l0 -13.359375l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.890625q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.640625q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.78125zm25.055267 2.3125l1.765625 0.453125q-0.5625 2.171875 -2.0 3.328125q-1.4375 1.140625 -3.53125 1.140625q-2.15625 0 -3.515625 -0.875q-1.34375 -0.890625 -2.0625 -2.546875q-0.703125 -1.671875 -0.703125 -3.59375q0 -2.078125 0.796875 -3.625q0.796875 -1.5625 2.265625 -2.359375q1.484375 -0.8125 3.25 -0.8125q2.0 0 3.359375 1.015625q1.375 1.015625 1.90625 2.875l-1.734375 0.40625q-0.46875 -1.453125 -1.359375 -2.109375q-0.875 -0.671875 -2.203125 -0.671875q-1.546875 0 -2.578125 0.734375q-1.03125 0.734375 -1.453125 1.984375q-0.421875 1.234375 -0.421875 2.5625q0 1.703125 0.5 2.96875q0.5 1.265625 1.546875 1.90625q1.046875 0.625 2.265625 0.625q1.484375 0 2.515625 -0.859375q1.03125 -0.859375 1.390625 -2.546875zm9.15625 4.6875l0 -13.359375l9.65625 0l0 1.578125l-7.875 0l0 4.09375l7.375 0l0 1.5625l-7.375 0l0 4.546875l8.1875 0l0 1.578125l-9.96875 0zm11.1154785 0l3.53125 -5.03125l-3.265625 -4.640625l2.046875 0l1.484375 2.265625q0.421875 0.640625 0.671875 1.078125q0.40625 -0.59375 0.734375 -1.0625l1.640625 -2.28125l1.953125 0l-3.34375 4.546875l3.59375 5.125l-2.015625 0l-1.984375 -3.0l-0.515625 -0.8125l-2.546875 3.8125l-1.984375 0zm14.0 -1.46875l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.578125l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.671875q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm8.230164 -1.640625l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm9.141357 5.765625l0 -9.671875l1.46875 0l0 1.375q1.0625 -1.59375 3.078125 -1.59375q0.875 0 1.609375 0.3125q0.734375 0.3125 1.09375 0.828125q0.375 0.5 0.515625 1.203125q0.09375 0.453125 0.09375 1.59375l0 5.953125l-1.640625 0l0 -5.890625q0 -1.0 -0.203125 -1.484375q-0.1875 -0.5 -0.671875 -0.796875q-0.484375 -0.296875 -1.140625 -0.296875q-1.046875 0 -1.8125 0.671875q-0.75 0.65625 -0.75 2.515625l0 5.28125l-1.640625 0zm9.719452 -2.890625l1.625 -0.25q0.125 0.96875 0.75 1.5q0.625 0.515625 1.75 0.515625q1.125 0 1.671875 -0.453125q0.546875 -0.46875 0.546875 -1.09375q0 -0.546875 -0.484375 -0.875q-0.328125 -0.21875 -1.671875 -0.546875q-1.8125 -0.46875 -2.515625 -0.796875q-0.6875 -0.328125 -1.046875 -0.90625q-0.359375 -0.59375 -0.359375 -1.3125q0 -0.640625 0.296875 -1.1875q0.296875 -0.5625 0.8125 -0.921875q0.375 -0.28125 1.03125 -0.46875q0.671875 -0.203125 1.421875 -0.203125q1.140625 0 2.0 0.328125q0.859375 0.328125 1.265625 0.890625q0.421875 0.5625 0.578125 1.5l-1.609375 0.21875q-0.109375 -0.75 -0.640625 -1.171875q-0.515625 -0.421875 -1.46875 -0.421875q-1.140625 0 -1.625 0.375q-0.46875 0.375 -0.46875 0.875q0 0.3125 0.1875 0.578125q0.203125 0.265625 0.640625 0.4375q0.234375 0.09375 1.4375 0.421875q1.75 0.453125 2.4375 0.75q0.6875 0.296875 1.078125 0.859375q0.390625 0.5625 0.390625 1.40625q0 0.828125 -0.484375 1.546875q-0.46875 0.71875 -1.375 1.125q-0.90625 0.390625 -2.046875 0.390625q-1.875 0 -2.875 -0.78125q-0.984375 -0.78125 -1.25 -2.328125zm9.984375 -8.578125l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm3.535431 -4.84375q0 -2.6875 1.484375 -3.96875q1.25 -1.078125 3.046875 -1.078125q2.0 0 3.265625 1.3125q1.265625 1.296875 1.265625 3.609375q0 1.859375 -0.5625 2.9375q-0.5625 1.0625 -1.640625 1.65625q-1.0625 0.59375 -2.328125 0.59375q-2.03125 0 -3.28125 -1.296875q-1.25 -1.3125 -1.25 -3.765625zm1.6875 0q0 1.859375 0.796875 2.796875q0.8125 0.921875 2.046875 0.921875q1.21875 0 2.03125 -0.921875q0.8125 -0.9375 0.8125 -2.84375q0 -1.796875 -0.8125 -2.71875q-0.8125 -0.921875 -2.03125 -0.921875q-1.234375 0 -2.046875 0.921875q-0.796875 0.90625 -0.796875 2.765625zm9.297607 4.84375l0 -9.671875l1.46875 0l0 1.375q1.0625 -1.59375 3.078125 -1.59375q0.875 0 1.609375 0.3125q0.734375 0.3125 1.09375 0.828125q0.375 0.5 0.515625 1.203125q0.09375 0.453125 0.09375 1.59375l0 5.953125l-1.640625 0l0 -5.890625q0 -1.0 -0.203125 -1.484375q-0.1875 -0.5 -0.671875 -0.796875q-0.484375 -0.296875 -1.140625 -0.296875q-1.046875 0 -1.8125 0.671875q-0.75 0.65625 -0.75 2.515625l0 5.28125l-1.640625 0z" fill-rule="nonzero"/><path fill="#000000" d="m298.11716 258.60724q-0.984375 -1.234375 -1.65625 -2.8749847q-0.65625 -1.640625 -0.65625 -3.390625q0 -1.546875 0.5 -2.96875q0.578125 -1.640625 1.8125 -3.28125l0.828125 0q-0.78125 1.359375 -1.03125 1.9375q-0.40625 0.890625 -0.625 1.875q-0.28125 1.21875 -0.28125 2.4375q0 3.140625 1.9375 6.2656097l-0.828125 0zm2.3446045 -2.8124847l0 -9.546875l3.59375 0q0.953125 0 1.453125 0.09375q0.703125 0.125 1.171875 0.453125q0.484375 0.328125 0.765625 0.921875q0.296875 0.59375 0.296875 1.296875q0 1.21875 -0.78125 2.0625q-0.765625 0.84375 -2.796875 0.84375l-2.4375 0l0 3.875l-1.265625 0zm1.265625 -5.0l2.453125 0q1.234375 0 1.75 -0.453125q0.515625 -0.46875 0.515625 -1.28125q0 -0.609375 -0.3125 -1.03125q-0.296875 -0.421875 -0.796875 -0.5625q-0.3125 -0.09375 -1.171875 -0.09375l-2.4375 0l0 3.421875zm7.6397705 5.0l0 -9.546875l6.90625 0l0 1.125l-5.640625 0l0 2.921875l5.28125 0l0 1.125l-5.28125 0l0 3.25l5.859375 0l0 1.125l-7.125 0zm15.67099 -3.34375l1.265625 0.3125q-0.390625 1.5625 -1.421875 2.375q-1.03125 0.8125 -2.53125 0.8125q-1.53125 0 -2.5 -0.625q-0.96875 -0.625 -1.484375 -1.8125q-0.5 -1.1875 -0.5 -2.5625q0 -1.484375 0.5625 -2.59375q0.578125 -1.109375 1.625 -1.6875q1.0625 -0.578125 2.328125 -0.578125q1.421875 0 2.390625 0.734375q0.984375 0.71875 1.375 2.046875l-1.25 0.296875q-0.328125 -1.046875 -0.96875 -1.515625q-0.625 -0.484375 -1.578125 -0.484375q-1.09375 0 -1.84375 0.53125q-0.734375 0.53125 -1.03125 1.421875q-0.296875 0.875 -0.296875 1.828125q0 1.21875 0.34375 2.125q0.359375 0.90625 1.109375 1.359375q0.75 0.4375 1.625 0.4375q1.0625 0 1.796875 -0.609375q0.734375 -0.609375 0.984375 -1.8125zm2.7657776 3.34375l0 -9.546875l1.265625 0l0 8.421875l4.703125 0l0 1.125l-5.96875 0zm7.6468506 -5.578125l0 -1.328125l1.328125 0l0 1.328125l-1.328125 0zm0 5.578125l0 -1.328125l1.328125 0l0 1.328125l-1.328125 0zm7.0778503 0l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.484375 0.3125 0.6875 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.171875 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm10.6649475 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm7.1937256 0.57810974l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.4999847q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.6093597 -0.328125 2.2812347q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.1562347q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.2093506 0.125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm11.131226 3.453125l0 -0.875q-0.65625 1.03125 -1.9375 1.03125q-0.8125 0 -1.515625 -0.453125q-0.6875 -0.453125 -1.078125 -1.265625q-0.375 -0.828125 -0.375 -1.890625q0 -1.03125 0.34375 -1.875q0.34375 -0.84375 1.03125 -1.28125q0.703125 -0.453125 1.546875 -0.453125q0.625 0 1.109375 0.265625q0.5 0.25 0.796875 0.671875l0 -3.421875l1.171875 0l0 9.546875l-1.09375 0zm-3.703125 -3.453125q0 1.328125 0.5625 1.984375q0.5625 0.65625 1.328125 0.65625q0.765625 0 1.296875 -0.625q0.53125 -0.625 0.53125 -1.90625q0 -1.421875 -0.546875 -2.078125q-0.546875 -0.671875 -1.34375 -0.671875q-0.78125 0 -1.3125 0.640625q-0.515625 0.625 -0.515625 2.0zm7.7093506 3.453125l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm7.0999756 6.3124847l-0.828125 0q1.9375 -3.1249847 1.9375 -6.2656097q0 -1.21875 -0.28125 -2.421875q-0.21875 -0.984375 -0.609375 -1.875q-0.265625 -0.59375 -1.046875 -1.953125l0.828125 0q1.234375 1.640625 1.8125 3.28125q0.5 1.421875 0.5 2.96875q0 1.75 -0.671875 3.390625q-0.671875 1.6406097 -1.640625 2.8749847z" fill-rule="nonzero"/><path fill="#d9ead3" d="m80.661415 70.357285l0 0c0 -9.146946 7.4150696 -16.562008 16.562012 -16.562008l502.21457 0c4.392517 0 8.605103 1.7449188 11.711121 4.8508987c3.105957 3.10598 4.850891 7.318592 4.850891 11.711109l0 66.24606c0 9.146942 -7.415039 16.561996 -16.562012 16.561996l-502.21457 0c-9.146942 0 -16.562012 -7.4150543 -16.562012 -16.561996z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m80.661415 70.357285l0 0c0 -9.146946 7.4150696 -16.562008 16.562012 -16.562008l502.21457 0c4.392517 0 8.605103 1.7449188 11.711121 4.8508987c3.105957 3.10598 4.850891 7.318592 4.850891 11.711109l0 66.24606c0 9.146942 -7.415039 16.561996 -16.562012 16.561996l-502.21457 0c-9.146942 0 -16.562012 -7.4150543 -16.562012 -16.561996z" fill-rule="evenodd"/><path fill="#000000" d="m299.6524 102.400314l0 -13.359375l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.890625q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.640625q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.78125zm10.740448 7.0l0 -13.359375l1.765625 0l0 5.484375l6.9375 0l0 -5.484375l1.765625 0l0 13.359375l-1.765625 0l0 -6.296875l-6.9375 0l0 6.296875l-1.765625 0zm13.410431 0l0 -13.359375l5.046875 0q1.328125 0 2.03125 0.125q0.96875 0.171875 1.640625 0.640625q0.671875 0.453125 1.078125 1.28125q0.40625 0.828125 0.40625 1.828125q0 1.703125 -1.09375 2.890625q-1.078125 1.171875 -3.921875 1.171875l-3.421875 0l0 5.421875l-1.765625 0zm1.765625 -7.0l3.453125 0q1.71875 0 2.4375 -0.640625q0.71875 -0.640625 0.71875 -1.796875q0 -0.84375 -0.421875 -1.4375q-0.421875 -0.59375 -1.125 -0.78125q-0.4375 -0.125 -1.640625 -0.125l-3.421875 0l0 4.78125zm15.445923 7.0l0 -13.359375l1.78125 0l0 11.78125l6.5625 0l0 1.578125l-8.34375 0zm10.250702 -11.46875l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm5.644806 0l-1.515625 0l0 -13.359375l1.640625 0l0 4.765625q1.046875 -1.296875 2.65625 -1.296875q0.890625 0 1.6875 0.359375q0.796875 0.359375 1.3125 1.015625q0.515625 0.640625 0.796875 1.5625q0.296875 0.921875 0.296875 1.96875q0 2.484375 -1.234375 3.84375q-1.21875 1.359375 -2.953125 1.359375q-1.703125 0 -2.6875 -1.4375l0 1.21875zm-0.015625 -4.90625q0 1.734375 0.484375 2.515625q0.765625 1.265625 2.09375 1.265625q1.078125 0 1.859375 -0.9375q0.78125 -0.9375 0.78125 -2.78125q0 -1.890625 -0.75 -2.796875q-0.75 -0.90625 -1.828125 -0.90625q-1.0625 0 -1.859375 0.9375q-0.78125 0.9375 -0.78125 2.703125zm8.875732 4.90625l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm12.540802 -1.1875q-0.921875 0.765625 -1.765625 1.09375q-0.828125 0.3125 -1.796875 0.3125q-1.59375 0 -2.453125 -0.78125q-0.859375 -0.78125 -0.859375 -1.984375q0 -0.71875 0.328125 -1.296875q0.328125 -0.59375 0.84375 -0.9375q0.53125 -0.359375 1.1875 -0.546875q0.46875 -0.125 1.453125 -0.25q1.984375 -0.234375 2.921875 -0.5625q0.015625 -0.34375 0.015625 -0.421875q0 -1.0 -0.46875 -1.421875q-0.625 -0.546875 -1.875 -0.546875q-1.15625 0 -1.703125 0.40625q-0.546875 0.40625 -0.8125 1.421875l-1.609375 -0.21875q0.21875 -1.015625 0.71875 -1.640625q0.5 -0.640625 1.453125 -0.984375q0.953125 -0.34375 2.1875 -0.34375q1.25 0 2.015625 0.296875q0.78125 0.28125 1.140625 0.734375q0.375 0.4375 0.515625 1.109375q0.078125 0.421875 0.078125 1.515625l0 2.1875q0 2.28125 0.109375 2.890625q0.109375 0.59375 0.40625 1.15625l-1.703125 0q-0.265625 -0.515625 -0.328125 -1.1875zm-0.140625 -3.671875q-0.890625 0.375 -2.671875 0.625q-1.015625 0.140625 -1.4375 0.328125q-0.421875 0.1875 -0.65625 0.53125q-0.21875 0.34375 -0.21875 0.78125q0 0.65625 0.5 1.09375q0.5 0.4375 1.453125 0.4375q0.9375 0 1.671875 -0.40625q0.75 -0.421875 1.09375 -1.140625q0.265625 -0.5625 0.265625 -1.640625l0 -0.609375zm4.188202 4.859375l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.1502075 3.71875l-0.1875 -1.53125q0.546875 0.140625 0.9375 0.140625q0.546875 0 0.875 -0.1875q0.328125 -0.171875 0.546875 -0.5q0.15625 -0.25 0.5 -1.21875q0.046875 -0.140625 0.140625 -0.40625l-3.671875 -9.6875l1.765625 0l2.015625 5.59375q0.390625 1.078125 0.703125 2.25q0.28125 -1.125 0.671875 -2.203125l2.078125 -5.640625l1.640625 0l-3.6875 9.828125q-0.59375 1.609375 -0.921875 2.203125q-0.4375 0.8125 -1.0 1.1875q-0.5625 0.375 -1.34375 0.375q-0.484375 0 -1.0625 -0.203125z" fill-rule="nonzero"/><path fill="#000000" d="m255.14563 122.09281q-0.984375 -1.234375 -1.65625 -2.875q-0.65625 -1.640625 -0.65625 -3.390625q0 -1.546875 0.5 -2.96875q0.578125 -1.640625 1.8125 -3.28125l0.828125 0q-0.78125 1.359375 -1.03125 1.9375q-0.40625 0.890625 -0.625 1.875q-0.28125 1.21875 -0.28125 2.4375q0 3.140625 1.9375 6.265625l-0.828125 0zm9.1414795 -6.15625l1.265625 0.3125q-0.390625 1.5625 -1.421875 2.375q-1.03125 0.8125 -2.53125 0.8125q-1.53125 0 -2.5 -0.625q-0.96875 -0.625 -1.484375 -1.8125q-0.5 -1.1875 -0.5 -2.5625q0 -1.484375 0.5625 -2.59375q0.578125 -1.109375 1.625 -1.6875q1.0625 -0.578125 2.328125 -0.578125q1.421875 0 2.390625 0.734375q0.984375 0.71875 1.375 2.046875l-1.25 0.296875q-0.328125 -1.046875 -0.96875 -1.515625q-0.625 -0.484375 -1.578125 -0.484375q-1.09375 0 -1.84375 0.53125q-0.734375 0.53125 -1.03125 1.421875q-0.296875 0.875 -0.296875 1.828125q0 1.21875 0.34375 2.125q0.359375 0.90625 1.109375 1.359375q0.75 0.4375 1.625 0.4375q1.0625 0 1.796875 -0.609375q0.734375 -0.609375 0.984375 -1.8125zm2.2345276 -0.109375q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.484375 0.3125 0.6875 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.171875 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm11.1024475 2.65625l0 -9.5625l1.078125 0l0 0.890625q0.375 -0.53125 0.84375 -0.78125q0.484375 -0.265625 1.15625 -0.265625q0.875 0 1.546875 0.453125q0.6875 0.453125 1.03125 1.28125q0.34375 0.828125 0.34375 1.828125q0 1.046875 -0.375 1.90625q-0.375 0.84375 -1.109375 1.296875q-0.71875 0.453125 -1.53125 0.453125q-0.578125 0 -1.046875 -0.25q-0.46875 -0.25 -0.765625 -0.625l0 3.375l-1.171875 0zm1.0625 -6.078125q0 1.34375 0.53125 1.984375q0.546875 0.625 1.3125 0.625q0.78125 0 1.34375 -0.65625q0.5625 -0.65625 0.5625 -2.046875q0 -1.3125 -0.546875 -1.96875q-0.546875 -0.671875 -1.296875 -0.671875q-0.75 0 -1.328125 0.703125q-0.578125 0.703125 -0.578125 2.03125zm5.9124756 -0.03125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.1781006 1.390625l1.15625 -0.1875q0.109375 0.703125 0.546875 1.078125q0.453125 0.359375 1.25 0.359375q0.8125 0 1.203125 -0.328125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.359375 -0.625q-0.234375 -0.15625 -1.1875 -0.390625q-1.296875 -0.328125 -1.796875 -0.5625q-0.484375 -0.25 -0.75 -0.65625q-0.25 -0.421875 -0.25 -0.9375q0 -0.453125 0.203125 -0.84375q0.21875 -0.40625 0.578125 -0.671875q0.28125 -0.1875 0.75 -0.328125q0.46875 -0.140625 1.015625 -0.140625q0.8125 0 1.421875 0.234375q0.609375 0.234375 0.90625 0.640625q0.296875 0.390625 0.40625 1.0625l-1.140625 0.15625q-0.078125 -0.53125 -0.453125 -0.828125q-0.375 -0.3125 -1.0625 -0.3125q-0.8125 0 -1.15625 0.265625q-0.34375 0.265625 -0.34375 0.625q0 0.234375 0.140625 0.421875q0.15625 0.1875 0.453125 0.3125q0.171875 0.0625 1.03125 0.296875q1.25 0.328125 1.734375 0.546875q0.5 0.203125 0.78125 0.609375q0.28125 0.40625 0.28125 1.0q0 0.59375 -0.34375 1.109375q-0.34375 0.515625 -1.0 0.796875q-0.640625 0.28125 -1.453125 0.28125q-1.34375 0 -2.046875 -0.5625q-0.703125 -0.5625 -0.90625 -1.65625zm11.8671875 -0.15625l1.203125 0.140625q-0.28125 1.0625 -1.0625 1.65625q-0.765625 0.578125 -1.96875 0.578125q-1.515625 0 -2.40625 -0.9375q-0.890625 -0.9375 -0.890625 -2.609375q0 -1.75 0.890625 -2.703125q0.90625 -0.96875 2.34375 -0.96875q1.390625 0 2.265625 0.9375q0.875 0.9375 0.875 2.65625q0 0.109375 0 0.3125l-5.15625 0q0.0625 1.140625 0.640625 1.75q0.578125 0.59375 1.4375 0.59375q0.65625 0 1.109375 -0.328125q0.453125 -0.34375 0.71875 -1.078125zm-3.84375 -1.90625l3.859375 0q-0.078125 -0.859375 -0.4375 -1.296875q-0.5625 -0.6875 -1.453125 -0.6875q-0.8125 0 -1.359375 0.546875q-0.546875 0.53125 -0.609375 1.4375zm6.5062256 4.125l0 -6.90625l1.0625 0l0 1.046875q0.40625 -0.734375 0.734375 -0.96875q0.34375 -0.234375 0.765625 -0.234375q0.59375 0 1.203125 0.375l-0.40625 1.078125q-0.4375 -0.25 -0.859375 -0.25q-0.390625 0 -0.703125 0.234375q-0.296875 0.234375 -0.421875 0.640625q-0.203125 0.625 -0.203125 1.359375l0 3.625l-1.171875 0zm4.7821045 -5.578125l0 -1.328125l1.328125 0l0 1.328125l-1.328125 0zm0 5.578125l0 -1.328125l1.328125 0l0 1.328125l-1.328125 0zm7.0778503 0l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.484375 0.3125 0.6875 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.171875 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm10.6649475 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm7.1937256 0.578125l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.5q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.609375 -0.328125 2.28125q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.15625q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.2093506 0.125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm11.131226 3.453125l0 -0.875q-0.65625 1.03125 -1.9375 1.03125q-0.8125 0 -1.515625 -0.453125q-0.6875 -0.453125 -1.078125 -1.265625q-0.375 -0.828125 -0.375 -1.890625q0 -1.03125 0.34375 -1.875q0.34375 -0.84375 1.03125 -1.28125q0.703125 -0.453125 1.546875 -0.453125q0.625 0 1.109375 0.265625q0.5 0.25 0.796875 0.671875l0 -3.421875l1.171875 0l0 9.546875l-1.09375 0zm-3.703125 -3.453125q0 1.328125 0.5625 1.984375q0.5625 0.65625 1.328125 0.65625q0.765625 0 1.296875 -0.625q0.53125 -0.625 0.53125 -1.90625q0 -1.421875 -0.546875 -2.078125q-0.546875 -0.671875 -1.34375 -0.671875q-0.78125 0 -1.3125 0.640625q-0.515625 0.625 -0.515625 2.0zm7.7093506 3.453125l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm5.4593506 3.65625l2.765625 -9.859375l0.9375 0l-2.765625 9.859375l-0.9375 0zm4.578003 -0.15625l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.484375 0.3125 0.6875 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.171875 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm10.664917 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm7.1937256 0.578125l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.5q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.609375 -0.328125 2.28125q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.15625q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.2093506 0.125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm11.131226 3.453125l0 -0.875q-0.65625 1.03125 -1.9375 1.03125q-0.8125 0 -1.515625 -0.453125q-0.6875 -0.453125 -1.078125 -1.265625q-0.375 -0.828125 -0.375 -1.890625q0 -1.03125 0.34375 -1.875q0.34375 -0.84375 1.03125 -1.28125q0.703125 -0.453125 1.546875 -0.453125q0.625 0 1.109375 0.265625q0.5 0.25 0.796875 0.671875l0 -3.421875l1.171875 0l0 9.546875l-1.09375 0zm-3.703125 -3.453125q0 1.328125 0.5625 1.984375q0.5625 0.65625 1.328125 0.65625q0.765625 0 1.296875 -0.625q0.53125 -0.625 0.53125 -1.90625q0 -1.421875 -0.546875 -2.078125q-0.546875 -0.671875 -1.34375 -0.671875q-0.78125 0 -1.3125 0.640625q-0.515625 0.625 -0.515625 2.0zm7.7093506 3.453125l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm7.0999756 6.3125l-0.828125 0q1.9375 -3.125 1.9375 -6.265625q0 -1.21875 -0.28125 -2.421875q-0.21875 -0.984375 -0.609375 -1.875q-0.265625 -0.59375 -1.046875 -1.953125l0.828125 0q1.234375 1.640625 1.8125 3.28125q0.5 1.421875 0.5 2.96875q0 1.75 -0.671875 3.390625q-0.671875 1.640625 -1.640625 2.875z" fill-rule="nonzero"/><path fill="#f4cccc" d="m80.661415 343.38617l0 0c0 -9.146973 7.4150696 -16.562012 16.562012 -16.562012l130.0886 0c4.392517 0 8.605118 1.7449036 11.711105 4.850891c3.1059723 3.1059875 4.850891 7.3186035 4.850891 11.711121l0 66.24603c0 9.146973 -7.4150543 16.562012 -16.561996 16.562012l-130.0886 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m80.661415 343.38617l0 0c0 -9.146973 7.4150696 -16.562012 16.562012 -16.562012l130.0886 0c4.392517 0 8.605118 1.7449036 11.711105 4.850891c3.1059723 3.1059875 4.850891 7.3186035 4.850891 11.711121l0 66.24603c0 9.146973 -7.4150543 16.562012 -16.561996 16.562012l-130.0886 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path fill="#000000" d="m139.03487 370.74167l1.765625 0.453125q-0.5625 2.171875 -2.0 3.328125q-1.4375 1.140625 -3.53125 1.140625q-2.15625 0 -3.515625 -0.875q-1.34375 -0.890625 -2.0625 -2.546875q-0.703125 -1.671875 -0.703125 -3.59375q0 -2.078125 0.796875 -3.625q0.796875 -1.5625 2.265625 -2.359375q1.484375 -0.8125 3.25 -0.8125q2.0 0 3.359375 1.015625q1.375 1.015625 1.90625 2.875l-1.734375 0.40625q-0.46875 -1.453125 -1.359375 -2.109375q-0.875 -0.671875 -2.203125 -0.671875q-1.546875 0 -2.578125 0.734375q-1.03125 0.734375 -1.453125 1.984375q-0.421875 1.234375 -0.421875 2.5625q0 1.703125 0.5 2.96875q0.5 1.265625 1.546875 1.90625q1.046875 0.625 2.265625 0.625q1.484375 0 2.515625 -0.859375q1.03125 -0.859375 1.390625 -2.546875zm9.125 4.6875l0 -13.359375l4.609375 0q1.546875 0 2.375 0.203125q1.140625 0.25 1.953125 0.953125q1.0625 0.890625 1.578125 2.28125q0.53125 1.390625 0.53125 3.171875q0 1.515625 -0.359375 2.703125q-0.359375 1.171875 -0.921875 1.9375q-0.546875 0.765625 -1.203125 1.21875q-0.65625 0.4375 -1.59375 0.671875q-0.9375 0.21875 -2.140625 0.21875l-4.828125 0zm1.765625 -1.578125l2.859375 0q1.3125 0 2.0625 -0.234375q0.75 -0.25 1.203125 -0.703125q0.625 -0.625 0.96875 -1.6875q0.359375 -1.0625 0.359375 -2.578125q0 -2.09375 -0.6875 -3.21875q-0.6875 -1.125 -1.671875 -1.5q-0.703125 -0.28125 -2.28125 -0.28125l-2.8125 0l0 10.203125zm11.488571 1.578125l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.228302 -11.46875l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm6.832321 0l-3.6875 -9.671875l1.734375 0l2.078125 5.796875q0.328125 0.9375 0.625 1.9375q0.203125 -0.765625 0.609375 -1.828125l2.140625 -5.90625l1.6875 0l-3.65625 9.671875l-1.53125 0zm13.265625 -3.109375l1.6875 0.203125q-0.40625 1.484375 -1.484375 2.3125q-1.078125 0.8125 -2.765625 0.8125q-2.125 0 -3.375 -1.296875q-1.234375 -1.3125 -1.234375 -3.671875q0 -2.453125 1.25 -3.796875q1.265625 -1.34375 3.265625 -1.34375q1.9375 0 3.15625 1.328125q1.234375 1.3125 1.234375 3.703125q0 0.15625 0 0.4375l-7.21875 0q0.09375 1.59375 0.90625 2.453125q0.8125 0.84375 2.015625 0.84375q0.90625 0 1.546875 -0.46875q0.640625 -0.484375 1.015625 -1.515625zm-5.390625 -2.65625l5.40625 0q-0.109375 -1.21875 -0.625 -1.828125q-0.78125 -0.953125 -2.03125 -0.953125q-1.125 0 -1.90625 0.765625q-0.765625 0.75 -0.84375 2.015625zm9.125717 5.765625l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0z" fill-rule="nonzero"/><path fill="#000000" d="m130.57883 395.12167q-0.984375 -1.234375 -1.65625 -2.875q-0.65625 -1.640625 -0.65625 -3.390625q0 -1.546875 0.5 -2.96875q0.578125 -1.640625 1.8125 -3.28125l0.828125 0q-0.78125 1.359375 -1.03125 1.9375q-0.40625 0.890625 -0.625 1.875q-0.28125 1.21875 -0.28125 2.4375q0 3.140625 1.9375 6.265625l-0.828125 0zm2.1727448 -2.8125l0 -9.546875l1.171875 0l0 9.546875l-1.171875 0zm2.99234 -8.1875l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm4.02359 0l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm6.3343506 3.5l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.484375 0.3125 0.6875 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.171875 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm10.664932 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm7.1937256 0.578125l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.5q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.609375 -0.328125 2.28125q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.15625q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.2093506 0.125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm11.162476 0.921875l1.15625 0.15625q-0.1875 1.1875 -0.96875 1.859375q-0.78125 0.671875 -1.921875 0.671875q-1.40625 0 -2.28125 -0.921875q-0.859375 -0.9375 -0.859375 -2.65625q0 -1.125 0.375 -1.96875q0.375 -0.84375 1.125 -1.25q0.765625 -0.421875 1.65625 -0.421875q1.125 0 1.84375 0.578125q0.71875 0.5625 0.921875 1.609375l-1.140625 0.171875q-0.171875 -0.703125 -0.59375 -1.046875q-0.40625 -0.359375 -0.984375 -0.359375q-0.890625 0 -1.453125 0.640625q-0.546875 0.640625 -0.546875 2.0q0 1.40625 0.53125 2.03125q0.546875 0.625 1.40625 0.625q0.6875 0 1.140625 -0.421875q0.46875 -0.421875 0.59375 -1.296875zm2.9140625 5.34375l-0.828125 0q1.9375 -3.125 1.9375 -6.265625q0 -1.21875 -0.28125 -2.421875q-0.21875 -0.984375 -0.609375 -1.875q-0.265625 -0.59375 -1.046875 -1.953125l0.828125 0q1.234375 1.640625 1.8125 3.28125q0.5 1.421875 0.5 2.96875q0 1.75 -0.671875 3.390625q-0.671875 1.640625 -1.640625 2.875z" fill-rule="nonzero"/><path fill="#f4cccc" d="m266.72534 343.38617l0 0c0 -9.146973 7.4150696 -16.562012 16.562012 -16.562012l130.08856 0c4.392517 0 8.605133 1.7449036 11.711121 4.850891c3.1059875 3.1059875 4.850891 7.3186035 4.850891 11.711121l0 66.24603c0 9.146973 -7.415039 16.562012 -16.562012 16.562012l-130.08856 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m266.72534 343.38617l0 0c0 -9.146973 7.4150696 -16.562012 16.562012 -16.562012l130.08856 0c4.392517 0 8.605133 1.7449036 11.711121 4.850891c3.1059875 3.1059875 4.850891 7.3186035 4.850891 11.711121l0 66.24603c0 9.146973 -7.415039 16.562012 -16.562012 16.562012l-130.08856 0c-9.146942 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path fill="#000000" d="m295.26633 375.42917l0 -13.359375l5.015625 0q1.53125 0 2.453125 0.40625q0.921875 0.40625 1.4375 1.25q0.53125 0.84375 0.53125 1.765625q0 0.859375 -0.46875 1.625q-0.453125 0.75 -1.390625 1.203125q1.203125 0.359375 1.859375 1.21875q0.65625 0.859375 0.65625 2.015625q0 0.9375 -0.40625 1.75q-0.390625 0.796875 -0.984375 1.234375q-0.578125 0.4375 -1.453125 0.671875q-0.875 0.21875 -2.15625 0.21875l-5.09375 0zm1.78125 -7.75l2.875 0q1.1875 0 1.6875 -0.140625q0.671875 -0.203125 1.015625 -0.671875q0.34375 -0.46875 0.34375 -1.171875q0 -0.65625 -0.328125 -1.15625q-0.3125 -0.515625 -0.90625 -0.703125q-0.59375 -0.1875 -2.03125 -0.1875l-2.65625 0l0 4.03125zm0 6.171875l3.3125 0q0.859375 0 1.203125 -0.0625q0.609375 -0.109375 1.015625 -0.359375q0.421875 -0.265625 0.6875 -0.75q0.265625 -0.484375 0.265625 -1.125q0 -0.75 -0.390625 -1.296875q-0.375 -0.546875 -1.0625 -0.765625q-0.671875 -0.234375 -1.953125 -0.234375l-3.078125 0l0 4.59375zm10.146698 -2.71875l1.65625 -0.140625q0.125 1.0 0.546875 1.640625q0.4375 0.640625 1.34375 1.046875q0.921875 0.390625 2.0625 0.390625q1.0 0 1.78125 -0.296875q0.78125 -0.296875 1.15625 -0.8125q0.375 -0.53125 0.375 -1.15625q0 -0.625 -0.375 -1.09375q-0.359375 -0.46875 -1.1875 -0.796875q-0.546875 -0.203125 -2.390625 -0.640625q-1.828125 -0.453125 -2.5625 -0.84375q-0.96875 -0.5 -1.4375 -1.234375q-0.46875 -0.75 -0.46875 -1.671875q0 -1.0 0.578125 -1.875q0.578125 -0.890625 1.671875 -1.34375q1.109375 -0.453125 2.453125 -0.453125q1.484375 0 2.609375 0.484375q1.140625 0.46875 1.75 1.40625q0.609375 0.921875 0.65625 2.09375l-1.6875 0.125q-0.140625 -1.265625 -0.9375 -1.90625q-0.78125 -0.65625 -2.3125 -0.65625q-1.609375 0 -2.34375 0.59375q-0.734375 0.59375 -0.734375 1.421875q0 0.71875 0.53125 1.171875q0.5 0.46875 2.65625 0.96875q2.15625 0.484375 2.953125 0.84375q1.171875 0.53125 1.71875 1.359375q0.5625 0.828125 0.5625 1.90625q0 1.0625 -0.609375 2.015625q-0.609375 0.9375 -1.75 1.46875q-1.140625 0.515625 -2.578125 0.515625q-1.8125 0 -3.046875 -0.53125q-1.21875 -0.53125 -1.921875 -1.59375q-0.6875 -1.0625 -0.71875 -2.40625zm12.506073 -2.203125q0 -3.328125 1.78125 -5.203125q1.78125 -1.890625 4.609375 -1.890625q1.84375 0 3.328125 0.890625q1.484375 0.875 2.265625 2.46875q0.78125 1.578125 0.78125 3.578125q0 2.03125 -0.828125 3.640625q-0.8125 1.59375 -2.3125 2.421875q-1.5 0.828125 -3.25 0.828125q-1.875 0 -3.359375 -0.90625q-1.484375 -0.921875 -2.25 -2.5q-0.765625 -1.578125 -0.765625 -3.328125zm1.8125 0.015625q0 2.421875 1.296875 3.8125q1.296875 1.390625 3.265625 1.390625q2.0 0 3.28125 -1.40625q1.28125 -1.40625 1.28125 -3.984375q0 -1.625 -0.546875 -2.84375q-0.546875 -1.21875 -1.609375 -1.875q-1.0625 -0.671875 -2.375 -0.671875q-1.890625 0 -3.25 1.296875q-1.34375 1.28125 -1.34375 4.28125zm13.214569 6.484375l0 -13.359375l1.8125 0l7.015625 10.484375l0 -10.484375l1.6875 0l0 13.359375l-1.8125 0l-7.015625 -10.5l0 10.5l-1.6875 0zm18.421875 0l0 -13.359375l1.640625 0l0 13.359375l-1.640625 0zm4.191681 -11.46875l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm5.6448364 0l-1.515625 0l0 -13.359375l1.640625 0l0 4.765625q1.046875 -1.296875 2.65625 -1.296875q0.890625 0 1.6875 0.359375q0.796875 0.359375 1.3125 1.015625q0.515625 0.640625 0.796875 1.5625q0.296875 0.921875 0.296875 1.96875q0 2.484375 -1.234375 3.84375q-1.21875 1.359375 -2.953125 1.359375q-1.703125 0 -2.6875 -1.4375l0 1.21875zm-0.015625 -4.90625q0 1.734375 0.484375 2.515625q0.765625 1.265625 2.09375 1.265625q1.078125 0 1.859375 -0.9375q0.78125 -0.9375 0.78125 -2.78125q0 -1.890625 -0.75 -2.796875q-0.75 -0.90625 -1.828125 -0.90625q-1.0625 0 -1.859375 0.9375q-0.78125 0.9375 -0.78125 2.703125zm8.875702 4.90625l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm12.540802 -1.1875q-0.921875 0.765625 -1.765625 1.09375q-0.828125 0.3125 -1.796875 0.3125q-1.59375 0 -2.453125 -0.78125q-0.859375 -0.78125 -0.859375 -1.984375q0 -0.71875 0.328125 -1.296875q0.328125 -0.59375 0.84375 -0.9375q0.53125 -0.359375 1.1875 -0.546875q0.46875 -0.125 1.453125 -0.25q1.984375 -0.234375 2.921875 -0.5625q0.015625 -0.34375 0.015625 -0.421875q0 -1.0 -0.46875 -1.421875q-0.625 -0.546875 -1.875 -0.546875q-1.15625 0 -1.703125 0.40625q-0.546875 0.40625 -0.8125 1.421875l-1.609375 -0.21875q0.21875 -1.015625 0.71875 -1.640625q0.5 -0.640625 1.453125 -0.984375q0.953125 -0.34375 2.1875 -0.34375q1.25 0 2.015625 0.296875q0.78125 0.28125 1.140625 0.734375q0.375 0.4375 0.515625 1.109375q0.078125 0.421875 0.078125 1.515625l0 2.1875q0 2.28125 0.109375 2.890625q0.109375 0.59375 0.40625 1.15625l-1.703125 0q-0.265625 -0.515625 -0.328125 -1.1875zm-0.140625 -3.671875q-0.890625 0.375 -2.671875 0.625q-1.015625 0.140625 -1.4375 0.328125q-0.421875 0.1875 -0.65625 0.53125q-0.21875 0.34375 -0.21875 0.78125q0 0.65625 0.5 1.09375q0.5 0.4375 1.453125 0.4375q0.9375 0 1.671875 -0.40625q0.75 -0.421875 1.09375 -1.140625q0.265625 -0.5625 0.265625 -1.640625l0 -0.609375zm4.1882324 4.859375l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.150177 3.71875l-0.1875 -1.53125q0.546875 0.140625 0.9375 0.140625q0.546875 0 0.875 -0.1875q0.328125 -0.171875 0.546875 -0.5q0.15625 -0.25 0.5 -1.21875q0.046875 -0.140625 0.140625 -0.40625l-3.671875 -9.6875l1.765625 0l2.015625 5.59375q0.390625 1.078125 0.703125 2.25q0.28125 -1.125 0.671875 -2.203125l2.078125 -5.640625l1.640625 0l-3.6875 9.828125q-0.59375 1.609375 -0.921875 2.203125q-0.4375 0.8125 -1.0 1.1875q-0.5625 0.375 -1.34375 0.375q-0.484375 0 -1.0625 -0.203125z" fill-rule="nonzero"/><path fill="#000000" d="m325.9002 395.12167q-0.984375 -1.234375 -1.65625 -2.875q-0.65625 -1.640625 -0.65625 -3.390625q0 -1.546875 0.5 -2.96875q0.578125 -1.640625 1.8125 -3.28125l0.828125 0q-0.78125 1.359375 -1.03125 1.9375q-0.40625 0.890625 -0.625 1.875q-0.28125 1.21875 -0.28125 2.4375q0 3.140625 1.9375 6.265625l-0.828125 0zm2.1727295 -2.8125l0 -9.546875l1.171875 0l0 9.546875l-1.171875 0zm2.99234 -8.1875l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm4.02359 0l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm7.4124756 3.5l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm5.8656006 1.4375l1.15625 -0.1875q0.109375 0.703125 0.546875 1.078125q0.453125 0.359375 1.25 0.359375q0.8125 0 1.203125 -0.328125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.359375 -0.625q-0.234375 -0.15625 -1.1875 -0.390625q-1.296875 -0.328125 -1.796875 -0.5625q-0.484375 -0.25 -0.75 -0.65625q-0.25 -0.421875 -0.25 -0.9375q0 -0.453125 0.203125 -0.84375q0.21875 -0.40625 0.578125 -0.671875q0.28125 -0.1875 0.75 -0.328125q0.46875 -0.140625 1.015625 -0.140625q0.8125 0 1.421875 0.234375q0.609375 0.234375 0.90625 0.640625q0.296875 0.390625 0.40625 1.0625l-1.140625 0.15625q-0.078125 -0.53125 -0.453125 -0.828125q-0.375 -0.3125 -1.0625 -0.3125q-0.8125 0 -1.15625 0.265625q-0.34375 0.265625 -0.34375 0.625q0 0.234375 0.140625 0.421875q0.15625 0.1875 0.453125 0.3125q0.171875 0.0625 1.03125 0.296875q1.25 0.328125 1.734375 0.546875q0.5 0.203125 0.78125 0.609375q0.28125 0.40625 0.28125 1.0q0 0.59375 -0.34375 1.109375q-0.34375 0.515625 -1.0 0.796875q-0.640625 0.28125 -1.453125 0.28125q-1.34375 0 -2.046875 -0.5625q-0.703125 -0.5625 -0.90625 -1.65625zm6.6953125 -1.390625q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm8.178101 2.8125l-0.828125 0q1.9375 -3.125 1.9375 -6.265625q0 -1.21875 -0.28125 -2.421875q-0.21875 -0.984375 -0.609375 -1.875q-0.265625 -0.59375 -1.046875 -1.953125l0.828125 0q1.234375 1.640625 1.8125 3.28125q0.5 1.421875 0.5 2.96875q0 1.75 -0.671875 3.390625q-0.671875 1.640625 -1.640625 2.875z" fill-rule="nonzero"/><path fill="#93c47d" d="m6.304462 166.96063l0 -158.99214l45.795277 0l0 158.99214z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m6.304462 166.96063l0 -158.99214l45.795277 0l0 158.99214z" fill-rule="evenodd"/><path fill="#000000" d="m22.762724 114.59216l0 -1.765625l7.71875 0q2.015623 0 3.203123 0.453125q1.1875 0.453125 1.9375 1.640625q0.734375 1.1875 0.734375 3.125q0 1.875 -0.640625 3.078125q-0.65625 1.1875 -1.875 1.703125q-1.234375 0.5 -3.359373 0.5l-7.71875 0l0 -1.765625l7.71875 0q1.7343731 0 2.562498 -0.3125q0.8125 -0.328125 1.265625 -1.109375q0.453125 -0.796875 0.453125 -1.9375q0 -1.953125 -0.890625 -2.78125q-0.890625 -0.828125 -3.390623 -0.828125l-7.71875 0zm10.468748 -3.8479462l-0.25 -1.625q0.96875 -0.125 1.5 -0.75q0.515625 -0.625 0.515625 -1.75q0 -1.125 -0.453125 -1.671875q-0.46875 -0.546875 -1.09375 -0.546875q-0.546875 0 -0.875 0.484375q-0.21875 0.328125 -0.546875 1.671875q-0.4687481 1.8125 -0.7968731 2.515625q-0.328125 0.6875 -0.90625 1.046875q-0.59375 0.359375 -1.3125 0.359375q-0.640625 0 -1.1875 -0.296875q-0.5625 -0.296875 -0.921875 -0.8125q-0.28125 -0.375 -0.46875 -1.03125q-0.203125 -0.671875 -0.203125 -1.421875q0 -1.140625 0.328125 -2.0q0.328125 -0.859375 0.890625 -1.265625q0.5625 -0.421875 1.5 -0.578125l0.21875 1.609375q-0.75 0.109375 -1.171875 0.640625q-0.421875 0.515625 -0.421875 1.46875q0 1.140625 0.375 1.625q0.375 0.46875 0.875 0.46875q0.3125 0 0.578125 -0.1875q0.265625 -0.203125 0.4375 -0.640625q0.09375 -0.234375 0.421875 -1.4375q0.453125 -1.75 0.75 -2.4375q0.296875 -0.6875 0.859375 -1.078125q0.5624981 -0.390625 1.4062481 -0.390625q0.828125 0 1.546875 0.484375q0.71875 0.46875 1.125 1.375q0.390625 0.90625 0.390625 2.046875q0 1.875 -0.78125 2.875q-0.78125 0.984375 -2.328125 1.25zm-0.21875 -16.609375l0.203125 -1.6875q1.484375 0.40625 2.3125 1.484375q0.8125 1.078125 0.8125 2.765625q0 2.125 -1.296875 3.375q-1.3125 1.234375 -3.671873 1.234375q-2.453125 0 -3.796875 -1.25q-1.34375 -1.265625 -1.34375 -3.265625q0 -1.9375 1.328125 -3.15625q1.3125 -1.234375 3.703125 -1.234375q0.15625 0 0.4375 0l0 7.21875q1.5937481 -0.09375 2.453123 -0.90625q0.84375 -0.8125 0.84375 -2.015625q0 -0.90625 -0.46875 -1.546875q-0.484375 -0.640625 -1.515625 -1.015625zm-2.656248 5.390625l0 -5.40625q-1.21875 0.109375 -1.828125 0.625q-0.953125 0.78125 -0.953125 2.03125q0 1.125 0.765625 1.90625q0.75 0.765625 2.015625 0.84375zm5.765623 -9.125717l-9.671873 0l0 -1.46875l1.46875 0q-1.03125 -0.5625 -1.359375 -1.03125q-0.328125 -0.484375 -0.328125 -1.0625q0 -0.828125 0.53125 -1.6875l1.515625 0.5625q-0.359375 0.609375 -0.359375 1.203125q0 0.546875 0.328125 0.96875q0.328125 0.421875 0.890625 0.609375q0.875 0.28125 1.921875 0.28125l5.062498 0l0 1.625zm0 -6.181427l-13.359373 0l0 -1.640625l13.359373 0l0 1.640625zm-1.1875 -10.504196q0.765625 0.921875 1.09375 1.765625q0.3125 0.828125 0.3125 1.796875q0 1.59375 -0.78125 2.453125q-0.78125 0.859375 -1.984375 0.859375q-0.71875 0 -1.296875 -0.328125q-0.5937481 -0.328125 -0.9374981 -0.84375q-0.359375 -0.53125 -0.546875 -1.1875q-0.125 -0.46875 -0.25 -1.453125q-0.234375 -1.984375 -0.5625 -2.921875q-0.34375 -0.015625 -0.421875 -0.015625q-1.0 0 -1.421875 0.46875q-0.546875 0.625 -0.546875 1.875q0 1.15625 0.40625 1.703125q0.40625 0.546875 1.421875 0.8125l-0.21875 1.609375q-1.015625 -0.21875 -1.640625 -0.71875q-0.640625 -0.5 -0.984375 -1.453125q-0.34375 -0.953125 -0.34375 -2.1875q0 -1.25 0.296875 -2.015625q0.28125 -0.78125 0.734375 -1.140625q0.4375 -0.375 1.109375 -0.515625q0.421875 -0.078125 1.515625 -0.078125l2.187498 0q2.28125 0 2.890625 -0.109375q0.59375 -0.109375 1.15625 -0.40625l0 1.703125q-0.515625 0.265625 -1.1875 0.328125zm-3.671873 0.140625q0.375 0.890625 0.625 2.671875q0.1406231 1.015625 0.3281231 1.4375q0.1875 0.421875 0.53125 0.65625q0.34375 0.21875 0.78125 0.21875q0.65625 0 1.09375 -0.5q0.4375 -0.5 0.4375 -1.453125q0 -0.9375 -0.40625 -1.671875q-0.421875 -0.75 -1.140625 -1.09375q-0.5625 -0.265625 -1.6406231 -0.265625l-0.609375 0zm4.859373 -4.203842l-9.671873 0l0 -1.46875l1.375 0q-1.59375 -1.0625 -1.59375 -3.078125q0 -0.875 0.3125 -1.6093788q0.3125 -0.734375 0.828125 -1.09375q0.5 -0.375 1.203125 -0.515625q0.453125 -0.09375 1.59375 -0.09375l5.953123 0l0 1.640625l-5.890623 0q-1.0 0 -1.484375 0.203125q-0.5 0.1875 -0.796875 0.6718788q-0.296875 0.484375 -0.296875 1.140625q0 1.046875 0.671875 1.8125q0.65625 0.75 2.515625 0.75l5.281248 0l0 1.640625zm0 -16.641346l-1.21875 0q1.4375 0.90625 1.4375 2.703125q0 1.15625 -0.640625 2.125q-0.640625 0.96875 -1.78125 1.5q-1.140625 0.53125 -2.624998 0.53125q-1.453125 0 -2.625 -0.484375q-1.1875 -0.484375 -1.8125 -1.4375q-0.625 -0.96875 -0.625 -2.171875q0 -0.875 0.375 -1.546875q0.359375 -0.6875 0.953125 -1.109375l-4.796875 0l0 -1.640625l13.359373 0l0 1.53125zm-4.828123 5.171875q1.8593731 0 2.781248 -0.78125q0.921875 -0.78125 0.921875 -1.84375q0 -1.078125 -0.875 -1.828125q-0.890625 -0.75 -2.687498 -0.75q-1.984375 0 -2.90625 0.765625q-0.9375 0.765625 -0.9375 1.890625q0 1.078125 0.890625 1.8125q0.890625 0.734375 2.8125 0.734375z" fill-rule="nonzero"/><path fill="#6fa8dc" d="m6.304462 303.47507l0 -126.96063l45.795277 0l0 126.96063z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m6.304462 303.47507l0 -126.96063l45.795277 0l0 126.96063z" fill-rule="evenodd"/><path fill="#000000" d="m36.122097 279.4914l-13.359373 0l0 -9.65625l1.578125 0l0 7.875l4.09375 0l0 -7.375l1.5625 0l0 7.375l4.546873 0l0 -8.1875l1.578125 0l0 9.96875zm0 -11.115448l-5.031248 -3.53125l-4.640625 3.265625l0 -2.046875l2.265625 -1.484375q0.640625 -0.421875 1.078125 -0.671875q-0.59375 -0.40625 -1.0625 -0.734375l-2.28125 -1.640625l0 -1.953125l4.546875 3.34375l5.124998 -3.59375l0 2.015625l-3.0 1.984375l-0.8125 0.515625l3.8125 2.546875l0 1.984375zm-1.46875 -13.999985l1.453125 -0.234375q0.140625 0.6875 0.140625 1.234375q0 0.89060974 -0.28125 1.3906097q-0.28125 0.484375 -0.734375 0.6875q-0.46875 0.203125 -1.9375 0.203125l-5.578123 0l0 1.203125l-1.265625 0l0 -1.203125l-2.390625 0l-0.984375 -1.625l3.375 0l0 -1.6562347l1.265625 0l0 1.6562347l5.671873 0q0.6875 0 0.890625 -0.07810974q0.203125 -0.09375 0.328125 -0.28125q0.109375 -0.203125 0.109375 -0.578125q0 -0.265625 -0.0625 -0.71875zm-1.640625 -8.230179l0.203125 -1.6875q1.484375 0.40625 2.3125 1.484375q0.8125 1.078125 0.8125 2.765625q0 2.125 -1.296875 3.375q-1.3125 1.234375 -3.671873 1.234375q-2.453125 0 -3.796875 -1.25q-1.34375 -1.265625 -1.34375 -3.265625q0 -1.9375 1.328125 -3.15625q1.3125 -1.234375 3.703125 -1.234375q0.15625 0 0.4375 0l0 7.21875q1.5937481 -0.09375 2.453123 -0.90625q0.84375 -0.8125 0.84375 -2.015625q0 -0.90625 -0.46875 -1.546875q-0.484375 -0.640625 -1.515625 -1.015625zm-2.656248 5.390625l0 -5.40625q-1.21875 0.109375 -1.828125 0.625q-0.953125 0.78125 -0.953125 2.03125q0 1.125 0.765625 1.90625q0.75 0.765625 2.015625 0.84375zm5.765623 -9.141342l-9.671873 0l0 -1.46875l1.375 0q-1.59375 -1.0625 -1.59375 -3.078125q0 -0.875 0.3125 -1.609375q0.3125 -0.734375 0.828125 -1.09375q0.5 -0.375 1.203125 -0.515625q0.453125 -0.09375 1.59375 -0.09375l5.953123 0l0 1.640625l-5.890623 0q-1.0 0 -1.484375 0.203125q-0.5 0.1875 -0.796875 0.671875q-0.296875 0.484375 -0.296875 1.140625q0 1.046875 0.671875 1.8125q0.65625 0.75 2.515625 0.75l5.281248 0l0 1.640625zm-2.890625 -9.719467l-0.25 -1.625q0.96875 -0.125 1.5 -0.75q0.515625 -0.625 0.515625 -1.75q0 -1.125 -0.453125 -1.671875q-0.46875 -0.546875 -1.09375 -0.546875q-0.546875 0 -0.875 0.484375q-0.21875 0.328125 -0.546875 1.671875q-0.4687481 1.8125 -0.7968731 2.515625q-0.328125 0.6875 -0.90625 1.046875q-0.59375 0.359375 -1.3125 0.359375q-0.640625 0 -1.1875 -0.296875q-0.5625 -0.296875 -0.921875 -0.8125q-0.28125 -0.375 -0.46875 -1.03125q-0.203125 -0.671875 -0.203125 -1.421875q0 -1.140625 0.328125 -2.0q0.328125 -0.859375 0.890625 -1.265625q0.5625 -0.421875 1.5 -0.578125l0.21875 1.609375q-0.75 0.109375 -1.171875 0.640625q-0.421875 0.515625 -0.421875 1.46875q0 1.140625 0.375 1.625q0.375 0.46875 0.875 0.46875q0.3125 0 0.578125 -0.1875q0.265625 -0.203125 0.4375 -0.640625q0.09375 -0.234375 0.421875 -1.4375q0.453125 -1.75 0.75 -2.4375q0.296875 -0.6875 0.859375 -1.078125q0.5624981 -0.390625 1.4062481 -0.390625q0.828125 0 1.546875 0.484375q0.71875 0.46875 1.125 1.375q0.390625 0.90625 0.390625 2.046875q0 1.875 -0.78125 2.875q-0.78125 0.984375 -2.328125 1.25zm-8.578123 -9.984375l-1.890625 0l0 -1.640625l1.890625 0l0 1.640625zm11.468748 0l-9.671873 0l0 -1.640625l9.671873 0l0 1.640625zm-4.843748 -3.5354462q-2.6875 0 -3.96875 -1.484375q-1.078125 -1.25 -1.078125 -3.046875q0 -2.0 1.3125 -3.265625q1.296875 -1.265625 3.609375 -1.265625q1.8593731 0 2.937498 0.5625q1.0625 0.5625 1.65625 1.640625q0.59375 1.0625 0.59375 2.328125q0 2.03125 -1.296875 3.28125q-1.3125 1.25 -3.765623 1.25zm0 -1.6875q1.8593731 0 2.796873 -0.796875q0.921875 -0.8125 0.921875 -2.046875q0 -1.21875 -0.921875 -2.03125q-0.9375 -0.8125 -2.843748 -0.8125q-1.796875 0 -2.71875 0.8125q-0.921875 0.8125 -0.921875 2.03125q0 1.234375 0.921875 2.046875q0.90625 0.796875 2.765625 0.796875zm4.843748 -9.297592l-9.671873 0l0 -1.46875l1.375 0q-1.59375 -1.0625 -1.59375 -3.078125q0 -0.875 0.3125 -1.609375q0.3125 -0.734375 0.828125 -1.09375q0.5 -0.375 1.203125 -0.515625q0.453125 -0.09375 1.59375 -0.09375l5.953123 0l0 1.640625l-5.890623 0q-1.0 0 -1.484375 0.203125q-0.5 0.1875 -0.796875 0.671875q-0.296875 0.484375 -0.296875 1.140625q0 1.046875 0.671875 1.8125q0.65625 0.75 2.515625 0.75l5.281248 0l0 1.640625z" fill-rule="nonzero"/><path fill="#e06666" d="m6.304462 439.9895l0 -126.96063l45.795277 0l0 126.96063z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m6.304462 439.9895l0 -126.96063l45.795277 0l0 126.96063z" fill-rule="evenodd"/><path fill="#000000" d="m31.825224 406.76526l-0.140625 -1.65625q0.9999981 -0.125 1.6406231 -0.546875q0.640625 -0.4375 1.046875 -1.34375q0.390625 -0.921875 0.390625 -2.0625q0 -1.0 -0.296875 -1.78125q-0.296875 -0.78125 -0.8125 -1.15625q-0.53125 -0.375 -1.15625 -0.375q-0.6249981 0 -1.0937481 0.375q-0.46875 0.359375 -0.796875 1.1875q-0.203125 0.546875 -0.640625 2.390625q-0.453125 1.828125 -0.84375 2.5625q-0.5 0.96875 -1.234375 1.4375q-0.75 0.46875 -1.671875 0.46875q-1.0 0 -1.875 -0.578125q-0.890625 -0.578125 -1.34375 -1.671875q-0.453125 -1.109375 -0.453125 -2.453125q0 -1.484375 0.484375 -2.609375q0.46875 -1.140625 1.40625 -1.75q0.921875 -0.609375 2.09375 -0.65625l0.125 1.6875q-1.265625 0.140625 -1.90625 0.9375q-0.65625 0.78125 -0.65625 2.3125q0 1.609375 0.59375 2.34375q0.59375 0.734375 1.421875 0.734375q0.71875 0 1.171875 -0.53125q0.46875 -0.5 0.96875 -2.65625q0.484375 -2.15625 0.84375 -2.953125q0.53125 -1.171875 1.359375 -1.71875q0.828125 -0.5625 1.9062481 -0.5625q1.0625 0 2.015625 0.609375q0.9375 0.609375 1.46875 1.75q0.515625 1.140625 0.515625 2.578125q0 1.8125 -0.53125 3.046875q-0.53125 1.21875 -1.59375 1.921875q-1.0625 0.6875 -2.406248 0.71875zm8.015623 -12.756073l-1.53125 0.1875q0.140625 -0.546875 0.140625 -0.9375q0 -0.546875 -0.1875 -0.875q-0.171875 -0.328125 -0.5 -0.546875q-0.25 -0.15625 -1.21875 -0.5q-0.140625 -0.046875 -0.40625 -0.140625l-9.687498 3.671875l0 -1.765625l5.593748 -2.015625q1.078125 -0.390625 2.25 -0.703125q-1.125 -0.28125 -2.203125 -0.671875l-5.640623 -2.078125l0 -1.640625l9.828123 3.6875q1.609375 0.59375 2.203125 0.921875q0.8125 0.4375 1.1875 1.0q0.375 0.5625 0.375 1.34375q0 0.484375 -0.203125 1.0625zm-6.609375 -8.75l-0.25 -1.625q0.96875 -0.125 1.5 -0.75q0.515625 -0.625 0.515625 -1.75q0 -1.125 -0.453125 -1.671875q-0.46875 -0.546875 -1.09375 -0.546875q-0.546875 0 -0.875 0.484375q-0.21875 0.328125 -0.546875 1.671875q-0.4687481 1.8125 -0.7968731 2.515625q-0.328125 0.6875 -0.90625 1.046875q-0.59375 0.359375 -1.3125 0.359375q-0.640625 0 -1.1875 -0.296875q-0.5625 -0.296875 -0.921875 -0.8125q-0.28125 -0.375 -0.46875 -1.03125q-0.203125 -0.671875 -0.203125 -1.421875q0 -1.140625 0.328125 -2.0q0.328125 -0.859375 0.890625 -1.265625q0.5625 -0.421875 1.5 -0.578125l0.21875 1.609375q-0.75 0.109375 -1.171875 0.640625q-0.421875 0.515625 -0.421875 1.46875q0 1.140625 0.375 1.625q0.375 0.46875 0.875 0.46875q0.3125 0 0.578125 -0.1875q0.265625 -0.203125 0.4375 -0.640625q0.09375 -0.234375 0.421875 -1.4375q0.453125 -1.75 0.75 -2.4375q0.296875 -0.6875 0.859375 -1.078125q0.5624981 -0.390625 1.4062481 -0.390625q0.828125 0 1.546875 0.484375q0.71875 0.46875 1.125 1.375q0.390625 0.90625 0.390625 2.046875q0 1.875 -0.78125 2.875q-0.78125 0.984375 -2.328125 1.25zm1.421875 -13.5625l1.453125 -0.234375q0.140625 0.6875 0.140625 1.234375q0 0.890625 -0.28125 1.390625q-0.28125 0.484375 -0.734375 0.6875q-0.46875 0.203125 -1.9375 0.203125l-5.578123 0l0 1.203125l-1.265625 0l0 -1.203125l-2.390625 0l-0.984375 -1.625l3.375 0l0 -1.65625l1.265625 0l0 1.65625l5.671873 0q0.6875 0 0.890625 -0.078125q0.203125 -0.09375 0.328125 -0.28125q0.109375 -0.203125 0.109375 -0.578125q0 -0.265625 -0.0625 -0.71875zm-1.640625 -8.230194l0.203125 -1.6875q1.484375 0.40625 2.3125 1.484375q0.8125 1.078125 0.8125 2.765625q0 2.125 -1.296875 3.375q-1.3125 1.234375 -3.671873 1.234375q-2.453125 0 -3.796875 -1.25q-1.34375 -1.265625 -1.34375 -3.265625q0 -1.9375 1.328125 -3.15625q1.3125 -1.234375 3.703125 -1.234375q0.15625 0 0.4375 0l0 7.21875q1.5937481 -0.09375 2.453123 -0.90625q0.84375 -0.8125 0.84375 -2.015625q0 -0.90625 -0.46875 -1.546875q-0.484375 -0.640625 -1.515625 -1.015625zm-2.656248 5.390625l0 -5.40625q-1.21875 0.109375 -1.828125 0.625q-0.953125 0.78125 -0.953125 2.03125q0 1.125 0.765625 1.90625q0.75 0.765625 2.015625 0.84375zm5.765623 -9.141327l-9.671873 0l0 -1.46875l1.359375 0q-0.71875 -0.453125 -1.140625 -1.203125q-0.4375 -0.765625 -0.4375 -1.71875q0 -1.078125 0.453125 -1.765625q0.4375 -0.6875 1.234375 -0.96875q-1.6875 -1.15625 -1.6875 -2.984375q0 -1.453125 0.796875 -2.21875q0.796875 -0.78125 2.453125 -0.78125l6.640623 0l0 1.640625l-6.093748 0q-0.984375 0 -1.40625 0.15625q-0.4375 0.15625 -0.703125 0.578125q-0.265625 0.421875 -0.265625 0.984375q0 1.015625 0.6875 1.6875q0.671875 0.671875 2.15625 0.671875l5.624998 0l0 1.640625l-6.281248 0q-1.09375 0 -1.640625 0.40625q-0.546875 0.40625 -0.546875 1.3125q0 0.6875 0.359375 1.28125q0.359375 0.59375 1.0625 0.859375q0.703125 0.25 2.03125 0.25l5.015623 0l0 1.640625z" fill-rule="nonzero"/><path fill="#d9ead3" d="m494.81628 13.664156l0 0c0 -3.1456223 2.5500183 -5.695652 5.695648 -5.695652l109.80551 0c1.5106201 0 2.9592896 0.6000757 4.027466 1.6682177c1.0681152 1.0681419 1.6682129 2.5168533 1.6682129 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80551 0c-3.14563 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m494.81628 13.664156l0 0c0 -3.1456223 2.5500183 -5.695652 5.695648 -5.695652l109.80551 0c1.5106201 0 2.9592896 0.6000757 4.027466 1.6682177c1.0681152 1.0681419 1.6682129 2.5168533 1.6682129 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80551 0c-3.14563 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path fill="#000000" d="m539.80963 26.120743l0 -1.125l4.03125 -0.015625l0 3.546875q-0.921875 0.75 -1.921875 1.125q-0.984375 0.359375 -2.03125 0.359375q-1.40625 0 -2.5625 -0.59375q-1.140625 -0.609375 -1.734375 -1.734375q-0.578125 -1.140625 -0.578125 -2.546875q0 -1.40625 0.578125 -2.609375q0.59375 -1.203125 1.6875 -1.78125q1.09375 -0.59375 2.515625 -0.59375q1.03125 0 1.859375 0.34375q0.84375 0.328125 1.3125 0.9375q0.484375 0.59375 0.734375 1.546875l-1.140625 0.3125q-0.21875 -0.71875 -0.53125 -1.140625q-0.3125 -0.421875 -0.90625 -0.671875q-0.59375 -0.25 -1.3125 -0.25q-0.875 0 -1.515625 0.265625q-0.625 0.265625 -1.015625 0.703125q-0.375 0.421875 -0.59375 0.9375q-0.359375 0.875 -0.359375 1.921875q0 1.265625 0.4375 2.125q0.4375 0.859375 1.265625 1.28125q0.84375 0.421875 1.796875 0.421875q0.8125 0 1.59375 -0.3125q0.78125 -0.328125 1.1875 -0.6875l0 -1.765625l-2.796875 0zm5.7264404 3.734375l0 -6.90625l1.0625 0l0 1.046875q0.40625 -0.734375 0.734375 -0.96875q0.34375 -0.234375 0.765625 -0.234375q0.59375 0 1.203125 0.375l-0.40625 1.078125q-0.4375 -0.25 -0.859375 -0.25q-0.390625 0 -0.703125 0.234375q-0.296875 0.234375 -0.421875 0.640625q-0.203125 0.625 -0.203125 1.359375l0 3.625l-1.171875 0zm4.4696045 -8.1875l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm7.4298706 0l0 -0.875q-0.65625 1.03125 -1.9375 1.03125q-0.8125 0 -1.515625 -0.453125q-0.6875 -0.453125 -1.078125 -1.265625q-0.375 -0.828125 -0.375 -1.890625q0 -1.03125 0.34375 -1.875q0.34375 -0.84375 1.03125 -1.28125q0.703125 -0.453125 1.546875 -0.453125q0.625 0 1.109375 0.265625q0.5 0.25 0.796875 0.671875l0 -3.421875l1.171875 0l0 9.546875l-1.09375 0zm-3.703125 -3.453125q0 1.328125 0.5625 1.984375q0.5625 0.65625 1.328125 0.65625q0.765625 0 1.296875 -0.625q0.53125 -0.625 0.53125 -1.90625q0 -1.421875 -0.546875 -2.078125q-0.546875 -0.671875 -1.34375 -0.671875q-0.78125 0 -1.3125 0.640625q-0.515625 0.625 -0.515625 2.0zm6.8499756 3.453125l0 -9.546875l6.4375 0l0 1.125l-5.171875 0l0 2.96875l4.46875 0l0 1.125l-4.46875 0l0 4.328125l-1.265625 0zm7.6413574 -3.0625l1.203125 -0.109375q0.078125 0.71875 0.390625 1.1875q0.3125 0.453125 0.953125 0.734375q0.65625 0.28125 1.46875 0.28125q0.71875 0 1.265625 -0.21875q0.5625 -0.21875 0.828125 -0.578125q0.265625 -0.375 0.265625 -0.828125q0 -0.453125 -0.265625 -0.78125q-0.25 -0.328125 -0.84375 -0.5625q-0.390625 -0.15625 -1.703125 -0.46875q-1.3125 -0.3125 -1.84375 -0.59375q-0.671875 -0.359375 -1.015625 -0.890625q-0.328125 -0.53125 -0.328125 -1.1875q0 -0.71875 0.40625 -1.34375q0.40625 -0.625 1.1875 -0.953125q0.796875 -0.328125 1.765625 -0.328125q1.046875 0 1.859375 0.34375q0.8125 0.34375 1.25 1.015625q0.4375 0.65625 0.46875 1.484375l-1.203125 0.09375q-0.109375 -0.90625 -0.671875 -1.359375q-0.5625 -0.46875 -1.65625 -0.46875q-1.140625 0 -1.671875 0.421875q-0.515625 0.421875 -0.515625 1.015625q0 0.515625 0.359375 0.84375q0.375 0.328125 1.90625 0.6875q1.546875 0.34375 2.109375 0.59375q0.84375 0.390625 1.234375 0.984375q0.390625 0.578125 0.390625 1.359375q0 0.75 -0.4375 1.4375q-0.421875 0.671875 -1.25 1.046875q-0.8125 0.359375 -1.828125 0.359375q-1.296875 0 -2.171875 -0.375q-0.875 -0.375 -1.375 -1.125q-0.5 -0.765625 -0.53125 -1.71875z" fill-rule="nonzero"/><path fill="#d9ead3" d="m357.6378 13.664156l0 0c0 -3.1456223 2.5500488 -5.695652 5.695648 -5.695652l109.80554 0c1.5105896 0 2.95932 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682434 2.5168533 1.6682434 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80554 0c-3.1455994 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m357.6378 13.664156l0 0c0 -3.1456223 2.5500488 -5.695652 5.695648 -5.695652l109.80554 0c1.5105896 0 2.95932 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682434 2.5168533 1.6682434 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80554 0c-3.1455994 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path fill="#000000" d="m382.28732 29.855118l3.65625 -9.546875l1.359375 0l3.90625 9.546875l-1.4375 0l-1.109375 -2.890625l-3.984375 0l-1.046875 2.890625l-1.34375 0zm2.75 -3.921875l3.234375 0l-1.0 -2.640625q-0.453125 -1.203125 -0.671875 -1.96875q-0.1875 0.90625 -0.515625 1.8125l-1.046875 2.796875zm7.0303955 6.578125l0 -9.5625l1.078125 0l0 0.890625q0.375 -0.53125 0.84375 -0.78125q0.484375 -0.265625 1.15625 -0.265625q0.875 0 1.546875 0.453125q0.6875 0.453125 1.03125 1.28125q0.34375 0.828125 0.34375 1.828125q0 1.046875 -0.375 1.90625q-0.375 0.84375 -1.109375 1.296875q-0.71875 0.453125 -1.53125 0.453125q-0.578125 0 -1.046875 -0.25q-0.46875 -0.25 -0.765625 -0.625l0 3.375l-1.171875 0zm1.0625 -6.078125q0 1.34375 0.53125 1.984375q0.546875 0.625 1.3125 0.625q0.78125 0 1.34375 -0.65625q0.5625 -0.65625 0.5625 -2.046875q0 -1.3125 -0.546875 -1.96875q-0.546875 -0.671875 -1.296875 -0.671875q-0.75 0 -1.328125 0.703125q-0.578125 0.703125 -0.578125 2.03125zm6.3499756 6.078125l0 -9.5625l1.078125 0l0 0.890625q0.375 -0.53125 0.84375 -0.78125q0.484375 -0.265625 1.15625 -0.265625q0.875 0 1.546875 0.453125q0.6875 0.453125 1.03125 1.28125q0.34375 0.828125 0.34375 1.828125q0 1.046875 -0.375 1.90625q-0.375 0.84375 -1.109375 1.296875q-0.71875 0.453125 -1.53125 0.453125q-0.578125 0 -1.046875 -0.25q-0.46875 -0.25 -0.765625 -0.625l0 3.375l-1.171875 0zm1.0625 -6.078125q0 1.34375 0.53125 1.984375q0.546875 0.625 1.3125 0.625q0.78125 0 1.34375 -0.65625q0.5625 -0.65625 0.5625 -2.046875q0 -1.3125 -0.546875 -1.96875q-0.546875 -0.671875 -1.296875 -0.671875q-0.75 0 -1.328125 0.703125q-0.578125 0.703125 -0.578125 2.03125zm6.3343506 3.421875l0 -9.546875l1.171875 0l0 9.546875l-1.171875 0zm2.99234 -8.1875l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm7.46109 -2.53125l1.15625 0.15625q-0.1875 1.1875 -0.96875 1.859375q-0.78125 0.671875 -1.921875 0.671875q-1.40625 0 -2.28125 -0.921875q-0.859375 -0.9375 -0.859375 -2.65625q0 -1.125 0.375 -1.96875q0.375 -0.84375 1.125 -1.25q0.765625 -0.421875 1.65625 -0.421875q1.125 0 1.84375 0.578125q0.71875 0.5625 0.921875 1.609375l-1.140625 0.171875q-0.171875 -0.703125 -0.59375 -1.046875q-0.40625 -0.359375 -0.984375 -0.359375q-0.890625 0 -1.453125 0.640625q-0.546875 0.640625 -0.546875 2.0q0 1.40625 0.53125 2.03125q0.546875 0.625 1.40625 0.625q0.6875 0 1.140625 -0.421875q0.46875 -0.421875 0.59375 -1.296875zm6.6640625 1.671875q-0.65625 0.5625 -1.265625 0.796875q-0.59375 0.21875 -1.28125 0.21875q-1.140625 0 -1.75 -0.546875q-0.609375 -0.5625 -0.609375 -1.4375q0 -0.5 0.21875 -0.921875q0.234375 -0.421875 0.609375 -0.671875q0.375 -0.25 0.84375 -0.390625q0.34375 -0.078125 1.046875 -0.171875q1.421875 -0.171875 2.09375 -0.40625q0 -0.234375 0 -0.296875q0 -0.71875 -0.328125 -1.015625q-0.453125 -0.390625 -1.34375 -0.390625q-0.8125 0 -1.21875 0.296875q-0.390625 0.28125 -0.578125 1.015625l-1.140625 -0.15625q0.15625 -0.734375 0.515625 -1.1875q0.359375 -0.453125 1.03125 -0.6875q0.671875 -0.25 1.5625 -0.25q0.890625 0 1.4375 0.203125q0.5625 0.203125 0.8125 0.53125q0.265625 0.3125 0.375 0.796875q0.046875 0.296875 0.046875 1.078125l0 1.5625q0 1.625 0.078125 2.0625q0.078125 0.4375 0.296875 0.828125l-1.21875 0q-0.1875 -0.359375 -0.234375 -0.859375zm-0.09375 -2.609375q-0.640625 0.265625 -1.921875 0.4375q-0.71875 0.109375 -1.015625 0.25q-0.296875 0.125 -0.46875 0.375q-0.15625 0.25 -0.15625 0.546875q0 0.46875 0.34375 0.78125q0.359375 0.3125 1.046875 0.3125q0.671875 0 1.203125 -0.296875q0.53125 -0.296875 0.78125 -0.8125q0.1875 -0.390625 0.1875 -1.171875l0 -0.421875zm5.5531006 2.421875l0.171875 1.03125q-0.5 0.109375 -0.890625 0.109375q-0.640625 0 -1.0 -0.203125q-0.34375 -0.203125 -0.484375 -0.53125q-0.140625 -0.328125 -0.140625 -1.390625l0 -3.96875l-0.859375 0l0 -0.90625l0.859375 0l0 -1.71875l1.171875 -0.703125l0 2.421875l1.171875 0l0 0.90625l-1.171875 0l0 4.046875q0 0.5 0.046875 0.640625q0.0625 0.140625 0.203125 0.234375q0.140625 0.078125 0.40625 0.078125q0.203125 0 0.515625 -0.046875zm1.1560974 -7.140625l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm2.507965 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm6.9437256 -2.0625l1.15625 -0.1875q0.109375 0.703125 0.546875 1.078125q0.453125 0.359375 1.25 0.359375q0.8125 0 1.203125 -0.328125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.359375 -0.625q-0.234375 -0.15625 -1.1875 -0.390625q-1.296875 -0.328125 -1.796875 -0.5625q-0.484375 -0.25 -0.75 -0.65625q-0.25 -0.421875 -0.25 -0.9375q0 -0.453125 0.203125 -0.84375q0.21875 -0.40625 0.578125 -0.671875q0.28125 -0.1875 0.75 -0.328125q0.46875 -0.140625 1.015625 -0.140625q0.8125 0 1.421875 0.234375q0.609375 0.234375 0.90625 0.640625q0.296875 0.390625 0.40625 1.0625l-1.140625 0.15625q-0.078125 -0.53125 -0.453125 -0.828125q-0.375 -0.3125 -1.0625 -0.3125q-0.8125 0 -1.15625 0.265625q-0.34375 0.265625 -0.34375 0.625q0 0.234375 0.140625 0.421875q0.15625 0.1875 0.453125 0.3125q0.171875 0.0625 1.03125 0.296875q1.25 0.328125 1.734375 0.546875q0.5 0.203125 0.78125 0.609375q0.28125 0.40625 0.28125 1.0q0 0.59375 -0.34375 1.109375q-0.34375 0.515625 -1.0 0.796875q-0.640625 0.28125 -1.453125 0.28125q-1.34375 0 -2.046875 -0.5625q-0.703125 -0.5625 -0.90625 -1.65625z" fill-rule="nonzero"/><path fill="#d9ead3" d="m219.14961 13.664156l0 0c0 -3.1456223 2.5500183 -5.695652 5.695648 -5.695652l109.80553 0c1.5105896 0 2.95932 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682434 2.5168533 1.6682434 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80553 0c-3.14563 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m219.14961 13.664156l0 0c0 -3.1456223 2.5500183 -5.695652 5.695648 -5.695652l109.80553 0c1.5105896 0 2.95932 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682434 2.5168533 1.6682434 4.0274343l0 22.781923c0 3.1456223 -2.5500488 5.695652 -5.6956787 5.695652l-109.80553 0c-3.14563 0 -5.695648 -2.5500298 -5.695648 -5.695652z" fill-rule="evenodd"/><path fill="#000000" d="m261.5093 25.214493q0 -2.375 1.28125 -3.71875q1.28125 -1.34375 3.296875 -1.34375q1.3125 0 2.375 0.625q1.0625 0.625 1.609375 1.765625q0.5625 1.125 0.5625 2.5625q0 1.4375 -0.59375 2.59375q-0.578125 1.140625 -1.65625 1.734375q-1.0625 0.578125 -2.3125 0.578125q-1.34375 0 -2.40625 -0.640625q-1.0625 -0.65625 -1.609375 -1.78125q-0.546875 -1.125 -0.546875 -2.375zm1.3125 0.015625q0 1.71875 0.921875 2.71875q0.921875 0.984375 2.328125 0.984375q1.421875 0 2.34375 -1.0q0.921875 -1.0 0.921875 -2.84375q0 -1.15625 -0.40625 -2.03125q-0.390625 -0.875 -1.15625 -1.34375q-0.75 -0.484375 -1.6875 -0.484375q-1.34375 0 -2.3125 0.921875q-0.953125 0.921875 -0.953125 3.078125zm9.44516 4.625l0 -9.546875l3.28125 0q1.109375 0 1.703125 0.140625q0.8125 0.1875 1.390625 0.6875q0.765625 0.640625 1.140625 1.640625q0.375 0.984375 0.375 2.25q0 1.09375 -0.265625 1.9375q-0.25 0.828125 -0.65625 1.390625q-0.390625 0.546875 -0.859375 0.859375q-0.46875 0.3125 -1.140625 0.484375q-0.65625 0.15625 -1.53125 0.15625l-3.4375 0zm1.265625 -1.125l2.03125 0q0.9375 0 1.46875 -0.171875q0.546875 -0.1875 0.875 -0.5q0.4375 -0.453125 0.6875 -1.203125q0.25 -0.765625 0.25 -1.84375q0 -1.5 -0.5 -2.296875q-0.484375 -0.8125 -1.1875 -1.078125q-0.5 -0.203125 -1.625 -0.203125l-2.0 0l0 7.296875zm8.312653 1.125l0 -9.546875l1.90625 0l2.25 6.765625q0.3125 0.9375 0.46875 1.40625q0.15625 -0.515625 0.5 -1.53125l2.28125 -6.640625l1.703125 0l0 9.546875l-1.21875 0l0 -7.984375l-2.765625 7.984375l-1.140625 0l-2.765625 -8.125l0 8.125l-1.21875 0zm10.5243225 -2.0625l1.15625 -0.1875q0.109375 0.703125 0.546875 1.078125q0.453125 0.359375 1.25 0.359375q0.8125 0 1.203125 -0.328125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.359375 -0.625q-0.234375 -0.15625 -1.1875 -0.390625q-1.296875 -0.328125 -1.796875 -0.5625q-0.484375 -0.25 -0.75 -0.65625q-0.25 -0.421875 -0.25 -0.9375q0 -0.453125 0.203125 -0.84375q0.21875 -0.40625 0.578125 -0.671875q0.28125 -0.1875 0.75 -0.328125q0.46875 -0.140625 1.015625 -0.140625q0.8125 0 1.421875 0.234375q0.609375 0.234375 0.90625 0.640625q0.296875 0.390625 0.40625 1.0625l-1.140625 0.15625q-0.078125 -0.53125 -0.453125 -0.828125q-0.375 -0.3125 -1.0625 -0.3125q-0.8125 0 -1.15625 0.265625q-0.34375 0.265625 -0.34375 0.625q0 0.234375 0.140625 0.421875q0.15625 0.1875 0.453125 0.3125q0.171875 0.0625 1.03125 0.296875q1.25 0.328125 1.734375 0.546875q0.5 0.203125 0.78125 0.609375q0.28125 0.40625 0.28125 1.0q0 0.59375 -0.34375 1.109375q-0.34375 0.515625 -1.0 0.796875q-0.640625 0.28125 -1.453125 0.28125q-1.34375 0 -2.046875 -0.5625q-0.703125 -0.5625 -0.90625 -1.65625z" fill-rule="nonzero"/><path fill="#d9ead3" d="m80.661415 13.664156l0 0c0 -3.1456223 2.5500336 -5.695652 5.695656 -5.695652l109.80554 0c1.5105743 0 2.9592896 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682129 2.5168533 1.6682129 4.0274343l0 22.781923c0 3.1456223 -2.5500336 5.695652 -5.695648 5.695652l-109.80554 0c-3.1456223 0 -5.695656 -2.5500298 -5.695656 -5.695652z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m80.661415 13.664156l0 0c0 -3.1456223 2.5500336 -5.695652 5.695656 -5.695652l109.80554 0c1.5105743 0 2.9592896 0.6000757 4.0274353 1.6682177c1.0681458 1.0681419 1.6682129 2.5168533 1.6682129 4.0274343l0 22.781923c0 3.1456223 -2.5500336 5.695652 -5.695648 5.695652l-109.80554 0c-3.1456223 0 -5.695656 -2.5500298 -5.695656 -5.695652z" fill-rule="evenodd"/><path fill="#000000" d="m107.68617 29.855118l0 -9.546875l1.25 0l0 9.546875l-1.25 0zm3.3279877 0l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm9.974976 -1.046875l0.171875 1.03125q-0.5 0.109375 -0.890625 0.109375q-0.640625 0 -1.0 -0.203125q-0.34375 -0.203125 -0.484375 -0.53125q-0.140625 -0.328125 -0.140625 -1.390625l0 -3.96875l-0.859375 0l0 -0.90625l0.859375 0l0 -1.71875l1.171875 -0.703125l0 2.421875l1.171875 0l0 0.90625l-1.171875 0l0 4.046875q0 0.5 0.046875 0.640625q0.0625 0.140625 0.203125 0.234375q0.140625 0.078125 0.40625 0.078125q0.203125 0 0.515625 -0.046875zm5.8748627 -1.171875l1.203125 0.140625q-0.28125 1.0625 -1.0625 1.65625q-0.765625 0.578125 -1.96875 0.578125q-1.515625 0 -2.40625 -0.9375q-0.890625 -0.9375 -0.890625 -2.609375q0 -1.75 0.890625 -2.703125q0.90625 -0.96875 2.34375 -0.96875q1.390625 0 2.265625 0.9375q0.875 0.9375 0.875 2.65625q0 0.109375 0 0.3125l-5.15625 0q0.0625 1.140625 0.640625 1.75q0.578125 0.59375 1.4375 0.59375q0.65625 0 1.109375 -0.328125q0.453125 -0.34375 0.71875 -1.078125zm-3.84375 -1.90625l3.859375 0q-0.078125 -0.859375 -0.4375 -1.296875q-0.5625 -0.6875 -1.453125 -0.6875q-0.8125 0 -1.359375 0.546875q-0.546875 0.53125 -0.609375 1.4375zm6.3031006 4.703125l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.5q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.609375 -0.328125 2.28125q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.15625q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.6312256 3.578125l0 -6.90625l1.0625 0l0 1.046875q0.40625 -0.734375 0.734375 -0.96875q0.34375 -0.234375 0.765625 -0.234375q0.59375 0 1.203125 0.375l-0.40625 1.078125q-0.4375 -0.25 -0.859375 -0.25q-0.390625 0 -0.703125 0.234375q-0.296875 0.234375 -0.421875 0.640625q-0.203125 0.625 -0.203125 1.359375l0 3.625l-1.171875 0zm8.96962 -0.859375q-0.65625 0.5625 -1.265625 0.796875q-0.59375 0.21875 -1.28125 0.21875q-1.140625 0 -1.75 -0.546875q-0.609375 -0.5625 -0.609375 -1.4375q0 -0.5 0.21875 -0.921875q0.234375 -0.421875 0.609375 -0.671875q0.375 -0.25 0.84375 -0.390625q0.34375 -0.078125 1.046875 -0.171875q1.421875 -0.171875 2.09375 -0.40625q0 -0.234375 0 -0.296875q0 -0.71875 -0.328125 -1.015625q-0.453125 -0.390625 -1.34375 -0.390625q-0.8125 0 -1.21875 0.296875q-0.390625 0.28125 -0.578125 1.015625l-1.140625 -0.15625q0.15625 -0.734375 0.515625 -1.1875q0.359375 -0.453125 1.03125 -0.6875q0.671875 -0.25 1.5625 -0.25q0.890625 0 1.4375 0.203125q0.5625 0.203125 0.8125 0.53125q0.265625 0.3125 0.375 0.796875q0.046875 0.296875 0.046875 1.078125l0 1.5625q0 1.625 0.078125 2.0625q0.078125 0.4375 0.296875 0.828125l-1.21875 0q-0.1875 -0.359375 -0.234375 -0.859375zm-0.09375 -2.609375q-0.640625 0.265625 -1.921875 0.4375q-0.71875 0.109375 -1.015625 0.25q-0.296875 0.125 -0.46875 0.375q-0.15625 0.25 -0.15625 0.546875q0 0.46875 0.34375 0.78125q0.359375 0.3125 1.046875 0.3125q0.671875 0 1.203125 -0.296875q0.53125 -0.296875 0.78125 -0.8125q0.1875 -0.390625 0.1875 -1.171875l0 -0.421875zm5.5531006 2.421875l0.171875 1.03125q-0.5 0.109375 -0.890625 0.109375q-0.640625 0 -1.0 -0.203125q-0.34375 -0.203125 -0.484375 -0.53125q-0.140625 -0.328125 -0.140625 -1.390625l0 -3.96875l-0.859375 0l0 -0.90625l0.859375 0l0 -1.71875l1.171875 -0.703125l0 2.421875l1.171875 0l0 0.90625l-1.171875 0l0 4.046875q0 0.5 0.046875 0.640625q0.0625 0.140625 0.203125 0.234375q0.140625 0.078125 0.40625 0.078125q0.203125 0 0.515625 -0.046875zm1.1561127 -7.140625l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm2.507965 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm6.9437256 -2.0625l1.15625 -0.1875q0.109375 0.703125 0.546875 1.078125q0.453125 0.359375 1.25 0.359375q0.8125 0 1.203125 -0.328125q0.390625 -0.328125 0.390625 -0.765625q0 -0.390625 -0.359375 -0.625q-0.234375 -0.15625 -1.1875 -0.390625q-1.296875 -0.328125 -1.796875 -0.5625q-0.484375 -0.25 -0.75 -0.65625q-0.25 -0.421875 -0.25 -0.9375q0 -0.453125 0.203125 -0.84375q0.21875 -0.40625 0.578125 -0.671875q0.28125 -0.1875 0.75 -0.328125q0.46875 -0.140625 1.015625 -0.140625q0.8125 0 1.421875 0.234375q0.609375 0.234375 0.90625 0.640625q0.296875 0.390625 0.40625 1.0625l-1.140625 0.15625q-0.078125 -0.53125 -0.453125 -0.828125q-0.375 -0.3125 -1.0625 -0.3125q-0.8125 0 -1.15625 0.265625q-0.34375 0.265625 -0.34375 0.625q0 0.234375 0.140625 0.421875q0.15625 0.1875 0.453125 0.3125q0.171875 0.0625 1.03125 0.296875q1.25 0.328125 1.734375 0.546875q0.5 0.203125 0.78125 0.609375q0.28125 0.40625 0.28125 1.0q0 0.59375 -0.34375 1.109375q-0.34375 0.515625 -1.0 0.796875q-0.640625 0.28125 -1.453125 0.28125q-1.34375 0 -2.046875 -0.5625q-0.703125 -0.5625 -0.90625 -1.65625z" fill-rule="nonzero"/><path fill="#f4cccc" d="m452.78665 343.38617l0 0c0 -9.146973 7.415039 -16.562012 16.562012 -16.562012l130.0886 0c4.392517 0 8.605103 1.7449036 11.71106 4.850891c3.106018 3.1059875 4.850952 7.3186035 4.850952 11.711121l0 66.24603c0 9.146973 -7.4151 16.562012 -16.562012 16.562012l-130.0886 0c-9.146973 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path stroke="#000000" stroke-width="2.0" stroke-linejoin="round" stroke-linecap="butt" d="m452.78665 343.38617l0 0c0 -9.146973 7.415039 -16.562012 16.562012 -16.562012l130.0886 0c4.392517 0 8.605103 1.7449036 11.71106 4.850891c3.106018 3.1059875 4.850952 7.3186035 4.850952 11.711121l0 66.24603c0 9.146973 -7.4151 16.562012 -16.562012 16.562012l-130.0886 0c-9.146973 0 -16.562012 -7.415039 -16.562012 -16.562012z" fill-rule="evenodd"/><path fill="#000000" d="m491.78995 375.42917l0 -13.359375l9.65625 0l0 1.578125l-7.875 0l0 4.09375l7.375 0l0 1.5625l-7.375 0l0 4.546875l8.1875 0l0 1.578125l-9.96875 0zm12.209198 0l0 -9.671875l1.46875 0l0 1.375q1.0625 -1.59375 3.078125 -1.59375q0.875 0 1.609375 0.3125q0.734375 0.3125 1.09375 0.828125q0.375 0.5 0.515625 1.203125q0.09375 0.453125 0.09375 1.59375l0 5.953125l-1.640625 0l0 -5.890625q0 -1.0 -0.203125 -1.484375q-0.1875 -0.5 -0.671875 -0.796875q-0.484375 -0.296875 -1.140625 -0.296875q-1.046875 0 -1.8125 0.671875q-0.75 0.65625 -0.75 2.515625l0 5.28125l-1.640625 0zm16.688232 -3.546875l1.609375 0.21875q-0.265625 1.65625 -1.359375 2.609375q-1.078125 0.9375 -2.671875 0.9375q-1.984375 0 -3.1875 -1.296875q-1.203125 -1.296875 -1.203125 -3.71875q0 -1.578125 0.515625 -2.75q0.515625 -1.171875 1.578125 -1.75q1.0625 -0.59375 2.3125 -0.59375q1.578125 0 2.578125 0.796875q1.0 0.796875 1.28125 2.265625l-1.59375 0.234375q-0.234375 -0.96875 -0.8125 -1.453125q-0.578125 -0.5 -1.390625 -0.5q-1.234375 0 -2.015625 0.890625q-0.78125 0.890625 -0.78125 2.8125q0 1.953125 0.75 2.84375q0.75 0.875 1.953125 0.875q0.96875 0 1.609375 -0.59375q0.65625 -0.59375 0.828125 -1.828125zm3.0 3.546875l0 -9.671875l1.46875 0l0 1.46875q0.5625 -1.03125 1.03125 -1.359375q0.484375 -0.328125 1.0625 -0.328125q0.828125 0 1.6875 0.53125l-0.5625 1.515625q-0.609375 -0.359375 -1.203125 -0.359375q-0.546875 0 -0.96875 0.328125q-0.421875 0.328125 -0.609375 0.890625q-0.28125 0.875 -0.28125 1.921875l0 5.0625l-1.625 0zm6.1501465 3.71875l-0.1875 -1.53125q0.546875 0.140625 0.9375 0.140625q0.546875 0 0.875 -0.1875q0.328125 -0.171875 0.546875 -0.5q0.15625 -0.25 0.5 -1.21875q0.046875 -0.140625 0.140625 -0.40625l-3.671875 -9.6875l1.765625 0l2.015625 5.59375q0.390625 1.078125 0.703125 2.25q0.28125 -1.125 0.671875 -2.203125l2.078125 -5.640625l1.640625 0l-3.6875 9.828125q-0.59375 1.609375 -0.921875 2.203125q-0.4375 0.8125 -1.0 1.1875q-0.5625 0.375 -1.34375 0.375q-0.484375 0 -1.0625 -0.203125zm9.40625 -0.015625l0 -13.375l1.484375 0l0 1.25q0.53125 -0.734375 1.1875 -1.09375q0.671875 -0.375 1.625 -0.375q1.234375 0 2.171875 0.640625q0.953125 0.625 1.4375 1.796875q0.484375 1.15625 0.484375 2.546875q0 1.484375 -0.53125 2.671875q-0.53125 1.1875 -1.546875 1.828125q-1.015625 0.625 -2.140625 0.625q-0.8125 0 -1.46875 -0.34375q-0.65625 -0.34375 -1.0625 -0.875l0 4.703125l-1.640625 0zm1.484375 -8.484375q0 1.859375 0.75 2.765625q0.765625 0.890625 1.828125 0.890625q1.09375 0 1.875 -0.921875q0.78125 -0.9375 0.78125 -2.875q0 -1.84375 -0.765625 -2.765625q-0.75 -0.921875 -1.8125 -0.921875q-1.046875 0 -1.859375 0.984375q-0.796875 0.96875 -0.796875 2.84375zm12.469482 3.3125l0.234375 1.453125q-0.6875 0.140625 -1.234375 0.140625q-0.890625 0 -1.390625 -0.28125q-0.484375 -0.28125 -0.6875 -0.734375q-0.203125 -0.46875 -0.203125 -1.9375l0 -5.578125l-1.203125 0l0 -1.265625l1.203125 0l0 -2.390625l1.625 -0.984375l0 3.375l1.65625 0l0 1.265625l-1.65625 0l0 5.671875q0 0.6875 0.078125 0.890625q0.09375 0.203125 0.28125 0.328125q0.203125 0.109375 0.578125 0.109375q0.265625 0 0.71875 -0.0625zm1.6051636 -10.0l0 -1.890625l1.640625 0l0 1.890625l-1.640625 0zm0 11.46875l0 -9.671875l1.640625 0l0 9.671875l-1.640625 0zm3.5354614 -4.84375q0 -2.6875 1.484375 -3.96875q1.25 -1.078125 3.046875 -1.078125q2.0 0 3.265625 1.3125q1.265625 1.296875 1.265625 3.609375q0 1.859375 -0.5625 2.9375q-0.5625 1.0625 -1.640625 1.65625q-1.0625 0.59375 -2.328125 0.59375q-2.03125 0 -3.28125 -1.296875q-1.25 -1.3125 -1.25 -3.765625zm1.6875 0q0 1.859375 0.796875 2.796875q0.8125 0.921875 2.046875 0.921875q1.21875 0 2.03125 -0.921875q0.8125 -0.9375 0.8125 -2.84375q0 -1.796875 -0.8125 -2.71875q-0.8125 -0.921875 -2.03125 -0.921875q-1.234375 0 -2.046875 0.921875q-0.796875 0.90625 -0.796875 2.765625zm9.297607 4.84375l0 -9.671875l1.46875 0l0 1.375q1.0625 -1.59375 3.078125 -1.59375q0.875 0 1.609375 0.3125q0.734375 0.3125 1.09375 0.828125q0.375 0.5 0.515625 1.203125q0.09375 0.453125 0.09375 1.59375l0 5.953125l-1.640625 0l0 -5.890625q0 -1.0 -0.203125 -1.484375q-0.1875 -0.5 -0.671875 -0.796875q-0.484375 -0.296875 -1.140625 -0.296875q-1.046875 0 -1.8125 0.671875q-0.75 0.65625 -0.75 2.515625l0 5.28125l-1.640625 0z" fill-rule="nonzero"/><path fill="#000000" d="m491.5951 395.12167q-0.984375 -1.234375 -1.65625 -2.875q-0.65625 -1.640625 -0.65625 -3.390625q0 -1.546875 0.5 -2.96875q0.578125 -1.640625 1.8125 -3.28125l0.828125 0q-0.78125 1.359375 -1.03125 1.9375q-0.40625 0.890625 -0.625 1.875q-0.28125 1.21875 -0.28125 2.4375q0 3.140625 1.9375 6.265625l-0.828125 0zm2.17276 -2.8125l0 -9.546875l1.171875 0l0 9.546875l-1.171875 0zm2.99234 -8.1875l0 -1.359375l1.171875 0l0 1.359375l-1.171875 0zm0 8.1875l0 -6.90625l1.171875 0l0 6.90625l-1.171875 0zm4.02359 0l-1.078125 0l0 -9.546875l1.171875 0l0 3.40625q0.734375 -0.921875 1.890625 -0.921875q0.640625 0 1.203125 0.265625q0.578125 0.25 0.9375 0.71875q0.375 0.453125 0.578125 1.109375q0.203125 0.65625 0.203125 1.40625q0 1.78125 -0.875 2.75q-0.875 0.96875 -2.109375 0.96875q-1.21875 0 -1.921875 -1.015625l0 0.859375zm0 -3.5q0 1.234375 0.328125 1.78125q0.5625 0.90625 1.5 0.90625q0.765625 0 1.328125 -0.65625q0.5625 -0.671875 0.5625 -2.0q0 -1.34375 -0.546875 -1.984375q-0.53125 -0.65625 -1.296875 -0.65625q-0.765625 0 -1.328125 0.671875q-0.546875 0.671875 -0.546875 1.9375zm6.3343506 3.5l0 -6.90625l1.046875 0l0 0.96875q0.328125 -0.515625 0.859375 -0.8125q0.546875 -0.3125 1.234375 -0.3125q0.78125 0 1.265625 0.3125q0.48434448 0.3125 0.6874695 0.890625q0.828125 -1.203125 2.140625 -1.203125q1.03125 0 1.578125 0.578125q0.5625 0.5625 0.5625 1.734375l0 4.75l-1.171875 0l0 -4.359375q0 -0.703125 -0.125 -1.0q-0.109375 -0.3125 -0.40625 -0.5q-0.296875 -0.1875 -0.703125 -0.1875q-0.71875 0 -1.203125 0.484375q-0.484375 0.484375 -0.484375 1.546875l0 4.015625l-1.1718445 0l0 -4.484375q0 -0.78125 -0.296875 -1.171875q-0.28125 -0.390625 -0.921875 -0.390625q-0.5 0 -0.921875 0.265625q-0.421875 0.25 -0.609375 0.75q-0.1875 0.5 -0.1875 1.453125l0 3.578125l-1.171875 0zm10.6649475 -3.453125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm6.6468506 3.453125l0 -6.90625l1.0625 0l0 0.984375q0.75 -1.140625 2.1875 -1.140625q0.625 0 1.15625 0.21875q0.53125 0.21875 0.78125 0.59375q0.265625 0.359375 0.375 0.859375q0.0625 0.328125 0.0625 1.140625l0 4.25l-1.171875 0l0 -4.203125q0 -0.71875 -0.140625 -1.0625q-0.140625 -0.359375 -0.484375 -0.5625q-0.34375 -0.21875 -0.8125 -0.21875q-0.75 0 -1.296875 0.46875q-0.546875 0.46875 -0.546875 1.796875l0 3.78125l-1.171875 0zm7.1937256 0.578125l1.140625 0.15625q0.078125 0.53125 0.40625 0.78125q0.4375 0.3125 1.1875 0.3125q0.8125 0 1.25 -0.328125q0.453125 -0.3125 0.609375 -0.90625q0.09375 -0.359375 0.078125 -1.5q-0.765625 0.90625 -1.90625 0.90625q-1.4375 0 -2.21875 -1.03125q-0.78125 -1.03125 -0.78125 -2.46875q0 -0.984375 0.359375 -1.8125q0.359375 -0.84375 1.03125 -1.296875q0.6875 -0.453125 1.609375 -0.453125q1.21875 0 2.015625 0.984375l0 -0.828125l1.078125 0l0 5.96875q0 1.609375 -0.328125 2.28125q-0.328125 0.6875 -1.046875 1.078125q-0.703125 0.390625 -1.75 0.390625q-1.234375 0 -2.0 -0.5625q-0.75 -0.5625 -0.734375 -1.671875zm0.984375 -4.15625q0 1.359375 0.53125 1.984375q0.546875 0.625 1.359375 0.625q0.796875 0 1.34375 -0.625q0.546875 -0.625 0.546875 -1.953125q0 -1.265625 -0.5625 -1.90625q-0.5625 -0.640625 -1.359375 -0.640625q-0.765625 0 -1.3125 0.640625q-0.546875 0.625 -0.546875 1.875zm6.2093506 0.125q0 -1.921875 1.078125 -2.84375q0.890625 -0.765625 2.171875 -0.765625q1.421875 0 2.328125 0.9375q0.90625 0.921875 0.90625 2.578125q0 1.328125 -0.40625 2.09375q-0.390625 0.765625 -1.15625 1.1875q-0.765625 0.421875 -1.671875 0.421875q-1.453125 0 -2.359375 -0.921875q-0.890625 -0.9375 -0.890625 -2.6875zm1.203125 0q0 1.328125 0.578125 1.984375q0.59375 0.65625 1.46875 0.65625q0.875 0 1.453125 -0.65625q0.578125 -0.671875 0.578125 -2.03125q0 -1.28125 -0.59375 -1.9375q-0.578125 -0.65625 -1.4375 -0.65625q-0.875 0 -1.46875 0.65625q-0.578125 0.65625 -0.578125 1.984375zm11.162476 0.921875l1.15625 0.15625q-0.1875 1.1875 -0.96875 1.859375q-0.78125 0.671875 -1.921875 0.671875q-1.40625 0 -2.28125 -0.921875q-0.859375 -0.9375 -0.859375 -2.65625q0 -1.125 0.375 -1.96875q0.375 -0.84375 1.125 -1.25q0.765625 -0.421875 1.65625 -0.421875q1.125 0 1.84375 0.578125q0.71875 0.5625 0.921875 1.609375l-1.140625 0.171875q-0.171875 -0.703125 -0.59375 -1.046875q-0.40625 -0.359375 -0.984375 -0.359375q-0.890625 0 -1.453125 0.640625q-0.546875 0.640625 -0.546875 2.0q0 1.40625 0.53125 2.03125q0.546875 0.625 1.40625 0.625q0.6875 0 1.140625 -0.421875q0.46875 -0.421875 0.59375 -1.296875zm2.1328125 2.53125l0 -6.90625l1.0625 0l0 1.046875q0.40625 -0.734375 0.734375 -0.96875q0.34375 -0.234375 0.765625 -0.234375q0.59375 0 1.203125 0.375l-0.40625 1.078125q-0.4375 -0.25 -0.859375 -0.25q-0.390625 0 -0.703125 0.234375q-0.296875 0.234375 -0.421875 0.640625q-0.203125 0.625 -0.203125 1.359375l0 3.625l-1.171875 0zm4.4071045 2.65625l-0.125 -1.09375q0.375 0.109375 0.65625 0.109375q0.390625 0 0.625 -0.140625q0.234375 -0.125 0.390625 -0.359375q0.109375 -0.171875 0.359375 -0.875q0.03125 -0.09375 0.109375 -0.28125l-2.625 -6.921875l1.265625 0l1.4375 4.0q0.28125 0.765625 0.5 1.59375q0.203125 -0.796875 0.46875 -1.578125l1.484375 -4.015625l1.171875 0l-2.625 7.015625q-0.421875 1.140625 -0.65625 1.578125q-0.3125 0.578125 -0.71875 0.84375q-0.40625 0.28125 -0.96875 0.28125q-0.328125 0 -0.75 -0.15625zm6.7109375 0l0 -9.5625l1.078125 0l0 0.890625q0.375 -0.53125 0.84375 -0.78125q0.484375 -0.265625 1.15625 -0.265625q0.875 0 1.546875 0.453125q0.6875 0.453125 1.03125 1.28125q0.34375 0.828125 0.34375 1.828125q0 1.046875 -0.375 1.90625q-0.375 0.84375 -1.109375 1.296875q-0.71875 0.453125 -1.53125 0.453125q-0.578125 0 -1.046875 -0.25q-0.46875 -0.25 -0.765625 -0.625l0 3.375l-1.171875 0zm1.0625 -6.078125q0 1.34375 0.53125 1.984375q0.546875 0.625 1.3125 0.625q0.78125 0 1.34375 -0.65625q0.5625 -0.65625 0.5625 -2.046875q0 -1.3125 -0.546875 -1.96875q-0.546875 -0.671875 -1.296875 -0.671875q-0.75 0 -1.328125 0.703125q-0.578125 0.703125 -0.578125 2.03125zm8.912476 2.375l0.171875 1.03125q-0.5 0.109375 -0.890625 0.109375q-0.640625 0 -1.0 -0.203125q-0.34375 -0.203125 -0.484375 -0.53125q-0.140625 -0.328125 -0.140625 -1.390625l0 -3.96875l-0.859375 0l0 -0.90625l0.859375 0l0 -1.71875l1.171875 -0.703125l0 2.421875l1.171875 0l0 0.90625l-1.171875 0l0 4.046875q0 0.5 0.046875 0.640625q0.0625 0.140625 0.203125 0.234375q0.140625 0.078125 0.40625 0.078125q0.203125 0 0.515625 -0.046875zm1.9061279 3.859375l-0.828125 0q1.9375 -3.125 1.9375 -6.265625q0 -1.21875 -0.28125 -2.421875q-0.21875 -0.984375 -0.609375 -1.875q-0.265625 -0.59375 -1.046875 -1.953125l0.828125 0q1.234375 1.640625 1.8125 3.28125q0.5 1.421875 0.5 2.96875q0 1.75 -0.671875 3.390625q-0.671875 1.640625 -1.640625 2.875z" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/reference/mongodb/ini.xml b/reference/mongodb/ini.xml
deleted file mode 100644
index ea8fdf8dca9b..000000000000
--- a/reference/mongodb/ini.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mongodb.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>mongodb &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.mongodb.debug">mongodb.debug</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.mongodb.debug">
-     <term>
-      <parameter>mongodb.debug</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       This option can be used to enable or disable trace-level debug logging in
-       the extension (and libmongoc).
-      </simpara>
-      <simpara>
-       Specify an empty string, <literal>"0"</literal>,
-       <literal>"off"</literal>, <literal>"no"</literal>, or
-       <literal>"false"</literal> to disable logging.
-      </simpara>
-      <simpara>
-       Specify <literal>"stderr"</literal> or <literal>"stdout"</literal> to log
-       to <literal>stderr</literal> or <literal>stdout</literal>, respectively.
-      </simpara>
-      <simpara>
-       Specify <literal>"1"</literal>, <literal>"on"</literal>,
-       <literal>"yes"</literal>, or <literal>"true"</literal> to log to a new
-       temporary file within the default system temp directory (i.e.
-       <function>sys_get_temp_dir</function>).
-      </simpara>
-      <simpara>
-       Specify any other string to log to a new temporary file within that
-       directory. If the directory cannot be used, the default system temp
-       directory will be used instead.
-      </simpara>
-      <note>
-       <simpara>
-        Please note that the debug log can contain sensitive information, such
-        as credentials to the MongoDB server and full documents written to or
-        read from the server. Please review any debug logs before sharing them
-        with other people.
-       </simpara>
-      </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/mongodb/mongodb.xml b/reference/mongodb/mongodb.xml
deleted file mode 100644
index 7aeae83349e0..000000000000
--- a/reference/mongodb/mongodb.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <part xml:id="mongodb.mongodb" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <?phpdoc extension-membership="pecl" ?>
-  <title>MongoDB Extension Classes</title>
-  <titleabbrev>MongoDB\Driver</titleabbrev>
-
-  &reference.mongodb.mongodb.driver.manager;
-  &reference.mongodb.mongodb.driver.command;
-  &reference.mongodb.mongodb.driver.query;
-  &reference.mongodb.mongodb.driver.bulkwrite;
-  &reference.mongodb.mongodb.driver.bulkwritecommand;
-  &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;
-  &reference.mongodb.mongodb.driver.readconcern;
-
-  &reference.mongodb.mongodb.driver.cursor;
-  &reference.mongodb.mongodb.driver.cursorid;
-  &reference.mongodb.mongodb.driver.cursorinterface;
-
-  &reference.mongodb.mongodb.driver.server;
-  &reference.mongodb.mongodb.driver.serverdescription;
-  &reference.mongodb.mongodb.driver.topologydescription;
-
-  &reference.mongodb.mongodb.driver.writeconcernerror;
-  &reference.mongodb.mongodb.driver.writeerror;
-  &reference.mongodb.mongodb.driver.writeresult;
-  &reference.mongodb.mongodb.driver.bulkwritecommandresult;
- </part>
diff --git a/reference/mongodb/mongodb/driver/bulkwrite.xml b/reference/mongodb/mongodb/driver/bulkwrite.xml
deleted file mode 100644
index 81e2df95c796..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-bulkwrite" role="class" 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\BulkWrite class</title>
- <titleabbrev>MongoDB\Driver\BulkWrite</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\BulkWrite intro -->
-  <section xml:id="mongodb-driver-bulkwrite.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\BulkWrite</classname> collects one or more
-    write operations that should be sent to the server. After adding any
-    number of insert, update, and delete operations, the collection may be
-    executed via
-    <methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>.
-   </simpara>
-   <simpara>
-    Write operations may either be ordered (default) or unordered. Ordered write
-    operations are sent to the server, in the order provided, for serial
-    execution. If a write fails, any remaining operations will be aborted.
-    Unordered operations are sent to the server in an arbitrary order
-    where they may be executed in parallel. Any errors that occur are reported
-    after all operations have been attempted.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-bulkwrite.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\BulkWrite</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\BulkWrite</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-bulkwrite')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongodb-driver-bulkwrite.examples">
-   &reftitle.examples;
-
-   <example>
-    <title>Mixed write operations are grouped by type</title>
-    <simpara>
-     Mixed write operations (i.e. inserts, updates, and deletes) will be
-     assembled into typed write commands to be sent sequentially to the server.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite(['ordered' => true]);
-$bulk->insert(['_id' => 1, 'x' => 1]);
-$bulk->insert(['_id' => 2, 'x' => 2]);
-$bulk->update(['x' => 2], ['$set' => ['x' => 1]]);
-$bulk->insert(['_id' => 3, 'x' => 3]);
-$bulk->delete(['x' => 1]);
-
-?>
-]]>
-    </programlisting>
-    <simpara>
-     Will result in four write commands (i.e. roundtrips) being executed. Since
-     the operations are ordered, the third insertion cannot be sent until the
-     preceding update is executed.
-    </simpara>
-   </example>
-   <example>
-    <title>Ordered write operations causing an error</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite(['ordered' => true]);
-$bulk->delete([]);
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 2]);
-$bulk->insert(['_id' => 3, 'hello' => 'world']);
-$bulk->update(['_id' => 3], ['$set' => ['hello' => 'earth']]);
-$bulk->insert(['_id' => 4, 'hello' => 'pluto']);
-$bulk->update(['_id' => 4], ['$set' => ['hello' => 'moon']]);
-$bulk->insert(['_id' => 3]);
-$bulk->insert(['_id' => 4]);
-$bulk->insert(['_id' => 5]);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$writeConcern = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY, 1000);
-
-try {
-    $result = $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    $result = $e->getWriteResult();
-
-    // Check if the write concern could not be fulfilled
-    if ($writeConcernError = $result->getWriteConcernError()) {
-        printf("%s (%d): %s\n",
-            $writeConcernError->getMessage(),
-            $writeConcernError->getCode(),
-            var_export($writeConcernError->getInfo(), true)
-        );
-    }
-
-    // Check if any write operations did not complete at all
-    foreach ($result->getWriteErrors() as $writeError) {
-        printf("Operation#%d: %s (%d)\n",
-            $writeError->getIndex(),
-            $writeError->getMessage(),
-            $writeError->getCode()
-        );
-    }
-} catch (MongoDB\Driver\Exception\Exception $e) {
-    printf("Other error: %s\n", $e->getMessage());
-    exit;
-}
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-
-?>
-]]>
-    </programlisting>
-   </example>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Operation#7: E11000 duplicate key error index: db.collection.$_id_ dup key: { : 3 } (11000)
-Inserted 4 document(s)
-Updated  2 document(s)
-]]>
-   </screen>
-   <simpara>
-    If the write concern could not be fulfilled, the example above would output
-    something like:
-   </simpara>
-   <screen>
-<![CDATA[
-waiting for replication timed out (64): array (
-  'wtimeout' => true,
-)
-Operation#7: E11000 duplicate key error index: databaseName.collectionName.$_id_ dup key: { : 3 } (11000)
-Inserted 4 document(s)
-Updated  2 document(s)
-]]>
-   </screen>
-   <simpara>
-    If we execute the example above, but allow for unordered writes:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite(['ordered' => false]);
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Operation#7: E11000 duplicate key error index: db.collection.$_id_ dup key: { : 3 } (11000)
-Operation#8: E11000 duplicate key error index: db.collection.$_id_ dup key: { : 4 } (11000)
-Inserted 5 document(s)
-Updated  2 document(s)
-]]>
-   </screen>
-  </section>
-
-  <section xml:id="mongodb-driver-bulkwrite.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname></member>
-    <member><classname>MongoDB\Driver\WriteResult</classname></member>
-    <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-    <member><classname>MongoDB\Driver\WriteConcernError</classname></member>
-    <member><classname>MongoDB\Driver\WriteError</classname></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.bulkwrite;
-
-</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/mongodb/mongodb/driver/bulkwrite/construct.xml b/reference/mongodb/mongodb/driver/bulkwrite/construct.xml
deleted file mode 100644
index 2e6ef9d1a6d2..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite/construct.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwrite.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWrite::__construct</refname>
-  <refpurpose>Create a new BulkWrite</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDB\Driver\BulkWrite::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\BulkWrite</classname>, which is a
-   mutable object to which one or more write operations may be added. The
-   write(s) may then be executed with
-   <methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter> (<type>array</type>)</term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>bypassDocumentValidation</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, allows insert and update operations to circumvent
-            document level validation.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 3.2+ and is ignored for older
-            server versions, which do not support document level validation.
-           </simpara>
-          </entry>
-          <entry>&false;</entry>
-         </row>
-         <row>
-          <entry>comment</entry>
-          <entry><type>mixed</type></entry>
-          <entry>
-           <simpara>
-            An arbitrary comment to help trace the operation through the
-            database profiler, currentOp output, and logs.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 4.4+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.let;
-         <row>
-          <entry>ordered</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           Ordered operations (&true;) are executed serially on the MongoDB
-           server, while unordered operations (&false;) are sent to the server
-           in an arbitrary order and may be executed in parallel.
-          </entry>
-          <entry>&true;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.14.0</entry>
-      <entry>
-       Added the <literal>"comment"</literal> and <literal>"let"</literal>
-       options.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.1.0</entry>
-      <entry>
-       Added the <literal>"bypassDocumentValidation"</literal> option.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWrite::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite(['ordered' => true]);
-$bulk->delete([]);
-$bulk->insert(['_id' => 1, 'x' => 1]);
-$bulk->insert(['_id' => 2, 'x' => 2]);
-$bulk->update(
-    ['x' => 2],
-    ['$set' => ['x' => 1]],
-    ['limit' => 1, 'upsert' => false]
-);
-$bulk->delete(['x' => 1], ['limit' => 1]);
-$bulk->update(
-    ['_id' => 3],
-    ['$set' => ['x' => 3]],
-    ['limit' => 1, 'upsert' => true]
-);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$writeConcern = new MongoDB\Driver\WriteConcern(1);
-
-try {
-    $result = $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    $result = $e->getWriteResult();
-
-    // Check if the write concern could not be fulfilled
-    if ($writeConcernError = $result->getWriteConcernError()) {
-        printf("%s (%d): %s\n",
-            $writeConcernError->getMessage(),
-            $writeConcernError->getCode(),
-            var_export($writeConcernError->getInfo(), true)
-        );
-    }
-
-    // Check if any write operations did not complete at all
-    foreach ($result->getWriteErrors() as $writeError) {
-        printf("Operation#%d: %s (%d)\n",
-            $writeError->getIndex(),
-            $writeError->getMessage(),
-            $writeError->getCode()
-        );
-    }
-} catch (MongoDB\Driver\Exception\Exception $e) {
-    printf("Other error: %s\n", $e->getMessage());
-    exit;
-}
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-printf("Upserted %d document(s)\n", $result->getUpsertedCount());
-printf("Deleted  %d document(s)\n", $result->getDeletedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Inserted 2 document(s)
-Updated  1 document(s)
-Upserted 1 document(s)
-Deleted  1 document(s)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname></member>
-   <member><classname>MongoDB\Driver\WriteResult</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/mongodb/mongodb/driver/bulkwrite/count.xml b/reference/mongodb/mongodb/driver/bulkwrite/count.xml
deleted file mode 100644
index 279eea7556b6..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite/count.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwrite.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWrite::count</refname>
-  <refpurpose>Count number of write operations in the bulk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWrite::count</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the number of write operations added to the
-   <classname>MongoDB\Driver\BulkWrite</classname> object.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns number of write operations added to the
-   <classname>MongoDB\Driver\BulkWrite</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       Returns the number of write operations added to the
-       <classname>MongoDB\Driver\BulkWrite</classname> object. Earlier versions
-       returned the expected number of client-to-server roundtrips required to
-       execute all write operations.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWrite::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1, 'x' => 1]);
-$bulk->insert(['_id' => 2, 'x' => 2]);
-$bulk->update(['x' => 2], ['$set' => ['x' => 1]]);
-$bulk->delete(['x' => 1]);
-
-var_dump(count($bulk));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(4)
-]]>
-   </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/mongodb/mongodb/driver/bulkwrite/delete.xml b/reference/mongodb/mongodb/driver/bulkwrite/delete.xml
deleted file mode 100644
index ebab03538894..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite/delete.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwrite.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWrite::delete</refname>
-  <refpurpose>Add a delete operation to the bulk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWrite::delete</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>deleteOptions</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a delete operation to the
-   <classname>MongoDB\Driver\BulkWrite</classname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>deleteOptions</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>deleteOptions</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 4.4+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>limit</entry>
-          <entry><type>bool</type></entry>
-          <entry>Delete all matching documents (&false;), or only the first matching document (&true;)</entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.8.0</entry>
-      <entry>
-       Added the <literal>"hint"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       Added the <literal>"collation"</literal> option.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWrite::delete</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->delete(['x' => 1], ['limit' => 1]);
-$bulk->delete(['x' => 2], ['limit' => 0]);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname></member>
-   <member><classname>MongoDB\Driver\WriteResult</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/mongodb/mongodb/driver/bulkwrite/insert.xml b/reference/mongodb/mongodb/driver/bulkwrite/insert.xml
deleted file mode 100644
index b47bb58cdb5a..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite/insert.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwrite.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWrite::insert</refname>
-  <refpurpose>Add an insert operation to the bulk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\Driver\BulkWrite::insert</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds an insert operation to the
-   <classname>MongoDB\Driver\BulkWrite</classname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>document</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A document to insert.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <literal>_id</literal> of the inserted document. If the
-   <parameter>document</parameter> did not have an <literal>_id</literal>, the
-   <classname>MongoDB\BSON\ObjectId</classname> generated for the insert will
-   be returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       The <literal>_id</literal> of the inserted document is always returned.
-       Previously, the method only returned a value if a
-       <classname>MongoDB\BSON\ObjectId</classname> was generated.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWrite::insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite;
-
-$doc1 = ['x' => 1];
-$doc2 = ['_id' => 'custom-id', 'x' => 2];
-$doc3 = ['_id' => new MongoDB\BSON\ObjectId('0123456789abcdef01234567'), 'x' => 3];
-
-$id1 = $bulk->insert($doc1);
-$id2 = $bulk->insert($doc2);
-$id3 = $bulk->insert($doc3);
-
-var_dump($id1, $id2, $id3);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\ObjectId)#3 (1) {
-  ["oid"]=>
-  string(24) "67f58058d1a0aa2fd80d55d0"
-}
-string(9) "custom-id"
-object(MongoDB\BSON\ObjectId)#4 (1) {
-  ["oid"]=>
-  string(24) "0123456789abcdef01234567"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname></member>
-   <member><classname>MongoDB\Driver\WriteResult</classname></member>
-   <member><classname>MongoDB\BSON\ObjectId</classname></member>
-   <member><interfacename>MongoDB\BSON\Persistable</interfacename></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/bulkwrite/update.xml b/reference/mongodb/mongodb/driver/bulkwrite/update.xml
deleted file mode 100644
index f56e6cecfb55..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwrite/update.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwrite.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWrite::update</refname>
-  <refpurpose>Add an update operation to the bulk</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWrite::update</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>newObj</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>updateOptions</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds an update operation to the
-   <classname>MongoDB\Driver\BulkWrite</classname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>newObj</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A document containing either update operators (e.g.
-      <literal>$set</literal>), a replacement document (i.e.
-      <emphasis>only</emphasis> <literal>field:value</literal> expressions), or
-      an <link xlink:href="&url.mongodb.docs.command;update/#update-with-an-aggregation-pipeline">aggregation pipeline</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>updateOptions</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>updateOptions</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>arrayFilters</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            An array of filter documents that determines which array elements to
-            modify for an update operation on an array field. See
-            <link xlink:href="&url.mongodb.docs.command;update/#update-command-arrayfilters">Specify arrayFilters for Array Update Operations</link>
-            in the MongoDB manual for more information.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 3.6+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 4.2+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>multi</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           Update only the first matching document if &false;, or all
-           matching documents &true;. This option cannot be &true; if
-           <parameter>newObj</parameter> is a replacement document.
-          </entry>
-          <entry>&false;</entry>
-         </row>
-         <row>
-          <entry>sort</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Specify which document the operation updates if the query matches
-            multiple documents. The first document matched by the sort order
-            will be updated.
-           </simpara>
-           <simpara>
-            This option cannot be used if <literal>"multi"</literal> is &true;.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 8.0+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>upsert</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           If <parameter>filter</parameter> does not match an existing document,
-           insert a <emphasis>single</emphasis> document. The document will be
-           created from <parameter>newObj</parameter> if it is a replacement
-           document (i.e. no update operators); otherwise, the operators in
-           <parameter>newObj</parameter> will be applied to
-           <parameter>filter</parameter> to create the new document.
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Added the <literal>"sort"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.7.0</entry>
-      <entry>
-       Added the <literal>"hint"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.6.0</entry>
-      <entry>
-       The <parameter>newObj</parameter> parameter now accepts an aggregation
-       pipeline. This feature requires MongoDB 4.2+ and will result in an
-       exception at execution time if specified for an older server version.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.5.0</entry>
-      <entry>
-       Using the <literal>"arrayFilters"</literal> option will result in an
-       exception at execution time if unsupported by the server. Previously,
-       no exception would be thrown and the option may have been ignored.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       Added the <literal>"arrayFilters"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       Added the <literal>"collation"</literal> option.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWrite::update</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->update(
-    ['x' => 2],
-    ['$set' => ['y' => 3]],
-    ['multi' => false, 'upsert' => false]
-);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname></member>
-   <member><classname>MongoDB\Driver\WriteResult</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/mongodb/mongodb/driver/bulkwritecommand.xml b/reference/mongodb/mongodb/driver/bulkwritecommand.xml
deleted file mode 100644
index ab837a85a28a..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-bulkwritecommand" role="class" 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\BulkWriteCommand class</title>
- <titleabbrev>MongoDB\Driver\BulkWriteCommand</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\BulkWriteCommand intro -->
-  <section xml:id="mongodb-driver-bulkwritecommand.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>MongoDB\Driver\BulkWriteCommand</classname> collects one or more
-    write operations that should be sent to the server using the
-    <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-    command introduced in MongoDB 8.0. After adding any number of insert,
-    update, and delete operations, the command may be executed via
-    <methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname>.
-   </simpara>
-   <simpara>
-    Unlike <classname>MongoDB\Driver\BulkWrite</classname>, where all write
-    operations must target the same collection, each write operation within
-    <classname>MongoDB\Driver\BulkWriteCommand</classname> may target a
-    different collection.
-   </simpara>
-   <simpara>
-    Write operations may either be ordered (default) or unordered. Ordered write
-    operations are sent to the server, in the order provided, for serial
-    execution. If a write fails, any remaining operations will be aborted.
-    Unordered operations are sent to the server in an arbitrary order
-    where they may be executed in parallel. Any errors that occur are reported
-    after all operations have been attempted.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-bulkwritecommand.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\BulkWriteCommand</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\BulkWriteCommand</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-bulkwritecommand')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongodb-driver-bulkwritecommand.examples">
-   &reftitle.examples;
-
-   <example>
-    <title>Mixed write operations</title>
-    <simpara>
-     Mixed write operations (i.e. inserts, updates, and deletes) will be sent
-     to the server using a single
-     <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-     command.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-// Delete documents from both collections
-$bulk->deleteMany('db.coll_one', []);
-$bulk->deleteMany('db.coll_two', []);
-
-// Insert documents into two collections
-$bulk->insertOne('db.coll_one', ['_id' => 1]);
-$bulk->insertOne('db.coll_two', ['_id' => 2]);
-$bulk->insertOne('db.coll_two', ['_id' => 3]);
-
-// Update a document in "coll_one"
-$bulk->updateOne('db.coll_one', ['_id' => 1], ['$set' => ['x' => 1]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Inserted 3 document(s)
-Updated  1 document(s)
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Ordered write operations causing an error</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-$bulk->deleteMany('db.coll', []);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 2]);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 3]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    $result = $e->getPartialResult();
-
-    var_dump($e->getWriteErrors());
-}
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(1) {
-  [3]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(78) "E11000 duplicate key error collection: db.coll index: _id_ dup key: { _id: 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(3)
-    ["info"]=>
-    object(stdClass)#6 (0) {
-    }
-  }
-}
-Inserted 2 document(s)
-]]>
-    </screen>
-   </example>
-  </section>
-
-  <section xml:id="mongodb-driver-bulkwritecommand.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-    <member><classname>MongoDB\Driver\BulkWriteCommandResult</classname></member>
-    <member><classname>MongoDB\Driver\Exception\BulkWriteCommandException</classname></member>
-    <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-    <member><classname>MongoDB\Driver\WriteConcernError</classname></member>
-    <member><classname>MongoDB\Driver\WriteError</classname></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.bulkwritecommand;
-
-</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/mongodb/mongodb/driver/bulkwritecommand/construct.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/construct.xml
deleted file mode 100644
index a3912fc9f0fa..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/construct.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::__construct</refname>
-  <refpurpose>Create a new BulkWriteCommand</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>MongoDB\Driver\BulkWriteCommand::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\BulkWriteCommand</classname>,
-   which may be used to perform many insert, update, and delete operations on
-   multiple collections in a single request using the
-   <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-   command introduced in MongoDB 8.0. This differs from
-   <classname>MongoDB\Driver\BulkWrite</classname>, which is supported by all
-   server versions but limited to a single collection.
-  </simpara>
-  <simpara>
-   After all write operations have been added, this object may be executed with
-   <methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter> (<type>array</type>)</term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>bypassDocumentValidation</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, allows insert and update operations to circumvent
-            document level validation.
-           </simpara>
-          </entry>
-          <entry>&false;</entry>
-         </row>
-         <row>
-          <entry>comment</entry>
-          <entry><type>mixed</type></entry>
-          <entry>
-           <simpara>
-            An arbitrary comment to help trace the operation through the
-            database profiler, currentOp output, and logs.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.let;
-         <row>
-          <entry>ordered</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Whether the operations in this bulk write should be executed in
-            the order in which they were specified. If &false;, writes will
-            continue to be executed if an individual write fails. If &true;,
-            writes will stop executing if an individual write fails.
-           </simpara>
-          </entry>
-          <entry>&true;</entry>
-         </row>
-         <row>
-          <entry>verboseResults</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Whether detailed results for each successful operation should be
-            included in the returned
-            <classname>MongoDB\Driver\BulkWriteCommandResult</classname>.
-           </simpara>
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-// Delete documents from both collections
-$bulk->deleteMany('db.coll_one', []);
-$bulk->deleteMany('db.coll_two', []);
-
-// Insert documents into two collections
-$bulk->insertOne('db.coll_one', ['_id' => 1]);
-$bulk->insertOne('db.coll_two', ['_id' => 2]);
-$bulk->insertOne('db.coll_two', ['_id' => 3]);
-
-// Update a document in "coll_one"
-$bulk->updateOne('db.coll_one', ['_id' => 1], ['$set' => ['x' => 1]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Inserted 3 document(s)
-Updated  1 document(s)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommand/count.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/count.xml
deleted file mode 100644
index c0541c0af572..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/count.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::count</refname>
-  <refpurpose>Count number of write operations in the BulkWriteCommand</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommand::count</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the number of write operations added to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname> object.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns number of write operations added to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['_id' => 1, 'x' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 2, 'x' => 2]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['x' => 1]]);
-$bulk->deleteMany('db.coll', ['x' => 1]);
-
-var_dump(count($bulk));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(4)
-]]>
-   </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/mongodb/mongodb/driver/bulkwritecommand/deletemany.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/deletemany.xml
deleted file mode 100644
index f686534fe618..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/deletemany.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.deletemany" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::deleteMany</refname>
-  <refpurpose>Add a deleteMany operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWriteCommand::deleteMany</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add a deleteMany operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. All documents
-   matching <parameter>filter</parameter> in the collection identified by
-   <parameter>namespace</parameter> will be deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::deleteMany</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->deleteMany('db.coll', ['x' => ['$gt' => 1]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::deleteOne</methodname></member>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommand/deleteone.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/deleteone.xml
deleted file mode 100644
index bc0f369652e1..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/deleteone.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.deleteone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::deleteOne</refname>
-  <refpurpose>Add a deleteOne operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWriteCommand::deleteOne</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add a deleteOne operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. The first document
-   matching <parameter>filter</parameter> in the collection identified by
-   <parameter>namespace</parameter> will be deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::deleteOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->deleteOne('db.coll', ['x' => 1]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::deleteMany</methodname></member>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommand/insertone.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/insertone.xml
deleted file mode 100644
index 9ff47f8529d0..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/insertone.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.insertone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::insertOne</refname>
-  <refpurpose>Add an insertOne operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\Driver\BulkWriteCommand::insertOne</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add an insertOne operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. The document will
-   be inserted into the collection identified by
-   <parameter>namespace</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   <varlistentry>
-    <term><parameter>document</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A document to insert.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <literal>_id</literal> of the inserted document. If the
-   <parameter>document</parameter> did not have an <literal>_id</literal>, the
-   <classname>MongoDB\BSON\ObjectId</classname> generated for the insert will
-   be returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::insertOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-$doc1 = ['x' => 1];
-$doc2 = ['_id' => 'custom-id', 'x' => 2];
-$doc3 = ['_id' => new MongoDB\BSON\ObjectId('0123456789abcdef01234567'), 'x' => 3];
-
-$id1 = $bulk->insertOne('db.coll', $doc1);
-$id2 = $bulk->insertOne('db.coll', $doc2);
-$id3 = $bulk->insertOne('db.coll', $doc3);
-
-var_dump($id1, $id2, $id3);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\ObjectId)#3 (1) {
-  ["oid"]=>
-  string(24) "67f58058d1a0aa2fd80d55d0"
-}
-string(9) "custom-id"
-object(MongoDB\BSON\ObjectId)#4 (1) {
-  ["oid"]=>
-  string(24) "0123456789abcdef01234567"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</classname></member>
-   <member><classname>MongoDB\BSON\ObjectId</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/mongodb/mongodb/driver/bulkwritecommand/replaceone.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/replaceone.xml
deleted file mode 100644
index 95c12b7c4bc7..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/replaceone.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.replaceone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::replaceOne</refname>
-  <refpurpose>Add a replaceOne operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWriteCommand::replaceOne</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>replacement</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add a replaceOne operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. The first document
-   matching <parameter>filter</parameter> in the collection identified by
-   <parameter>namespace</parameter> will be replaced.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>replacement</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A replacement document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>sort</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Specify which document the operation replaces if the query matches
-            multiple documents. The first document matched by the sort order
-            will be replaced.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>upsert</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           If <parameter>filter</parameter> does not match an existing document,
-           insert a <emphasis>single</emphasis> document. The document will be
-           created from <parameter>replacement</parameter>.
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::replaceOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->replaceOne('db.coll', ['x' => 1], ['x' => 1, 'y' => 2]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::updateOne</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::updateMany</methodname></member>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommand/updatemany.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/updatemany.xml
deleted file mode 100644
index 86a3005db55a..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/updatemany.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.updatemany" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::updateMany</refname>
-  <refpurpose>Add an updateMany operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWriteCommand::updateMany</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>update</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add an updateMany operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. All documents
-   matching <parameter>filter</parameter> in the collection identified by
-   <parameter>namespace</parameter> will be updated.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>update</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A document containing either update operators (e.g.
-      <literal>$set</literal>) or an
-      <link xlink:href="&url.mongodb.docs.command;update/#update-with-an-aggregation-pipeline">aggregation pipeline</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>arrayFilters</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            An array of filter documents that determines which array elements to
-            modify for an update operation on an array field. See
-            <link xlink:href="&url.mongodb.docs.command;update/#update-command-arrayfilters">Specify arrayFilters for Array Update Operations</link>
-            in the MongoDB manual for more information.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>upsert</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           If <parameter>filter</parameter> does not match an existing document,
-           insert a <emphasis>single</emphasis> document. The document will be
-           created by applying operators in <parameter>update</parameter> to any
-           field values in <parameter>filter</parameter>.
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::updateMany</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->updateMany('db.coll', ['x' => ['$gt' => 1]], ['$set' => ['y' => 2]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::replaceOne</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::updateMany</methodname></member>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommand/updateone.xml b/reference/mongodb/mongodb/driver/bulkwritecommand/updateone.xml
deleted file mode 100644
index 85b041f6f70d..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommand/updateone.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommand.updateone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommand::updateOne</refname>
-  <refpurpose>Add an updateOne operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\BulkWriteCommand::updateOne</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>update</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add an updateOne operation to the
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. The first document
-   matching <parameter>filter</parameter> in the collection identified by
-   <parameter>namespace</parameter> will be updated.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>update</parameter> (<type class="union"><type>array</type><type>object</type></type>)</term>
-    <listitem>
-     <simpara>
-      A document containing either update operators (e.g.
-      <literal>$set</literal>) or an
-      <link xlink:href="&url.mongodb.docs.command;update/#update-with-an-aggregation-pipeline">aggregation pipeline</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>arrayFilters</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            An array of filter documents that determines which array elements to
-            modify for an update operation on an array field. See
-            <link xlink:href="&url.mongodb.docs.command;update/#update-command-arrayfilters">Specify arrayFilters for Array Update Operations</link>
-            in the MongoDB manual for more information.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.collation;
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>sort</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Specify which document the operation updates if the query matches
-            multiple documents. The first document matched by the sort order
-            will be updated.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>upsert</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           If <parameter>filter</parameter> does not match an existing document,
-           insert a <emphasis>single</emphasis> document. The document will be
-           created by applying operators in <parameter>update</parameter> to any
-           field values in <parameter>filter</parameter>.
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommand::updateOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 2]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::replaceOne</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::updateMany</methodname></member>
-   <member><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</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/mongodb/mongodb/driver/bulkwritecommandresult.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult.xml
deleted file mode 100644
index 2e6b0b331c2c..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-bulkwritecommandresult" role="class" 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\BulkWriteCommandResult class</title>
- <titleabbrev>MongoDB\Driver\BulkWriteCommandResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\BulkWriteCommandResult intro -->
-  <section xml:id="mongodb-driver-bulkwritecommandresult.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\BulkWriteCommandResult</classname> class
-    encapsulates information about an executed
-    <classname>MongoDB\Driver\BulkWriteCommand</classname> and is returned by
-    <methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-bulkwritecommandresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\BulkWriteCommandResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\BulkWriteCommandResult</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-bulkwritecommandresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.bulkwritecommandresult;
-
-</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/mongodb/mongodb/driver/bulkwritecommandresult/getdeletedcount.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getdeletedcount.xml
deleted file mode 100644
index 7ad751d43995..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getdeletedcount.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getdeletedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getDeletedCount</refname>
-  <refpurpose>Returns the number of documents deleted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommandResult::getDeletedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the total number of documents deleted by all operations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getDeletedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getDeletedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getDeleteResults</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getdeleteresults.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getdeleteresults.xml
deleted file mode 100644
index 9c5d235f528b..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getdeleteresults.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getdeleteresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getDeleteResults</refname>
-  <refpurpose>Returns verbose results for successful deletes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\Document</type><type>null</type></type><methodname>MongoDB\Driver\BulkWriteCommandResult::getDeleteResults</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a document containing the result of each successful delete
-   operation, or &null; if verbose results were not requested. The document
-   keys will correspond to the index of the write operation from
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getDeleteResults</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand(['verboseResults' => true]);
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getDeleteResults()->toPHP());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#7 (1) {
-  ["4"]=>
-  object(stdClass)#6 (1) {
-    ["deletedCount"]=>
-    object(MongoDB\BSON\Int64)#5 (1) {
-      ["integer"]=>
-      string(1) "3"
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getDeletedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getinsertedcount.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getinsertedcount.xml
deleted file mode 100644
index 5abe75d4735c..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getinsertedcount.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getinsertedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getInsertedCount</refname>
-  <refpurpose>Returns the number of documents inserted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommandResult::getInsertedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the total number of documents inserted (excluding upserts) by all
-   operations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getInsertedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getInsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getInsertResults</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getinsertresults.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getinsertresults.xml
deleted file mode 100644
index 4a1986e5fa01..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getinsertresults.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getinsertresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getInsertResults</refname>
-  <refpurpose>Returns verbose results for successful inserts</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\Document</type><type>null</type></type><methodname>MongoDB\Driver\BulkWriteCommandResult::getInsertResults</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Since <literal>_id</literal> fields for inserted documents are generated by
-   the extension when not explicitly provided, the value of
-   <literal>insertedId</literal> in each result will match the return value of
-   <methodname>MongoDB\Driver\BulkWriteCommand::insertOne</methodname> for
-   the corresponding insert operation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a document containing the result of each successful insert
-   operation, or &null; if verbose results were not requested. The document
-   keys will correspond to the index of the write operation from
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getInsertResults</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand(['verboseResults' => true]);
-
-$generatedId = $bulk->insertOne('db.coll', ['x' => 1]);
-
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($generatedId);
-
-var_dump($result->getInsertResults()->toPHP());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\ObjectId)#3 (1) {
-  ["oid"]=>
-  string(24) "67f7ee69783dcce702097b41"
-}
-object(stdClass)#8 (1) {
-  ["0"]=>
-  object(stdClass)#7 (1) {
-    ["insertedId"]=>
-    object(MongoDB\BSON\ObjectId)#6 (1) {
-      ["oid"]=>
-      string(24) "67f7ee69783dcce702097b41"
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getInsertedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommand::insertOne</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/mongodb/mongodb/driver/bulkwritecommandresult/getmatchedcount.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getmatchedcount.xml
deleted file mode 100644
index 8fb2a9a7bd03..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getmatchedcount.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getmatchedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</refname>
-  <refpurpose>Returns the number of documents selected for update</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the update operation results in no change to the document (e.g. setting
-   the value of a field to its current value), the matched count may be greater
-   than the value returned by
-   <methodname>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the total number of documents selected for update by all operations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getMatchedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getmodifiedcount.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getmodifiedcount.xml
deleted file mode 100644
index 3e68521a7e32..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getmodifiedcount.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getmodifiedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</refname>
-  <refpurpose>Returns the number of existing documents updated</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the update operation results in no change to the document (e.g. setting
-   the value of a field to its current value), the modified count may be less
-   than the value returned by
-   <methodname>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the total number of existing documents updated by all operations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getModifiedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getupdateresults.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getupdateresults.xml
deleted file mode 100644
index cab3f1e1d039..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getupdateresults.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getupdateresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</refname>
-  <refpurpose>Returns verbose results for successful updates</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\Document</type><type>null</type></type><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a document containing the result of each successful update
-   operation, or &null; if verbose results were not requested. The document
-   keys will correspond to the index of the write operation from
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand(['verboseResults' => true]);
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getUpdateResults()->toPHP());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#16 (3) {
-  ["1"]=>
-  object(stdClass)#7 (2) {
-    ["matchedCount"]=>
-    object(MongoDB\BSON\Int64)#5 (1) {
-      ["integer"]=>
-      string(1) "1"
-    }
-    ["modifiedCount"]=>
-    object(MongoDB\BSON\Int64)#6 (1) {
-      ["integer"]=>
-      string(1) "1"
-    }
-  }
-  ["2"]=>
-  object(stdClass)#11 (3) {
-    ["matchedCount"]=>
-    object(MongoDB\BSON\Int64)#8 (1) {
-      ["integer"]=>
-      string(1) "1"
-    }
-    ["modifiedCount"]=>
-    object(MongoDB\BSON\Int64)#9 (1) {
-      ["integer"]=>
-      string(1) "0"
-    }
-    ["upsertedId"]=>
-    object(MongoDB\BSON\ObjectId)#10 (1) {
-      ["oid"]=>
-      string(24) "67f7eb9b1f198bbcb880d575"
-    }
-  }
-  ["3"]=>
-  object(stdClass)#15 (3) {
-    ["matchedCount"]=>
-    object(MongoDB\BSON\Int64)#12 (1) {
-      ["integer"]=>
-      string(1) "1"
-    }
-    ["modifiedCount"]=>
-    object(MongoDB\BSON\Int64)#13 (1) {
-      ["integer"]=>
-      string(1) "0"
-    }
-    ["upsertedId"]=>
-    object(MongoDB\BSON\ObjectId)#14 (1) {
-      ["oid"]=>
-      string(24) "67f7eb9b1f198bbcb880d576"
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getMatchedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getModifiedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpsertedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/getupsertedcount.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/getupsertedcount.xml
deleted file mode 100644
index e42e4c3b1ebf..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/getupsertedcount.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.getupsertedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::getUpsertedCount</refname>
-  <refpurpose>Returns the number of documents upserted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpsertedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the total number of documents upserted by all operations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   &mongodb.throws.unacknowledged;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::getUpsertedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-$bulk->updateOne('db.coll', ['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->updateOne('db.coll', ['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->updateOne('db.coll', ['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->deleteMany('db.coll', []);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->getUpsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::getUpdateResults</methodname></member>
-   <member><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</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/mongodb/mongodb/driver/bulkwritecommandresult/isacknowledged.xml b/reference/mongodb/mongodb/driver/bulkwritecommandresult/isacknowledged.xml
deleted file mode 100644
index 9b833136db49..000000000000
--- a/reference/mongodb/mongodb/driver/bulkwritecommandresult/isacknowledged.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandresult.isacknowledged" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</refname>
-  <refpurpose>Returns whether the write was acknowledged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the write is acknowledged, other fields will be available on the
-   <classname>MongoDB\Driver\BulkWriteCommandResult</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the write was acknowledged, and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</function> with acknowledged write concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-var_dump($result->isAcknowledged());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\BulkWriteCommandResult::isAcknowledged</function> with unacknowledged write concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand(['ordered' => false]);
-$bulk->insertOne('db.coll', ['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(0);
-
-$result = $manager->executeBulkWriteCommand($bulk, ['writeConcern' => $writeConcern]);
-
-var_dump($result->isAcknowledged());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/clientencryption.xml b/reference/mongodb/mongodb/driver/clientencryption.xml
deleted file mode 100644
index fd10c73c35ee..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344831 $ -->
-
-<reference xml:id="class.mongodb-driver-clientencryption" role="class" 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\ClientEncryption class</title>
- <titleabbrev>MongoDB\Driver\ClientEncryption</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongoDB\Driver\ClientEncryption intro -->
-  <section xml:id="mongodb-driver-clientencryption.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\ClientEncryption</classname> class handles
-    creation of data keys for client-side encryption, as well as manually
-    encrypting and decrypting values.
-   </simpara>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="mongodb-driver-clientencryption.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\ClientEncryption</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\ClientEncryption</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-    <!-- {{{ MongoDB\Driver\ReadPreference constants -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.deterministic">MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC</varname>
-     <initializer>AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.random">MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM</varname>
-     <initializer>AEAD_AES_256_CBC_HMAC_SHA_512-Random</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.algorithm-indexed">MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED</varname>
-     <initializer>Indexed</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.algorithm-unindexed">MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED</varname>
-     <initializer>Unindexed</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.algorithm-range">MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE</varname>
-     <initializer>Range</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.query-type-equality">MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY</varname>
-     <initializer>equality</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-clientencryption.constants.query-type-range">MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE</varname>
-     <initializer>range</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-clientencryption')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
-  <!-- {{{ MongoDB\Driver\ClientEncryption constants -->
-  <section xml:id="mongodb-driver-clientencryption.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.deterministic">
-     <term><constant>MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC</constant></term>
-     <listitem>
-      <simpara>Specifies an algorithm for <link xlink:href="&url.mongodb.docs;core/csfle/fundamentals/encryption-algorithms/#deterministic-encryption">deterministic encryption</link>, which is suitable for querying.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.random">
-     <term><constant>MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM</constant></term>
-     <listitem>
-      <simpara>Specifies an algorithm for <link xlink:href="&url.mongodb.docs;core/csfle/fundamentals/encryption-algorithms/#randomized-encryption">randomized encryption</link></simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.algorithm-indexed">
-     <term><constant>MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED</constant></term>
-     <listitem>
-      <simpara>Specifies an algorithm for an indexed, encrypted payload, which can be used with queryable encryption.</simpara>
-      <simpara>To insert or query with an indexed, encrypted payload, the <classname>MongoDB\Driver\Manager</classname> must be configured with the <literal>"autoEncryption"</literal> driver option. The <literal>"bypassQueryAnalysis"</literal> auto encryption option may be &true;. The <literal>"bypassAutoEncryption"</literal> auto encryption option must be &false;.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.algorithm-unindexed">
-     <term><constant>MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED</constant></term>
-     <listitem>
-      <simpara>Specifies an algorithm for an unindexed, encrypted payload.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.algorithm-range">
-     <term><constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE</constant></term>
-     <listitem>
-      <simpara>
-       Specifies an algorithm for a range encrypted payload, which can be used
-       with queryable encryption.
-      </simpara>
-      <simpara>
-       To query with a range encrypted payload, the
-       <classname>MongoDB\Driver\Manager</classname> must be configured with the
-       <literal>"autoEncryption"</literal> driver option. The
-       <literal>"bypassQueryAnalysis"</literal> auto encryption option may be
-       &true;. The <literal>"bypassAutoEncryption"</literal> auto encryption
-       option must be &false;.
-      </simpara>
-      <note>
-       <simpara>The extension does not yet support range queries for Decimal128 BSON field types.</simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.query-type-equality">
-     <term><constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY</constant></term>
-     <listitem>
-      <simpara>
-       Specifies an equality query type, which is used in conjunction with
-       <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED</constant>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-clientencryption.constants.query-type-range">
-     <term><constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE</constant></term>
-     <listitem>
-      <simpara>
-       Specifies a range query type, which is used in conjunction with
-       <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE</constant>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-  <!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.0.0</entry>
-       <entry>
-        <simpara>
-         Removed <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW</constant>
-         and <constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW</constant>.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.20.0</entry>
-       <entry>
-        <simpara>
-         Added <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE</constant>
-         and <constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE</constant>.
-        </simpara>
-        <simpara>
-         Deprecated <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW</constant>
-         and <constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW</constant>.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.16.0</entry>
-       <entry>
-        Added <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW</constant>
-        and <constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW</constant>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.14.0</entry>
-       <entry>
-        Added <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED</constant>,
-        <constant>MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED</constant>,
-        and <constant>MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY</constant>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
-  <section xml:id="mongodb-driver-clientencryption.seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><function>MongoDB\Driver\Manager::createClientEncryption</function></member>
-   </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.clientencryption;
-
-</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/mongodb/mongodb/driver/clientencryption/addkeyaltname.xml b/reference/mongodb/mongodb/driver/clientencryption/addkeyaltname.xml
deleted file mode 100644
index a48595e1d43f..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/addkeyaltname.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.addkeyaltname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::addKeyAltName</refname>
-  <refpurpose>Adds an alternate name to a key document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\ClientEncryption::addKeyAltName</methodname>
-   <methodparam><type>MongoDB\BSON\Binary</type><parameter>keyId</parameter></methodparam>
-   <methodparam><type>string</type><parameter>keyAltName</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds <parameter>keyAltName</parameter> to the set of alternate names for the
-   key document with the given UUID <parameter>keyId</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keyId</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>MongoDB\BSON\Binary</classname> instance with subtype 4
-      (UUID) identifying the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>keyAltName</parameter></term>
-    <listitem>
-     <simpara>
-      Alternate name to add to the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the previous version of the key document, or &null; if no document
-   matched.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::getKeyByAltName</function></member>
-   <member><function>MongoDB\Driver\ClientEncryption::removeKeyAltName</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/mongodb/mongodb/driver/clientencryption/construct.xml b/reference/mongodb/mongodb/driver/clientencryption/construct.xml
deleted file mode 100644
index 044af3620ec5..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/construct.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::__construct</refname>
-  <refpurpose>Create a new ClientEncryption object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\ClientEncryption::__construct</methodname>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\ClientEncryption</classname> object with the specified options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>keyVaultClient</entry>
-          <entry><classname>MongoDB\Driver\Manager</classname></entry>
-          <entry>The Manager used to route data key queries. This option is required (unlike with <function>MongoDB\Driver\Manager::createClientEncryption</function>).</entry>
-         </row>
-         &mongodb.option.encryption.keyVaultNamespace;
-         &mongodb.option.encryption.kmsProviders;
-         &mongodb.option.encryption.tlsOptions;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the extension was compiled without libmongocrypt support</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.16.0</entry>
-      <entry>
-       <simpara>
-        The AWS KMS provider for client-side encryption now accepts a
-        <literal>"sessionToken"</literal> option, which can be used to
-        authenticate with temporary AWS credentials.
-       </simpara>
-       <simpara>
-        Added <literal>"tlsDisableOCSPEndpointCheck"</literal> to the
-        <literal>"tlsOptions"</literal> option.
-       </simpara>
-       <simpara>
-        If an empty document is specified for the <literal>"azure"</literal> or
-        <literal>"gcp"</literal> KMS provider, the driver will attempt to
-        configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.15.0</entry>
-      <entry>
-       <simpara>
-        If an empty document is specified for the <literal>"aws"</literal> KMS
-        provider, the driver will attempt to configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::createClientEncryption</function></member>
-   <member><link xlink:href="&url.mongodb.docs;core/security-explicit-client-side-encryption/">Explicit (Manual) Client-Side Field Level Encryption</link> in the MongoDB manual</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/clientencryption/createdatakey.xml b/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
deleted file mode 100644
index 995bfad5c5b1..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/createdatakey.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.createdatakey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::createDataKey</refname>
-  <refpurpose>Creates a key document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Binary</type><methodname>MongoDB\Driver\ClientEncryption::createDataKey</methodname>
-   <methodparam><type>string</type><parameter>kmsProvider</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a new key document and inserts it into the key vault collection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>kmsProvider</parameter></term>
-    <listitem>
-     <simpara>
-      The KMS provider (e.g. <literal>"local"</literal>,
-      <literal>"aws"</literal>) that will be used to encrypt the new data key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>Data key options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>masterKey</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            The masterKey document identifies a KMS-specific key used to encrypt
-            the new data key. This option is required unless
-            <parameter>kmsProvider</parameter> is <literal>"local"</literal>.
-           </simpara>
-           &mongodb.option.encryption.masterKey-options-by-provider;
-          </entry>
-         </row>
-         <row>
-          <entry>keyAltNames</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            An optional list of string alternate names used to reference a key.
-            If a key is created with alternate names, then encryption may refer
-            to the key by the unique alternate name instead of by
-            <literal>_id</literal>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>keyMaterial</entry>
-          <entry><classname>MongoDB\BSON\Binary</classname></entry>
-          <entry>
-           <simpara>
-            An optional 96-byte value to use as custom key material for the data
-            key being created. If keyMaterial is given, the custom key material
-            is used for encrypting and decrypting data. Otherwise, the key
-            material for the new data key is generated from a cryptographically
-            secure random device.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the identifier of the new key as a
-   <classname>MongoDB\BSON\Binary</classname> object with subtype 4 (UUID).
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Added <literal>"delegated"</literal> to the KMIP provider masterKey options.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.15.0</entry>
-      <entry>
-       Added the <literal>"keyMaterial"</literal> option.
-      </entry>
-     </row>
-     <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>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/clientencryption/decrypt.xml b/reference/mongodb/mongodb/driver/clientencryption/decrypt.xml
deleted file mode 100644
index 7753f4996cd4..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/decrypt.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.decrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::decrypt</refname>
-  <refpurpose>Decrypt a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>MongoDB\Driver\ClientEncryption::decrypt</methodname>
-   <methodparam><type>MongoDB\BSON\Binary</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decrypts the value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>MongoDB\BSON\Binary</classname> instance with subtype 6
-      containing the encrypted value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the decrypted value as it was passed to
-   <function>MongoDB\Driver\ClientEncryption::encrypt</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\EncryptionException</classname> if an error occurs while decrypting the value</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::encrypt</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/mongodb/mongodb/driver/clientencryption/deletekey.xml b/reference/mongodb/mongodb/driver/clientencryption/deletekey.xml
deleted file mode 100644
index 398b5397b4b4..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/deletekey.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.deletekey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::deleteKey</refname>
-  <refpurpose>Deletes a key document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\ClientEncryption::deleteKey</methodname>
-   <methodparam><type>MongoDB\BSON\Binary</type><parameter>keyId</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes the key document with the given UUID <parameter>keyId</parameter>
-   from the key vault collection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keyId</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>MongoDB\BSON\Binary</classname> instance with subtype 4
-      (UUID) identifying the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the result of the internal <literal>deleteOne</literal> operation on
-   the key vault collection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</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/clientencryption/encrypt.xml b/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml
deleted file mode 100644
index af39a7e2b529..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/encrypt.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.encrypt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::encrypt</refname>
-  <refpurpose>Encrypt a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Binary</type><methodname>MongoDB\Driver\ClientEncryption::encrypt</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encrypts the value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to be encrypted. Any value that can be inserted into MongoDB can
-      be encrypted using this method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mongodb.parameter.encryptOpts;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the encrypted value as
-   <classname>MongoDB\BSON\Binary</classname> object with subtype 6.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\EncryptionException</classname> if an error occurs while encrypting the value</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Added the <literal>"trimFactor"</literal> range option. The
-       <literal>"sparsity"</literal> range option is now optional.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.16.0</entry>
-      <entry>
-       Added the <literal>"rangeOpts"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.14.0</entry>
-      <entry>
-       Added the <literal>"contentionFactor"</literal> and
-       <literal>"queryType"</literal> options.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::decrypt</function></member>
-   <member><function>MongoDB\Driver\ClientEncryption::encryptExpression</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/mongodb/mongodb/driver/clientencryption/encryptexpression.xml b/reference/mongodb/mongodb/driver/clientencryption/encryptexpression.xml
deleted file mode 100644
index 284b88462b89..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/encryptexpression.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.encryptexpression" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::encryptExpression</refname>
-  <refpurpose>Encrypts a match or aggregate expression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\ClientEncryption::encryptExpression</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>expr</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encrypts a match or aggregate expression to query a range index.
-  </simpara>
-  <simpara>To query with a range encrypted payload, the <classname>MongoDB\Driver\Manager</classname> must be configured with the <literal>"autoEncryption"</literal> driver option. The <literal>"bypassQueryAnalysis"</literal> auto encryption option may be &true;. The <literal>"bypassAutoEncryption"</literal> auto encryption option must be &false;.</simpara>
-  <note>
-   <simpara>The extension does not yet support range queries for Decimal128 BSON field types.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>expr</parameter></term>
-    <listitem>
-     <simpara>
-      The match or aggregate expression to be encrypted. Expressions must use at
-      least one of the <literal>$gt</literal>, <literal>$gte</literal>,
-      <literal>$lt</literal>, or <literal>$lte</literal> operators. A top-level
-      <literal>$and</literal> operator is required, even if only a single
-      comparison operator is used.
-     </simpara>
-     <simpara>
-      An example of a supported match expression (applies to queries and the
-      <literal>$match</literal> aggregation stage) is as follows:
-     </simpara>
-     <programlisting role="text">
-<![CDATA[
-[
-    '$and' => [
-        [ '<field>' => [ '$gt'  => '<value1>' ] ],
-        [ '<field>' => [ '$lte' => '<value2>' ] ],
-    ],
-]
-]]>
-     </programlisting>
-     <simpara>
-      An example of a supported aggregate expression is as follows:
-     </simpara>
-     <programlisting role="text">
-<![CDATA[
-[
-    '$and' => [
-        [ '$gte' => [ '<fieldPath>', '<value1>' ] ],
-        [ '$lt'  => [ '<fieldPath>', '<value2>' ] ],
-    ],
-]
-]]>
-     </programlisting>
-    </listitem>
-   </varlistentry>
-   &mongodb.parameter.encryptOpts;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the encrypted expression as an object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\EncryptionException</classname> if an error occurs while encrypting the expression</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Added the <literal>"trimFactor"</literal> range option. The
-       <literal>"sparsity"</literal> range option is now optional.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::__construct</function></member>
-   <member><function>MongoDB\Driver\ClientEncryption::encrypt</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/mongodb/mongodb/driver/clientencryption/getkey.xml b/reference/mongodb/mongodb/driver/clientencryption/getkey.xml
deleted file mode 100644
index 6d60326359d2..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/getkey.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.getkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::getKey</refname>
-  <refpurpose>Gets a key document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\ClientEncryption::getKey</methodname>
-   <methodparam><type>MongoDB\BSON\Binary</type><parameter>keyId</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Finds a single key document in the key vault collection with the given UUID
-   <parameter>keyId</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keyId</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>MongoDB\BSON\Binary</classname> instance with subtype 4
-      (UUID) identifying the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key document, or &null; if no document matched.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</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/clientencryption/getkeybyaltname.xml b/reference/mongodb/mongodb/driver/clientencryption/getkeybyaltname.xml
deleted file mode 100644
index 3fa9f2def180..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/getkeybyaltname.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.getkeybyaltname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::getKeyByAltName</refname>
-  <refpurpose>Gets a key document by an alternate name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\ClientEncryption::getKeyByAltName</methodname>
-   <methodparam><type>string</type><parameter>keyAltName</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Finds a single key document in the key vault collection with the given
-   alternate name <parameter>keyAltName</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keyAltName</parameter></term>
-    <listitem>
-     <simpara>
-      Alternate name for the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the key document, or &null; if no document matched.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::addKeyAltName</function></member>
-   <member><function>MongoDB\Driver\ClientEncryption::removeKeyAltName</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/mongodb/mongodb/driver/clientencryption/getkeys.xml b/reference/mongodb/mongodb/driver/clientencryption/getkeys.xml
deleted file mode 100644
index db0a84be4dd0..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/getkeys.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.getkeys" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::getKeys</refname>
-  <refpurpose>Gets all key documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\ClientEncryption::getKeys</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Finds all key documents in the key vault collection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</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/clientencryption/removekeyaltname.xml b/reference/mongodb/mongodb/driver/clientencryption/removekeyaltname.xml
deleted file mode 100644
index 25f59ed161fd..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/removekeyaltname.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.removekeyaltname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::removeKeyAltName</refname>
-  <refpurpose>Removes an alternate name from a key document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\ClientEncryption::removeKeyAltName</methodname>
-   <methodparam><type>MongoDB\BSON\Binary</type><parameter>keyId</parameter></methodparam>
-   <methodparam><type>string</type><parameter>keyAltName</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes <parameter>keyAltName</parameter> from the set of alternate names for
-   the key document with the given UUID <parameter>keyId</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>keyId</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>MongoDB\BSON\Binary</classname> instance with subtype 4
-      (UUID) identifying the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>keyAltName</parameter></term>
-    <listitem>
-     <simpara>
-      Alternate name to remove from the key document.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the previous version of the key document, or &null; if no document
-   matched.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::addKeyAltName</function></member>
-   <member><function>MongoDB\Driver\ClientEncryption::getKeyByAltName</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/mongodb/mongodb/driver/clientencryption/rewrapmanydatakey.xml b/reference/mongodb/mongodb/driver/clientencryption/rewrapmanydatakey.xml
deleted file mode 100644
index 66e7b9036310..000000000000
--- a/reference/mongodb/mongodb/driver/clientencryption/rewrapmanydatakey.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344035 $ -->
-
-<refentry xml:id="mongodb-driver-clientencryption.rewrapmanydatakey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ClientEncryption::rewrapManyDataKey</refname>
-  <refpurpose>Rewraps data keys</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\ClientEncryption::rewrapManyDataKey</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rewraps (i.e. decrypts and re-encrypts) zero or more data keys in the key
-   vault collection that match the given <parameter>filter</parameter>.
-  </simpara>
-  <simpara>
-   If the <literal>"provider"</literal> option is not specified, matching data
-   keys will be rewrapped with their current KMS provider. Otherwise, matching
-   data keys will be re-encrypted according to the specified
-   <literal>"provider"</literal> and <literal>"masterKey"</literal> options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>RewrapManyDataKey options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>provider</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            The KMS provider (e.g. <literal>"local"</literal>,
-            <literal>"aws"</literal>) that will be used to re-encrypt the
-            matched data keys.
-           </simpara>
-           <simpara>
-            If a KMS provider is not specified, matched data keys will be
-            re-encrypted with their current KMS provider.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>masterKey</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            The masterKey identifies a KMS-specific key used to encrypt the new
-            data key. This option should not be specified without the
-            <literal>"provider"</literal> option. This option is required if
-            <literal>"provider"</literal> is specified and not
-            <literal>"local"</literal>.
-           </simpara>
-           &mongodb.option.encryption.masterKey-options-by-provider;
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object, which will have an optional
-   <literal>bulkWriteResult</literal> property containing the result of the
-   internal <literal>bulkWrite</literal> operation as an object. If no data keys
-   matched the filter or the write was unacknowledged, the
-   <literal>bulkWriteResult</literal> property will be &null;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\EncryptionException</classname> if an error occurs while decrypting or re-encrypting a data key.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Added <literal>"delegated"</literal> to the KMIP provider masterKey options.
-      </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/mongodb/mongodb/driver/command.xml b/reference/mongodb/mongodb/driver/command.xml
deleted file mode 100644
index 270a15db2681..000000000000
--- a/reference/mongodb/mongodb/driver/command.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-command" role="class" 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\Command class</title>
- <titleabbrev>MongoDB\Driver\Command</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Command intro -->
-  <section xml:id="mongodb-driver-command.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Command</classname> class is a value object
-    that represents a database command.
-   </simpara>
-   <simpara>
-    To provide <quote>Command Helpers</quote> the <classname>MongoDB\Driver\Command</classname> object should be composed.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-command.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Command</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Command</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-command')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongodb-driver-command.examples">
-   &reftitle.examples;
-
-   <example>
-    <title>Composing <classname>MongoDB\Driver\Command</classname> to provide a helper to create collections</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class CreateCollection {
-    protected $cmd = array();
-
-    function __construct($collectionName) {
-        $this->cmd["create"] = (string) $collectionName;
-    }
-    function setCappedCollection($maxBytes, $maxDocuments = false) {
-        $this->cmd["capped"] = true;
-        $this->cmd["size"]   = (int) $maxBytes;
-
-        if ($maxDocuments) {
-            $this->cmd["max"] = (int) $maxDocuments;
-        }
-    }
-    function usePowerOf2Sizes($bool) {
-        if ($bool) {
-            $this->cmd["flags"] = 1;
-        } else {
-            $this->cmd["flags"] = 0;
-        }
-    }
-    function setFlags($flags) {
-        $this->cmd["flags"] = (int) $flags;
-    }
-    function getCommand() {
-        return new MongoDB\Driver\Command($this->cmd);
-    }
-    function getCollectionName() {
-        return $this->cmd["create"];
-    }
-}
-
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-$createCollection = new CreateCollection("cappedCollection");
-$createCollection->setCappedCollection(64 * 1024);
-
-try {
-    $command = $createCollection->getCommand();
-    $cursor = $manager->executeCommand("databaseName", $command);
-    $response = $cursor->toArray()[0];
-    var_dump($response);
-
-    $collstats = ["collstats" => $createCollection->getCollectionName()];
-    $cursor = $manager->executeCommand("databaseName", new MongoDB\Driver\Command($collstats));
-    $response = $cursor->toArray()[0];
-    var_dump($response);
-} catch(MongoDB\Driver\Exception $e) {
-    echo $e->getMessage(), "\n";
-    exit;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\Command)#3 (1) {
-  ["command"]=>
-  array(3) {
-    ["create"]=>
-    string(16) "cappedCollection"
-    ["capped"]=>
-    bool(true)
-    ["size"]=>
-    int(65536)
-  }
-}
-array(1) {
-  ["ok"]=>
-  float(1)
-}
-array(16) {
-  ["ns"]=>
-  string(29) "databaseName.cappedCollection"
-  ["count"]=>
-  int(0)
-  ["size"]=>
-  int(0)
-  ["numExtents"]=>
-  int(1)
-  ["storageSize"]=>
-  int(65536)
-  ["nindexes"]=>
-  int(1)
-  ["lastExtentSize"]=>
-  float(65536)
-  ["paddingFactor"]=>
-  float(1)
-  ["paddingFactorNote"]=>
-  string(101) "paddingFactor is unused and unmaintained in 2.8. It remains hard coded to 1.0 for compatibility only."
-  ["userFlags"]=>
-  int(0)
-  ["capped"]=>
-  bool(true)
-  ["max"]=>
-  int(9223372036854775807)
-  ["maxSize"]=>
-  int(65536)
-  ["totalIndexSize"]=>
-  int(8176)
-  ["indexSizes"]=>
-  object(stdClass)#4 (1) {
-    ["_id_"]=>
-    int(8176)
-  }
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.command;
-
-</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/mongodb/mongodb/driver/command/construct.xml b/reference/mongodb/mongodb/driver/command/construct.xml
deleted file mode 100644
index 6956c79c0f1c..000000000000
--- a/reference/mongodb/mongodb/driver/command/construct.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-command.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Command::__construct</refname>
-  <refpurpose>Create a new Command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\Command::__construct</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>document</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>commandOptions</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\Command</classname>, which is an
-   immutable value object that represents a database command. The command may
-   then be executed with
-   <methodname>MongoDB\Driver\Manager::executeCommand</methodname>.
-  </simpara>
-  <simpara>
-   The complete command document, which includes the command name and its
-   options, should be expressed in the <parameter>document</parameter>
-   parameter. The <parameter>commandOptions</parameter> parameter is only used
-   to specify options related to the execution of the command and the resulting
-   <classname>MongoDB\Driver\Cursor</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>document</parameter></term>
-    <listitem>
-     <simpara>
-      The complete command document, which will be sent to the server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>commandOptions</parameter></term>
-    <listitem>
-     <note>
-      <simpara>
-       Do not use this parameter to specify options described in the command's
-       reference in the MongoDB manual. This parameter should only be used for
-       the options explicitly listed below.
-      </simpara>
-     </note>
-     <para>
-      <table>
-       <title>commandOptions</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>maxAwaitTimeMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Positive integer denoting the time limit in milliseconds for the
-            server to block a getMore operation if no data is available. This
-            option should only be used in conjunction with commands that return
-            a tailable cursor (e.g. <link
-            xlink:href="&url.mongodb.docs;changeStreams/">Change
-            Streams</link>).
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       <simpara>
-        Added a second <parameter>commandOptions</parameter> argument, which supports
-        the <literal>"maxAwaitTimeMS"</literal> option.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Command::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$command = new MongoDB\Driver\Command(array("buildinfo" => 1));
-
-try {
-    $cursor = $manager->executeCommand("admin", $command);
-    $response = $cursor->toArray()[0];
-} catch(MongoDB\Driver\Exception $e) {
-    echo $e->getMessage(), "\n";
-    exit;
-}
-var_dump($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-array(13) {
-  ["version"]=>
-  string(14) "2.8.0-rc2-pre-"
-  ["gitVersion"]=>
-  string(62) "b743d7158f7642f4da6b7eac8320374b3b88dc2e modules: subscription"
-  ["OpenSSLVersion"]=>
-  string(25) "OpenSSL 1.0.1f 6 Jan 2014"
-  ["sysInfo"]=>
-  string(104) "Linux infant 3.16.0-24-generic #32-Ubuntu SMP Tue Oct 28 13:07:32 UTC 2014 x86_64 BOOST_LIB_VERSION=1_49"
-  ["loaderFlags"]=>
-  string(91) "-fPIC -pthread -Wl,-z,now -rdynamic -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,-z,now -Wl,-E"
-  ["compilerFlags"]=>
-  string(301) "-Wnon-virtual-dtor -Woverloaded-virtual -std=c++11 -fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe -Werror -O3 -Wno-unused-local-typedefs -Wno-unused-function -Wno-deprecated-declarations -Wno-unused-but-set-variable -fno-builtin-memcmp -std=c99"
-  ["allocator"]=>
-  string(8) "tcmalloc"
-  ["versionArray"]=>
-  array(4) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(8)
-    [2]=>
-    int(0)
-    [3]=>
-    int(-8)
-  }
-  ["javascriptEngine"]=>
-  string(2) "V8"
-  ["bits"]=>
-  int(64)
-  ["debug"]=>
-  bool(false)
-  ["maxBsonObjectSize"]=>
-  int(16777216)
-  ["ok"]=>
-  float(1)
-}
-
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title><function>MongoDB\Driver\Command::__construct</function> example</title>
-   <simpara>
-    Commands can accept options as well, as part of the normal structure that
-    you create to send to the server. For example, the
-    <literal>maxTimeMS</literal> option can be passed with most commands to
-    restrict the amount of time a specific command can run for on the server.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$command = new MongoDB\Driver\Command(
-    array(
-        "distinct" => "beer",
-        "key" => "beer_name",
-        "maxTimeMS" => 10,
-    )
-);
-
-try {
-    $cursor = $manager->executeCommand("beerdb", $command);
-    $response = $cursor->toArray()[0];
-} catch(MongoDB\Driver\Exception\Exception $e) {
-    echo $e->getMessage(), "\n";
-    exit;
-}
-var_dump($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-    operation exceeded time limit
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeCommand</methodname></member>
-   <member><classname>MongoDB\Driver\Cursor</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/mongodb/mongodb/driver/cursor.xml b/reference/mongodb/mongodb/driver/cursor.xml
deleted file mode 100644
index c1edfc430563..000000000000
--- a/reference/mongodb/mongodb/driver/cursor.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-cursor" role="class" 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\Cursor class</title>
- <titleabbrev>MongoDB\Driver\Cursor</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Cursor intro -->
-  <section xml:id="mongodb-driver-cursor.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Cursor</classname> class encapsulates
-    the results of a MongoDB command or query and may be returned by
-    <methodname>MongoDB\Driver\Manager::executeCommand</methodname> or
-    <methodname>MongoDB\Driver\Manager::executeQuery</methodname>, respectively.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-cursor.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Cursor</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Cursor</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\CursorInterface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-cursor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 1.9.0</entry>
-       <entry>
-        Implements <interfacename>Iterator</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.6.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\Driver\CursorInterface</interfacename>,
-        which extends <interfacename>Traversable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
-  <section xml:id="mongodb-driver-cursor.examples">
-   &reftitle.examples;
-
-   <example xml:id="mongodb-driver-cursor.examples.foreach">
-    <title>Reading a result set</title>
-    <simpara>
-     <methodname>MongoDB\Driver\Manager::executeCommand</methodname> and
-     <methodname>MongoDB\Driver\Manager::executeQuery</methodname> both return
-     their result(s) as a <classname>MongoDB\Driver\Cursor</classname> object.
-     This object can be used to iterate over the result set of the command or
-     query.
-    </simpara>
-    <simpara>
-     Because <classname>MongoDB\Driver\Cursor</classname> implements the
-     <interfacename>Traversable</interfacename> interface, you can simply
-     iterate over the result set with
-     <link linkend="control-structures.foreach"><literal>foreach</literal></link>.
-    </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager();
-
-/* Insert some documents so that our query returns information */
-$bulkWrite = new MongoDB\Driver\BulkWrite;
-$bulkWrite->insert(['name' => 'Ceres', 'size' => 946, 'distance' => 2.766]);
-$bulkWrite->insert(['name' => 'Vesta', 'size' => 525, 'distance' => 2.362]);
-$manager->executeBulkWrite("test.asteroids", $bulkWrite);
-
-/* Query for all the items in the collection */
-$query = new MongoDB\Driver\Query( [] );
-
-/* Query the "asteroids" collection of the "test" database */
-$cursor = $manager->executeQuery("test.asteroids", $query);
-
-/* $cursor now contains an object that wraps around the result set. Use
- * foreach() to iterate over all the result */
-foreach($cursor as $document) {
-    print_r($document);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-stdClass Object
-(
-    [_id] => MongoDB\BSON\ObjectId Object
-        (
-            [oid] => 5a4cff2f122d3321565d8cc2
-        )
-
-    [name] => Ceres
-    [size] => 946
-    [distance] => 2.766
-)
-stdClass Object
-(
-    [_id] => MongoDB\BSON\ObjectId Object
-        (
-            [oid] => 5a4cff2f122d3321565d8cc3
-        )
-
-    [name] => Vesta
-    [size] => 525
-    [distance] => 2.362
-)
-]]>
-    </screen>
-   </example>
-
-   <example xml:id="mongodb-driver-cursor.examples.tailable">
-    <title>Reading a result set for a tailable cursor</title>
-    <simpara>
-     <link xlink:href="&url.mongodb.docs;core/tailable-cursors">Tailable cursors</link>
-     are a special type of MongoDB cursor that allows the client to read some
-     results and then wait until more documents become available. These cursors
-     are primarily used with
-     <link xlink:href="&url.mongodb.docs;core/capped-collections">Capped Collections</link>
-     and <link xlink:href="&url.mongodb.docs;changeStreams">Change Streams</link>.
-    </simpara>
-    <simpara>
-     While normal cursors can be iterated once with <literal>foreach</literal>,
-     that approach will not work with tailable cursors. When
-     <literal>foreach</literal> is used with a tailable cursor, the loop will
-     stop upon reaching the end of the initial result set. Attempting to
-     continue iteration on the cursor with a second
-     <literal>foreach</literal> would throw an exception, since PHP attempts to
-     rewind the cursor. Similar to result objects in other database drivers,
-     cursors in MongoDB only support forward iteration, which means they cannot
-     be rewound.
-    </simpara>
-    <simpara>
-     In order to continuously read from a tailable cursor, the Cursor object
-     must be wrapped with an <classname>IteratorIterator</classname>. This
-     allows the application to directly control the cursor's iteration, avoid
-     inadvertently rewinding the cursor, and decide when to wait for new results
-     or stop iteration entirely.
-    </simpara>
-    <simpara>
-     In order to demonstrate a tailable cursor in action, two scripts will be
-     used: a "producer" and a "consumer". The producer script will create a new
-     capped collection using the
-     <link xlink:href="&url.mongodb.docs.command;create">create</link> command
-     and proceed to insert a new document into that collection each second.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$manager->executeCommand('test', new MongoDB\Driver\Command([
-    'create' => 'asteroids',
-    'capped' => true,
-    'size' => 1048576,
-]));
-
-while (true) {
-    $bulkWrite = new MongoDB\Driver\BulkWrite;
-    $bulkWrite->insert(['createdAt' => new MongoDB\BSON\UTCDateTime]);
-    $manager->executeBulkWrite('test.asteroids', $bulkWrite);
-
-    sleep(1);
-}
-
-?>
-]]>
-    </programlisting>
-    <simpara>
-     With the producer script still running, a second consumer script may be
-     executed to read the inserted documents using a tailable cursor, indicated
-     by the <literal>tailable</literal> and <literal>awaitData</literal> options
-     to <function>MongoDB\Driver\Query::__construct</function>.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$query = new MongoDB\Driver\Query([], [
-    'tailable' => true,
-    'awaitData' => true,
-]);
-
-$cursor = $manager->executeQuery('test.asteroids', $query);
-
-$iterator = new IteratorIterator($cursor);
-
-$iterator->rewind();
-
-while (true) {
-    if ($iterator->valid()) {
-        $document = $iterator->current();
-        printf("Consumed document created at: %s\n", $document->createdAt);
-    }
-
-    $iterator->next();
-}
-
-?>
-]]>
-    </programlisting>
-    <simpara>
-     The consumer script will start by quickly printing all available documents
-     in the capped collection (as if <literal>foreach</literal> had been used);
-     however, it will not terminate upon reaching the end of the initial result
-     set. Since the cursor is tailable, calling
-     <function>IteratorIterator::next</function> will block and wait for
-     additional results. <function>IteratorIterator::valid</function> is also
-     used to check if there is actually data available to read at each step.
-    </simpara>
-    <note>
-     <simpara>
-      This example uses the <literal>awaitData</literal> query option to
-      instruct the server to block for a short period (e.g. one second) at the
-      end of the result set before returning a response to the driver. This is
-      used to prevent the driver from aggressively polling the server when there
-      are no results available. The <literal>maxAwaitTimeMS</literal> option may
-      be used in conjunction with <literal>tailable</literal> and
-      <literal>awaitData</literal> to specify the amount of time that the server
-      should block when it reaches the end of the result set.
-     </simpara>
-    </note>
-   </example>
-  </section>
-
-  <section role="errors">
-   &reftitle.errors;
-   <simpara>
-    When iterating over the cursor object, BSON data is converted into PHP
-    variables. This iteration can cause the following Exceptions:
-   </simpara>
-   <simplelist>
-    <member>
-     Throws
-     <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-     a class in the type map cannot be instantiated or does not implement
-     <interfacename>MongoDB\BSON\Unserializable</interfacename>.
-    </member>
-    &mongodb.throws.bson.unexpected;
-   </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.cursor;
-
-</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/mongodb/mongodb/driver/cursor/construct.xml b/reference/mongodb/mongodb/driver/cursor/construct.xml
deleted file mode 100644
index 6a0f1acf4363..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::__construct</refname>
-  <refpurpose>Create a new Cursor (not used)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\Driver\Cursor::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\Driver\Cursor</classname> objects are returned as the
-   result of an executed command or query and cannot be constructed directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeQuery</function></member>
-   <member><function>MongoDB\Driver\Server::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeQuery</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/mongodb/mongodb/driver/cursor/current.xml b/reference/mongodb/mongodb/driver/cursor/current.xml
deleted file mode 100644
index 6792469237bb..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/current.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision: 335444 $ -->
-<refentry xml:id="mongodb-driver-cursor.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::current</refname>
-  <refpurpose>Returns the current element</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>object</type><type>null</type></type><methodname>MongoDB\Driver\Cursor::current</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current result document as an array or object, depending on the
-   cursor&apos;s type map. If iteration has not started or the current position
-   is not valid, &null; will be returned.
-  </simpara>
- </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/mongodb/mongodb/driver/cursor/getid.xml b/reference/mongodb/mongodb/driver/cursor/getid.xml
deleted file mode 100644
index 9a5c99b80187..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/getid.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.getid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::getId</refname>
-  <refpurpose>Returns the ID for this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Int64</type><methodname>MongoDB\Driver\Cursor::getId</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the ID for this cursor, which uniquely identifies the cursor on the
-   server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ID for this cursor. The ID will be returned as a
-   <classname>MongoDB\BSON\Int64</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The return type was changed to <classname>MongoDB\BSON\Int64</classname>.
-       The <parameter>asInt64</parameter> parameter was removed.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Deprecated returning a <classname>MongoDB\Driver\CursorId</classname>.
-       Added the <parameter>asInt64</parameter> argument to ease migration for
-       future versions. If <parameter>asInt64</parameter> is &true;, the ID
-       will be returned as a <classname>MongoDB\BSON\Int64</classname>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::getId</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* In this example, we insert several documents into the collection and specify
- * a smaller batchSize to ensure that the first batch contains only a subset of
- * our results and the cursor remains open on the server. */
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$query = new MongoDB\Driver\Query([], ['batchSize' => 2]);
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->insert(['x' => 2]);
-$bulk->insert(['x' => 3]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$cursor = $manager->executeQuery('db.collection', $query);
-var_dump($cursor->getId(true));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\BSON\Int64)#5 (1) {
-  ["integer"]=>
-  string(11) "94810124093"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\BSON\Int64</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/mongodb/mongodb/driver/cursor/getserver.xml b/reference/mongodb/mongodb/driver/cursor/getserver.xml
deleted file mode 100644
index c4c754dace80..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/getserver.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::getServer</refname>
-  <refpurpose>Returns the server associated with this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Cursor::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   cursor. This is the server that executed the
-   <classname>MongoDB\Driver\Query</classname> or
-   <classname>MongoDB\Driver\Command</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::getServer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$query = new MongoDB\Driver\Query([]);
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$cursor = $manager->executeQuery('db.collection', $query);
-var_dump($cursor->getServer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\Server)#5 (10) {
-  ["host"]=>
-  string(9) "localhost"
-  ["port"]=>
-  int(27017)
-  ["type"]=>
-  int(1)
-  ["is_primary"]=>
-  bool(false)
-  ["is_secondary"]=>
-  bool(false)
-  ["is_arbiter"]=>
-  bool(false)
-  ["is_hidden"]=>
-  bool(false)
-  ["is_passive"]=>
-  bool(false)
-  ["last_hello_response"]=>
-  array(8) {
-    ["isWritablePrimary"]=>
-    bool(true)
-    ["maxBsonObjectSize"]=>
-    int(16777216)
-    ["maxMessageSizeBytes"]=>
-    int(48000000)
-    ["maxWriteBatchSize"]=>
-    int(1000)
-    ["localTime"]=>
-    object(MongoDB\BSON\UTCDateTime)#6 (1) {
-      ["milliseconds"]=>
-      int(1446505367907)
-    }
-    ["maxWireVersion"]=>
-    int(3)
-    ["minWireVersion"]=>
-    int(0)
-    ["ok"]=>
-    float(1)
-  }
-  ["round_trip_time"]=>
-  int(584)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Server</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/mongodb/mongodb/driver/cursor/isdead.xml b/reference/mongodb/mongodb/driver/cursor/isdead.xml
deleted file mode 100644
index 2c1f917888b7..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/isdead.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.isdead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::isDead</refname>
-  <refpurpose>Checks if the cursor is exhausted or may have additional results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Cursor::isDead</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Checks whether there are definitely no additional results available on the
-   cursor. This method is similar to the
-   <link xlink:href="&url.mongodb.docs;reference/method/cursor.isExhausted/">cursor.isExhausted()</link>
-   method in the MongoDB shell and is primarily useful when iterating
-   <link xlink:href="&url.mongodb.docs;core/tailable-cursors/">tailable cursors</link>.
-  </simpara>
-  <para>
-   A cursor has no additional results and is considered "dead" when one of the
-   following is true:
-   <simplelist>
-    <member>
-     The current batch has been fully iterated <emphasis>and</emphasis> the
-     cursor ID is zero (i.e. a
-     <link xlink:href="&url.mongodb.docs;reference/command/getMore/">getMore</link>
-     cannot be issued).
-    </member>
-    <member>An error was encountered while iterating the cursor.</member>
-    <member>The cursor reached its configured limit.</member>
-   </simplelist>
-  </para>
-  <para>
-   By design, it is not possible to always determine whether a cursor has
-   additional results. The cases where a cursor <emphasis>may</emphasis> have
-   more data available is as follows:
-   <simplelist>
-    <member>
-     There are additional documents in the current batch, which are buffered on
-     the client side. Iterating will fetch a document from the local buffer.
-    </member>
-    <member>
-     There are no additional documents in the current batch (i.e. local buffer),
-     but the cursor ID is non-zero. Iterating will request more documents from
-     the server via a
-     <link xlink:href="&url.mongodb.docs;reference/command/getMore/">getMore</link>
-     operation, which may or may not return additional results and/or indicate
-     that the cursor has been closed on the server by returning zero for its ID.
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if there are definitely no additional results available on the
-   cursor, and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::isDead</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$query = new MongoDB\Driver\Query([]);
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->insert(['x' => 2]);
-$bulk->insert(['x' => 3]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$cursor = $manager->executeQuery('db.collection', $query);
-
-$iterator = new IteratorIterator($cursor);
-
-$iterator->rewind();
-var_dump($cursor->isDead());
-
-$iterator->next();
-var_dump($cursor->isDead());
-
-$iterator->next();
-var_dump($cursor->isDead());
-
-$iterator->next();
-var_dump($cursor->isDead());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-bool(false)
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs;core/tailable-cursors/">Tailable Cursors</link> in the MongoDB manual</member>
-   <member><link xlink:href="&url.mongodb.docs;reference/method/cursor.isExhausted/">cursor.isExhausted()</link> in the MongoDB manual</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/cursor/key.xml b/reference/mongodb/mongodb/driver/cursor/key.xml
deleted file mode 100644
index 53672b72a53e..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/key.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision: 351075 $ -->
-<refentry xml:id="mongodb-driver-cursor.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::key</refname>
-  <refpurpose>Returns the current result&apos;s index within the cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Cursor::key</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The current result&apos;s numeric index within the cursor.
-  </simpara>
- </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/mongodb/mongodb/driver/cursor/next.xml b/reference/mongodb/mongodb/driver/cursor/next.xml
deleted file mode 100644
index 2f66d3a325b3..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/next.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision: 335444 $ -->
-<refentry xml:id="mongodb-driver-cursor.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::next</refname>
-  <refpurpose>Advances the cursor to the next result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Cursor::next</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Moves the current position to the next element in the cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-  </simplelist>
- </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/mongodb/mongodb/driver/cursor/rewind.xml b/reference/mongodb/mongodb/driver/cursor/rewind.xml
deleted file mode 100644
index 548d1ec8e3ac..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/rewind.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision: 335444 $ -->
-<refentry xml:id="mongodb-driver-cursor.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::rewind</refname>
-  <refpurpose>Rewind the cursor to the first result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Cursor::rewind</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   If the cursor has advanced beyond its first position, it can no longer be
-   rewound.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &null;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\LogicException</classname> if this method is called after the cursor has advanced beyond its first position.</member>
-  </simplelist>
- </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/mongodb/mongodb/driver/cursor/settypemap.xml b/reference/mongodb/mongodb/driver/cursor/settypemap.xml
deleted file mode 100644
index 2d74b8fad38f..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/settypemap.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.settypemap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::setTypeMap</refname>
-  <refpurpose>Sets a type map to use for BSON unserialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Cursor::setTypeMap</methodname>
-   <methodparam><type>array</type><parameter>typemap</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the <link linkend="mongodb.persistence.typemaps">type map
-   configuration</link> to use when unserializing the BSON results into PHP
-   values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.typeMap;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
-  <para>
-   When iterating over the cursor, the following exceptions can also be thrown
-   due to an incorrect type map configuration:
-   <simplelist>
-    <member>
-     Throws
-     <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-     a class in the type map cannot be instantiated or does not implement
-     <interfacename>MongoDB\BSON\Unserializable</interfacename>.
-    </member>
-   </simplelist>
-  </para>
-
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::setTypeMap</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$id = $bulk->insert(['x' => 1]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$query = new MongoDB\Driver\Query(['_id' => $id]);
-$cursor = $manager->executeQuery('db.collection', $query);
-$cursor->setTypeMap(['root' => 'array']);
-
-foreach ($cursor as $document) {
-    var_dump($document);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["_id"]=>
-  object(MongoDB\BSON\ObjectId)#6 (1) {
-    ["oid"]=>
-    string(24) "56424fb76118fd3267180741"
-  }
-  ["x"]=>
-  int(1)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongodb.persistence"/></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/cursor/toarray.xml b/reference/mongodb/mongodb/driver/cursor/toarray.xml
deleted file mode 100644
index 4b7e6c275198..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/toarray.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursor.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::toArray</refname>
-  <refpurpose>Returns an array containing all results for this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Cursor::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Iterates the cursor and returns its results in an array.
-   <function>MongoDB\Driver\Cursor::setTypeMap</function> may be used to control
-   how documents are unserialized into PHP values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> containing all results for this cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Cursor::toArray</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->insert(['x' => 2]);
-$bulk->insert(['x' => 3]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$query = new MongoDB\Driver\Query([]);
-$cursor = $manager->executeQuery('db.collection', $query);
-
-var_dump($cursor->toArray());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  object(stdClass)#6 (2) {
-    ["_id"]=>
-    object(MongoDB\BSON\ObjectId)#5 (1) {
-      ["oid"]=>
-      string(24) "564259a96118fd40b41bcf61"
-    }
-    ["x"]=>
-    int(1)
-  }
-  [1]=>
-  object(stdClass)#8 (2) {
-    ["_id"]=>
-    object(MongoDB\BSON\ObjectId)#7 (1) {
-      ["oid"]=>
-      string(24) "564259a96118fd40b41bcf62"
-    }
-    ["x"]=>
-    int(2)
-  }
-  [2]=>
-  object(stdClass)#10 (2) {
-    ["_id"]=>
-    object(MongoDB\BSON\ObjectId)#9 (1) {
-      ["oid"]=>
-      string(24) "564259a96118fd40b41bcf63"
-    }
-    ["x"]=>
-    int(3)
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Cursor::setTypeMap</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/mongodb/mongodb/driver/cursor/valid.xml b/reference/mongodb/mongodb/driver/cursor/valid.xml
deleted file mode 100644
index 253fc9a568ec..000000000000
--- a/reference/mongodb/mongodb/driver/cursor/valid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- $Revision: 343888 $ -->
-<refentry xml:id="mongodb-driver-cursor.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Cursor::valid</refname>
-  <refpurpose>Checks if the current position in the cursor is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Cursor::valid</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; if the current cursor position is valid, &false; otherwise.
-  </simpara>
- </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/mongodb/mongodb/driver/cursorid.xml b/reference/mongodb/mongodb/driver/cursorid.xml
deleted file mode 100644
index 6285ae7c2f9f..000000000000
--- a/reference/mongodb/mongodb/driver/cursorid.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-cursorid" role="class" 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\CursorId class</title>
- <titleabbrev>MongoDB\Driver\CursorId</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\CursorId intro -->
-  <section xml:id="mongodb-driver-cursorid.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\CursorID</classname> class is a value object
-    that represents a cursor ID. Instances of this class are returned by
-    <function>MongoDB\Driver\Cursor::getId</function>.
-   </simpara>
-   <warning>
-    <simpara>
-     This class has been <emphasis>DEPRECATED</emphasis> as of extension
-     version 1.20.0 and was removed in 2.0. Applications have to update their
-     usage of <methodname>MongoDB\Driver\Cursor::getId</methodname> to return
-     <classname>MongoDB\BSON\Int64</classname> instead.
-    </simpara>
-   </warning>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-cursorid.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\CursorId</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\CursorId</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Stringable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-cursorid')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.class-removed;
-      <row>
-       <entry>PECL mongodb 1.20.0</entry>
-       <entry>
-        This class has been deprecated and will be removed in version 2.0.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.12.0</entry>
-       <entry>
-        Implements <interfacename>Stringable</interfacename> for PHP 8.0+.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.7.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.cursorid;
-
-</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/mongodb/mongodb/driver/cursorid/construct.xml b/reference/mongodb/mongodb/driver/cursorid/construct.xml
deleted file mode 100644
index b8b85a174ce1..000000000000
--- a/reference/mongodb/mongodb/driver/cursorid/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursorid.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorId::__construct</refname>
-  <refpurpose>Create a new CursorId (not used)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\Driver\CursorId::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\Driver\CursorId</classname> objects are returned from
-   <function>MongoDB\Driver\Cursor::getId</function> and cannot be constructed
-   directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Cursor::getId</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/mongodb/mongodb/driver/cursorid/tostring.xml b/reference/mongodb/mongodb/driver/cursorid/tostring.xml
deleted file mode 100644
index 9cd67482153b..000000000000
--- a/reference/mongodb/mongodb/driver/cursorid/tostring.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-cursorid.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorId::__toString</refname>
-  <refpurpose>String representation of the cursor ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\CursorId::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <type>string</type> representation of the cursor ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <type>string</type> representation of the cursor ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\CursorId::__toString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* In this example, we insert several documents into the collection and specify
- * a smaller batchSize to ensure that the first batch contains only a subset of
- * our results and the cursor remains open on the server. */
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-$query = new MongoDB\Driver\Query([], ['batchSize' => 2]);
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->insert(['x' => 2]);
-$bulk->insert(['x' => 3]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$cursor = $manager->executeQuery('db.collection', $query);
-var_dump((string) $cursor->getId());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "98061641158"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Cursor::getId</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/mongodb/mongodb/driver/cursorinterface.xml b/reference/mongodb/mongodb/driver/cursorinterface.xml
deleted file mode 100644
index 84f3689135d4..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344505 $ -->
-
-<reference xml:id="class.mongodb-driver-cursorinterface" role="class" 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\CursorInterface interface</title>
- <titleabbrev>MongoDB\Driver\CursorInterface</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ MongoDB\Driver\CursorInterface intro -->
-  <section xml:id="mongodb-driver-cursorinterface.intro">
-   &reftitle.intro;
-   <simpara>
-    This interface is implemented by
-    <classname>MongoDB\Driver\Cursor</classname> to be used as
-    a parameter, return, or property type in userland classes.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-cursorinterface.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\CursorInterface</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\CursorInterface</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.mongodb-driver-cursorinterface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.0.0</entry>
-       <entry>
-        <simpara>
-         This interface now extends <interfacename>Iterator</interfacename>.
-        </simpara>
-        <simpara>
-         Return types previously declared as tentative are now enforced.
-        </simpara>
-       </entry>
-      </row>
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.cursorinterface;
-
-</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/mongodb/mongodb/driver/cursorinterface/getid.xml b/reference/mongodb/mongodb/driver/cursorinterface/getid.xml
deleted file mode 100644
index fad90fef74f9..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface/getid.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 342970 $ -->
-
-<refentry xml:id="mongodb-driver-cursorinterface.getid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorInterface::getId</refname>
-  <refpurpose>Returns the ID for this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>MongoDB\BSON\Int64</type><methodname>MongoDB\Driver\CursorInterface::getId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the ID for this cursor, which uniquely identifies the cursor on the
-   server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ID for this cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Added <classname>MongoDB\BSON\Int64</classname> to the tentative return
-       type for this method. <classname>MongoDB\Driver\CursorId</classname>
-       will be removed from the return type in version 2.0.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Cursor::getId</methodname></member>
-   <member><classname>MongoDB\Driver\CursorId</classname></member>
-   <member><classname>MongoDB\BSON\Int64</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/mongodb/mongodb/driver/cursorinterface/getserver.xml b/reference/mongodb/mongodb/driver/cursorinterface/getserver.xml
deleted file mode 100644
index 1c69a5c2a9e1..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface/getserver.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 340639 $ -->
-
-<refentry xml:id="mongodb-driver-cursorinterface.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorInterface::getServer</refname>
-  <refpurpose>Returns the server associated with this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\CursorInterface::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   cursor. This is the server that executed the
-   <classname>MongoDB\Driver\Query</classname> or
-   <classname>MongoDB\Driver\Command</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Cursor::getServer</methodname></member>
-   <member><classname>MongoDB\Driver\Server</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/mongodb/mongodb/driver/cursorinterface/isdead.xml b/reference/mongodb/mongodb/driver/cursorinterface/isdead.xml
deleted file mode 100644
index 9f46c8306776..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface/isdead.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344169 $ -->
-
-<refentry xml:id="mongodb-driver-cursorinterface.isdead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorInterface::isDead</refname>
-  <refpurpose>Checks if the cursor may have additional results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\CursorInterface::isDead</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks whether the cursor may have additional results available to read. A
-   cursor is initially "alive" but may become "dead" for any of the following
-   reasons:
-   <simplelist>
-    <member>Advancing a non-tailable cursor did not return a document</member>
-    <member>The cursor encountered an error</member>
-    <member>The cursor read its last batch to completion</member>
-    <member>The cursor reached its configured limit</member>
-   </simplelist>
-   This is primarily useful with tailable cursors.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if additional results are not available, and &false;
-   otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Cursor::isDead</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/mongodb/mongodb/driver/cursorinterface/settypemap.xml b/reference/mongodb/mongodb/driver/cursorinterface/settypemap.xml
deleted file mode 100644
index 54fcec2ade1b..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface/settypemap.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 343748 $ -->
-
-<refentry xml:id="mongodb-driver-cursorinterface.settypemap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorInterface::setTypeMap</refname>
-  <refpurpose>Sets a type map to use for BSON unserialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\CursorInterface::setTypeMap</methodname>
-   <methodparam><type>array</type><parameter>typemap</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the <link linkend="mongodb.persistence.typemaps">type map
-   configuration</link> to use when unserializing the BSON results into PHP
-   values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.typeMap;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Cursor::setTypeMap</methodname></member>
-   <member><xref linkend="mongodb.persistence"/></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/cursorinterface/toarray.xml b/reference/mongodb/mongodb/driver/cursorinterface/toarray.xml
deleted file mode 100644
index e1f1dfecc936..000000000000
--- a/reference/mongodb/mongodb/driver/cursorinterface/toarray.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 342971 $ -->
-
-<refentry xml:id="mongodb-driver-cursorinterface.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\CursorInterface::toArray</refname>
-  <refpurpose>Returns an array containing all results for this cursor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\CursorInterface::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Iterates the cursor and returns its results in an array.
-   <function>MongoDB\Driver\CursorInterface::setTypeMap</function> may be used
-   to control how documents are unserialized into PHP values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> containing all results for this cursor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Cursor::toArray</methodname></member>
-   <member><function>MongoDB\Driver\CursorInterface::setTypeMap</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/mongodb/mongodb/driver/exception/authenticationexception.xml b/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
deleted file mode 100644
index 879dd85b086a..000000000000
--- a/reference/mongodb/mongodb/driver/exception/authenticationexception.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-authenticationexception" role="class" 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\Exception\AuthenticationException class</title>
- <titleabbrev>MongoDB\Driver\Exception\AuthenticationException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\AuthenticationException intro -->
-  <section xml:id="mongodb-driver-exception-authenticationexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver fails to authenticate with the server.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-authenticationexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\AuthenticationException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\AuthenticationException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ConnectionException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml
deleted file mode 100644
index cc34384f21cf..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-bulkwritecommandexception" role="class" 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\Exception\BulkWriteCommandException class</title>
- <titleabbrev>MongoDB\Driver\Exception\BulkWriteCommandException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\BulkWriteCommandException intro -->
-  <section xml:id="mongodb-driver-exception-bulkwritecommandexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown due to failed execution of a
-    <classname>MongoDB\Driver\BulkWriteCommand</classname>. The methods of this
-    class provide more details of the error that occurred, including the error
-    reply and partial results from the bulk write.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-bulkwritecommandexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\BulkWriteCommandException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\BulkWriteCommandException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <type class="union"><type>MongoDB\BSON\Document</type><type>null</type></type>
-     <varname linkend="mongodb-driver-exception-bulkwritecommandexception.props.errorreply">errorReply</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <type class="union"><type>MongoDB\Driver\BulkWriteCommandResult</type><type>null</type></type>
-     <varname linkend="mongodb-driver-exception-bulkwritecommandexception.props.partialresult">partialResult</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <type>array</type>
-     <varname linkend="mongodb-driver-exception-bulkwritecommandexception.props.writeconcernerrors">writeConcernErrors</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>private</modifier>
-     <type>array</type>
-     <varname linkend="mongodb-driver-exception-bulkwritecommandexception.props.writeerrors">writeErrors</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-bulkwritecommandexception')/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.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Exception\BulkWriteCommandException properties -->
-  <section xml:id="mongodb-driver-exception-bulkwritecommandexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-exception-bulkwritecommandexception.props.errorreply">
-     <term><varname>errorReply</varname></term>
-     <listitem>
-      <simpara>
-       Any top-level error that occurred when attempting to communicate with
-       the server or execute the bulk write. This value may be &null; if the
-       exception was thrown due to errors occurring on individual writes.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-exception-bulkwritecommandexception.props.partialresult">
-     <term><varname>partialResult</varname></term>
-     <listitem>
-      <simpara>
-       A <classname>MongoDB\Driver\BulkWriteCommandResult</classname> reporting
-       the result of any successful operations that were performed before the
-       error was encountered. This value may be &null; if it cannot be
-       determined that at least one write was successfully performed (and
-       acknowledged).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-exception-bulkwritecommandexception.props.writeconcernerrors">
-     <term><varname>writeConcernErrors</varname></term>
-     <listitem>
-      <simpara>
-       An array of any <classname>MongoDB\Driver\WriteConcernError</classname>s
-       that occurred while executing the bulk write. This list may have
-       multiple items if more than one server command was required to execute
-       the bulk write.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-exception-bulkwritecommandexception.props.writeerrors">
-     <term><varname>writeErrors</varname></term>
-     <listitem>
-      <simpara>
-       An array of any <classname>MongoDB\Driver\WriteError</classname>s
-       that occurred during the execution of individual write operations. Array
-       keys will correspond to the index of the write operation from
-       <classname>MongoDB\Driver\BulkWriteCommand</classname>. This map will
-       contain at most one entry if the bulk write was ordered.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.exception.entities.bulkwritecommandexception;
-
-</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/mongodb/mongodb/driver/exception/bulkwritecommandexception/geterrorreply.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/geterrorreply.xml
deleted file mode 100644
index ea1504190bd7..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/geterrorreply.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandexception.geterrorreply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\BulkWriteCommandException::getErrorReply</refname>
-  <refpurpose>Returns any top-level command error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\Document</type><type>null</type></type><methodname>MongoDB\Driver\Exception\BulkWriteCommandException::getErrorReply</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns any top-level error that occurred when attempting to communicate
-   with the server or execute the bulk write. This value may be &null; if the
-   exception was thrown due to errors occurring on individual writes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Exception\BulkWriteCommandException::getErrorReply</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-// This example uses configureFailPoint to simulate a top-level command error
-$manager->executeCommand('admin', new MongoDB\Driver\Command([
-    'configureFailPoint' => 'failCommand',
-    'mode' => ['times' => 1],
-    'data' => [
-        'failCommands' => ['bulkWrite'],
-        'errorCode' => 8, /* UnknownError */
-    ],
-]));
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    var_dump($e->getErrorReply()?->toPHP());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#12 (6) {
-  ["ok"]=>
-  float(0)
-  ["errmsg"]=>
-  string(43) "Failing command via 'failCommand' failpoint"
-  ["code"]=>
-  int(8)
-  ["codeName"]=>
-  string(12) "UnknownError"
-  ["$clusterTime"]=>
-  object(stdClass)#10 (2) {
-    ["clusterTime"]=>
-    object(MongoDB\BSON\Timestamp)#6 (2) {
-      ["increment"]=>
-      string(1) "7"
-      ["timestamp"]=>
-      string(10) "1744319389"
-    }
-    ["signature"]=>
-    object(stdClass)#9 (2) {
-      ["hash"]=>
-      object(MongoDB\BSON\Binary)#7 (2) {
-        ["data"]=>
-        string(20) ""
-        ["type"]=>
-        int(0)
-      }
-      ["keyId"]=>
-      object(MongoDB\BSON\Int64)#8 (1) {
-        ["integer"]=>
-        string(1) "0"
-      }
-    }
-  }
-  ["operationTime"]=>
-  object(MongoDB\BSON\Timestamp)#11 (2) {
-    ["increment"]=>
-    string(1) "7"
-    ["timestamp"]=>
-    string(10) "1744319389"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::executeBulkWriteCommand</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/mongodb/mongodb/driver/exception/bulkwritecommandexception/getpartialresult.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getpartialresult.xml
deleted file mode 100644
index d09a00b4a372..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getpartialresult.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandexception.getpartialresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\BulkWriteCommandException::getPartialResult</refname>
-  <refpurpose>Returns the result of any successful write operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\Driver\BulkWriteCommandResult</type><type>null</type></type><methodname>MongoDB\Driver\Exception\BulkWriteCommandException::getPartialResult</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\Driver\BulkWriteCommandResult</classname>
-   reporting the result of any successful operations that were performed before
-   the error was encountered. The return value will be &null; if it cannot be
-   determined that at least one write was successfully performed (and
-   acknowledged).
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Partial result if at least one write is successful</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->deleteMany('db.coll', []);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    $result = $e->getPartialResult();
-}
-
-var_dump($result?->getInsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>No partial result if no writes are successful</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->deleteMany('db.coll', []);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$manager->executeBulkWriteCommand($bulk);
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['_id' => 1]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    $result = $e->getPartialResult();
-}
-
-var_dump($result?->getInsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeBulkWriteCommand</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/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteconcernerrors.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteconcernerrors.xml
deleted file mode 100644
index b8198261d6dc..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteconcernerrors.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandexception.getwriteconcernerrors" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteConcernErrors</refname>
-  <refpurpose>Returns any write concern errors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteConcernErrors</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array of any <classname>MongoDB\Driver\WriteConcernError</classname>s
-   that occurred while executing the bulk write. This list may have multiple
-   items if more than one server command was required to execute the bulk
-   write.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteConcernErrors</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->insertOne('db.coll', ['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(50);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk, ['writeConcern' => $writeConcern]);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    var_dump($e->getWriteConcernErrors());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  object(MongoDB\Driver\WriteConcernError)#6 (3) {
-    ["message"]=>
-    string(29) "Not enough data-bearing nodes"
-    ["code"]=>
-    int(100)
-    ["info"]=>
-    object(stdClass)#8 (1) {
-      ["writeConcern"]=>
-      object(stdClass)#7 (3) {
-        ["w"]=>
-        int(50)
-        ["wtimeout"]=>
-        int(0)
-        ["provenance"]=>
-        string(14) "clientSupplied"
-      }
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::executeBulkWriteCommand</function></member>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><classname>MongoDB\Driver\WriteConcernError</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/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteerrors.xml b/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteerrors.xml
deleted file mode 100644
index 1d80e52c5680..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwritecommandexception/getwriteerrors.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwritecommandexception.getwriteerrors" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteErrors</refname>
-  <refpurpose>Returns any write errors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteErrors</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array of any <classname>MongoDB\Driver\WriteError</classname>s that
-   occurred during the execution of individual write operations. Array keys
-   will correspond to the index of the write operation from
-   <classname>MongoDB\Driver\BulkWriteCommand</classname>. This map will
-   contain at most one entry if the bulk write was ordered.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Exception\BulkWriteCommandException::getWriteErrors</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand(['ordered' => false]);
-$bulk->deleteMany('db.coll', []);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    var_dump($e->getWriteErrors());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [2]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(78) "E11000 duplicate key error collection: db.coll index: _id_ dup key: { _id: 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(2)
-    ["info"]=>
-    object(stdClass)#6 (0) {
-    }
-  }
-  [3]=>
-  object(MongoDB\Driver\WriteError)#7 (4) {
-    ["message"]=>
-    string(78) "E11000 duplicate key error collection: db.coll index: _id_ dup key: { _id: 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(3)
-    ["info"]=>
-    object(stdClass)#8 (0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::executeBulkWriteCommand</function></member>
-   <member><classname>MongoDB\Driver\WriteError</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/mongodb/mongodb/driver/exception/bulkwriteexception.xml b/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
deleted file mode 100644
index c6b8f08ca006..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwriteexception.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-bulkwriteexception" role="class" 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\Exception\BulkWriteException class</title>
- <titleabbrev>MongoDB\Driver\Exception\BulkWriteException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\BulkWriteException intro -->
-  <section xml:id="mongodb-driver-exception-bulkwriteexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when a bulk write operation fails.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-bulkwriteexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\BulkWriteException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\BulkWriteException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\WriteResult</type>
-     <varname linkend="mongodb-driver-exception-bulkwriteexception.props.writeresult">writeResult</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" />-->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-bulkwriteexception')/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.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ MongoDB\Driver\Exception\BulkWriteException properties -->
-  <section xml:id="mongodb-driver-exception-bulkwriteexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-exception-bulkwriteexception.props.writeresult">
-     <term><varname>writeResult</varname></term>
-     <listitem>
-      <simpara>
-       The <classname>MongoDB\Driver\WriteResult</classname> associated with
-       the failed write operation.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-  <!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        The <varname>writeResult</varname> property is now
-        <modifier>public</modifier> <modifier>readonly</modifier>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 2.0.0</entry>
-       <entry>
-        <simpara>
-         This class now extends
-         <classname>MongoDB\Driver\Exception\ServerException</classname>
-         instead of
-         <classname>MongoDB\Driver\Exception\WriteException</classname>.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
- &reference.mongodb.mongodb.driver.exception.entities.bulkwriteexception;
-
-</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/mongodb/mongodb/driver/exception/bulkwriteexception/getwriteresult.xml b/reference/mongodb/mongodb/driver/exception/bulkwriteexception/getwriteresult.xml
deleted file mode 100644
index f155b4d6d398..000000000000
--- a/reference/mongodb/mongodb/driver/exception/bulkwriteexception/getwriteresult.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-bulkwriteexception.getwriteresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\BulkWriteException::getWriteResult</refname>
-  <refpurpose>Returns the WriteResult for the failed write operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Exception\BulkWriteException::getWriteResult</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\WriteResult</classname> for the failed
-   write operation. The
-   <function>MongoDB\Driver\WriteResult::getWriteErrors</function> and
-   <function>MongoDB\Driver\WriteResult::getWriteConcernError</function> methods
-   may be used to get more details about the failure.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>MongoDB\Driver\WriteResult</classname> for the failed write
-   operation.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Exception\BulkWriteException::getWriteResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost');
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 1]);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    $writeResult = $e->getWriteResult();
-
-    if ($writeConcernError = $writeResult->getWriteConcernError()) {
-        var_dump($writeConcernError);
-    }
-
-    if ($writeErrors = $writeResult->getWriteErrors()) {
-        var_dump($writeErrors);
-    }
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(70) "E11000 duplicate key error index: db.collection.$_id_ dup key: { : 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(1)
-    ["info"]=>
-    NULL
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteResult</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeBulkWrite</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/mongodb/mongodb/driver/exception/commandexception.xml b/reference/mongodb/mongodb/driver/exception/commandexception.xml
deleted file mode 100644
index f817719aab09..000000000000
--- a/reference/mongodb/mongodb/driver/exception/commandexception.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-commandexception" role="class" 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\Exception\CommandException class</title>
- <titleabbrev>MongoDB\Driver\Exception\CommandException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\CommandException intro -->
-  <section xml:id="mongodb-driver-exception-commandexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when a command fails.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-commandexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\CommandException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\CommandException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>object</type>
-     <varname linkend="mongodb-driver-exception-commandexception.props.resultdocument">resultDocument</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-commandexception')/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.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ MongoDB\Driver\Exception\CommandException properties -->
-  <section xml:id="mongodb-driver-exception-commandexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-exception-commandexception.props.resultdocument">
-     <term><varname>resultDocument</varname></term>
-     <listitem>
-      <simpara>
-       The result document associated with the failed command.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        The <varname>resultDocument</varname> property is now
-        <modifier>public</modifier> <modifier>readonly</modifier>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.exception.entities.commandexception;
-
-</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/mongodb/mongodb/driver/exception/commandexception/getresultdocument.xml b/reference/mongodb/mongodb/driver/exception/commandexception/getresultdocument.xml
deleted file mode 100644
index 02a2a6b62420..000000000000
--- a/reference/mongodb/mongodb/driver/exception/commandexception/getresultdocument.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-commandexception.getresultdocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\CommandException::getResultDocument</refname>
-  <refpurpose>Returns the result document for the failed command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Exception\CommandException::getResultDocument</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the result document for the failed command.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The result document for the failed command.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::executeCommand</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/mongodb/mongodb/driver/exception/connectionexception.xml b/reference/mongodb/mongodb/driver/exception/connectionexception.xml
deleted file mode 100644
index eebc83cc6c6b..000000000000
--- a/reference/mongodb/mongodb/driver/exception/connectionexception.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-connectionexception" role="class" 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\Exception\ConnectionException class</title>
- <titleabbrev>MongoDB\Driver\Exception\ConnectionException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\ConnectionException intro -->
-  <section xml:id="mongodb-driver-exception-connectionexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class for exceptions thrown when the driver fails to establish a
-    database connection.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-connectionexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\ConnectionException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\ConnectionException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\RuntimeException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml b/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
deleted file mode 100644
index d3ee0ab22d09..000000000000
--- a/reference/mongodb/mongodb/driver/exception/connectiontimeoutexception.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-connectiontimeoutexception" role="class" 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\Exception\ConnectionTimeoutException class</title>
- <titleabbrev>MongoDB\Driver\Exception\ConnectionTimeoutException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\ConnectionTimeoutException intro -->
-  <section xml:id="mongodb-driver-exception-connectiontimeoutexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver fails to establish a database connection within a
-    specified time limit
-    (<link linkend="mongodb-driver-manager.construct-urioptions">connectTimeoutMS</link>)
-    or server selection fails
-    (<link linkend="mongodb-driver-manager.construct-urioptions">serverSelectionTimeoutMS</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-connectiontimeoutexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\ConnectionTimeoutException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\ConnectionTimeoutException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ConnectionException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/encryptionexception.xml b/reference/mongodb/mongodb/driver/exception/encryptionexception.xml
deleted file mode 100644
index b64ed7224c1d..000000000000
--- a/reference/mongodb/mongodb/driver/exception/encryptionexception.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 345347 $ -->
-
-<reference xml:id="class.mongodb-driver-exception-encryptionexception" role="class" 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\Exception\EncryptionException class</title>
- <titleabbrev>MongoDB\Driver\Exception\EncryptionException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\EncryptionException intro -->
-  <section xml:id="mongodb-driver-exception-encryptionexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class for exceptions thrown during client-side encryption.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-encryptionexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\EncryptionException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\EncryptionException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\RuntimeException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/exception.xml b/reference/mongodb/mongodb/driver/exception/exception.xml
deleted file mode 100644
index 28eaba256557..000000000000
--- a/reference/mongodb/mongodb/driver/exception/exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-exception" role="class" 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\Exception\Exception interface</title>
- <titleabbrev>MongoDB\Driver\Exception\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\Exception intro -->
-  <section xml:id="mongodb-driver-exception-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Common interface for all extension exceptions. This interface is also used
-    by the library, and may be used to identify any exceptions originating from
-    the MongoDB PHP driver (i.e. extension and library).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/executiontimeoutexception.xml b/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
deleted file mode 100644
index 37539dc8b7b9..000000000000
--- a/reference/mongodb/mongodb/driver/exception/executiontimeoutexception.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-executiontimeoutexception" role="class" 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\Exception\ExecutionTimeoutException class</title>
- <titleabbrev>MongoDB\Driver\Exception\ExecutionTimeoutException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\ExecutionTimeoutException intro -->
-  <section xml:id="mongodb-driver-exception-executiontimeoutexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when a query or command fails to complete within a specified time
-    limit (e.g.
-    <link xlink:href="&url.mongodb.docs.maxtimems;">maxTimeMS</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-executiontimeoutexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\ExecutionTimeoutException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\ExecutionTimeoutException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 1.5.0</entry>
-       <entry>
-        <simpara>
-         This class now extends
-         <classname>MongoDB\Driver\Exception\ServerException</classname>
-         instead of
-         <classname>MongoDB\Driver\Exception\RuntimeException</classname>.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/invalidargumentexception.xml b/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml
deleted file mode 100644
index ac0c7e16d39f..000000000000
--- a/reference/mongodb/mongodb/driver/exception/invalidargumentexception.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-invalidargumentexception" role="class" 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\Exception\InvalidArgumentException class</title>
- <titleabbrev>MongoDB\Driver\Exception\InvalidArgumentException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\InvalidArgumentException intro -->
-  <section xml:id="mongodb-driver-exception-invalidargumentexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when a driver method is given invalid arguments (e.g. invalid option
-    types).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-invalidargumentexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\InvalidArgumentException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>InvalidArgumentException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('invalidargumentexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.invalidargumentexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/logicexception.xml b/reference/mongodb/mongodb/driver/exception/logicexception.xml
deleted file mode 100644
index b16ad2886f76..000000000000
--- a/reference/mongodb/mongodb/driver/exception/logicexception.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-logicexception" role="class" 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\Exception\LogicException class</title>
- <titleabbrev>MongoDB\Driver\Exception\LogicException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\LogicException intro -->
-  <section xml:id="mongodb-driver-exception-logicexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver is incorrectly used (e.g. rewinding a cursor).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-logicexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\LogicException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\LogicException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>LogicException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('logicexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.logicexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/runtimeexception.xml b/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
deleted file mode 100644
index b14ad24ef95a..000000000000
--- a/reference/mongodb/mongodb/driver/exception/runtimeexception.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-runtimeexception" role="class" 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\Exception\RuntimeException class</title>
- <titleabbrev>MongoDB\Driver\Exception\RuntimeException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\RuntimeException intro -->
-  <section xml:id="mongodb-driver-exception-runtimeexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver encounters a runtime error (e.g. internal error from
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-runtimeexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\RuntimeException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\RuntimeException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type class="union"><type>array</type><type>null</type></type>
-     <varname linkend="mongodb-driver-exception-runtimeexception.props.errorlabels">errorLabels</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-runtimeexception')/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.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Exception\RuntimeException properties -->
-  <section xml:id="mongodb-driver-exception-runtimeexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-exception-runtimeexception.props.errorlabels">
-     <term><varname>errorLabels</varname></term>
-     <listitem>
-      <simpara>
-       Contains an array of error labels to go with an exception. For example,
-       error labels can be used to detect whether a transaction can be retried
-       safely if the <literal>TransientTransactionError</literal> label is
-       present. The existence of a specific error label should be tested for
-       with the
-       <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>,
-       instead of interpreting this <literal>errorLabels</literal> property
-       manually.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 1.6.0</entry>
-       <entry>
-        <simpara>
-         The
-         <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
-         method and
-         <link linkend="mongodb-driver-exception-runtimeexception.props.errorlabels">MongoDB\Driver\Exception\RuntimeException::errorLabels</link>
-         property have been added.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.exception.entities.runtimeexception;
-
-</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/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml b/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml
deleted file mode 100644
index 0f6f2081bc05..000000000000
--- a/reference/mongodb/mongodb/driver/exception/runtimeexception/haserrorlabel.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-runtimeexception.haserrorlabel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</refname>
-  <refpurpose>Returns whether an error label is associated with an exception</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
-   <methodparam><type>string</type><parameter>errorLabel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns whether the <parameter>errorLabel</parameter> has been set for this
-   exception. Error labels are set by either the server or the extension to
-   indicate specific situations that may be handled by an application. A common
-   situation might be determining whether to safely retry a transaction that
-   failed due to a transient error (e.g. network error, transaction conflict).
-   Examples of error labels are <literal>TransientTransactionError</literal>
-   and <literal>UnknownTransactionCommitResult</literal>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errorLabel</parameter></term>
-    <listitem>
-     <simpara>The name of the <literal>errorLabel</literal> to test for.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Whether the given <literal>errorLabel</literal> is associated with this
-   exception.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Session::commitTransaction</function></member>
-   <member><link xlink:href="&url.mongodb.docs.transactions;">MongoDB documentation on transactions</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/mongodb/driver/exception/serverexception.xml b/reference/mongodb/mongodb/driver/exception/serverexception.xml
deleted file mode 100644
index ed13e9e0e0ee..000000000000
--- a/reference/mongodb/mongodb/driver/exception/serverexception.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-serverexception" role="class" 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\Exception\ServerException class</title>
- <titleabbrev>MongoDB\Driver\Exception\ServerException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\ServerException intro -->
-  <section xml:id="mongodb-driver-exception-serverexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class for exceptions thrown by the server. The code of this exception and its subclasses will correspond to the original error code from the server.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-serverexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\ServerException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\RuntimeException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/sslconnectionexception.xml b/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
deleted file mode 100644
index 3c275913d9ff..000000000000
--- a/reference/mongodb/mongodb/driver/exception/sslconnectionexception.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-sslconnectionexception" role="class" 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\Exception\SSLConnectionException class</title>
- <titleabbrev>MongoDB\Driver\Exception\SSLConnectionException</titleabbrev>
-
- <partintro>
-
-  <warning>
-   <simpara>
-    This exception class is <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.5.0 and was removed in 2.0. This exception was never thrown
-    by the extension. Applications should use
-    <classname>MongoDB\Driver\Exception\ConnectionException</classname> instead.
-   </simpara>
-  </warning>
-
-<!-- {{{ MongoDB\Driver\Exception\SSLConnectionException intro -->
-  <section xml:id="mongodb-driver-exception-sslconnectionexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver fails to establish an SSL connection with the server.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-sslconnectionexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\SSLConnectionException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\SSLConnectionException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ConnectionException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-connectionexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-connectionexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml b/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml
deleted file mode 100644
index 3ea6b237241c..000000000000
--- a/reference/mongodb/mongodb/driver/exception/unexpectedvalueexception.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-unexpectedvalueexception" role="class" 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\Exception\UnexpectedValueException class</title>
- <titleabbrev>MongoDB\Driver\Exception\UnexpectedValueException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Exception\UnexpectedValueException intro -->
-  <section xml:id="mongodb-driver-exception-unexpectedvalueexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the driver encounters an unexpected value (e.g. during BSON
-    serialization or deserialization).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-unexpectedvalueexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\UnexpectedValueException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Exception\UnexpectedValueException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UnexpectedValueException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('unexpectedvalueexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.unexpectedvalueexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/exception/writeexception.xml b/reference/mongodb/mongodb/driver/exception/writeexception.xml
deleted file mode 100644
index b8b0b43452dd..000000000000
--- a/reference/mongodb/mongodb/driver/exception/writeexception.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-exception-writeexception" role="class" 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\Exception\WriteException class</title>
- <titleabbrev>MongoDB\Driver\Exception\WriteException</titleabbrev>
-
- <partintro>
-
-  <warning>
-   <simpara>
-    This exception class is <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. This exception was never directly
-    thrown by the extension. Applications should use
-    <classname>MongoDB\Driver\Exception\BulkWriteException</classname> instead.
-   </simpara>
-  </warning>
-
-<!-- {{{ MongoDB\Driver\Exception\WriteException intro -->
-  <section xml:id="mongodb-driver-exception-writeexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class for exceptions thrown by a failed write operation. The exception
-    encapsulates a <classname>MongoDB\Driver\WriteResult</classname> object.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-exception-writeexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Exception\WriteException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>MongoDB\Driver\Exception\WriteException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>MongoDB\Driver\Exception\ServerException</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Exception\Exception</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>MongoDB\Driver\WriteResult</type>
-     <varname linkend="mongodb-driver-exception-writeexception.props.writeresult">writeResult</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-serverexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('mongodb-driver-exception-runtimeexception.synopsis')/descendant::db:fieldsynopsis)" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('runtimeexception.synopsis')/descendant::db:fieldsynopsis)" /> -->
-    <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.mongodb-driver-exception-writeexception')/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.mongodb-driver-exception-serverexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-exception-runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <!-- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ MongoDB\Driver\Exception\WriteException properties -->
-  <section xml:id="mongodb-driver-exception-writeexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-exception-writeexception.props.writeresult">
-     <term><varname>writeResult</varname></term>
-     <listitem>
-      <simpara>
-       The <classname>MongoDB\Driver\WriteResult</classname> associated with
-       the failed write operation.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.class-removed;
-      <row>
-       <entry>PECL mongodb 1.20.0</entry>
-       <entry>
-        This class has been deprecated and will be removed in version 2.0.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.5.0</entry>
-       <entry>
-        <simpara>
-         This class now extends
-         <classname>MongoDB\Driver\Exception\ServerException</classname>
-         instead of
-         <classname>MongoDB\Driver\Exception\RuntimeException</classname>.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.exception.entities.writeexception;
-
-</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/mongodb/mongodb/driver/exception/writeexception/getwriteresult.xml b/reference/mongodb/mongodb/driver/exception/writeexception/getwriteresult.xml
deleted file mode 100644
index 9110f5208f83..000000000000
--- a/reference/mongodb/mongodb/driver/exception/writeexception/getwriteresult.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeexception.getwriteresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Exception\WriteException::getWriteResult</refname>
-  <refpurpose>Returns the WriteResult for the failed write operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Exception\WriteException::getWriteResult</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\WriteResult</classname> for the failed
-   write operation. The
-   <function>MongoDB\Driver\WriteResult::getWriteErrors</function> and
-   <function>MongoDB\Driver\WriteResult::getWriteConcernError</function> methods
-   may be used to get more details about the failure.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>MongoDB\Driver\WriteResult</classname> for the failed write
-   operation.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Exception\WriteException::getWriteResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost');
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 1]);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk);
-} catch (MongoDB\Driver\Exception\WriteException $e) {
-    $writeResult = $e->getWriteResult();
-
-    if ($writeConcernError = $writeResult->getWriteConcernError()) {
-        var_dump($writeConcernError);
-    }
-
-    if ($writeErrors = $writeResult->getWriteErrors()) {
-        var_dump($writeErrors);
-    }
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(70) "E11000 duplicate key error index: db.collection.$_id_ dup key: { : 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(1)
-    ["info"]=>
-    NULL
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteResult</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeBulkWrite</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/mongodb/mongodb/driver/manager.xml b/reference/mongodb/mongodb/driver/manager.xml
deleted file mode 100644
index 41c4102e1579..000000000000
--- a/reference/mongodb/mongodb/driver/manager.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-manager" role="class" 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\Manager class</title>
- <titleabbrev>MongoDB\Driver\Manager</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Manager intro -->
-  <section xml:id="mongodb-driver-manager.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Manager</classname> is the main entry point
-    to the extension. It is responsible for maintaining connections to MongoDB
-    (be it standalone server, replica set, or sharded cluster).
-   </simpara>
-   <simpara>
-    No connection to MongoDB is made upon instantiating the Manager.
-    This means the <classname>MongoDB\Driver\Manager</classname> can always be
-    constructed, even though one or more MongoDB servers are down.
-   </simpara>
-   <simpara>
-    Any write or query can throw connection exceptions as connections are created lazily.
-    A MongoDB server may also become unavailable during the life time of the script.
-    It is therefore important that all actions on the Manager to be wrapped in try/catch statements.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-manager.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Manager</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Manager</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-manager')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="mongodb-driver-manager.examples">
-   &reftitle.examples;
-
-   <example>
-    <title><function>MongoDB\Driver\Manager::__construct</function> basic example</title>
-    <simpara>
-     <function>var_dump</function>ing a
-     <classname>MongoDB\Driver\Manager</classname> will print out various
-     details about the manager that are otherwise not normally exposed.
-     This can be useful to debug how the driver views your MongoDB setup, and
-     which options are used.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-var_dump($manager);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-object(MongoDB\Driver\Manager)#1 (2) {
-  ["uri"]=>
-  string(26) "mongodb://127.0.0.1:27017/"
-  ["cluster"]=>
-  array(0) {
-  }
-}
-]]>
-    </screen>
-   </example>
-  </section>
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.manager;
-
-</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/mongodb/mongodb/driver/manager/addsubscriber.xml b/reference/mongodb/mongodb/driver/manager/addsubscriber.xml
deleted file mode 100644
index 90e3772f3b5e..000000000000
--- a/reference/mongodb/mongodb/driver/manager/addsubscriber.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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>
-  <simpara>
-   Registers a monitoring event subscriber with this Manager. The subscriber
-   will be notified of all events for this Manager.
-  </simpara>
-  <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>
-     <simpara>
-      A monitoring event subscriber to register with this Manager.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>
-    Throws
-    <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if
-    <parameter>subscriber</parameter> is a
-    <classname>MongoDB\Driver\Monitoring\LogSubscriber</classname>, since
-    loggers can only be registered globally.
-   </member>
-  </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
deleted file mode 100644
index 7421ee3c122f..000000000000
--- a/reference/mongodb/mongodb/driver/manager/construct.xml
+++ /dev/null
@@ -1,1301 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::__construct</refname>
-  <refpurpose>Create new MongoDB Manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\Manager::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>uri</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>uriOptions</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>driverOptions</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\Manager</classname> object with the specified options.
-  </simpara>
-  <note>
-   <simpara>
-    Per the <link xlink:href="&url.mongodb.sdam;#single-threaded-client-construction">Server Discovery and Monitoring Specification</link>,
-    this constructor performs no I/O. Connections will be initialized on demand,
-    when the first operation is executed.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    When specifying any SSL or TLS URI options via the connection string or
-    <parameter>uriOptions</parameter> parameter, the extension will implicitly
-    enable TLS for its connections. To avoid this, either explicitly disable the
-    <literal>tls</literal> option or don't specify any TLS options.
-   </simpara>
-  </note>
-  &mongodb.note.forking;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry xml:id="mongodb-driver-manager.construct-uri">
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>A <link xlink:href="&url.mongodb.docs;reference/connection-string/">mongodb://</link> connection URI:</simpara>
-     <programlisting role="txt">
-<![CDATA[
-mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[defaultAuthDb][?options]]
-]]>
-     </programlisting>
-     <simpara>
-      Defaults to <literal>"mongodb://127.0.0.1:27017"</literal> if unspecified.
-     </simpara>
-     <simpara>
-      For details on supported URI options, see
-      <link xlink:href="&url.mongodb.docs;reference/connection-string/#connections-connection-options">Connection String Options</link>
-      in the MongoDB manual.
-      <link xlink:href="&url.mongodb.docs;reference/connection-string/#connection-pool-options">Connection pool options</link>
-      are not supported, as the extension does not implement connection pools.
-     </simpara>
-     <simpara>
-      The <parameter>uri</parameter> is a URL, hence any special characters in
-      its components need to be URL encoded according to
-      <link xlink:href="&url.rfc;3986">RFC 3986</link>. This is particularly
-      relevant to the username and password, which can often include special
-      characters such as <literal>@</literal>, <literal>:</literal>, or
-      <literal>%</literal>. When connecting via a Unix domain socket, the socket
-      path may contain special characters such as slashes and must be encoded.
-      The <function>rawurlencode</function> function may be used to encode
-      constituent parts of the URI.
-     </simpara>
-     <simpara>
-      The <literal>defaultAuthDb</literal> component may be used to specify the
-      database name associated with the user's credentials; however the
-      <literal>authSource</literal> URI option will take priority if specified.
-      If neither <literal>defaultAuthDb</literal> nor
-      <literal>authSource</literal> are specified, the <literal>admin</literal>
-      database will be used by default. The <literal>defaultAuthDb</literal>
-      component has no effect in the absence of user credentials.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="mongodb-driver-manager.construct-urioptions">
-    <term><parameter>uriOptions</parameter></term>
-    <listitem>
-     <simpara>
-      Additional
-      <link xlink:href="&url.mongodb.docs;reference/connection-string/#connections-connection-options">connection string options</link>,
-      which will overwrite any options with the same name in the
-      <parameter>uri</parameter> parameter.
-     </simpara>
-     <para>
-      <table>
-       <title>uriOptions</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>appname</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            MongoDB 3.4+ has the ability to annotate connections with metadata
-            provided by the connecting client. This metadata is included in the
-            server's logs upon establishing a connection and also recorded in
-            slow query logs when database profiling is enabled.
-           </simpara>
-           <simpara>
-            This option may be used to specify an application name, which will
-            be included in the metadata. The value cannot exceed 128 characters
-            in length.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>authMechanism</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            The authentication mechanism that MongoDB will use to authenticate
-            the connection. For additional details and a list of supported
-            values, see
-            <link xlink:href="&url.mongodb.docs;reference/connection-string/#urioption.authMechanism">Authentication Options</link>
-            in the MongoDB manual.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>authMechanismProperties</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            Properties for the selected authentication mechanism. For additional
-            details and a list of supported properties, see the
-            <link xlink:href="&url.mongodb.specs;/blob/master/source/auth/auth.rst#auth-related-options">Driver Authentication Specification</link>.
-           </simpara>
-           <note>
-            <simpara>
-             When not specified in the URI string, this option is expressed as
-             an array of key/value pairs. The keys and values in this array
-             should be strings.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>authSource</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            The database name associated with the user's credentials. Defaults
-            to the database component of the connection URI, or the
-            <literal>admin</literal> database if both are unspecified.
-           </simpara>
-           <simpara>
-            For authentication mechanisms that delegate credential storage to
-            other services (e.g. GSSAPI), this should be
-            <literal>"$external"</literal>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>compressors</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            A prioritized, comma-delimited list of compressors that the client
-            wants to use. Messages are only compressed if the client and server
-            share any compressors in common, and the compressor used in each
-            direction will depend on the individual configuration of the server
-            or driver. See the
-            <link xlink:href="&url.mongodb.specs;/blob/master/source/compression/OP_COMPRESSED.rst#compressors">Driver Compression Specification</link>
-            for more information.
-           </simpara>
-          </entry>
-         </row>
-         <row xml:id="mongodb-driver-manager.construct-urioptions.connecttimeoutms">
-          <entry>connectTimeoutMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The time in milliseconds to attempt a connection before timing out.
-            Defaults to 10,000 milliseconds.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>directConnection</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            This option can be used to control replica set discovery behavior
-            when only a single host is provided in the connection string. By
-            default, providing a single member in the connection string will
-            establish a direct connection or discover additional members
-            depending on whether the <literal>"replicaSet"</literal> URI option
-            is omitted or present, respectively. Specify &false; to force
-            discovery to occur (if <literal>"replicaSet"</literal> is omitted)
-            or specify &true; to force a direct connection (if
-            <literal>"replicaSet"</literal> is present).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>enableOverloadRetargeting</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            When set to &true; it forces server selection after a
-            <literal>SystemOverloadedError</literal>. Defaults to &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>heartbeatFrequencyMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Specifies the interval in milliseconds between the driver's checks
-            of the MongoDB topology, counted from the end of the previous check
-            until the beginning of the next one. Defaults to 60,000
-            milliseconds.
-           </simpara>
-           <simpara>
-            Per the
-            <link xlink:href="&url.mongodb.sdam;#heartbeatfrequencyms">Server Discovery and Monitoring Specification</link>,
-            this value cannot be less than 500 milliseconds.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>journal</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the default write concern's
-            <parameter>journal</parameter> parameter. If &true;, writes will
-            require acknowledgement from MongoDB that the operation has been
-            written to the journal. For details, see
-            <classname>MongoDB\Driver\WriteConcern</classname>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>loadBalanced</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Specifies whether the driver is connecting to a MongoDB cluster
-            through a load balancer. If &true;, the driver may only connect to a
-            single host (specified by either the connection string or SRV
-            lookup), the <literal>"directConnection"</literal> URI option
-            cannot be &true;, and the <literal>"replicaSet"</literal> URI option
-            must be omitted. Defaults to &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>localThresholdMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The size in milliseconds of the latency window for selecting among
-            multiple suitable MongoDB instances while resolving a read
-            preference. Defaults to 15 milliseconds.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>maxAdaptiveRetries</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            This option can be used to change the maximum number of retries
-            when a <literal>SystemOverloadedError</literal> occurs. Must be a
-            positive integer; defaults to <literal>2</literal>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>maxStalenessSeconds</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the read preference's
-            <literal>"maxStalenessSeconds"</literal>. Specifies, in seconds, how
-            stale a secondary can be before the client stops using it for read
-            operations. By default, there is no maximum staleness and clients
-            will not consider a secondary’s lag when choosing where to direct a
-            read operation. For details, see
-            <classname>MongoDB\Driver\ReadPreference</classname>.
-           </simpara>
-           <simpara>
-            If specified, the max staleness must be a signed 32-bit integer
-            greater than or equal to
-            <constant>MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</constant>
-            (i.e. 90 seconds).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>password</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           The password for the user being authenticated. This option is useful
-           if the password contains special characters, which would otherwise
-           need to be URL encoded for the connection URI.
-          </entry>
-         </row>
-         <row>
-          <entry>readConcernLevel</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           Corresponds to the read concern's <parameter>level</parameter>
-           parameter. Specifies the level of read isolation. For details, see
-           <classname>MongoDB\Driver\ReadConcern</classname>.
-          </entry>
-         </row>
-         <row>
-          <entry>readPreference</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the read preference's <parameter>mode</parameter>
-            parameter. Defaults to <literal>"primary"</literal>. For details,
-            see <classname>MongoDB\Driver\ReadPreference</classname>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>readPreferenceTags</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the read preference's <parameter>tagSets</parameter>
-            parameter. Tag sets allow you to target read operations to specific
-            members of a replica set. For details, see
-            <classname>MongoDB\Driver\ReadPreference</classname>.
-           </simpara>
-           <note>
-            <simpara>
-             When not specified in the URI string, this option is expressed as
-             an array consistent with the format expected by
-             <function>MongoDB\Driver\ReadPreference::__construct</function>.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>replicaSet</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Specifies the name of the replica set.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>retryReads</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Specifies whether or not the driver should automatically retry
-            certain read operations that fail due to transient network errors
-            or replica set elections. This functionality requires MongoDB 3.6+.
-            Defaults to &true;.
-           </simpara>
-           <simpara>
-            See the
-            <link xlink:href="&url.mongodb.specs;/blob/master/source/retryable-reads/retryable-reads.rst">Retryable Reads Specification</link>
-            for more information.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>retryWrites</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Specifies whether or not the driver should automatically retry
-            certain write operations that fail due to transient network errors
-            or replica set elections. This functionality requires MongoDB 3.6+.
-            Defaults to &true;.
-           </simpara>
-           <simpara>
-            See
-            <link xlink:href="&url.mongodb.docs;core/retryable-writes/">Retryable Writes</link>
-            in the MongoDB manual for more information.
-           </simpara>
-          </entry>
-         </row>
-         <row xml:id="mongodb-driver-manager.construct-urioptions.serverselectiontimeoutms">
-          <entry>serverSelectionTimeoutMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Specifies how long in milliseconds to block for server selection
-            before throwing an exception. Defaults to 30,000 milliseconds.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>serverSelectionTryOnce</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            When &true;, instructs the driver to scan the MongoDB deployment
-            exactly once after server selection fails and then either select a
-            server or raise an error. When &false;, the driver blocks and
-            searches for a server up to the
-            <literal>"serverSelectionTimeoutMS"</literal> value. Defaults to
-            &true;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>socketCheckIntervalMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            If a socket has not been used recently, the driver must check it via
-            a <literal>hello</literal> command before using it for any
-            operation. Defaults to 5,000 milliseconds.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>socketTimeoutMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The time in milliseconds to attempt a send or receive on a socket
-            before timing out. Defaults to 300,000 milliseconds (i.e. five
-            minutes).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>srvMaxHosts</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The maximum number of SRV results to randomly select when initially
-            populating the seedlist or, during SRV polling, adding new hosts to
-            the topology. Defaults to <literal>0</literal> (i.e. no maximum).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>srvServiceName</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            The service name to use for SRV lookup in initial DNS seedlist
-            discovery and SRV polling. Defaults to <literal>"mongodb"</literal>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tls</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Initiates the connection with TLS/SSL if &true;. Defaults to
-            &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsAllowInvalidCertificates</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Specifies whether or not the driver should error when the server's
-            TLS certificate is invalid. Defaults to &false;.
-           </simpara>
-           <warning>
-            <simpara>
-             Disabling certificate validation creates a vulnerability.
-            </simpara>
-           </warning>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsAllowInvalidHostnames</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Specifies whether or not the driver should error when there is a
-            mismatch between the server's hostname and the hostname specified by
-            the TLS certificate. Defaults to &false;.
-           </simpara>
-           <warning>
-            <simpara>
-             Disabling certificate validation creates a vulnerability. Allowing
-             invalid hostnames may expose the driver to a
-             <link xlink:href="&url.mongodb.wiki.mitm;">man-in-the-middle attack</link>.
-            </simpara>
-           </warning>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsCAFile</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Path to file with either a single or bundle of certificate
-            authorities to be considered trusted when making a TLS connection.
-            The system certificate store will be used by default.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsCertificateKeyFile</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Path to the client certificate file or the client private key file;
-            in the case that they both are needed, the files should be
-            concatenated.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsCertificateKeyFilePassword</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Password to decrypt the client private key (i.e.
-            <literal>"tlsCertificateKeyFile"</literal> URI option) to be used
-            for TLS connections.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsDisableCertificateRevocationCheck</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, the driver will not attempt to check certificate
-            revocation status (e.g. OCSP, CRL). Defaults to &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsDisableOCSPEndpointCheck</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, the driver will not attempt to contact an OCSP responder
-            endpoint if needed (i.e. an OCSP response is not stapled). Defaults
-            to &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tlsInsecure</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Relax TLS constraints as much as possible. Specifying &true; for
-            this option has the same effect as specifying &true; for both the
-            <literal>"tlsAllowInvalidCertificates"</literal> and
-            <literal>"tlsAllowInvalidHostnames"</literal> URI options. Defaults
-            to &false;.
-           </simpara>
-           <warning>
-            <simpara>
-             Disabling certificate validation creates a vulnerability. Allowing
-             invalid hostnames may expose the driver to a
-             <link xlink:href="&url.mongodb.wiki.mitm;">man-in-the-middle attack</link>.
-            </simpara>
-           </warning>
-          </entry>
-         </row>
-         <row>
-          <entry>username</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           The username for the user being authenticated. This option is useful
-           if the username contains special characters, which would otherwise
-           need to be URL encoded for the connection URI.
-          </entry>
-         </row>
-         <row>
-          <entry>w</entry>
-          <entry><type class="union"><type>int</type><type>string</type></type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the default write concern's <parameter>w</parameter>
-            parameter. For details, see
-            <classname>MongoDB\Driver\WriteConcern</classname>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>wTimeoutMS</entry>
-          <entry><type class="union"><type>int</type><type>string</type></type></entry>
-          <entry>
-           <simpara>
-            Corresponds to the default write concern's
-            <parameter>wtimeout</parameter> parameter. Specifies a time limit,
-            in milliseconds, for the write concern. For details, see
-            <classname>MongoDB\Driver\WriteConcern</classname>.
-           </simpara>
-           <simpara>
-            If specified, <literal>wTimeoutMS</literal> must be a signed 32-bit
-            integer greater than or equal to zero.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>zlibCompressionLevel</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Specifies the compression level to use for the zlib compressor. This
-            option has no effect if <literal>zlib</literal> is not included in
-            the <literal>"compressors"</literal> URI option. See the
-            <link xlink:href="&url.mongodb.specs;/blob/master/source/compression/OP_COMPRESSED.rst#zlibcompressionlevel">Driver Compression Specification</link>
-            for more information.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="mongodb-driver-manager.construct-driveroptions">
-    <term><parameter>driverOptions</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>driverOptions</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>autoEncryption</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            Provides options to enable automatic client-side field level
-            encryption. The list of options is described in the <link linkend="mongodb-driver-manager.construct-autoencryption">table below</link>.
-           </simpara>
-           <note>
-            <simpara>
-             Automatic encryption is an enterprise-only feature that only
-             applies to operations on a collection. Automatic encryption is not
-             supported for operations on a database or view, and operations that
-             are not bypassed will result in error (see
-             <link xlink:href="&url.mongodb.libmongocrypt.allow.list;">libmongocrypt: Auto Encryption Allow-List</link>). To bypass automatic encryption
-             for all operations, set <literal>bypassAutoEncryption</literal> to
-             &true;.
-            </simpara>
-            <simpara>
-             Automatic encryption requires the authenticated user to have the
-             <link xlink:href="&url.mongodb.docs;reference/command/listCollections/#required-access">listCollections</link>
-             privilege action.
-            </simpara>
-            <simpara>
-             Explicit encryption/decryption and automatic decryption is a
-             community feature. The driver can still automatically decrypt when
-             <literal>bypassAutoEncryption</literal> is &true;.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>ca_dir</entry>
-          <entry><type>string</type></entry>
-          <entry>
-           <simpara>
-            Path to a correctly hashed certificate directory. The system
-            certificate store will be used by default.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>crl_file</entry>
-          <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>
-           <simpara>
-            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;.
-           </simpara>
-           <note>
-            <simpara>
-             Disabling client persistence is not generally recommended.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>driver</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            Allows a higher level library to append its own metadata to the
-            server handshake. By default, the extension submits its own name,
-            version, and platform (i.e. PHP version) in the handshake. Strings
-            can be specified for the <literal>"name"</literal>,
-            <literal>"version"</literal>, and <literal>"platform"</literal> keys
-            of this array, and will be appended to the respective field(s) in
-            the handshake document.
-           </simpara>
-           <note>
-            <simpara>
-             Handshake information is limited to 512 bytes. The extension will
-             truncate handshake data to fit within this 512-byte string. Higher
-             level libraries are encouraged to keep their own metadata concise.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>serverApi</entry>
-          <entry><classname>MongoDB\Driver\ServerApi</classname></entry>
-          <entry>
-           <simpara>
-            This option is used to declare a server API version for the manager.
-            If omitted, no API version is declared.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     <para xml:id="mongodb-driver-manager.construct-autoencryption">
-      Options supported by automatic encryption through the <literal>autoEncryption</literal> driver option:
-      <table>
-       <title>autoEncryption</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.encryption.keyVaultClient;
-         &mongodb.option.encryption.keyVaultNamespace;
-         &mongodb.option.encryption.kmsProviders;
-         &mongodb.option.encryption.tlsOptions;
-         <row>
-          <entry>schemaMap</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Map of collection namespaces to a local JSON schema. This is
-            used to configure automatic encryption. See
-            <link xlink:href="&url.mongodb.docs;reference/security-client-side-automatic-json-schema/">Automatic Encryption Rules</link>
-            in the MongoDB manual for more information. It is an error to
-            specify a collection in both <literal>schemaMap</literal> and
-            <literal>encryptedFieldsMap</literal>.
-           </simpara>
-           <note>
-            <simpara>
-             Supplying a <literal>schemaMap</literal> provides more
-             security than relying on JSON schemas obtained from the
-             server. It protects against a malicious server advertising a
-             false JSON schema, which could trick the client into sending
-             unencrypted data that should be encrypted.
-            </simpara>
-           </note>
-           <note>
-            <simpara>
-             Schemas supplied in the <literal>schemaMap</literal> only
-             apply to configuring automatic encryption for client side
-             encryption. Other validation rules in the JSON schema will
-             not be enforced by the driver and will result in an error.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>bypassAutoEncryption</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           If &true;, <literal>mongocryptd</literal> will not be spawned
-           automatically. This is used to disable automatic encryption.
-           Defaults to &false;.
-          </entry>
-         </row>
-         <row>
-          <entry>bypassQueryAnalysis</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, automatic analysis of outgoing commands will be
-            disabled and <literal>mongocryptd</literal> will not be
-            spawned automatically. This enables the use case of explicit
-            encryption for querying indexed fields without requiring the
-            enterprise licensed <literal>crypt_shared</literal> library or
-            <literal>mongocryptd</literal> process. Defaults to &false;.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>encryptedFieldsMap</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Map of collection namespaces to an
-            <literal>encryptedFields</literal> document. This is used to
-            configure queryable encryption. See
-            <link xlink:href="&url.mongodb.docs;core/queryable-encryption/fundamentals/encrypt-and-query/">Field Encryption and Queryability</link>
-            in the MongoDB manual for more information. It is an error to
-            specify a collection in both
-            <literal>encryptedFieldsMap</literal> and
-            <literal>schemaMap</literal>.
-           </simpara>
-           <note>
-            <simpara>
-             Supplying an <literal>encryptedFieldsMap</literal> provides
-             more security than relying on an
-             <literal>encryptedFields</literal> obtained from the server.
-             It protects against a malicious server advertising a false
-             <literal>encryptedFields</literal>.
-            </simpara>
-           </note>
-          </entry>
-         </row>
-         <row>
-          <entry>extraOptions</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            The <literal>extraOptions</literal> relate to the
-            <literal>mongocryptd</literal> process. The following options
-            are supported:
-           </simpara>
-           <simplelist>
-            <member><literal>mongocryptdURI</literal> (<type>string</type>): URI to connect to an existing <literal>mongocryptd</literal> process. Defaults to <literal>"mongodb://localhost:27020"</literal>.</member>
-            <member><literal>mongocryptdBypassSpawn</literal> (<type>bool</type>): If &true;, prevent the driver from spawning <literal>mongocryptd</literal>. Defaults to &false;.</member>
-            <member><literal>mongocryptdSpawnPath</literal> (<type>string</type>): Absolute path to search for <literal>mongocryptd</literal> binary. Defaults to empty string and consults system paths.</member>
-            <member><literal>mongocryptdSpawnArgs</literal> (<type>array</type>): Array of string arguments to pass to <literal>mongocryptd</literal> when spawning. Defaults to <literal>["--idleShutdownTimeoutSecs=60"]</literal>.</member>
-            <member><literal>cryptSharedLibPath</literal> (<type>string</type>): Absolute path to <literal>crypt_shared</literal> shared library. Defaults to empty string and consults system paths.</member>
-            <member><literal>cryptSharedLibRequired</literal> (<type>bool</type>): If &true;, require the driver to load <literal>crypt_shared</literal>. Defaults to &false;.</member>
-           </simplelist>
-           <simpara>
-            See the <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#extraoptions">Client-Side Encryption Specification</link> for more information.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-      <note>
-       <simpara>
-        Automatic encryption is an enterprise only feature that only
-        applies to operations on a collection. Automatic encryption is not
-        supported for operations on a database or view, and operations that
-        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
-        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>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the <parameter>uri</parameter> format is invalid</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"canonicalizeHostname"</literal> URI option was removed.
-        Use the <literal>"CANONICALIZE_HOST_NAME"</literal> property of the
-        <literal>"authMechanismProperties"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"gssapiServiceName"</literal> URI option was removed.
-        Use the <literal>"SERVICE_NAME"</literal> property of the
-        <literal>"authMechanismProperties"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"safe"</literal> URI option was removed. Use the
-        <literal>"w"</literal> and <literal>"wTimeoutMS"</literal> URI options
-        instead.
-       </simpara>
-       <simpara>
-        The <literal>"ssl"</literal> URI option was removed. Use the
-        <literal>"tls"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"allow_invalid_hostname"</literal> driver option was
-        removed. Use the <literal>"tlsAllowInvalidHostnames"</literal> URI
-        option instead.
-       </simpara>
-       <simpara>
-        The <literal>"ca_file"</literal> driver option was removed. Use the
-        <literal>"tlsCAFile"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"context"</literal> driver option was removed. All context
-        options were deprecated in favor of the various URI options related to
-        TLS.
-       </simpara>
-       <simpara>
-        The <literal>"pem_file"</literal> driver option was removed. Use the
-        <literal>"tlsCertificateKeyFile"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"pem_pwd"</literal> driver option was removed. Use the
-        <literal>"tlsCertificateKeyFilePassword"</literal> URI option instead.
-       </simpara>
-       <simpara>
-        The <literal>"weak_cert_validation"</literal> driver option was removed.
-        Use the <literal>"tlsAllowInvalidCertificates"</literal> URI option
-        instead.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.16.0</entry>
-      <entry>
-       <simpara>
-        The AWS KMS provider for client-side encryption now accepts a
-        <literal>"sessionToken"</literal> option, which can be used to
-        authenticate with temporary AWS credentials.
-       </simpara>
-       <simpara>
-        Added <literal>"tlsDisableOCSPEndpointCheck"</literal> to the
-        <literal>"tlsOptions"</literal> field of the
-        <literal>"autoEncryption"</literal> driver option.
-       </simpara>
-       <simpara>
-        If an empty document is specified for the <literal>"azure"</literal> or
-        <literal>"gcp"</literal> KMS provider, the driver will attempt to
-        configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.15.0</entry>
-      <entry>
-       <simpara>
-        If an empty document is specified for the <literal>"aws"</literal> KMS
-        provider, the driver will attempt to configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.14.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"bypassQueryAnalysis"</literal> and
-        <literal>"encryptedFieldsMap"</literal> auto encryption options.
-        Additional options pertaining to <literal>crypt_shared</literal> are
-        now supported in the <literal>"extraOptions"</literal> auto encryption
-        option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.13.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"srvMaxHosts"</literal> and
-        <literal>"srvServiceName"</literal> URI options.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.12.0</entry>
-      <entry>
-       <simpara>
-        KMIP is now supported as a KMS provider for client-side encryption and
-        may be configured in the <literal>"kmsProviders"</literal> field of the
-        <literal>"autoEncryption"</literal> driver option. Additionally, TLS
-        options for KMS providers may now be configured in the
-        <literal>"tlsOptions"</literal> field of the
-        <literal>"autoEncryption"</literal> driver option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.11.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"loadBalanced"</literal> URI option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.10.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"disableClientPersistence"</literal> driver option.
-       </simpara>
-       <simpara>
-        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>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.8.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"directConnection"</literal>,
-        <literal>"tlsDisableCertificateRevocationCheck"</literal>, and
-        <literal>"tlsDisableOCSPEndpointCheck"</literal> URI options.
-       </simpara>
-       <simpara>
-        Added the <literal>"driver"</literal> driver option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.7.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"autoEncryption"</literal> driver option.
-       </simpara>
-       <simpara>
-        Specifying any SSL or TLS option via the <parameter>driverOptions</parameter>
-        parameter will now implicitly enable TLS, as is done for the
-        corresponding URI options.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.6.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"retryReads"</literal>, <literal>"tls"</literal>,
-        <literal>"tlsAllowInvalidCertificates"</literal>,
-        <literal>"tlsAllowInvalidHostnames"</literal>,
-        <literal>"tlsCAFile"</literal>,
-        <literal>"tlsCertificateKeyFile"</literal>,
-        <literal>"tlsCertificateKeyFilePassword"</literal>, and
-        <literal>"tlsInsecure"</literal> URI options.
-       </simpara>
-       <simpara>
-        The <literal>"retryWrites"</literal> URI option defaults to &true;.
-       </simpara>
-       <simpara>
-        Specifying any SSL or TLS URI option via the connection string or
-        <parameter>uriOptions</parameter> parameter will now implicitly enable
-        TLS unless <literal>ssl</literal> or <literal>tls</literal> is &false;.
-        TLS is <emphasis>not</emphasis> implicitly enabled for any options in
-        the <parameter>driverOptions</parameter> parameter, which is unchanged
-        from previous versions.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.5.0</entry>
-      <entry>
-       <simpara>
-        <literal>"wtimeoutMS"</literal> is now always validated and applied to
-        the write concern. Previously, the option was ignored if
-        <literal>"w"</literal> was &lt;= 1, since the timeout only applies to
-        replication.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"compressors"</literal>,
-        <literal>"retryWrites"</literal>, and
-        <literal>"zlibCompressionLevel"</literal> URI options.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>uriOptions</parameter> argument now accepts
-        <literal>"authMechanism"</literal> and
-        <literal>"authMechanismProperties"</literal> options. Previously, these
-        options were only supported in the <parameter>uri</parameter> argument.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>uri</parameter> argument defaults to
-        <literal>"mongodb://127.0.0.1/"</literal>. The default port remains
-        <literal>27017</literal>.
-       </simpara>
-       <simpara>
-        Added the <literal>"appname"</literal> URI option.
-       </simpara>
-       <simpara>
-        Added the <literal>"allow_invalid_hostname"</literal>,
-        <literal>"ca_file"</literal>, <literal>"ca_dir"</literal>,
-        <literal>"clr_file"</literal>, <literal>"pem_file"</literal>,
-        <literal>"pem_pwd"</literal>, and
-        <literal>"weak_cert_validation"</literal> driver options.
-       </simpara>
-       <simpara>
-        The PHP Streams API is no longer used for socket communication. The
-        <literal>"connectTimeoutMS"</literal> URI option now defaults to 10
-        seconds instead of
-        <link linkend="ini.default-socket-timeout">default_socket_timeout</link>
-        in previous versions. Additionally, the extension no longer supports
-        all <link linkend="context.ssl">SSL context options</link> via the
-        <literal>"context"</literal> driver option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.1.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>uri</parameter> argument is optional and defaults to
-        <literal>"mongodb://localhost:27017/"</literal>.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::__construct</function> basic examples</title>
-   <simpara>Connecting to standalone MongoDB node:</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://example.com:27017");
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    Connecting to standalone MongoDB node via a Unix domain socket. The socket
-    path may include special characters such as slashes and should be encoded
-    with <function>rawurlencode</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://" . rawurlencode("/tmp/mongodb-27017.sock"));
-
-?>
-]]>
-   </programlisting>
-   <simpara>Connecting to a replica set:</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://rs1.example.com,rs2.example.com/?replicaSet=myReplicaSet");
-
-?>
-]]>
-   </programlisting>
-   <simpara>Connecting to a sharded cluster (i.e. one or more mongos instances):</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://mongos1.example.com,mongos2.example.com/");
-
-?>
-]]>
-   </programlisting>
-   <simpara>Connecting to MongoDB with authentication credentials for a particular user and database:</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://myusername:mypassword@example.com/?authSource=databaseName");
-
-?>
-]]>
-   </programlisting>
-
-   <simpara>
-    Connecting to MongoDB with authentication credentials for a particular
-    user and database, where the username or password includes special
-    characters (e.g. <literal>@</literal>, <literal>:</literal>,
-    <literal>%</literal>). In the following example, the password string
-    <literal>myp@ss:w%rd</literal> has been manually escaped; however,
-    <function>rawurlencode</function> may also be used to escape URI components
-    that may contain special characters.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://myusername:myp%40ss%3Aw%25rd@example.com/?authSource=databaseName");
-
-?>
-]]>
-   </programlisting>
-
-   <simpara>Connecting to MongoDB with X509 authentication:</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager(
-    "mongodb://example.com/?ssl=true&authMechanism=MONGODB-X509",
-    [],
-    [
-        "pem_file" => "/path/to/client.pem",
-    ]
-);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="mongodb.connection-handling">Connection handling and persistence</link></member>
-   <member><link xlink:href="&url.mongodb.docs;reference/connection-string/">MongoDB Connection String Format</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/mongodb/driver/manager/createclientencryption.xml b/reference/mongodb/mongodb/driver/manager/createclientencryption.xml
deleted file mode 100644
index 641d47370a1b..000000000000
--- a/reference/mongodb/mongodb/driver/manager/createclientencryption.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 348272 $ -->
-
-<refentry xml:id="mongodb-driver-manager.createclientencryption" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::createClientEncryption</refname>
-  <refpurpose>Create a new ClientEncryption object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ClientEncryption</type><methodname>MongoDB\Driver\Manager::createClientEncryption</methodname>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\ClientEncryption</classname> object with the specified options.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.encryption.keyVaultClient;
-         &mongodb.option.encryption.keyVaultNamespace;
-         &mongodb.option.encryption.kmsProviders;
-         &mongodb.option.encryption.tlsOptions;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>MongoDB\Driver\ClientEncryption</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the extension was compiled without libmongocrypt support</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.16.0</entry>
-      <entry>
-       <simpara>
-        The AWS KMS provider for client-side encryption now accepts a
-        <literal>"sessionToken"</literal> option, which can be used to
-        authenticate with temporary AWS credentials.
-       </simpara>
-       <simpara>
-        Added <literal>"tlsDisableOCSPEndpointCheck"</literal> to the
-        <literal>"tlsOptions"</literal> option.
-       </simpara>
-       <simpara>
-        If an empty document is specified for the <literal>"azure"</literal> or
-        <literal>"gcp"</literal> KMS provider, the driver will attempt to
-        configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.15.0</entry>
-      <entry>
-       <simpara>
-        If an empty document is specified for the <literal>"aws"</literal> KMS
-        provider, the driver will attempt to configure the provider using
-        <link xlink:href="&url.mongodb.specs;/blob/master/source/client-side-encryption/client-side-encryption.rst#automatic-credentials">Automatic Credentials</link>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.12.0</entry>
-      <entry>
-       <simpara>
-        KMIP is now supported as a KMS provider for client-side encryption and
-        may be configured in the <literal>"kmsProviders"</literal> option.
-       </simpara>
-       <simpara>
-        Added the <literal>"tlsOptions"</literal> option.
-       </simpara>
-      </entry>
-     </row>
-     <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>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ClientEncryption::__construct</function></member>
-   <member><link xlink:href="&url.mongodb.docs;core/security-explicit-client-side-encryption/">Explicit (Manual) Client-Side Field Level Encryption</link> in the MongoDB manual</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/executebulkwrite.xml b/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
deleted file mode 100644
index e41371889240..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executebulkwrite.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executebulkwrite" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeBulkWrite</refname>
-  <refpurpose>Execute one or more write operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\BulkWrite</type><parameter>bulk</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes one or more write operations on the primary server.
-  </simpara>
-  <simpara>
-   A <classname>MongoDB\Driver\BulkWrite</classname> can be constructed with
-   one or more write operations of varying types (e.g. updates, deletes, and
-   inserts). The driver will attempt to send operations of the same type to the
-   server in as few requests as possible to optimize round trips.
-  </simpara>
-  <simpara>
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.bulkwrite;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.writeresult;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> has already been executed. <classname>MongoDB\Driver\BulkWrite</classname> objects may not be executed multiple times.</member>
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   &mongodb.throws.bulkwriteexception;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\WriteConcern</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\WriteConcern</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\WriteConcern</classname> object.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       is now thrown if <parameter>bulk</parameter> does not contain any write
-       operations. Previously, a
-       <classname>MongoDB\Driver\Exception\BulkWriteException</classname> was
-       thrown.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::executeBulkWrite</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$bulk = new MongoDB\Driver\BulkWrite();
-
-$bulk->insert(['_id' => 1, 'x' => 1]);
-$bulk->insert(['_id' => 2, 'x' => 2]);
-
-$bulk->update(['x' => 2], ['$set' => ['x' => 1]], ['multi' => false, 'upsert' => false]);
-$bulk->update(['x' => 3], ['$set' => ['x' => 3]], ['multi' => false, 'upsert' => true]);
-$bulk->update(['_id' => 3], ['$set' => ['x' => 3]], ['multi' => false, 'upsert' => true]);
-
-$bulk->insert(['_id' => 4, 'x' => 2]);
-
-$bulk->delete(['x' => 1], ['limit' => 1]);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$writeConcern = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY, 100);
-$result = $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Matched  %d document(s)\n", $result->getMatchedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-printf("Upserted %d document(s)\n", $result->getUpsertedCount());
-printf("Deleted  %d document(s)\n", $result->getDeletedCount());
-
-foreach ($result->getUpsertedIds() as $index => $id) {
-    printf('upsertedId[%d]: ', $index);
-    var_dump($id);
-}
-
-/* If the WriteConcern could not be fulfilled */
-if ($writeConcernError = $result->getWriteConcernError()) {
-    printf("%s (%d): %s\n", $writeConcernError->getMessage(), $writeConcernError->getCode(), var_export($writeConcernError->getInfo(), true));
-}
-
-/* If a write could not happen at all */
-foreach ($result->getWriteErrors() as $writeError) {
-    printf("Operation#%d: %s (%d)\n", $writeError->getIndex(), $writeError->getMessage(), $writeError->getCode());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Inserted 3 document(s)
-Matched  1 document(s)
-Updated  1 document(s)
-Upserted 2 document(s)
-Deleted  1 document(s)
-upsertedId[3]: object(MongoDB\BSON\ObjectId)#5 (1) {
-  ["oid"]=>
-  string(24) "54d3adc3ce7a792f4d703756"
-}
-upsertedId[4]: int(3)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWrite</classname></member>
-   <member><classname>MongoDB\Driver\WriteResult</classname></member>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><function>MongoDB\Driver\Server::executeBulkWrite</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/mongodb/mongodb/driver/manager/executebulkwritecommand.xml b/reference/mongodb/mongodb/driver/manager/executebulkwritecommand.xml
deleted file mode 100644
index 5a1f138169c7..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executebulkwritecommand.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executebulkwritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeBulkWriteCommand</refname>
-  <refpurpose>Execute write operations using the bulkWrite command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\BulkWriteCommandResult</type><methodname>MongoDB\Driver\Manager::executeBulkWriteCommand</methodname>
-   <methodparam><type>MongoDB\Driver\BulkWriteCommand</type><parameter>bulk</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes one or more write operations on the primary server using the
-   <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-   command introduced in MongoDB 8.0.
-  </simpara>
-  <simpara>
-   A <classname>MongoDB\Driver\BulkWriteCommand</classname> can be constructed
-   with one or more write operations of varying types (e.g. inserts, updates,
-   and deletes). Each write operation may target a different collection.
-  </simpara>
-  <simpara>
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.bulkwritecommand;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.bulkwritecommandresult;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> has already been executed. <classname>MongoDB\Driver\BulkWriteCommand</classname> objects may not be executed multiple times.</member>
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   &mongodb.throws.bulkwritecommandexception;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Mixed write operations</title>
-   <simpara>
-    Mixed write operations (i.e. inserts, updates, and deletes) will be sent
-    to the server using a single
-    <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-    command.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-// Delete documents from both collections
-$bulk->deleteMany('db.coll_one', []);
-$bulk->deleteMany('db.coll_two', []);
-
-// Insert documents into two collections
-$bulk->insertOne('db.coll_one', ['_id' => 1]);
-$bulk->insertOne('db.coll_two', ['_id' => 2]);
-$bulk->insertOne('db.coll_two', ['_id' => 3]);
-
-// Update a document in "coll_one"
-$bulk->updateOne('db.coll_one', ['_id' => 1], ['$set' => ['x' => 1]]);
-
-$result = $manager->executeBulkWriteCommand($bulk);
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-printf("Updated  %d document(s)\n", $result->getModifiedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Inserted 3 document(s)
-Updated  1 document(s)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Ordered write operations causing an error</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWriteCommand;
-
-$bulk->deleteMany('db.coll', []);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 2]);
-$bulk->insertOne('db.coll', ['_id' => 1]);
-$bulk->insertOne('db.coll', ['_id' => 3]);
-
-try {
-    $result = $manager->executeBulkWriteCommand($bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteCommandException $e) {
-    $result = $e->getPartialResult();
-
-    var_dump($e->getWriteErrors());
-}
-
-printf("Inserted %d document(s)\n", $result->getInsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [3]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(78) "E11000 duplicate key error collection: db.coll index: _id_ dup key: { _id: 1 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(3)
-    ["info"]=>
-    object(stdClass)#6 (0) {
-    }
-  }
-}
-Inserted 2 document(s)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWriteCommand</classname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</classname></member>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><function>MongoDB\Driver\Server::executeBulkWriteCommand</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/mongodb/mongodb/driver/manager/executecommand.xml b/reference/mongodb/mongodb/driver/manager/executecommand.xml
deleted file mode 100644
index 941fa4eb80eb..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executecommand.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeCommand</refname>
-  <refpurpose>Execute a database command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Selects a server according to the <literal>"readPreference"</literal> option
-   and executes the command on that server.
-  </simpara>
-  <simpara>
-   This method applies no special logic to the command. The
-   Default values for the <literal>"readPreference"</literal>,
-   <literal>"readConcern"</literal>, and <literal>"writeConcern"</literal>
-   options will be inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option). If there is no active transaction, a
-   primary read preference will be used for server selection.
-  </simpara>
-  <simpara>
-   Default values will <emphasis>not</emphasis> be inferred from the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-   Users are therefore encouraged to use specific read and/or write command
-   methods if possible.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command, issuing a write command to a secondary).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\ReadPreference</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\ReadPreference</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\ReadPreference</classname> object.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::executeCommand</function> with a command returning a single result document</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$command = new MongoDB\Driver\Command(['ping' => 1]);
-
-try {
-    $cursor = $manager->executeCommand('admin', $command);
-} catch(MongoDB\Driver\Exception $e) {
-    echo $e->getMessage(), "\n";
-    exit;
-}
-
-/* The ping command returns a single result document, so we need to access the
- * first result in the cursor. */
-$response = $cursor->toArray()[0];
-
-var_dump($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["ok"]=>
-  float(1)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\Manager::executeCommand</function> with a command returning a cursor</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1, 'y' => 'foo']);
-$bulk->insert(['x' => 2, 'y' => 'bar']);
-$bulk->insert(['x' => 3, 'y' => 'bar']);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$command = new MongoDB\Driver\Command([
-    'aggregate' => 'collection',
-    'pipeline' => [
-        ['$group' => ['_id' => '$y', 'sum' => ['$sum' => '$x']]],
-    ],
-    'cursor' => new stdClass,
-]);
-$cursor = $manager->executeCommand('db', $command);
-
-/* The aggregate command can optionally return its results in a cursor instead
- * of a single result document. In this case, we can iterate on the cursor
- * directly to access those results. */
-foreach ($cursor as $document) {
-    var_dump($document);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(stdClass)#6 (2) {
-  ["_id"]=>
-  string(3) "bar"
-  ["sum"]=>
-  int(10)
-}
-object(stdClass)#7 (2) {
-  ["_id"]=>
-  string(3) "foo"
-  ["sum"]=>
-  int(2)
-}
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Limiting execution time for a command</title>
-   <simpara>
-    The execution time of a command may be limited by specifying a value for
-    <literal>"maxTimeMS"</literal> in the
-    <classname>MongoDB\Driver\Command</classname> document. Note that this time
-    limit is enforced on the server side and does not take network latency into
-    account. See
-    <link xlink:href="&url.mongodb.docs.maxtimems;">Terminate Running Operations</link>
-    in the MongoDB manual for more information.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-
-$command = new MongoDB\Driver\Command([
-    'count' => 'collection',
-    'query' => ['x' => ['$gt' => 1]],
-    'maxTimeMS' => 1000,
-]);
-
-$cursor = $manager->executeCommand('db', $command);
-
-var_dump($cursor->toArray()[0]);
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    If the command fails to complete after one second of execution time on the
-    server, a
-    <classname>MongoDB\Driver\Exception\ExecutionTimeoutException</classname>
-    will be thrown.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    If a secondary <parameter>readPreference</parameter> is used, it is the
-    caller&apos;s responsibility to ensure that the
-    <parameter>command</parameter> can be executed on a secondary. No validation
-    is done by the driver.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This method does not default to using the read preference from the
-    <link linkend="mongodb-driver-manager.construct-uri">MongoDB Connection
-    URI</link>. Applications in need of that behavior should consider using
-    <function>MongoDB\Driver\Manager::executeReadCommand</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeCommand</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/mongodb/mongodb/driver/manager/executequery.xml b/reference/mongodb/mongodb/driver/manager/executequery.xml
deleted file mode 100644
index b0287a24606f..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executequery.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executequery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeQuery</refname>
-  <refpurpose>Execute a database query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeQuery</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Query</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Selects a server according to the <literal>"readPreference"</literal> option
-   and executes the query on that server.
-  </simpara>
-  <simpara>
-   Default values for the <literal>"readPreference"</literal> option and Query's
-   <literal>"readConcern"</literal> option will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.query;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid query operators).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\ReadPreference</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\ReadPreference</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\ReadPreference</classname> object.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::executeQuery</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->insert(['x' => 2]);
-$bulk->insert(['x' => 3]);
-$manager->executeBulkWrite('db.collection', $bulk);
-
-$filter = ['x' => ['$gt' => 1]];
-$options = [
-    'projection' => ['_id' => 0],
-    'sort' => ['x' => -1],
-];
-
-$query = new MongoDB\Driver\Query($filter, $options);
-$cursor = $manager->executeQuery('db.collection', $query);
-
-foreach ($cursor as $document) {
-    var_dump($document);
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(stdClass)#6 (1) {
-  ["x"]=>
-  int(3)
-}
-object(stdClass)#7 (1) {
-  ["x"]=>
-  int(2)
-}
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Limiting execution time for a query</title>
-   <simpara>
-    The <literal>"maxTimeMS"</literal>
-    <classname>MongoDB\Driver\Query</classname> option may be used to limit the
-    execution time of a query. Note that this time limit is enforced on the
-    server side and does not take network latency into account. See
-    <link xlink:href="&url.mongodb.docs.maxtimems;">Terminate Running Operations</link>
-    in the MongoDB manual for more information.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-
-$filter = ['x' => ['$gt' => 1]];
-$options = [
-    'maxTimeMS' => 1000,
-];
-
-$query = new MongoDB\Driver\Query($filter, $options);
-$cursor = $manager->executeQuery('db.collection', $query);
-
-foreach ($cursor as $document) {
-    var_dump($document);
-}
-
-?>
-]]>
-   </programlisting>
-   <simpara>
-    If the query fails to complete after one second of execution time on the
-    server, a
-    <classname>MongoDB\Driver\Exception\ExecutionTimeoutException</classname>
-    will be thrown.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><classname>MongoDB\Driver\Query</classname></member>
-   <member><classname>MongoDB\Driver\ReadPreference</classname></member>
-   <member><function>MongoDB\Driver\Server::executeQuery</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/mongodb/mongodb/driver/manager/executereadcommand.xml b/reference/mongodb/mongodb/driver/manager/executereadcommand.xml
deleted file mode 100644
index da1922943959..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executereadcommand.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executereadcommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeReadCommand</refname>
-  <refpurpose>Execute a database command that reads</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeReadCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Selects a server according to the <literal>"readPreference"</literal> option
-   and executes the command on that server.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that read (e.g.
-   <link xlink:href="&url.mongodb.docs;reference/command/distinct/">distinct</link>).
-   Default values for the <literal>"readPreference"</literal> and
-   <literal>"readConcern"</literal> options will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadCommand</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/mongodb/mongodb/driver/manager/executereadwritecommand.xml b/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
deleted file mode 100644
index b335d0bae78d..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executereadwritecommand.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executereadwritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeReadWriteCommand</refname>
-  <refpurpose>Execute a database command that reads and writes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeReadWriteCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on the primary server.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that read and write
-   (e.g. <link xlink:href="&url.mongodb.docs;reference/command/aggregate/">aggregate</link>).
-   Default values for the <literal>"readConcern"</literal> and
-   <literal>"writeConcern"</literal> options will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadWriteCommand</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/mongodb/mongodb/driver/manager/executewritecommand.xml b/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
deleted file mode 100644
index a7ddec1abdbd..000000000000
--- a/reference/mongodb/mongodb/driver/manager/executewritecommand.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.executewritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::executeWriteCommand</refname>
-  <refpurpose>Execute a database command that writes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Manager::executeWriteCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on the primary server.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that write (e.g.
-   <link xlink:href="&url.mongodb.docs;reference/command/drop/">drop</link>).
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
-  <note>
-   <simpara>
-    This method is not intended to be used to execute
-    <link xlink:href="&url.mongodb.docs;reference/command/insert/">insert</link>,
-    <link xlink:href="&url.mongodb.docs;reference/command/update/">update</link>,
-    or <link xlink:href="&url.mongodb.docs;reference/command/delete/">delete</link>
-    commands. Users are encouraged to use
-    <function>MongoDB\Driver\Manager::executeBulkWrite</function> for those
-    operations.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeWriteCommand</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/mongodb/mongodb/driver/manager/getencryptedfieldsmap.xml b/reference/mongodb/mongodb/driver/manager/getencryptedfieldsmap.xml
deleted file mode 100644
index 5ebeb71df41b..000000000000
--- a/reference/mongodb/mongodb/driver/manager/getencryptedfieldsmap.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.getencryptedfieldsmap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::getEncryptedFieldsMap</refname>
-  <refpurpose>Return the encryptedFieldsMap auto encryption option for the Manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>object</type><type>null</type></type><methodname>MongoDB\Driver\Manager::getEncryptedFieldsMap</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <literal>encryptedFieldsMap</literal> auto encryption option for
-   the Manager, if specified.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <literal>encryptedFieldsMap</literal> auto encryption option for the
-   Manager, or &null; if it was not specified.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::__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/mongodb/mongodb/driver/manager/getreadconcern.xml b/reference/mongodb/mongodb/driver/manager/getreadconcern.xml
deleted file mode 100644
index 0661bff37fa6..000000000000
--- a/reference/mongodb/mongodb/driver/manager/getreadconcern.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.getreadconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::getReadConcern</refname>
-  <refpurpose>Return the ReadConcern for the Manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ReadConcern</type><methodname>MongoDB\Driver\Manager::getReadConcern</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\ReadConcern</classname> for the
-   Manager, which is derived from its URI options. This is the default read
-   concern for queries and commands executed on the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>MongoDB\Driver\ReadConcern</classname> for the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::getReadConcern</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-var_dump($manager->getReadConcern());
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017/?readConcernLevel=local');
-var_dump($manager->getReadConcern());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\ReadConcern)#2 (0) {
-}
-object(MongoDB\Driver\ReadConcern)#1 (1) {
-  ["level"]=>
-  string(5) "local"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\ReadConcern</classname></member>
-   <member><function>MongoDB\Driver\Manager::__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/mongodb/mongodb/driver/manager/getreadpreference.xml b/reference/mongodb/mongodb/driver/manager/getreadpreference.xml
deleted file mode 100644
index b2fcf000b15b..000000000000
--- a/reference/mongodb/mongodb/driver/manager/getreadpreference.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.getreadpreference" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::getReadPreference</refname>
-  <refpurpose>Return the ReadPreference for the Manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ReadPreference</type><methodname>MongoDB\Driver\Manager::getReadPreference</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\ReadPreference</classname> for the
-   Manager, which is derived from its URI options. This is the default read
-   preference for queries and commands executed on the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>MongoDB\Driver\ReadPreference</classname> for the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::getReadPreference</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-var_dump($manager->getReadPreference());
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017/?readPreference=secondaryPreferred&readPreferenceTags=dc:ny,rack:1&readPreferenceTags=dc:ny&readPreferenceTags=');
-var_dump($manager->getReadPreference());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\ReadPreference)#2 (1) {
-  ["mode"]=>
-  string(7) "primary"
-}
-object(MongoDB\Driver\ReadPreference)#1 (2) {
-  ["mode"]=>
-  string(18) "secondaryPreferred"
-  ["tags"]=>
-  array(3) {
-    [0]=>
-    object(stdClass)#3 (2) {
-      ["dc"]=>
-      string(2) "ny"
-      ["rack"]=>
-      string(1) "1"
-    }
-    [1]=>
-    object(stdClass)#4 (1) {
-      ["dc"]=>
-      string(2) "ny"
-    }
-    [2]=>
-    object(stdClass)#5 (0) {
-    }
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\ReadPreference</classname></member>
-   <member><function>MongoDB\Driver\Manager::__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/mongodb/mongodb/driver/manager/getservers.xml b/reference/mongodb/mongodb/driver/manager/getservers.xml
deleted file mode 100644
index 3d7e4cc618a9..000000000000
--- a/reference/mongodb/mongodb/driver/manager/getservers.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.getservers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::getServers</refname>
-  <refpurpose>Return the servers to which this manager is connected</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Manager::getServers</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an <type>array</type> of <classname>MongoDB\Driver\Server</classname>
-   instances to which this manager is connected.
-  </simpara>
-  <note>
-   <simpara>
-    Since the driver connects to the database lazily, this method may return an
-    empty <type>array</type> if called before executing an operation on the
-    <classname>MongoDB\Driver\Manager</classname>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> of <classname>MongoDB\Driver\Server</classname>
-   instances to which this manager is connected.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::getServers</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017");
-
-/* The driver connects to the database server lazily, so Manager::getServers()
- * may initially return an empty array. */
-var_dump($manager->getServers());
-
-$command = new MongoDB\Driver\Command(['ping' => 1]);
-$manager->executeCommand('db', $command);
-
-var_dump($manager->getServers());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(0) {
-}
-array(1) {
-  [0]=>
-  object(MongoDB\Driver\Server)#3 (10) {
-    ["host"]=>
-    string(9) "localhost"
-    ["port"]=>
-    int(27017)
-    ["type"]=>
-    int(1)
-    ["is_primary"]=>
-    bool(false)
-    ["is_secondary"]=>
-    bool(false)
-    ["is_arbiter"]=>
-    bool(false)
-    ["is_hidden"]=>
-    bool(false)
-    ["is_passive"]=>
-    bool(false)
-    ["last_hello_response"]=>
-    array(8) {
-      ["isWritablePrimary"]=>
-      bool(true)
-      ["maxBsonObjectSize"]=>
-      int(16777216)
-      ["maxMessageSizeBytes"]=>
-      int(48000000)
-      ["maxWriteBatchSize"]=>
-      int(1000)
-      ["localTime"]=>
-      object(MongoDB\BSON\UTCDateTime)#4 (1) {
-        ["milliseconds"]=>
-        int(1447267964517)
-      }
-      ["maxWireVersion"]=>
-      int(3)
-      ["minWireVersion"]=>
-      int(0)
-      ["ok"]=>
-      float(1)
-    }
-    ["round_trip_time"]=>
-    int(554)
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Server</classname></member>
-   <member><function>MongoDB\Driver\Manager::selectServer</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/mongodb/mongodb/driver/manager/getwriteconcern.xml b/reference/mongodb/mongodb/driver/manager/getwriteconcern.xml
deleted file mode 100644
index 1ff1268a0313..000000000000
--- a/reference/mongodb/mongodb/driver/manager/getwriteconcern.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.getwriteconcern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::getWriteConcern</refname>
-  <refpurpose>Return the WriteConcern for the Manager</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\WriteConcern</type><methodname>MongoDB\Driver\Manager::getWriteConcern</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\WriteConcern</classname> for the
-   Manager, which is derived from its URI options. This is the default write
-   concern for writes and commands executed on the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>MongoDB\Driver\WriteConcern</classname> for the Manager.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Manager::getWriteConcern</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-var_dump($manager->getWriteConcern());
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017/?w=majority&wtimeoutMS=2000');
-var_dump($manager->getWriteConcern());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\WriteConcern)#2 (0) {
-}
-object(MongoDB\Driver\WriteConcern)#1 (2) {
-  ["w"]=>
-  string(8) "majority"
-  ["wtimeout"]=>
-  int(2000)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><function>MongoDB\Driver\Manager::__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/mongodb/mongodb/driver/manager/removesubscriber.xml b/reference/mongodb/mongodb/driver/manager/removesubscriber.xml
deleted file mode 100644
index d3ec7ca73789..000000000000
--- a/reference/mongodb/mongodb/driver/manager/removesubscriber.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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>
-  <simpara>
-   Unregisters a monitoring event subscriber with this Manager.
-  </simpara>
-  <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>
-     <simpara>
-      A monitoring event subscriber to unregister with this Manager.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </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/manager/selectserver.xml b/reference/mongodb/mongodb/driver/manager/selectserver.xml
deleted file mode 100644
index 7110a4cf5cd8..000000000000
--- a/reference/mongodb/mongodb/driver/manager/selectserver.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.selectserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::selectServer</refname>
-  <refpurpose>Select a server matching a read preference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Manager::selectServer</methodname>
-   <methodparam choice="opt"><type class="union"><type>MongoDB\Driver\ReadPreference</type><type>null</type></type><parameter>readPreference</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Selects a <classname>MongoDB\Driver\Server</classname> matching
-   <parameter>readPreference</parameter>. If
-   <parameter>readPreference</parameter> is &null; or omitted, the primary
-   server will be selected by default. This may be used to preselect a server in
-   order to perform version checking before executing an operation.
-  </simpara>
-  <note>
-   <simpara>
-    Unlike <function>MongoDB\Driver\Manager::getServers</function>, this method
-    will initialize database connections and perform server discovery if
-    necessary. See the
-    <link xlink:href="&url.mongodb.serverselection;#single-threaded-server-selection">Server Selection Specification</link>
-    for additional information.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>readPreference</parameter> (<classname>MongoDB\Driver\ReadPreference</classname>)</term>
-    <listitem>
-     <simpara>
-      The read preference to use for selecting a server. If &null; or omitted,
-      the primary server will be selected by default.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\Driver\Server</classname> matching the read
-   preference.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if a server matching the read preference could not be found.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.11.0</entry>
-      <entry>
-       The <parameter>readPreference</parameter> is now optional. If &null; or
-       omitted, the primary server will be selected by default.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Server</classname></member>
-   <member><function>MongoDB\Driver\Manager::getServers</function></member>
-   <member><link xlink:href="&url.mongodb.serverselection;">Server Selection Specification</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/mongodb/driver/manager/startsession.xml b/reference/mongodb/mongodb/driver/manager/startsession.xml
deleted file mode 100644
index 3f528d8e136b..000000000000
--- a/reference/mongodb/mongodb/driver/manager/startsession.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-manager.startsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Manager::startSession</refname>
-  <refpurpose>Start a new client session for use with this client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Session</type><methodname>MongoDB\Driver\Manager::startSession</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a <classname>MongoDB\Driver\Session</classname> for the given
-   options. The session may then be specified when executing commands, queries,
-   and write operations.
-  </simpara>
-  <note>
-   <simpara>
-    A <classname>MongoDB\Driver\Session</classname> can only be used with the
-    <classname>MongoDB\Driver\Manager</classname> from which it was created.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-          <entry>Default</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>causalConsistency</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Configure causal consistency in a session. If &true;, each operation
-            in the session will be causally ordered after the previous read or
-            write operation. Set to &false; to disable causal consistency.
-           </simpara>
-           <simpara>
-            See
-            <link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Causal Consistency</link>
-            in the MongoDB manual for more information.
-           </simpara>
-          </entry>
-          <entry>&true;</entry>
-         </row>
-         <row>
-          <entry>defaultTransactionOptions</entry>
-          <entry><type>array</type></entry>
-          <entry>
-           <simpara>
-            Default options to apply to newly created transactions. These
-            options are used unless they are overridden when a transaction is
-            started with different value for each option.
-           </simpara>
-           <para>
-            <table>
-             <title>options</title>
-             <tgroup cols="3">
-              <thead>
-               <row>
-                <entry>Option</entry>
-                <entry>Type</entry>
-                <entry>Description</entry>
-               </row>
-              </thead>
-              <tbody>
-               &mongodb.option.maxCommitTimeMS;
-               &mongodb.option.readConcern;
-               &mongodb.option.readPreference;
-               &mongodb.option.writeConcern;
-              </tbody>
-             </tgroup>
-            </table>
-           </para>
-           <simpara>
-            This option is available in MongoDB 4.0+.
-           </simpara>
-          </entry>
-          <entry><literal>[]</literal></entry>
-         </row>
-         <row>
-          <entry>snapshot</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Configure snapshot reads in a session. If &true;, a timestamp will
-            be obtained from the first supported read operation in the session
-            (i.e. <literal>find</literal>, <literal>aggregate</literal>, or
-            unsharded <literal>distinct</literal>). Subsequent read operations
-            within the session will then utilize a <literal>"snapshot"</literal>
-            read concern level to read majority-committed data from that
-            timestamp. Set to &false; to disable snapshot reads.
-           </simpara>
-           <simpara>
-            Snapshot reads require MongoDB 5.0+ and cannot be used with causal
-            consistency, transactions, or write operations. If
-            <literal>"snapshot"</literal> is &true;,
-            <literal>"causalConsistency"</literal> will default to &false;.
-           </simpara>
-           <simpara>
-            See
-            <link xlink:href="&url.mongodb.docs;reference/read-concern-snapshot/#read-concern-and-atclustertime">Read Concern "snapshot"</link>
-            in the MongoDB manual for more information.
-           </simpara>
-          </entry>
-          <entry>&false;</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\Driver\Session</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if the <literal>"causalConsistency"</literal> and <literal>"snapshot"</literal> options are both &true;.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the session could not be created (e.g. libmongoc does not support crypto).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.11.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"snapshot"</literal> option was added.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.6.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"maxCommitTimeMS"</literal> option was added to
-        <literal>"defaultTransactionOptions"</literal>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.5.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"defaultTransactionOptions"</literal> option was added.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Session</classname></member>
-   <member><link xlink:href="&url.mongodb.docs;core/read-isolation-consistency-recency/#causal-consistency">Causal Consistency</link> in the MongoDB manual</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/monitoring/commandfailedevent.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml
deleted file mode 100644
index 1e3326b445eb..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-commandfailedevent" role="class" 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\Monitoring\CommandFailedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\CommandFailedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandFailedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-commandfailedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname>
-    class encapsulates information about a failed command.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-commandfailedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.commandname">commandName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.databasename">databaseName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.duration">duration</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>Exception</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.error">error</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>object</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.reply">reply</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.operationid">operationId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.requestid">requestId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.serviceid">serviceId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandfailedevent.props.serverconnectionid">serverConnectionId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-commandfailedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandFailedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-commandfailedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.commandname">
-     <term><varname>commandName</varname></term>
-     <listitem>
-      <simpara>The command name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.databasename">
-     <term><varname>databaseName</varname></term>
-     <listitem>
-      <simpara>The database name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.duration">
-     <term><varname>duration</varname></term>
-     <listitem>
-      <simpara>
-       The duration of the command in microseconds. The duration is a
-       calculated value that includes the time to send the message and
-       receive the response from the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.error">
-     <term><varname>error</varname></term>
-     <listitem>
-      <simpara>The exception that was thrown when the command failed.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.reply">
-     <term><varname>reply</varname></term>
-     <listitem>
-      <simpara>The failure reply document returned by the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.operationid">
-     <term><varname>operationId</varname></term>
-     <listitem>
-      <simpara>
-       The operation ID. This may be used to link events together such as
-       bulk writes, which may dispatch multiple commands.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.requestid">
-     <term><varname>requestId</varname></term>
-     <listitem>
-      <simpara>
-       The request ID. This may be used to associate this
-       <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname>
-       with a corresponding
-       <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.serviceid">
-     <term><varname>serviceId</varname></term>
-     <listitem>
-      <simpara>
-       The service ID, or &null; if the server does not support it (i.e.
-       not using load-balanced mode).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandfailedevent.props.serverconnectionid">
-     <term><varname>serverConnectionId</varname></term>
-     <listitem>
-      <simpara>
-       The server connection ID, or &null; if not available.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties. The
-        <varname>duration</varname> property replaces the
-        <methodname>getDurationMicros</methodname> method.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.commandfailedevent;
-
-</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/mongodb/mongodb/driver/monitoring/commandfailedevent/getcommandname.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getcommandname.xml
deleted file mode 100644
index f9c39ca18990..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getcommandname.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getcommandname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getCommandName</refname>
-  <refpurpose>Returns the command name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getCommandName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the command name (e.g. <literal>"find"</literal>,
-   <literal>"aggregate"</literal>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandfailedevent/getdatabasename.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getdatabasename.xml
deleted file mode 100644
index 293006672ef2..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getdatabasename.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getdatabasename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getDatabaseName</refname>
-  <refpurpose>Returns the database on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getDatabaseName</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the database on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandfailedevent/getdurationmicros.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getdurationmicros.xml
deleted file mode 100644
index af7e3baadb3e..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getdurationmicros.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getdurationmicros" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getDurationMicros</refname>
-  <refpurpose>Returns the command's duration in microseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getDurationMicros</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The command's duration is a calculated value that includes the time to send
-   the message and receive the reply from the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's duration in microseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandfailedevent/geterror.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
deleted file mode 100644
index 8560a208a95f..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/geterror.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.geterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getError</refname>
-  <refpurpose>Returns the Exception associated with the failed command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Exception</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getError</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Exception</classname> associated with the failed command.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandfailedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/gethost.xml
deleted file mode 100644
index 9d4bc726e481..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getHost</refname>
-  <refpurpose>Returns the server hostname for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandfailedevent/getoperationid.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getoperationid.xml
deleted file mode 100644
index 857be002864d..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getoperationid.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getoperationid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getOperationId</refname>
-  <refpurpose>Returns the command's operation ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getOperationId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The operation ID is generated by the extension and may be used to link events
-   together such as bulk write operations, which may have been split across
-   several commands at the protocol level.
-  </simpara>
-  <note>
-   <simpara>
-    Since multiple commands may share the same operation ID, it is not reliable
-    to use this value to associate event objects with each other. The request ID
-    returned by
-    <methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getRequestId</methodname>
-    should be used instead.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's operation ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getOperationId</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getRequestId</methodname></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/monitoring/commandfailedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getport.xml
deleted file mode 100644
index c63d85d8b649..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getPort</refname>
-  <refpurpose>Returns the server port for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandfailedevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml
deleted file mode 100644
index feef33fc8d5e..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getreply.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getreply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getReply</refname>
-  <refpurpose>Returns the command reply document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getReply</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The reply document will be converted from BSON to PHP using the default
-   <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command reply document as a <classname>stdClass</classname>
-   object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongodb.tutorial.apm" /></member>
-   <member><xref linkend="mongodb.persistence"/></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/monitoring/commandfailedevent/getrequestid.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getrequestid.xml
deleted file mode 100644
index 34a51818629b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getrequestid.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getrequestid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getRequestId</refname>
-  <refpurpose>Returns the command's request ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getRequestId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The request ID is generated by the extension and may be used to associate
-   this <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname> with
-   a previous
-   <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's request ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</methodname></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/monitoring/commandfailedevent/getserver.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserver.xml
deleted file mode 100644
index 89cae4858f1e..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserver.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServer</refname>
-  <refpurpose>Returns the Server on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This method has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getHost</methodname>
-    and
-    <methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getPort</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.method-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServer</methodname></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/monitoring/commandfailedevent/getserverconnectionid.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserverconnectionid.xml
deleted file mode 100644
index 3716b26903f6..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserverconnectionid.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getserverconnectionid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServerConnectionId</refname>
-  <refpurpose>Returns the server connection ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServerConnectionId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the server connection ID for the command. The server connection ID is
-   distinct from server (i.e.
-   <function>MongoDB\Driver\Monitoring\CommandFailedEvent::getServer</function>)
-   and is returned in the "connectionId" field of a <literal>hello</literal>
-   command response MongoDB 4.2+.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server connection ID, or &null; if it is not available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandfailedevent/getserviceid.xml b/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserviceid.xml
deleted file mode 100644
index 7a9470ed781d..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandfailedevent/getserviceid.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandfailedevent.getserviceid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServiceId</refname>
-  <refpurpose>Returns the load balancer service ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServiceId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   When the driver is connected to a MongoDB cluster through a load balancer,
-   the service ID corresponds to the <literal>serviceId</literal> field in the
-   <literal>hello</literal> command response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the load balancer service ID, or &null; if the driver is not
-   connected to a load balancer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandstartedevent.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent.xml
deleted file mode 100644
index a424520acdf1..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-commandstartedevent" role="class" 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\Monitoring\CommandStartedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\CommandStartedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandStartedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-commandstartedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>
-    class encapsulates information about a started command.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-commandstartedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.commandname">commandName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.databasename">databaseName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>object</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.command">command</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.operationid">operationId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.requestid">requestId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.serviceid">serviceId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandstartedevent.props.serverconnectionid">serverConnectionId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-commandstartedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandStartedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-commandstartedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.commandname">
-     <term><varname>commandName</varname></term>
-     <listitem>
-      <simpara>The command name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.databasename">
-     <term><varname>databaseName</varname></term>
-     <listitem>
-      <simpara>The database name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.command">
-     <term><varname>command</varname></term>
-     <listitem>
-      <simpara>The command document.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.operationid">
-     <term><varname>operationId</varname></term>
-     <listitem>
-      <simpara>
-       The operation ID. This may be used to link events together such as
-       bulk writes, which may dispatch multiple commands.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.requestid">
-     <term><varname>requestId</varname></term>
-     <listitem>
-      <simpara>
-       The request ID. This may be used to associate this
-       <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>
-       with a corresponding
-       <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-       or
-       <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.serviceid">
-     <term><varname>serviceId</varname></term>
-     <listitem>
-      <simpara>
-       The service ID, or &null; if the server does not support it (i.e.
-       not using load-balanced mode).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandstartedevent.props.serverconnectionid">
-     <term><varname>serverConnectionId</varname></term>
-     <listitem>
-      <simpara>The server connection ID, or &null; if not available.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.commandstartedevent;
-
-</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/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml
deleted file mode 100644
index 256ce6d88690..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommand.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getcommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getCommand</refname>
-  <refpurpose>Returns the command document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getCommand</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The reply document will be converted from BSON to PHP using the default
-   <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command document as a <classname>stdClass</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongodb.tutorial.apm" /></member>
-   <member><xref linkend="mongodb.persistence"/></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/monitoring/commandstartedevent/getcommandname.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommandname.xml
deleted file mode 100644
index a7439155ec64..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getcommandname.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getcommandname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getCommandName</refname>
-  <refpurpose>Returns the command name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getCommandName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the command name (e.g. <literal>"find"</literal>,
-   <literal>"aggregate"</literal>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandstartedevent/getdatabasename.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getdatabasename.xml
deleted file mode 100644
index 891e2c4b5541..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getdatabasename.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getdatabasename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getDatabaseName</refname>
-  <refpurpose>Returns the database on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getDatabaseName</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the database on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandstartedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/gethost.xml
deleted file mode 100644
index 60b58fdbf8cc..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getHost</refname>
-  <refpurpose>Returns the server hostname for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandstartedevent/getoperationid.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getoperationid.xml
deleted file mode 100644
index 2af1a3c476d5..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getoperationid.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getoperationid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getOperationId</refname>
-  <refpurpose>Returns the command's operation ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getOperationId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The operation ID is generated by the extension and may be used to link events
-   together such as bulk write operations, which may have been split across
-   several commands at the protocol level.
-  </simpara>
-  <note>
-   <simpara>
-    Since multiple commands may share the same operation ID, it is not reliable
-    to use this value to associate event objects with each other. The request ID
-    returned by
-    <methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</methodname>
-    should be used instead.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's operation ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getOperationId</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getOperationId</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</methodname></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/monitoring/commandstartedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getport.xml
deleted file mode 100644
index a9304fa92a9c..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getPort</refname>
-  <refpurpose>Returns the server port for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandstartedevent/getrequestid.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getrequestid.xml
deleted file mode 100644
index 576aa56c0bec..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getrequestid.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getrequestid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</refname>
-  <refpurpose>Returns the command's request ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The request ID is generated by the extension and may be used to associate
-   this <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>
-   with a later
-   <classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname> or
-   <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's request ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getRequestId</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getRequestId</methodname></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/monitoring/commandstartedevent/getserver.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserver.xml
deleted file mode 100644
index 78e7d6e6dcf4..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserver.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServer</refname>
-  <refpurpose>Returns the Server on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This method has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getHost</methodname>
-    and
-    <methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getPort</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.method-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandFailedEvent::getServer</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServer</methodname></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/monitoring/commandstartedevent/getserverconnectionid.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserverconnectionid.xml
deleted file mode 100644
index b416b2b078d7..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserverconnectionid.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getserverconnectionid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServerConnectionId</refname>
-  <refpurpose>Returns the server connection ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServerConnectionId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the server connection ID for the command. The server connection ID is
-   distinct from server (i.e.
-   <function>MongoDB\Driver\Monitoring\CommandStartedEvent::getServer</function>)
-   and is returned in the "connectionId" field of a <literal>hello</literal>
-   command response MongoDB 4.2+.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server connection ID, or &null; if it is not available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandstartedevent/getserviceid.xml b/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserviceid.xml
deleted file mode 100644
index 7783cd334e05..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandstartedevent/getserviceid.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandstartedevent.getserviceid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServiceId</refname>
-  <refpurpose>Returns the load balancer service ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServiceId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   When the driver is connected to a MongoDB cluster through a load balancer,
-   the service ID corresponds to the <literal>serviceId</literal> field in the
-   <literal>hello</literal> command response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the load balancer service ID, or &null; if the driver is not
-   connected to a load balancer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandsubscriber.xml b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml
deleted file mode 100644
index 247e83aaaead..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-commandsubscriber" role="class" 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\Monitoring\CommandSubscriber interface</title>
- <titleabbrev>MongoDB\Driver\Monitoring\CommandSubscriber</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandSubscriber intro -->
-  <section xml:id="mongodb-driver-monitoring-commandsubscriber.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes may implement this interface to register an event subscriber that is
-    notified for each started, successful, and failed command event. See
-    <xref linkend="mongodb.tutorial.apm" /> for additional information.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-commandsubscriber.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\CommandSubscriber</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\CommandSubscriber</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-commandsubscriber')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
-   &reference.mongodb.mongodb.driver.monitoring.entities.commandsubscriber;
-
-</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/mongodb/mongodb/driver/monitoring/commandsubscriber/commandfailed.xml b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandfailed.xml
deleted file mode 100644
index d696c975e66d..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandfailed.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsubscriber.commandfailed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSubscriber::commandFailed</refname>
-  <refpurpose>Notification method for a failed command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\CommandSubscriber::commandFailed</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\CommandFailedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a command fails.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\CommandFailedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the failed command.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\CommandFailedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::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/monitoring/commandsubscriber/commandstarted.xml b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandstarted.xml
deleted file mode 100644
index 760b0df4d57e..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandstarted.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsubscriber.commandstarted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSubscriber::commandStarted</refname>
-  <refpurpose>Notification method for a started command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\CommandSubscriber::commandStarted</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\CommandStartedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a command is sent
-   to the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\CommandStartedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the started command.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::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/monitoring/commandsubscriber/commandsucceeded.xml b/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandsucceeded.xml
deleted file mode 100644
index 9b4de978f99c..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsubscriber/commandsucceeded.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsubscriber.commandsucceeded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSubscriber::commandSucceeded</refname>
-  <refpurpose>Notification method for a successful command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\CommandSubscriber::commandSucceeded</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\CommandSucceededEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a command
-   succeeds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\CommandSucceededEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the successful command.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::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/monitoring/commandsucceededevent.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent.xml
deleted file mode 100644
index 5ce7329c7ce3..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-commandsucceededevent" role="class" 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\Monitoring\CommandSucceededEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\CommandSucceededEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandSucceededEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-commandsucceededevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-    class encapsulates information about a successful command.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-commandsucceededevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.commandname">commandName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.databasename">databaseName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.duration">duration</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>object</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.reply">reply</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.operationid">operationId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.requestid">requestId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.serviceid">serviceId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-monitoring-commandsucceededevent.props.serverconnectionid">serverConnectionId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-commandsucceededevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\CommandSucceededEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-commandsucceededevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server that executed the command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.commandname">
-     <term><varname>commandName</varname></term>
-     <listitem>
-      <simpara>The command name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.databasename">
-     <term><varname>databaseName</varname></term>
-     <listitem>
-      <simpara>The database name.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.duration">
-     <term><varname>duration</varname></term>
-     <listitem>
-      <simpara>
-       The duration of the command in microseconds. The duration is a
-       calculated value that includes the time to send the message and
-       receive the response from the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.reply">
-     <term><varname>reply</varname></term>
-     <listitem>
-      <simpara>The reply document returned by the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.operationid">
-     <term><varname>operationId</varname></term>
-     <listitem>
-      <simpara>
-       The operation ID. This may be used to link events together such as
-       bulk writes, which may dispatch multiple commands.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.requestid">
-     <term><varname>requestId</varname></term>
-     <listitem>
-      <simpara>
-       The request ID. This may be used to associate this
-       <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-       with a corresponding
-       <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.serviceid">
-     <term><varname>serviceId</varname></term>
-     <listitem>
-      <simpara>
-       The service ID, or &null; if the server does not support it (i.e.
-       not using load-balanced mode).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-commandsucceededevent.props.serverconnectionid">
-     <term><varname>serverConnectionId</varname></term>
-     <listitem>
-      <simpara>The server connection ID, or &null; if not available.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties. The
-        <varname>duration</varname> property replaces the
-        <methodname>getDurationMicros</methodname> method.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.commandsucceededevent;
-
-</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/mongodb/mongodb/driver/monitoring/commandsucceededevent/getcommandname.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getcommandname.xml
deleted file mode 100644
index 871a3af3101f..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getcommandname.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getcommandname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getCommandName</refname>
-  <refpurpose>Returns the command name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getCommandName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the command name (e.g. <literal>"find"</literal>,
-   <literal>"aggregate"</literal>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandsucceededevent/getdatabasename.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getdatabasename.xml
deleted file mode 100644
index d69ea55db23b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getdatabasename.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getdatabasename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getDatabaseName</refname>
-  <refpurpose>Returns the database on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getDatabaseName</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the database on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandsucceededevent/getdurationmicros.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getdurationmicros.xml
deleted file mode 100644
index 6b7b88e76bf5..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getdurationmicros.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getdurationmicros" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getDurationMicros</refname>
-  <refpurpose>Returns the command's duration in microseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getDurationMicros</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The command's duration is a calculated value that includes the time to send
-   the message and receive the reply from the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's duration in microseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <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/monitoring/commandsucceededevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/gethost.xml
deleted file mode 100644
index 07662125ac3b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getHost</refname>
-  <refpurpose>Returns the server hostname for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandsucceededevent/getoperationid.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getoperationid.xml
deleted file mode 100644
index 76114e14d7af..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getoperationid.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getoperationid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getOperationId</refname>
-  <refpurpose>Returns the command's operation ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getOperationId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The operation ID is generated by the extension and may be used to link events
-   together such as bulk write operations, which may have been split across
-   several commands at the protocol level.
-  </simpara>
-  <note>
-   <simpara>
-    Since multiple commands may share the same operation ID, it is not reliable
-    to use this value to associate event objects with each other. The request ID
-    returned by
-    <methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getRequestId</methodname>
-    should be used instead.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's operation ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getOperationId</methodname></member>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getRequestId</methodname></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/monitoring/commandsucceededevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getport.xml
deleted file mode 100644
index 179a2a679708..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getPort</refname>
-  <refpurpose>Returns the server port for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port of the server on which the command was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandsucceededevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml
deleted file mode 100644
index 471ade691e00..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getreply.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getreply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getReply</refname>
-  <refpurpose>Returns the command reply document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getReply</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The reply document will be converted from BSON to PHP using the default
-   <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command reply document as a <classname>stdClass</classname>
-   object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongodb.tutorial.apm" /></member>
-   <member><xref linkend="mongodb.persistence"/></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/monitoring/commandsucceededevent/getrequestid.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getrequestid.xml
deleted file mode 100644
index 5f4e0cdaeaab..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getrequestid.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getrequestid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getRequestId</refname>
-  <refpurpose>Returns the command's request ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getRequestId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The request ID is generated by the extension and may be used to associate
-   this <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-   with a previous
-   <classname>MongoDB\Driver\Monitoring\CommandStartedEvent</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the command's request ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getRequestId</methodname></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/monitoring/commandsucceededevent/getserver.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserver.xml
deleted file mode 100644
index 9ae678dec59f..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserver.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServer</refname>
-  <refpurpose>Returns the Server on which the command was executed</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This method has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getHost</methodname>
-    and
-    <methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getPort</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> on which the command
-   was executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.method-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Monitoring\CommandStartedEvent::getServer</methodname></member>
-   <member><methodname>MongoDB\Driver\Cursor::getServer</methodname></member>
-   <member><methodname>MongoDB\Driver\WriteResult::getServer</methodname></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/monitoring/commandsucceededevent/getserverconnectionid.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserverconnectionid.xml
deleted file mode 100644
index b7bd4005f9b7..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserverconnectionid.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getserverconnectionid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServerConnectionId</refname>
-  <refpurpose>Returns the server connection ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServerConnectionId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the server connection ID for the command. The server connection ID is
-   distinct from server (i.e.
-   <function>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServer</function>)
-   and is returned in the "connectionId" field of a <literal>hello</literal>
-   command response MongoDB 4.2+.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server connection ID, or &null; if it is not available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/commandsucceededevent/getserviceid.xml b/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserviceid.xml
deleted file mode 100644
index 89cd897bf46b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/commandsucceededevent/getserviceid.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-commandsucceededevent.getserviceid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServiceId</refname>
-  <refpurpose>Returns the load balancer service ID for the command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\ObjectId</type><type>null</type></type><methodname>MongoDB\Driver\Monitoring\CommandSucceededEvent::getServiceId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   When the driver is connected to a MongoDB cluster through a load balancer,
-   the service ID corresponds to the <literal>serviceId</literal> field in the
-   <literal>hello</literal> command response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the load balancer service ID, or &null; if the driver is not
-   connected to a load balancer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/logsubscriber.xml b/reference/mongodb/mongodb/driver/monitoring/logsubscriber.xml
deleted file mode 100644
index 9d22b8026a61..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/logsubscriber.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-logsubscriber" role="class" 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\Monitoring\LogSubscriber interface</title>
- <titleabbrev>MongoDB\Driver\Monitoring\LogSubscriber</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\LogSubscriber intro -->
-  <section xml:id="mongodb-driver-monitoring-logsubscriber.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes implementing this interface may be registered as a subscriber and
-    receive log messages from the extension. This is similar to stream-based
-    debug logging (i.e. <link linkend="ini.mongodb.debug">mongodb.debug</link>)
-    except that trace-level log messages are <emphasis>not</emphasis> received.
-   </simpara>
-   <simpara>
-    As with stream-based logging, it is only possible to register a logger
-    globally using <function>MongoDB\Driver\Monitoring\addSubscriber</function>.
-    The extension is not able to distinguish log messages for individual
-    <classname>MongoDB\Driver\Manager</classname> objects.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-logsubscriber.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\LogSubscriber</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\LogSubscriber</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-error">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_ERROR</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-critical">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_CRITICAL</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-warning">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_WARNING</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-message">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_MESSAGE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-info">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_INFO</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-logsubscriber.constants.level-debug">MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_DEBUG</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-logsubscriber')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\BSON\Binary constants -->
-  <section xml:id="mongodb-driver-monitoring-logsubscriber.constants">
-   &reftitle.constants;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-error">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_ERROR</constant></term>
-     <listitem>
-      <simpara>
-       Error log level. An error condition that the extension is unable to report
-       through its API. This is the most severe log level in the extension.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-critical">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_CRITICAL</constant></term>
-     <listitem>
-      <simpara>
-       Critical log level. An error condition with slightly less severity. This
-       constant exists for consistency with libmongoc; however, the extension is
-       unlikely to use it in practice.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-warning">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_WARNING</constant></term>
-     <listitem>
-      <simpara>
-       Warning log level. Indicates a situation where undesirable application
-       behavior may occur.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-message">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_MESSAGE</constant></term>
-     <listitem>
-      <simpara>
-       Message or notice log level. Indicates an event that is unusual but not
-       problematic.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-info">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_INFO</constant></term>
-     <listitem>
-      <simpara>
-       Info log level. High-level information about normal driver behavior.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-monitoring-logsubscriber.constants.level-debug">
-     <term><constant>MongoDB\Driver\Monitoring\LogSubscriber::LEVEL_DEBUG</constant></term>
-     <listitem>
-      <simpara>
-       Debug log level. Detailed information that may be helpful when debugging
-       an application.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
- </partintro>
-
-   &reference.mongodb.mongodb.driver.monitoring.entities.logsubscriber;
-
-</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/mongodb/mongodb/driver/monitoring/logsubscriber/log.xml b/reference/mongodb/mongodb/driver/monitoring/logsubscriber/log.xml
deleted file mode 100644
index db50276f5388..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/logsubscriber/log.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-logsubscriber.log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\LogSubscriber::log</refname>
-  <refpurpose>Notification method for a log message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\LogSubscriber::log</methodname>
-   <methodparam><type>int</type><parameter>level</parameter></methodparam>
-   <methodparam><type>string</type><parameter>domain</parameter></methodparam>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called for each logged
-   message.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>level</parameter></term>
-    <listitem>
-     <simpara>
-      The severity level. This will be one of the
-      <link linkend="mongodb-driver-monitoring-logsubscriber.constants">interface constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>domain</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the driver component that emitted the log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml
deleted file mode 100644
index 4ee5df7074cf..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-sdamsubscriber" role="class" 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\Monitoring\SDAMSubscriber interface</title>
- <titleabbrev>MongoDB\Driver\Monitoring\SDAMSubscriber</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\SDAMSubscriber intro -->
-  <section xml:id="mongodb-driver-monitoring-sdamsubscriber.intro">
-   &reftitle.intro;
-   <simpara>
-    Classes may implement this interface to register an event subscriber that is
-    notified for various SDAM events. See the
-    <link xlink:href="&url.mongodb.sdam;">Server Discovery and Monitoring</link>
-    and <link xlink:href="&url.mongodb.sdam-monitoring;">SDAM Monitoring</link>
-    specifications for additional information.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-sdamsubscriber.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\SDAMSubscriber</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\SDAMSubscriber</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\Driver\Monitoring\Subscriber</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-sdamsubscriber')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      &mongodb.changelog.tentative-return-types-enforced;
-      &mongodb.changelog.tentative-return-types;
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
-   &reference.mongodb.mongodb.driver.monitoring.entities.sdamsubscriber;
-
-</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverchanged.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverchanged.xml
deleted file mode 100644
index 3947d17d2821..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverchanged.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serverchanged" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverChanged</refname>
-  <refpurpose>Notification method for a server description change</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverChanged</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerChangedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a server's
-   description changes. For example, a server's type changing from secondary to
-   primary would cause its server description to change.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerChangedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the changed server
-      description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerChangedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverclosed.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverclosed.xml
deleted file mode 100644
index 484ea6d6d04a..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverclosed.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serverclosed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverClosed</refname>
-  <refpurpose>Notification method for closing a server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverClosed</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerClosedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when an existing
-   server is removed from the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerClosedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the closed server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerClosedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatfailed.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatfailed.xml
deleted file mode 100644
index f5140adee706..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatfailed.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serverheartbeatfailed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatFailed</refname>
-  <refpurpose>Notification method for a failed server heartbeat</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatFailed</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a server
-   heartbeat (i.e.
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command issued through
-   <link xlink:href="&url.mongodb.sdam;">server monitoring</link>) fails.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the failed server
-      heartbeat.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatstarted.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatstarted.xml
deleted file mode 100644
index 52d272a80502..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatstarted.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serverheartbeatstarted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatStarted</refname>
-  <refpurpose>Notification method for a started server heartbeat</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatStarted</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a server
-   heartbeat (i.e.
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command issued through
-   <link xlink:href="&url.mongodb.sdam;">server monitoring</link>) is sent to
-   the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the started server
-      heartbeat.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatsucceeded.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatsucceeded.xml
deleted file mode 100644
index a35f31cb30e1..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serverheartbeatsucceeded.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serverheartbeatsucceeded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatSucceeded</refname>
-  <refpurpose>Notification method for a successful server heartbeat</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverHeartbeatSucceeded</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a server
-   heartbeat (i.e.
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command issued through
-   <link xlink:href="&url.mongodb.sdam;">server monitoring</link>) succeeds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the successful server
-      heartbeat.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/serveropening.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serveropening.xml
deleted file mode 100644
index f9ed3ec56b4f..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/serveropening.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.serveropening" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverOpening</refname>
-  <refpurpose>Notification method for opening a server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::serverOpening</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\ServerOpeningEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when a new server is
-   added to the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\ServerOpeningEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the opened server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\ServerOpeningEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologychanged.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologychanged.xml
deleted file mode 100644
index 7bb232574a4b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologychanged.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.topologychanged" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyChanged</refname>
-  <refpurpose>Notification method for a topology description change</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyChanged</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\TopologyChangedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when the topology's
-   description changes. For example, a topology discovering a new replica set
-   primary would cause its topology description to change.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\TopologyChangedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the changed topology
-      description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\TopologyChangedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyclosed.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyclosed.xml
deleted file mode 100644
index fff086106bfe..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyclosed.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.topologyclosed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyClosed</refname>
-  <refpurpose>Notification method for closing the topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyClosed</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\TopologyClosedEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when the topology is
-   closed.
-  </simpara>
-  <note>
-   <simpara>
-    Due to the driver's
-    <link linkend="mongodb.connection-handling">connection handling and persistence</link>
-    behavior, this event can only be observed when a
-    <classname>MongoDB\Driver\Manager</classname> is created with the
-    <literal>"disableClientPersistence"</literal> driver option and freed before
-    request shutdown (RSHUTDOWN).
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\TopologyClosedEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the closed topology.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\TopologyClosedEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyopening.xml b/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyopening.xml
deleted file mode 100644
index 7545681215eb..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/sdamsubscriber/topologyopening.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-sdamsubscriber.topologyopening" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyOpening</refname>
-  <refpurpose>Notification method for opening the topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Monitoring\SDAMSubscriber::topologyOpening</methodname>
-   <methodparam><type>MongoDB\Driver\Monitoring\TopologyOpeningEvent</type><parameter>event</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If the subscriber is registered, this method is called when the topology is
-   opened.
-  </simpara>
-  <note>
-   <simpara>
-    Due to the driver's
-    <link linkend="mongodb.connection-handling">connection handling and persistence</link>
-    behavior, this event may not be observed if a
-    <classname>MongoDB\Driver\Manager</classname> uses a previously persisted
-    <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> client.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter> (<type>MongoDB\Driver\Monitoring\TopologyOpeningEvent</type>)</term>
-    <listitem>
-     <simpara>
-      An event object encapsulating information about the opened topology.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Monitoring\TopologyOpeningEvent</classname></member>
-   <member><function>MongoDB\Driver\Monitoring\addSubscriber</function></member>
-   <member><function>MongoDB\Driver\Manager::addSubscriber</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/mongodb/mongodb/driver/monitoring/serverchangedevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent.xml
deleted file mode 100644
index 1f82160a8f36..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serverchangedevent" role="class" 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\Monitoring\ServerChangedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerChangedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerChangedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serverchangedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerChangedEvent</classname>
-    class encapsulates information about a changed server description. For
-    example, a server's type changing from secondary to primary would cause its
-    server description to change.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serverchangedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerChangedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerChangedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serverchangedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverchangedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-serverchangedevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\ServerDescription</type>
-     <varname linkend="mongodb-driver-monitoring-serverchangedevent.props.newdescription">newDescription</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\ServerDescription</type>
-     <varname linkend="mongodb-driver-monitoring-serverchangedevent.props.previousdescription">previousDescription</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serverchangedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerChangedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serverchangedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverchangedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverchangedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverchangedevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverchangedevent.props.newdescription">
-     <term><varname>newDescription</varname></term>
-     <listitem>
-      <simpara>The new server description.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverchangedevent.props.previousdescription">
-     <term><varname>previousDescription</varname></term>
-     <listitem>
-      <simpara>The previous server description.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serverchangedevent;
-
-</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/mongodb/mongodb/driver/monitoring/serverchangedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/gethost.xml
deleted file mode 100644
index 534a79d9efac..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverchangedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerChangedEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerChangedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverchangedevent/getnewdescription.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getnewdescription.xml
deleted file mode 100644
index 0e7fa1676e49..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getnewdescription.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverchangedevent.getnewdescription" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerChangedEvent::getNewDescription</refname>
-  <refpurpose>Returns the new description for the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ServerDescription</type><methodname>MongoDB\Driver\Monitoring\ServerChangedEvent::getNewDescription</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the new <classname>MongoDB\Driver\ServerDescription</classname>
-   for the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverchangedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getport.xml
deleted file mode 100644
index c3a28ead8f55..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverchangedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerChangedEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerChangedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverchangedevent/getpreviousdescription.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getpreviousdescription.xml
deleted file mode 100644
index d94579eb0955..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/getpreviousdescription.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverchangedevent.getpreviousdescription" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerChangedEvent::getPreviousDescription</refname>
-  <refpurpose>Returns the previous description for the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ServerDescription</type><methodname>MongoDB\Driver\Monitoring\ServerChangedEvent::getPreviousDescription</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the previous <classname>MongoDB\Driver\ServerDescription</classname>
-   for the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverchangedevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/gettopologyid.xml
deleted file mode 100644
index fb0a3b7c3f7d..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverchangedevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverchangedevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerChangedEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID associated with this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\ServerChangedEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverclosedevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverclosedevent.xml
deleted file mode 100644
index 6fd48ae69b28..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverclosedevent.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serverclosedevent" role="class" 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\Monitoring\ServerClosedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerClosedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerClosedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serverclosedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerClosedEvent</classname>
-    class encapsulates information about a closed server. This corresponds to an
-    existing server being removed from the topology.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serverclosedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerClosedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerClosedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serverclosedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverclosedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-serverclosedevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serverclosedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerClosedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serverclosedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverclosedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverclosedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverclosedevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serverclosedevent;
-
-</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/mongodb/mongodb/driver/monitoring/serverclosedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/gethost.xml
deleted file mode 100644
index bfd5bd570df4..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverclosedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerClosedEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerClosedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverclosedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/getport.xml
deleted file mode 100644
index 8d4aa9b6b4a8..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverclosedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerClosedEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerClosedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverclosedevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/gettopologyid.xml
deleted file mode 100644
index abb1d4baaf0b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverclosedevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverclosedevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerClosedEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID associated with this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\ServerClosedEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatfailedevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml
deleted file mode 100644
index 26c41fdc94e6..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serverheartbeatfailedevent" role="class" 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\Monitoring\ServerHeartbeatFailedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</classname>
-    class encapsulates information about a failed server heartbeat (i.e.
-    <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-    command issued through
-    <link xlink:href="&url.mongodb.sdam;">server monitoring</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>bool</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.awaited">awaited</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.duration">duration</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>Exception</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatfailedevent.props.error">error</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serverheartbeatfailedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props.awaited">
-     <term><varname>awaited</varname></term>
-     <listitem>
-      <simpara>
-       Whether the heartbeat used a streaming protocol. The extension does
-       not use the streaming protocol for monitoring, so this method will always
-       return &false;.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props.duration">
-     <term><varname>duration</varname></term>
-     <listitem>
-      <simpara>
-       The duration of the heartbeat in microseconds. The duration is a
-       calculated value that includes the time to send the message and
-       receive the response from the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.props.error">
-     <term><varname>error</varname></term>
-     <listitem>
-      <simpara>The exception that was thrown when the heartbeat failed.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties. The
-        <varname>duration</varname> property replaces the
-        <methodname>getDurationMicros</methodname> method.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serverheartbeatfailedevent;
-
-</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/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/getdurationmicros.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/getdurationmicros.xml
deleted file mode 100644
index 3aed3ed9a641..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/getdurationmicros.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.getdurationmicros" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getDurationMicros</refname>
-  <refpurpose>Returns the heartbeat's duration in microseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getDurationMicros</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The heartbeat's duration is a calculated value that includes the time to send
-   the message and receive the reply from the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the heartbeat's duration in microseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatfailedevent/geterror.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
deleted file mode 100644
index c32abbb6cec5..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/geterror.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.geterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getError</refname>
-  <refpurpose>Returns the Exception associated with the failed heartbeat</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Exception</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getError</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Exception</classname> associated with the failed
-   heartbeat.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatfailedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/gethost.xml
deleted file mode 100644
index 8ce4e79740e7..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/gethost.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatfailedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/getport.xml
deleted file mode 100644
index fe712d6e631a..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/getport.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatfailedevent/isawaited.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/isawaited.xml
deleted file mode 100644
index 7ea0c94f2bf2..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatfailedevent/isawaited.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatfailedevent.isawaited" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::isAwaited</refname>
-  <refpurpose>Returns whether the heartbeat used a streaming protocol</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent::isAwaited</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether the heartbeat used a streaming protocol. The extension does
-   not use the streaming protocol for monitoring, so this method will always
-   return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatstartedevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent.xml
deleted file mode 100644
index 7e9c4a920a1b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serverheartbeatstartedevent" role="class" 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\Monitoring\ServerHeartbeatStartedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</classname>
-    class encapsulates information about a started server heartbeat (i.e.
-    <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-    command issued through
-    <link xlink:href="&url.mongodb.sdam;">server monitoring</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatstartedevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatstartedevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>bool</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatstartedevent.props.awaited">awaited</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serverheartbeatstartedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.props.awaited">
-     <term><varname>awaited</varname></term>
-     <listitem>
-      <simpara>
-       Whether the heartbeat used a streaming protocol. The extension does
-       not use the streaming protocol for monitoring, so this method will always
-       return &false;.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serverheartbeatstartedevent;
-
-</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/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/gethost.xml
deleted file mode 100644
index b2826ecb5cae..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatstartedevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/getport.xml
deleted file mode 100644
index b8e70233812d..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatstartedevent/isawaited.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/isawaited.xml
deleted file mode 100644
index 5218841a3c73..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatstartedevent/isawaited.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatstartedevent.isawaited" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::isAwaited</refname>
-  <refpurpose>Returns whether the heartbeat used a streaming protocol</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent::isAwaited</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether the heartbeat used a streaming protocol. The extension does
-   not use the streaming protocol for monitoring, so this method will always
-   return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatsucceededevent.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent.xml
deleted file mode 100644
index 354c0344b589..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serverheartbeatsucceededevent" role="class" 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\Monitoring\ServerHeartbeatSucceededEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</classname>
-    class encapsulates information about a successful server heartbeat (i.e.
-    <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-    command issued through
-    <link xlink:href="&url.mongodb.sdam;">server monitoring</link>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>bool</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.awaited">awaited</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.duration">duration</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>object</type>
-     <varname linkend="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.reply">reply</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serverheartbeatsucceededevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.awaited">
-     <term><varname>awaited</varname></term>
-     <listitem>
-      <simpara>
-       Whether the heartbeat used a streaming protocol. The extension does
-       not use the streaming protocol for monitoring, so this method will always
-       return &false;.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.duration">
-     <term><varname>duration</varname></term>
-     <listitem>
-      <simpara>
-       The duration of the heartbeat in microseconds. The duration is a
-       calculated value that includes the time to send the message and
-       receive the response from the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.props.reply">
-     <term><varname>reply</varname></term>
-     <listitem>
-      <simpara>The reply document returned by the server.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties. The
-        <varname>duration</varname> property replaces the
-        <methodname>getDurationMicros</methodname> method.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serverheartbeatsucceededevent;
-
-</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/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getdurationmicros.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getdurationmicros.xml
deleted file mode 100644
index 9e727a9d69eb..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getdurationmicros.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.getdurationmicros" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getDurationMicros</refname>
-  <refpurpose>Returns the heartbeat's duration in microseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getDurationMicros</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The heartbeat's duration is a calculated value that includes the time to send
-   the message and receive the reply from the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the heartbeat's duration in microseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatsucceededevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/gethost.xml
deleted file mode 100644
index b34941ec53c0..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatsucceededevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getport.xml
deleted file mode 100644
index 5295ef5f075f..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serverheartbeatsucceededevent/getreply.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml
deleted file mode 100644
index ec7a7800a0d3..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/getreply.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.getreply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getReply</refname>
-  <refpurpose>Returns the heartbeat reply document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::getReply</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The reply document will be converted from BSON to PHP using the default
-   <link linkend="mongodb.persistence.deserialization">deserialization</link>
-   rules (e.g. BSON documents will be converted to <type>stdClass</type>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the heartbeat reply document as a <classname>stdClass</classname>
-   object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><xref linkend="mongodb.tutorial.apm" /></member>
-   <member><xref linkend="mongodb.persistence"/></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/monitoring/serverheartbeatsucceededevent/isawaited.xml b/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/isawaited.xml
deleted file mode 100644
index 7c313ee9c5b0..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serverheartbeatsucceededevent/isawaited.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serverheartbeatsucceededevent.isawaited" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::isAwaited</refname>
-  <refpurpose>Returns whether the heartbeat used a streaming protocol</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent::isAwaited</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether the heartbeat used a streaming protocol. The extension does
-   not use the streaming protocol for monitoring, so this method will always
-   return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serveropeningevent.xml b/reference/mongodb/mongodb/driver/monitoring/serveropeningevent.xml
deleted file mode 100644
index bb7d68d91bc1..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serveropeningevent.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-serveropeningevent" role="class" 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\Monitoring\ServerOpeningEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\ServerOpeningEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerOpeningEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-serveropeningevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\ServerOpeningEvent</classname>
-    class encapsulates information about an opened server. This corresponds to a
-    new server being added to the topology.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-serveropeningevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\ServerOpeningEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\ServerOpeningEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-monitoring-serveropeningevent.props.host">host</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-monitoring-serveropeningevent.props.port">port</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-serveropeningevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-serveropeningevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\ServerOpeningEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-serveropeningevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-serveropeningevent.props.host">
-     <term><varname>host</varname></term>
-     <listitem>
-      <simpara>The hostname of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serveropeningevent.props.port">
-     <term><varname>port</varname></term>
-     <listitem>
-      <simpara>The port of the server.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-serveropeningevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.serveropeningevent;
-
-</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/mongodb/mongodb/driver/monitoring/serveropeningevent/gethost.xml b/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/gethost.xml
deleted file mode 100644
index c3b6232259cc..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/gethost.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serveropeningevent.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getHost</refname>
-  <refpurpose>Returns the hostname of the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getHost</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serveropeningevent/getport.xml b/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/getport.xml
deleted file mode 100644
index f35623293c3b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/getport.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serveropeningevent.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getPort</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/serveropeningevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/gettopologyid.xml
deleted file mode 100644
index 5e2014b92227..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/serveropeningevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-serveropeningevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID associated with this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\ServerOpeningEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/subscriber.xml b/reference/mongodb/mongodb/driver/monitoring/subscriber.xml
deleted file mode 100644
index 74fa3d877223..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/subscriber.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-subscriber" role="class" 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\Monitoring\Subscriber interface</title>
- <titleabbrev>MongoDB\Driver\Monitoring\Subscriber</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\Subscriber intro -->
-  <section xml:id="mongodb-driver-monitoring-subscriber.intro">
-   &reftitle.intro;
-   <simpara>
-    Base interface for event subscribers. This is used as a parameter type in the functions
-    <function>MongoDB\Driver\Monitoring\addSubscriber</function> and
-    <function>MongoDB\Driver\Monitoring\removeSubscriber</function> and should
-    not be implemented directly.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-subscriber.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\Subscriber</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\Subscriber</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-   <simpara>
-    This interface has no methods. Its only purpose is to be the base interface
-    for all event subscribers.
-   </simpara>
-
-  </section>
-
- </partintro>
-
-</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/mongodb/mongodb/driver/monitoring/topologychangedevent.xml b/reference/mongodb/mongodb/driver/monitoring/topologychangedevent.xml
deleted file mode 100644
index 2000a13ff817..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologychangedevent.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-topologychangedevent" role="class" 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\Monitoring\TopologyChangedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\TopologyChangedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyChangedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-topologychangedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\TopologyChangedEvent</classname>
-    class encapsulates information about a changed topology description. For
-    example, a topology discovering a new replica set primary would cause its
-    topology description to change.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-topologychangedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\TopologyChangedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\TopologyChangedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-topologychangedevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\TopologyDescription</type>
-     <varname linkend="mongodb-driver-monitoring-topologychangedevent.props.newdescription">newDescription</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\TopologyDescription</type>
-     <varname linkend="mongodb-driver-monitoring-topologychangedevent.props.previousdescription">previousDescription</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-topologychangedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyChangedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-topologychangedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-topologychangedevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-topologychangedevent.props.newdescription">
-     <term><varname>newDescription</varname></term>
-     <listitem>
-      <simpara>The new topology description.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-monitoring-topologychangedevent.props.previousdescription">
-     <term><varname>previousDescription</varname></term>
-     <listitem>
-      <simpara>The previous topology description.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.topologychangedevent;
-
-</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/mongodb/mongodb/driver/monitoring/topologychangedevent/getnewdescription.xml b/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/getnewdescription.xml
deleted file mode 100644
index 17bddbe314d1..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/getnewdescription.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-topologychangedevent.getnewdescription" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getNewDescription</refname>
-  <refpurpose>Returns the new description for the topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\TopologyDescription</type><methodname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getNewDescription</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the new <classname>MongoDB\Driver\TopologyDescription</classname>
-   for the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/topologychangedevent/getpreviousdescription.xml b/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/getpreviousdescription.xml
deleted file mode 100644
index b0f822499102..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/getpreviousdescription.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-topologychangedevent.getpreviousdescription" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getPreviousDescription</refname>
-  <refpurpose>Returns the previous description for the topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\TopologyDescription</type><methodname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getPreviousDescription</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the previous <classname>MongoDB\Driver\TopologyDescription</classname>
-   for the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/topologychangedevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/gettopologyid.xml
deleted file mode 100644
index 2e3900424bd2..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologychangedevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-topologychangedevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\TopologyChangedEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/topologyclosedevent.xml b/reference/mongodb/mongodb/driver/monitoring/topologyclosedevent.xml
deleted file mode 100644
index 2d0f0c780c7b..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologyclosedevent.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-topologyclosedevent" role="class" 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\Monitoring\TopologyClosedEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\TopologyClosedEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyClosedEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-topologyclosedevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\TopologyClosedEvent</classname>
-    class encapsulates information about a closed topology.
-   </simpara>
-   <note>
-    <simpara>
-     Due to the driver's
-     <link linkend="mongodb.connection-handling">connection handling and persistence</link>
-     behavior, this event can only be observed when a
-     <classname>MongoDB\Driver\Manager</classname> is created with the
-     <literal>"disableClientPersistence"</literal> driver option and freed
-     before request shutdown (RSHUTDOWN).
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-topologyclosedevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\TopologyClosedEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\TopologyClosedEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-topologyclosedevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-topologyclosedevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyClosedEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-topologyclosedevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-topologyclosedevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.topologyclosedevent;
-
-</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/mongodb/mongodb/driver/monitoring/topologyclosedevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/topologyclosedevent/gettopologyid.xml
deleted file mode 100644
index ccb02bb53447..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologyclosedevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-topologyclosedevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\TopologyClosedEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\TopologyClosedEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/monitoring/topologyopeningevent.xml b/reference/mongodb/mongodb/driver/monitoring/topologyopeningevent.xml
deleted file mode 100644
index 276f2e3f7056..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologyopeningevent.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-monitoring-topologyopeningevent" role="class" 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\Monitoring\TopologyOpeningEvent class</title>
- <titleabbrev>MongoDB\Driver\Monitoring\TopologyOpeningEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyOpeningEvent intro -->
-  <section xml:id="mongodb-driver-monitoring-topologyopeningevent.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Monitoring\TopologyOpeningEvent</classname>
-    class encapsulates information about an opened topology.
-   </simpara>
-   <note>
-    <simpara>
-     Due to the driver's
-     <link linkend="mongodb.connection-handling">connection handling and persistence</link>
-     behavior, this event may not be observed if a
-     <classname>MongoDB\Driver\Manager</classname> uses a previously persisted
-     <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link> client.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-monitoring-topologyopeningevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Monitoring\TopologyOpeningEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Monitoring\TopologyOpeningEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\BSON\ObjectId</type>
-     <varname linkend="mongodb-driver-monitoring-topologyopeningevent.props.topologyid">topologyId</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-monitoring-topologyopeningevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Monitoring\TopologyOpeningEvent properties -->
-  <section xml:id="mongodb-driver-monitoring-topologyopeningevent.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-monitoring-topologyopeningevent.props.topologyid">
-     <term><varname>topologyId</varname></term>
-     <listitem>
-      <simpara>The topology ID.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.monitoring.entities.topologyopeningevent;
-
-</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/mongodb/mongodb/driver/monitoring/topologyopeningevent/gettopologyid.xml b/reference/mongodb/mongodb/driver/monitoring/topologyopeningevent/gettopologyid.xml
deleted file mode 100644
index e59a82c4fc54..000000000000
--- a/reference/mongodb/mongodb/driver/monitoring/topologyopeningevent/gettopologyid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-monitoring-topologyopeningevent.gettopologyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Monitoring\TopologyOpeningEvent::getTopologyId</refname>
-  <refpurpose>Returns the topology ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\BSON\ObjectId</type><methodname>MongoDB\Driver\Monitoring\TopologyOpeningEvent::getTopologyId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the topology ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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.xml b/reference/mongodb/mongodb/driver/query.xml
deleted file mode 100644
index 16dcbc0278bb..000000000000
--- a/reference/mongodb/mongodb/driver/query.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-query" role="class" 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\Query class</title>
- <titleabbrev>MongoDB\Driver\Query</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Query intro -->
-  <section xml:id="mongodb-driver-query.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Query</classname> class is a value object that
-    represents a database query.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-query.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Query</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Query</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-query')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.query;
-
-</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/mongodb/mongodb/driver/query/construct.xml b/reference/mongodb/mongodb/driver/query/construct.xml
deleted file mode 100644
index c49a9274fd77..000000000000
--- a/reference/mongodb/mongodb/driver/query/construct.xml
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-query.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Query::__construct</refname>
-  <refpurpose>Create a new Query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\Query::__construct</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>filter</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>queryOptions</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\Query</classname>, which is an
-   immutable value object that represents a database query. The query may then
-   be executed with
-   <methodname>MongoDB\Driver\Manager::executeQuery</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.filter;
-   <varlistentry>
-    <term><parameter>queryOptions</parameter></term>
-    <listitem>
-     <para>
-      <table xml:id="mongodb-driver-query.construct-queryOptions">
-       <title>queryOptions</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>allowDiskUse</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Allows MongoDB to use temporary disk files to store data exceeding
-            the 100 megabyte system memory limit while processing a blocking
-            sort operation.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>allowPartialResults</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            For queries against a sharded collection, returns partial results
-            from the mongos if some shards are unavailable instead of throwing
-            an error.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"partial"</literal> option if
-            not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>awaitData</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           Use in conjunction with the <literal>"tailable"</literal> option to
-           block a getMore operation on the cursor temporarily if at the end of
-           data rather than returning no data. After a timeout period, the query
-           returns as normal.
-          </entry>
-         </row>
-         <row>
-          <entry>batchSize</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The number of documents to return in the first batch. Defaults to
-            101. A batch size of 0 means that the cursor will be established,
-            but no documents will be returned in the first batch.
-           </simpara>
-           <simpara>
-            In versions of MongoDB before 3.2, where queries use the legacy wire
-            protocol OP_QUERY, a batch size of 1 will close the cursor
-            irrespective of the number of matched documents.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.collation;
-         <row>
-          <entry>comment</entry>
-          <entry><type>mixed</type></entry>
-          <entry>
-           <simpara>
-            An arbitrary comment to help trace the operation through the
-            database profiler, currentOp output, and logs.
-           </simpara>
-           <simpara>
-            The comment can be any valid BSON type for MongoDB 4.4+. Earlier
-            server versions only support string values.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$comment"</literal> modifier
-            if not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>exhaust</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Stream the data down full blast in multiple "more" packages, on the
-            assumption that the client will fully read all data queried. Faster
-            when you are pulling a lot of data and know you want to pull it all
-            down. Note: the client is not allowed to not read all the data
-            unless it closes the connection.
-           </simpara>
-           <simpara>
-            This option is not supported by the find command in MongoDB 3.2+ and
-            will force the driver to use the legacy wire protocol version (i.e.
-            OP_QUERY).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>explain</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, the returned <classname>MongoDB\Driver\Cursor</classname>
-            will contain a single document that describes the process and
-            indexes used to return the query.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$explain"</literal> modifier
-            if not specified.
-           </simpara>
-           <simpara>
-            This option is not supported by the find command in MongoDB 3.2+ and
-            will only be respected when using the legacy wire protocol version
-            (i.e. OP_QUERY). The
-            <link xlink:href="&url.mongodb.docs;reference/command/explain/">explain</link>
-            command should be used on MongoDB 3.0+.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>hint</entry>
-          <entry><type class="union"><type>string</type><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            Index specification. Specify either the index name as a string or
-            the index key pattern. If specified, then the query system will only
-            consider plans using the hinted index.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"hint"</literal> option if not
-            specified.
-           </simpara>
-          </entry>
-         </row>
-         &mongodb.option.let;
-         <row>
-          <entry>limit</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The maximum number of documents to return. If unspecified, then
-            defaults to no limit. A limit of 0 is equivalent to setting no
-            limit.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>max</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            The <emphasis>exclusive</emphasis> upper bound for a specific index.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$max"</literal> modifier if
-            not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>maxAwaitTimeMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Positive integer denoting the time limit in milliseconds for the
-            server to block a getMore operation if no data is available. This
-            option should only be used in conjunction with the
-            <literal>"tailable"</literal> and <literal>"awaitData"</literal>
-            options.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>maxTimeMS</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            The cumulative time limit in milliseconds for processing operations
-            on the cursor. MongoDB aborts the operation at the earliest
-            following interrupt point.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$maxTimeMS"</literal>
-            modifier if not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>min</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            The <emphasis>inclusive</emphasis> lower bound for a specific index.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$min"</literal> modifier if
-            not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>noCursorTimeout</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           Prevents the server from timing out idle cursors after an inactivity
-           period (10 minutes).
-          </entry>
-         </row>
-         <row>
-          <entry>projection</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>
-            The <link xlink:href="&url.mongodb.docs;tutorial/project-fields-from-query-results/">projection specification</link>
-            to determine which fields to include in the returned documents.
-           </simpara>
-           <simpara>
-            If you are using the <link
-            linkend="mongodb.persistence.deserialization">ODM
-            functionality</link> to deserialise documents as their original
-            PHP class, make sure that you include the
-            <property>__pclass</property> field in the projection. This is
-            required for the deserialization to work and without it, the
-            extension will return (by default) a <classname>stdClass</classname>
-            object instead.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>readConcern</entry>
-          <entry><classname>MongoDB\Driver\ReadConcern</classname></entry>
-          <entry>
-           <simpara>
-            A read concern to apply to the operation. By default, the read
-            concern from the
-            <link linkend="mongodb-driver-manager.construct-uri">MongoDB
-            Connection URI</link> will be used.
-           </simpara>
-           <simpara>
-            This option is available in MongoDB 3.2+ and will result in an
-            exception at execution time if specified for an older server
-            version.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>returnKey</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            If &true;, returns only the index keys in the resulting documents.
-            Default value is &false;. If &true; and the find command does not
-            use an index, the returned documents will be empty.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$returnKey"</literal>
-            modifier if not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>showRecordId</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           <simpara>
-            Determines whether to return the record identifier for each
-            document. If &true;, adds a top-level <literal>"$recordId"</literal>
-            field to the returned documents.
-           </simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$showDiskLoc"</literal>
-            modifier if not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>singleBatch</entry>
-          <entry><type>bool</type></entry>
-          <entry>
-           Determines whether to close the cursor after the first batch.
-           Defaults to &false;.
-          </entry>
-         </row>
-         <row>
-          <entry>skip</entry>
-          <entry><type>int</type></entry>
-          <entry>Number of documents to skip. Defaults to 0.</entry>
-         </row>
-         <row>
-          <entry>sort</entry>
-          <entry><type class="union"><type>array</type><type>object</type></type></entry>
-          <entry>
-           <simpara>The sort specification for the ordering of the results.</simpara>
-           <simpara>
-            Falls back to the deprecated <literal>"$orderby"</literal> modifier
-            if not specified.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>tailable</entry>
-          <entry><type>bool</type></entry>
-          <entry>Returns a tailable cursor for a capped collection.</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"partial"</literal> option was removed. Use the
-        <literal>"allowPartialResults"</literal> option instead.
-       </simpara>
-       <simpara>
-        The <literal>"maxScan"</literal> option was removed. Support for this
-        option was removed in MongoDB 4.2.
-       </simpara>
-       <simpara>
-        The <literal>"modifiers"</literal> option was removed. This option was
-        used for legacy query modifiers, which are all deprecated.
-       </simpara>
-       <simpara>
-        The <literal>"oplogReplay"</literal> option was removed. It is ignored
-        in MongoDB 4.4 and newer.
-       </simpara>
-       <simpara>
-        The <literal>"snapshot"</literal> option was removed. Support for this
-        option was removed in MongoDB 4.0.
-       </simpara>
-       <simpara>
-        A negative value for the <literal>"limit"</literal> option no longer
-        implies &true; for the <literal>"singleBatch"</literal> option. To only
-        receive a single batch of results, combine a positive
-        <literal>"limit"</literal> value with the
-        <literal>"singleBatch"</literal> option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.14.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"let"</literal> option. The
-        <literal>"comment"</literal> option now accepts any type.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.8.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"allowDiskUse"</literal> option.
-       </simpara>
-       <simpara>
-        The <literal>"oplogReplay"</literal> option is deprecated.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.5.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"maxScan"</literal> and <literal>"snapshot"</literal>
-        options are deprecated.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"maxAwaitTimeMS"</literal> option.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        Added the <literal>"allowPartialResults"</literal>,
-        <literal>"collation"</literal>, <literal>"comment"</literal>,
-        <literal>"hint"</literal>, <literal>"max"</literal>,
-        <literal>"maxScan"</literal>, <literal>"maxTimeMS"</literal>,
-        <literal>"min"</literal>, <literal>"returnKey"</literal>,
-        <literal>"showRecordId"</literal>, and <literal>"snapshot"</literal>
-        options.
-       </simpara>
-       <simpara>
-        Renamed the <literal>"partial"</literal> option to
-        <literal>"allowPartialResults"</literal>. For backwards compatibility,
-        <literal>"partial"</literal> will still be read if
-        <literal>"allowPartialResults"</literal> is not specified.
-       </simpara>
-       <simpara>
-        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>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.1.0</entry>
-      <entry>Added the <literal>"readConcern"</literal> option.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Query::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Select only documents authord by "bjori" with at least 100 views */
-$filter = [
-    'author' => 'bjori',
-    'views' => [
-        '$gte' => 100,
-    ],
-];
-
-$options = [
-    /* Only return the following fields in the matching documents */
-    'projection' => [
-        'title' => 1,
-        'article' => 1,
-    ],
-    /* Return the documents in descending order of views */
-    'sort' => [
-        'views' => -1
-    ],
-];
-
-$query = new MongoDB\Driver\Query($filter, $options);
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017');
-$readPreference = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY);
-$cursor = $manager->executeQuery('databaseName.collectionName', $query, ['readPreference' => $readPreference]);
-
-foreach($cursor as $document) {
-    var_dump($document);
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::executeQuery</methodname></member>
-   <member><classname>MongoDB\Driver\Cursor</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/mongodb/mongodb/driver/readconcern.xml b/reference/mongodb/mongodb/driver/readconcern.xml
deleted file mode 100644
index 141dc1f79e92..000000000000
--- a/reference/mongodb/mongodb/driver/readconcern.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-readconcern" role="class" 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\ReadConcern class</title>
- <titleabbrev>MongoDB\Driver\ReadConcern</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\ReadConcern intro -->
-  <section xml:id="mongodb-driver-readconcern.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>MongoDB\Driver\ReadConcern</classname> controls the level of
-    isolation for read operations for replica sets and replica set shards. This
-    option requires MongoDB 3.2 or later.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-readconcern.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\ReadConcern</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\ReadConcern</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Serializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>string</type><type>null</type></type>
-     <varname linkend="mongodb-driver-readconcern.props.level">level</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readconcern.constants.linearizable">MongoDB\Driver\ReadConcern::AVAILABLE</varname>
-     <initializer>"available"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readconcern.constants.linearizable">MongoDB\Driver\ReadConcern::LINEARIZABLE</varname>
-     <initializer>"linearizable"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readconcern.constants.local">MongoDB\Driver\ReadConcern::LOCAL</varname>
-     <initializer>"local"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readconcern.constants.majority">MongoDB\Driver\ReadConcern::MAJORITY</varname>
-     <initializer>"majority"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readconcern.constants.snapshot">MongoDB\Driver\ReadConcern::SNAPSHOT</varname>
-     <initializer>"snapshot"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-readconcern')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\ReadConcern properties -->
-  <section xml:id="mongodb-driver-readconcern.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-readconcern.props.level">
-     <term><varname>level</varname></term>
-     <listitem>
-      <simpara>
-       The read concern level. &null; if no level was specified.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ MongoDB\Driver\ReadConcern constants -->
-  <section xml:id="mongodb-driver-readconcern.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-readconcern.constants.available">
-     <term><constant>MongoDB\Driver\ReadConcern::AVAILABLE</constant></term>
-     <listitem>
-      <simpara>
-       Default for reads against secondaries when
-       <literal>afterClusterTime</literal>and <literal>level</literal> are
-       unspecified.
-      </simpara>
-      <simpara>
-       The query returns the instance&apos;s most recent data. Provides no
-       guarantee that the data has been written to a majority of the replica set
-       members (i.e. may be rolled back).
-      </simpara>
-      <simpara>
-       For unsharded collections (including collections in a standalone
-       deployment or a replica set deployment), <literal>"local"</literal> and
-       <literal>"available"</literal> read concerns behave identically.
-      </simpara>
-      <simpara>
-       For a sharded cluster, <literal>"available"</literal> read concern
-       provides greater tolerance for partitions since it does not wait to
-       ensure consistency guarantees. However, a query with
-       <literal>"available"</literal> read concern may return orphan documents
-       if the shard is undergoing chunk migrations since the
-       <literal>"available"</literal> read concern, unlike
-       <literal>"local"</literal> read concern, does not contact the
-       shard&apos;s primary nor the config servers for updated metadata.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readconcern.constants.linearizable">
-     <term><constant>MongoDB\Driver\ReadConcern::LINEARIZABLE</constant></term>
-     <listitem>
-      <simpara>
-       The query returns data that reflects all successful writes issued with a
-       write concern of <literal>"majority"</literal> <emphasis>and</emphasis>
-       acknowledged prior to the start of the read operation. For replica sets
-       that run with <literal>writeConcernMajorityJournalDefault</literal> set
-       to &true;, linearizable read concern returns data that will never be
-       rolled back.
-      </simpara>
-      <simpara>
-       With <literal>writeConcernMajorityJournalDefault</literal> set to
-       &false;, MongoDB will not wait for <literal>w: "majority"</literal>
-       writes to be durable before acknowledging the writes. As such,
-       <literal>"majority"</literal> write operations could possibly roll back
-       in the event of a loss of a replica set member.
-      </simpara>
-      <simpara>
-       You can specify linearizable read concern for read operations on the
-       primary only.
-      </simpara>
-      <simpara>
-       Linearizable read concern guarantees only apply if read
-       operations specify a query filter that uniquely identifies a single
-       document.
-      </simpara>
-      <tip>
-       <simpara>
-        Always use <literal>maxTimeMS</literal> with linearizable read concern
-        in case a majority of data bearing members are unavailable.
-        <literal>maxTimeMS</literal> ensures that the operation does not block
-        indefinitely and instead ensures that the operation returns an error if
-        the read concern cannot be fulfilled.
-       </simpara>
-      </tip>
-      <simpara>
-       Linearizable read concern requires MongoDB 3.4.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readconcern.constants.local">
-     <term><constant>MongoDB\Driver\ReadConcern::LOCAL</constant></term>
-     <listitem>
-      <simpara>
-       Default for reads against primary if <literal>level</literal> is
-       unspecified and for reads against secondaries if <literal>level</literal>
-       is unspecified but <literal>afterClusterTime</literal> is specified.
-      </simpara>
-      <simpara>
-       The query returns the instance&apos;s most recent data. Provides no
-       guarantee that the data has been written to a majority of the replica set
-       members (i.e. may be rolled back).
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readconcern.constants.majority">
-     <term><constant>MongoDB\Driver\ReadConcern::MAJORITY</constant></term>
-     <listitem>
-      <simpara>
-       The query returns the instance&apos;s most recent data acknowledged as
-       having been written to a majority of members in the replica set.
-      </simpara>
-      <simpara>
-       To use read concern level of <literal>"majority"</literal>, replica sets
-       must use WiredTiger storage engine and election protocol version 1.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readconcern.constants.snapshot">
-     <term><constant>MongoDB\Driver\ReadConcern::SNAPSHOT</constant></term>
-     <listitem>
-      <simpara>
-       Read concern <literal>"snapshot"</literal> is available for
-       multi-document transactions, and starting in MongoDB 5.0, certain read
-       operations outside of multi-document transactions.
-      </simpara>
-      <simpara>
-       If the transaction is not part of a causally consistent session, upon
-       transaction commit with write concern <literal>"majority"</literal>, the
-       transaction operations are guaranteed to have read from a snapshot of
-       majority-committed data.
-      </simpara>
-      <simpara>
-       If the transaction is part of a causally consistent session, upon
-       transaction commit with write concern <literal>"majority"</literal>, the
-       transaction operations are guaranteed to have read from a snapshot of
-       majority-committed data that provides causal consistency with the
-       operation immediately preceding the transaction start.
-      </simpara>
-      <simpara>
-       Outside of multi-document transactions, read concern
-       <literal>"snapshot"</literal> is available on primaries and secondaries
-       for the following read operations: <literal>find</literal>,
-       <literal>aggregate</literal>, and <literal>distinct</literal> (on
-       unsharded collections). All other read commands prohibit
-       <literal>"snapshot"</literal>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.11.0</entry>
-       <entry>
-        <simpara>
-         Added the <constant>MongoDB\Driver\ReadConcern::SNAPSHOT</constant>
-         constant.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.7.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.4.0</entry>
-       <entry>
-        <simpara>
-         Added the <constant>MongoDB\Driver\ReadConcern::AVAILABLE</constant>
-         constant.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        <simpara>
-         Added the
-         <constant>MongoDB\Driver\ReadConcern::LINEARIZABLE</constant>
-         constant.
-        </simpara>
-        <simpara>
-         Implements <interfacename>MongoDB\BSON\Serializable</interfacename>.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
-  <section xml:id="mongodb-driver-readconcern.seealso">
-   &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readconcern;">Read Concern reference</link></member>
-  </simplelist>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.readconcern;
-
-</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/mongodb/mongodb/driver/readconcern/bsonserialize.xml b/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml
deleted file mode 100644
index d19e66c397dd..000000000000
--- a/reference/mongodb/mongodb/driver/readconcern/bsonserialize.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readconcern.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadConcern::bsonSerialize</refname>
-  <refpurpose>Returns an object for BSON serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ReadConcern::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object for serializing the ReadConcern as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadConcern::bsonSerialize</function> with empty read concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rc = new MongoDB\Driver\ReadConcern;
-var_dump($rc->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($rc)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (0) {
-}
-
-{ }
-]]>
-   </screen>
-  </example><example>
-   <title><function>MongoDB\Driver\ReadConcern::bsonSerialize</function> with local read concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL);
-var_dump($rc->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($rc)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (1) {
-  ["level"]=>
-  string(5) "local"
-}
-
-{ "level" : "local" }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.readconcern;">Read Concern reference</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/mongodb/driver/readconcern/construct.xml b/reference/mongodb/mongodb/driver/readconcern/construct.xml
deleted file mode 100644
index 3741b22b6047..000000000000
--- a/reference/mongodb/mongodb/driver/readconcern/construct.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readconcern.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadConcern::__construct</refname>
-  <refpurpose>Create a new ReadConcern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\ReadConcern::__construct</methodname>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>level</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\ReadConcern</classname>, which is
-   an immutable value object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>level</parameter></term>
-    <listitem>
-     <simpara>
-      The <link xlink:href="&url.mongodb.docs.readconcern;#read-concern-levels">read concern level</link>.
-      You may use, but are not limited to, one of the
-      <link linkend="mongodb-driver-readconcern.constants">class constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadConcern::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Unspecified read isolation level (uses the server's default behavior) */
-$rc = new MongoDB\Driver\ReadConcern();
-
-/* Request read isolation from a single replica set node */
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL);
-
-/* Request read isolation from a majority of the replica set nodes */
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::MAJORITY);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readconcern;">Read Concern reference</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/mongodb/driver/readconcern/getlevel.xml b/reference/mongodb/mongodb/driver/readconcern/getlevel.xml
deleted file mode 100644
index a2c0240e1ee2..000000000000
--- a/reference/mongodb/mongodb/driver/readconcern/getlevel.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readconcern.getlevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadConcern::getLevel</refname>
-  <refpurpose>Returns the ReadConcern&apos;s "level" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>MongoDB\Driver\ReadConcern::getLevel</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadConcern&apos;s "level" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadConcern::getLevel</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rc = new MongoDB\Driver\ReadConcern();
-var_dump($rc->getLevel());
-
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::LOCAL);
-var_dump($rc->getLevel());
-
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::MAJORITY);
-var_dump($rc->getLevel());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-NULL
-string(5) "local"
-string(8) "majority"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readconcern;">Read Concern reference</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/mongodb/driver/readconcern/isdefault.xml b/reference/mongodb/mongodb/driver/readconcern/isdefault.xml
deleted file mode 100644
index e13e048b7809..000000000000
--- a/reference/mongodb/mongodb/driver/readconcern/isdefault.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readconcern.isdefault" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadConcern::isDefault</refname>
-  <refpurpose>Checks if this is the default read concern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\ReadConcern::isDefault</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this is the default read concern (i.e. no options are
-   specified). This method is primarily intended to be used in conjunction with
-   <methodname>MongoDB\Driver\Manager::getReadConcern</methodname> to determine
-   whether the Manager has been constructed without any read concern options.
-  </simpara>
-  <simpara>
-   The driver will not include a default read concern in its read operations
-   (e.g. <methodname>MongoDB\Driver\Manager::executeQuery</methodname>) in order
-   to allow the server to apply its own default. Libraries that access the
-   Manager's read concern to include it in their own read commands should use
-   this method to ensure that default read concerns are left unset.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this is the default read concern and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadConcern::isDefault</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rc = new MongoDB\Driver\ReadConcern(null);
-var_dump($rc->isDefault());
-
-$rc = new MongoDB\Driver\ReadConcern(MongoDB\Driver\ReadConcern::MAJORITY);
-var_dump($rc->isDefault());
-
-$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?readConcernLevel=majority');
-$rc = $manager->getReadConcern();
-var_dump($rc->isDefault());
-
-$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/');
-$rc = $manager->getReadConcern();
-var_dump($rc->isDefault());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::getReadConcern</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.readconcern;">Read Concern reference</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/mongodb/driver/readpreference.xml b/reference/mongodb/mongodb/driver/readpreference.xml
deleted file mode 100644
index 2f5c6498cae6..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-readpreference" role="class" 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\ReadPreference class</title>
- <titleabbrev>MongoDB\Driver\ReadPreference</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\ReadPreference intro -->
-  <section xml:id="mongodb-driver-readpreference.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-readpreference.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\ReadPreference</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\ReadPreference</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>MongoDB\BSON\Serializable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.props.mode">mode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>array</type><type>null</type></type>
-     <varname linkend="mongodb-driver-readpreference.props.tags">tags</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-readpreference.props.maxstaleness">maxStalenessSeconds</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>object</type><type>null</type></type>
-     <varname linkend="mongodb-driver-readpreference.props.hedge">hedge</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.constants.primary">MongoDB\Driver\ReadPreference::PRIMARY</varname>
-     <initializer>primary</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.constants.primary-preferred">MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</varname>
-     <initializer>primaryPreferred</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.constants.secondary">MongoDB\Driver\ReadPreference::SECONDARY</varname>
-     <initializer>secondary</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.constants.secondary-preferred">MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</varname>
-     <initializer>secondaryPreferred</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-readpreference.constants.nearest">MongoDB\Driver\ReadPreference::NEAREST</varname>
-     <initializer>nearest</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-readpreference.constants.no-max-staleness">MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-readpreference.constants.smallest-max-staleness-seconds">MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</varname>
-     <initializer>90</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-readpreference')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\ReadPreference properties -->
-  <section xml:id="mongodb-driver-readpreference.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-readpreference.props.mode">
-     <term><varname>mode</varname></term>
-     <listitem>
-      <simpara>
-       The read preference mode as a string (e.g.
-       <literal>"primary"</literal>, <literal>"secondary"</literal>).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-readpreference.props.tags">
-     <term><varname>tags</varname></term>
-     <listitem>
-      <simpara>
-       The tag set list used by the read preference, or &null; if no tag
-       sets were specified.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-readpreference.props.maxstaleness">
-     <term><varname>maxStalenessSeconds</varname></term>
-     <listitem>
-      <simpara>
-       The maximum staleness in seconds for reads, or
-       <constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant>
-       if no maximum staleness was specified.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-readpreference.props.hedge">
-     <term><varname>hedge</varname></term>
-     <listitem>
-      <simpara>
-       A document specifying the hedge options for the read preference, or
-       &null; if no hedge options were specified.
-      </simpara>
-      <warning>
-       <simpara>
-        This property is deprecated as hedged reads are deprecated in
-        MongoDB 8.0.
-       </simpara>
-      </warning>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ MongoDB\Driver\ReadPreference constants -->
-  <section xml:id="mongodb-driver-readpreference.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.primary">
-     <term><constant>MongoDB\Driver\ReadPreference::PRIMARY</constant></term>
-     <listitem>
-      <simpara>
-       All operations read from the current replica set primary. This is the
-       default read preference for MongoDB.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.primary-preferred">
-     <term><constant>MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</constant></term>
-     <listitem>
-      <simpara>
-       In most situations, operations read from the primary but if it is
-       unavailable, operations read from secondary members.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.secondary">
-     <term><constant>MongoDB\Driver\ReadPreference::SECONDARY</constant></term>
-     <listitem>
-      <simpara>
-       All operations read from the secondary members of the replica set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.secondary-preferred">
-     <term><constant>MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</constant></term>
-     <listitem>
-      <simpara>
-       In most situations, operations read from secondary members but if no
-       secondary members are available, operations read from the primary.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.nearest">
-     <term><constant>MongoDB\Driver\ReadPreference::NEAREST</constant></term>
-     <listitem>
-      <simpara>
-       Operations read from member of the replica set with the least network
-       latency, irrespective of the member&apos;s type.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.no-max-staleness">
-     <term><constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant></term>
-     <listitem>
-      <simpara>
-       The default value for the <literal>"maxStalenessSeconds"</literal>
-       option is to specify no limit on maximum staleness, which means that the
-       driver will not consider a secondary&apos;s lag when choosing where to
-       direct a read operation.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-readpreference.constants.smallest-max-staleness-seconds">
-     <term><constant>MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</constant></term>
-     <listitem>
-      <simpara>
-       The minimum value for the <literal>"maxStalenessSeconds"</literal> option
-       is 90 seconds. The driver estimates secondaries&apos; staleness by
-       periodically checking the latest write date of each replica set member.
-       Since these checks are infrequent, the staleness estimate is coarse.
-       Thus, the driver cannot enforce a max staleness value of less than 90
-       seconds.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 2.0.0</entry>
-       <entry>
-        <simpara>
-         Removed the
-         <constant>MongoDB\Driver\ReadPreference::RP_PRIMARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_SECONDARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED</constant>,
-         and <constant>MongoDB\Driver\ReadPreference::RP_NEAREST</constant>
-         constants. The <methodname>getMode</methodname> method was also removed.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.20.0</entry>
-       <entry>
-        <simpara>
-         Deprecated the
-         <constant>MongoDB\Driver\ReadPreference::RP_PRIMARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_SECONDARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED</constant>,
-         and <constant>MongoDB\Driver\ReadPreference::RP_NEAREST</constant>
-         constants.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.7.0</entry>
-       <entry>
-        <simpara>
-         Added the
-         <constant>MongoDB\Driver\ReadPreference::PRIMARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED</constant>,
-         <constant>MongoDB\Driver\ReadPreference::SECONDARY</constant>,
-         <constant>MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED</constant>,
-         and <constant>MongoDB\Driver\ReadPreference::NEAREST</constant>
-         constants.
-        </simpara>
-        <simpara>
-         Implements <interfacename>Serializable</interfacename>.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        <simpara>
-         Added the
-         <constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant>
-         and
-         <constant>MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</constant>
-         constants.
-        </simpara>
-        <simpara>
-         Implements <interfacename>MongoDB\BSON\Serializable</interfacename>.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.readpreference;
-
-</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/mongodb/mongodb/driver/readpreference/bsonserialize.xml b/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml
deleted file mode 100644
index ff7d1503c2e8..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/bsonserialize.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readpreference.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::bsonSerialize</refname>
-  <refpurpose>Returns an object for BSON serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ReadPreference::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object for serializing the ReadPreference as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::bsonSerialize</function> with primary read preference</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY);
-var_dump($rp->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($rp)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (1) {
-  ["mode"]=>
-  string(7) "primary"
-}
-
-{ "mode" : "primary" }
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::bsonSerialize</function> with secondary read preference and tag sets</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(
-    MongoDB\Driver\ReadPreference::SECONDARY,
-    [
-        ['dc' => 'ny'],
-        ['dc' => 'sf', 'use' => 'reporting'],
-        []
-    ]
-);
-var_dump($rp->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($rp)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (2) {
-  ["mode"]=>
-  string(9) "secondary"
-  ["tags"]=>
-  array(3) {
-    [0]=>
-    object(stdClass)#1 (1) {
-      ["dc"]=>
-      string(2) "ny"
-    }
-    [1]=>
-    object(stdClass)#5 (2) {
-      ["dc"]=>
-      string(2) "sf"
-      ["use"]=>
-      string(9) "reporting"
-    }
-    [2]=>
-    object(stdClass)#4 (0) {
-    }
-  }
-}
-
-{ "mode" : "secondary", "tags" : [ { "dc" : "ny" }, { "dc" : "sf", "use" : "reporting" }, {  } ] }
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::bsonSerialize</function> with secondary read preference and max staleness</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(
-    MongoDB\Driver\ReadPreference::SECONDARY,
-    null,
-    ['maxStalenessSeconds' => 120]
-);
-var_dump($rp->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($rp)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (2) {
-  ["mode"]=>
-  string(9) "secondary"
-  ["maxStalenessSeconds"]=>
-  int(120)
-}
-
-{ "mode" : "secondary", "maxStalenessSeconds" : 120 }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/construct.xml b/reference/mongodb/mongodb/driver/readpreference/construct.xml
deleted file mode 100644
index 59a3d2fe03a6..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/construct.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readpreference.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::__construct</refname>
-  <refpurpose>Create a new ReadPreference</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\ReadPreference::__construct</methodname>
-   <methodparam><type>string</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>tagSets</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>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\ReadPreference</classname>, which
-   is an immutable value object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>Read preference mode</title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>Value</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry><literal>"primary"</literal></entry>
-          <entry>
-           <simpara>
-            All operations read from the current replica set primary. This is
-            the default read preference for MongoDB.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry><literal>"primaryPreferred"</literal></entry>
-          <entry>
-           <simpara>
-            In most situations, operations read from the primary but if it is
-            unavailable, operations read from secondary members.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry><literal>"secondary"</literal></entry>
-          <entry>
-           <simpara>
-            All operations read from the secondary members of the replica set.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry><literal>"secondaryPreferred"</literal></entry>
-          <entry>
-           <simpara>
-            In most situations, operations read from secondary members but if no
-            secondary members are available, operations read from the primary.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry><literal>"nearest"</literal></entry>
-          <entry>
-           <simpara>
-            Operations read from member of the replica set with the least
-            network latency, irrespective of the member&apos;s type.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>tagSets</parameter></term>
-    <listitem>
-     <simpara>
-      Tag sets allow you to target read operations to specific members of a
-      replica set. This parameter should be an array of associative arrays, each
-      of which contain zero or more key/value pairs. When selecting a server for
-      a read operation, the driver attempt to select a node having all tags in a
-      set (i.e. the associative array of key/value pairs). If selection fails,
-      the driver will attempt subsequent sets. An empty tag set
-      (<literal>array()</literal>) will match any node and may be used as a
-      fallback.
-     </simpara>
-     <simpara>
-      Tags are not compatible with the <literal>"primary"</literal> mode and,
-      in general, only apply when selecting a secondary member of a set for a
-      read operation. However, the <literal>"nearest"</literal> mode, when
-      combined with a tag set, selects the matching member with the lowest
-      network latency. This member may be a primary or secondary.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>hedge</entry>
-          <entry><type class="union"><type>object</type><type>array</type></type></entry>
-          <entry>
-           <simpara>Specifies whether to use <link xlink:href="&url.mongodb.docs;core/sharded-cluster-query-router/#mongos-hedged-reads">hedged reads</link>, which are supported by MongoDB 4.4+ for sharded queries.</simpara>
-           <simpara>
-            Server hedged reads are available for all non-primary read preferences
-            and are enabled by default when using the <literal>"nearest"</literal>
-            mode. This option allows explicitly enabling server hedged reads for
-            non-primary read preferences by specifying
-            <literal>['enabled' => true]</literal>, or explicitly disabling
-            server hedged reads for the <literal>"nearest"</literal> read
-            preference by specifying <literal>['enabled' => false]</literal>.
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>maxStalenessSeconds</entry>
-          <entry><type>int</type></entry>
-          <entry>
-           <simpara>
-            Specifies a maximum replication lag, or "staleness", for reads from
-            secondaries. When a secondary&apos;s estimated staleness exceeds
-            this value, the driver stops using it for read operations.
-           </simpara>
-           <simpara>
-            If specified, the max staleness must be a signed 32-bit integer
-            greater than or equal to
-            <constant>MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS</constant>.
-           </simpara>
-           <simpara>
-            Defaults to
-            <constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant>,
-            which means that the driver will not consider a secondary&apos;s lag
-            when choosing where to direct a read operation.
-           </simpara>
-           <simpara>
-            This option is not compatible with the <literal>"primary"</literal>
-            mode. Specifying a max staleness also requires all MongoDB instances
-            in the deployment to be using MongoDB 3.4+. An exception will be
-            thrown at execution time if any MongoDB instances in the deployment
-            are of an older server version.
-           </simpara>
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>mode</parameter> is invalid.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>tagSets</parameter> is provided for a primary read preference or is malformed (i.e. not an array of zero or more documents).</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if the <literal>"maxStalenessSeconds"</literal> option is provided for a primary read preference or is out of range.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       Passing an <type>int</type> for the <parameter>mode</parameter> argument
-       is no longer supported.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.20.0</entry>
-      <entry>
-       Passing an <type>int</type> for the <parameter>mode</parameter> argument
-       is <emphasis>DEPRECATED</emphasis>.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.8.0</entry>
-      <entry>
-       Added the <literal>"hedge"</literal> option.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <simpara>
-        The <parameter>mode</parameter> argument now accepts a string value,
-        which is consistent with the <literal>"readPreference"</literal> URI
-        option for <function>MongoDB\Driver\Manager::__construct</function>.
-       </simpara>
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.2.0</entry>
-      <entry>
-       <simpara>
-        Added a third <parameter>options</parameter> argument, which supports
-        the <literal>"maxStalenessSeconds"</literal> option.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Prefer a secondary node but fall back to a primary. */
-var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED));
-
-/* Prefer a node in the New York data center with lowest latency. */
-var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST, [['dc' => 'ny']]));
-
-/* Require a secondary node whose replication lag is within two minutes of the primary */
-var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 120]));
-
-/* Explicitly enable server hedged reads */
-var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => ['enabled' => true]]));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\ReadPreference)#1 (1) {
-  ["mode"]=>
-  string(18) "secondaryPreferred"
-}
-object(MongoDB\Driver\ReadPreference)#1 (2) {
-  ["mode"]=>
-  string(7) "nearest"
-  ["tags"]=>
-  array(1) {
-    [0]=>
-    object(stdClass)#2 (1) {
-      ["dc"]=>
-      string(2) "ny"
-    }
-  }
-}
-object(MongoDB\Driver\ReadPreference)#1 (2) {
-  ["mode"]=>
-  string(9) "secondary"
-  ["maxStalenessSeconds"]=>
-  int(120)
-}
-object(MongoDB\Driver\ReadPreference)#1 (2) {
-  ["mode"]=>
-  string(9) "secondary"
-  ["hedge"]=>
-  object(stdClass)#1 (1) {
-    ["enabled"]=>
-    bool(true)
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/gethedge.xml b/reference/mongodb/mongodb/driver/readpreference/gethedge.xml
deleted file mode 100644
index 98288c102cce..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/gethedge.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 342988 $ -->
-
-<refentry xml:id="mongodb-driver-readpreference.gethedge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::getHedge</refname>
-  <refpurpose>Returns the ReadPreference&apos;s "hedge" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\ReadPreference::getHedge</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadPreference&apos;s "hedge" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/getmaxstalenessseconds.xml b/reference/mongodb/mongodb/driver/readpreference/getmaxstalenessseconds.xml
deleted file mode 100644
index d4c6ac71e1c7..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/getmaxstalenessseconds.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readpreference.getmaxstalenessseconds" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::getMaxStalenessSeconds</refname>
-  <refpurpose>Returns the ReadPreference&apos;s "maxStalenessSeconds" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ReadPreference::getMaxStalenessSeconds</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadPreference&apos;s "maxStalenessSeconds" option. If no max
-   staleness has been specified,
-   <constant>MongoDB\Driver\ReadPreference::NO_MAX_STALENESS</constant> will be
-   returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::getMaxStalenessSeconds</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY);
-var_dump($rp->getMaxStalenessSeconds());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, [
-    'maxStalenessSeconds' => MongoDB\Driver\ReadPreference::NO_MAX_STALENESS,
-]);
-var_dump($rp->getMaxStalenessSeconds());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, [
-    'maxStalenessSeconds' => MongoDB\Driver\ReadPreference::SMALLEST_MAX_STALENESS_SECONDS,
-]);
-var_dump($rp->getMaxStalenessSeconds());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, [
-    'maxStalenessSeconds' => 1000,
-]);
-var_dump($rp->getMaxStalenessSeconds());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(-1)
-int(-1)
-int(90)
-int(1000)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/getmode.xml b/reference/mongodb/mongodb/driver/readpreference/getmode.xml
deleted file mode 100644
index 087031bb47ae..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/getmode.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readpreference.getmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::getMode</refname>
-  <refpurpose>Returns the ReadPreference&apos;s "mode" option</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   <simpara>
-    This function has been <emphasis>DEPRECATED</emphasis> as of extension
-    version 1.20.0 and was removed in 2.0. Applications should use
-    <methodname>MongoDB\Driver\ReadPreference::getModeString</methodname>
-    instead.
-   </simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ReadPreference::getMode</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadPreference&apos;s "mode" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.method-removed;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::getMode</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY);
-var_dump($rp->getMode());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED);
-var_dump($rp->getMode());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY);
-var_dump($rp->getMode());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED);
-var_dump($rp->getMode());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST);
-var_dump($rp->getMode());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-int(5)
-int(2)
-int(6)
-int(10)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\ReadPreference::getModeString</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/getmodestring.xml b/reference/mongodb/mongodb/driver/readpreference/getmodestring.xml
deleted file mode 100644
index ca231f2a6bf9..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/getmodestring.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 343892 $ -->
-
-<refentry xml:id="mongodb-driver-readpreference.getmodestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::getModeString</refname>
-  <refpurpose>Returns the ReadPreference&apos;s "mode" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\ReadPreference::getModeString</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadPreference&apos;s "mode" option as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::getModeString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY);
-var_dump($rp->getModeString());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED);
-var_dump($rp->getModeString());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY);
-var_dump($rp->getModeString());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED);
-var_dump($rp->getModeString());
-
-$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST);
-var_dump($rp->getModeString());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(7) "primary"
-string(16) "primaryPreferred"
-string(9) "secondary"
-string(18) "secondaryPreferred"
-string(7) "nearest"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\ReadPreference::getMode</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/readpreference/gettagsets.xml b/reference/mongodb/mongodb/driver/readpreference/gettagsets.xml
deleted file mode 100644
index 4d140e9fbeaa..000000000000
--- a/reference/mongodb/mongodb/driver/readpreference/gettagsets.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-readpreference.gettagsets" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ReadPreference::getTagSets</refname>
-  <refpurpose>Returns the ReadPreference&apos;s "tagSets" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\ReadPreference::getTagSets</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the ReadPreference&apos;s "tagSets" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\ReadPreference::getTagSets</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$mode = MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED;
-
-/* Null and an empty array both denote no tag set preference. */
-$rp = new MongoDB\Driver\ReadPreference($mode, null);
-var_dump($rp->getTagSets());
-
-$rp = new MongoDB\Driver\ReadPreference($mode, []);
-var_dump($rp->getTagSets());
-
-/* Prefer a node in New York, but fall back to any available node. */
-$rp = new MongoDB\Driver\ReadPreference($mode, [['dc' => 'ny']]);
-var_dump($rp->getTagSets());
-
-/* Prefer a node in the New York, followed by a node in San Francisco that is
-   labeled for reporting usage, and finally fall back to any available node. */
-$rp = new MongoDB\Driver\ReadPreference($mode, [
-  ['dc' => 'ny'],
-  ['dc' => 'sf', 'use' => 'reporting'],
-  [],
-]);
-var_dump($rp->getTagSets());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(0) {
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  array(1) {
-    ["dc"]=>
-    string(2) "ny"
-  }
-  [1]=>
-  array(0) {
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    ["dc"]=>
-    string(2) "ny"
-  }
-  [1]=>
-  array(2) {
-    ["dc"]=>
-    string(2) "sf"
-    ["use"]=>
-    string(9) "reporting"
-  }
-  [2]=>
-  array(0) {
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.readpreference;">Read Preference reference</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/mongodb/driver/server.xml b/reference/mongodb/mongodb/driver/server.xml
deleted file mode 100644
index 34a9f77470b3..000000000000
--- a/reference/mongodb/mongodb/driver/server.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-server" role="class" 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\Server class</title>
- <titleabbrev>MongoDB\Driver\Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Server intro -->
-  <section xml:id="mongodb-driver-server.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Server</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Server</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-unknown">MongoDB\Driver\Server::TYPE_UNKNOWN</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-standalone">MongoDB\Driver\Server::TYPE_STANDALONE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-mongos">MongoDB\Driver\Server::TYPE_MONGOS</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-possible-primary">MongoDB\Driver\Server::TYPE_POSSIBLE_PRIMARY</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-rs-primary">MongoDB\Driver\Server::TYPE_RS_PRIMARY</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-rs-secondary">MongoDB\Driver\Server::TYPE_RS_SECONDARY</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-rs-arbiter">MongoDB\Driver\Server::TYPE_RS_ARBITER</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-rs-other">MongoDB\Driver\Server::TYPE_RS_OTHER</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-rs-ghost">MongoDB\Driver\Server::TYPE_RS_GHOST</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-server.constants.type-load-balancer">MongoDB\Driver\Server::TYPE_LOAD_BALANCER</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\Server constants -->
-  <section xml:id="mongodb-driver-server.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-unknown">
-     <term><constant>MongoDB\Driver\Server::TYPE_UNKNOWN</constant></term>
-     <listitem>
-      <simpara>Unknown server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-standalone">
-     <term><constant>MongoDB\Driver\Server::TYPE_STANDALONE</constant></term>
-     <listitem>
-      <simpara>Standalone server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-mongos">
-     <term><constant>MongoDB\Driver\Server::TYPE_MONGOS</constant></term>
-     <listitem>
-      <simpara>Mongos server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-possible-primary">
-     <term><constant>MongoDB\Driver\Server::TYPE_POSSIBLE_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set possible primary server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-      <simpara>A server may be identified as a possible primary if it has not yet been checked but another member of the replica set thinks it is the primary.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-rs-primary">
-     <term><constant>MongoDB\Driver\Server::TYPE_RS_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set primary server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-rs-secondary">
-     <term><constant>MongoDB\Driver\Server::TYPE_RS_SECONDARY</constant></term>
-     <listitem>
-      <simpara>Replica set secondary server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-rs-arbiter">
-     <term><constant>MongoDB\Driver\Server::TYPE_RS_ARBITER</constant></term>
-     <listitem>
-      <simpara>Replica set arbiter server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-rs-other">
-     <term><constant>MongoDB\Driver\Server::TYPE_RS_OTHER</constant></term>
-     <listitem>
-      <simpara>Replica set other server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-      <simpara>Such servers may be hidden, starting up, or recovering. They cannot be queried, but their hosts lists are useful for discovering the current replica set configuration.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-rs-ghost">
-     <term><constant>MongoDB\Driver\Server::TYPE_RS_GHOST</constant></term>
-     <listitem>
-      <simpara>Replica set ghost server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-      <simpara>Servers may be identified as such in at least three situations: briefly during server startup; in an uninitialized replica set; or when the server is shunned (i.e. removed from the replica set config). They cannot be queried, nor can their host list be used to discover the current replica set configuration; however, the client may monitor this server in hope that it transitions to a more useful state.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-server.constants.type-load-balancer">
-     <term><constant>MongoDB\Driver\Server::TYPE_LOAD_BALANCER</constant></term>
-     <listitem>
-      <simpara>Load balancer server type, returned by <methodname>MongoDB\Driver\Server::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 1.11.0</entry>
-       <entry>
-        <simpara>
-         Added the
-         <constant>MongoDB\Driver\Server::TYPE_LOAD_BALANCER</constant>
-         constant.
-        </simpara>
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.server;
-
-</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/mongodb/mongodb/driver/server/construct.xml b/reference/mongodb/mongodb/driver/server/construct.xml
deleted file mode 100644
index ac01ee210070..000000000000
--- a/reference/mongodb/mongodb/driver/server/construct.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::__construct</refname>
-  <refpurpose>Create a new Server (not used)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\Driver\Server::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\Driver\Server</classname> objects are created internally
-   by <classname>MongoDB\Driver\Manager</classname> when a database connection
-   is established and may be returned by
-   <function>MongoDB\Driver\Manager::getServers</function> and
-   <function>MongoDB\Driver\Manager::selectServer</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::getServers</function></member>
-   <member><function>MongoDB\Driver\Manager::selectServer</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/mongodb/mongodb/driver/server/executebulkwrite.xml b/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
deleted file mode 100644
index 05ed61f5b33e..000000000000
--- a/reference/mongodb/mongodb/driver/server/executebulkwrite.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executebulkwrite" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeBulkWrite</refname>
-  <refpurpose>Execute one or more write operations on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\WriteResult</type><methodname>MongoDB\Driver\Server::executeBulkWrite</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\BulkWrite</type><parameter>bulk</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes one or more write operations on this server.
-  </simpara>
-  <simpara>
-   A <classname>MongoDB\Driver\BulkWrite</classname> can be constructed with
-   one or more write operations of varying types (e.g. updates, deletes, and
-   inserts). The driver will attempt to send operations of the same type to the
-   server in as few requests as possible to optimize round trips.
-  </simpara>
-  <simpara>
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.bulkwrite;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.writeresult;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> has already been executed. <classname>MongoDB\Driver\BulkWrite</classname> objects may not be executed multiple times.</member>
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   &mongodb.throws.bulkwriteexception;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\WriteConcern</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\WriteConcern</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\WriteConcern</classname> object.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.3.0</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       is now thrown if <parameter>bulk</parameter> does not contain any write
-       operations. Previously, a
-       <classname>MongoDB\Driver\Exception\BulkWriteException</classname> was
-       thrown.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &mongodb.note.server.write;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWrite</classname></member>
-   <member><classname>MongoDB\Driver\WriteResult</classname></member>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeBulkWrite</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/mongodb/mongodb/driver/server/executebulkwritecommand.xml b/reference/mongodb/mongodb/driver/server/executebulkwritecommand.xml
deleted file mode 100644
index bef524c3aced..000000000000
--- a/reference/mongodb/mongodb/driver/server/executebulkwritecommand.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executebulkwritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeBulkWriteCommand</refname>
-  <refpurpose>Execute write operations on this server using the bulkWrite command</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\BulkWriteCommandResult</type><methodname>MongoDB\Driver\Server::executeBulkWriteCommand</methodname>
-   <methodparam><type>MongoDB\Driver\BulkWriteCommand</type><parameter>bulk</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes one or more write operations on this server using the
-   <link xlink:href="&url.mongodb.docs.command;bulkWrite">bulkWrite</link>
-   command introduced in MongoDB 8.0.
-  </simpara>
-  <simpara>
-   A <classname>MongoDB\Driver\BulkWriteCommand</classname> can be constructed
-   with one or more write operations of varying types (e.g. inserts, updates,
-   and deletes). Each write operation may target a different collection.
-  </simpara>
-  <simpara>
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.bulkwritecommand;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.bulkwritecommandresult;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> does not contain any write operations.</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>bulk</parameter> has already been executed. <classname>MongoDB\Driver\BulkWriteCommand</classname> objects may not be executed multiple times.</member>
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   &mongodb.throws.bulkwritecommandexception;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWriteCommand</classname></member>
-   <member><classname>MongoDB\Driver\BulkWriteCommandResult</classname></member>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeBulkWriteCommand</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/mongodb/mongodb/driver/server/executecommand.xml b/reference/mongodb/mongodb/driver/server/executecommand.xml
deleted file mode 100644
index 8bd725182fd1..000000000000
--- a/reference/mongodb/mongodb/driver/server/executecommand.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeCommand</refname>
-  <refpurpose>Execute a database command on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on this server.
-  </simpara>
-  <simpara>
-   This method applies no special logic to the command. The
-   Default values for the <literal>"readPreference"</literal>,
-   <literal>"readConcern"</literal>, and <literal>"writeConcern"</literal>
-   options will be inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option). If there is no active transaction, a
-   primary read preference will be used for server selection.
-  </simpara>
-  <simpara>
-   Default values will <emphasis>not</emphasis> be inferred from the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-   Users are therefore encouraged to use specific read and/or write command
-   methods if possible.
-  </simpara>
-  &mongodb.note.server.readpreference;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command, issuing a write command to a secondary).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\ReadPreference</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\ReadPreference</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\ReadPreference</classname> object.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &mongodb.note.server.write;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Server::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeCommand</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/mongodb/mongodb/driver/server/executequery.xml b/reference/mongodb/mongodb/driver/server/executequery.xml
deleted file mode 100644
index 24014368bac8..000000000000
--- a/reference/mongodb/mongodb/driver/server/executequery.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executequery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeQuery</refname>
-  <refpurpose>Execute a database query on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeQuery</methodname>
-   <methodparam><type>string</type><parameter>namespace</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Query</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the query on this server.
-  </simpara>
-  <simpara>
-   Default values for the <literal>"readPreference"</literal> option and Query's
-   <literal>"readConcern"</literal> option will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
-  &mongodb.note.server.readpreference;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.namespace;
-   &mongodb.parameter.query;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid query operators).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 2.0.0</entry>
-      <entry>
-       The <parameter>options</parameter> parameter no longer accepts a
-       <classname>MongoDB\Driver\ReadPreference</classname> instance.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.21.0</entry>
-      <entry>
-       Passing a <classname>MongoDB\Driver\ReadPreference</classname> object as
-       <parameter>options</parameter> is deprecated and will be removed in 2.0.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL mongodb 1.4.0</entry>
-      <entry>
-       The third parameter is now an <parameter>options</parameter> array.
-       For backwards compatibility, this parameter will still accept a
-       <classname>MongoDB\Driver\ReadPreference</classname> object.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><classname>MongoDB\Driver\Query</classname></member>
-   <member><classname>MongoDB\Driver\ReadPreference</classname></member>
-   <member><function>MongoDB\Driver\Manager::executeQuery</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/mongodb/mongodb/driver/server/executereadcommand.xml b/reference/mongodb/mongodb/driver/server/executereadcommand.xml
deleted file mode 100644
index 667c3a119bb6..000000000000
--- a/reference/mongodb/mongodb/driver/server/executereadcommand.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executereadcommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeReadCommand</refname>
-  <refpurpose>Execute a database command that reads on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeReadCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on this server, irrespective of the
-   <literal>"readPreference"</literal> option.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that read (e.g.
-   <link xlink:href="&url.mongodb.docs;reference/command/distinct/">distinct</link>).
-   Default values for the <literal>"readPreference"</literal> and
-   <literal>"readConcern"</literal> options will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
-  &mongodb.note.server.readpreference;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.readPreference;
-         &mongodb.option.session;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Server::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadCommand</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/mongodb/mongodb/driver/server/executereadwritecommand.xml b/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
deleted file mode 100644
index dfa143c74b3e..000000000000
--- a/reference/mongodb/mongodb/driver/server/executereadwritecommand.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executereadwritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeReadWriteCommand</refname>
-  <refpurpose>Execute a database command that reads and writes on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeReadWriteCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on this server.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that read and write
-   (e.g. <link xlink:href="&url.mongodb.docs;reference/command/aggregate/">aggregate</link>).
-   Default values for the <literal>"readConcern"</literal> and
-   <literal>"writeConcern"</literal> options will be inferred from an active
-   transaction (indicated by the <literal>"session"</literal> option), followed
-   by the <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.readConcern;
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &mongodb.note.server.write;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Server::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeReadWriteCommand</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/mongodb/mongodb/driver/server/executewritecommand.xml b/reference/mongodb/mongodb/driver/server/executewritecommand.xml
deleted file mode 100644
index ad5e6e25dc9c..000000000000
--- a/reference/mongodb/mongodb/driver/server/executewritecommand.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.executewritecommand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::executeWriteCommand</refname>
-  <refpurpose>Execute a database command that writes on this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Cursor</type><methodname>MongoDB\Driver\Server::executeWriteCommand</methodname>
-   <methodparam><type>string</type><parameter>db</parameter></methodparam>
-   <methodparam><type>MongoDB\Driver\Command</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes the command on this server.
-  </simpara>
-  <simpara>
-   This method will apply logic that is specific to commands that write (e.g.
-   <link xlink:href="&url.mongodb.docs;reference/command/drop/">drop</link>).
-   The default value for the <literal>"writeConcern"</literal> option will be
-   inferred from an active transaction (indicated by the
-   <literal>"session"</literal> option), followed by the
-   <link linkend="mongodb-driver-manager.construct-uri">connection URI</link>.
-  </simpara>
-  <note>
-   <simpara>
-    This method is not intended to be used to execute
-    <link xlink:href="&url.mongodb.docs;reference/command/insert/">insert</link>,
-    <link xlink:href="&url.mongodb.docs;reference/command/update/">update</link>,
-    or <link xlink:href="&url.mongodb.docs;reference/command/delete/">delete</link>
-    commands. Users are encouraged to use
-    <function>MongoDB\Driver\Server::executeBulkWrite</function> for those
-    operations.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mongodb.parameter.db;
-   &mongodb.parameter.command;
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.session;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-     &mongodb.option.transactionReadWriteConcern;
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &mongodb.returns.cursor;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.session-readwriteconcern;
-   &mongodb.throws.session-unacknowledged;
-   &mongodb.throws.std;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> on other errors (e.g. invalid command).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.4.4</entry>
-      <entry>
-       <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname>
-       will be thrown if the <literal>"session"</literal> option is used in
-       combination with an unacknowledged write concern.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &mongodb.note.server.write;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Command</classname></member>
-   <member><classname>MongoDB\Driver\Cursor</classname></member>
-   <member><function>MongoDB\Driver\Server::executeCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadCommand</function></member>
-   <member><function>MongoDB\Driver\Server::executeReadWriteCommand</function></member>
-   <member><function>MongoDB\Driver\Manager::executeWriteCommand</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/mongodb/mongodb/driver/server/gethost.xml b/reference/mongodb/mongodb/driver/server/gethost.xml
deleted file mode 100644
index 560dea0aefd6..000000000000
--- a/reference/mongodb/mongodb/driver/server/gethost.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getHost</refname>
-  <refpurpose>Returns the hostname of this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Server::getHost</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the hostname of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Server::getHost</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017/");
-$server = $manager->selectServer();
-
-var_dump($server->getHost());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(9) "localhost"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</function></member>
-   <member><function>MongoDB\Driver\ServerDescription::getHost</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/mongodb/mongodb/driver/server/getinfo.xml b/reference/mongodb/mongodb/driver/server/getinfo.xml
deleted file mode 100644
index 3aeaf8662f1f..000000000000
--- a/reference/mongodb/mongodb/driver/server/getinfo.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.getinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getInfo</refname>
-  <refpurpose>Returns an array of information describing this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Server::getInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an array of information describing the server. This array is derived
-   from the most recent
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command response obtained through
-   <link xlink:href="&url.mongodb.sdam;">server monitoring</link>.
-  </simpara>
-  <note>
-   <simpara>
-    When the driver is connected to a load balancer, this method will return
-    the backing server's
-    <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-    command response from the initial connection handshake. This is in contrast
-    to other methods (e.g. <function>MongoDB\Driver\Server::getType</function>),
-    which will return information about the load balancer itself.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of information describing this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Server::getInfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager('mongodb://localhost:27017/');
-
-$rp = new MongoDB\Driver\ReadPreference('primary');
-$server = $manager->selectServer($rp);
-
-var_dump($server->getInfo());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(23) {
-  ["helloOk"]=>
-  bool(true)
-  ["topologyVersion"]=>
-  array(2) {
-    ["processId"]=>
-    object(MongoDB\BSON\ObjectId)#4 (1) {
-      ["oid"]=>
-      string(24) "617b6d696a3a89d2f77e6df0"
-    }
-    ["counter"]=>
-    int(6)
-  }
-  ["hosts"]=>
-  array(1) {
-    [0]=>
-    string(15) "localhost:27017"
-  }
-  ["setName"]=>
-  string(3) "rs0"
-  ["setVersion"]=>
-  int(1)
-  ["ismaster"]=>
-  bool(true)
-  ["secondary"]=>
-  bool(false)
-  ["primary"]=>
-  string(15) "localhost:27017"
-  ["me"]=>
-  string(15) "localhost:27017"
-  ["electionId"]=>
-  object(MongoDB\BSON\ObjectId)#5 (1) {
-    ["oid"]=>
-    string(24) "7fffffff0000000000000001"
-  }
-  ["lastWrite"]=>
-  array(4) {
-    ["opTime"]=>
-    array(2) {
-      ["ts"]=>
-      object(MongoDB\BSON\Timestamp)#6 (2) {
-        ["increment"]=>
-        string(1) "1"
-        ["timestamp"]=>
-        string(10) "1635478989"
-      }
-      ["t"]=>
-      int(1)
-    }
-    ["lastWriteDate"]=>
-    object(MongoDB\BSON\UTCDateTime)#7 (1) {
-      ["milliseconds"]=>
-      string(13) "1635478989000"
-    }
-    ["majorityOpTime"]=>
-    array(2) {
-      ["ts"]=>
-      object(MongoDB\BSON\Timestamp)#8 (2) {
-        ["increment"]=>
-        string(1) "1"
-        ["timestamp"]=>
-        string(10) "1635478989"
-      }
-      ["t"]=>
-      int(1)
-    }
-    ["majorityWriteDate"]=>
-    object(MongoDB\BSON\UTCDateTime)#9 (1) {
-      ["milliseconds"]=>
-      string(13) "1635478989000"
-    }
-  }
-  ["maxBsonObjectSize"]=>
-  int(16777216)
-  ["maxMessageSizeBytes"]=>
-  int(48000000)
-  ["maxWriteBatchSize"]=>
-  int(100000)
-  ["localTime"]=>
-  object(MongoDB\BSON\UTCDateTime)#10 (1) {
-    ["milliseconds"]=>
-    string(13) "1635478992136"
-  }
-  ["logicalSessionTimeoutMinutes"]=>
-  int(30)
-  ["connectionId"]=>
-  int(3)
-  ["minWireVersion"]=>
-  int(0)
-  ["maxWireVersion"]=>
-  int(13)
-  ["readOnly"]=>
-  bool(false)
-  ["ok"]=>
-  float(1)
-  ["$clusterTime"]=>
-  array(2) {
-    ["clusterTime"]=>
-    object(MongoDB\BSON\Timestamp)#11 (2) {
-      ["increment"]=>
-      string(1) "1"
-      ["timestamp"]=>
-      string(10) "1635478989"
-    }
-    ["signature"]=>
-    array(2) {
-      ["hash"]=>
-      object(MongoDB\BSON\Binary)#12 (2) {
-        ["data"]=>
-        string(20) ""
-        ["type"]=>
-        int(0)
-      }
-      ["keyId"]=>
-      int(0)
-    }
-  }
-  ["operationTime"]=>
-  object(MongoDB\BSON\Timestamp)#13 (2) {
-    ["increment"]=>
-    string(1) "1"
-    ["timestamp"]=>
-    string(10) "1635478989"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.11.0</entry>
-      <entry>
-       When the driver is connected to a load balancer, this method returns
-       the backing server's <literal>hello</literal> command response from the
-       initial connection handshake.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\ServerDescription::getHelloResponse</function></member>
-   <member><link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link> command in the MongoDB manual</member>
-   <member><link xlink:href="&url.mongodb.sdam;">Server Discovery and Monitoring Specification</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/mongodb/driver/server/getlatency.xml b/reference/mongodb/mongodb/driver/server/getlatency.xml
deleted file mode 100644
index d0305dd21c5f..000000000000
--- a/reference/mongodb/mongodb/driver/server/getlatency.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.getlatency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getLatency</refname>
-  <refpurpose>Returns the latency of this server in milliseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>integer</type><type>null</type></type><methodname>MongoDB\Driver\Server::getLatency</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the latency of this server in milliseconds. This is the client&apos;s
-   measured
-   <link xlink:href="&url.mongodb.sdam;#round-trip-time">round trip time</link>
-   of a <literal>hello</literal> command.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the latency of this server in milliseconds, or &null; if no latency
-   has been measured (e.g. client is connected to a load balancer).
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.11.0</entry>
-      <entry>
-       This method will return &null; if no latency has been measured. In
-       earlier versions, an integer was always returned and an unset value
-       might be reported as <literal>-1</literal>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Server::getLatency</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017/");
-$server = $manager->selectServer();
-
-var_dump($server->getLatency());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(592)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</function></member>
-   <member><function>MongoDB\Driver\ServerDescription::getRoundTripTime</function></member>
-   <member><link xlink:href="&url.mongodb.sdam;">Server Discovery and Monitoring Specification</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/mongodb/driver/server/getport.xml b/reference/mongodb/mongodb/driver/server/getport.xml
deleted file mode 100644
index 08434410cdeb..000000000000
--- a/reference/mongodb/mongodb/driver/server/getport.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Server::getPort</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\Server::getPort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://localhost:27017/");
-$server = $manager->selectServer();
-
-var_dump($server->getPort());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(27017)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</function></member>
-   <member><function>MongoDB\Driver\ServerDescription::getPort</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/mongodb/mongodb/driver/server/getserverdescription.xml b/reference/mongodb/mongodb/driver/server/getserverdescription.xml
deleted file mode 100644
index dd00da0b31c2..000000000000
--- a/reference/mongodb/mongodb/driver/server/getserverdescription.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.getserverdescription" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getServerDescription</refname>
-  <refpurpose>Returns a ServerDescription for this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\ServerDescription</type><methodname>MongoDB\Driver\Server::getServerDescription</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns a <classname>MongoDB\Driver\ServerDescription</classname> for this
-   server. This is an immutable value object that will describe the server at
-   the time this method is called.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\Driver\ServerDescription</classname> for this
-   server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/server/gettags.xml b/reference/mongodb/mongodb/driver/server/gettags.xml
deleted file mode 100644
index 505254bc6072..000000000000
--- a/reference/mongodb/mongodb/driver/server/gettags.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.gettags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getTags</refname>
-  <refpurpose>Returns an array of tags describing this server in a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\Server::getTags</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an <type>array</type> of
-   <link xlink:href="&url.mongodb.glossary;#term-tag">tags</link> used to
-   describe this server in a replica set. The array will contain zero or more
-   <type>string</type> key and value pairs.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> of tags used to describe this server in a
-   replica set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/server/gettype.xml b/reference/mongodb/mongodb/driver/server/gettype.xml
deleted file mode 100644
index d395c1e357d4..000000000000
--- a/reference/mongodb/mongodb/driver/server/gettype.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::getType</refname>
-  <refpurpose>Returns an integer denoting the type of this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\Server::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an <type>int</type> denoting the type of this server. The value
-   will correlate with a <classname>MongoDB\Driver\Server</classname> constant.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>int</type> denoting the type of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</function></member>
-   <member><function>MongoDB\Driver\ServerDescription::getType</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/mongodb/mongodb/driver/server/isarbiter.xml b/reference/mongodb/mongodb/driver/server/isarbiter.xml
deleted file mode 100644
index 2444240b061f..000000000000
--- a/reference/mongodb/mongodb/driver/server/isarbiter.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.isarbiter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::isArbiter</refname>
-  <refpurpose>Checks if this server is an arbiter member of a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Server::isArbiter</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this server is an
-   <link xlink:href="&url.mongodb.glossary;#term-arbiter">arbiter member</link>
-   of a replica set.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this server is an arbiter member of a replica set, and
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/server/ishidden.xml b/reference/mongodb/mongodb/driver/server/ishidden.xml
deleted file mode 100644
index 88f854237df9..000000000000
--- a/reference/mongodb/mongodb/driver/server/ishidden.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.ishidden" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::isHidden</refname>
-  <refpurpose>Checks if this server is a hidden member of a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Server::isHidden</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this server is a
-   <link xlink:href="&url.mongodb.glossary;#term-hidden-member">hidden member</link>
-   of a replica set.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this server is a hidden member of a replica set, and
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/server/ispassive.xml b/reference/mongodb/mongodb/driver/server/ispassive.xml
deleted file mode 100644
index 5e6cb5129b9a..000000000000
--- a/reference/mongodb/mongodb/driver/server/ispassive.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.ispassive" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::isPassive</refname>
-  <refpurpose>Checks if this server is a passive member of a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Server::isPassive</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this server is a
-   <link xlink:href="&url.mongodb.glossary;#term-passive-member">passive member</link>
-   of a replica set (i.e. its priority is <literal>0</literal>).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this server is a passive member of a replica set, and
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/server/isprimary.xml b/reference/mongodb/mongodb/driver/server/isprimary.xml
deleted file mode 100644
index ad45b7dea848..000000000000
--- a/reference/mongodb/mongodb/driver/server/isprimary.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.isprimary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::isPrimary</refname>
-  <refpurpose>Checks if this server is a primary member of a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Server::isPrimary</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this server is a
-   <link xlink:href="&url.mongodb.glossary;#term-primary">primary member</link>
-   of a replica set.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this server is a primary member of a replica set, and
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/server/issecondary.xml b/reference/mongodb/mongodb/driver/server/issecondary.xml
deleted file mode 100644
index 172685eb4741..000000000000
--- a/reference/mongodb/mongodb/driver/server/issecondary.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-server.issecondary" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Server::isSecondary</refname>
-  <refpurpose>Checks if this server is a secondary member of a replica set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Server::isSecondary</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this server is a
-   <link xlink:href="&url.mongodb.glossary;#term-secondary">secondary member</link>
-   of a replica set.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this server is a secondary member of a replica set, and
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</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/mongodb/mongodb/driver/serverapi.xml b/reference/mongodb/mongodb/driver/serverapi.xml
deleted file mode 100644
index 912cba728b85..000000000000
--- a/reference/mongodb/mongodb/driver/serverapi.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-serverapi" role="class" 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;
-   <simpara>
-
-   </simpara>
-  </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>
-      <simpara>Server API version 1.</simpara>
-     </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>
-    <simpara>
-     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.
-    </simpara>
-    <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;
-
-</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/mongodb/mongodb/driver/serverapi/bsonserialize.xml b/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
deleted file mode 100644
index 510e7d7dc685..000000000000
--- a/reference/mongodb/mongodb/driver/serverapi/bsonserialize.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverapi.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerApi::bsonSerialize</refname>
-  <refpurpose>Returns an object for BSON serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\ServerApi::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object for serializing the ServerApi as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Serializable::bsonSerialize</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/mongodb/mongodb/driver/serverapi/construct.xml b/reference/mongodb/mongodb/driver/serverapi/construct.xml
deleted file mode 100644
index 6cc8ef288f4c..000000000000
--- a/reference/mongodb/mongodb/driver/serverapi/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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 class="union"><type>bool</type><type>null</type></type><parameter>strict</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>deprecationErrors</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <simpara>
-   Creates a new <classname>MongoDB\Driver\ServerApi</classname> instance used to
-   declare an API version when creating a
-   <classname>MongoDB\Driver\Manager</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry xml:id="mongodb-driver-serverapi.construct-version">
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <simpara>
-      A server API version.
-     </simpara>
-     <simpara>
-      Supported API versions are provided as constants in
-      <classname>MongoDB\Driver\ServerApi</classname>. The only supported API
-      version is <constant>MongoDB\Driver\ServerApi::V1</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="mongodb-driver-manager.construct-strict">
-    <term><parameter>strict</parameter></term>
-    <listitem>
-     <simpara>
-      If the <parameter>strict</parameter> parameter is set to &true;, the
-      server will yield an error for any command that is not part of the
-      specified API version. If no value is provided, the server default value
-      (&false;) is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="mongodb-driver-manager.construct-deprecationErrors">
-    <term><parameter>deprecationErrors</parameter></term>
-    <listitem>
-     <simpara>
-      If the <parameter>deprecationErrors</parameter> parameter is set to &true;,
-      the server will yield an error when using a command that is deprecated in
-      the specified API version. If no value is provided, the server default value
-      (&false;) is used.
-     </simpara>
-    </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/mongodb/mongodb/driver/serverdescription.xml b/reference/mongodb/mongodb/driver/serverdescription.xml
deleted file mode 100644
index 1c9c09a2d488..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-serverdescription" role="class" 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\ServerDescription class</title>
- <titleabbrev>MongoDB\Driver\ServerDescription</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\ServerDescription intro -->
-  <section xml:id="mongodb-driver-serverdescription.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\ServerDescription</classname> class is a value
-    object that represents a server to which the driver is connected. Instances
-    of this class are returned by
-    <function>MongoDB\Driver\Server::getServerDescription</function> and
-    <classname>MongoDB\Driver\Monitoring\ServerChangedEvent</classname> methods.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-serverdescription.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\ServerDescription</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\ServerDescription</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-unknown">MongoDB\Driver\ServerDescription::TYPE_UNKNOWN</varname>
-     <initializer>"Unknown"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-standalone">MongoDB\Driver\ServerDescription::TYPE_STANDALONE</varname>
-     <initializer>"Standalone"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-mongos">MongoDB\Driver\ServerDescription::TYPE_MONGOS</varname>
-     <initializer>"Mongos"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-possible-primary">MongoDB\Driver\ServerDescription::TYPE_POSSIBLE_PRIMARY</varname>
-     <initializer>"PossiblePrimary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-rs-primary">MongoDB\Driver\ServerDescription::TYPE_RS_PRIMARY</varname>
-     <initializer>"RSPrimary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-rs-secondary">MongoDB\Driver\ServerDescription::TYPE_RS_SECONDARY</varname>
-     <initializer>"RSSecondary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-rs-arbiter">MongoDB\Driver\ServerDescription::TYPE_RS_ARBITER</varname>
-     <initializer>"RSArbiter"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-rs-other">MongoDB\Driver\ServerDescription::TYPE_RS_OTHER</varname>
-     <initializer>"RSOther"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-rs-ghost">MongoDB\Driver\ServerDescription::TYPE_RS_GHOST</varname>
-     <initializer>"RSGhost"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-serverdescription.constants.type-load-balancer">MongoDB\Driver\ServerDescription::TYPE_LOAD_BALANCER</varname>
-     <initializer>"LoadBalancer"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-serverdescription')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\ServerDescription constants -->
-  <section xml:id="mongodb-driver-serverdescription.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-unknown">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_UNKNOWN</constant></term>
-     <listitem>
-      <simpara>Unknown server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-standalone">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_STANDALONE</constant></term>
-     <listitem>
-      <simpara>Standalone server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-mongos">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_MONGOS</constant></term>
-     <listitem>
-      <simpara>Mongos server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-possible-primary">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_POSSIBLE_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set possible primary server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-      <simpara>A server may be identified as a possible primary if it has not yet been checked but another memory of the replica set thinks it is the primary.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-rs-primary">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_RS_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set primary server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-rs-secondary">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_RS_SECONDARY</constant></term>
-     <listitem>
-      <simpara>Replica set secondary server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-rs-arbiter">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_RS_ARBITER</constant></term>
-     <listitem>
-      <simpara>Replica set arbiter server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-rs-other">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_RS_OTHER</constant></term>
-     <listitem>
-      <simpara>Replica set other server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-      <simpara>Such servers may be hidden, starting up, or recovering. They cannot be queried, but their hosts lists are useful for discovering the current replica set configuration.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-rs-ghost">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_RS_GHOST</constant></term>
-     <listitem>
-      <simpara>Replica set ghost server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-      <simpara>Servers may be identified as such in at least three situations: briefly during server startup; in an uninitialized replica set; or when the server is shunned (i.e. removed from the replica set config). They cannot be queried, nor can their host list be used to discover the current replica set configuration; however, the client may monitor this server in hope that it transitions to a more useful state.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-serverdescription.constants.type-load-balancer">
-     <term><constant>MongoDB\Driver\ServerDescription::TYPE_LOAD_BALANCER</constant></term>
-     <listitem>
-      <simpara>Load balancer server type, returned by <methodname>MongoDB\Driver\ServerDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.serverdescription;
-
-</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/mongodb/mongodb/driver/serverdescription/gethelloresponse.xml b/reference/mongodb/mongodb/driver/serverdescription/gethelloresponse.xml
deleted file mode 100644
index 4e7605e6a7bc..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/gethelloresponse.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.gethelloresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getHelloResponse</refname>
-  <refpurpose>Returns the server's most recent "hello" response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\ServerDescription::getHelloResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an array of information describing the server. This array is derived
-   from the most recent (at the time the
-   <classname>MongoDB\Driver\ServerDescription</classname> was constructed)
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command response obtained through
-   <link xlink:href="&url.mongodb.sdam;">server monitoring</link>.
-  </simpara>
-  <note>
-   <simpara>
-    When the driver is connected to a load balancer, this method will return an
-    empty array since load balancers are not monitored. This is in contrast to
-    <function>MongoDB\Driver\Server::getInfo</function>, which would return the
-    backing server's
-    <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-    command response from the initial connection handshake.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of information describing this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getInfo</function></member>
-   <member><link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link> command in the MongoDB manual</member>
-   <member><link xlink:href="&url.mongodb.sdam;">Server Discovery and Monitoring Specification</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/mongodb/driver/serverdescription/gethost.xml b/reference/mongodb/mongodb/driver/serverdescription/gethost.xml
deleted file mode 100644
index 38f528cfdcc0..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/gethost.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.gethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getHost</refname>
-  <refpurpose>Returns the hostname of this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\ServerDescription::getHost</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the hostname of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostname of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getHost</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/mongodb/mongodb/driver/serverdescription/getlastupdatetime.xml b/reference/mongodb/mongodb/driver/serverdescription/getlastupdatetime.xml
deleted file mode 100644
index 152b328bd455..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/getlastupdatetime.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.getlastupdatetime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getLastUpdateTime</refname>
-  <refpurpose>Returns the server's last update time in microseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ServerDescription::getLastUpdateTime</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the server's last update time in microseconds.
-  </simpara>
-  <note>
-   <simpara>
-    The returned value is a monotonic timestamp, which starts at an arbitrary
-    point. As such, it is only suitable to compare with other return values from
-    <function>MongoDB\Driver\ServerDescription::getLastUpdateTime</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server's last update time in microseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/serverdescription/getport.xml b/reference/mongodb/mongodb/driver/serverdescription/getport.xml
deleted file mode 100644
index 23e7e0398d57..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/getport.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.getport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getPort</refname>
-  <refpurpose>Returns the port on which this server is listening</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\ServerDescription::getPort</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the port on which this server is listening.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getPort</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/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml b/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml
deleted file mode 100644
index eb6f03f551e3..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/getroundtriptime.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.getroundtriptime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getRoundTripTime</refname>
-  <refpurpose>Returns the server's round trip time in milliseconds</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>MongoDB\Driver\ServerDescription::getRoundTripTime</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the server's round trip time in milliseconds. This is the client's
-   measurement of the duration of a
-   <link xlink:href="&url.mongodb.docs;reference/command/hello/">hello</link>
-   command.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server's round trip time in milliseconds.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getLatency</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/mongodb/mongodb/driver/serverdescription/gettype.xml b/reference/mongodb/mongodb/driver/serverdescription/gettype.xml
deleted file mode 100644
index 3ec04f71d428..000000000000
--- a/reference/mongodb/mongodb/driver/serverdescription/gettype.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-serverdescription.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\ServerDescription::getType</refname>
-  <refpurpose>Returns a string denoting the type of this server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\ServerDescription::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns a <type>string</type> denoting the type of this server. The value
-   will correlate with a <classname>MongoDB\Driver\ServerDescription</classname>
-   constant.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>string</type> denoting the type of this server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Server::getType</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/mongodb/mongodb/driver/session.xml b/reference/mongodb/mongodb/driver/session.xml
deleted file mode 100644
index f752a418ed1e..000000000000
--- a/reference/mongodb/mongodb/driver/session.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-session" role="class" 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\Session class</title>
- <titleabbrev>MongoDB\Driver\Session</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\Session intro -->
-  <section xml:id="mongodb-driver-session.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\Session</classname> class represents a
-    client session and is returned by
-    <methodname>MongoDB\Driver\Manager::startSession</methodname>. Commands,
-    queries, and write operations may then be associated with the session.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-session.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\Session</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\Session</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-session.constants.transaction-none">MongoDB\Driver\Session::TRANSACTION_NONE</varname>
-     <initializer>none</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-session.constants.transaction-starting">MongoDB\Driver\Session::TRANSACTION_STARTING</varname>
-     <initializer>starting</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-session.constants.transaction-in-progress">MongoDB\Driver\Session::TRANSACTION_IN_PROGRESS</varname>
-     <initializer>in_progress</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-session.constants.transaction-committed">MongoDB\Driver\Session::TRANSACTION_COMMITTED</varname>
-     <initializer>committed</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-session.constants.transaction-aborted">MongoDB\Driver\Session::TRANSACTION_ABORTED</varname>
-     <initializer>aborted</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-session')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ MongoDB\Driver\Session constants -->
-  <section xml:id="mongodb-driver-session.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-session.constants.transaction-none">
-     <term><constant>MongoDB\Driver\Session::TRANSACTION_NONE</constant></term>
-     <listitem>
-      <simpara>
-       There is no transaction in progress.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-session.constants.transaction-starting">
-     <term><constant>MongoDB\Driver\Session::TRANSACTION_STARTING</constant></term>
-     <listitem>
-      <simpara>
-       A transaction has been started, but no operation has been sent to the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-session.constants.transaction-in-progress">
-     <term><constant>MongoDB\Driver\Session::TRANSACTION_IN_PROGRESS</constant></term>
-     <listitem>
-      <simpara>
-       A transaction is in progress.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-session.constants.transaction-committed">
-     <term><constant>MongoDB\Driver\Session::TRANSACTION_COMMITTED</constant></term>
-     <listitem>
-      <simpara>
-       The transaction was committed.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-session.constants.transaction-aborted">
-     <term><constant>MongoDB\Driver\Session::TRANSACTION_ABORTED</constant></term>
-     <listitem>
-      <simpara>
-       The transaction was aborted.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-  <!-- }}} -->
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.session;
-
-</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/mongodb/mongodb/driver/session/aborttransaction.xml b/reference/mongodb/mongodb/driver/session/aborttransaction.xml
deleted file mode 100644
index cb03deca2abf..000000000000
--- a/reference/mongodb/mongodb/driver/session/aborttransaction.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.aborttransaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::abortTransaction</refname>
-  <refpurpose>Aborts a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::abortTransaction</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Terminates the multi-document transaction and rolls back any data changes
-   made by the operations within the transaction. That is, the transaction ends
-   without saving any of the changes made by the operations in the transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the transaction could not be aborted (e.g. a transaction was not started).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::startSession</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::commitTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::startTransaction</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/mongodb/mongodb/driver/session/advanceclustertime.xml b/reference/mongodb/mongodb/driver/session/advanceclustertime.xml
deleted file mode 100644
index deaf3ac6fe0a..000000000000
--- a/reference/mongodb/mongodb/driver/session/advanceclustertime.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.advanceclustertime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::advanceClusterTime</refname>
-  <refpurpose>Advances the cluster time for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::advanceClusterTime</methodname>
-   <methodparam><type class="union"><type>array</type><type>object</type></type><parameter>clusterTime</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Advances the cluster time for this session. If the cluster time is less than
-   or equal to the session's current cluster time, this function is a no-op.
-  </simpara>
-  <simpara>
-   By using this method in conjunction with
-   <methodname>MongoDB\Driver\Session::advanceOperationTime</methodname> to copy
-   the cluster and operation times from another session, you can ensure that
-   operations in this session are causally consistent with the last operation in
-   the other session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>clusterTime</parameter></term>
-    <listitem>
-     <simpara>
-      The cluster time is a document containing a logical timestamp and server
-      signature. Typically, this value will be obtained by calling
-      <methodname>MongoDB\Driver\Session::getClusterTime</methodname> on another
-      session object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::advanceOperationTime</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::getClusterTime</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/mongodb/mongodb/driver/session/advanceoperationtime.xml b/reference/mongodb/mongodb/driver/session/advanceoperationtime.xml
deleted file mode 100644
index 8dc7657788bd..000000000000
--- a/reference/mongodb/mongodb/driver/session/advanceoperationtime.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.advanceoperationtime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::advanceOperationTime</refname>
-  <refpurpose>Advances the operation time for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::advanceOperationTime</methodname>
-   <methodparam><type>MongoDB\BSON\TimestampInterface</type><parameter>operationTime</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Advances the operation time for this session. If the operation time is less
-   than or equal to the session's current operation time, this function is a
-   no-op.
-  </simpara>
-  <simpara>
-   By using this method in conjunction with
-   <methodname>MongoDB\Driver\Session::advanceClusterTime</methodname> to copy
-   the operation and cluster times from another session, you can ensure that
-   operations in this session are causally consistent with the last operation in
-   the other session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>operationTime</parameter></term>
-    <listitem>
-     <simpara>
-      The operation time is a logical timestamp. Typically, this value will be
-      obtained by calling
-      <methodname>MongoDB\Driver\Session::getOperationTime</methodname> on
-      another session object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::advanceClusterTime</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::getClusterTime</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/mongodb/mongodb/driver/session/committransaction.xml b/reference/mongodb/mongodb/driver/session/committransaction.xml
deleted file mode 100644
index 24770db07b20..000000000000
--- a/reference/mongodb/mongodb/driver/session/committransaction.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.committransaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::commitTransaction</refname>
-  <refpurpose>Commits a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::commitTransaction</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Saves the changes made by the operations in the multi-document transaction
-   and ends the transaction. Until the commit, none of the data changes made
-   from within the transaction are visible outside the transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws
-   <classname>MongoDB\Driver\Exception\CommandException</classname> if the
-   server could not commit the transaction (e.g. due to conflicts, network
-   issues). In case the exception's
-   <methodname>MongoDB\Driver\Exception\CommandException::getResultDocument</methodname>
-   has a <literal>"errorLabels"</literal> element, and this array contains a
-   <literal>"TransientTransactionError"</literal> or
-   <literal>"UnknownTransactionCommitResult"</literal> value, it is safe to re-try
-   the <emphasis>whole</emphasis> transaction. In newer versions of the
-   extension,
-   <methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</methodname>
-   should be used to test for this situation instead.</member>
-   <member>Throws
-   <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the
-   transaction could not be committed (e.g. a transaction was not
-   started).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::startSession</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::abortTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::startTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Exception\RuntimeException::hasErrorLabel</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/mongodb/mongodb/driver/session/construct.xml b/reference/mongodb/mongodb/driver/session/construct.xml
deleted file mode 100644
index 3b687a447aa8..000000000000
--- a/reference/mongodb/mongodb/driver/session/construct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::__construct</refname>
-  <refpurpose>Create a new Session (not used)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>MongoDB\Driver\Session::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   <classname>MongoDB\Driver\Session</classname> objects are returned by
-   <methodname>MongoDB\Driver\Manager::startSession</methodname> and cannot be
-   constructed directly.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>MongoDB\Driver\Manager::startSession</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/mongodb/mongodb/driver/session/endsession.xml b/reference/mongodb/mongodb/driver/session/endsession.xml
deleted file mode 100644
index aed0800fc51a..000000000000
--- a/reference/mongodb/mongodb/driver/session/endsession.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.endsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::endSession</refname>
-  <refpurpose>Terminates a session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::endSession</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   This method closes an existing session. If a transaction was associated
-   with this session, the transaction will be aborted. After calling this
-   method, applications should not invoke other methods on the session.
-  </simpara>
-  <note>
-   <simpara>
-    Sessions are also closed during garbage collection. It should not be
-    necessary to call this method under normal circumstances.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::startSession</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::abortTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::commitTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::startTransaction</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/mongodb/mongodb/driver/session/getclustertime.xml b/reference/mongodb/mongodb/driver/session/getclustertime.xml
deleted file mode 100644
index 248f468cbd1e..000000000000
--- a/reference/mongodb/mongodb/driver/session/getclustertime.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.getclustertime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getClusterTime</refname>
-  <refpurpose>Returns the cluster time for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\Session::getClusterTime</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the cluster time for this session. If the session has not been used
-   for any operation and
-   <methodname>MongoDB\Driver\Session::advanceClusterTime</methodname> has not
-   been called, the cluster time will be &null;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the cluster time for this session, or &null; if the session has no
-   cluster time.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::advanceClusterTime</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/mongodb/mongodb/driver/session/getlogicalsessionid.xml b/reference/mongodb/mongodb/driver/session/getlogicalsessionid.xml
deleted file mode 100644
index 7bf28358e11f..000000000000
--- a/reference/mongodb/mongodb/driver/session/getlogicalsessionid.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.getlogicalsessionid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getLogicalSessionId</refname>
-  <refpurpose>Returns the logical session ID for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>object</type><methodname>MongoDB\Driver\Session::getLogicalSessionId</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the logical session ID for this session, which may be used to
-   identify this session's operations on the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the logical session ID for this session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/session/getoperationtime.xml b/reference/mongodb/mongodb/driver/session/getoperationtime.xml
deleted file mode 100644
index 2e1355f40fec..000000000000
--- a/reference/mongodb/mongodb/driver/session/getoperationtime.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.getoperationtime" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getOperationTime</refname>
-  <refpurpose>Returns the operation time for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\BSON\Timestamp</type><type>null</type></type><methodname>MongoDB\Driver\Session::getOperationTime</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the operation time for this session. If the session has not been used
-   for any operation and
-   <methodname>MongoDB\Driver\Session::advanceOperationTime</methodname> has not
-   been called, the operation time will be &null;
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the operation time for this session, or &null; if the session has no
-   operation time.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::advanceOperationTime</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/mongodb/mongodb/driver/session/getserver.xml b/reference/mongodb/mongodb/driver/session/getserver.xml
deleted file mode 100644
index 7209fe7a81b6..000000000000
--- a/reference/mongodb/mongodb/driver/session/getserver.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344522 $ -->
-
-<refentry xml:id="mongodb-driver-session.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getServer</refname>
-  <refpurpose>Returns the server to which this session is pinned</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\Driver\Server</type><type>null</type></type><methodname>MongoDB\Driver\Session::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> to which this
-   session is pinned. If the session is not pinned to a server, &null; will be
-   returned.
-  </simpara>
-  <simpara>
-   Session pinning is primarily used for sharded transactions, as all commands
-   within a sharded transaction must be sent to the same mongos instance. This
-   method is intended to be used by libraries built atop the extension to allow
-   use of a pinned server instead of invoking server selection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> to which this
-   session is pinned, or &null; if the session is not pinned to any server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/session/gettransactionoptions.xml b/reference/mongodb/mongodb/driver/session/gettransactionoptions.xml
deleted file mode 100644
index 216f0b320f07..000000000000
--- a/reference/mongodb/mongodb/driver/session/gettransactionoptions.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344522 $ -->
-
-<refentry xml:id="mongodb-driver-session.gettransactionoptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getTransactionOptions</refname>
-  <refpurpose>Returns options for the currently running transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>MongoDB\Driver\Session::getTransactionOptions</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns options for the currently running transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>array</type> containing current transaction options, or
-   &null; if no transaction is running.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::getTransactionState</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/mongodb/mongodb/driver/session/gettransactionstate.xml b/reference/mongodb/mongodb/driver/session/gettransactionstate.xml
deleted file mode 100644
index c61035ccfec1..000000000000
--- a/reference/mongodb/mongodb/driver/session/gettransactionstate.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344522 $ -->
-
-<refentry xml:id="mongodb-driver-session.gettransactionstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::getTransactionState</refname>
-  <refpurpose>Returns the current transaction state for this session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\Session::getTransactionState</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the transaction state for this session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current transaction state for this session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::isInTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::getTransactionOptions</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/mongodb/mongodb/driver/session/isdirty.xml b/reference/mongodb/mongodb/driver/session/isdirty.xml
deleted file mode 100644
index f07297de3850..000000000000
--- a/reference/mongodb/mongodb/driver/session/isdirty.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344522 $ -->
-
-<refentry xml:id="mongodb-driver-session.isdirty" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::isDirty</refname>
-  <refpurpose>Returns whether the session has been marked as dirty</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Session::isDirty</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether the session has been marked as dirty (i.e. it has been used
-   with a command that encountered a network error).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns whether the session has been marked as dirty.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/session/isintransaction.xml b/reference/mongodb/mongodb/driver/session/isintransaction.xml
deleted file mode 100644
index 7f372462e0e0..000000000000
--- a/reference/mongodb/mongodb/driver/session/isintransaction.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 344522 $ -->
-
-<refentry xml:id="mongodb-driver-session.isintransaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::isInTransaction</refname>
-  <refpurpose>Returns whether a multi-document transaction is in progress</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\Session::isInTransaction</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether a multi-document transaction is currently in progress for
-   this session. A transaction is considered "in progress" if it has been
-   started but has not been committed or aborted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if a transaction is currently in progress for this session,
-   and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Session::getTransactionState</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/mongodb/mongodb/driver/session/starttransaction.xml b/reference/mongodb/mongodb/driver/session/starttransaction.xml
deleted file mode 100644
index 01f953196679..000000000000
--- a/reference/mongodb/mongodb/driver/session/starttransaction.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-session.starttransaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\Session::startTransaction</refname>
-  <refpurpose>Starts a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>MongoDB\Driver\Session::startTransaction</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Starts a multi-document transaction associated with the session. At any given
-   time, you can have at most one open transaction for a session. After starting
-   a transaction, the session object must be passed to each operation via
-   the <literal>"session"</literal> option (e.g.
-   <methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>) in order
-   to associate that operation with the transaction.
-  </simpara>
-  <simpara>
-   Transactions can be committed through
-   <methodname>MongoDB\Driver\Session::commitTransaction</methodname>, and
-   aborted with
-   <methodname>MongoDB\Driver\Session::abortTransaction</methodname>.
-   Transactions are also automatically aborted when the session is closed from
-   garbage collection or by explicitly calling
-   <methodname>MongoDB\Driver\Session::endSession</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options can be passed as argument to this method. Each element in this
-      options array overrides the corresponding option from the
-      <literal>"defaultTransactionOptions"</literal> option, if set when
-      starting the session with
-      <methodname>MongoDB\Driver\Manager::startSession</methodname>.
-     </simpara>
-     <para>
-      <table>
-       <title>options</title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Option</entry>
-          <entry>Type</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         &mongodb.option.maxCommitTimeMS;
-         &mongodb.option.readConcern;
-         &mongodb.option.readPreference;
-         &mongodb.option.writeConcern;
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\CommandException</classname> if the transaction could not be started because of a server-side problem (e.g. a lock could not be obtained).</member>
-   <member>Throws <classname>MongoDB\Driver\Exception\RuntimeException</classname> if the transaction could not be started (e.g. a transaction was already started).</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.6.0</entry>
-      <entry>
-       <simpara>
-        The <literal>"maxCommitTimeMS"</literal> option was added.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::startSession</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::commitTransaction</methodname></member>
-   <member><methodname>MongoDB\Driver\Session::abortTransaction</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/mongodb/mongodb/driver/topologydescription.xml b/reference/mongodb/mongodb/driver/topologydescription.xml
deleted file mode 100644
index 8d64fc79f088..000000000000
--- a/reference/mongodb/mongodb/driver/topologydescription.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-topologydescription" role="class" 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\TopologyDescription class</title>
- <titleabbrev>MongoDB\Driver\TopologyDescription</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\TopologyDescription intro -->
-  <section xml:id="mongodb-driver-topologydescription.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\TopologyDescription</classname> class is a
-    value object that represents a topology to which the driver is connected.
-    Instances of this class are returned by
-    <classname>MongoDB\Driver\Monitoring\TopologyChangedEvent</classname>
-    methods.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-topologydescription.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\TopologyDescription</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\TopologyDescription</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-unknown">MongoDB\Driver\TopologyDescription::TYPE_UNKNOWN</varname>
-     <initializer>"Unknown"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-single">MongoDB\Driver\TopologyDescription::TYPE_SINGLE</varname>
-     <initializer>"Single"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-sharded">MongoDB\Driver\TopologyDescription::TYPE_SHARDED</varname>
-     <initializer>"Sharded"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-replica-set-no-primary">MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_NO_PRIMARY</varname>
-     <initializer>"ReplicaSetNoPrimary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-replica-set-with-primary">MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_WITH_PRIMARY</varname>
-     <initializer>"ReplicaSetWithPrimary"</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-topologydescription.constants.type-load-balanced">MongoDB\Driver\TopologyDescription::TYPE_LOAD_BALANCED</varname>
-     <initializer>"LoadBalanced"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-topologydescription')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\TopologyDescription constants -->
-  <section xml:id="mongodb-driver-topologydescription.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-unknown">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_UNKNOWN</constant></term>
-     <listitem>
-      <simpara>Unknown topology type, returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-single">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_SINGLE</constant></term>
-     <listitem>
-      <simpara>Single server (i.e. direct connection), returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-sharded">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_SHARDED</constant></term>
-     <listitem>
-      <simpara>Sharded cluster, returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-replica-set-no-primary">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_NO_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set with no primary server, returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-replica-set-with-primary">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_WITH_PRIMARY</constant></term>
-     <listitem>
-      <simpara>Replica set with a primary server, returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mongodb-driver-topologydescription.constants.type-load-balanced">
-     <term><constant>MongoDB\Driver\TopologyDescription::TYPE_LOAD_BALANCED</constant></term>
-     <listitem>
-      <simpara>Load balanced topology, returned by <methodname>MongoDB\Driver\TopologyDescription::getType</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.topologydescription;
-
-</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/mongodb/mongodb/driver/topologydescription/getservers.xml b/reference/mongodb/mongodb/driver/topologydescription/getservers.xml
deleted file mode 100644
index 305332c7c070..000000000000
--- a/reference/mongodb/mongodb/driver/topologydescription/getservers.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-topologydescription.getservers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\TopologyDescription::getServers</refname>
-  <refpurpose>Returns the servers in the topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\TopologyDescription::getServers</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns an array of <classname>MongoDB\Driver\ServerDescription</classname>
-   objects corresponding to the known servers in the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of <classname>MongoDB\Driver\ServerDescription</classname>
-   objects corresponding to the known servers in the topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/topologydescription/gettype.xml b/reference/mongodb/mongodb/driver/topologydescription/gettype.xml
deleted file mode 100644
index 43ea094f15ab..000000000000
--- a/reference/mongodb/mongodb/driver/topologydescription/gettype.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-topologydescription.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\TopologyDescription::getType</refname>
-  <refpurpose>Returns a string denoting the type of this topology</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\TopologyDescription::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns a <type>string</type> denoting the type of this topology. The value
-   will correlate with a
-   <classname>MongoDB\Driver\TopologyDescription</classname> constant.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <type>string</type> denoting the type of this topology.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/topologydescription/hasreadableserver.xml b/reference/mongodb/mongodb/driver/topologydescription/hasreadableserver.xml
deleted file mode 100644
index 2c66513fffa3..000000000000
--- a/reference/mongodb/mongodb/driver/topologydescription/hasreadableserver.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-topologydescription.hasreadableserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\TopologyDescription::hasReadableServer</refname>
-  <refpurpose>Returns whether the topology has a readable server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\TopologyDescription::hasReadableServer</methodname>
-   <methodparam choice="opt"><type class="union"><type>MongoDB\Driver\ReadPreference</type><type>null</type></type><parameter>readPreference</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns whether the topology has a readable server or, if
-   <parameter>readPreference</parameter> is specified, a server matching the
-   specified read preference.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns whether the topology has a readable server or, if
-   <parameter>readPreference</parameter> is specified, a server matching the
-   specified read preference.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/topologydescription/haswritableserver.xml b/reference/mongodb/mongodb/driver/topologydescription/haswritableserver.xml
deleted file mode 100644
index 4763f63d8b05..000000000000
--- a/reference/mongodb/mongodb/driver/topologydescription/haswritableserver.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-topologydescription.haswritableserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\TopologyDescription::hasWritableServer</refname>
-  <refpurpose>Returns whether the topology has a writable server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\TopologyDescription::hasWritableServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether the topology has a writable server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns whether the topology has a writable server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/writeconcern.xml b/reference/mongodb/mongodb/driver/writeconcern.xml
deleted file mode 100644
index c1769066b76e..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-writeconcern" role="class" 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\WriteConcern class</title>
- <titleabbrev>MongoDB\Driver\WriteConcern</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\WriteConcern intro -->
-  <section xml:id="mongodb-driver-writeconcern.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>MongoDB\Driver\WriteConcern</classname> describes the level of
-    acknowledgement requested from MongoDB for write operations to a standalone
-    <literal>mongod</literal> or to replica sets or to sharded clusters. In
-    sharded clusters, <literal>mongos</literal> instances will pass the write
-    concern on to the shards.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-writeconcern.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\WriteConcern</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\WriteConcern</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-writeconcern.constants.majority">MongoDB\Driver\WriteConcern::MAJORITY</varname>
-     <initializer>"majority"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>string</type><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeconcern.props.w">w</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>bool</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeconcern.props.j">j</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-writeconcern.props.wtimeout">wtimeout</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-writeconcern')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\WriteConcern properties -->
-  <section xml:id="mongodb-driver-writeconcern.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-writeconcern.props.w">
-     <term><varname>w</varname></term>
-     <listitem>
-      <simpara>
-       The write concern value (integer number of nodes, the string
-       <literal>"majority"</literal>, or a custom write concern tag name),
-       or &null; if not set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeconcern.props.j">
-     <term><varname>j</varname></term>
-     <listitem>
-      <simpara>
-       Whether write operations must be committed to the journal before
-       acknowledged, or &null; if not specified.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeconcern.props.wtimeout">
-     <term><varname>wtimeout</varname></term>
-     <listitem>
-      <simpara>
-       The timeout in milliseconds to wait for write concern acknowledgement.
-       A value of <literal>0</literal> means to wait indefinitely.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ MongoDB\Driver\WriteConcern constants -->
-  <section xml:id="mongodb-driver-writeconcern.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mongodb-driver-writeconcern.constants.majority">
-     <term><constant>MongoDB\Driver\WriteConcern::MAJORITY</constant></term>
-     <listitem>
-      <simpara>
-       Majority of all the members in the set; arbiters, non-voting members,
-       passive members, hidden members and delayed members are all included in
-       the definition of majority write concern.
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.7.0</entry>
-       <entry>
-        Implements <interfacename>Serializable</interfacename>.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL mongodb 1.2.0</entry>
-       <entry>
-        Implements <interfacename>MongoDB\BSON\Serializable</interfacename>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.writeconcern;
-
-</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/mongodb/mongodb/driver/writeconcern/bsonserialize.xml b/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml
deleted file mode 100644
index 583db2322951..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/bsonserialize.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.bsonserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::bsonSerialize</refname>
-  <refpurpose>Returns an object for BSON serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>stdClass</type><methodname>MongoDB\Driver\WriteConcern::bsonSerialize</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object for serializing the WriteConcern as BSON.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::bsonSerialize</function> with majority write concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY);
-var_dump($wc->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($wc)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (1) {
-  ["w"]=>
-  string(8) "majority"
-}
-
-{ "w" : "majority" }
-]]>
-   </screen>
-  </example><example>
-   <title><function>MongoDB\Driver\WriteConcern::bsonSerialize</function> with wtimeout and journal</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(2, 1000, true);
-var_dump($wc->bsonSerialize());
-
-echo "\n", MongoDB\BSON\Document::fromPHP($wc)->toRelaxedExtendedJSON();
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#2 (3) {
-  ["w"]=>
-  int(2)
-  ["j"]=>
-  bool(true)
-  ["wtimeout"]=>
-  int(1000)
-}
-
-{ "w" : 2, "j" : true, "wtimeout" : 1000 }
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\BSON\Serializable::bsonSerialize</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcern/construct.xml b/reference/mongodb/mongodb/driver/writeconcern/construct.xml
deleted file mode 100644
index 19c0c04ae4b1..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/construct.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::__construct</refname>
-  <refpurpose>Create a new WriteConcern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>MongoDB\Driver\WriteConcern::__construct</methodname>
-   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>w</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>int</type><type>null</type></type><parameter>wtimeout</parameter><initializer>&null;</initializer></methodparam>
-  <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>journal</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a new <classname>MongoDB\Driver\WriteConcern</classname>, which is
-   an immutable value object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>w</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title>Write concern</title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>Value</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>1</entry>
-          <entry>
-            Requests acknowledgement that the write operation has propagated to
-            the standalone <literal>mongod</literal> or the primary in a replica
-            set. This is the default write concern for MongoDB.
-          </entry>
-         </row>
-         <row>
-          <entry>0</entry>
-          <entry>
-           Requests no acknowledgment of the write operation. However, this may
-           return information about socket exceptions and networking errors to
-           the application.
-          </entry>
-         </row>
-         <row>
-          <entry>&lt;integer greater than 1&gt;</entry>
-          <entry>
-           Numbers greater than 1 are valid only for replica sets to request
-           acknowledgement from specified number of members, including the
-           primary.
-          </entry>
-         </row>
-         <row>
-          <entry><constant>MongoDB\Driver\WriteConcern::MAJORITY</constant></entry>
-          <entry>
-           <simpara>
-            Requests acknowledgment that write operations have propagated to the
-            majority of voting nodes, including the primary, and have been
-            written to the on-disk journal for these nodes.
-           </simpara>
-           <simpara>
-            Prior to MongoDB 3.0, this refers to the majority of replica set
-            members (not just voting nodes).
-           </simpara>
-          </entry>
-         </row>
-         <row>
-          <entry>string</entry>
-          <entry>
-           A string value is interpereted as a tag set. Requests acknowledgement
-           that the write operations have propagated to a replica set member
-           with the specified tag.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>wtimeout</parameter></term>
-    <listitem>
-     <simpara>
-      How long to wait (in milliseconds) for secondaries before failing.
-     </simpara>
-     <simpara>
-      <literal>wtimeout</literal> causes write operations to return with an
-      error (<classname>WriteConcernError</classname>) after the specified
-      limit, even if the required write concern will eventually succeed. When
-      these write operations return, MongoDB does not undo successful data
-      modifications performed before the write concern exceeded the
-      <literal>wtimeout</literal> time limit.
-     </simpara>
-     <simpara>
-      If specified, <literal>wtimeout</literal> must be a signed 64-bit integer
-      greater than or equal to zero.
-     </simpara>
-     <para>
-      <table>
-       <title>Write concern timeout</title>
-       <tgroup cols="2">
-        <thead>
-         <row>
-          <entry>Value</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>0</entry>
-          <entry>Block indefinitely. This is the default.</entry>
-         </row>
-         <row>
-          <entry>&lt;integer greater than 0&gt;</entry>
-          <entry>
-           Milliseconds to wait until returning.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>journal</parameter></term>
-    <listitem>
-     <simpara>
-      Wait until mongod has applied the write to the journal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-   <member>Throws <classname>MongoDB\Driver\Exception\InvalidArgumentException</classname> if <parameter>w</parameter> is invalid or <parameter>wtimeout</parameter> is either negative or greater than the bounds of a signed 32-bit integer.</member>
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.7.0</entry>
-      <entry>
-       The <parameter>wTimeout</parameter> parameter now accepts 64-bit values.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Request write acknowledgement from the majority of the replica set nodes */
-$wc = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY, 500);
-
-/* Request write acknowledgement from a node configured with the "MultipleDC" tag */
-$wc = new MongoDB\Driver\WriteConcern("MultipleDC", 500);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcern/getjournal.xml b/reference/mongodb/mongodb/driver/writeconcern/getjournal.xml
deleted file mode 100644
index 5a078cc8acec..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/getjournal.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.getjournal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::getJournal</refname>
-  <refpurpose>Returns the WriteConcern&apos;s "journal" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>MongoDB\Driver\WriteConcern::getJournal</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteConcern&apos;s "journal" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::getJournal</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(1);
-var_dump($wc->getJournal());
-
-$wc = new MongoDB\Driver\WriteConcern(1, 0, true);
-var_dump($wc->getJournal());
-
-$wc = new MongoDB\Driver\WriteConcern(1, 0, false);
-var_dump($wc->getJournal());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-NULL
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcern/getw.xml b/reference/mongodb/mongodb/driver/writeconcern/getw.xml
deleted file mode 100644
index 8fda4ab1f0cc..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/getw.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.getw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::getW</refname>
-  <refpurpose>Returns the WriteConcern&apos;s "w" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>int</type><type>null</type></type><methodname>MongoDB\Driver\WriteConcern::getW</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteConcern&apos;s "w" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::getW</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(1);
-var_dump($wc->getW());
-
-$wc = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY);
-var_dump($wc->getW());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-string(8) "majority"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcern/getwtimeout.xml b/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
deleted file mode 100644
index facd0ad51c6b..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/getwtimeout.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.getwtimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::getWtimeout</refname>
-  <refpurpose>Returns the WriteConcern&apos;s "wtimeout" option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteConcern::getWtimeout</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteConcern&apos;s "wtimeout" option.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL mongodb 1.7.0</entry>
-      <entry>
-       On 32-bit systems, this method will always truncate the <literal>wTimeout</literal>
-       value if it exceeds the 32-bit range. In that case, a warning will be
-       emitted.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::getWtimeout</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(1);
-var_dump($wc->getWtimeout());
-
-$wc = new MongoDB\Driver\WriteConcern(MongoDB\Driver\WriteConcern::MAJORITY, 3000);
-var_dump($wc->getWtimeout());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(0)
-int(3000)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcern/isdefault.xml b/reference/mongodb/mongodb/driver/writeconcern/isdefault.xml
deleted file mode 100644
index c6d3ef7344e1..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcern/isdefault.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcern.isdefault" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcern::isDefault</refname>
-  <refpurpose>Checks if this is the default write concern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\WriteConcern::isDefault</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns whether this is the default write concern (i.e. no options are
-   specified). This method is primarily intended to be used in conjunction with
-   <methodname>MongoDB\Driver\Manager::getWriteConcern</methodname> to determine
-   whether the Manager has been constructed without any write concern options.
-  </simpara>
-  <simpara>
-   The driver will not include a default write concern in its write operations
-   (e.g. <methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>) in
-   order to allow the server to apply its own default, which may have been
-   <link xlink:href="&url.mongodb.docs;core/replica-set-write-concern/#modify-default-write-concern">modified</link>.
-   Libraries that access the Manager's write concern to include it in their own
-   write commands should use this method to ensure that default write concerns
-   are left unset.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this is the default write concern and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcern::isDefault</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$wc = new MongoDB\Driver\WriteConcern(1);
-var_dump($wc->isDefault());
-
-$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/?w=majority');
-$wc = $manager->getWriteConcern();
-var_dump($wc->isDefault());
-
-$manager = new MongoDB\Driver\Manager('mongodb://127.0.0.1/');
-$wc = $manager->getWriteConcern();
-var_dump($wc->isDefault());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\Manager::getWriteConcern</methodname></member>
-   <member><link xlink:href="&url.mongodb.docs;core/replica-set-write-concern/#modify-default-write-concern">Modify Default Write Concern</link> in the MongoDB manual</member>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcernerror.xml b/reference/mongodb/mongodb/driver/writeconcernerror.xml
deleted file mode 100644
index f6f8533554fd..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcernerror.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-writeconcernerror" role="class" 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\WriteConcernError class</title>
- <titleabbrev>MongoDB\Driver\WriteConcernError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\WriteConcernError intro -->
-  <section xml:id="mongodb-driver-writeconcernerror.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\WriteConcernError</classname> class
-    encapsulates information about a write concern error and may be returned by
-    <methodname>MongoDB\Driver\WriteResult::getWriteConcernError</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-writeconcernerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\WriteConcernError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\WriteConcernError</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-writeconcernerror.props.message">message</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-writeconcernerror.props.code">code</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>object</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeconcernerror.props.info">info</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-writeconcernerror')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\WriteConcernError properties -->
-  <section xml:id="mongodb-driver-writeconcernerror.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-writeconcernerror.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <simpara>The error message.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeconcernerror.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <simpara>The error code.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeconcernerror.props.info">
-     <term><varname>info</varname></term>
-     <listitem>
-      <simpara>
-       Additional information for the error, or &null; if not available.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.writeconcernerror;
-
-</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/mongodb/mongodb/driver/writeconcernerror/getcode.xml b/reference/mongodb/mongodb/driver/writeconcernerror/getcode.xml
deleted file mode 100644
index acee94a89879..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcernerror/getcode.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcernerror.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcernError::getCode</refname>
-  <refpurpose>Returns the WriteConcernError&apos;s error code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteConcernError::getCode</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteConcernError&apos;s error code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcernError::getCode</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://rs1.example.com,rs2.example.com/?replicaSet=myReplicaSet");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(2, 1);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteConcernError()->getCode());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(64)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcernerror/getinfo.xml b/reference/mongodb/mongodb/driver/writeconcernerror/getinfo.xml
deleted file mode 100644
index 693bca00fb74..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcernerror/getinfo.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcernerror.getinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcernError::getInfo</refname>
-  <refpurpose>Returns metadata document for the WriteConcernError</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\WriteConcernError::getInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the metadata document for the WriteConcernError, or &null; if
-   no metadata is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcernError::getInfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://rs1.example.com,rs2.example.com/?replicaSet=myReplicaSet");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(2, 1);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteConcernError()->getInfo());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(stdClass)#1 (1) {
-  ["wtimeout"]=>
-  bool(true)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeconcernerror/getmessage.xml b/reference/mongodb/mongodb/driver/writeconcernerror/getmessage.xml
deleted file mode 100644
index fc2a4e62345b..000000000000
--- a/reference/mongodb/mongodb/driver/writeconcernerror/getmessage.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeconcernerror.getmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteConcernError::getMessage</refname>
-  <refpurpose>Returns the WriteConcernError&apos;s error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\WriteConcernError::getMessage</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteConcernError&apos;s error message.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteConcernError::getMessage</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://rs1.example.com,rs2.example.com/?replicaSet=myReplicaSet");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(2, 1);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteConcernError()->getMessage());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(33) "waiting for replication timed out"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeerror.xml b/reference/mongodb/mongodb/driver/writeerror.xml
deleted file mode 100644
index 9ebcef86575d..000000000000
--- a/reference/mongodb/mongodb/driver/writeerror.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-writeerror" role="class" 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\WriteError class</title>
- <titleabbrev>MongoDB\Driver\WriteError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\WriteError intro -->
-  <section xml:id="mongodb-driver-writeerror.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\WriteError</classname> class encapsulates
-    information about a write error and may be returned as an array element from
-    <methodname>MongoDB\Driver\WriteResult::getWriteErrors</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-writeerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\WriteError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\WriteError</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="mongodb-driver-writeerror.props.message">message</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-writeerror.props.code">code</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>int</type>
-     <varname linkend="mongodb-driver-writeerror.props.index">index</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>object</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeerror.props.info">info</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-writeerror')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\WriteError properties -->
-  <section xml:id="mongodb-driver-writeerror.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-writeerror.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <simpara>The error message.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeerror.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <simpara>The error code.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeerror.props.index">
-     <term><varname>index</varname></term>
-     <listitem>
-      <simpara>
-       The index of the write operation within the
-       <classname>MongoDB\Driver\BulkWrite</classname> that caused the error.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeerror.props.info">
-     <term><varname>info</varname></term>
-     <listitem>
-      <simpara>
-       Additional information for the error, or &null; if not available.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.writeerror;
-
-</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/mongodb/mongodb/driver/writeerror/getcode.xml b/reference/mongodb/mongodb/driver/writeerror/getcode.xml
deleted file mode 100644
index c2be05e720f6..000000000000
--- a/reference/mongodb/mongodb/driver/writeerror/getcode.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeerror.getcode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteError::getCode</refname>
-  <refpurpose>Returns the WriteError&apos;s error code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteError::getCode</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteError&apos;s error code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteError::getCode</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 1]);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteErrors()[0]->getCode());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(11000)
-]]>
-   </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/mongodb/mongodb/driver/writeerror/getindex.xml b/reference/mongodb/mongodb/driver/writeerror/getindex.xml
deleted file mode 100644
index df6199a72b99..000000000000
--- a/reference/mongodb/mongodb/driver/writeerror/getindex.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeerror.getindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteError::getIndex</refname>
-  <refpurpose>Returns the index of the write operation corresponding to this WriteError</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteError::getIndex</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the index of the write operation (from
-   <classname>MongoDB\Driver\BulkWrite</classname>) corresponding to this
-   WriteError.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteError::getIndex</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 1]);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteErrors()[0]->getIndex());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\BulkWrite</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/mongodb/mongodb/driver/writeerror/getinfo.xml b/reference/mongodb/mongodb/driver/writeerror/getinfo.xml
deleted file mode 100644
index 4f607ab9935e..000000000000
--- a/reference/mongodb/mongodb/driver/writeerror/getinfo.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeerror.getinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteError::getInfo</refname>
-  <refpurpose>Returns metadata document for the WriteError</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>object</type><type>null</type></type><methodname>MongoDB\Driver\WriteError::getInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the metadata document for the WriteError, or &null; if no metadata is
-   available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </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/writeerror/getmessage.xml b/reference/mongodb/mongodb/driver/writeerror/getmessage.xml
deleted file mode 100644
index 461221c71d8e..000000000000
--- a/reference/mongodb/mongodb/driver/writeerror/getmessage.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeerror.getmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteError::getMessage</refname>
-  <refpurpose>Returns the WriteError&apos;s error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>MongoDB\Driver\WriteError::getMessage</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the WriteError&apos;s error message.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteError::getMessage</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 1]);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteErrors()[0]->getMessage());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(70) "E11000 duplicate key error index: db.collection.$_id_ dup key: { : 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/mongodb/mongodb/driver/writeresult.xml b/reference/mongodb/mongodb/driver/writeresult.xml
deleted file mode 100644
index e14aee3a9082..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult.xml
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mongodb-driver-writeresult" role="class" 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\WriteResult class</title>
- <titleabbrev>MongoDB\Driver\WriteResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ MongoDB\Driver\WriteResult intro -->
-  <section xml:id="mongodb-driver-writeresult.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>MongoDB\Driver\WriteResult</classname> class encapsulates
-    information about an executed
-    <classname>MongoDB\Driver\BulkWrite</classname> and may be returned by
-    <methodname>MongoDB\Driver\Manager::executeBulkWrite</methodname>.
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mongodb-driver-writeresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>MongoDB\Driver\WriteResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>MongoDB\Driver\WriteResult</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.insertedcount">insertedCount</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.matchedcount">matchedCount</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.modifiedcount">modifiedCount</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.deletedcount">deletedCount</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>int</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.upsertedcount">upsertedCount</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>MongoDB\Driver\Server</type>
-     <varname linkend="mongodb-driver-writeresult.props.server">server</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>array</type>
-     <varname linkend="mongodb-driver-writeresult.props.upsertedids">upsertedIds</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>array</type>
-     <varname linkend="mongodb-driver-writeresult.props.writeerrors">writeErrors</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>MongoDB\Driver\WriteConcernError</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.writeconcernerror">writeConcernError</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type class="union"><type>MongoDB\Driver\WriteConcern</type><type>null</type></type>
-     <varname linkend="mongodb-driver-writeresult.props.writeconcern">writeConcern</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>array</type>
-     <varname linkend="mongodb-driver-writeresult.props.errorreplies">errorReplies</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mongodb-driver-writeresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ MongoDB\Driver\WriteResult properties -->
-  <section xml:id="mongodb-driver-writeresult.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.insertedcount">
-     <term><varname>insertedCount</varname></term>
-     <listitem>
-      <simpara>
-       The number of documents inserted (excluding upserts), or &null; if
-       the write concern did not request acknowledgement.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.matchedcount">
-     <term><varname>matchedCount</varname></term>
-     <listitem>
-      <simpara>
-       The number of documents matched by update and replace operations, or
-       &null; if the write concern did not request acknowledgement.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.modifiedcount">
-     <term><varname>modifiedCount</varname></term>
-     <listitem>
-      <simpara>
-       The number of documents modified by update and replace operations, or
-       &null; if the write concern did not request acknowledgement or if the
-       server did not report this information.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.deletedcount">
-     <term><varname>deletedCount</varname></term>
-     <listitem>
-      <simpara>
-       The number of documents deleted, or &null; if the write concern did
-       not request acknowledgement.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.upsertedcount">
-     <term><varname>upsertedCount</varname></term>
-     <listitem>
-      <simpara>
-       The number of documents upserted, or &null; if the write concern did
-       not request acknowledgement.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.server">
-     <term><varname>server</varname></term>
-     <listitem>
-      <simpara>
-       The server that executed the bulk write.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.upsertedids">
-     <term><varname>upsertedIds</varname></term>
-     <listitem>
-      <simpara>
-       An array of <literal>_id</literal> values for upserted documents.
-       Array keys will correspond to the index of the write operation from
-       <classname>MongoDB\Driver\BulkWrite</classname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.writeerrors">
-     <term><varname>writeErrors</varname></term>
-     <listitem>
-      <simpara>
-       An array of <classname>MongoDB\Driver\WriteError</classname>s for any
-       write errors that occurred during execution.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.writeconcernerror">
-     <term><varname>writeConcernError</varname></term>
-     <listitem>
-      <simpara>
-       The <classname>MongoDB\Driver\WriteConcernError</classname> that
-       occurred, or &null; if no write concern error occurred.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.writeconcern">
-     <term><varname>writeConcern</varname></term>
-     <listitem>
-      <simpara>
-       The <classname>MongoDB\Driver\WriteConcern</classname> used for the
-       bulk write, or &null; if not available.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mongodb-driver-writeresult.props.errorreplies">
-     <term><varname>errorReplies</varname></term>
-     <listitem>
-      <simpara>
-       An array of error reply documents from the server.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PECL mongodb 2.3.0</entry>
-       <entry>
-        Added public <modifier>readonly</modifier> properties.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
-
- </partintro>
-
- &reference.mongodb.mongodb.driver.entities.writeresult;
-
-</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/mongodb/mongodb/driver/writeresult/getdeletedcount.xml b/reference/mongodb/mongodb/driver/writeresult/getdeletedcount.xml
deleted file mode 100644
index 5815c6838eb9..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getdeletedcount.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getdeletedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getDeletedCount</refname>
-  <refpurpose>Returns the number of documents deleted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteResult::getDeletedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of documents deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.unacknowledged;
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.throw-unacknowledged-write;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getDeletedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getDeletedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getinsertedcount.xml b/reference/mongodb/mongodb/driver/writeresult/getinsertedcount.xml
deleted file mode 100644
index 68c94bb4ccb8..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getinsertedcount.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getinsertedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getInsertedCount</refname>
-  <refpurpose>Returns the number of documents inserted (excluding upserts)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteResult::getInsertedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of documents inserted (excluding upserts).
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.unacknowledged;
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.throw-unacknowledged-write;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getInsertedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getInsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getmatchedcount.xml b/reference/mongodb/mongodb/driver/writeresult/getmatchedcount.xml
deleted file mode 100644
index 6319c769b599..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getmatchedcount.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getmatchedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getMatchedCount</refname>
-  <refpurpose>Returns the number of documents selected for update</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteResult::getMatchedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the update operation results in no change to the document (e.g. setting
-   the value of a field to its current value), the matched count may be greater
-   than the value returned by
-   <methodname>MongoDB\Driver\WriteResult::getModifiedCount</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of documents selected for update.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.unacknowledged;
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.throw-unacknowledged-write;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getMatchedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getMatchedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::getModifiedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getmodifiedcount.xml b/reference/mongodb/mongodb/driver/writeresult/getmodifiedcount.xml
deleted file mode 100644
index acbe6da8c830..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getmodifiedcount.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getmodifiedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getModifiedCount</refname>
-  <refpurpose>Returns the number of existing documents updated</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteResult::getModifiedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the update operation results in no change to the document (e.g. setting
-   the value of a field to its current value), the modified count may be less
-   than the value returned by
-   <methodname>MongoDB\Driver\WriteResult::getMatchedCount</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of existing documents updated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.unacknowledged;
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.throw-unacknowledged-write;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getModifiedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getModifiedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::getMatchedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getserver.xml b/reference/mongodb/mongodb/driver/writeresult/getserver.xml
deleted file mode 100644
index 1a3fa8213bfb..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getserver.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getServer</refname>
-  <refpurpose>Returns the server associated with this write result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>MongoDB\Driver\Server</type><methodname>MongoDB\Driver\WriteResult::getServer</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   write result. This is the server that executed the
-   <classname>MongoDB\Driver\BulkWrite</classname>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>MongoDB\Driver\Server</classname> associated with this
-   write result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getServer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-$server = $manager->selectServer();
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$result = $server->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getServer() == $server);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\Server</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/mongodb/mongodb/driver/writeresult/getupsertedcount.xml b/reference/mongodb/mongodb/driver/writeresult/getupsertedcount.xml
deleted file mode 100644
index 79b278e1726c..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getupsertedcount.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getupsertedcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getUpsertedCount</refname>
-  <refpurpose>Returns the number of documents inserted by an upsert</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>MongoDB\Driver\WriteResult::getUpsertedCount</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of documents inserted by an upsert.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.unacknowledged;
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &mongodb.changelog.throw-unacknowledged-write;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getUpsertedCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getUpsertedCount());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::getUpsertedIds</methodname></member>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getupsertedids.xml b/reference/mongodb/mongodb/driver/writeresult/getupsertedids.xml
deleted file mode 100644
index b8122fc332ca..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getupsertedids.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getupsertedids" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getUpsertedIds</refname>
-  <refpurpose>Returns an array of identifiers for upserted documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\WriteResult::getUpsertedIds</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of identifiers (i.e. <literal>"_id"</literal> field values)
-   for upserted documents. The array keys will correspond to the index of the
-   write operation (from <classname>MongoDB\Driver\BulkWrite</classname>)
-   responsible for the upsert.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getUpsertedIds</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-$bulk->update(['x' => 1], ['$set' => ['y' => 3]]);
-$bulk->update(['x' => 2], ['$set' => ['y' => 1]], ['upsert' => true]);
-$bulk->update(['x' => 3], ['$set' => ['y' => 2]], ['upsert' => true]);
-$bulk->delete(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->getUpsertedIds());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [2]=>
-  object(MongoDB\BSON\ObjectId)#4 (1) {
-    ["oid"]=>
-    string(24) "580e62a224f2302f191b880b"
-  }
-  [3]=>
-  object(MongoDB\BSON\ObjectId)#5 (1) {
-    ["oid"]=>
-    string(24) "580e62a224f2302f191b880c"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>MongoDB\Driver\WriteResult::getUpsertedCount</methodname></member>
-   <member><methodname>MongoDB\Driver\WriteResult::isAcknowledged</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/mongodb/mongodb/driver/writeresult/getwriteconcernerror.xml b/reference/mongodb/mongodb/driver/writeresult/getwriteconcernerror.xml
deleted file mode 100644
index a0968a7c5c2a..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getwriteconcernerror.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getwriteconcernerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getWriteConcernError</refname>
-  <refpurpose>Returns any write concern error that occurred</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>MongoDB\Driver\WriteConcernError</type><type>null</type></type><methodname>MongoDB\Driver\WriteResult::getWriteConcernError</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>MongoDB\Driver\WriteConcernError</classname> if a write
-   concern error was encountered during the write operation, and &null;
-   otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getWriteConcernError</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager("mongodb://rs1.example.com,rs2.example.com/?replicaSet=myReplicaSet");
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(2, 1);
-
-try {
-    $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-} catch(MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteConcernError());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(MongoDB\Driver\WriteConcernError)#6 (3) {
-  ["message"]=>
-  string(33) "waiting for replication timed out"
-  ["code"]=>
-  int(64)
-  ["info"]=>
-  object(stdClass)#7 (1) {
-    ["wtimeout"]=>
-    bool(true)
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/mongodb/driver/writeresult/getwriteerrors.xml b/reference/mongodb/mongodb/driver/writeresult/getwriteerrors.xml
deleted file mode 100644
index e0d7055c8a64..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/getwriteerrors.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.getwriteerrors" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::getWriteErrors</refname>
-  <refpurpose>Returns any write errors that occurred</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>MongoDB\Driver\WriteResult::getWriteErrors</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of <classname>MongoDB\Driver\WriteError</classname> objects
-   for any write errors encountered during the write operation. The array will
-   be empty if no write errors occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getWriteErrors</function> with a single error</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-/* By default, bulk write operations are executed serially in order and
- * execution will stop after the first error.
- */
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 2]);
-$bulk->insert(['_id' => 2]);
-$bulk->insert(['_id' => 3]);
-$bulk->insert(['_id' => 4]);
-$bulk->insert(['_id' => 4]);
-
-try {
-    $result = $manager->executeBulkWrite('db.collection', $bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteErrors());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(81) "E11000 duplicate key error collection: db.collection index: _id_ dup key: { : 2 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(2)
-    ["info"]=>
-    NULL
-  }
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::getWriteErrors</function> with multiple errors</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-/* The "ordered" option may be used to allow bulk write operations to continue
- * executing after the first error is encountered.
- */
-$bulk = new MongoDB\Driver\BulkWrite(['ordered' => false]);
-$bulk->insert(['_id' => 1]);
-$bulk->insert(['_id' => 2]);
-$bulk->insert(['_id' => 2]);
-$bulk->insert(['_id' => 3]);
-$bulk->insert(['_id' => 4]);
-$bulk->insert(['_id' => 4]);
-
-try {
-    $result = $manager->executeBulkWrite('db.collection', $bulk);
-} catch (MongoDB\Driver\Exception\BulkWriteException $e) {
-    var_dump($e->getWriteResult()->getWriteErrors());
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  object(MongoDB\Driver\WriteError)#5 (4) {
-    ["message"]=>
-    string(81) "E11000 duplicate key error collection: db.collection index: _id_ dup key: { : 2 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(2)
-    ["info"]=>
-    NULL
-  }
-  [1]=>
-  object(MongoDB\Driver\WriteError)#6 (4) {
-    ["message"]=>
-    string(81) "E11000 duplicate key error collection: db.collection index: _id_ dup key: { : 4 }"
-    ["code"]=>
-    int(11000)
-    ["index"]=>
-    int(5)
-    ["info"]=>
-    NULL
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteError</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/mongodb/mongodb/driver/writeresult/isacknowledged.xml b/reference/mongodb/mongodb/driver/writeresult/isacknowledged.xml
deleted file mode 100644
index 68f7ba66c4f9..000000000000
--- a/reference/mongodb/mongodb/driver/writeresult/isacknowledged.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mongodb-driver-writeresult.isacknowledged" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>MongoDB\Driver\WriteResult::isAcknowledged</refname>
-  <refpurpose>Returns whether the write was acknowledged</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>MongoDB\Driver\WriteResult::isAcknowledged</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   If the write is acknowledged, other count fields will be available on the
-   <classname>MongoDB\Driver\WriteResult</classname> object.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the write was acknowledged, and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simplelist>
-   &mongodb.throws.argumentparsing;
-  </simplelist>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::isAcknowledged</function> with acknowledged write concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk);
-
-var_dump($result->isAcknowledged());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>MongoDB\Driver\WriteResult::isAcknowledged</function> with unacknowledged write concern</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$manager = new MongoDB\Driver\Manager;
-
-$bulk = new MongoDB\Driver\BulkWrite;
-$bulk->insert(['x' => 1]);
-
-$writeConcern = new MongoDB\Driver\WriteConcern(0);
-
-$result = $manager->executeBulkWrite('db.collection', $bulk, ['writeConcern' => $writeConcern]);
-
-var_dump($result->isAcknowledged());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>MongoDB\Driver\WriteConcern</classname></member>
-   <member><link xlink:href="&url.mongodb.docs.writeconcern;">Write Concern reference</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/monitoring.xml b/reference/mongodb/monitoring.xml
deleted file mode 100644
index 58ad6eae0ce3..000000000000
--- a/reference/mongodb/monitoring.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <part xml:id="mongodb.monitoring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Monitoring classes and subscriber functions</title>
-  <titleabbrev>MongoDB\Driver\Monitoring</titleabbrev>
-
-  <reference xml:id="ref.monitoring.functions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-   <title>&Functions;</title>
-   &reference.mongodb.functions.driver.entities.monitoring;
-  </reference>
-
-  &reference.mongodb.mongodb.driver.monitoring.commandfailedevent;
-  &reference.mongodb.mongodb.driver.monitoring.commandstartedevent;
-  &reference.mongodb.mongodb.driver.monitoring.commandsucceededevent;
-
-  &reference.mongodb.mongodb.driver.monitoring.serverchangedevent;
-  &reference.mongodb.mongodb.driver.monitoring.serverclosedevent;
-  &reference.mongodb.mongodb.driver.monitoring.serveropeningevent;
-  &reference.mongodb.mongodb.driver.monitoring.serverheartbeatfailedevent;
-  &reference.mongodb.mongodb.driver.monitoring.serverheartbeatstartedevent;
-  &reference.mongodb.mongodb.driver.monitoring.serverheartbeatsucceededevent;
-  &reference.mongodb.mongodb.driver.monitoring.topologychangedevent;
-  &reference.mongodb.mongodb.driver.monitoring.topologyclosedevent;
-  &reference.mongodb.mongodb.driver.monitoring.topologyopeningevent;
-
-  &reference.mongodb.mongodb.driver.monitoring.commandsubscriber;
-  &reference.mongodb.mongodb.driver.monitoring.logsubscriber;
-  &reference.mongodb.mongodb.driver.monitoring.sdamsubscriber;
-  &reference.mongodb.mongodb.driver.monitoring.subscriber;
- </part>
diff --git a/reference/mongodb/security.xml b/reference/mongodb/security.xml
deleted file mode 100644
index 31455353c718..000000000000
--- a/reference/mongodb/security.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongodb.security" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Security</title>
-
- <section xml:id="mongodb.security.request_injection">
-  <title>Request Injection Attacks</title>
-  <simpara>
-   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.
-  </simpara>
-
-  <simpara>
-   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 creates the query
-   <literal>$q = new \MongoDB\Driver\Query( [ 'username' => $_GET['username'] ])</literal>.
-  </simpara>
-
-  <simpara>
-   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>$q = new \MongoDB\Driver\Query( [ 'username' => [ '$ne' => 'foo' ] ] )</literal>,
-   which will return all users not named "foo" (all of your users, probably).
-  </simpara>
-
-  <simpara>
-   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.
-   PHP has the <function>filter_var</function> function to assist with this.
-  </simpara>
-
-  <simpara>
-   Note that this type of attack can be used with any database interaction that
-   locates a document, including updates, upserts, deletes, and findAndModify
-   commands.
-  </simpara>
-
-  <simpara>
-   See <link xlink:href="&url.mongodb.dochub.security;">the main documentation</link>
-   for more information about SQL-injection-like issues with MongoDB.
-  </simpara>
- </section>
-
- <section xml:id="mongodb.security.script_injection">
-  <title>Script Injection Attacks</title>
-  <simpara>
-   If you are using JavaScript, make sure that any variables that cross the PHP-
-   to-JavaScript boundary are passed in the <literal>scope</literal> field of
-   <classname>MongoDB\BSON\Javascript</classname>, not interpolated into the
-   JavaScript string. This can come up when using <literal>$where</literal>
-   clauses in queries, mapReduce and group commands, and any other time you may
-   pass JavaScript into the database.
-  </simpara>
-  <simpara>
-   For example, suppose we have some JavaScript to greet a user in the database
-   logs.  We could do:
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoDB\Driver\Manager;
-
-// Don't do this!!!
-$username = $_GET['field'];
-
-$cmd = new \MongoDB\Driver\Command( [
-    'eval' => "print('Hello, $username!');"
-] );
-
-$r = $m->executeCommand( 'dramio', $cmd );
-?>
-]]>
-  </programlisting>
-  <simpara>
-   However, what if a malicious user passes in some JavaScript?
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoDB\Driver\Manager;
-
-// Don't do this!!!
-$username = $_GET['field'];
-// $username is set to "'); db.users.drop(); print('"
-
-$cmd = new \MongoDB\Driver\Command( [
-    'eval' => "print('Hello, $username!');"
-] );
-
-$r = $m->executeCommand( 'dramio', $cmd );
-?>
-]]>
-  </programlisting>
-  <simpara>
-   Now MongoDB executes the JavaScript string
-   <literal>"print('Hello, '); db.users.drop(); print('!');"</literal>.
-   This attack is easy to avoid: use <literal>args</literal> to pass
-   variables from PHP to JavaScript:
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$m = new MongoDB\Driver\Manager;
-
-$_GET['field'] = 'derick';
-$args = [ $_GET['field'] ];
-
-$cmd = new \MongoDB\Driver\Command( [
-    'eval' => "function greet(username) { print('Hello, ' + username + '!'); }",
-    'args' => $args,
-] );
-
-$r = $m->executeCommand( 'dramio', $cmd );
-?>
-]]>
-  </programlisting>
-  <simpara>
-   This adds an argument to the JavaScript scope, which gets used as argument
-   for the <literal>greet</literal> function. Now if
-   someone tries to send malicious code, MongoDB will harmlessly print
-   <literal>Hello, '); db.dropDatabase(); print('!</literal>.
-  </simpara>
-
-  <simpara>
-   Using arguments helps to 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! It is best to avoid executing
-   <emphasis>any</emphasis> JavaScript on the server in the first place.
-  </simpara>
-
-  <simpara>
-   You are strongly recommended to stay clear of the <link
-   xlink:href="&url.mongodb.docs;reference/operator/query/where/#considerations">$where
-   clause</link> with queries, as it impacts performance significantly. Where
-   possible, use either normal query operators, or the <link
-   xlink:href="&url.mongodb.docs;core/aggregation-pipeline">Aggregation
-   Framework</link>.
-  </simpara>
-
-  <simpara>
-   As alternative to <link
-   xlink:href="&url.mongodb.dochub.mapreduce;">MapReduce</link>, which uses
-   JavaScript, consider using the <link
-   xlink:href="&url.mongodb.docs;core/aggregation-pipeline">Aggregation
-   Framework</link>. Unlike Map/Reduce, it uses an idiomatic language to
-   construct queries, without having to write, and use, the slower JavaScript
-   approach that Map/Reduce requires.
-  </simpara>
-
-  <simpara>
-   The <link
-   xlink:href="&url.mongodb.docs;reference/command/eval/">eval command</link>
-   has been deprecated since MongoDB 3.0, and should also be avoided.
-  </simpara>
- </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/setup.xml b/reference/mongodb/setup.xml
deleted file mode 100644
index 2d111214eb37..000000000000
--- a/reference/mongodb/setup.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mongodb.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mongodb.requirements">
-  &reftitle.required;
-  <simpara>
-   As of version 1.21.0, the extension requires PHP 8.1 or higher. Previous
-   versions of the extension allow compatibility with older PHP versions.
-  </simpara>
-  <simpara>
-   The extension requires
-   <link xlink:href="&url.mongodb.libbson;">libbson</link> and
-   <link xlink:href="&url.mongodb.libmongoc;">libmongoc</link>, and will use
-   bundled versions of both libraries by default. System libraries may also be
-   used, as discussed in the
-   <link linkend="mongodb.installation.manual">manual installation</link>
-   documentation.
-  </simpara>
-  <simpara>
-   The extension, via libmongoc, optionally depends on a TLS library (e.g.
-   OpenSSL) and will use it if available. If the build process fails to find a
-   TLS library, users should check that the appropriate development package
-   (e.g. <literal>libssl-dev</literal>) and
-   <link xlink:href="&url.mongodb.wiki.pkg-config;">pkg-config</link> are both
-   installed. The process for detecting and configuring TLS libraries is
-   discussed in more detail in the
-   <link linkend="mongodb.installation.manual">manual installation</link>
-   documentation.
-  </simpara>
-  <simpara>
-   <link xlink:href="&url.cyrus;">Cyrus SASL</link> is an optional dependency to
-   support Kerberos authentication and will be used if available.
-  </simpara>
-  <note>
-   <simpara>
-    Due to potential problems representing 64-bit integers on 32-bit platforms,
-    users are advised to use 64-bit environments. When using a 32-bit platform,
-    be aware that any 64-bit integer read from the database will be returned as
-    a <classname>MongoDB\BSON\Int64</classname> instance instead of a PHP
-    integer type.
-   </simpara>
-  </note>
- </section>
-
- &reference.mongodb.configure;
- &reference.mongodb.ini;
-<!--
- <section xml:id="mongodb.resources">
-  &reftitle.resources;
-  <simpara>
-
-  </simpara>
- </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/tutorial.xml b/reference/mongodb/tutorial.xml
deleted file mode 100644
index cbeca557b291..000000000000
--- a/reference/mongodb/tutorial.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
- <chapter xml:id="mongodb.tutorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>Tutorials</title>
-  <titleabbrev>Tutorials</titleabbrev>
-
-  <info xml:id="mongodb.tutorial.intro">
-   <abstract>
-    <simpara>
-     In this section you will find several tutorials on how to use the MongoDB
-     driver for PHP.
-    </simpara>
-   </abstract>
-  </info>
-
-  &reference.mongodb.tutorial.library;
-  &reference.mongodb.tutorial.apm;
- </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/tutorial/apm.xml b/reference/mongodb/tutorial/apm.xml
deleted file mode 100644
index 60a3acdad501..000000000000
--- a/reference/mongodb/tutorial/apm.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mongodb.tutorial.apm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Application Performance Monitoring (APM)</title>
-
- <simpara>
-  The extension contains an event subscriber API, which allows applications to
-  monitor commands and internal activity pertaining to the
-  <link xlink:href="&url.mongodb.sdam;">Server Discovery and Monitoring Specification</link>.
-  This tutorial will demonstrate command monitoring using the
-  <classname>MongoDB\Driver\Monitoring\CommandSubscriber</classname> interface.
- </simpara>
-
- <simpara>
-  The <classname>MongoDB\Driver\Monitoring\CommandSubscriber</classname>
-  interface defines three methods: <literal>commandStarted</literal>,
-  <literal>commandSucceeded</literal>, and <literal>commandFailed</literal>.
-  Each of these three methods accept a single <parameter>event</parameter>
-  argument of a specific class for the respective event. For example, the
-  <literal>commandSucceeded</literal>'s <parameter>event</parameter> argument
-  is a <classname>MongoDB\Driver\Monitoring\CommandSucceededEvent</classname>
-  object.
- </simpara>
-
- <simpara>
-  In this tutorial we will implement a subscriber that creates a list of all
-  the query profiles and the average time they took.
- </simpara>
-
- <section>
-  <title>Subscriber Class Scaffolding</title>
-
-  <simpara>
-   We start with the framework for our subscriber:
-  </simpara>
-
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-class QueryTimeCollector implements \MongoDB\Driver\Monitoring\CommandSubscriber
-{
-    public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void
-    {
-    }
-
-    public function commandSucceeded( \MongoDB\Driver\Monitoring\CommandSucceededEvent $event ): void
-    {
-    }
-
-    public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void
-    {
-    }
-}
-
-?>
-]]>
-  </programlisting>
- </section>
-
- <section>
-  <title>Registering the Subscriber</title>
-
-  <simpara>
-   Once a subscriber object is instantiated, it needs to be registered with the
-   extensions's monitoring system. This is done by calling
-   <methodname>MongoDB\Driver\Monitoring\addSubscriber</methodname> or
-   <methodname>MongoDB\Driver\Manager::addSubscriber</methodname> to register
-   the subscriber globally or with a specific Manager, respectively.
-  </simpara>
-
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-\MongoDB\Driver\Monitoring\addSubscriber( new QueryTimeCollector() );
-
-?>
-]]>
-  </programlisting>
- </section>
-
- <section>
-  <title>Implementing the Logic</title>
-
-  <simpara>
-   With the object registered, the only thing left is to implement the logic
-   in the subscriber class. To correlate the two events that make up a
-   successfully executed command (commandStarted and commandSucceeded), each
-   event object exposes a <literal>requestId</literal> field.
-  </simpara>
-  <simpara>
-   To record the average time per query shape, we will start by checking for a
-   <literal>find</literal> command in the commandStarted event. We will then add
-   an item to the <literal>pendingCommands</literal> property indexed by its
-   <literal>requestId</literal> and with its value representing the query shape.
-  </simpara>
-  <simpara>
-   If we receive a corresponding commandSucceeded event with the same
-   <literal>requestId</literal>, we add the duration of the event (from
-   <literal>durationMicros</literal>) to the total time and increment the
-   operation count.
-  </simpara>
-  <simpara>
-   If a corresponding commandFailed event is encountered, we just remove the
-   entry from the <literal>pendingCommands</literal> property.
-  </simpara>
-
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-class QueryTimeCollector implements \MongoDB\Driver\Monitoring\CommandSubscriber
-{
-    private $pendingCommands = [];
-    private $queryShapeStats = [];
-
-    /* Creates a query shape out of the filter argument. Right now it only
-     * takes the top level fields into account */
-    private function createQueryShape( array $filter )
-    {
-        return json_encode( array_keys( $filter ) );
-    }
-
-    public function commandStarted( \MongoDB\Driver\Monitoring\CommandStartedEvent $event ): void
-    {
-        if ( 'find' === $event->getCommandName() )
-        {
-            $queryShape = $this->createQueryShape( (array) $event->getCommand()->filter );
-            $this->pendingCommands[$event->getRequestId()] = $queryShape;
-        }
-    }
-
-    public function commandSucceeded( \MongoDB\Driver\Monitoring\CommandSucceededEvent $event ): void
-    {
-        $requestId = $event->getRequestId();
-        if ( array_key_exists( $requestId, $this->pendingCommands ) )
-        {
-            $this->queryShapeStats[$this->pendingCommands[$requestId]]['count']++;
-            $this->queryShapeStats[$this->pendingCommands[$requestId]]['duration'] += $event->getDurationMicros();
-            unset( $this->pendingCommands[$requestId] );
-        }
-    }
-
-    public function commandFailed( \MongoDB\Driver\Monitoring\CommandFailedEvent $event ): void
-    {
-        if ( array_key_exists( $event->getRequestId(), $this->pendingCommands ) )
-        {
-            unset( $this->pendingCommands[$event->getRequestId()] );
-        }
-    }
-
-    public function __destruct()
-    {
-        foreach( $this->queryShapeStats as $shape => $stats )
-        {
-            echo "Shape: ", $shape, " (", $stats['count'], ")\n  ",
-                $stats['duration'] / $stats['count'], "µs\n\n";
-        }
-    }
-}
-
-$m = new \MongoDB\Driver\Manager( 'mongodb://localhost:27016' );
-
-/* Add the subscriber */
-\MongoDB\Driver\Monitoring\addSubscriber( new QueryTimeCollector() );
-
-/* Do a bunch of queries */
-$query = new \MongoDB\Driver\Query( [
-    'region_slug' => 'scotland-highlands', 'age' => [ '$gte' => 20 ]
-] );
-$cursor = $m->executeQuery( 'dramio.whisky', $query );
-
-$query = new \MongoDB\Driver\Query( [
-    'region_slug' => 'scotland-lowlands', 'age' => [ '$gte' => 15 ]
-] );
-$cursor = $m->executeQuery( 'dramio.whisky', $query );
-
-$query = new \MongoDB\Driver\Query( [ 'region_slug' => 'scotland-lowlands' ] );
-$cursor = $m->executeQuery( 'dramio.whisky', $query );
-
-?>
-]]>
-  </programlisting>
- </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/mongodb/tutorial/library.xml b/reference/mongodb/tutorial/library.xml
deleted file mode 100644
index e9246570e089..000000000000
--- a/reference/mongodb/tutorial/library.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mongodb.tutorial.library" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Using the PHP Library for MongoDB (PHPLIB)</title>
-
- <simpara>
-  After the initial extension set-up, we will continue explaining how to get
-  started with the corresponding userland library to write our first project.
- </simpara>
-
- <section>
-  <title>Installing the PHP Library with Composer</title>
-
-  <simpara>
-   The last thing we still need to install to get started on the application
-   itself, is the PHP library.
-  </simpara>
-
-  <simpara>
-   The library needs to be installed with
-   <link xlink:href="&url.mongodb.composer;">Composer</link>, a package manager
-   for PHP. Instructions for installing Composer on various platforms may be
-   found on its website.
-   </simpara>
-
-   <para>
-    Install the library by running:
-    <programlisting role="shell">
-<![CDATA[
-$ composer require mongodb/mongodb
-]]>
-    </programlisting>
-   </para>
-
-   <para>
-It will output something akin to:
-
-    <programlisting role="text">
-<![CDATA[
-./composer.json has been created
-Loading composer repositories with package information
-Updating dependencies (including require-dev)
-  - Installing mongodb/mongodb (1.0.0)
-    Downloading: 100%
-
-Writing lock file
-Generating autoload files
-]]>
-    </programlisting>
-   </para>
-
-   <simpara>
-    Composer will create several files: <code>composer.json</code>,
-    <code>composer.lock</code>, and a <code>vendor</code> directory that will
-    contain the library and any other dependencies your project might require.
-   </simpara>
-  </section>
-
-  <section>
-   <title>Using the PHP Library</title>
-
-   <para>
-    In addition to managing your dependencies, Composer will also provide you
-    with an autoloader (for those dependencies' classes). Ensure that it is
-    included at the start of your script or in your application's bootstrap
-    code:
-    <programlisting role="php">
-<![CDATA[
-<?php
-// This path should point to Composer's autoloader
-require 'vendor/autoload.php';
-]]>
-    </programlisting>
-   </para>
-
-   <simpara>
-    With this done, you can now use any of the functionality as described in the
-    <link xlink:href="&url.mongodb.library.docs;">library documentation</link>.
-   </simpara>
-
-   <simpara>
-    If you have used MongoDB drivers in other languages, the library's API
-    should look familiar. It contains a
-    <link xlink:href="&url.mongodb.library.apidocs;/class/MongoDBClient/">Client</link>
-    class for connecting to MongoDB, a
-    <link xlink:href="&url.mongodb.library.apidocs;/class/MongoDBDatabase/">Database</link>
-    class for database-level operations (e.g. commands, collection management),
-    and a
-    <link xlink:href="&url.mongodb.library.apidocs;/class/MongoDBCollection">Collection</link>
-    class for collection-level operations (e.g.
-    <link xlink:href="&url.mongodb.wiki.crud;">CRUD</link> methods, index management).
-   </simpara>
-
-   <para>
-    As an example, this is how you insert a document into the
-    <emphasis>beers</emphasis> collection of the <emphasis>demo</emphasis>
-    database:
-    <programlisting role="php">
-<![CDATA[
-<?php
-require 'vendor/autoload.php'; // include Composer's autoloader
-
-$client = new MongoDB\Client("mongodb://localhost:27017");
-$collection = $client->demo->beers;
-
-$result = $collection->insertOne( [ 'name' => 'Hinterland', 'brewery' => 'BrewDog' ] );
-
-echo "Inserted with Object ID '{$result->getInsertedId()}'";
-?>
-]]>
-    </programlisting>
-   </para>
-
-   <simpara>
-    Since the inserted document did not contain an <code>_id</code> field, the
-    extension will generate an <classname>MongoDB\BSON\ObjectId</classname> for
-    the server to use as the <code>_id</code>. This value is also made available
-    to the caller via the result object returned by the <code>insertOne</code>
-    method.
-   </simpara>
-
-   <para>
-    After insertion, you can query for the data that you have just inserted.
-    For that, you use the <code>find</code> method, which returns an iterable
-    cursor:
-    <programlisting role="php">
-<![CDATA[
-<?php
-require 'vendor/autoload.php'; // include Composer's autoloader
-
-$client = new MongoDB\Client("mongodb://localhost:27017");
-$collection = $client->demo->beers;
-
-$result = $collection->find( [ 'name' => 'Hinterland', 'brewery' => 'BrewDog' ] );
-
-foreach ($result as $entry) {
-    echo $entry['_id'], ': ', $entry['name'], "\n";
-}
-?>
-]]>
-    </programlisting>
-   </para>
-
-   <simpara>
-    While it may not be apparent in the examples, BSON documents and arrays are
-    unserialized as special classes in the library by default. These classes
-    extend <classname>ArrayObject</classname> for usability and implement the
-    extension's <interfacename>MongoDB\BSON\Serializable</interfacename> and
-    <interfacename>MongoDB\BSON\Unserializable</interfacename> interfaces to
-    ensure that values preserve their type when serialized back into BSON. This
-    avoids a caveat in the legacy <code>mongo</code> extension where arrays
-    might turn into documents, and vice versa. See the
-    <xref linkend="mongodb.persistence"/> specification for more information on
-    how values are converted between PHP and BSON.
-   </simpara>
-  </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/mongodb/versions.xml b/reference/mongodb/versions.xml
deleted file mode 100644
index 33f49c555e55..000000000000
--- a/reference/mongodb/versions.xml
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- BSON functions -->
- <function name='mongodb\bson\fromjson' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\bson\fromphp' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\bson\tojson' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\bson\tocanonicalextendedjson' from='mongodb &gt;=1.3.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\bson\torelaxedextendedjson' from='mongodb &gt;=1.3.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\bson\tophp' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
-
- <!-- Monitoring functions -->
- <function name='mongodb\driver\monitoring\addsubscriber' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\removesubscriber' from='mongodb &gt;=1.3.0'/>
-
- <!-- Driver interfaces -->
- <function name='mongodb\driver\cursorinterface' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\cursorinterface::getid' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\cursorinterface::getserver' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\cursorinterface::isdead' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\cursorinterface::settypemap' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\cursorinterface::toarray' from='mongodb &gt;=1.6.0'/>
-
- <!-- Classes and Methods -->
- <function name='mongodb\driver\clientencryption' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\clientencryption::__construct' from='mongodb &gt;=1.14.0'/>
- <function name='mongodb\driver\clientencryption::addkeyaltname' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::createdatakey' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\clientencryption::decrypt' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\clientencryption::deletekey' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::encrypt' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\clientencryption::encryptexpression' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\driver\clientencryption::getkey' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::getkeybyaltname' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::getkeys' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::removekeyaltname' from='mongodb &gt;=1.15.0'/>
- <function name='mongodb\driver\clientencryption::rewrapmanydatakey' from='mongodb &gt;=1.15.0'/>
-
- <function name='mongodb\driver\command' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\command::__construct' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\cursor' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::current' from='mongodb &gt;=1.9.0'/>
- <function name='mongodb\driver\cursor::getid' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::getserver' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::isdead' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::key' from='mongodb &gt;=1.9.0'/>
- <function name='mongodb\driver\cursor::next' from='mongodb &gt;=1.9.0'/>
- <function name='mongodb\driver\cursor::rewind' from='mongodb &gt;=1.9.0'/>
- <function name='mongodb\driver\cursor::settypemap' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::toarray' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\cursor::valid' from='mongodb &gt;=1.9.0'/>
-
- <function name='mongodb\driver\cursorid' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\cursorid::__construct' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\cursorid::__tostring' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
-
- <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::executebulkwritecommand' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\manager::executecommand' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\manager::executequery' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\manager::executereadcommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\manager::executereadwritecommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\manager::executewritecommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\manager::getencryptedfieldsmap' from='mongodb &gt;=1.14.0'/>
- <function name='mongodb\driver\manager::getreadconcern' from='mongodb &gt;=1.1.0'/>
- <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'/>
-
- <function name='mongodb\driver\query' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\query::__construct' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\readconcern' from='mongodb &gt;=1.1.0'/>
- <function name='mongodb\driver\readconcern::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\readconcern::bsonserialize' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\driver\readconcern::getlevel' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\readconcern::isdefault' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\driver\readpreference' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\readpreference::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\readpreference::bsonserialize' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\driver\readpreference::gethedge' from='mongodb &gt;=1.8.0'/>
- <function name='mongodb\driver\readpreference::getmaxstalenessseconds' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\driver\readpreference::getmode' from='mongodb &gt;=1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\readpreference::getmodestring' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\readpreference::gettagsets' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\server' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::executebulkwrite' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::executebulkwritecommand' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\server::executecommand' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::executequery' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::executereadcommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\server::executereadwritecommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\server::executewritecommand' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\server::gethost' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::getinfo' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::getlatency' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::getport' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::getserverdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\server::gettags' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::gettype' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::isarbiter' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::ishidden' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\server::ispassive' from='mongodb &gt;=1.0.0'/>
- <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\serverdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::gethelloresponse' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::getlastupdatetime' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::getroundtriptime' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\serverdescription::gettype' from='mongodb &gt;=1.13.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'/>
- <function name='mongodb\driver\session::advanceclustertime' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\session::advanceoperationtime' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\session::committransaction' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\driver\session::endsession' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\driver\session::getclustertime' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\session::getlogicalsessionid' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\session::getoperationtime' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\driver\session::getserver' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\session::gettransactionoptions' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\session::gettransactionstate' from='mongodb &gt;=1.7.0'/>
- <function name='mongodb\driver\session::isdirty' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\session::isintransaction' from='mongodb &gt;=1.6.0'/>
- <function name='mongodb\driver\session::starttransaction' from='mongodb &gt;=1.5.0'/>
-
- <function name='mongodb\driver\topologydescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\topologydescription::getservers' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\topologydescription::hasreadableserver' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\topologydescription::haswritableserver' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\topologydescription::gettype' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\bulkwrite' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\bulkwrite::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\bulkwrite::insert' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\bulkwrite::update' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\bulkwrite::delete' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\bulkwrite::count' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\bulkwritecommand' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::__construct' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::count' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::deletemany' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::deleteone' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::insertone' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::replaceone' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::updatemany' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommand::updateone' from='mongodb &gt;=2.1.0'/>
-
- <function name='mongodb\driver\bulkwritecommandresult' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getdeletedcount' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getinsertedcount' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getmatchedcount' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getmodifiedcount' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getupsertedcount' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getdeleteresults' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getinsertresults' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::getupdateresults' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\bulkwritecommandresult::isacknowledged' from='mongodb &gt;=2.1.0'/>
-
- <function name='mongodb\driver\writeconcern' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcern::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcern::bsonserialize' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\driver\writeconcern::getjournal' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcern::getw' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcern::getwtimeout' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcern::isdefault' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\driver\writeconcernerror' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcernerror::getcode' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcernerror::getinfo' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeconcernerror::getmessage' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\writeerror' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeerror::getcode' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeerror::getindex' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeerror::getinfo' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeerror::getmessage' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\writeresult' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getinsertedcount' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getmatchedcount' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getmodifiedcount' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getdeletedcount' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getupsertedcount' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getserver' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getupsertedids' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getwriteconcernerror' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::getwriteerrors' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\driver\writeresult::isacknowledged' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\driver\exception\authenticationexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\bulkwriteexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\bulkwriteexception::getwriteresult' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\commandexception' from='mongodb &gt;= 1.5.0'/>
- <function name='mongodb\driver\exception\commandexception::getresultdocument' from='mongodb &gt;= 1.5.0'/>
- <function name='mongodb\driver\exception\connectionexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\connectiontimeoutexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\encryptionexception' from='mongodb &gt;= 1.7.0'/>
- <function name='mongodb\driver\exception\exception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\executiontimeoutexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\invalidargumentexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\logicexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\runtimeexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\runtimeexception::hasErrorLabel' from='mongodb &gt;= 1.6.0'/>
- <function name='mongodb\driver\exception\serverexception' from='mongodb &gt;= 1.5.0'/>
- <function name='mongodb\driver\exception\sslconnectionexception' from='mongodb &gt;= 1.0.0' deprecated='mongodb 1.5.0'/>
- <function name='mongodb\driver\exception\unexpectedvalueexception' from='mongodb &gt;= 1.0.0'/>
- <function name='mongodb\driver\exception\writeexception' from='mongodb &gt;= 1.0.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\exception\writeexception::getwriteresult' from='mongodb &gt;= 1.0.0' deprecated='mongodb 1.20.0'/>
-
- <function name='mongodb\driver\exception\bulkwritecommandexception' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\exception\bulkwritecommandexception::geterrorreply' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\exception\bulkwritecommandexception::getpartialresult' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\exception\bulkwritecommandexception::getwriteerrors' from='mongodb &gt;=2.1.0'/>
- <function name='mongodb\driver\exception\bulkwritecommandexception::getwriteconcernerrors' from='mongodb &gt;=2.1.0'/>
-
- <!-- Monitoring interfaces -->
- <function name='mongodb\driver\monitoring\subscriber' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsubscriber' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsubscriber::commandfailed' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsubscriber::commandstarted' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsubscriber::commandsucceeded' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\logsubscriber' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\driver\monitoring\logsubscriber::log' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serverchanged' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serverclosed' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serveropening' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serverheartbeatfailed' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serverheartbeatstarted' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::serverheartbeatsucceeded' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::topologychanged' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::topologyclosed' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\sdamsubscriber::topologyopening' from='mongodb &gt;=1.13.0'/>
-
- <!-- Monitoring event classes -->
- <function name='mongodb\driver\monitoring\commandfailedevent' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getcommandname' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getdatabasename' from='mongodb &gt;=1.19.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getdurationmicros' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::geterror' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::gethost' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getoperationid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getport' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getreply' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getrequestid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getserver' from='mongodb &gt;=1.3.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getserverconnectionid' from='mongodb &gt;=1.14.0'/>
- <function name='mongodb\driver\monitoring\commandfailedevent::getserviceid' from='mongodb &gt;=1.11.0'/>
-
- <function name='mongodb\driver\monitoring\commandstartedevent' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getcommand' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getcommandname' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getdatabasename' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::gethost' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getoperationid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getport' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getrequestid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getserver' from='mongodb &gt;=1.3.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getserverconnectionid' from='mongodb &gt;=1.14.0'/>
- <function name='mongodb\driver\monitoring\commandstartedevent::getserviceid' from='mongodb &gt;=1.11.0'/>
-
- <function name='mongodb\driver\monitoring\commandsucceededevent' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getcommandname' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getdatabasename' from='mongodb &gt;=1.19.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getdurationmicros' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::gethost' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getoperationid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getport' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getreply' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getrequestid' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getserver' from='mongodb &gt;=1.3.0' deprecated='mongodb 1.20.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getserverconnectionid' from='mongodb &gt;=1.14.0'/>
- <function name='mongodb\driver\monitoring\commandsucceededevent::getserviceid' from='mongodb &gt;=1.11.0'/>
-
- <function name='mongodb\driver\monitoring\serverchangedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverchangedevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverchangedevent::getnewdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverchangedevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverchangedevent::getpreviousdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverchangedevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\serverclosedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverclosedevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverclosedevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverclosedevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\serveropeningevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serveropeningevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serveropeningevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serveropeningevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent::getdurationmicros' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent::geterror' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatfailedevent::isawaited' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\serverheartbeatstartedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatstartedevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatstartedevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatstartedevent::isawaited' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent::getdurationmicros' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent::gethost' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent::getport' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent::getreply' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\serverheartbeatsucceededevent::isawaited' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\topologychangedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\topologychangedevent::getnewdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\topologychangedevent::getpreviousdescription' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\topologychangedevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\topologyclosedevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\topologyclosedevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <function name='mongodb\driver\monitoring\topologyopeningevent' from='mongodb &gt;=1.13.0'/>
- <function name='mongodb\driver\monitoring\topologyopeningevent::gettopologyid' from='mongodb &gt;=1.13.0'/>
-
- <!-- BSON interfaces -->
- <function name='mongodb\bson\persistable' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\persistable::bsonserialize' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\bson\serializable' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\serializable::bsonserialize' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\bson\type' from='mongodb &gt;=1.0.0'/>
-
- <function name='mongodb\bson\unserializable' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\unserializable::bsonunserialize' from='mongodb &gt;=1.0.0'/>
-
- <!-- BSON type interfaces -->
- <function name='mongodb\bson\binaryinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\binaryinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\binaryinterface::gettype' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\binaryinterface::getdata' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\decimal128interface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\decimal128interface::__tostring' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\javascriptinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\javascriptinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\javascriptinterface::getcode' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\javascriptinterface::getscope' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\maxkeyinterface' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\minkeyinterface' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\objectidinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\objectidinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\objectidinterface::gettimestamp' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\regexinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\regexinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\regexinterface::getflags' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\regexinterface::getpattern' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\timestampinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\timestampinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\timestampinterface::getincrement' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\timestampinterface::gettimestamp' from='mongodb &gt;=1.3.0'/>
-
- <function name='mongodb\bson\utcdatetimeinterface' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\utcdatetimeinterface::__tostring' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\utcdatetimeinterface::todatetime' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\utcdatetimeinterface::todatetimeimmutable' from='mongodb &gt;=2.0.0'/>
-
- <!-- BSON type classes -->
- <function name='mongodb\bson\binary' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\binary::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\binary::__tostring' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\binary::fromVector' from='mongodb &gt;=2.2.0'/>
- <function name='mongodb\bson\binary::gettype' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\binary::getdata' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\binary::getvectortype' from='mongodb &gt;=2.2.0'/>
- <function name='mongodb\bson\binary::toarray' from='mongodb &gt;=2.2.0'/>
- <function name='mongodb\bson\binary::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\decimal128' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\decimal128::__construct' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\decimal128::__tostring' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\decimal128::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\document' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::__construct' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::__tostring' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::frombson' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::fromjson' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::fromphp' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::get' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::getiterator' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::has' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::offsetexists' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\document::offsetget' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\document::offsetset' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\document::offsetunset' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\document::tocanonicalextendedjson' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::tophp' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\document::torelaxedextendedjson' from='mongodb &gt;=1.16.0'/>
-
- <function name='mongodb\bson\int64' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\bson\int64::__construct' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\bson\int64::__tostring' from='mongodb &gt;=1.5.0'/>
- <function name='mongodb\bson\int64::jsonserialize' from='mongodb &gt;=1.5.0'/>
-
- <function name='mongodb\bson\iterator' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::__construct' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::current' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::key' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::next' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::rewind' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\iterator::valid' from='mongodb &gt;=1.16.0'/>
-
- <function name='mongodb\bson\javascript' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\javascript::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\javascript::__tostring' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\javascript::getcode' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\javascript::getscope' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\javascript::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\maxkey' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\maxkey::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\maxkey::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\minkey' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\minkey::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\minkey::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\objectid' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\objectid::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\objectid::__tostring' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\objectid::gettimestamp' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\objectid::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\packedarray' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::__construct' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::__tostring' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::fromjson' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\bson\packedarray::fromphp' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::get' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::getiterator' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::has' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::offsetexists' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\packedarray::offsetget' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\packedarray::offsetset' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\packedarray::offsetunset' from='mongodb &gt;=1.17.0'/>
- <function name='mongodb\bson\packedarray::tocanonicalextendedjson' from='mongodb &gt;=1.20.0'/>
- <function name='mongodb\bson\packedarray::tophp' from='mongodb &gt;=1.16.0'/>
- <function name='mongodb\bson\packedarray::torelaxedextendedjson' from='mongodb &gt;=1.20.0'/>
-
- <function name='mongodb\bson\regex' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\regex::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\regex::__tostring' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\regex::getflags' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\regex::getpattern' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\regex::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\timestamp' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\timestamp::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\timestamp::__tostring' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\timestamp::getincrement' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\timestamp::gettimestamp' from='mongodb &gt;=1.3.0'/>
- <function name='mongodb\bson\timestamp::jsonserialize' from='mongodb &gt;=1.2.0'/>
-
- <function name='mongodb\bson\utcdatetime' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\utcdatetime::__construct' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\utcdatetime::__tostring' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\utcdatetime::jsonserialize' from='mongodb &gt;=1.2.0'/>
- <function name='mongodb\bson\utcdatetime::todatetime' from='mongodb &gt;=1.0.0'/>
- <function name='mongodb\bson\utcdatetime::todatetimeimmutable' from='mongodb &gt;=1.20.0'/>
-
- <function name='mongodb\bson\vectortype' from='mongodb &gt;=2.2.0'/>
-
- <!-- BSON type classes (for deprecated BSON types) -->
- <function name='mongodb\bson\dbpointer' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\dbpointer::__construct' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\dbpointer::__tostring' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\dbpointer::jsonserialize' from='mongodb &gt;=1.4.0'/>
-
- <function name='mongodb\bson\symbol' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\symbol::__construct' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\symbol::__tostring' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\symbol::jsonserialize' from='mongodb &gt;=1.4.0'/>
-
- <function name='mongodb\bson\undefined' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\undefined::__construct' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\undefined::__tostring' from='mongodb &gt;=1.4.0'/>
- <function name='mongodb\bson\undefined::jsonserialize' from='mongodb &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
--->
diff --git a/reference/mqseries/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mqseries/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mqseries/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mqseries/book.xml b/reference/mqseries/book.xml
deleted file mode 100644
index 7de924e71783..000000000000
--- a/reference/mqseries/book.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.mqseries">
- <?phpdoc extension-membership="pecl" ?>
- <title>mqseries</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.mqseries">
-  &reftitle.intro;
-  &warn.experimental;
-  <simpara>
-   This extension aims to provide an interface for communicating with IBMs
-   WebSphere MQ series Queue managers.
-  </simpara>
-  <simpara>
-   The interface mimics the C-API client interface of WebSphere MQ Series as
-   close as possible. Using the same naming conventions and possibilities of the
-   C-API. In order to understand the workings of this extension some level of
-   understanding the C-API is required.
-  </simpara>
-  <simpara>
-   For MQ-options, MQ-structures, MQ-results etc. please read the WebSphere MQ
-   Application Programming Guide and WebSphere MQ Application Programming
-   Reference.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.mqseries.setup;
- &reference.mqseries.constants;
- &reference.mqseries.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/mqseries/configure.xml b/reference/mqseries/configure.xml
deleted file mode 100644
index 78898190925c..000000000000
--- a/reference/mqseries/configure.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mqseries.configure">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
- </simpara>
- <simpara>
-  &pecl.info; <link xlink:href="&url.pecl.package;mqseries">&url.pecl.package;mqseries</link>.
- </simpara>
- <note>
-  <simpara>
-   The official name of this extension is <emphasis>mqseries</emphasis>.
-  </simpara>
- </note>
- <para>
-  There are two ways to connect to a queue manager. These depend on the way the extension is compiled and linked.
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      First one and also the default one is using the mqic libraries. Compiling and linking the
-      extension against these IBM WebSphere MQSeries libraries allows the extension to connect to the
-      Queue manager using the client interface. Remote connections are possible this way.
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>The other way is to compile and link against the mqm libraries. Using these libraries it is
-     possible to make use of the transaction management of a queue manager.</simpara>
-    </listitem>
-   </itemizedlist>
- </para>
- <simpara>Currently selecting the libraries to use is done by changing the <filename>config.m4</filename> file.</simpara>
-</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/mqseries/constants.xml b/reference/mqseries/constants.xml
deleted file mode 100644
index 5c200aacd704..000000000000
--- a/reference/mqseries/constants.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xml:id="mqseries.constants">
- &reftitle.constants;
- <simpara>
-  For each WebSphere MQ Constant there is a mqseries counterpart.
- </simpara>
- <simpara>For definitions and usage see the WebSphere MQ Application Programming Guide and WebSphere MQ
-  Application Programming Reference red books.
- </simpara>
- <simpara>The name of the mqseries counterpart is made by appending the WebSphere MQ constant with MQSERIES_,
-  for example the CompletionCode constants are:
- </simpara>
- <table>
-  <title>mqseries constants</title>
-  <tgroup cols="2">
-   <thead>
-    <row>
-     <entry>PHP Constant</entry>
-     <entry>MQ Constant</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row xml:id="constant.mqseries-mqcc-ok">
-     <entry><constant>MQSERIES_MQCC_OK</constant></entry>
-     <entry>MQCC_OK</entry>
-    </row>
-    <row xml:id="constant.mqseries-mqcc-warning">
-     <entry><constant>MQSERIES_MQCC_WARNING</constant></entry>
-     <entry>MQCC_WARNING</entry>
-    </row>
-    <row xml:id="constant.mqseries-mqcc-failed">
-     <entry><constant>MQSERIES_MQCC_FAILED</constant></entry>
-     <entry>MQCC_FAILED</entry>
-    </row>
-    <row xml:id="constant.mqseries-mqcc-unknown">
-     <entry><constant>MQSERIES_MQCC_UNKNOWN</constant></entry>
-     <entry>MQCC_UNKNOWN</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-
-</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/mqseries/functions/mqseries-back.xml b/reference/mqseries/functions/mqseries-back.xml
deleted file mode 100644
index 04c66bed7ca7..000000000000
--- a/reference/mqseries/functions/mqseries-back.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-back">
- <refnamediv>
-  <refname>mqseries_back</refname>
-  <refpurpose>MQSeries MQBACK</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_back</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_back</function>
-   (MQBACK) call indicates to the queue manager that all the message gets and
-   puts that have occurred since the last syncpoint are to be backed out.
-   Messages put as part of a unit of work are deleted; messages retrieved as
-   part of a unit of work are reinstated on the queue.
-  </simpara>
-  <simpara>
-   Using
-   <function>mqseries_back</function>
-   only works in conjunction with
-   <function>mqseries_begin</function>
-   and only function when connecting directly to a Queueu manager. Not via the
-   mqclient interface.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_back</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    mqseries_back($conn, $comp_code, $reason);
-
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mqseries_back</function>
-    will not function when using MQSeries Client to connect to a Queueu Manager.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_begin</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/mqseries/functions/mqseries-begin.xml b/reference/mqseries/functions/mqseries-begin.xml
deleted file mode 100644
index aeb33ab1afd7..000000000000
--- a/reference/mqseries/functions/mqseries-begin.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-begin">
- <refnamediv>
-  <refname>mqseries_begin</refname>
-  <refpurpose>MQseries MQBEGIN</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_begin</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>array</type><parameter>beginOptions</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_begin</function>
-   (MQBEGIN) call begins a unit of work that is coordinated by the queue
-   manager, and that may involve external resource managers.
-  </simpara>
-  <simpara>
-   Using
-   <function>mqseries_begin</function>
-   starts the unit of work. Either
-   <function>mqseries_back</function>
-   or
-   <function>mqseries_cmit</function>
-   ends the unit of work.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_begin</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $mqbo = array();
-    mqseries_begin( $conn,
-                    $mqbo,
-                    $comp_code,
-                    $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        /* reason code 2121 is a warning for more information see MQSeries reference manual.*/
-        if ($reason !== 2121) {
-            printf("CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        }
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mqseries_begin</function>
-    will not function when using MQSeries Client to connect to a Queueu Manager.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_back</function></member>
-   <member><function>mqseries_cmit</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/mqseries/functions/mqseries-close.xml b/reference/mqseries/functions/mqseries-close.xml
deleted file mode 100644
index 2f506711bd63..000000000000
--- a/reference/mqseries/functions/mqseries-close.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-close">
- <refnamediv>
-  <refname>mqseries_close</refname>
-  <refpurpose>MQSeries MQCLOSE</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_close</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>hobj</parameter></methodparam>
-   <methodparam><type>int</type><parameter>options</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_close</function>
-   (MQCLOSE) call relinquishes access to an object, and is the inverse of the
-   <function>mqseries_open</function>
-   (MQOPEN) call.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <simpara/>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_close</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    mqseries_close($conn, $obj, MQSERIES_MQCO_NONE, $comp_code, $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("close CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_open</function></member>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</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/mqseries/functions/mqseries-cmit.xml b/reference/mqseries/functions/mqseries-cmit.xml
deleted file mode 100644
index f507efe066b7..000000000000
--- a/reference/mqseries/functions/mqseries-cmit.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-cmit">
- <refnamediv>
-  <refname>mqseries_cmit</refname>
-  <refpurpose>MQSeries MQCMIT</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_cmit</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_cmit</function>
-   (MQCMIT) call indicates to the queue manager that the application has reached
-   a syncpoint, and that all of the message gets and puts that have occurred
-   since the last syncpoint are to be made permanent. Messages put as part of a
-   unit of work are made available to other applications; messages retrieved as
-   part of a unit of work are deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_cmit</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    mqseries_cmit($conn, $comp_code, $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("cmit CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mqseries_back</function>
-    will not function when using MQSeries Client to connect to a Queueu Manager.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_begin</function></member>
-   <member><function>mqseries_back</function></member>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</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/mqseries/functions/mqseries-conn.xml b/reference/mqseries/functions/mqseries-conn.xml
deleted file mode 100644
index f5f7679e263a..000000000000
--- a/reference/mqseries/functions/mqseries-conn.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-conn">
- <refnamediv>
-  <refname>mqseries_conn</refname>
-  <refpurpose>MQSeries MQCONN</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_conn</methodname>
-   <methodparam><type>string</type><parameter>qManagerName</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_conn</function>
-   (MQCONN) call connects an application program to a queue manager. It provides
-   a queue manager connection handle, which is used by the application on
-   subsequent message queuing calls.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>qManagerName</parameter>
-    </term>
-    <listitem>
-     <simpara>Name of queue manager.</simpara>
-     <simpara>Name of the queue manager the application wishes to connect.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_conn</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    mqseries_conn('WMQ1', $conn, $comp_code, $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("conn CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        exit;
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_disc</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/mqseries/functions/mqseries-connx.xml b/reference/mqseries/functions/mqseries-connx.xml
deleted file mode 100644
index 4374789999db..000000000000
--- a/reference/mqseries/functions/mqseries-connx.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-connx">
- <refnamediv>
-  <refname>mqseries_connx</refname>
-  <refpurpose>MQSeries MQCONNX</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_connx</methodname>
-   <methodparam><type>string</type><parameter>qManagerName</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">connOptions</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_connx</function>
-   (MQCONNX) call connects an application program to a queue manager. It
-   provides a queue manager connection handle, which is used by the application
-   on subsequent MQ calls.
-  </simpara>
-  <simpara>
-   The <function>mqseries_connx</function> call is like the
-   <function>mqseries_conn</function> (MQCONN) call, except that MQCONNX
-   allows options to be specified to control the way that the call works.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>qManagerName</parameter>
-    </term>
-    <listitem>
-     <simpara>Name of queue manager.</simpara>
-     <simpara>Name of the queue manager the application wishes to connect.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>connOps</parameter>
-    </term>
-    <listitem>
-     <simpara>Options that control the action of function</simpara>
-     <simpara>See also the MQCNO structure.</simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>
-     <function>mqseries_connx</function>
-     example
-    </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-    $mqcno = array(
-        'Version' => MQSERIES_MQCNO_VERSION_2,
-        'Options' => MQSERIES_MQCNO_STANDARD_BINDING,
-        'MQCD' => array('ChannelName' => 'MQNX9420.CLIENT',
-        'ConnectionName' => 'localhost',
-        'TransportType' => MQSERIES_MQXPT_TCP)
-    );
-
-    mqseries_connx('MQNX9420', $mqcno, $conn, $comp_code,$reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("Connx CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        exit;
-    }
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>
-     <function>mqseries_connx</function>
-     example using SSL connection &amp; OCSP Responder URL
-    </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-    $mqcno = array(
-        'Version' => 4, //MQCNO_VERSION_4
-        'Options' => MQSERIES_MQCNO_STANDARD_BINDING,
-        'MQCD' => array(
-            'Version' => 7, //MQCD_VERSION_7
-            'ConnectionName' => 'localhost',
-            'TransportType' => MQSERIES_MQXPT_TCP,
-            'ChannelName' => 'CONNECTIONCHANNEL',
-            'SSLCipherSpec' => 'NULL_SHA'
-        ),
-        'MQSCO' => array(
-            'KeyRepository' => '/var/mqm/qmgrs/QUEUEMGR/ssl/key', //Local path where the SSL key repository can be found
-            'MQAIR' => array(
-                'Version' => 2, //MQAIR_VERSION_2
-                'AuthInfoType' => 2, //MQAIT_OCSP
-                'OCSPResponderURL' => 'http://dummy.OCSP.responder'
-            )
-        )
-    );
-
-    mqseries_connx('QUEUEMGR', $mqcno, $conn, $comp_code,$reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("Connx CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        exit;
-    }
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_disc</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/mqseries/functions/mqseries-disc.xml b/reference/mqseries/functions/mqseries-disc.xml
deleted file mode 100644
index e71eec97785d..000000000000
--- a/reference/mqseries/functions/mqseries-disc.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-disc">
- <refnamediv>
-  <refname>mqseries_disc</refname>
-  <refpurpose>MQSeries MQDISC</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_disc</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_disc</function>
-   (MQDISC) call breaks the connection between the queue manager and the
-   application program, and is the inverse of the
-   <function>mqseries_conn</function>
-   (MQCONN) or
-   <function>mqseries_connx</function>
-   (MQCONNX) call.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_disc</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    mqseries_disc($conn, $comp_code, $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("disc CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</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/mqseries/functions/mqseries-get.xml b/reference/mqseries/functions/mqseries-get.xml
deleted file mode 100644
index b4ad0fa7c652..000000000000
--- a/reference/mqseries/functions/mqseries-get.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-get">
- <refnamediv>
-  <refname>mqseries_get</refname>
-  <refpurpose>MQSeries MQGET</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_get</methodname>
-   <methodparam><type>resource</type><parameter>hConn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>hObj</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">md</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">gmo</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">bufferLength</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">msg</parameter></methodparam>
-   <methodparam><type>int</type><parameter role="reference">data_length</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_get</function>
-   (MQGET) call retrieves a message from a local queue that has been opened
-   using the
-   <function>mqseries_open</function>
-   (MQOPEN) call
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>md</parameter>
-    </term>
-    <listitem>
-     <simpara>Message descriptor (MQMD).</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>gmo</parameter>
-    </term>
-    <listitem>
-     <simpara>Get message options (MQGMO).</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>bufferLength</parameter>
-    </term>
-    <listitem>
-     <simpara>Expected length of the result buffer</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>msg</parameter>
-    </term>
-    <listitem>
-     <simpara>
-      Buffer holding the message that was retrieved from the object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>data_length</parameter>
-    </term>
-    <listitem>
-     <simpara>Actual buffer length</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_get</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// open connection to the queue manager
-    mqseries_conn('WMQ1', $conn, $comp_code, $reason);
-// $conn now hold the reference to the connection to the queue manager.
-
-// open the connection to the testq queue
-    mqseries_open(
-                $conn,
-                array('ObjectName' => 'TESTQ'),
-                MQSERIES_MQOO_INPUT_AS_Q_DEF | MQSERIES_MQOO_FAIL_IF_QUIESCING | MQSERIES_MQOO_OUTPUT,
-                $obj,
-                $comp_code,
-                $reason);
-// $obj now holds the reference to the object (TESTQ)
-
-// setup empty message descriptor.
-    $mdg = array();
-// setup get message options
-    $gmo = array('Options' => MQSERIES_MQGMO_FAIL_IF_QUIESCING | MQSERIES_MQGMO_WAIT, 'WaitInterval' => 3000);
-
-// get the message from the queue
-    mqseries_get($conn, $obj, $mdg, $gmo, 255, $msg, $data_length, $comp_code, $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("GET CompCode:%d Reason:%d Text:%s<br>", $comp_code, $reason, mqseries_strerror($reason));
-    }
-
-// close the object reference $obj
-    mqseries_close($conn, $obj, MQSERIES_MQCO_NONE, $comp_code, $reason);
-
-// disconnect from the queue manager.
-    mqseries_disc($conn, $comp_code, $reason);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_open</function></member>
-   <member><function>mqseries_put</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/mqseries/functions/mqseries-inq.xml b/reference/mqseries/functions/mqseries-inq.xml
deleted file mode 100644
index 77b9262f642d..000000000000
--- a/reference/mqseries/functions/mqseries-inq.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-inq">
- <refnamediv>
-  <refname>mqseries_inq</refname>
-  <refpurpose>MQSeries MQINQ</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_inq</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>hobj</parameter></methodparam>
-   <methodparam><type>int</type><parameter>selectorCount</parameter></methodparam>
-   <methodparam><type>array</type><parameter>selectors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>intAttrCount</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">intAttr</parameter></methodparam>
-   <methodparam><type>int</type><parameter>charAttrLength</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">charAttr</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_inq</function>
-   (MQINQ) call returns an array of integers and a set of character strings
-   containing the attributes of an object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>selectorCount</parameter>
-    </term>
-    <listitem>
-     <simpara>Count of selectors.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>selectors</parameter>
-    </term>
-    <listitem>
-     <simpara>Array of attribute selectors.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>intAttrLength</parameter>
-    </term>
-    <listitem>
-     <simpara>Count of integer attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>intAttr</parameter>
-    </term>
-    <listitem>
-     <simpara>Array of integer attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>charAttrLength</parameter>
-    </term>
-    <listitem>
-     <simpara>Length of character attributes buffer.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>charAttr</parameter>
-    </term>
-    <listitem>
-     <simpara>Character attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_inq</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $int_attr = array();
-    $char_attr = "";
-
-    mqseries_inq($conn, $obj, 1, array(MQSERIES_MQCA_Q_MGR_NAME), 0, $int_attr, 48, $char_attr, $comp_code, $reason);
-
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("INQ CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    } else {
-        echo "INQ QManager name result ".$char_attr."<br>\n";
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_open</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/mqseries/functions/mqseries-open.xml b/reference/mqseries/functions/mqseries-open.xml
deleted file mode 100644
index 1f43c7a59cc2..000000000000
--- a/reference/mqseries/functions/mqseries-open.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-open">
- <refnamediv>
-  <refname>mqseries_open</refname>
-  <refpurpose>MQSeries MQOPEN</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_open</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">objDesc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>option</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">hobj</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_open</function>
-   (MQOPEN) call establishes access to an object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>objDesc</parameter>
-    </term>
-    <listitem>
-     <simpara>Object descriptor. (MQOD)</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>options</parameter>
-    </term>
-    <listitem>
-     <simpara>Options that control the action of the function.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_open</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $mqods = array('ObjectName' => 'TESTQ');
-    mqseries_open(
-                $conn,
-                $mqods,
-                MQSERIES_MQOO_INPUT_AS_Q_DEF | MQSERIES_MQOO_FAIL_IF_QUIESCING | MQSERIES_MQOO_OUTPUT,
-                $obj,
-                $comp_code,
-                $reason);
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("open CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        exit;
-    }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_close</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/mqseries/functions/mqseries-put.xml b/reference/mqseries/functions/mqseries-put.xml
deleted file mode 100644
index 72ee5ca457bd..000000000000
--- a/reference/mqseries/functions/mqseries-put.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-put">
- <refnamediv>
-  <refname>mqseries_put</refname>
-  <refpurpose>MQSeries MQPUT</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_put</methodname>
-   <methodparam><type>resource</type><parameter>hConn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>hObj</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">md</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">pmo</parameter></methodparam>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_put</function>
-   (MQPUT) call puts a message on a queue or distribution list. The queue or
-   distribution list must already be open.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>md</parameter>
-    </term>
-    <listitem>
-     <simpara>Message descriptor (MQMD).</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>pmo</parameter>
-    </term>
-    <listitem>
-     <simpara>Put message options (MQPMO).</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>message</parameter>
-    </term>
-    <listitem>
-     <simpara>The actual message to put onto the queue.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_put</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// open connection to the queue manager
-    mqseries_conn('WMQ1', $conn, $comp_code, $reason);
-// $conn now hold the reference to the connection to the queue manager.
-
-// open the connectio to the testq queueu
-    mqseries_open(
-                $conn,
-                array('ObjectName' => 'TESTQ'),
-                MQSERIES_MQOO_INPUT_AS_Q_DEF | MQSERIES_MQOO_FAIL_IF_QUIESCING | MQSERIES_MQOO_OUTPUT,
-                $obj,
-                $comp_code,
-                $reason);
-// $obj now holds the reference to the object (TESTQ)
-
-// setup the message descriptor array. Check MQSeries reference manuals.
-    $md = array(
-                'Version' => MQSERIES_MQMD_VERSION_1,
-                'Expiry' => MQSERIES_MQEI_UNLIMITED,
-                'Report' => MQSERIES_MQRO_NONE,
-                'MsgType' => MQSERIES_MQMT_DATAGRAM,
-                'Format' => MQSERIES_MQFMT_STRING,
-                'Priority' => 1,
-                'Persistence' => MQSERIES_MQPER_PERSISTENT);
-
-// setup the put message options.
-    $pmo = array('Options' => MQSERIES_MQPMO_NEW_MSG_ID|MQSERIES_MQPMO_SYNCPOINT);
-
-// put the message 'Ping' on the queueu.
-    mqseries_put($conn, $obj, $md, $pmo, 'Ping', $comp_code, $reason);
-
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("put CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-    }
-
-// close the object reference $obj
-    mqseries_close($conn, $obj, MQSERIES_MQCO_NONE, $comp_code, $reason);
-
-// disconnect from the queue manager.
-    mqseries_disc($conn, $comp_code, $reason);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_open</function></member>
-   <member><function>mqseries_get</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/mqseries/functions/mqseries-put1.xml b/reference/mqseries/functions/mqseries-put1.xml
deleted file mode 100644
index a6c47f9f5107..000000000000
--- a/reference/mqseries/functions/mqseries-put1.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-put1">
- <refnamediv>
-  <refname>mqseries_put1</refname>
-  <refpurpose>MQSeries MQPUT1</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_put1</methodname>
-   <methodparam><type>resource</type><parameter>hconn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">objDesc</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">msgDesc</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">pmo</parameter></methodparam>
-   <methodparam><type>string</type><parameter>buffer</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The
-   <function>mqseries_put1</function>
-   (MQPUT1) call puts one message on a queue. The queue need not be open.
-  </simpara>
-  <simpara>
-   You can use both the <function>mqseries_put</function> and <function>mqseries_put1</function>
-   calls to put messages on a queue; which call to use depends on the circumstances.
-   Use the <function>mqseries_put</function> (MQPUT) call to place multiple messages on the same queue.
-   Use the <function>mqseries_put1</function> (MQPUT1) call to put only one message on a queue.
-   This call encapsulates the MQOPEN, MQPUT, and MQCLOSE calls into a single call, minimizing the
-   number of calls that must be issued.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>objDesc</parameter>
-    </term>
-    <listitem>
-     <simpara>Object descriptor. (MQOD)</simpara>
-     <simpara>
-      This is a structure which identifies the queue to which the message is
-      added.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>msgDesc</parameter>
-    </term>
-    <listitem>
-     <simpara>Message descriptor (MQMD).</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>pmo</parameter>
-    </term>
-    <listitem>
-     <simpara>Put message options (MQPMO).</simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_conn</function></member>
-   <member><function>mqseries_connx</function></member>
-   <member><function>mqseries_open</function></member>
-   <member><function>mqseries_get</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/mqseries/functions/mqseries-set.xml b/reference/mqseries/functions/mqseries-set.xml
deleted file mode 100644
index a5900ff99a92..000000000000
--- a/reference/mqseries/functions/mqseries-set.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-set">
- <refnamediv>
-  <refname>mqseries_set</refname>
-  <refpurpose>MQSeries MQSET</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>mqseries_set</methodname>
-   <methodparam><type>resource</type><parameter>hConn</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>hObj</parameter></methodparam>
-   <methodparam><type>int</type><parameter>selectorCount</parameter></methodparam>
-   <methodparam><type>array</type><parameter>selectors</parameter></methodparam>
-   <methodparam><type>int</type><parameter>intAttrCount</parameter></methodparam>
-   <methodparam><type>array</type><parameter>intAttrs</parameter></methodparam>
-   <methodparam><type>int</type><parameter>charAttrLength</parameter></methodparam>
-   <methodparam><type>array</type><parameter>charAttrs</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">compCode</parameter></methodparam>
-   <methodparam><type>resource</type><parameter role="reference">reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The <function>mqseries_set</function>
-   (MQSET) call is used to change the attributes of an object represented by a
-   handle. The object must be a queue.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>hConn</parameter>
-    </term>
-    <listitem>
-     <simpara>Connection handle.</simpara>
-     <simpara>This handle represents the connection to the queue manager.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>hObj</parameter>
-    </term>
-    <listitem>
-     <simpara>Object handle.</simpara>
-     <simpara>This handle represents the object to be used.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>selectorCount</parameter>
-    </term>
-    <listitem>
-     <simpara>Count of selectors.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>selectors</parameter>
-    </term>
-    <listitem>
-     <simpara>Array of attribute selectors.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>intAttrCount</parameter>
-    </term>
-    <listitem>
-     <simpara>Count of integer attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>intAttrs</parameter>
-    </term>
-    <listitem>
-     <simpara>Array of integer attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>charAttrLength</parameter>
-    </term>
-    <listitem>
-     <simpara>Length of character attributes buffer.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>charAttrs</parameter>
-    </term>
-    <listitem>
-     <simpara>Character attributes.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>compCode</parameter>
-    </term>
-    <listitem>
-     <simpara>Completion code.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>&return.void;</simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mqseries_inq</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/mqseries/functions/mqseries-strerror.xml b/reference/mqseries/functions/mqseries-strerror.xml
deleted file mode 100644
index 1645acbc57b2..000000000000
--- a/reference/mqseries/functions/mqseries-strerror.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mqseries-strerror">
- <refnamediv>
-  <refname>mqseries_strerror</refname>
-  <refpurpose>Returns the error message corresponding to a result code (MQRC)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mqseries_strerror</methodname>
-   <methodparam><type>int</type><parameter>reason</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mqseries_strerror</function>
-   returns the message that correspond to the reason result code.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term>
-     <parameter>reason</parameter>
-    </term>
-    <listitem>
-     <simpara>Reason code qualifying the compCode.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>string representation of the reason code message.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>
-    <function>mqseries_strerror</function>
-    example
-   </title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    if ($comp_code !== MQSERIES_MQCC_OK) {
-        printf("open CompCode:%d Reason:%d Text:%s<br>\n", $comp_code, $reason, mqseries_strerror($reason));
-        exit;
-    }
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Connx CompCode:2 Reason:2059 Text:Queue manager not available for connection.
-]]>
-   </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/mqseries/ini.xml b/reference/mqseries/ini.xml
deleted file mode 100644
index f05a114a9259..000000000000
--- a/reference/mqseries/ini.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mqseries.ini" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.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/mqseries/reference.xml b/reference/mqseries/reference.xml
deleted file mode 100644
index d0e11e270a11..000000000000
--- a/reference/mqseries/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mqseries">
- <title>mqseries &Functions;</title>
- &reference.mqseries.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/mqseries/resources.xml b/reference/mqseries/resources.xml
deleted file mode 100644
index 044e029406a8..000000000000
--- a/reference/mqseries/resources.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="mqseries.resources">
- &reftitle.resources;
- <simpara>
-  This extension defines a connection and object_handle resources.
- </simpara>
- <simpara>
-  The <function>mqseries_conn</function> and <function>mqseries_connx</function> define the
-  connectionn handles.
- </simpara>
- <simpara>
-  The <function>mqseries_open</function> defines the object handle.
- </simpara>
-</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/mqseries/setup.xml b/reference/mqseries/setup.xml
deleted file mode 100644
index 44bcc7a67c9b..000000000000
--- a/reference/mqseries/setup.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mqseries.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="mqseries.requirements">
-  &reftitle.required;
-  <simpara>
-   A working IBM WebSphere MQ installation. If building the extension the SDK
-   for IBM WebSphere MQ is also required.
-  </simpara>
-  <note>
-   <simpara>
-    Be aware that when running against a IBM WebSphere MQ Client installation
-    some methods are not available. This is not a problem of the extension but
-    just the way the WebSphere MQ Client Interface works.
-   </simpara>
-  </note>
-
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.mqseries.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.mqseries.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- &reference.mqseries.resources;
- <!-- }}} -->
-
-</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/mqseries/versions.xml b/reference/mqseries/versions.xml
deleted file mode 100644
index a432e4949e42..000000000000
--- a/reference/mqseries/versions.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='mqseries_back' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_begin' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_close' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_cmit' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_conn' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_connx' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_disc' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_error' from='PECL mqseries &gt;= 0.7.0'/>
- <function name='mqseries_get' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_inq' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_open' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_put' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_put1' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_set' from='PECL mqseries &gt;= 0.10.0'/>
- <function name='mqseries_strerror' from='PECL mqseries &gt;= 0.10.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/mysql/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mysql/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mysql/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mysql/book.xml b/reference/mysql/book.xml
deleted file mode 100644
index 6cece2f2bd61..000000000000
--- a/reference/mysql/book.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- State: deprecated -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.mysql">
- <?phpdoc extension-membership="pecl"?>
- <title>Original MySQL API</title>
- <titleabbrev>MySQL (Original)</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.mysql">
-  &reftitle.intro;
-  <simpara>
-   This extension is deprecated as of PHP 5.5.0, and
-   has been removed as of PHP 7.0.0. Instead, either the
-   <link linkend="book.mysqli">mysqli</link> or
-   <link linkend="ref.pdo-mysql">PDO_MySQL</link> extension should be
-   used. See also the <link linkend="mysqlinfo.api.choosing">MySQL API
-   Overview</link> for further help while choosing a MySQL API.
-  </simpara>
-  <simpara>
-   These functions allow you to access MySQL database servers.
-   More information about MySQL can be found at <link xlink:href="&url.mysql;">&url.mysql;</link>.
-  </simpara>
-  <simpara>
-   Documentation for MySQL can be found at <link xlink:href="&url.mysql.docs;">&url.mysql.docs;</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.mysql.setup;
- &reference.mysql.changelog;
- &reference.mysql.constants;
- &reference.mysql.examples;
- &reference.mysql.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/mysql/changelog.xml b/reference/mysql/changelog.xml
deleted file mode 100644
index 8e273d15f075..000000000000
--- a/reference/mysql/changelog.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="changelog.mysql">
- <title>&ChangelogListingTitle;</title>
- <simpara>&ChangelogListingDescription;</simpara>
-
- <simplesect>
-  <title>General Changelog for the ext/mysql extension</title>
-  <simpara>
-   This changelog references the ext/mysql extension.
-  </simpara>
- </simplesect>
-
- <simplesect xml:id="changelog.mysql.global">
-  <title>Global ext/mysql changes</title>
-  <simpara>
-   The following is a list of changes to the entire ext/mysql extension.
-  </simpara>
-  <informaltable xml:id="changelog.mysql.global.table">
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>7.0.0</entry>
-      <entry>
-       <simpara>
-        This extension was removed from PHP. For details, see
-        <xref linkend="mysqlinfo.api.choosing"/>.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </simplesect>
-
- <simplesect xml:id="changelog.mysql.functions">
-  <title>Changes to existing functions</title>
-  <simpara>
-   The following list is a compilation of changelog entries from
-   the ext/mysql functions.
-  </simpara>
-  <?phpdoc generate-changelog-for="ref.mysql book.mysql"?>
- </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/mysql/configure.xml b/reference/mysql/configure.xml
deleted file mode 100644
index 10fe32acb109..000000000000
--- a/reference/mysql/configure.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mysql.installation">
- &reftitle.install;
-
- <warning>
-  &mysql.alternative.note;
- </warning>
-
- <simpara xml:id="mysql.configure">
-  For compiling, simply use the
-  <option role="configure">--with-mysql[=DIR]</option>
-  configuration option where the optional <literal>[DIR]</literal> points to
-  the MySQL installation directory.
- </simpara>
- <simpara>
-  Although this MySQL extension is compatible with MySQL 4.1.0 and greater,
-  it doesn't support the extra functionality that these versions provide.
-  For that, use the <link linkend="book.mysqli">MySQLi</link> extension.
- </simpara>
- <simpara>
-  If you would like to install the mysql extension along with the mysqli extension
-  you have to use the same client library to avoid any conflicts.
- </simpara>
-
- <section xml:id="mysql.installation.linux">
-  <title>Installation on Linux Systems</title>
-  <simpara>
-   Note: <literal>[DIR]</literal> is the path to the MySQL client library
-   files (<emphasis>headers and libraries</emphasis>), which can be downloaded from
-   <link xlink:href="&url.mysql;">MySQL</link>.
-  </simpara>
-  <table xml:id="mysql.installation.compile.support">
-   <title>ext/mysql compile time support matrix</title>
-   <tgroup cols="5">
-    <thead>
-     <row>
-      <entry>PHP &Version;</entry>
-      <entry>&Default;</entry>
-      <entry>&ConfigureOptions;: <link linkend="mysqlnd.overview">mysqlnd</link></entry>
-      <entry>&ConfigureOptions;: <literal>libmysqlclient</literal></entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>4.x.x</entry>
-      <entry>libmysqlclient</entry>
-      <entry>&NotAvailable;</entry>
-      <entry><option role="configure">--without-mysql</option> to disable</entry>
-      <entry>MySQL enabled by default, MySQL client libraries are bundled</entry>
-     </row>
-     <row>
-      <entry>5.0.x, 5.1.x, 5.2.x</entry>
-      <entry>libmysqlclient</entry>
-      <entry>&NotAvailable;</entry>
-      <entry><option role="configure">--with-mysql=[DIR]</option></entry>
-      <entry>
-       MySQL is no longer enabled by default, and the MySQL client libraries
-       are no longer bundled
-      </entry>
-     </row>
-     <row>
-      <entry>5.3.x</entry>
-      <entry>libmysqlclient</entry>
-      <entry><option role="configure">--with-mysql=mysqlnd</option></entry>
-      <entry><option role="configure">--with-mysql=[DIR]</option></entry>
-      <entry>mysqlnd is now available</entry>
-     </row>
-     <row>
-      <entry>5.4.x</entry>
-      <entry>mysqlnd</entry>
-      <entry><option role="configure">--with-mysql</option></entry>
-      <entry><option role="configure">--with-mysql=[DIR]</option></entry>
-      <entry>mysqlnd is now the default</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </section>
-
- <section xml:id="mysql.installation.windows">
-  <title>Installation on Windows Systems</title>
-  <section xml:id="mysql.installation.windows.php52">
-   <title>PHP 5.0.x, 5.1.x, 5.2.x</title>
-   <simpara>
-    MySQL is no longer enabled by default, so the
-    <filename>php_mysql.dll</filename> DLL must be enabled inside of
-    &php.ini;. Also, PHP needs access to the MySQL client library. A file
-    named <filename>libmysql.dll</filename> is included in the Windows PHP
-    distribution and in order for PHP to talk to MySQL this file needs to be
-    available to the Windows systems <envar>PATH</envar>. See the FAQ
-    titled "<link linkend="faq.installation.addtopath">How do I add my PHP
-    directory to the <envar>PATH</envar> on Windows</link>" for information on how to do
-    this. Although copying <filename>libmysql.dll</filename> to the Windows
-    system directory also works (because the system directory is by default in
-    the system's <envar>PATH</envar>), it's not recommended.
-   </simpara>
-   <simpara>
-    As with enabling any PHP extension (such as
-    <filename>php_mysql.dll</filename>), the PHP directive
-    <link linkend="ini.extension-dir">extension_dir</link> should be set to
-    the directory where the PHP extensions are located. See also the
-    <link linkend="install.windows.manual">Manual Windows Installation
-    Instructions</link>. An example extension_dir value for PHP 5 is
-    <literal>c:\php\ext</literal>
-   </simpara>
-   <note>
-    <simpara>
-     If when starting the web server an error similar to the following occurs:
-     <literal>"Unable to load dynamic library './php_mysql.dll'"</literal>,
-     this is because <filename>php_mysql.dll</filename> and/or
-     <filename>libmysql.dll</filename> cannot be found by the system.
-    </simpara>
-   </note>
-  </section>
-  <section xml:id="mysql.installation.windows.php53">
-   <title>PHP 5.3.0+</title>
-   <simpara>
-    The <link linkend="mysqlnd.overview">MySQL Native Driver</link> is enabled by
-    default. Include <filename>php_mysql.dll</filename>, but <filename>libmysql.dll</filename>
-    is no longer required or used.
-   </simpara>
-  </section>
- </section>
-
- <section xml:id="mysql.installation.notes">
-  <title>MySQL Installation Notes</title>
-   <warning>
-    <simpara>
-     Crashes and startup problems of PHP may be encountered
-     when loading this extension in conjunction with the recode extension.
-     See the <link linkend="ref.recode">recode</link> extension for more
-     information.
-    </simpara>
-   </warning>
-   <note>
-    <simpara>
-     If you need charsets other than <emphasis>latin</emphasis> (default), you
-     have to install external (not bundled) libmysqlclient with compiled charset
-     support.
-    </simpara>
-   </note>
- </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/mysql/constants.xml b/reference/mysql/constants.xml
deleted file mode 100644
index 579929bb71bb..000000000000
--- a/reference/mysql/constants.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="mysql.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  It is possible to specify additional client flags for the
-  <function>mysql_connect</function> and <function>mysql_pconnect</function>
-  functions. The following constants are defined:
-  <table xml:id="mysql.client-flags">
-   <title>MySQL client constants</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row xml:id="constant.mysql-client-compress">
-       <entry><constant>MYSQL_CLIENT_COMPRESS</constant></entry>
-       <entry>Use compression protocol</entry>
-      </row>
-      <row xml:id="constant.mysql-client-ignore-space">
-       <entry><constant>MYSQL_CLIENT_IGNORE_SPACE</constant></entry>
-       <entry>Allow space after function names</entry>
-      </row>
-      <row xml:id="constant.mysql-client-interactive">
-       <entry><constant>MYSQL_CLIENT_INTERACTIVE</constant></entry>
-       <entry>Allow interactive_timeout seconds (instead of <option>wait_timeout</option>) of
-        inactivity before closing the connection.</entry>
-      </row>
-      <row xml:id="constant.mysql-client-ssl">
-       <entry><constant>MYSQL_CLIENT_SSL</constant></entry>
-       <entry>Use SSL encryption. This flag is only available with version 4.x
-        of the MySQL client library or newer. Version 3.23.x is bundled both
-        with PHP 4 and Windows binaries of PHP 5.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-  </table>
- </para>
-
- <para>
-  The function <function>mysql_fetch_array</function> uses a constant for
-  the different types of result arrays. The following constants are
-  defined:
-  <table xml:id="mysql.constants.fetch">
-   <title>MySQL fetch constants</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.mysql-assoc">
-      <entry><constant>MYSQL_ASSOC</constant></entry>
-      <entry>
-       Columns are returned into the array having the fieldname as the array
-       index.
-      </entry>
-     </row>
-     <row xml:id="constant.mysql-both">
-      <entry><constant>MYSQL_BOTH</constant></entry>
-      <entry>
-       Columns are returned into the array having both a numerical index
-       and the fieldname as the array index.
-      </entry>
-     </row>
-     <row xml:id="constant.mysql-num">
-      <entry><constant>MYSQL_NUM</constant></entry>
-      <entry>
-       Columns are returned into the array having a numerical index to the
-       fields. This index starts with 0, the first field in the result.
-      </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/mysql/examples.xml b/reference/mysql/examples.xml
deleted file mode 100644
index aa7ce8395e1c..000000000000
--- a/reference/mysql/examples.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysql.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <section xml:id="mysql.examples-basic">
-  <title>MySQL extension overview example</title>
-  <para>
-   This simple example shows how to connect, execute a query, print
-   resulting rows and disconnect from a MySQL database.
-   <example>
-    <title>MySQL extension overview example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Connecting, selecting database
-$link = mysql_connect('mysql_host', 'mysql_user', 'mysql_password')
-    or die('Could not connect: ' . mysql_error());
-echo 'Connected successfully';
-mysql_select_db('my_database') or die('Could not select database');
-
-// Performing SQL query
-$query = 'SELECT * FROM my_table';
-$result = mysql_query($query) or die('Query failed: ' . mysql_error());
-
-// Printing results in HTML
-echo "<table>\n";
-while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
-    echo "\t<tr>\n";
-    foreach ($line as $col_value) {
-        echo "\t\t<td>$col_value</td>\n";
-    }
-    echo "\t</tr>\n";
-}
-echo "</table>\n";
-
-// Free resultset
-mysql_free_result($result);
-
-// Closing connection
-mysql_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/mysql/functions/mysql-affected-rows.xml b/reference/mysql/functions/mysql-affected-rows.xml
deleted file mode 100644
index 6422d41bf721..000000000000
--- a/reference/mysql/functions/mysql-affected-rows.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-affected-rows">
- <refnamediv>
-  <refname>mysql_affected_rows</refname>
-  <refpurpose>Get number of affected rows in previous MySQL operation</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_affected_rows</function></member>
-    <member><methodname>PDOStatement::rowCount</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mysql_affected_rows</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get the number of affected rows by the last INSERT, UPDATE, REPLACE
-   or DELETE query associated with <parameter>link_identifier</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of affected rows on success, and -1 if the last query
-   failed.
-  </simpara>
-  <simpara>
-   If the last query was a DELETE query with no WHERE clause, all
-   of the records will have been deleted from the table but this
-   function will return zero with MySQL versions prior to 4.1.2.
-  </simpara>
-  <simpara>
-   When using UPDATE, MySQL will not update columns where the new value is the
-   same as the old value.  This creates the possibility that
-   <function>mysql_affected_rows</function> may not actually equal the number
-   of rows matched, only the number of rows that were literally affected by
-   the query.
-  </simpara>
-  <simpara>
-   The REPLACE statement first deletes the record with the same primary key
-   and then inserts the new record. This function returns the number of
-   deleted records plus the number of inserted records.
-  </simpara>
-  <simpara>
-   In the case of "INSERT ... ON DUPLICATE KEY UPDATE" queries, the
-   return value will be <literal>1</literal> if an insert was performed,
-   or <literal>2</literal> for an update of an existing row.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_affected_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-mysql_select_db('mydb');
-
-/* this should return the correct numbers of deleted records */
-mysql_query('DELETE FROM mytable WHERE id < 10');
-printf("Records deleted: %d\n", mysql_affected_rows());
-
-/* with a where clause that is never true, it should return 0 */
-mysql_query('DELETE FROM mytable WHERE 0');
-printf("Records deleted: %d\n", mysql_affected_rows());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Records deleted: 10
-Records deleted: 0
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>mysql_affected_rows</function> example using transactions</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-mysql_select_db('mydb');
-
-/* Update records */
-mysql_query("UPDATE mytable SET used=1 WHERE id < 10");
-printf ("Updated records: %d\n", mysql_affected_rows());
-mysql_query("COMMIT");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Updated Records: 10
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Transactions</title>
-   <simpara>
-    If you are using transactions, you need to call
-    <function>mysql_affected_rows</function> after your INSERT, UPDATE, or
-    DELETE query, not after the COMMIT.
-   </simpara>
-  </note>
-  <note>
-   <title>SELECT Statements</title>
-   <simpara>
-    To retrieve the number of rows returned by a SELECT, it is possible to
-    use <function>mysql_num_rows</function>.
-   </simpara>
-  </note>
-  <note>
-   <title>Cascaded Foreign Keys</title>
-   <simpara>
-     <function>mysql_affected_rows</function> does not count rows affected
-     implicitly through the use of ON DELETE CASCADE and/or ON UPDATE CASCADE
-     in foreign key constraints.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_num_rows</function></member>
-   <member><function>mysql_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-client-encoding.xml b/reference/mysql/functions/mysql-client-encoding.xml
deleted file mode 100644
index 3712a8e5520d..000000000000
--- a/reference/mysql/functions/mysql-client-encoding.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-client-encoding">
- <refnamediv>
-  <refname>mysql_client_encoding</refname>
-  <refpurpose>Returns the name of the character set</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_character_set_name</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_client_encoding</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the <literal>character_set</literal> variable from MySQL.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the default character set name for the current connection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_client_encoding</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link    = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$charset = mysql_client_encoding($link);
-
-echo "The current character set is: $charset\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-The current character set is: latin1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_set_charset</function></member>
-   <member><function>mysql_real_escape_string</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/mysql/functions/mysql-close.xml b/reference/mysql/functions/mysql-close.xml
deleted file mode 100644
index a2501fe0a5df..000000000000
--- a/reference/mysql/functions/mysql-close.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-close">
- <refnamediv>
-  <refname>mysql_close</refname>
-  <refpurpose>Close MySQL connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_close</function></member>
-    <member>PDO: Assign the value of &null; to the PDO object</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_close</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_close</function> closes the non-persistent connection to
-   the MySQL server that's associated with the specified link identifier. If
-   <parameter>link_identifier</parameter> isn't specified, the last opened
-   link is used.
-  </simpara>
-  &mysql.close.connections.result.sets;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid-noreopen.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Connected successfully
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mysql_close</function> will not close persistent links
-    created by <function>mysql_pconnect</function>.
-    For additional details, see the manual page on
-    <link linkend="features.persistent-connections">persistent connections</link>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_connect</function></member>
-   <member><function>mysql_free_result</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/mysql/functions/mysql-connect.xml b/reference/mysql/functions/mysql-connect.xml
deleted file mode 100644
index 96858d728168..000000000000
--- a/reference/mysql/functions/mysql-connect.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-connect">
- <refnamediv>
-  <refname>mysql_connect</refname>
-  <refpurpose>Open a connection to a MySQL Server</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_connect</function></member>
-    <member><methodname>PDO::__construct</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>mysql_connect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter><initializer>ini_get("mysql.default_host")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>username</parameter><initializer>ini_get("mysql.default_user")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>ini_get("mysql.default_password")</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>new_link</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>client_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Opens or reuses a connection to a MySQL server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>server</parameter></term>
-    <listitem>
-     <simpara>
-      The MySQL server. It can also include a port number. e.g.
-      "hostname:port" or a path to a local socket e.g. ":/path/to/socket" for
-      the localhost.
-     </simpara>
-     <simpara>
-      If the PHP directive <link linkend="ini.mysql.default-host">
-      mysql.default_host</link> is undefined (default), then the default
-      value is 'localhost:3306'. In &sqlsafemode;, this parameter is ignored
-      and value 'localhost:3306' is always used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The username. Default value is defined by <link linkend="ini.mysql.default-user">mysql.default_user</link>. In
-      &sqlsafemode;, this parameter is ignored and the name of the user that
-      owns the server process is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password. Default value is defined by <link linkend="ini.mysql.default-password">mysql.default_password</link>. In
-      &sqlsafemode;, this parameter is ignored and empty password is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_link</parameter></term>
-    <listitem>
-     <simpara>
-      If a second call is made to <function>mysql_connect</function>
-      with the same arguments, no new link will be established, but
-      instead, the link identifier of the already opened link will be
-      returned. The <parameter>new_link</parameter> parameter modifies this
-      behavior and makes <function>mysql_connect</function> always open
-      a new link, even if <function>mysql_connect</function> was called
-      before with the same parameters.
-      In &sqlsafemode;, this parameter is ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>client_flags</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>client_flags</parameter> parameter can be a combination
-      of the following constants:
-      128 (enable <literal>LOAD DATA LOCAL</literal> handling),
-      <constant>MYSQL_CLIENT_SSL</constant>,
-      <constant>MYSQL_CLIENT_COMPRESS</constant>,
-      <constant>MYSQL_CLIENT_IGNORE_SPACE</constant> or
-      <constant>MYSQL_CLIENT_INTERACTIVE</constant>.
-      Read the section about <xref linkend="mysql.client-flags"/> for further information.
-      In &sqlsafemode;, this parameter is ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a MySQL link identifier on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_connect</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_connect</function> example using <literal>hostname:port</literal> syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// we connect to example.com and port 3307
-$link = mysql_connect('example.com:3307', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-
-// we connect to localhost at port 3307
-$link = mysql_connect('127.0.0.1:3307', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_connect</function> example using  ":/path/to/socket" syntax</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// we connect to localhost and socket e.g. /tmp/mysql.sock
-
-// variant 1: omit localhost
-$link = mysql_connect(':/tmp/mysql', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-
-
-// variant 2: with localhost
-$link = mysql_connect('localhost:/tmp/mysql.sock', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-echo 'Connected successfully';
-mysql_close($link);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Whenever you specify &quot;localhost&quot; or
-    &quot;localhost:port&quot; as server, the MySQL client library will
-    override this and try to connect to a local socket (named pipe on
-    Windows). If you want to use TCP/IP, use &quot;127.0.0.1&quot;
-    instead of &quot;localhost&quot;. If the MySQL client library tries to
-    connect to the wrong local socket, the correct path should be set as
-    <link linkend="ini.mysql.default-host">mysql.default_host</link> in &php.ini; and the server field
-    left blank.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    The link to the server will be closed as soon as the execution of
-    the script ends, unless it's closed earlier by explicitly calling
-    <function>mysql_close</function>.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    Error "Can't create TCP/IP socket (10106)" usually means that the <link linkend="ini.variables-order">variables_order</link> configure directive
-    doesn't contain character <literal>E</literal>. On Windows, if the
-    environment is not copied the <literal>SYSTEMROOT</literal> environment
-    variable won't be available and PHP will have problems loading Winsock.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_pconnect</function></member>
-   <member><function>mysql_close</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/mysql/functions/mysql-create-db.xml b/reference/mysql/functions/mysql-create-db.xml
deleted file mode 100644
index ea11e1fa5692..000000000000
--- a/reference/mysql/functions/mysql-create-db.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-create-db">
- <refnamediv>
-  <refname>mysql_create_db</refname>
-  <refpurpose>Create a MySQL database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.4-3-0;
-   <simplelist role="alternatives">
-    <member><function>mysqli_query</function></member>
-    <member><methodname>PDO::query</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_create_db</methodname>
-   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_create_db</function> attempts to create a new
-   database on the server associated with the specified link
-   identifier.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database being created.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_create_db</function> alternative example</title>
-   <simpara>
-    The function <function>mysql_create_db</function> is deprecated. It is
-    preferable to use <function>mysql_query</function> to issue an sql
-   <literal>CREATE DATABASE</literal> statement instead.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-
-$sql = 'CREATE DATABASE my_db';
-if (mysql_query($sql, $link)) {
-    echo "Database my_db created successfully\n";
-} else {
-    echo 'Error creating database: ' . mysql_error() . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Database my_db created successfully
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_createdb</function>
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This function will not be available if the MySQL extension was built
-    against a MySQL 4.x client library.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_select_db</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/mysql/functions/mysql-data-seek.xml b/reference/mysql/functions/mysql-data-seek.xml
deleted file mode 100644
index 53933ae009ca..000000000000
--- a/reference/mysql/functions/mysql-data-seek.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-data-seek">
- <refnamediv>
-  <refname>mysql_data_seek</refname>
-  <refpurpose>Move internal result pointer</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_data_seek</function></member>
-    <member><constant>PDO::FETCH_ORI_ABS</constant></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_data_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>row_number</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_data_seek</function> moves the internal row
-   pointer of the MySQL result associated with the specified result
-   identifier to point to the specified row number.  The next call
-   to a MySQL fetch function, such as <function>mysql_fetch_assoc</function>,
-   would return that row.
-  </simpara>
-  <simpara>
-   <parameter>row_number</parameter> starts at 0. The
-   <parameter>row_number</parameter> should be a value in the range from 0 to
-   <function>mysql_num_rows</function> - 1. However if the result set
-   is empty (<function>mysql_num_rows</function> == 0), a seek to 0 will
-   fail with an <constant>E_WARNING</constant> and
-   <function>mysql_data_seek</function> will return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   <varlistentry>
-    <term><parameter>row_number</parameter></term>
-    <listitem>
-     <simpara>
-      The desired row number of the new result pointer.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_data_seek</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-$db_selected = mysql_select_db('sample_db');
-if (!$db_selected) {
-    die('Could not select database: ' . mysql_error());
-}
-$query = 'SELECT last_name, first_name FROM friends';
-$result = mysql_query($query);
-if (!$result) {
-    die('Query failed: ' . mysql_error());
-}
-/* fetch rows in reverse order */
-for ($i = mysql_num_rows($result) - 1; $i >= 0; $i--) {
-    if (!mysql_data_seek($result, $i)) {
-        echo "Cannot seek to row $i: " . mysql_error() . "\n";
-        continue;
-    }
-
-    if (!($row = mysql_fetch_assoc($result))) {
-        continue;
-    }
-
-    echo $row['last_name'] . ' ' . $row['first_name'] . "<br />\n";
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The function <function>mysql_data_seek</function> can be used in
-    conjunction only with <function>mysql_query</function>, not with
-    <function>mysql_unbuffered_query</function>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_num_rows</function></member>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_fetch_array</function></member>
-   <member><function>mysql_fetch_object</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/mysql/functions/mysql-db-name.xml b/reference/mysql/functions/mysql-db-name.xml
deleted file mode 100644
index bf06fe0c7f90..000000000000
--- a/reference/mysql/functions/mysql-db-name.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-db-name">
- <refnamediv>
-  <refname>mysql_db_name</refname>
-  <refpurpose>Retrieves database name from the call to <function>mysql_list_dbs</function></refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member>Query: <literal>SELECT DATABASE()</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_db_name</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>field</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve the database name from a call to
-   <function>mysql_list_dbs</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      The result pointer from a call to <function>mysql_list_dbs</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <simpara>
-      The index into the result set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <simpara>
-      The field name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the database name on success, and &false; on failure. If &false;
-   is returned, use <function>mysql_error</function> to determine the nature
-   of the error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_db_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-error_reporting(E_ALL);
-
-$link = mysql_connect('dbhost', 'username', 'password');
-$db_list = mysql_list_dbs($link);
-
-$i = 0;
-$cnt = mysql_num_rows($db_list);
-while ($i < $cnt) {
-    echo mysql_db_name($db_list, $i) . "\n";
-    $i++;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_dbname</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_list_dbs</function></member>
-   <member><function>mysql_tablename</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/mysql/functions/mysql-db-query.xml b/reference/mysql/functions/mysql-db-query.xml
deleted file mode 100644
index da49bacfddca..000000000000
--- a/reference/mysql/functions/mysql-db-query.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-db-query">
- <refnamediv>
-  <refname>mysql_db_query</refname>
-  <refpurpose>Selects a database and executes a query on it</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.5-3-0;
-   <simplelist role="alternatives">
-    <member><function>mysqli_select_db</function> then the query</member>
-    <member><methodname>PDO::__construct</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>bool</type></type><methodname>mysql_db_query</methodname>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_db_query</function> selects a database, and executes a
-   query on it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database that will be selected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      The MySQL query.
-     </simpara>
-     <simpara>
-      Data inside the query should be <link linkend="function.mysql-real-escape-string">properly escaped</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a positive MySQL result resource to the query result,
-   or &false; on error. The function also returns &true;/&false; for
-   <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
-   queries to indicate success/failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_db_query</function> alternative example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-if (!$link = mysql_connect('mysql_host', 'mysql_user', 'mysql_password')) {
-    echo 'Could not connect to mysql';
-    exit;
-}
-
-if (!mysql_select_db('mysql_dbname', $link)) {
-    echo 'Could not select database';
-    exit;
-}
-
-$sql    = 'SELECT foo FROM bar WHERE id = 42';
-$result = mysql_query($sql, $link);
-
-if (!$result) {
-    echo "DB Error, could not query the database\n";
-    echo 'MySQL Error: ' . mysql_error();
-    exit;
-}
-
-while ($row = mysql_fetch_assoc($result)) {
-    echo $row['foo'];
-}
-
-mysql_free_result($result);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Be aware that this function does <emphasis role="strong">NOT</emphasis>
-    switch back to the database you were connected before. In other words,
-    you can't use this function to <emphasis>temporarily</emphasis> run a
-    sql query on another database, you would have to manually switch back.
-    Users are strongly encouraged to use the
-    <literal>database.table</literal> syntax in their sql queries or
-    <function>mysql_select_db</function> instead of this function.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_select_db</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/mysql/functions/mysql-drop-db.xml b/reference/mysql/functions/mysql-drop-db.xml
deleted file mode 100644
index 432ff55c7fc2..000000000000
--- a/reference/mysql/functions/mysql-drop-db.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-drop-db">
- <refnamediv>
-  <refname>mysql_drop_db</refname>
-  <refpurpose>Drop (delete) a MySQL database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.4-3-0;
-   <simplelist role="alternatives">
-    <member>Execute a <literal>DROP DATABASE</literal> query</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_drop_db</methodname>
-   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_drop_db</function> attempts to drop (remove) an
-   entire database from the server associated with the specified
-   link identifier. This function is deprecated, it is preferable to use
-   <function>mysql_query</function> to issue an sql
-   <literal>DROP DATABASE</literal> statement instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database that will be deleted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_drop_db</function> alternative example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-
-$sql = 'DROP DATABASE my_db';
-if (mysql_query($sql, $link)) {
-    echo "Database my_db was successfully dropped\n";
-} else {
-    echo 'Error dropping database: ' . mysql_error() . "\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <simpara>
-    This function will not be available if the MySQL extension was built
-    against a MySQL 4.x client library.
-   </simpara>
-  </warning>
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_dropdb</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</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/mysql/functions/mysql-errno.xml b/reference/mysql/functions/mysql-errno.xml
deleted file mode 100644
index 2f0eb7f44746..000000000000
--- a/reference/mysql/functions/mysql-errno.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-errno">
- <refnamediv>
-  <refname>mysql_errno</refname>
-  <refpurpose>Returns the numerical value of the error message from previous MySQL operation</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_errno</function></member>
-    <member><methodname>PDO::errorCode</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mysql_errno</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the error number from the last MySQL function.
-  </simpara>
-  <simpara>
-   Errors coming back from the MySQL database backend no longer
-   issue warnings. Instead, use <function>mysql_errno</function> to
-   retrieve the error code. Note that this function only returns the
-   error code from the most recently executed MySQL function (not
-   including <function>mysql_error</function> and
-   <function>mysql_errno</function>), so if you want to use it,
-   make sure you check the value before calling another MySQL
-   function.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error number from the last MySQL function, or
-   <literal>0</literal> (zero) if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_errno</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect("localhost", "mysql_user", "mysql_password");
-
-if (!mysql_select_db("nonexistentdb", $link)) {
-    echo mysql_errno($link) . ": " . mysql_error($link). "\n";
-}
-
-mysql_select_db("kossu", $link);
-if (!mysql_query("SELECT * FROM nonexistenttable", $link)) {
-    echo mysql_errno($link) . ": " . mysql_error($link) . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1049: Unknown database 'nonexistentdb'
-1146: Table 'kossu.nonexistenttable' doesn't exist
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_error</function></member>
-   <member><link xlink:href="&url.mysql.docs.error;">MySQL error codes</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/mysql/functions/mysql-error.xml b/reference/mysql/functions/mysql-error.xml
deleted file mode 100644
index 20babf41731b..000000000000
--- a/reference/mysql/functions/mysql-error.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-error">
- <refnamediv>
-  <refname>mysql_error</refname>
-  <refpurpose>Returns the text of the error message from previous MySQL operation</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_error</function></member>
-    <member><methodname>PDO::errorInfo</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_error</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the error text from the last MySQL function.
-   Errors coming back from the MySQL database backend no longer
-   issue warnings. Instead, use <function>mysql_error</function> to
-   retrieve the error text. Note that this function only returns the
-   error text from the most recently executed MySQL function (not
-   including <function>mysql_error</function> and
-   <function>mysql_errno</function>), so if you want to use it, make
-   sure you check the value before calling another MySQL function.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the error text from the last MySQL function, or
-   <literal>''</literal> (empty string) if no error occurred.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_error</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect("localhost", "mysql_user", "mysql_password");
-
-mysql_select_db("nonexistentdb", $link);
-echo mysql_errno($link) . ": " . mysql_error($link). "\n";
-
-mysql_select_db("kossu", $link);
-mysql_query("SELECT * FROM nonexistenttable", $link);
-echo mysql_errno($link) . ": " . mysql_error($link) . "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1049: Unknown database 'nonexistentdb'
-1146: Table 'kossu.nonexistenttable' doesn't exist
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_errno</function></member>
-   <member><link xlink:href="&url.mysql.docs.error;">MySQL error codes</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/mysql/functions/mysql-escape-string.xml b/reference/mysql/functions/mysql-escape-string.xml
deleted file mode 100644
index a28322331069..000000000000
--- a/reference/mysql/functions/mysql-escape-string.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-escape-string">
- <refnamediv>
-  <refname>mysql_escape_string</refname>
-  <refpurpose>Escapes a string for use in a mysql_query</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.4-3-0;
-   <simplelist role="alternatives">
-    <member><function>mysqli_escape_string</function></member>
-    <member><methodname>PDO::quote</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_escape_string</methodname>
-   <methodparam><type>string</type><parameter>unescaped_string</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function will escape the <parameter>unescaped_string</parameter>,
-   so that it is safe to place it in a <function>mysql_query</function>.
-   This function is deprecated.
-  </simpara>
-  <simpara>
-   This function is identical to <function>mysql_real_escape_string</function>
-   except that <function>mysql_real_escape_string</function> takes a
-   connection handler and escapes the string according to the current
-   character set. <function>mysql_escape_string</function> does not take a
-   connection argument and does not respect the current charset setting.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>unescaped_string</parameter></term>
-    <listitem>
-     <simpara>
-      The string that is to be escaped.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the escaped string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_escape_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$item = "Zak's Laptop";
-$escaped_item = mysql_escape_string($item);
-printf("Escaped string: %s\n", $escaped_item);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Escaped string: Zak\'s Laptop
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mysql_escape_string</function> does not escape
-    <literal>%</literal> and <literal>_</literal>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_real_escape_string</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/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
deleted file mode 100644
index 83bfc1fbaa91..000000000000
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-array">
- <refnamediv>
-  <refname>mysql_fetch_array</refname>
-  <refpurpose>Fetch a result row as an associative array, a numeric array, or both</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_array</function></member>
-    <member><methodname>PDOStatement::fetch</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mysql_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>result_type</parameter><initializer>MYSQL_BOTH</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an array that corresponds to the fetched row
-   and moves the internal data pointer ahead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   <varlistentry>
-    <term><parameter>result_type</parameter></term>
-    <listitem>
-     <simpara>
-      The type of array that is to be fetched. It's a constant and can
-      take the following values: <constant>MYSQL_ASSOC</constant>,
-      <constant>MYSQL_NUM</constant>, and
-      <constant>MYSQL_BOTH</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of strings that corresponds to the fetched row, or &false;
-   if there are no more rows. The type of returned array depends on
-   how <parameter>result_type</parameter> is defined. By using
-   <constant>MYSQL_BOTH</constant> (default), you'll get an array with both
-   associative and number indices. Using <constant>MYSQL_ASSOC</constant>, you
-   only get associative indices (as <function>mysql_fetch_assoc</function>
-   works), using <constant>MYSQL_NUM</constant>, you only get number indices
-   (as <function>mysql_fetch_row</function> works).
-  </simpara>
-  <simpara>
-   If two or more columns of the result have the same field names,
-   the last column will take precedence. To access the other column(s)
-   of the same name, you must use the numeric index of the column or
-   make an alias for the column. For aliased columns, you cannot
-   access the contents with the original column name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Query with aliased duplicate field names</title>
-   <programlisting role="sql">
-<![CDATA[
-SELECT table1.field AS foo, table2.field AS bar FROM table1, table2
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_fetch_array</function> with <constant>MYSQL_NUM</constant></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("localhost", "mysql_user", "mysql_password") or
-    die("Could not connect: " . mysql_error());
-mysql_select_db("mydb");
-
-$result = mysql_query("SELECT id, name FROM mytable");
-
-while ($row = mysql_fetch_array($result, MYSQL_NUM)) {
-    printf("ID: %s  Name: %s", $row[0], $row[1]);
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_fetch_array</function> with <constant>MYSQL_ASSOC</constant></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("localhost", "mysql_user", "mysql_password") or
-    die("Could not connect: " . mysql_error());
-mysql_select_db("mydb");
-
-$result = mysql_query("SELECT id, name FROM mytable");
-
-while ($row = mysql_fetch_array($result, MYSQL_ASSOC)) {
-    printf("ID: %s  Name: %s", $row["id"], $row["name"]);
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_fetch_array</function> with <constant>MYSQL_BOTH</constant></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("localhost", "mysql_user", "mysql_password") or
-    die("Could not connect: " . mysql_error());
-mysql_select_db("mydb");
-
-$result = mysql_query("SELECT id, name FROM mytable");
-
-while ($row = mysql_fetch_array($result, MYSQL_BOTH)) {
-    printf ("ID: %s  Name: %s", $row[0], $row["name"]);
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Performance</title>
-   <simpara>
-    An important thing to note is that using
-    <function>mysql_fetch_array</function> is <emphasis>not
-    significantly</emphasis> slower than using
-    <function>mysql_fetch_row</function>, while it provides
-    a significant added value.
-   </simpara>
-  </note>
-  &database.field-case;
-  &database.fetch-null;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_data_seek</function></member>
-   <member><function>mysql_query</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/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
deleted file mode 100644
index 12e1868900ad..000000000000
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-assoc">
- <refnamediv>
-  <refname>mysql_fetch_assoc</refname>
-  <refpurpose>Fetch a result row as an associative array</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_assoc</function></member>
-    <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_ASSOC</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mysql_fetch_assoc</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an associative array that corresponds to the fetched row
-   and moves the internal data pointer ahead.
-   <function>mysql_fetch_assoc</function> is equivalent to calling
-   <function>mysql_fetch_array</function> with MYSQL_ASSOC for the
-   optional second parameter. It only returns an associative array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array of strings that corresponds to the fetched row, or
-   &false; if there are no more rows.
-  </simpara>
-  <simpara>
-   If two or more columns of the result have the same field names,
-   the last column will take precedence. To access the other
-   column(s) of the same name, you either need to access the
-   result with numeric indices by using
-   <function>mysql_fetch_row</function> or add alias names.
-   See the example at the <function>mysql_fetch_array</function>
-   description about aliases.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>An expanded <function>mysql_fetch_assoc</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$conn = mysql_connect("localhost", "mysql_user", "mysql_password");
-
-if (!$conn) {
-    echo "Unable to connect to DB: " . mysql_error();
-    exit;
-}
-
-if (!mysql_select_db("mydbname")) {
-    echo "Unable to select mydbname: " . mysql_error();
-    exit;
-}
-
-$sql = "SELECT id as userid, fullname, userstatus
-        FROM   sometable
-        WHERE  userstatus = 1";
-
-$result = mysql_query($sql);
-
-if (!$result) {
-    echo "Could not successfully run query ($sql) from DB: " . mysql_error();
-    exit;
-}
-
-if (mysql_num_rows($result) == 0) {
-    echo "No rows found, nothing to print so am exiting";
-    exit;
-}
-
-// While a row of data exists, put that row in $row as an associative array
-// Note: If you're expecting just one row, no need to use a loop
-// Note: If you put extract($row); inside the following loop, you'll
-//       then create $userid, $fullname, and $userstatus
-while ($row = mysql_fetch_assoc($result)) {
-    echo $row["userid"];
-    echo $row["fullname"];
-    echo $row["userstatus"];
-}
-
-mysql_free_result($result);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Performance</title>
-   <simpara>
-    An important thing to note is that using
-    <function>mysql_fetch_assoc</function> is <emphasis>not
-    significantly</emphasis> slower than using
-    <function>mysql_fetch_row</function>, while it
-    provides a significant added value.
-   </simpara>
-  </note>
-  &database.field-case;
-  &database.fetch-null;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>mysql_fetch_array</function></member>
-   <member><function>mysql_data_seek</function></member>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_error</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/mysql/functions/mysql-fetch-field.xml b/reference/mysql/functions/mysql-fetch-field.xml
deleted file mode 100644
index 2b00cdba2748..000000000000
--- a/reference/mysql/functions/mysql-fetch-field.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-field">
- <refnamediv>
-  <refname>mysql_fetch_field</refname>
-  <refpurpose>Get column information from a result and return as an object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field</function></member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>mysql_fetch_field</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>field_offset</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an object containing field information. This function can be used
-   to obtain information about fields in the provided query result.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   <varlistentry>
-    <term><parameter>field_offset</parameter></term>
-    <listitem>
-     <simpara>
-      The numerical field offset. If the field offset is not specified, the
-      next field that was not yet retrieved by this function is retrieved.
-      The <parameter>field_offset</parameter> starts at <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>object</type> containing field information. The properties
-   of the object are:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     name - column name
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     table - name of the table the column belongs to, which is the alias name if one is defined
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     max_length - maximum length of the column
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     not_null - 1 if the column cannot be &null;
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     primary_key - 1 if the column is a primary key
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     unique_key - 1 if the column is a unique key
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     multiple_key - 1 if the column is a non-unique key
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     numeric - 1 if the column is numeric
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     blob - 1 if the column is a BLOB
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     type - the type of the column
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     unsigned - 1 if the column is unsigned
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     zerofill - 1 if the column is zero-filled
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_fetch_field</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$conn = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$conn) {
-    die('Could not connect: ' . mysql_error());
-}
-mysql_select_db('database');
-$result = mysql_query('select * from table');
-if (!$result) {
-    die('Query failed: ' . mysql_error());
-}
-/* get column metadata */
-$i = 0;
-while ($i < mysql_num_fields($result)) {
-    echo "Information for column $i:<br />\n";
-    $meta = mysql_fetch_field($result, $i);
-    if (!$meta) {
-        echo "No information available<br />\n";
-    }
-    echo "<pre>
-blob:         $meta->blob
-max_length:   $meta->max_length
-multiple_key: $meta->multiple_key
-name:         $meta->name
-not_null:     $meta->not_null
-numeric:      $meta->numeric
-primary_key:  $meta->primary_key
-table:        $meta->table
-type:         $meta->type
-unique_key:   $meta->unique_key
-unsigned:     $meta->unsigned
-zerofill:     $meta->zerofill
-</pre>";
-    $i++;
-}
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &database.field-case;
-  <note>
-   <simpara>
-    If field or tablenames are aliased in the SQL query the aliased name will
-    be returned. The original name can be retrieved for instance by using
-    <methodname>mysqli_result::fetch_field</methodname>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_seek</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/mysql/functions/mysql-fetch-lengths.xml b/reference/mysql/functions/mysql-fetch-lengths.xml
deleted file mode 100644
index d4bd2b46d406..000000000000
--- a/reference/mysql/functions/mysql-fetch-lengths.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-lengths">
- <refnamediv>
-  <refname>mysql_fetch_lengths</refname>
-  <refpurpose>Get the length of each output in a result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_lengths</function></member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>mysql_fetch_lengths</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an array that corresponds to the lengths of each field
-   in the last row fetched by MySQL.
-  </simpara>
-  <simpara>
-   <function>mysql_fetch_lengths</function> stores the lengths of
-   each result column in the last row returned by
-   <function>mysql_fetch_row</function>,
-   <function>mysql_fetch_assoc</function>,
-   <function>mysql_fetch_array</function>, and
-   <function>mysql_fetch_object</function> in an array, starting at
-   offset 0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of lengths on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_fetch_lengths</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-$row     = mysql_fetch_assoc($result);
-$lengths = mysql_fetch_lengths($result);
-
-print_r($row);
-print_r($lengths);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [id] => 42
-    [email] => user@example.com
-)
-Array
-(
-    [0] => 2
-    [1] => 16
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_len</function></member>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>strlen</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/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
deleted file mode 100644
index d118207131a0..000000000000
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-object">
- <refnamediv>
-  <refname>mysql_fetch_object</refname>
-  <refpurpose>Fetch a result row as an object</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_object</function></member>
-    <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_OBJ</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>mysql_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns an object with properties that correspond to the fetched row
-   and moves the internal data pointer ahead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-     <listitem>
-      <simpara>
-       The name of the class to instantiate, set the properties of and return.
-       If not specified, a <classname>stdClass</classname> object is returned.
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-     <listitem>
-      <simpara>
-       An optional <type>array</type> of parameters to pass to the constructor
-       for <parameter>class_name</parameter> objects.
-      </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>object</type> with string properties that correspond to the
-   fetched row, or &false; if there are no more rows.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_fetch_object</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("hostname", "user", "password");
-mysql_select_db("mydb");
-$result = mysql_query("select * from mytable");
-while ($row = mysql_fetch_object($result)) {
-    echo $row->user_id;
-    echo $row->fullname;
-}
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_fetch_object</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class foo {
-    public $name;
-}
-
-mysql_connect("hostname", "user", "password");
-mysql_select_db("mydb");
-
-$result = mysql_query("select name from mytable limit 1");
-$obj = mysql_fetch_object($result, 'foo');
-var_dump($obj);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <title>Performance</title>
-   <simpara>
-    Speed-wise, the function is identical to
-    <function>mysql_fetch_array</function>, and almost as quick as
-    <function>mysql_fetch_row</function> (the difference is
-    insignificant).
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    <function>mysql_fetch_object</function> is similar to
-    <function>mysql_fetch_array</function>, with one difference - an
-    object is returned, instead of an array.  Indirectly, that means
-    that you can only access the data by the field names, and not by
-    their offsets (numbers are illegal property names).
-   </simpara>
-  </note>
-  &database.field-case;
-  &database.fetch-null;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_array</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>mysql_data_seek</function></member>
-   <member><function>mysql_query</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/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
deleted file mode 100644
index 3e877a7af507..000000000000
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-fetch-row">
- <refnamediv>
-  <refname>mysql_fetch_row</refname>
-  <refpurpose>Get a result row as an enumerated array</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_row</function></member>
-    <member>
-     <methodname>PDOStatement::fetch</methodname>
-     with <parameter>mode</parameter> as <constant>PDO::FETCH_NUM</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>mysql_fetch_row</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a numerical array that corresponds to the fetched row
-   and moves the internal data pointer ahead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an numerical array of strings that corresponds to the fetched row, or
-   &false; if there are no more rows.
-  </simpara>
-  <simpara>
-   <function>mysql_fetch_row</function> fetches one row of data from
-   the result associated with the specified result identifier.  The
-   row is returned as an array.  Each result column is stored in an
-   array offset, starting at offset 0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Fetching one row with <function>mysql_fetch_row</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-$row = mysql_fetch_row($result);
-
-echo $row[0]; // 42
-echo $row[1]; // the email value
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &database.fetch-null;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_array</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_fetch_object</function></member>
-   <member><function>mysql_data_seek</function></member>
-   <member><function>mysql_fetch_lengths</function></member>
-   <member><function>mysql_result</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/mysql/functions/mysql-field-flags.xml b/reference/mysql/functions/mysql-field-flags.xml
deleted file mode 100644
index 372861f951a4..000000000000
--- a/reference/mysql/functions/mysql-field-flags.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-flags">
- <refnamediv>
-  <refname>mysql_field_flags</refname>
-  <refpurpose>Get the flags associated with the specified field in a result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field_direct</function> [flags]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [flags]</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mysql_field_flags</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_field_flags</function> returns the field flags of
-   the specified field. The flags are reported as a single word
-   per flag separated by a single space, so that you can split the
-   returned value using <function>explode</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string of flags associated with the result&return.falseforfailure;.
-  </simpara>
-  <simpara>
-   The following flags are reported, if your version of MySQL
-   is current enough to support them: <literal>"not_null"</literal>,
-   <literal>"primary_key"</literal>, <literal>"unique_key"</literal>,
-   <literal>"multiple_key"</literal>, <literal>"blob"</literal>,
-   <literal>"unsigned"</literal>, <literal>"zerofill"</literal>,
-   <literal>"binary"</literal>, <literal>"enum"</literal>,
-   <literal>"auto_increment"</literal> and <literal>"timestamp"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_field_flags</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-$flags = mysql_field_flags($result, 0);
-
-echo $flags;
-print_r(explode(' ', $flags));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-not_null primary_key auto_increment
-Array
-(
-    [0] => not_null
-    [1] => primary_key
-    [2] => auto_increment
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_fieldflags</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_type</function></member>
-   <member><function>mysql_field_len</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/mysql/functions/mysql-field-len.xml b/reference/mysql/functions/mysql-field-len.xml
deleted file mode 100644
index 679d9c9dc78f..000000000000
--- a/reference/mysql/functions/mysql-field-len.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-len">
- <refnamediv>
-  <refname>mysql_field_len</refname>
-  <refpurpose>Returns the length of the specified field</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field_direct</function> [length]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [len]</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mysql_field_len</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_field_len</function> returns the length of the
-   specified field.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The length of the specified field index on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_field_len</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-
-// Will get the length of the id field as specified in the database
-// schema.
-$length = mysql_field_len($result, 0);
-echo $length;
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_fieldlen</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_lengths</function></member>
-   <member><function>strlen</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/mysql/functions/mysql-field-name.xml b/reference/mysql/functions/mysql-field-name.xml
deleted file mode 100644
index 9d23f5bca98c..000000000000
--- a/reference/mysql/functions/mysql-field-name.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-name">
- <refnamediv>
-  <refname>mysql_field_name</refname>
-  <refpurpose>Get the name of the specified field in a result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field_direct</function> [name] or [orgname]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [name]</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mysql_field_name</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_field_name</function> returns the name of the
-   specified field index.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The name of the specified field index on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_field_name</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* The users table consists of three fields:
- *   user_id
- *   username
- *   password.
- */
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect to MySQL server: ' . mysql_error());
-}
-$dbname = 'mydb';
-$db_selected = mysql_select_db($dbname, $link);
-if (!$db_selected) {
-    die("Could not set $dbname: " . mysql_error());
-}
-$res = mysql_query('select * from users', $link);
-
-echo mysql_field_name($res, 0) . "\n";
-echo mysql_field_name($res, 2);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-user_id
-password
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &database.field-case;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_fieldname</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_type</function></member>
-   <member><function>mysql_field_len</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/mysql/functions/mysql-field-seek.xml b/reference/mysql/functions/mysql-field-seek.xml
deleted file mode 100644
index c1cb581b4455..000000000000
--- a/reference/mysql/functions/mysql-field-seek.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-seek">
- <refnamediv>
-  <refname>mysql_field_seek</refname>
-  <refpurpose>Set result pointer to a specified field offset</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_field_seek</function></member>
-    <member>
-     <methodname>PDOStatement::fetch</methodname> using the
-     <parameter>cursor_orientation</parameter> and
-     <parameter>offset</parameter> parameters
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_field_seek</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Seeks to the specified field offset.  If the next call to
-   <function>mysql_fetch_field</function> doesn't include a field
-   offset, the field offset specified in
-   <function>mysql_field_seek</function> will be returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_field</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/mysql/functions/mysql-field-table.xml b/reference/mysql/functions/mysql-field-table.xml
deleted file mode 100644
index 8c256f2aeb9d..000000000000
--- a/reference/mysql/functions/mysql-field-table.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-field-table">
- <refnamediv>
-  <refname>mysql_field_table</refname>
-  <refpurpose>Get name of the table the specified field is in</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field_direct</function> [table] or [orgtable]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [table]</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_field_table</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the table that the specified field is in.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The name of the table on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_field_table</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$query = "SELECT account.*, country.* FROM account, country WHERE country.name = 'Portugal' AND account.country_id = country.id";
-
-// get the result from the DB
-$result = mysql_query($query);
-
-// Lists the table name and then the field name
-for ($i = 0; $i < mysql_num_fields($result); ++$i) {
-    $table = mysql_field_table($result, $i);
-    $field = mysql_field_name($result, $i);
-
-    echo  "$table: $field\n";
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_fieldtable</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_list_tables</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/mysql/functions/mysql-field-type.xml b/reference/mysql/functions/mysql-field-type.xml
deleted file mode 100644
index 7578758f02c5..000000000000
--- a/reference/mysql/functions/mysql-field-type.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-field-type">
- <refnamediv>
-  <refname>mysql_field_type</refname>
-  <refpurpose>Get the type of the specified field in a result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_fetch_field_direct</function> [type]</member>
-    <member><methodname>PDOStatement::getColumnMeta</methodname> [driver:decl_type] or [pdo_type]</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_field_type</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>field_offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_field_type</function> is similar to the
-   <function>mysql_field_name</function> function. The arguments are
-   identical, but the field type is returned instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   &mysql.field-offset.req.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The returned field type
-   will be one of <literal>"int"</literal>, <literal>"real"</literal>,
-   <literal>"string"</literal>, <literal>"blob"</literal>, and others as
-   detailed in the <link xlink:href="&url.mysql.docs;">MySQL
-   documentation</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_field_type</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("localhost", "mysql_username", "mysql_password");
-mysql_select_db("mysql");
-$result = mysql_query("SELECT * FROM func");
-$fields = mysql_num_fields($result);
-$rows   = mysql_num_rows($result);
-$table  = mysql_field_table($result, 0);
-echo "Your '" . $table . "' table has " . $fields . " fields and " . $rows . " record(s)\n";
-echo "The table has the following fields:\n";
-for ($i=0; $i < $fields; $i++) {
-    $type  = mysql_field_type($result, $i);
-    $name  = mysql_field_name($result, $i);
-    $len   = mysql_field_len($result, $i);
-    $flags = mysql_field_flags($result, $i);
-    echo $type . " " . $name . " " . $len . " " . $flags . "\n";
-}
-mysql_free_result($result);
-mysql_close();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Your 'func' table has 4 fields and 1 record(s)
-The table has the following fields:
-string name 64 not_null primary_key binary
-int ret 1 not_null
-string dl 128 not_null
-string type 9 not_null enum
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_fieldtype</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_name</function></member>
-   <member><function>mysql_field_len</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/mysql/functions/mysql-free-result.xml b/reference/mysql/functions/mysql-free-result.xml
deleted file mode 100644
index 575915e688a3..000000000000
--- a/reference/mysql/functions/mysql-free-result.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-free-result">
- <refnamediv>
-  <refname>mysql_free_result</refname>
-  <refpurpose>Free result memory</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_free_result</function></member>
-    <member>Assign the value of &null; to the PDO object, or <methodname>PDOStatement::closeCursor</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_free_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_free_result</function> will free all memory
-   associated with the result identifier <parameter>result</parameter>.
-  </simpara>
-  <simpara>
-   <function>mysql_free_result</function> only needs to be called if
-   you are concerned about how much memory is being used for queries
-   that return large result sets.  All associated result memory is
-   automatically freed at the end of the script's execution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
-  <simpara>
-   If a non-resource is used for the <parameter>result</parameter>, an
-   error of level E_WARNING will be emitted.  It's worth noting that
-   <function>mysql_query</function> only returns a <type>resource</type>
-   for SELECT, SHOW, EXPLAIN, and DESCRIBE queries.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_free_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-/* Use the result, assuming we're done with it afterwards */
-$row = mysql_fetch_assoc($result);
-
-/* Now we free up the result and continue on with our script */
-mysql_free_result($result);
-
-echo $row['id'];
-echo $row['email'];
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_freeresult</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</function></member>
-   <member><function>is_resource</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/mysql/functions/mysql-get-client-info.xml b/reference/mysql/functions/mysql-get-client-info.xml
deleted file mode 100644
index 286d34421bb6..000000000000
--- a/reference/mysql/functions/mysql-get-client-info.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-client-info">
- <refnamediv>
-  <refname>mysql_get_client_info</refname>
-  <refpurpose>Get MySQL client info</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_get_client_info</function></member>
-    <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_CLIENT_VERSION</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_get_client_info</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_get_client_info</function> returns a string that
-   represents the client library version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The MySQL client version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_get_client_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-printf("MySQL client info: %s\n", mysql_get_client_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MySQL client info: 3.23.39
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_get_host_info</function></member>
-   <member><function>mysql_get_proto_info</function></member>
-   <member><function>mysql_get_server_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-get-host-info.xml b/reference/mysql/functions/mysql-get-host-info.xml
deleted file mode 100644
index 802c0d131f83..000000000000
--- a/reference/mysql/functions/mysql-get-host-info.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-host-info">
- <refnamediv>
-  <refname>mysql_get_host_info</refname>
-  <refpurpose>Get MySQL host info</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_get_host_info</function></member>
-    <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_CONNECTION_STATUS</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mysql_get_host_info</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Describes the type of connection in use for the connection, including the
-   server host name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string describing the type of MySQL connection in use for the
-   connection&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_get_host_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-printf("MySQL host info: %s\n", mysql_get_host_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MySQL host info: Localhost via UNIX socket
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_get_client_info</function></member>
-   <member><function>mysql_get_proto_info</function></member>
-   <member><function>mysql_get_server_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-get-proto-info.xml b/reference/mysql/functions/mysql-get-proto-info.xml
deleted file mode 100644
index 44b04b3abb80..000000000000
--- a/reference/mysql/functions/mysql-get-proto-info.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.mysql-get-proto-info">
- <refnamediv>
-  <refname>mysql_get_proto_info</refname>
-  <refpurpose>Get MySQL protocol info</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_get_proto_info</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mysql_get_proto_info</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the MySQL protocol.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the MySQL protocol on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_get_proto_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-printf("MySQL protocol version: %s\n", mysql_get_proto_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MySQL protocol version: 10
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_get_client_info</function></member>
-   <member><function>mysql_get_host_info</function></member>
-   <member><function>mysql_get_server_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-get-server-info.xml b/reference/mysql/functions/mysql-get-server-info.xml
deleted file mode 100644
index 13e34b52584e..000000000000
--- a/reference/mysql/functions/mysql-get-server-info.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-get-server-info">
- <refnamediv>
-  <refname>mysql_get_server_info</refname>
-  <refpurpose>Get MySQL server info</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_get_server_info</function></member>
-    <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_SERVER_VERSION</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mysql_get_server_info</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the MySQL server version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the MySQL server version on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_get_server_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-printf("MySQL server version: %s\n", mysql_get_server_info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MySQL server version: 4.0.1-alpha
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_get_client_info</function></member>
-   <member><function>mysql_get_host_info</function></member>
-   <member><function>mysql_get_proto_info</function></member>
-   <member><function>phpversion</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/mysql/functions/mysql-info.xml b/reference/mysql/functions/mysql-info.xml
deleted file mode 100644
index 76796bd66943..000000000000
--- a/reference/mysql/functions/mysql-info.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-info">
- <refnamediv>
-  <refname>mysql_info</refname>
-  <refpurpose>Get information about the most recent query</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_info</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_info</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns detailed information about the last query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns information about the statement on success, or &false; on
-   failure. See the example below for which statements provide information,
-   and what the returned value may look like. Statements that are not listed
-   will return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Relevant MySQL Statements</title>
-   <simpara>
-    Statements that return string values. The numbers are only for
-    illustrating purpose; their values will correspond to the query.
-   </simpara>
-   <programlisting role="mysql">
-<![CDATA[
-INSERT INTO ... SELECT ...
-String format: Records: 23 Duplicates: 0 Warnings: 0
-INSERT INTO ... VALUES (...),(...),(...)...
-String format: Records: 37 Duplicates: 0 Warnings: 0
-LOAD DATA INFILE ...
-String format: Records: 42 Deleted: 0 Skipped: 0 Warnings: 0
-ALTER TABLE
-String format: Records: 60 Duplicates: 0 Warnings: 0
-UPDATE
-String format: Rows matched: 65 Changed: 65 Warnings: 0
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>mysql_info</function> returns a non-&false; value for the
-    INSERT ... VALUES statement only if multiple value lists are
-    specified in the statement.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_affected_rows</function></member>
-   <member><function>mysql_insert_id</function></member>
-   <member><function>mysql_stat</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/mysql/functions/mysql-insert-id.xml b/reference/mysql/functions/mysql-insert-id.xml
deleted file mode 100644
index cccbeeda8dc0..000000000000
--- a/reference/mysql/functions/mysql-insert-id.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-insert-id">
- <refnamediv>
-  <refname>mysql_insert_id</refname>
-  <refpurpose>Get the ID generated in the last query</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_insert_id</function></member>
-    <member><methodname>PDO::lastInsertId</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>mysql_insert_id</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the ID generated for an AUTO_INCREMENT column by the previous
-   query (usually INSERT).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The ID generated for an AUTO_INCREMENT column by the previous
-   query on success, <literal>0</literal> if the previous
-   query does not generate an AUTO_INCREMENT value, or &false; if
-   no MySQL connection was established.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_insert_id</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-mysql_select_db('mydb');
-
-mysql_query("INSERT INTO mytable (product) values ('kossu')");
-printf("Last inserted record has id %d\n", mysql_insert_id());
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <simpara>
-    <function>mysql_insert_id</function> will convert the return type of the
-    native MySQL C API function <literal>mysql_insert_id()</literal> to a type
-    of <literal>long</literal> (named <type>int</type> in PHP). If your
-    AUTO_INCREMENT column has a column type of BIGINT (64 bits) the
-    conversion may result in an incorrect value. Instead, use the internal
-    MySQL SQL function LAST_INSERT_ID() in an SQL query. For more information
-    about PHP's maximum integer values, please see the
-    <link linkend="language.types.integer">integer</link> documentation.
-   </simpara>
-  </caution>
-  <note>
-   <simpara>
-    Because <function>mysql_insert_id</function> acts on the last performed
-    query, be sure to call <function>mysql_insert_id</function> immediately
-    after the query that generates the value.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    The value of the MySQL SQL function
-    <literal>LAST_INSERT_ID()</literal> always contains the most
-    recently generated AUTO_INCREMENT value, and is not reset
-    between queries.
-  </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-list-dbs.xml b/reference/mysql/functions/mysql-list-dbs.xml
deleted file mode 100644
index 595dc27a89d9..000000000000
--- a/reference/mysql/functions/mysql-list-dbs.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-list-dbs">
- <refnamediv>
-  <refname>mysql_list_dbs</refname>
-  <refpurpose>List databases available on a MySQL server</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.5-4-0;
-   <simplelist role="alternatives">
-    <member>SQL Query: <literal>SHOW DATABASES</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mysql_list_dbs</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a result pointer containing the databases available from the
-   current mysql daemon.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a result pointer <type>resource</type> on success, or &false; on
-   failure. Use the <function>mysql_tablename</function> function to traverse
-   this result pointer, or any function for result tables, such as
-   <function>mysql_fetch_array</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_list_dbs</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Usage without mysql_list_dbs()
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$res = mysql_query("SHOW DATABASES");
-
-while ($row = mysql_fetch_assoc($res)) {
-    echo $row['Database'] . "\n";
-}
-
-// Deprecated as of PHP 5.4.0
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$db_list = mysql_list_dbs($link);
-
-while ($row = mysql_fetch_object($db_list)) {
-     echo $row->Database . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-database1
-database2
-database3
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_listdbs</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_db_name</function></member>
-   <member><function>mysql_select_db</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/mysql/functions/mysql-list-fields.xml b/reference/mysql/functions/mysql-list-fields.xml
deleted file mode 100644
index a9a3b736c143..000000000000
--- a/reference/mysql/functions/mysql-list-fields.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-list-fields">
- <refnamediv>
-  <refname>mysql_list_fields</refname>
-  <refpurpose>List MySQL table fields</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.5-4-0;
-   <simplelist role="alternatives">
-    <member>SQL Query: <literal>SHOW COLUMNS FROM sometable</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mysql_list_fields</methodname>
-   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>table_name</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves information about the given table name.
-  </simpara>
-  <simpara>
-   This function is deprecated. It is preferable to use
-   <function>mysql_query</function> to issue an SQL <literal>SHOW COLUMNS FROM
-   table [LIKE 'name']</literal> statement instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database that's being queried.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the table that's being queried.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A result pointer <type>resource</type> on success, or &false; on
-   failure.
-  </simpara>
-  <simpara>
-   The returned result can be used with <function>mysql_field_flags</function>,
-   <function>mysql_field_len</function>,
-   <function>mysql_field_name</function>&listendand;
-   <function>mysql_field_type</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Alternate to deprecated <function>mysql_list_fields</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SHOW COLUMNS FROM sometable");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-if (mysql_num_rows($result) > 0) {
-    while ($row = mysql_fetch_assoc($result)) {
-        print_r($row);
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [Field] => id
-    [Type] => int(7)
-    [Null] =>
-    [Key] => PRI
-    [Default] =>
-    [Extra] => auto_increment
-)
-Array
-(
-    [Field] => email
-    [Type] => varchar(100)
-    [Null] =>
-    [Key] =>
-    [Default] =>
-    [Extra] =>
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_listfields</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_field_flags</function></member>
-   <member><function>mysql_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql/functions/mysql-list-processes.xml b/reference/mysql/functions/mysql-list-processes.xml
deleted file mode 100644
index ef91dfdb2cf2..000000000000
--- a/reference/mysql/functions/mysql-list-processes.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-list-processes">
- <refnamediv>
-  <refname>mysql_list_processes</refname>
-  <refpurpose>List MySQL processes</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_thread_id</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>mysql_list_processes</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the current MySQL server threads.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A result pointer <type>resource</type> on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_list_processes</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-
-$result = mysql_list_processes($link);
-while ($row = mysql_fetch_assoc($result)){
-    printf("%s %s %s %s %s\n", $row["Id"], $row["Host"], $row["db"],
-        $row["Command"], $row["Time"]);
-}
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1 localhost test Processlist 0
-4 localhost mysql sleep 5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_thread_id</function></member>
-   <member><function>mysql_stat</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/mysql/functions/mysql-list-tables.xml b/reference/mysql/functions/mysql-list-tables.xml
deleted file mode 100644
index 36798fd5d7ce..000000000000
--- a/reference/mysql/functions/mysql-list-tables.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-list-tables">
- <refnamediv>
-  <refname>mysql_list_tables</refname>
-  <refpurpose>List tables in a MySQL database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note.4-3-0;
-   <simplelist role="alternatives">
-    <member>SQL Query: <literal>SHOW TABLES FROM dbname</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>mysql_list_tables</methodname>
-   <methodparam><type>string</type><parameter>database</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves a list of table names from a MySQL database.
-  </simpara>
-  <simpara>
-   This function is deprecated. It is preferable to use
-   <function>mysql_query</function> to issue an SQL <literal>SHOW TABLES
-   [FROM db_name] [LIKE 'pattern']</literal> statement instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A result pointer <type>resource</type> on success&return.falseforfailure;.
-  </simpara>
-  <simpara>
-   Use the <function>mysql_tablename</function> function to
-   traverse this result pointer, or any function for result tables,
-   such as <function>mysql_fetch_array</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_list_tables</function> alternative example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dbname = 'mysql_dbname';
-
-if (!mysql_connect('mysql_host', 'mysql_user', 'mysql_password')) {
-    echo 'Could not connect to mysql';
-    exit;
-}
-
-$sql = "SHOW TABLES FROM $dbname";
-$result = mysql_query($sql);
-
-if (!$result) {
-    echo "DB Error, could not list tables\n";
-    echo 'MySQL Error: ' . mysql_error();
-    exit;
-}
-
-while ($row = mysql_fetch_row($result)) {
-    echo "Table: {$row[0]}\n";
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_listtables</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_list_dbs</function></member>
-   <member><function>mysql_tablename</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/mysql/functions/mysql-num-fields.xml b/reference/mysql/functions/mysql-num-fields.xml
deleted file mode 100644
index c525e0d6a0e5..000000000000
--- a/reference/mysql/functions/mysql-num-fields.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-num-fields">
- <refnamediv>
-  <refname>mysql_num_fields</refname>
-  <refpurpose>Get number of fields in result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_num_fields</function></member>
-    <member><methodname>PDOStatement::columnCount</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mysql_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the number of fields from a query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of fields in the result set <type>resource</type> on
-   success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_num_fields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query("SELECT id,email FROM people WHERE id = '42'");
-if (!$result) {
-    echo 'Could not run query: ' . mysql_error();
-    exit;
-}
-
-/* returns 2 because id,email === two fields */
-echo mysql_num_fields($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_numfields</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_select_db</function></member>
-   <member><function>mysql_query</function></member>
-   <member><function>mysql_fetch_field</function></member>
-   <member><function>mysql_num_rows</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/mysql/functions/mysql-num-rows.xml b/reference/mysql/functions/mysql-num-rows.xml
deleted file mode 100644
index bc43c5340487..000000000000
--- a/reference/mysql/functions/mysql-num-rows.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-num-rows">
- <refnamediv>
-  <refname>mysql_num_rows</refname>
-  <refpurpose>Get number of rows in result</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_num_rows</function></member>
-    <member><function>mysqli_stmt_num_rows</function></member>
-    <member><methodname>PDOStatement::rowCount</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mysql_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the number of rows from a result set. This command is only valid
-   for statements like SELECT or SHOW that return an actual result set.
-   To retrieve the number of rows affected by a INSERT, UPDATE, REPLACE or
-   DELETE query, use <function>mysql_affected_rows</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of rows in a result set on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_num_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$link = mysql_connect("localhost", "mysql_user", "mysql_password");
-mysql_select_db("database", $link);
-
-$result = mysql_query("SELECT * FROM table1", $link);
-$num_rows = mysql_num_rows($result);
-
-echo "$num_rows Rows\n";
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    If you use <function>mysql_unbuffered_query</function>,
-    <function>mysql_num_rows</function> will not return the
-    correct value until all the rows in the result set have been
-    retrieved.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_numrows</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_affected_rows</function></member>
-   <member><function>mysql_connect</function></member>
-   <member><function>mysql_data_seek</function></member>
-   <member><function>mysql_select_db</function></member>
-   <member><function>mysql_query</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/mysql/functions/mysql-pconnect.xml b/reference/mysql/functions/mysql-pconnect.xml
deleted file mode 100644
index bb4c83d4c8fa..000000000000
--- a/reference/mysql/functions/mysql-pconnect.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-pconnect">
- <refnamediv>
-  <refname>mysql_pconnect</refname>
-  <refpurpose>Open a persistent connection to a MySQL server</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_connect</function> with <literal>p:</literal> host prefix</member>
-    <member><methodname>PDO::__construct</methodname> with <constant>PDO::ATTR_PERSISTENT</constant> as a driver option</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mysql_pconnect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>server</parameter><initializer>ini_get("mysql.default_host")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>username</parameter><initializer>ini_get("mysql.default_user")</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>ini_get("mysql.default_password")</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>client_flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <!-- Undocumented confusing syntax:
-  <methodsynopsis>
-   <type>resource</type><methodname>mysql_pconnect</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>server</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>bool</type><parameter>new_link</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>client_flags</parameter></methodparam>
-  </methodsynopsis>
-  -->
-  <simpara>
-   Establishes a persistent connection to a MySQL server.
-  </simpara>
-  <!-- TODO: Integrate this information more nicely with features.persistent -->
-  <simpara>
-   <function>mysql_pconnect</function> acts very much like
-   <function>mysql_connect</function> with two major differences.
-  </simpara>
-  <simpara>
-   First, when connecting, the function would first try to find a
-   (persistent) link that's already open with the same host,
-   username and password.  If one is found, an identifier for it
-   will be returned instead of opening a new connection.
-  </simpara>
-  <simpara>
-   Second, the connection to the SQL server will not be closed when
-   the execution of the script ends.  Instead, the link will remain
-   open for future use (<function>mysql_close</function> will not
-   close links established by <function>mysql_pconnect</function>).
-  </simpara>
-  <simpara>
-   This type of link is therefore called 'persistent'.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>server</parameter></term>
-    <listitem>
-     <simpara>
-      The MySQL server. It can also include a port number. e.g.
-      "hostname:port" or a path to a local socket e.g. ":/path/to/socket" for
-      the localhost.
-     </simpara>
-     <simpara>
-      If the PHP directive <link linkend="ini.mysql.default-host">
-      mysql.default_host</link> is undefined (default), then the default
-      value is 'localhost:3306'
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The username. Default value is the name of the user that owns the
-      server process.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password. Default value is an empty password.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>client_flags</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>client_flags</parameter> parameter can be a combination
-      of the following constants:
-      128 (enable <literal>LOAD DATA LOCAL</literal> handling),
-      <constant>MYSQL_CLIENT_SSL</constant>,
-      <constant>MYSQL_CLIENT_COMPRESS</constant>,
-      <constant>MYSQL_CLIENT_IGNORE_SPACE</constant> or
-      <constant>MYSQL_CLIENT_INTERACTIVE</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a MySQL persistent link identifier on success, or &false; on
-   failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Note, that these kind of links only work if you are using
-    a module version of PHP. See the
-    <link linkend="features.persistent-connections">Persistent
-    Database Connections</link> section for more information.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    Using persistent connections can require a bit of tuning of your Apache
-    and MySQL configurations to ensure that you do not exceed the number of
-    connections allowed by MySQL.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_connect</function></member>
-   <member><link linkend="features.persistent-connections">Persistent
-   Database Connections</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/mysql/functions/mysql-ping.xml b/reference/mysql/functions/mysql-ping.xml
deleted file mode 100644
index 570cffe9e634..000000000000
--- a/reference/mysql/functions/mysql-ping.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-ping">
- <refnamediv>
-  <refname>mysql_ping</refname>
-  <refpurpose>Ping a server connection or reconnect if there is no connection</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_ping</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_ping</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks whether or not the connection to
-   the server is working. If it has gone down, an automatic reconnection is
-   attempted. This function can be used by scripts that remain idle for a
-   long while, to check whether or not the server has closed the connection
-   and reconnect if necessary.
-  </simpara>
-  <note>
-   <simpara>
-    Automatic reconnection is disabled by default in versions of MySQL &gt;= 5.0.3.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the connection to the server MySQL server is working,
-   otherwise &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>mysql_ping</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-set_time_limit(0);
-
-$conn = mysql_connect('localhost', 'mysqluser', 'mypass');
-$db   = mysql_select_db('mydb');
-
-/* Assuming this query will take a long time */
-$result = mysql_query($sql);
-if (!$result) {
-    echo 'Query #1 failed, exiting.';
-    exit;
-}
-
-/* Make sure the connection is still alive, if not, try to reconnect */
-if (!mysql_ping($conn)) {
-    echo 'Lost connection, exiting after query #1';
-    exit;
-}
-mysql_free_result($result);
-
-/* So the connection is still alive, let's run another query */
-$result2 = mysql_query($sql2);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_thread_id</function></member>
-   <member><function>mysql_list_processes</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/mysql/functions/mysql-query.xml b/reference/mysql/functions/mysql-query.xml
deleted file mode 100644
index 39e974a5af7a..000000000000
--- a/reference/mysql/functions/mysql-query.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-query">
- <refnamediv>
-  <refname>mysql_query</refname>
-  <refpurpose>Send a MySQL query</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_query</function></member>
-    <member><methodname>PDO::query</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>mysql_query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_query</function> sends a unique query (multiple queries
-   are not supported) to the currently
-   active database on the server that's associated with the
-   specified <parameter>link_identifier</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      An SQL query
-     </simpara>
-     <simpara>
-      The query string should not end with a semicolon.
-      Data inside the query should be <link linkend="function.mysql-real-escape-string">properly escaped</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   For SELECT, SHOW, DESCRIBE, EXPLAIN and other statements returning resultset,
-   <function>mysql_query</function>
-   returns a <type>resource</type> on success, or &false; on
-   error.
-  </simpara>
-  <simpara>
-   For other type of SQL statements, INSERT, UPDATE, DELETE, DROP, etc,
-   <function>mysql_query</function> returns &true; on success
-   or &false; on error.
-  </simpara>
-  <simpara>
-   The returned result resource should be passed to
-   <function>mysql_fetch_array</function>, and other
-   functions for dealing with result tables, to access the returned data.
-  </simpara>
-  <simpara>
-   Use <function>mysql_num_rows</function> to find out how many rows
-   were returned for a SELECT statement or
-   <function>mysql_affected_rows</function> to find out how many
-   rows were affected by a DELETE, INSERT, REPLACE, or UPDATE
-   statement.
-  </simpara>
-  <simpara>
-   <function>mysql_query</function> will also fail and return &false;
-   if the user does not have permission to access the table(s) referenced by
-   the query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Invalid Query</title>
-   <simpara>
-    The following query is syntactically invalid, so
-    <function>mysql_query</function> fails and returns &false;.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$result = mysql_query('SELECT * WHERE 1=1');
-if (!$result) {
-    die('Invalid query: ' . mysql_error());
-}
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Valid Query</title>
-   <simpara>
-    The following query is valid, so <function>mysql_query</function>
-    returns a <type>resource</type>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// This could be supplied by a user, for example
-$firstname = 'fred';
-$lastname  = 'fox';
-
-// Formulate Query
-// This is the best way to perform an SQL query
-// For more examples, see mysql_real_escape_string()
-$query = sprintf("SELECT firstname, lastname, address, age FROM friends
-    WHERE firstname='%s' AND lastname='%s'",
-    mysql_real_escape_string($firstname),
-    mysql_real_escape_string($lastname));
-
-// Perform Query
-$result = mysql_query($query);
-
-// Check result
-// This shows the actual query sent to MySQL, and the error. Useful for debugging.
-if (!$result) {
-    $message  = 'Invalid query: ' . mysql_error() . "\n";
-    $message .= 'Whole query: ' . $query;
-    die($message);
-}
-
-// Use result
-// Attempting to print $result won't allow access to information in the resource
-// One of the mysql result functions must be used
-// See also mysql_result(), mysql_fetch_array(), mysql_fetch_row(), etc.
-while ($row = mysql_fetch_assoc($result)) {
-    echo $row['firstname'];
-    echo $row['lastname'];
-    echo $row['address'];
-    echo $row['age'];
-}
-
-// Free the resources associated with the result set
-// This is done automatically at the end of the script
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_connect</function></member>
-   <member><function>mysql_error</function></member>
-   <member><function>mysql_real_escape_string</function></member>
-   <member><function>mysql_result</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_unbuffered_query</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/mysql/functions/mysql-real-escape-string.xml b/reference/mysql/functions/mysql-real-escape-string.xml
deleted file mode 100644
index 9424be20a2e2..000000000000
--- a/reference/mysql/functions/mysql-real-escape-string.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-real-escape-string">
- <refnamediv>
-  <refname>mysql_real_escape_string</refname>
-  <refpurpose>Escapes special characters in a string for use in an SQL statement</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_real_escape_string</function></member>
-    <member><methodname>PDO::quote</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_real_escape_string</methodname>
-   <methodparam><type>string</type><parameter>unescaped_string</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Escapes special characters in the <parameter>unescaped_string</parameter>,
-   taking into account the current character set of the connection so that it
-   is safe to place it in a <function>mysql_query</function>. If binary data
-   is to be inserted, this function must be used.
-  </simpara>
-  <simpara>
-   <function>mysql_real_escape_string</function> calls MySQL's library function
-   mysql_real_escape_string, which prepends backslashes to the following characters:
-   <literal>\x00</literal>, <literal>\n</literal>,
-   <literal>\r</literal>, <literal>\</literal>, <literal>'</literal>,
-   <literal>"</literal> and <literal>\x1a</literal>.
-  </simpara>
-  <simpara>
-   This function must always (with few exceptions) be used to make data
-   safe before sending a query to MySQL.
-  </simpara>
-
-  <caution>
-   <title>Security: the default character set</title>
-   <simpara>
-    The character set must be set either at the server level, or with
-    the API function <function>mysql_set_charset</function> for it to affect
-    <function>mysql_real_escape_string</function>. See the concepts section
-    on <link linkend="mysqlinfo.concepts.charset">character sets</link> for
-    more information.
-   </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>unescaped_string</parameter></term>
-    <listitem>
-     <simpara>
-      The string that is to be escaped.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the escaped string, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Executing this function without a MySQL connection present will
-   also emit <constant>E_WARNING</constant> level PHP errors. Only
-   execute this function with a valid MySQL connection present.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Simple <function>mysql_real_escape_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Connect
-$link = mysql_connect('mysql_host', 'mysql_user', 'mysql_password')
-    OR die(mysql_error());
-
-// Query
-$query = sprintf("SELECT * FROM users WHERE user='%s' AND password='%s'",
-            mysql_real_escape_string($user),
-            mysql_real_escape_string($password));
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>mysql_real_escape_string</function> requires a connection example</title>
-   <simpara>
-    This example demonstrates what happens if a MySQL connection is not
-    present when calling this function.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// We have not connected to MySQL
-
-$lastname  = "O'Reilly";
-$_lastname = mysql_real_escape_string($lastname);
-
-$query = "SELECT * FROM actors WHERE last_name = '$_lastname'";
-
-var_dump($_lastname);
-var_dump($query);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Warning: mysql_real_escape_string(): No such file or directory in /this/test/script.php on line 5
-Warning: mysql_real_escape_string(): A link to the server could not be established in /this/test/script.php on line 5
-
-bool(false)
-string(41) "SELECT * FROM actors WHERE last_name = ''"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>An example SQL Injection Attack</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// We didn't check $_POST['password'], it could be anything the user wanted! For example:
-$_POST['username'] = 'aidan';
-$_POST['password'] = "' OR ''='";
-
-// Query database to check if there are any matching users
-$query = "SELECT * FROM users WHERE user='{$_POST['username']}' AND password='{$_POST['password']}'";
-mysql_query($query);
-
-// This means the query sent to MySQL would be:
-echo $query;
-?>
-]]>
-   </programlisting>
-    <simpara>
-     The query sent to MySQL:
-    </simpara>
-   <screen>
-<![CDATA[
-SELECT * FROM users WHERE user='aidan' AND password='' OR ''=''
-]]>
-   </screen>
-   <simpara>
-    This would allow anyone to log in without a valid password.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    A MySQL connection is required before using
-    <function>mysql_real_escape_string</function> otherwise an error of
-    level <constant>E_WARNING</constant> is generated, and &false; is
-    returned. If <parameter>link_identifier</parameter> isn't defined, the
-    last MySQL connection is used.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    If this function is not used to escape data, the query is vulnerable to
-    <link linkend="security.database.sql-injection">SQL Injection Attacks</link>.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    <function>mysql_real_escape_string</function> does not escape
-    <literal>%</literal> and <literal>_</literal>. These are wildcards in
-    MySQL if combined with <literal>LIKE</literal>, <literal>GRANT</literal>,
-    or <literal>REVOKE</literal>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_set_charset</function></member>
-   <member><function>mysql_client_encoding</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/mysql/functions/mysql-result.xml b/reference/mysql/functions/mysql-result.xml
deleted file mode 100644
index 097a3e289786..000000000000
--- a/reference/mysql/functions/mysql-result.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-result">
- <refnamediv>
-  <refname>mysql_result</refname>
-  <refpurpose>Get result data</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member>
-     <function>mysqli_data_seek</function> in conjunction with
-     <function>mysqli_field_seek</function> and
-     <function>mysqli_fetch_field</function>
-    </member>
-    <member><methodname>PDOStatement::fetchColumn</methodname></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_result</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>field</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the contents of one cell from a MySQL result set.
-  </simpara>
-  <simpara>
-   When working on large result sets, you should consider using one
-   of the functions that fetch an entire row (specified below).  As
-   these functions return the contents of multiple cells in one
-   function call, they're MUCH quicker than
-   <function>mysql_result</function>.  Also, note that specifying a
-   numeric offset for the field argument is much quicker than
-   specifying a fieldname or tablename.fieldname argument.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.result.description;
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <simpara>
-      The row number from the result that's being retrieved. Row numbers
-      start at <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <simpara>
-      The name or offset of the field being retrieved.
-     </simpara>
-     <simpara>
-      It can be the field's offset, the field's name, or the field's table
-      dot field name (tablename.fieldname). If the column name has been
-      aliased ('select foo as bar from...'), use the alias instead of the
-      column name. If undefined, the first field is retrieved.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The contents of one cell from a MySQL result set on success, or
-   &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_result</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Could not connect: ' . mysql_error());
-}
-if (!mysql_select_db('database_name')) {
-    die('Could not select database: ' . mysql_error());
-}
-$result = mysql_query('SELECT name FROM work.employee');
-if (!$result) {
-    die('Could not query:' . mysql_error());
-}
-echo mysql_result($result, 2); // outputs third employee's name
-
-mysql_close($link);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Calls to <function>mysql_result</function> should not be mixed
-    with calls to other functions that deal with the result set.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_fetch_row</function></member>
-   <member><function>mysql_fetch_array</function></member>
-   <member><function>mysql_fetch_assoc</function></member>
-   <member><function>mysql_fetch_object</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/mysql/functions/mysql-select-db.xml b/reference/mysql/functions/mysql-select-db.xml
deleted file mode 100644
index 32ab346a2f59..000000000000
--- a/reference/mysql/functions/mysql-select-db.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-select-db">
- <refnamediv>
-  <refname>mysql_select_db</refname>
-  <refpurpose>Select a MySQL database</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_select_db</function></member>
-    <member><methodname>PDO::__construct</methodname> (part of dsn)</member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_select_db</methodname>
-   <methodparam><type>string</type><parameter>database_name</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the current active database on the server that's associated with the
-   specified link identifier. Every subsequent call to
-   <function>mysql_query</function> will be made on the active database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>database_name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the database that is to be selected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_select_db</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-if (!$link) {
-    die('Not connected : ' . mysql_error());
-}
-
-// make foo the current db
-$db_selected = mysql_select_db('foo', $link);
-if (!$db_selected) {
-    die ('Can\'t use foo : ' . mysql_error());
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    &info.deprecated.alias;
-    <function>mysql_selectdb</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_connect</function></member>
-   <member><function>mysql_pconnect</function></member>
-   <member><function>mysql_query</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/mysql/functions/mysql-set-charset.xml b/reference/mysql/functions/mysql-set-charset.xml
deleted file mode 100644
index 20997dbc1044..000000000000
--- a/reference/mysql/functions/mysql-set-charset.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.mysql-set-charset">
- <refnamediv>
-  <refname>mysql_set_charset</refname>
-  <refpurpose>Sets the client character set</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_set_charset</function></member>
-    <member>PDO: Add <literal>charset</literal> to the connection string, such as <literal>charset=utf8</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>mysql_set_charset</methodname>
-   <methodparam><type>string</type><parameter>charset</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the default character set for the current connection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>charset</parameter></term>
-    <listitem>
-     <simpara>
-      A valid character set name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    This function requires MySQL 5.0.7 or later.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    This is the preferred way to change the charset. Using
-    <function>mysql_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.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="mysqlinfo.concepts.charset">Setting character sets in MySQL</link></member>
-   <member><link xlink:href="&url.mysql.charsets;">List of character sets that MySQL supports</link></member>
-   <member><function>mysql_client_encoding</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/mysql/functions/mysql-stat.xml b/reference/mysql/functions/mysql-stat.xml
deleted file mode 100644
index 019715df9143..000000000000
--- a/reference/mysql/functions/mysql-stat.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-stat">
- <refnamediv>
-  <refname>mysql_stat</refname>
-  <refpurpose>Get current system status</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_stat</function></member>
-    <member>
-     <methodname>PDO::getAttribute</methodname>
-     with <parameter>attribute</parameter> as <constant>PDO::ATTR_SERVER_INFO</constant>
-    </member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>mysql_stat</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_stat</function> returns the current server status.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string with the status for uptime, threads, queries, open tables,
-   flush tables and queries per second. For a complete list of other status
-   variables, you have to use the <literal>SHOW STATUS</literal> SQL command.
-   If <parameter>link_identifier</parameter> is invalid, &null; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_stat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link   = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$status = explode('  ', mysql_stat($link));
-print_r($status);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Uptime: 5380
-    [1] => Threads: 2
-    [2] => Questions: 1321299
-    [3] => Slow queries: 0
-    [4] => Opens: 26
-    [5] => Flush tables: 1
-    [6] => Open tables: 17
-    [7] => Queries per second avg: 245.595
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Alternative <function>mysql_stat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link   = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$result = mysql_query('SHOW STATUS', $link);
-while ($row = mysql_fetch_assoc($result)) {
-    echo $row['Variable_name'] . ' = ' . $row['Value'] . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-back_log = 50
-basedir = /usr/local/
-bdb_cache_size = 8388600
-bdb_log_buffer_size = 32768
-bdb_home = /var/db/mysql/
-bdb_max_lock = 10000
-bdb_logdir =
-bdb_shared_data = OFF
-bdb_tmpdir = /var/tmp/
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_get_server_info</function></member>
-   <member><function>mysql_list_processes</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/mysql/functions/mysql-tablename.xml b/reference/mysql/functions/mysql-tablename.xml
deleted file mode 100644
index af1002f9822b..000000000000
--- a/reference/mysql/functions/mysql-tablename.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-tablename">
- <refnamediv>
-  <refname>mysql_tablename</refname>
-  <refpurpose>Get table name of field</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member>SQL Query: <literal>SHOW TABLES</literal></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>mysql_tablename</methodname>
-   <methodparam><type>resource</type><parameter>result</parameter></methodparam>
-   <methodparam><type>int</type><parameter>i</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the table name from a <parameter>result</parameter>.
-  </simpara>
-  <simpara>
-   This function is deprecated. It is preferable to use
-   <function>mysql_query</function> to issue an SQL <literal>SHOW TABLES
-   [FROM db_name] [LIKE 'pattern']</literal> statement instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>result</parameter></term>
-    <listitem>
-     <simpara>
-      A result pointer <type>resource</type> that's returned from
-      <function>mysql_list_tables</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>i</parameter></term>
-    <listitem>
-     <simpara>
-      The integer index (row/table number)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The name of the table on success&return.falseforfailure;.
-  </simpara>
-  <simpara>
-   Use the <function>mysql_tablename</function> function to
-   traverse this result pointer, or any function for result tables,
-   such as <function>mysql_fetch_array</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_tablename</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-mysql_connect("localhost", "mysql_user", "mysql_password");
-$result = mysql_list_tables("mydb");
-$num_rows = mysql_num_rows($result);
-for ($i = 0; $i < $num_rows; $i++) {
-    echo "Table: ", mysql_tablename($result, $i), "\n";
-}
-
-mysql_free_result($result);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The <function>mysql_num_rows</function> function may be used to
-    determine the number of tables in the result pointer.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_list_tables</function></member>
-   <member><function>mysql_field_table</function></member>
-   <member><function>mysql_db_name</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/mysql/functions/mysql-thread-id.xml b/reference/mysql/functions/mysql-thread-id.xml
deleted file mode 100644
index aec4c5fd29f6..000000000000
--- a/reference/mysql/functions/mysql-thread-id.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-thread-id">
- <refnamediv>
-  <refname>mysql_thread_id</refname>
-  <refpurpose>Return the current thread ID</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member><function>mysqli_thread_id</function></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>mysql_thread_id</methodname>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the current thread ID. If the connection is lost, and a reconnect
-   with <function>mysql_ping</function> is executed, the thread ID will
-   change. This means only retrieve the thread ID when needed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The thread ID on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_thread_id</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = mysql_connect('localhost', 'mysql_user', 'mysql_password');
-$thread_id = mysql_thread_id($link);
-if ($thread_id){
-    printf("current thread id is %d\n", $thread_id);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-current thread id is 73
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_ping</function></member>
-   <member><function>mysql_list_processes</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/mysql/functions/mysql-unbuffered-query.xml b/reference/mysql/functions/mysql-unbuffered-query.xml
deleted file mode 100644
index 251d536710a0..000000000000
--- a/reference/mysql/functions/mysql-unbuffered-query.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.mysql-unbuffered-query">
- <refnamediv>
-  <refname>mysql_unbuffered_query</refname>
-  <refpurpose>Send an SQL query to MySQL without fetching and buffering the result rows</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning>
-   &mysql.alternative.note;
-   <simplelist role="alternatives">
-    <member>See: <link linkend="mysqlinfo.concepts.buffering">Buffered and Unbuffered queries</link></member>
-   </simplelist>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>mysql_unbuffered_query</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>link_identifier</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>mysql_unbuffered_query</function> sends the SQL query
-   <parameter>query</parameter> to MySQL without automatically
-   fetching and buffering the result rows as
-   <function>mysql_query</function> does.  This saves a considerable
-   amount of memory with SQL queries that produce large result sets,
-   and you can start working on the result set immediately after the
-   first row has been retrieved as you don't have to wait until the
-   complete SQL query has been performed.  To use
-   <function>mysql_unbuffered_query</function> while multiple database
-   connections are open, you must specify the optional parameter
-   <parameter>link_identifier</parameter> to identify which connection
-   you want to use.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <simpara>
-      The SQL query to execute.
-     </simpara>
-     <simpara>
-      Data inside the query should be <link linkend="function.mysql-real-escape-string">properly escaped</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &mysql.linkid.description;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   For SELECT, SHOW, DESCRIBE or EXPLAIN statements,
-   <function>mysql_unbuffered_query</function>
-   returns a <type>resource</type> on success, or &false; on
-   error.
-  </simpara>
-  <simpara>
-   For other type of SQL statements, UPDATE, DELETE, DROP, etc,
-   <function>mysql_unbuffered_query</function> returns &true; on success
-   or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The benefits of <function>mysql_unbuffered_query</function> come
-    at a cost: you cannot use <function>mysql_num_rows</function> and
-    <function>mysql_data_seek</function> on a result set returned from
-    <function>mysql_unbuffered_query</function>, until all rows are fetched.
-    You also have to fetch all result rows from an unbuffered SQL query
-    before you can send a new SQL query to MySQL, using the same
-    <parameter>link_identifier</parameter>.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mysql_query</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/mysql/ini.xml b/reference/mysql/ini.xml
deleted file mode 100644
index 89fa35fe0da6..000000000000
--- a/reference/mysql/ini.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="mysql.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table xml:id="mysql.configuration.options">
-   <title>MySQL Configuration Options</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="mysql.configuration.list">
-     <row>
-      <entry><link linkend="ini.mysql.allow-local-infile">mysql.allow_local_infile</link></entry>
-      <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.allow-persistent">mysql.allow_persistent</link></entry>
-      <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.max-persistent">mysql.max_persistent</link></entry>
-      <entry>"-1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.max-links">mysql.max_links</link></entry>
-      <entry>"-1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.trace-mode">mysql.trace_mode</link></entry>
-      <entry>"0"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.default-port">mysql.default_port</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.default-socket">mysql.default_socket</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.default-host">mysql.default_host</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.default-user">mysql.default_user</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.default-password">mysql.default_password</link></entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.mysql.connect-timeout">mysql.connect_timeout</link></entry>
-      <entry>"60"</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
-</para>
-
-&ini.descriptions.title;
-
-<variablelist>
-
- <varlistentry xml:id="ini.mysql.allow-local-infile">
-  <term>
-   <parameter>mysql.allow_local_infile</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    Allow accessing, from PHP's perspective, local files with LOAD DATA
-    statements
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.allow-persistent">
-  <term>
-   <parameter>mysql.allow_persistent</parameter>
-   <type>bool</type>
-  </term>
-  <listitem>
-   <simpara>
-    Whether to allow
-    <link linkend="features.persistent-connections">persistent connections</link>
-    to MySQL.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.max-persistent">
-  <term>
-   <parameter>mysql.max_persistent</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    The maximum number of persistent MySQL connections per
-    process.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.max-links">
-  <term>
-   <parameter>mysql.max_links</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    The maximum number of MySQL connections per process, including
-    persistent connections.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.trace-mode">
-  <term>
-   <parameter>mysql.trace_mode</parameter>
-   <type>bool</type>
-  </term>
-  <listitem>
-   <simpara>
-    Trace mode. When <literal>mysql.trace_mode</literal> is enabled, warnings
-    for table/index scans, non free result sets, and SQL-Errors will be
-    displayed. (Introduced in PHP 4.3.0)
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.default-port">
-  <term>
-   <parameter>mysql.default_port</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default TCP port number to use when connecting to
-    the database server if no other port is specified. If
-    no default is specified, the port will be obtained
-    from the <envar>MYSQL_TCP_PORT</envar> environment
-    variable, the <literal>mysql-tcp</literal> entry in
-    <filename>/etc/services</filename> or the compile-time
-    <constant>MYSQL_PORT</constant> constant, in that order. Win32
-    will only use the <constant>MYSQL_PORT</constant> constant.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.default-socket">
-  <term>
-   <parameter>mysql.default_socket</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default socket name to use when connecting to a local
-    database server if no other socket name is specified.
-   </simpara>
-  </listitem>
- </varlistentry>
-  <varlistentry xml:id="ini.mysql.default-host">
-  <term>
-   <parameter>mysql.default_host</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default server host to use when connecting to the database
-    server if no other host is specified. Doesn't apply in
-    &sqlsafemode;.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.default-user">
-  <term>
-   <parameter>mysql.default_user</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default user name to use when connecting to the database
-    server if no other name is specified. Doesn't apply in
-    &sqlsafemode;.
-   </simpara>
-  </listitem>
- </varlistentry>
-
- <varlistentry xml:id="ini.mysql.default-password">
-  <term>
-   <parameter>mysql.default_password</parameter>
-   <type>string</type>
-  </term>
-  <listitem>
-   <simpara>
-    The default password to use when connecting to the database
-    server if no other password is specified. Doesn't apply in
-    &sqlsafemode;.
-   </simpara>
-  </listitem>
- </varlistentry>
-  <varlistentry xml:id="ini.mysql.connect-timeout">
-  <term>
-   <parameter>mysql.connect_timeout</parameter>
-   <type>int</type>
-  </term>
-  <listitem>
-   <simpara>
-    Connect timeout in seconds. On Linux this timeout is also used for
-    waiting for the first answer from the server.
-   </simpara>
-  </listitem>
- </varlistentry>
-
-</variablelist>
-</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/mysql/reference.xml b/reference/mysql/reference.xml
deleted file mode 100644
index 630c7d7869b6..000000000000
--- a/reference/mysql/reference.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ref.mysql">
-  <title>MySQL &Functions;</title>
-
-  <partintro>
-   <section xml:id="mysql.notes">
-   &reftitle.notes;
-    <note>
-     <simpara>
-      Most MySQL functions accept <parameter>link_identifier</parameter> as
-      the last optional parameter. If it is not provided, last opened
-      connection is used. If it doesn't exist, connection is tried to
-      establish with default parameters defined in &php.ini;. If it is not
-      successful, functions return &false;.
-     </simpara>
-    </note>
-   </section>
-  </partintro>
-
-&reference.mysql.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/mysql/setup.xml b/reference/mysql/setup.xml
deleted file mode 100644
index 076f1d13853c..000000000000
--- a/reference/mysql/setup.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="mysql.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="mysql.requirements">
-  &reftitle.required;
-  <simpara>
-   In order to have these functions available, you must compile PHP with
-   MySQL support.
-  </simpara>
-  <warning>
-   &mysql.alternative.note;
-  </warning>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.mysql.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.mysql.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="mysql.resources">
-  &reftitle.resources;
-  <simpara>
-   There are two resource types used in the MySQL module. The first one
-   is the link identifier for a database connection, the second a resource
-   which holds the result of a query.
-  </simpara>
- </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/mysql/versions.xml b/reference/mysql/versions.xml
deleted file mode 100644
index 416295d752fb..000000000000
--- a/reference/mysql/versions.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<!--
- NOTE: Version info for the MySQL PECL Extension (1.0) is
-       considered irrelevant so is not listed here.
--->
-
-<versions>
- <function name='mysql' from='PHP 4, PHP 5'/>
- <function name='mysql_affected_rows' from='PHP 4, PHP 5'/>
- <function name='mysql_client_encoding' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_close' from='PHP 4, PHP 5'/>
- <function name='mysql_connect' from='PHP 4, PHP 5'/>
- <function name='mysql_create_db' from='PHP 4, PHP 5'/>
- <function name='mysql_data_seek' from='PHP 4, PHP 5'/>
- <function name='mysql_db_name' from='PHP 4, PHP 5'/>
- <function name='mysql_db_query' from='PHP 4, PHP 5'/>
- <function name='mysql_dbname' from='PHP 4, PHP 5'/>
- <function name='mysql_drop_db' from='PHP 4, PHP 5'/>
- <function name='mysql_errno' from='PHP 4, PHP 5'/>
- <function name='mysql_error' from='PHP 4, PHP 5'/>
- <function name='mysql_escape_string' from='PHP 4 &gt;= 4.0.3, PHP 5'/>
- <function name='mysql_fetch_array' from='PHP 4, PHP 5'/>
- <function name='mysql_fetch_assoc' from='PHP 4 &gt;= 4.0.3, PHP 5'/>
- <function name='mysql_fetch_field' from='PHP 4, PHP 5'/>
- <function name='mysql_fetch_lengths' from='PHP 4, PHP 5'/>
- <function name='mysql_fetch_object' from='PHP 4, PHP 5'/>
- <function name='mysql_fetch_row' from='PHP 4, PHP 5'/>
- <function name='mysql_field_flags' from='PHP 4, PHP 5'/>
- <function name='mysql_field_len' from='PHP 4, PHP 5'/>
- <function name='mysql_field_name' from='PHP 4, PHP 5'/>
- <function name='mysql_field_seek' from='PHP 4, PHP 5'/>
- <function name='mysql_field_table' from='PHP 4, PHP 5'/>
- <function name='mysql_field_type' from='PHP 4, PHP 5'/>
- <function name='mysql_fieldflags' from='PHP 4, PHP 5'/>
- <function name='mysql_fieldlen' from='PHP 4, PHP 5'/>
- <function name='mysql_fieldname' from='PHP 4, PHP 5'/>
- <function name='mysql_fieldtable' from='PHP 4, PHP 5'/>
- <function name='mysql_fieldtype' from='PHP 4, PHP 5'/>
- <function name='mysql_free_result' from='PHP 4, PHP 5'/>
- <function name='mysql_freeresult' from='PHP 4, PHP 5'/>
- <function name='mysql_get_client_info' from='PHP 4 &gt;= 4.0.5, PHP 5'/>
- <function name='mysql_get_host_info' from='PHP 4 &gt;= 4.0.5, PHP 5'/>
- <function name='mysql_get_proto_info' from='PHP 4 &gt;= 4.0.5, PHP 5'/>
- <function name='mysql_get_server_info' from='PHP 4 &gt;= 4.0.5, PHP 5'/>
- <function name='mysql_info' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_insert_id' from='PHP 4, PHP 5'/>
- <function name='mysql_list_dbs' from='PHP 4, PHP 5'/>
- <function name='mysql_list_fields' from='PHP 4, PHP 5'/>
- <function name='mysql_list_processes' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_list_tables' from='PHP 4, PHP 5'/>
- <function name='mysql_listdbs' from='PHP 4, PHP 5'/>
- <function name='mysql_listfields' from='PHP 4, PHP 5'/>
- <function name='mysql_num_fields' from='PHP 4, PHP 5'/>
- <function name='mysql_num_rows' from='PHP 4, PHP 5'/>
- <function name='mysql_numfields' from='PHP 4, PHP 5'/>
- <function name='mysql_numrows' from='PHP 4, PHP 5'/>
- <function name='mysql_pconnect' from='PHP 4, PHP 5'/>
- <function name='mysql_ping' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_query' from='PHP 4, PHP 5'/>
- <function name='mysql_real_escape_string' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_result' from='PHP 4, PHP 5'/>
- <function name='mysql_select_db' from='PHP 4, PHP 5'/>
- <function name='mysql_selectdb' from='PHP 4, PHP 5'/>
- <function name='mysql_set_charset' from='PHP 5 &gt;= 5.2.3'/>
- <function name='mysql_stat' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_table_name' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_tablename' from='PHP 4, PHP 5'/>
- <function name='mysql_thread_id' from='PHP 4 &gt;= 4.3.0, PHP 5'/>
- <function name='mysql_unbuffered_query' from='PHP 4 &gt;= 4.0.6, PHP 5'/>
-</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/mysql_xdevapi/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/mysql_xdevapi/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/mysql_xdevapi/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/mysql_xdevapi/book.xml b/reference/mysql_xdevapi/book.xml
deleted file mode 100644
index 8feb18d4e26b..000000000000
--- a/reference/mysql_xdevapi/book.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.mysql-xdevapi">
-  &reftitle.intro;
-  <para>
-   This extension provides access to the MySQL Document Store via the X DevAPI. The X DevAPI
-   is a common API provided by multiple MySQL Connectors providing easy access to relational
-   tables as well as collections of documents, which are represented in JSON, from a API
-   with CRUD-style operations.
-  </para>
-  <para>
-   The X DevAPI uses the X Protocol, the new generation client-server protocol of the MySQL
-   8.0 server.
-  </para>
-  <para>
-   For general information about the MySQL Document Store, please refer to the
-   <link xlink:href="&url.mysql.docs.document-store;">MySQL Document Store</link>
-   chapter in the MySQL manual.
-  </para>
- </preface>
-
- &reference.mysql-xdevapi.setup;
- &reference.mysql-xdevapi.constants;
- &reference.mysql-xdevapi.changelog;
- &reference.mysql-xdevapi.examples;
- &reference.mysql-xdevapi.reference;
-
- &reference.mysql-xdevapi.mysql-xdevapi.baseresult;
- &reference.mysql-xdevapi.mysql-xdevapi.client;
- &reference.mysql-xdevapi.mysql-xdevapi.collection;
- &reference.mysql-xdevapi.mysql-xdevapi.collectionadd;
- &reference.mysql-xdevapi.mysql-xdevapi.collectionfind;
- &reference.mysql-xdevapi.mysql-xdevapi.collectionmodify;
- &reference.mysql-xdevapi.mysql-xdevapi.collectionremove;
- &reference.mysql-xdevapi.mysql-xdevapi.columnresult;
- &reference.mysql-xdevapi.mysql-xdevapi.crudoperationbindable;
- &reference.mysql-xdevapi.mysql-xdevapi.crudoperationlimitable;
- &reference.mysql-xdevapi.mysql-xdevapi.crudoperationskippable;
- &reference.mysql-xdevapi.mysql-xdevapi.crudoperationsortable;
- &reference.mysql-xdevapi.mysql-xdevapi.databaseobject;
- &reference.mysql-xdevapi.mysql-xdevapi.docresult;
- &reference.mysql-xdevapi.mysql-xdevapi.driver;
- &reference.mysql-xdevapi.mysql-xdevapi.exception;
- &reference.mysql-xdevapi.mysql-xdevapi.executable;
- &reference.mysql-xdevapi.mysql-xdevapi.executionstatus;
- &reference.mysql-xdevapi.mysql-xdevapi.expression;
- &reference.mysql-xdevapi.mysql-xdevapi.fieldmetadata;
- &reference.mysql-xdevapi.mysql-xdevapi.result;
- &reference.mysql-xdevapi.mysql-xdevapi.rowresult;
- &reference.mysql-xdevapi.mysql-xdevapi.schema;
- &reference.mysql-xdevapi.mysql-xdevapi.schemaobject;
- &reference.mysql-xdevapi.mysql-xdevapi.session;
- &reference.mysql-xdevapi.mysql-xdevapi.sqlstatement;
- &reference.mysql-xdevapi.mysql-xdevapi.sqlstatementresult;
- &reference.mysql-xdevapi.mysql-xdevapi.statement;
- &reference.mysql-xdevapi.mysql-xdevapi.table;
- &reference.mysql-xdevapi.mysql-xdevapi.tabledelete;
- &reference.mysql-xdevapi.mysql-xdevapi.tableinsert;
- &reference.mysql-xdevapi.mysql-xdevapi.tableselect;
- &reference.mysql-xdevapi.mysql-xdevapi.tableupdate;
- &reference.mysql-xdevapi.mysql-xdevapi.warning;
-
-</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/mysql_xdevapi/changelog.xml b/reference/mysql_xdevapi/changelog.xml
deleted file mode 100644
index b947cd385725..000000000000
--- a/reference/mysql_xdevapi/changelog.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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.28</entry>
-        <entry>
-         <para>
-           Removed TLSv1 and TLSv1.1 support. The values "TLSv1", "TLSv1.0",
-           and "TLSv1.1" are now considered invalid for the "tls-versions"
-           connection attribute.
-         </para>
-        </entry>
-       </row>
-       <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/mysql_xdevapi/constants.xml b/reference/mysql_xdevapi/constants.xml
deleted file mode 100644
index a27b318f728a..000000000000
--- a/reference/mysql_xdevapi/constants.xml
+++ /dev/null
@@ -1,412 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="mysql-xdevapi.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.mysqlx-client-ssl">
-    <term>
-     <constant>MYSQLX_CLIENT_SSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-decimal">
-    <term>
-     <constant>MYSQLX_TYPE_DECIMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-tiny">
-    <term>
-     <constant>MYSQLX_TYPE_TINY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-short">
-    <term>
-     <constant>MYSQLX_TYPE_SHORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-smallint">
-    <term>
-     <constant>MYSQLX_TYPE_SMALLINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-mediumint">
-    <term>
-     <constant>MYSQLX_TYPE_MEDIUMINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-int">
-    <term>
-     <constant>MYSQLX_TYPE_INT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-bigint">
-    <term>
-     <constant>MYSQLX_TYPE_BIGINT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-long">
-    <term>
-     <constant>MYSQLX_TYPE_LONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-float">
-    <term>
-     <constant>MYSQLX_TYPE_FLOAT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-double">
-    <term>
-     <constant>MYSQLX_TYPE_DOUBLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-null">
-    <term>
-     <constant>MYSQLX_TYPE_NULL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-timestamp">
-    <term>
-     <constant>MYSQLX_TYPE_TIMESTAMP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-longlong">
-    <term>
-     <constant>MYSQLX_TYPE_LONGLONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-int24">
-    <term>
-     <constant>MYSQLX_TYPE_INT24</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-date">
-    <term>
-     <constant>MYSQLX_TYPE_DATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-time">
-    <term>
-     <constant>MYSQLX_TYPE_TIME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-datetime">
-    <term>
-     <constant>MYSQLX_TYPE_DATETIME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-year">
-    <term>
-     <constant>MYSQLX_TYPE_YEAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-newdate">
-    <term>
-     <constant>MYSQLX_TYPE_NEWDATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-enum">
-    <term>
-     <constant>MYSQLX_TYPE_ENUM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-set">
-    <term>
-     <constant>MYSQLX_TYPE_SET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-tiny-blob">
-    <term>
-     <constant>MYSQLX_TYPE_TINY_BLOB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-medium-blob">
-    <term>
-     <constant>MYSQLX_TYPE_MEDIUM_BLOB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-long-blob">
-    <term>
-     <constant>MYSQLX_TYPE_LONG_BLOB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-blob">
-    <term>
-     <constant>MYSQLX_TYPE_BLOB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-var-string">
-    <term>
-     <constant>MYSQLX_TYPE_VAR_STRING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-string">
-    <term>
-     <constant>MYSQLX_TYPE_STRING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-char">
-    <term>
-     <constant>MYSQLX_TYPE_CHAR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-bytes">
-    <term>
-     <constant>MYSQLX_TYPE_BYTES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-interval">
-    <term>
-     <constant>MYSQLX_TYPE_INTERVAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-geometry">
-    <term>
-     <constant>MYSQLX_TYPE_GEOMETRY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-json">
-    <term>
-     <constant>MYSQLX_TYPE_JSON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-newdecimal">
-    <term>
-     <constant>MYSQLX_TYPE_NEWDECIMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-type-bit">
-    <term>
-     <constant>MYSQLX_TYPE_BIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-lock-default">
-    <term>
-     <constant>MYSQLX_LOCK_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-lock-nowait">
-    <term>
-     <constant>MYSQLX_LOCK_NOWAIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.mysqlx-lock-skip-locked">
-    <term>
-     <constant>MYSQLX_LOCK_SKIP_LOCKED</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/mysql_xdevapi/examples.xml b/reference/mysql_xdevapi/examples.xml
deleted file mode 100644
index 3285536097c2..000000000000
--- a/reference/mysql_xdevapi/examples.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysql-xdevapi.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  The central entry point to the X DevAPI is the <function>mysql_xdevapi\getSession</function>
-  function, which receives a URI to a MySQL 8.0 Server and returns a
-  <classname>mysql_xdevapi\Session</classname> object.
- </para>
- <example>
-  <title>Connecting to a MySQL Server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $session = mysql_xdevapi\getSession("mysqlx://user:password@host");
-} catch(Exception $e) {
-    die("Connection could not be established: " . $e->getMessage());
-}
- 
-// ... use $session
-?>
-]]>
-  </programlisting>
- </example>
- <para>
-  The session provides full access to the API. For a new MySQL Server installation,
-  the first step is to create a database schema with a collection 
-  to store data:
- </para>
- <example>
-  <title>Creating a Schema and Collection on the MySQL Server</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$schema = $session->createSchema("test");
-$collection = $schema->createCollection("example");
-?>
-]]>
-  </programlisting>
- </example>
- <para>
-  When storing data, typically <function>json_encode</function> is used to encode
-  the data into JSON, which can then be stored inside a collection.
- </para>
- <para>
-  The following example stores data into the collection we created earlier, 
-  and then retrieve parts of it again.
- </para>
- <example>
-  <title>Storing and Retrieving Data</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$marco = [
-  "name" => "Marco",
-  "age"  => 19,
-  "job"  => "Programmer"
-];
-$mike = [
-  "name" => "Mike",
-  "age"  => 39,
-  "job"  => "Manager"
-];
-
-$schema = $session->getSchema("test");
-$collection = $schema->getCollection("example");
-
-$collection->add($marco, $mike)->execute();
-
-var_dump($collection->find("name = 'Mike'")->execute()->fetchOne());
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-   <![CDATA[
-array(4) {
-  ["_id"]=>
-  string(28) "00005ad66aaf0000000000000003"
-  ["age"]=>
-  int(39)
-  ["job"]=>
-  string(7) "Manager"
-  ["name"]=>
-  string(4) "Mike"
-}
-]]>
-  </screen>
- </example>
- <para>
-  The example demonstrates that the MySQL Server adds an extra field named
-  <code>_id</code>, which serves as primary key to the document.
- </para>
- <para>
-  The example also demonstrates that retrieved data is sorted alphabetically.
-  That specific order comes from the efficient binary storage inside the MySQL server, but
-  it should not be relied upon. Refer to the MySQL JSON datatype documentation for details.
- </para>
- <para>
-  Optionally use PHP's iterators to fetch multiple documents:
- </para>
- <example>
-  <title>Fetching and Iterating Multiple Documents</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$result = $collection->find()->execute();
-foreach ($result as $doc) {
-  echo "{$doc["name"]} is a {$doc["job"]}.\n";
-}
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-   <![CDATA[
-Marco is a Programmer.
-Mike is a Manager.
-]]>
-  </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/mysql_xdevapi/functions/mysql-xdevapi.expression.xml b/reference/mysql_xdevapi/functions/mysql-xdevapi.expression.xml
deleted file mode 100644
index 4806da7886bd..000000000000
--- a/reference/mysql_xdevapi/functions/mysql-xdevapi.expression.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysql-xdevapi-expression" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>expression</refname>
-  <refpurpose>Bind prepared statement variables as parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>object</type><methodname>mysql_xdevapi\expression</methodname>
-   <methodparam><type>string</type><parameter>expression</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>expression</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Expression</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$expression = mysql_xdevapi\Expression("[age,job]");
-
-$res  = $coll->find("age > 30")->fields($expression)->limit(3)->execute();
-$data = $res->fetchAll();
-
-print_r($data);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-<?php
-]]>
-   </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/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml b/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml
deleted file mode 100644
index d22628cc6d9c..000000000000
--- a/reference/mysql_xdevapi/functions/mysql-xdevapi.getsession.xml
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.mysql-xdevapi-getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>getSession</refname>
-  <refpurpose>Connect to a MySQL server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mysql_xdevapi\Session</type><methodname>mysql_xdevapi\getSession</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects to the MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <para>
-      The URI to the MySQL server, such as <literal>mysqlx://user:password@host</literal>.
-     </para>
-     <para>
-      URI format:
-     </para>
-     <para>
-      <code>scheme://[user[:[password]]@]target[:port][?attribute1=value1&amp;attribute2=value2...</code>
-     </para>
-     <itemizedlist>
-      <listitem>
-        <para><literal>scheme</literal>: required, the connection protocol</para>
-        <para>In mysql_xdevapi it is always 'mysqlx' (for X Protocol)</para>
-      </listitem>
-      <listitem>
-        <para><literal>user</literal>: optional, the MySQL user account for authentication</para>
-      </listitem>
-      <listitem>
-        <para><literal>password</literal>: optional, the MySQL user's password for authentication</para>
-      </listitem>
-      <listitem>
-        <para><literal>target</literal>: required, the server instance the connection refers to:</para>
-        <para>* TCP connection (host name, IPv4 address, or IPv6 address)</para>
-        <para>* Unix socket path (local file path)</para>
-        <para>* Windows named-pipe (local file path)</para>
-      </listitem>
-      <listitem>
-        <para><literal>port</literal>: optional, network port of MySQL server.</para>
-        <para>by default port for X Protocol is 33060</para>
-      </listitem>
-      <listitem>
-        <para>
-          <literal>?attribute=value</literal>: this element is optional and specifies a data dictionary 
-          that contains different options, including:
-        </para>
-        <itemizedlist>
-          <listitem>
-          <para>
-            The <literal>auth</literal> (authentication mechanism) attribute as it relates to encrypted connections.
-            For additional information, see <link xlink:href="&url.mysql.docs.connect.encryption;">Command
-            Options for Encrypted Connections</link>.
-            The following 'auth' values are supported: <literal>plain</literal>,
-            <literal>mysql41</literal>, <literal>external</literal>, and <literal>sha256_mem</literal>.
-          </para>
-          </listitem>
-          <listitem>
-          <para>
-           The <literal>connect-timeout</literal> attribute affects the connection
-           and not subsequent operations. It is set per connection whether on
-           a single or multiple hosts.
-          </para>
-          <para>
-           Pass in a positive integer to define the connection timeout in seconds,
-           or pass in 0 (zero) to disable the timeout (infinite). Not defining
-           connect-timeout uses the default value of 10.
-          </para>
-          <para>
-            Related, the MYSQLX_CONNECTION_TIMEOUT (timeout in seconds) and MYSQLX_TEST_CONNECTION_TIMEOUT (used while running tests)
-            environment variables can be set and used instead of connect-timeout in the URI. The
-            connect-timeout URI option has precedence over these environment variables.
-          </para>
-          </listitem>
-          <listitem>
-            <para>
-              The optional <literal>compression</literal> attribute accepts these values: 
-              <literal>preferred</literal> (client negotiates with server to find a supported algorithm; connection is uncompressed if a mutually supported algorithm is not found), 
-              <literal>required</literal> (like "preferred", but connection is terminated if a mutually supported algorithm is not found), or
-              <literal>disabled</literal> (connection is uncompressed). Defaults to <literal>preferred</literal>.
-            </para>
-            <para>
-              This option was added in version 8.0.20.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              The optional <literal>compression-algorithms</literal> attribute defines 
-              the desired compression algorithms (and their preferred usage order): 
-              <literal>zstd_stream</literal> (alias: zstd),
-              <literal>lz4_message</literal> (alias: lz4), or
-              <literal>deflate_stream</literal> (aliases: deflate or zlib).
-              By default, the order used (depending on system availability) is lz4_message, zstd_stream, then deflate_stream.
-              For example, passing in compression-algorithms=[lz4,zstd_stream] uses lz4 if it's available, otherwise
-              zstd_stream is used. If both are unavailable then behavior depends on the compression value
-              e.g., if compression=required then it'll fail with an error.
-            </para>
-            <para>
-              This option was added in version 8.0.22.
-            </para>
-          </listitem>
-        </itemizedlist>
-       </listitem>
-      </itemizedlist>
-
-  <example>
-  <title>URI examples</title>
-  <programlisting role="php">
-mysqlx://foobar
-mysqlx://root@localhost?socket=%2Ftmp%2Fmysqld.sock%2F
-mysqlx://foo:bar@localhost:33060
-mysqlx://foo:bar@localhost:33160?ssl-mode=disabled
-mysqlx://foo:bar@localhost:33260?ssl-mode=required
-mysqlx://foo:bar@localhost:33360?ssl-mode=required&amp;auth=mysql41
-mysqlx://foo:bar@(/path/to/socket)
-mysqlx://foo:bar@(/path/to/socket)?auth=sha256_mem
-mysqlx://foo:bar@[localhost:33060, 127.0.0.1:33061]
-mysqlx://foobar?ssl-ca=(/path/to/ca.pem)&amp;ssl-crl=(/path/to/crl.pem)
-mysqlx://foo:bar@[localhost:33060, 127.0.0.1:33061]?ssl-mode=disabled
-mysqlx://foo:bar@localhost:33160/?connect-timeout=0
-mysqlx://foo:bar@localhost:33160/?connect-timeout=10&amp;compression=required
-mysqlx://foo:bar@localhost:33160/?connect-timeout=10&amp;compression=required&amp;compression-algorithms=[lz4,zstd_stream]
-  </programlisting>
-</example>
-
-   <para>
-    For related information, see MySQL Shell's
-    <link xlink:href="&url.mysql.docs.connect.shell.uri;">Connecting using a URI String</link>.
-   </para>
-
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A <classname>Session</classname> object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   A connection failure throws an <classname>Exception</classname>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\getSession</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $session = mysql_xdevapi\getSession("mysqlx://user:password@host");
-} catch(Exception $e) {
-    die("Connection could not be established: " . $e->getMessage());
-}
-
-$schemas = $session->getSchemas();
-print_r($schemas);
-
-$mysql_version = $session->getServerVersion();
-print_r($mysql_version);
-
-var_dump($collection->find("name = 'Alfred'")->execute()->fetchOne());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\Schema Object
-        (
-            [name] => helloworld
-        )
-    [1] => mysql_xdevapi\Schema Object
-        (
-            [name] => information_schema
-        )
-    [2] => mysql_xdevapi\Schema Object
-        (
-            [name] => mysql
-        )
-    [3] => mysql_xdevapi\Schema Object
-        (
-            [name] => performance_schema
-        )
-    [4] => mysql_xdevapi\Schema Object
-        (
-            [name] => sys
-        )
-)
-
-80012
-
-array(4) {
-  ["_id"]=>
-  string(28) "00005ad66abf0001000400000003"
-  ["age"]=>
-  int(42)
-  ["job"]=>
-  string(7) "Butler"
-  ["name"]=>
-  string(4) "Alfred"
-}
-]]>
-   </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/mysql_xdevapi/ini.xml b/reference/mysql_xdevapi/ini.xml
deleted file mode 100644
index 8e1a076aa179..000000000000
--- a/reference/mysql_xdevapi/ini.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="mysql-xdevapi.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table xml:id="mysql-xdevapi.configuration.configuration">
-   <title>Mysql_xdevapi &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.xmysqlnd.collect-memory-statistics">xmysqlnd.collect_memory_statistics</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.xmysqlnd.collect-statistics">xmysqlnd.collect_statistics</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.xmysqlnd.debug">xmysqlnd.debug</link></entry>
-      <entry></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.xmysqlnd.mempool-default-size">xmysqlnd.mempool_default_size</link></entry>
-      <entry>16000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.xmysqlnd.net-read-timeout">xmysqlnd.net_read_timeout</link></entry>
-      <entry>31536000</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.xmysqlnd.trace-alloc">xmysqlnd.trace_alloc</link></entry>
-      <entry></entry>
-      <entry><constant>INI_SYSTEM</constant></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.xmysqlnd.collect-memory-statistics">
-     <term>
-      <parameter>xmysqlnd.collect_memory_statistics</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.xmysqlnd.collect-statistics">
-     <term>
-      <parameter>xmysqlnd.collect_statistics</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.xmysqlnd.debug">
-     <term>
-      <parameter>xmysqlnd.debug</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.xmysqlnd.mempool-default-size">
-     <term>
-      <parameter>xmysqlnd.mempool_default_size</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.xmysqlnd.net-read-timeout">
-     <term>
-      <parameter>xmysqlnd.net_read_timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.xmysqlnd.trace-alloc">
-     <term>
-      <parameter>xmysqlnd.trace_alloc</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       
-      </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/mysql_xdevapi/mysql-xdevapi.baseresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.baseresult.xml
deleted file mode 100644
index c319d8a85eba..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.baseresult.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-baseresult" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>BaseResult interface</title>
- <titleabbrev>mysql_xdevapi\BaseResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\BaseResult intro -->
-  <section xml:id="mysql-xdevapi-baseresult.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-baseresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\BaseResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\BaseResult</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-baseresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.baseresult;
-
-</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/mysql_xdevapi/mysql-xdevapi.client.xml b/reference/mysql_xdevapi/mysql-xdevapi.client.xml
deleted file mode 100644
index 12637dba4dd1..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.client.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Client class</title>
- <titleabbrev>mysql_xdevapi\Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Client intro -->
-  <section xml:id="mysql-xdevapi-client.intro">
-   &reftitle.intro;
-   <para>
-    Provides access to the connection pool.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Client</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Client</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.client;
-
-</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/mysql_xdevapi/mysql-xdevapi.collection.xml b/reference/mysql_xdevapi/mysql-xdevapi.collection.xml
deleted file mode 100644
index 769b0ba79de6..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.collection.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-collection" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Collection class</title>
- <titleabbrev>mysql_xdevapi\Collection</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Collection intro -->
-  <section xml:id="mysql-xdevapi-collection.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-collection.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Collection</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Collection</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\SchemaObject</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-collection.props.name">name</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\Collection properties -->
-  <section xml:id="mysql-xdevapi-collection.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-collection.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.collection;
-
-</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/mysql_xdevapi/mysql-xdevapi.collectionadd.xml b/reference/mysql_xdevapi/mysql-xdevapi.collectionadd.xml
deleted file mode 100644
index c3353d6a4432..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.collectionadd.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-collectionadd" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CollectionAdd class</title>
- <titleabbrev>mysql_xdevapi\CollectionAdd</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CollectionAdd intro -->
-  <section xml:id="mysql-xdevapi-collectionadd.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-collectionadd.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CollectionAdd</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CollectionAdd</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-collectionadd')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.collectionadd;
-
-</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/mysql_xdevapi/mysql-xdevapi.collectionfind.xml b/reference/mysql_xdevapi/mysql-xdevapi.collectionfind.xml
deleted file mode 100644
index ac02dbb63ba1..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.collectionfind.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-collectionfind" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CollectionFind class</title>
- <titleabbrev>mysql_xdevapi\CollectionFind</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CollectionFind intro -->
-  <section xml:id="mysql-xdevapi-collectionfind.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-collectionfind.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CollectionFind</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CollectionFind</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationBindable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationLimitable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationSortable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-collectionfind')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.collectionfind;
-
-</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/mysql_xdevapi/mysql-xdevapi.collectionmodify.xml b/reference/mysql_xdevapi/mysql-xdevapi.collectionmodify.xml
deleted file mode 100644
index 0fc9e70cd091..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.collectionmodify.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-collectionmodify" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CollectionModify class</title>
- <titleabbrev>mysql_xdevapi\CollectionModify</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CollectionModify intro -->
-  <section xml:id="mysql-xdevapi-collectionmodify.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-collectionmodify.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CollectionModify</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CollectionModify</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationBindable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationLimitable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationSkippable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationSortable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-collectionmodify')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.collectionmodify;
-
-</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/mysql_xdevapi/mysql-xdevapi.collectionremove.xml b/reference/mysql_xdevapi/mysql-xdevapi.collectionremove.xml
deleted file mode 100644
index 36c4939bbfaa..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.collectionremove.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-collectionremove" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CollectionRemove class</title>
- <titleabbrev>mysql_xdevapi\CollectionRemove</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CollectionRemove intro -->
-  <section xml:id="mysql-xdevapi-collectionremove.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-collectionremove.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CollectionRemove</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CollectionRemove</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationBindable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationLimitable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\CrudOperationSortable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-collectionremove')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.collectionremove;
-
-</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/mysql_xdevapi/mysql-xdevapi.columnresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.columnresult.xml
deleted file mode 100644
index f0fd29380c72..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.columnresult.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-columnresult" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>ColumnResult class</title>
- <titleabbrev>mysql_xdevapi\ColumnResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\ColumnResult intro -->
-  <section xml:id="mysql-xdevapi-columnresult.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-columnresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\ColumnResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\ColumnResult</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-columnresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.columnresult;
-
-</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/mysql_xdevapi/mysql-xdevapi.crudoperationbindable.xml b/reference/mysql_xdevapi/mysql-xdevapi.crudoperationbindable.xml
deleted file mode 100644
index 8927219c32c2..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.crudoperationbindable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-crudoperationbindable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CrudOperationBindable interface</title>
- <titleabbrev>mysql_xdevapi\CrudOperationBindable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CrudOperationBindable intro -->
-  <section xml:id="mysql-xdevapi-crudoperationbindable.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-crudoperationbindable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CrudOperationBindable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CrudOperationBindable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-crudoperationbindable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.crudoperationbindable;
-
-</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/mysql_xdevapi/mysql-xdevapi.crudoperationlimitable.xml b/reference/mysql_xdevapi/mysql-xdevapi.crudoperationlimitable.xml
deleted file mode 100644
index 0da4aad0e86d..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.crudoperationlimitable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-crudoperationlimitable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CrudOperationLimitable interface</title>
- <titleabbrev>mysql_xdevapi\CrudOperationLimitable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CrudOperationLimitable intro -->
-  <section xml:id="mysql-xdevapi-crudoperationlimitable.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-crudoperationlimitable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CrudOperationLimitable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CrudOperationLimitable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-crudoperationlimitable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.crudoperationlimitable;
-
-</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/mysql_xdevapi/mysql-xdevapi.crudoperationskippable.xml b/reference/mysql_xdevapi/mysql-xdevapi.crudoperationskippable.xml
deleted file mode 100644
index e7f8671ff156..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.crudoperationskippable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-crudoperationskippable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CrudOperationSkippable interface</title>
- <titleabbrev>mysql_xdevapi\CrudOperationSkippable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CrudOperationSkippable intro -->
-  <section xml:id="mysql-xdevapi-crudoperationskippable.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-crudoperationskippable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CrudOperationSkippable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CrudOperationSkippable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-crudoperationskippable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.crudoperationskippable;
-
-</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/mysql_xdevapi/mysql-xdevapi.crudoperationsortable.xml b/reference/mysql_xdevapi/mysql-xdevapi.crudoperationsortable.xml
deleted file mode 100644
index 71909b428fce..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.crudoperationsortable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-crudoperationsortable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>CrudOperationSortable interface</title>
- <titleabbrev>mysql_xdevapi\CrudOperationSortable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\CrudOperationSortable intro -->
-  <section xml:id="mysql-xdevapi-crudoperationsortable.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-crudoperationsortable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\CrudOperationSortable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\CrudOperationSortable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-crudoperationsortable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.crudoperationsortable;
-
-</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/mysql_xdevapi/mysql-xdevapi.databaseobject.xml b/reference/mysql_xdevapi/mysql-xdevapi.databaseobject.xml
deleted file mode 100644
index a059c14f84cd..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.databaseobject.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-databaseobject" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>DatabaseObject interface</title>
- <titleabbrev>mysql_xdevapi\DatabaseObject</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\DatabaseObject intro -->
-  <section xml:id="mysql-xdevapi-databaseobject.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-databaseobject.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\DatabaseObject</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\DatabaseObject</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-databaseobject')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.databaseobject;
-
-</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/mysql_xdevapi/mysql-xdevapi.docresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml
deleted file mode 100644
index 55753313b720..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.docresult.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-docresult" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>DocResult class</title>
- <titleabbrev>mysql_xdevapi\DocResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\DocResult intro -->
-  <section xml:id="mysql-xdevapi-docresult.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-docresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\DocResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\DocResult</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\BaseResult</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-docresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.docresult;
-
-</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/mysql_xdevapi/mysql-xdevapi.driver.xml b/reference/mysql_xdevapi/mysql-xdevapi.driver.xml
deleted file mode 100644
index 6ba5432e3e4e..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.driver.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-driver" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Driver class</title>
- <titleabbrev>mysql_xdevapi\Driver</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Driver intro -->
-  <section xml:id="mysql-xdevapi-driver.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-driver.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Driver</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Driver</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="mysql-xdevapi-driver.constants.version">mysql_xdevapi\Driver::version</varname>
-     <initializer>8.0.3</initializer>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ mysql_xdevapi\Driver constants -->
-  <section xml:id="mysql-xdevapi-driver.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mysql-xdevapi-driver.constants.version">
-     <term><constant>mysql_xdevapi\Driver::version</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/mysql_xdevapi/mysql-xdevapi.exception.xml b/reference/mysql_xdevapi/mysql-xdevapi.exception.xml
deleted file mode 100644
index 991b524a503b..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.exception.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Exception class</title>
- <titleabbrev>mysql_xdevapi\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Exception intro -->
-  <section xml:id="mysql-xdevapi-exception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.mysql-xdevapi-exception')/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.runtimeexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" /> -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!-- &reference.mysql-xdevapi.mysql-xdevapi.entities.exception; -->
-
-</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/mysql_xdevapi/mysql-xdevapi.executable.xml b/reference/mysql_xdevapi/mysql-xdevapi.executable.xml
deleted file mode 100644
index f023de7de9e8..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.executable.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-executable" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Executable interface</title>
- <titleabbrev>mysql_xdevapi\Executable</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Executable intro -->
-  <section xml:id="mysql-xdevapi-executable.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-executable.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Executable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Executable</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-executable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.executable;
-
-</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/mysql_xdevapi/mysql-xdevapi.executionstatus.xml b/reference/mysql_xdevapi/mysql-xdevapi.executionstatus.xml
deleted file mode 100644
index 298111b008be..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.executionstatus.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-executionstatus" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>ExecutionStatus class</title>
- <titleabbrev>mysql_xdevapi\ExecutionStatus</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\ExecutionStatus intro -->
-  <section xml:id="mysql-xdevapi-executionstatus.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-executionstatus.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\ExecutionStatus</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\ExecutionStatus</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-executionstatus.props.affecteditems">affectedItems</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-executionstatus.props.matcheditems">matchedItems</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-executionstatus.props.founditems">foundItems</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-executionstatus.props.lastinsertid">lastInsertId</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-executionstatus.props.lastdocumentid">lastDocumentId</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-executionstatus')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\ExecutionStatus properties -->
-  <section xml:id="mysql-xdevapi-executionstatus.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-executionstatus.props.affecteditems">
-     <term><varname>affectedItems</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-executionstatus.props.matcheditems">
-     <term><varname>matchedItems</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-executionstatus.props.founditems">
-     <term><varname>foundItems</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-executionstatus.props.lastinsertid">
-     <term><varname>lastInsertId</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-executionstatus.props.lastdocumentid">
-     <term><varname>lastDocumentId</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.executionstatus;
-
-</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/mysql_xdevapi/mysql-xdevapi.expression.xml b/reference/mysql_xdevapi/mysql-xdevapi.expression.xml
deleted file mode 100644
index 0b8cf1c06e10..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.expression.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-expression" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Expression class</title>
- <titleabbrev>mysql_xdevapi\Expression</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Expression intro -->
-  <section xml:id="mysql-xdevapi-expression.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-expression.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Expression</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Expression</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-expression.props.name">name</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-expression')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\Expression properties -->
-  <section xml:id="mysql-xdevapi-expression.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-expression.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.expression;
-
-</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/mysql_xdevapi/mysql-xdevapi.fieldmetadata.xml b/reference/mysql_xdevapi/mysql-xdevapi.fieldmetadata.xml
deleted file mode 100644
index ff9696b5250e..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.fieldmetadata.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-fieldmetadata" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>FieldMetadata class</title>
- <titleabbrev>mysql_xdevapi\FieldMetadata</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\FieldMetadata intro -->
-  <section xml:id="mysql-xdevapi-fieldmetadata.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-fieldmetadata.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\FieldMetadata</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\FieldMetadata</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.type">type</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.type-name">type_name</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.name">name</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.original-name">original_name</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.table">table</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.original-table">original_table</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.schema">schema</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.catalog">catalog</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.collation">collation</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.fractional-digits">fractional_digits</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.length">length</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.flags">flags</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-fieldmetadata.props.content-type">content_type</varname>
-    </fieldsynopsis>
-
-    
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\FieldMetadata properties -->
-  <section xml:id="mysql-xdevapi-fieldmetadata.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.type">
-     <term><varname>type</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.type-name">
-     <term><varname>type_name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.original-name">
-     <term><varname>original_name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.table">
-     <term><varname>table</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.original-table">
-     <term><varname>original_table</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.schema">
-     <term><varname>schema</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.catalog">
-     <term><varname>catalog</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.collation">
-     <term><varname>collation</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.fractional-digits">
-     <term><varname>fractional_digits</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.length">
-     <term><varname>length</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.flags">
-     <term><varname>flags</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-fieldmetadata.props.content-type">
-     <term><varname>content_type</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/mysql_xdevapi/mysql-xdevapi.result.xml b/reference/mysql_xdevapi/mysql-xdevapi.result.xml
deleted file mode 100644
index 098a6ab46b68..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.result.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-result" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Result class</title>
- <titleabbrev>mysql_xdevapi\Result</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Result intro -->
-  <section xml:id="mysql-xdevapi-result.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-result.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Result</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Result</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\BaseResult</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-result')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.result;
-
-</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/mysql_xdevapi/mysql-xdevapi.rowresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml
deleted file mode 100644
index d2de1dff4758..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.rowresult.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-rowresult" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>RowResult class</title>
- <titleabbrev>mysql_xdevapi\RowResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\RowResult intro -->
-  <section xml:id="mysql-xdevapi-rowresult.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-rowresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\RowResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\RowResult</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\BaseResult</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-rowresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.rowresult;
-
-</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/mysql_xdevapi/mysql-xdevapi.schema.xml b/reference/mysql_xdevapi/mysql-xdevapi.schema.xml
deleted file mode 100644
index 7878f026a6c1..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.schema.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-schema" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Schema class</title>
- <titleabbrev>mysql_xdevapi\Schema</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Schema intro -->
-  <section xml:id="mysql-xdevapi-schema.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-schema.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Schema</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Schema</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\DatabaseObject</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-schema.props.name">name</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-schema')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\Schema properties -->
-  <section xml:id="mysql-xdevapi-schema.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-schema.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.schema;
-
-</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/mysql_xdevapi/mysql-xdevapi.schemaobject.xml b/reference/mysql_xdevapi/mysql-xdevapi.schemaobject.xml
deleted file mode 100644
index 47187ebf3b68..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.schemaobject.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-schemaobject" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>SchemaObject interface</title>
- <titleabbrev>mysql_xdevapi\SchemaObject</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\SchemaObject intro -->
-  <section xml:id="mysql-xdevapi-schemaobject.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-schemaobject.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\SchemaObject</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\SchemaObject</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\DatabaseObject</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-schemaobject')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.schemaobject;
-
-</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/mysql_xdevapi/mysql-xdevapi.session.xml b/reference/mysql_xdevapi/mysql-xdevapi.session.xml
deleted file mode 100644
index a8f951c18d51..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.session.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-session" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Session class</title>
- <titleabbrev>mysql_xdevapi\Session</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Session intro -->
-  <section xml:id="mysql-xdevapi-session.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-session.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Session</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Session</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-session')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.session;
-
-</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/mysql_xdevapi/mysql-xdevapi.sqlstatement.xml b/reference/mysql_xdevapi/mysql-xdevapi.sqlstatement.xml
deleted file mode 100644
index 863dec265436..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.sqlstatement.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-sqlstatement" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>SqlStatement class</title>
- <titleabbrev>mysql_xdevapi\SqlStatement</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\SqlStatement intro -->
-  <section xml:id="mysql-xdevapi-sqlstatement.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-sqlstatement.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\SqlStatement</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\SqlStatement</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mysql-xdevapi-sqlstatement.constants.execute-async">mysql_xdevapi\SqlStatement::EXECUTE_ASYNC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mysql-xdevapi-sqlstatement.constants.buffered">mysql_xdevapi\SqlStatement::BUFFERED</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-sqlstatement.props.statement">statement</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-sqlstatement')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ mysql_xdevapi\SqlStatement properties -->
-  <section xml:id="mysql-xdevapi-sqlstatement.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-sqlstatement.props.statement">
-     <term><varname>statement</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ mysql_xdevapi\SqlStatement constants -->
-  <section xml:id="mysql-xdevapi-sqlstatement.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mysql-xdevapi-sqlstatement.constants.execute-async">
-     <term><constant>mysql_xdevapi\SqlStatement::EXECUTE_ASYNC</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mysql-xdevapi-sqlstatement.constants.buffered">
-     <term><constant>mysql_xdevapi\SqlStatement::BUFFERED</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.sqlstatement;
-
-</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/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml b/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml
deleted file mode 100644
index f54836f92a67..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.sqlstatementresult.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-sqlstatementresult" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>SqlStatementResult class</title>
- <titleabbrev>mysql_xdevapi\SqlStatementResult</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\SqlStatementResult intro -->
-  <section xml:id="mysql-xdevapi-sqlstatementresult.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-sqlstatementresult.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\SqlStatementResult</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\SqlStatementResult</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>mysql_xdevapi\BaseResult</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-sqlstatementresult')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.sqlstatementresult;
-
-</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/mysql_xdevapi/mysql-xdevapi.statement.xml b/reference/mysql_xdevapi/mysql-xdevapi.statement.xml
deleted file mode 100644
index a10288499373..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.statement.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-statement" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Statement class</title>
- <titleabbrev>mysql_xdevapi\Statement</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Statement intro -->
-  <section xml:id="mysql-xdevapi-statement.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-statement.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Statement</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Statement</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mysql-xdevapi-statement.constants.execute-async">mysql_xdevapi\Statement::EXECUTE_ASYNC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="mysql-xdevapi-statement.constants.buffered">mysql_xdevapi\Statement::BUFFERED</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-statement')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ mysql_xdevapi\Statement constants -->
-  <section xml:id="mysql-xdevapi-statement.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="mysql-xdevapi-statement.constants.execute-async">
-     <term><constant>mysql_xdevapi\Statement::EXECUTE_ASYNC</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="mysql-xdevapi-statement.constants.buffered">
-     <term><constant>mysql_xdevapi\Statement::BUFFERED</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.statement;
-
-</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/mysql_xdevapi/mysql-xdevapi.table.xml b/reference/mysql_xdevapi/mysql-xdevapi.table.xml
deleted file mode 100644
index d11ad5ca3cef..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.table.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-table" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Table class</title>
- <titleabbrev>mysql_xdevapi\Table</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Table intro -->
-  <section xml:id="mysql-xdevapi-table.intro">
-   &reftitle.intro;
-   <para>
-    Provides access to the table through INSERT/SELECT/UPDATE/DELETE statements.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-table.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Table</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Table</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\SchemaObject</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-table.props.name">name</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-table')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ mysql_xdevapi\Table properties -->
-  <section xml:id="mysql-xdevapi-table.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-table.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.table;
-
-</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/mysql_xdevapi/mysql-xdevapi.tabledelete.xml b/reference/mysql_xdevapi/mysql-xdevapi.tabledelete.xml
deleted file mode 100644
index 0c2888c1e5f9..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.tabledelete.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-tabledelete" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>TableDelete class</title>
- <titleabbrev>mysql_xdevapi\TableDelete</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\TableDelete intro -->
-  <section xml:id="mysql-xdevapi-tabledelete.intro">
-   &reftitle.intro;
-   <para>
-    A statement for delete operations on Table.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-tabledelete.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\TableDelete</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\TableDelete</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-tabledelete')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.tabledelete;
-
-</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/mysql_xdevapi/mysql-xdevapi.tableinsert.xml b/reference/mysql_xdevapi/mysql-xdevapi.tableinsert.xml
deleted file mode 100644
index 0753598f7683..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.tableinsert.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-tableinsert" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>TableInsert class</title>
- <titleabbrev>mysql_xdevapi\TableInsert</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\TableInsert intro -->
-  <section xml:id="mysql-xdevapi-tableinsert.intro">
-   &reftitle.intro;
-   <para>
-    A statement for insert operations on Table.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-tableinsert.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\TableInsert</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\TableInsert</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-tableinsert')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.tableinsert;
-
-</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/mysql_xdevapi/mysql-xdevapi.tableselect.xml b/reference/mysql_xdevapi/mysql-xdevapi.tableselect.xml
deleted file mode 100644
index f744208ec0e7..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.tableselect.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-tableselect" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>TableSelect class</title>
- <titleabbrev>mysql_xdevapi\TableSelect</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\TableSelect intro -->
-  <section xml:id="mysql-xdevapi-tableselect.intro">
-   &reftitle.intro;
-   <para>
-    A statement for record retrieval operations on a Table.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-tableselect.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\TableSelect</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\TableSelect</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-tableselect')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.tableselect;
-
-</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/mysql_xdevapi/mysql-xdevapi.tableupdate.xml b/reference/mysql_xdevapi/mysql-xdevapi.tableupdate.xml
deleted file mode 100644
index f7caafbdeec8..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.tableupdate.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-tableupdate" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>TableUpdate class</title>
- <titleabbrev>mysql_xdevapi\TableUpdate</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\TableUpdate intro -->
-  <section xml:id="mysql-xdevapi-tableupdate.intro">
-   &reftitle.intro;
-   <para>
-    A statement for record update operations on a Table.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-tableupdate.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\TableUpdate</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\TableUpdate</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>mysql_xdevapi\Executable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-tableupdate')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.tableupdate;
-
-</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/mysql_xdevapi/mysql-xdevapi.warning.xml b/reference/mysql_xdevapi/mysql-xdevapi.warning.xml
deleted file mode 100644
index eb98f1d00f0c..000000000000
--- a/reference/mysql_xdevapi/mysql-xdevapi.warning.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.mysql-xdevapi-warning" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Warning class</title>
- <titleabbrev>mysql_xdevapi\Warning</titleabbrev>
-
- <partintro>
-
-<!-- {{{ mysql_xdevapi\Warning intro -->
-  <section xml:id="mysql-xdevapi-warning.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="mysql-xdevapi-warning.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>mysql_xdevapi\Warning</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>mysql_xdevapi\Warning</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-warning.props.message">message</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-warning.props.level">level</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="mysql-xdevapi-warning.props.code">code</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.mysql-xdevapi-warning')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ mysql_xdevapi\Warning properties -->
-  <section xml:id="mysql-xdevapi-warning.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="mysql-xdevapi-warning.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-warning.props.level">
-     <term><varname>level</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="mysql-xdevapi-warning.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.mysql-xdevapi.mysql-xdevapi.entities.warning;
-
-</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/mysql_xdevapi/mysql_xdevapi/baseresult/getwarnings.xml b/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarnings.xml
deleted file mode 100644
index 73a7897ab9a1..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarnings.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-baseresult.getwarnings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>BaseResult::getWarnings</refname>
-  <refpurpose>Fetch warnings from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\BaseResult::getWarnings</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetches warnings generated by MySQL server's last operation.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of Warning objects from the last operation. Each object
-   defines an error 'message', error 'level', and error 'code'. An empty
-   array is returned if no errors are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarnings</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-$warnings = $res->getWarnings();
-
-print_r($warnings);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-    [1] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml
deleted file mode 100644
index ac2818c95982..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/baseresult/getwarningscount.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-baseresult.getwarningscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>BaseResult::getWarningsCount</refname>
-  <refpurpose>Fetch warning count from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\BaseResult::getWarningsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of warnings raised by the last operation. Specifically, 
-   these warnings are raised by the MySQL server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of warnings from the last operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarningsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS foo")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-
-echo $res->getWarningsCount();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-2
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/client/close.xml b/reference/mysql_xdevapi/mysql_xdevapi/client/close.xml
deleted file mode 100755
index 3676fb6810d8..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/client/close.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-client.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>mysql_xdevapi\Client::close</refname>
-  <refpurpose>Close client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Client::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Close all client connections with the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if connections are closed.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql_xdevapi/mysql_xdevapi/client/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/client/construct.xml
deleted file mode 100755
index 1726f2f893a3..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/client/construct.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Client::__construct</refname>
-  <refpurpose>Client constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Client::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Construct a client object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Client::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pooling_options = '{
-  "enabled": true,
-    "maxSize": 10,
-    "maxIdleTime": 3600,
-    "queueTimeOut": 1000
-}';
-$client = mysql_xdevapi\getClient($connection_uri, $pooling_options);
-$session = $client->getSession();
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/client/getsession.xml b/reference/mysql_xdevapi/mysql_xdevapi/client/getsession.xml
deleted file mode 100755
index 8f51fbd2d87c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/client/getsession.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-client.getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Client::getClient</refname>
-  <refpurpose>Get client session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Session</type><methodname>mysql_xdevapi\Client::getSession</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get session associated with the client.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Session 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/mysql_xdevapi/mysql_xdevapi/collection/add.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/add.xml
deleted file mode 100644
index 4f31a881536f..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/add.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::add</refname>
-  <refpurpose>Add collection document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionAdd</type><methodname>mysql_xdevapi\Collection::add</methodname>
-   <methodparam><type>mixed</type><parameter>document</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Triggers the insertion of the given document(s) into the collection, and 
-   multiple variants of this method are supported. Options include:
-  </para>
-  <orderedlist>
-   <listitem>
-     <para>
-      Add a single document as a JSON string.
-     </para>
-   </listitem>
-   <listitem>
-     <para>
-      Add a single document as an array as: 
-      <literal>[ 'field' => 'value', 'field2' => 'value2' ... ]</literal>
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-      A mix of both, and multiple documents can be added in the same operation.
-    </para>
-   </listitem>
-  </orderedlist>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>document</parameter></term>
-    <listitem>
-     <para>
-      One or multiple documents, and this can be either JSON or an array of fields with 
-      their associated values. This cannot be an empty array.
-     </para>
-     <para>
-      The MySQL server automatically generates unique <literal>_id</literal> values for
-      each document (recommended), although this can be manually added as well. This value must be
-      unique as otherwise the add operation will fail.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionAdd object. Use execute() to return a Result that can be used to query the number 
-   of affected items, the number warnings generated by the operation, or to fetch a list of 
-   generated IDs for the inserted documents.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::add</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-// Add two documents
-$collection->add('{"name": "Fred",  "age": 21, "job": "Construction"}')->execute();
-$collection->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-
-// Add two documents using a single JSON object
-$result = $collection->add(
-  '{"name": "Bernie",
-    "jobs": [{"title":"Cat Herder","Salary":42000}, {"title":"Father","Salary":0}],
-    "hobbies": ["Sports","Making cupcakes"]}',
-  '{"name": "Jane",
-    "jobs": [{"title":"Scientist","Salary":18000}, {"title":"Mother","Salary":0}],
-    "hobbies": ["Walking","Making pies"]}')->execute();
-
-// Fetch a list of generated ID's from the last add()
-$ids = $result->getGeneratedIds();
-print_r($ids);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => 00005b6b53610000000000000056
-    [1] => 00005b6b53610000000000000057
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    A unique _id is generated by MySQL Server 8.0 or higher, as demonstrated 
-    in the example. The _id field must be manually defined if using
-    MySQL Server 5.7.
-   </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/mysql_xdevapi/mysql_xdevapi/collection/addorreplaceone.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/addorreplaceone.xml
deleted file mode 100644
index bfc2bbffdf90..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/addorreplaceone.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.addorreplaceone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::addOrReplaceOne</refname>
-  <refpurpose>Add or replace collection document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Collection::addOrReplaceOne</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>doc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Add a new document, or replace a document if it already exists.
-  </para>
-  <para>
-   Here are several scenarios for this method:
-  </para>
-  <itemizedlist>
-   <listitem>
-    <para>
-      If neither the id or any unique key values conflict with any document in the collection, 
-      then the document is added.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-      If the id does not match any document but one or more unique key values conflict with a 
-      document in the collection, then an error is raised.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     If id matches an existing document and no unique keys are defined for the collection, 
-     then the document is replaced.
-   </para>
-   </listitem>
-   <listitem>
-    <para>
-      If id matches an existing document, and either all unique keys in the replacement document 
-      match that same document or they don't conflict with any other documents in the collection, 
-      then the document is replaced.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-      If id matches an existing document and one or more unique keys match a different document 
-      from the collection, then an error is raised.
-    </para>
-   </listitem>
-  </itemizedlist>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      This is the filter id. If this id or any other field that has a unique index already 
-      exists in the collection, then it will update the matching document instead.
-     </para>
-     <para>
-      By default, this id is automatically generated by MySQL Server when the
-      record was added, and is referenced as a field named '_id'.
-    </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>doc</parameter></term>
-    <listitem>
-     <para>
-      This is the document to add or replace, which is a JSON string.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::addOrReplaceOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-// Using add()
-$result = $collection->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-
-// Using addOrReplaceOne()
-// Note: we're passing in a known _id value here
-$result = $collection->addOrReplaceOne('00005b6b53610000000000000056', '{"name": "Fred",  "age": 21, "job": "Construction"}');
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/construct.xml
deleted file mode 100644
index 51e5301051d1..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/construct.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::__construct</refname>
-  <refpurpose>Collection constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Collection::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Construct a Collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::getOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection->add('{"name": "Alfred", "age": 42, "job": "Butler"}')->execute();
-
-// A unique _id is (by default, and recommended) generated by MySQL Server
-// This retrieves the generated _id's; only one in this example, so $ids[0]
-$ids        = $result->getGeneratedIds();
-$alfreds_id = $ids[0];
-
-// ...
-
-print_r($alfreds_id);
-print_r($collection->getOne($alfreds_id));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-00005b6b536100000000000000b1
-
-Array
-(
-    [_id] => 00005b6b536100000000000000b1
-    [age] => 42
-    [job] => Butler
-    [name] => Alfred
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/count.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/count.xml
deleted file mode 100644
index fc8ce0d3fea0..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/count.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::count</refname>
-  <refpurpose>Get document count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Collection::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   This functionality is similar to a <literal>SELECT COUNT(*)</literal> SQL 
-   operation against the MySQL server for the current schema and collection.
-   In other words, it counts the number of documents in the collection.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of documents in the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name": "Bernie",
-    "jobs": [
-      {"title":"Cat Herder","Salary":42000}, 
-      {"title":"Father","Salary":0}
-    ],
-    "hobbies": ["Sports","Making cupcakes"]}',
-  '{"name": "Jane",
-    "jobs": [
-      {"title":"Scientist","Salary":18000}, 
-      {"title":"Mother","Salary":0}
-    ],
-    "hobbies": ["Walking","Making pies"]}')
-  ->execute();
-
-var_dump($collection->count());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(2)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/createindex.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/createindex.xml
deleted file mode 100644
index c813ce2736ab..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/createindex.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.createindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::createIndex</refname>
-  <refpurpose>Create collection index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>mysql_xdevapi\Collection::createIndex</methodname>
-   <methodparam><type>string</type><parameter>index_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>index_desc_json</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates an index on the collection.
-  </para>
-  <para>
-    An exception is thrown if an index with the same name already exists,
-    or if index definition is not correctly formed.
-   </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index_name</parameter></term>
-    <listitem>
-     <para>
-      The name of the index that to create. This name must be a valid index name as 
-      accepted by the <literal>CREATE INDEX</literal> SQL query.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>index_desc_json</parameter></term>
-    <listitem>
-     <para>
-      Definition of the index to create. It contains an array of IndexField objects,
-      and each object describes a single document member to include in the index, 
-      and an optional string for the type of index that might be INDEX (default) or SPATIAL.
-     </para>
-     <para>
-      A single IndexField description consists of the following fields:
-     </para>
-     <itemizedlist>
-      <listitem>
-        <para>
-          <code>field</code>: string, the full document path to the document member or field to be indexed.
-        </para>
-      </listitem>
-      <listitem>
-       <para>
-        <code>type</code>: string, one of the supported SQL column types to map the field into.
-        For numeric types, the optional UNSIGNED keyword may follow.
-        For the TEXT type, the length to consider for indexing may be added.
-       </para>
-      </listitem>
-      <listitem>
-        <para>
-          <code>required</code>: bool, (optional) true if the field is required to exist in the document. 
-          Defaults to &false;, except for <literal>GEOJSON</literal> where it defaults to &true;.
-         </para>
-       </listitem>
-      <listitem>
-        <para>
-          <code>options</code>: integer, (optional) special option flags for use 
-          when decoding <literal>GEOJSON</literal> data.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <code>srid</code>: integer, (optional) srid value for use when 
-          decoding <literal>GEOJSON</literal> data.
-        </para>
-      </listitem>
-      </itemizedlist>
-
-      <para>
-        It is an error to include other fields not described above in 
-        IndexDefinition or IndexField documents.
-      </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para></para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::createIndex</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-// Creating a text index
-$collection->createIndex(
-  'myindex1', 
-  '{"fields": [{
-    "field": "$.name", 
-    "type": "TEXT(25)", 
-    "required": true}], 
-    "unique": false}'
-);
-
-// A spatial index
-$collection->createIndex(
-  'myindex2', 
-  '{"fields": [{
-    "field": "$.home", 
-    "type": "GEOJSON", 
-    "required": true}], 
-    "type": "SPATIAL"}'
-);
-
-// Index with multiple fields
-$collection->createIndex(
-  'myindex3', 
-  '{"fields": [
-    {
-      "field": "$.name",
-      "type": "TEXT(20)",
-      "required": true
-    },
-    {
-      "field": "$.age",
-      "type": "INTEGER"
-    },
-    {
-      "field": "$.job",
-      "type": "TEXT(30)",
-      "required": false
-    }
-  ],
-  "unique": true
-  }'
-);
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/dropindex.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/dropindex.xml
deleted file mode 100644
index 315db6ac9003..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/dropindex.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.dropindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::dropIndex</refname>
-  <refpurpose>Drop collection index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Collection::dropIndex</methodname>
-   <methodparam><type>string</type><parameter>index_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Drop a collection index.
-  </para>
-  <para>
-   This operation does not yield an error if the index does not exist, but
-   &false; is returned in that case.
- </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index_name</parameter></term>
-    <listitem>
-     <para>
-      Name of collection index to drop.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the DROP INDEX operation succeeded, otherwise &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::dropIndex</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$collection->createIndex(
-  'myindex', 
-  '{"fields": [{"field": "$.name", "type": "TEXT(25)", "required": true}], "unique": false}'
-);
-
-// ...
-
-if ($collection->dropIndex('myindex')) {
-    echo "An index named 'myindex' was found, and dropped.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-An index named 'myindex' was found, and dropped.
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/existsindatabase.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/existsindatabase.xml
deleted file mode 100644
index d4899e35a028..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/existsindatabase.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.existsindatabase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::existsInDatabase</refname>
-  <refpurpose>Check if collection exists in database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Collection::existsInDatabase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the Collection object refers to a collection in the database (schema).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if collection exists in the database, else &false; if it does not.
-  </para>
-  <para>
-    A table defined with two columns (doc and _id) is considered a collection, 
-    and a third _json_schema column as of MySQL 8.0.21. 
-    Adding an additional column means existsInDatabase() will no longer see it as a collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::existsInDatabase</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// ...
-
-if (!$collection->existsInDatabase()) {
-    echo "The collection no longer exists in the database named addressbook. What happened?";
-}
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/find.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/find.xml
deleted file mode 100644
index ecc70a03e4b5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/find.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.find" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::find</refname>
-  <refpurpose>Search for document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\Collection::find</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>search_condition</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Search a database collection for a document or set of documents. The
-   found documents are returned as a CollectionFind object is to
-   further modify or fetch results from.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>search_condition</parameter></term>
-    <listitem>
-     <para>
-      Although optional, normally a condition is defined to limit the results
-      to a subset of documents.
-     </para>
-     <para>
-      Multiple elements might build the condition and the syntax supports parameter binding. 
-      The expression used as search condition must be a valid SQL expression.
-      If no search condition is provided (field empty) then find('true') is assumed.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object to verify the operation,
-   or fetch the found documents.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::find</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$collection->add('{"name": "Alfred",     "age": 18, "job": "Butler"}')->execute();
-$collection->add('{"name": "Bob",        "age": 19, "job": "Swimmer"}')->execute();
-$collection->add('{"name": "Fred",       "age": 20, "job": "Construction"}')->execute();
-$collection->add('{"name": "Wilma",      "age": 21, "job": "Teacher"}')->execute();
-$collection->add('{"name": "Suki",       "age": 22, "job": "Teacher"}')->execute();
-
-$find   = $collection->find('job LIKE :job AND age > :age');
-$result = $find
-  ->bind(['job' => 'Teacher', 'age' => 20])
-  ->sort('age DESC')
-  ->limit(2)            
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b536100000000000000a8
-            [age] => 22
-            [job] => Teacher
-            [name] => Suki
-        )
-    [1] => Array
-        (
-            [_id] => 00005b6b536100000000000000a7
-            [age] => 21
-            [job] => Teacher
-            [name] => Wilma
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/getname.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/getname.xml
deleted file mode 100644
index 154832f6f951..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/getname.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::getName</refname>
-  <refpurpose>Get collection name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Collection::getName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the collection's name.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The collection name, as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::getName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-
-// ...
-
-var_dump($collection->getName());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(6) "people"
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/getone.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/getone.xml
deleted file mode 100644
index 48b77772f815..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/getone.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.getone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::getOne</refname>
-  <refpurpose>Get one document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Document</type><methodname>mysql_xdevapi\Collection::getOne</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fetches one document from the collection.
-  </para>
-  <para>
-   This is a shortcut for:
-   <code>Collection.find("_id = :id").bind("id", id).execute().fetchOne();</code>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      The document _id in the collection.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The collection object, or &null; if the _id does not match a document.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::getOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection->add('{"name": "Alfred", "age": 42, "job": "Butler"}')->execute();
-
-// A unique _id is (by default, and recommended) generated by MySQL Server
-// This retrieves the generated _id's; only one in this example, so $ids[0]
-$ids        = $result->getGeneratedIds();
-$alfreds_id = $ids[0];
-
-// ...
-
-print_r($alfreds_id);
-print_r($collection->getOne($alfreds_id));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-00005b6b536100000000000000b1
-
-Array
-(
-    [_id] => 00005b6b536100000000000000b1
-    [age] => 42
-    [job] => Butler
-    [name] => Alfred
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/getschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/getschema.xml
deleted file mode 100644
index fb0c93bc6335..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/getschema.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.getschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::getSchema</refname>
-  <refpurpose>Get schema object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Schema Object</type><methodname>mysql_xdevapi\Collection::getSchema</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the schema object that contains the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The schema object on success, or &null; if the object cannot be retrieved
-   for the given collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::getSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-var_dump($collection->getSchema());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Schema)#9 (1) {
-  ["name"]=>
-  string(11) "addressbook"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/getsession.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/getsession.xml
deleted file mode 100644
index 941eb242754f..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/getsession.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::getSession</refname>
-  <refpurpose>Get session object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Session</type><methodname>mysql_xdevapi\Collection::getSession</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get a new Session object from the Collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Session object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::getSession</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-// ...
-
-$newsession = $collection->getSession();
-
-var_dump($session);
-var_dump($newsession);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Session)#1 (0) {
-}
-object(mysql_xdevapi\Session)#4 (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/mysql_xdevapi/mysql_xdevapi/collection/modify.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/modify.xml
deleted file mode 100644
index f10bc00bf5c2..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/modify.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collection.modify" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::modify</refname>
-  <refpurpose>Modify collection documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\Collection::modify</methodname>
-   <methodparam><type>string</type><parameter>search_condition</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Modify the documents of a collection that meet specific search conditions.
-   Multiple operations are allowed, and parameter binding
-   is supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>search_condition</parameter></term>
-    <listitem>
-     <para>
-      Must be a valid SQL expression used to match the documents to modify.
-      This expression might be as simple as &true;, which matches all 
-      documents, or it might use functions and operators such as 
-      <code>'CAST(_id AS SIGNED) >= 10'</code>, 
-      <code>'age MOD 2 = 0 OR age MOD 3 = 0'</code>, or
-      <code>'_id IN ["2","5","7","10"]'</code>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If the operation is not executed, then the function will return 
-   a Modify object that can be used to add additional
-   modify operations.
-  </para>
-  <para>
-   If the modify operation is executed, then the returned object will contain
-   the result of the operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::modify</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$collection->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$collection->add('{"name": "Bob",    "age": 19, "job": "Painter"}')->execute();
-
-// Add two new jobs for all Painters: Artist and Crafter
-$collection
-  ->modify("job in ('Butler', 'Painter')")
-  ->arrayAppend('job', 'Artist')
-  ->arrayAppend('job', 'Crafter')
-  ->execute();
-
-// Remove the 'beer' field from all documents with the age 21
-$collection
-  ->modify('age < 21')
-  ->unset(['beer'])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/remove.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/remove.xml
deleted file mode 100644
index 902271d4979a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/remove.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collection.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::remove</refname>
-  <refpurpose>Remove collection documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionRemove</type><methodname>mysql_xdevapi\Collection::remove</methodname>
-   <methodparam><type>string</type><parameter>search_condition</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes documents of a collection that meet specific search conditions.
-   Multiple operations are allowed, and parameter binding is supported.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>search_condition</parameter></term>
-    <listitem>
-     <para>
-      Must be a valid SQL expression used to match the documents to remove.
-      This expression might be as simple as &true;, which matches all 
-      documents, or it might use functions and operators such as 
-      <code>'CAST(_id AS SIGNED) >= 10'</code>, 
-      <code>'age MOD 2 = 0 OR age MOD 3 = 0'</code>, or
-      <code>'_id IN ["2","5","7","10"]'</code>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If the operation is not executed, then the function will return 
-   a Remove object that can be used to add additional
-   remove operations.
-  </para>
-  <para>
-   If the remove operation is executed, then the returned object will contain
-   the result of the operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$collection->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$collection->add('{"name": "Bob",    "age": 19, "job": "Painter"}')->execute();
-
-// Remove all painters
-$collection
-  ->remove("job in ('Painter')")
-  ->execute();
-
-// Remove the oldest butler
-$collection
-  ->remove("job in ('Butler')")
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-
-// Remove record with highest age
-$collection
-  ->remove('true')
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/removeone.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/removeone.xml
deleted file mode 100644
index 054ff728bcb9..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/removeone.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.removeone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::removeOne</refname>
-  <refpurpose>Remove one collection document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Collection::removeOne</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Remove one document from the collection with the corresponding ID.
-   This is a shortcut for <code>Collection.remove("_id = :id").bind("id", id).execute()</code>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      The ID of the collection document to remove. Typically this is
-      the _id that was generated by MySQL Server when the record
-      was added.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object that can be used to query the number of affected items or the
-   number warnings generated by the operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::removeOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-
-// Normally the _id is known by other means, 
-// but for this example let's fetch the generated id and use it
-$ids       = $result->getGeneratedIds();
-$alfred_id = $ids[0];
-
-$result = $collection->removeOne($alfred_id);
-
-if(!$result->getAffectedItemsCount()) {
-    echo "Alfred with id $alfred_id was not removed.";
-} else {
-    echo "Goodbye, Alfred, you can take _id $alfred_id with you.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Goodbye, Alfred, you can take _id 00005b6b536100000000000000cb with you.
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collection/replaceone.xml b/reference/mysql_xdevapi/mysql_xdevapi/collection/replaceone.xml
deleted file mode 100644
index 2840989be668..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collection/replaceone.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collection.replaceone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Collection::replaceOne</refname>
-  <refpurpose>Replace one collection document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Collection::replaceOne</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>doc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Updates (or replaces) the document identified by ID, if it exists.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      ID of the document to replace or update. Typically this is
-      the _id that was generated by MySQL Server when the record
-      was added.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>doc</parameter></term>
-    <listitem>
-     <para>
-      Collection document to update or replace the document matching
-      the <option>id</option> parameter.
-     </para>
-     <para>
-      This document can be either a document object or a valid JSON string 
-      describing the new document.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object that can be used to query the number of affected items and the
-   number warnings generated by the operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::replaceOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-
-// Normally the _id is known by other means, 
-// but for this example let's fetch the generated id and use it
-$ids       = $result->getGeneratedIds();
-$alfred_id = $ids[0];
-
-// ...
-
-$alfred = $collection->getOne($alfred_id);
-$alfred['age'] = 81;
-$alfred['job'] = 'Guru';
-
-$collection->replaceOne($alfred_id, $alfred);
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionadd/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionadd/construct.xml
deleted file mode 100644
index 7448ec437b17..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionadd/construct.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionadd.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionAdd::__construct</refname>
-  <refpurpose>CollectionAdd constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\CollectionAdd::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Use to add a document to a collection; called from a Collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionAdd::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-// Add two documents
-$collection
-  ->add('{"name": "Fred",  "age": 21, "job": "Construction"}')
-  ->execute();
-
-$collection
-  ->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')
-  ->execute();
-
-// Add two documents using a single JSON object
-$result = $collection
-  ->add(
-    '{"name": "Bernie",
-      "jobs": [{"title":"Cat Herder","Salary":42000}, {"title":"Father","Salary":0}],
-      "hobbies": ["Sports","Making cupcakes"]}',
-    '{"name": "Jane",
-      "jobs": [{"title":"Scientist","Salary":18000}, {"title":"Mother","Salary":0}],
-      "hobbies": ["Walking","Making pies"]}')
-  ->execute();
-
-// Fetch a list of generated ID's from the last add()
-$ids = $result->getGeneratedIds();
-print_r($ids);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => 00005b6b53610000000000000056
-    [1] => 00005b6b53610000000000000057
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    A unique _id is generated by MySQL Server 8.0 or higher, as demonstrated 
-    in the example. The _id field must be manually defined if using
-    MySQL Server 5.7.
-   </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/mysql_xdevapi/mysql_xdevapi/collectionadd/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionadd/execute.xml
deleted file mode 100644
index b33eedce738f..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionadd/execute.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionadd.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionAdd::execute</refname>
-  <refpurpose>Execute the statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\CollectionAdd::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   The execute method is required to send the CRUD operation request
-   to the MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object that can be used to verify the status of the operation,
-   such as the number of affected rows.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionAdd::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-// Add two documents
-$collection
-  ->add('{"name": "Fred",  "age": 21, "job": "Construction"}')
-  ->execute();
-
-$collection
-  ->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')
-  ->execute();
-
-// Add two documents using a single JSON object
-$result = $collection
-  ->add(
-    '{"name": "Bernie",
-      "jobs": [{"title":"Cat Herder","Salary":42000}, {"title":"Father","Salary":0}],
-      "hobbies": ["Sports","Making cupcakes"]}',
-    '{"name": "Jane",
-      "jobs": [{"title":"Scientist","Salary":18000}, {"title":"Mother","Salary":0}],
-      "hobbies": ["Walking","Making pies"]}')
-  ->execute();
-
-// Fetch a list of generated ID's from the last add()
-$ids = $result->getGeneratedIds();
-print_r($ids);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => 00005b6b53610000000000000056
-    [1] => 00005b6b53610000000000000057
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/bind.xml
deleted file mode 100644
index fc81e9d2f222..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/bind.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::bind</refname>
-  <refpurpose>Bind value to query placeholder</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   It allows the user to bind a parameter to the placeholder in the search condition of the find operation.
-   The placeholder has the form of :NAME where ':' is a common prefix that must always exists before any NAME,
-   NAME is the actual name of the placeholder. The bind function accepts a list of placeholders if multiple
-   entities have to be substituted in the search condition.
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-      Values to substitute in the search condition; multiple values are allowed
-      and are passed as an array where "PLACEHOLDER_NAME => PLACEHOLDER_VALUE".
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object, 
-   or chain with execute() to return a Result object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-$result = $create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000cf"
-    ["age"]=>
-    int(18)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(6) "Alfred"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/construct.xml
deleted file mode 100644
index d235ebb5abf7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/construct.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::__construct</refname>
-  <refpurpose>CollectionFind constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\CollectionFind::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>CollectionFind example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-$result = $create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000cf"
-    ["age"]=>
-    int(18)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(6) "Alfred"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/execute.xml
deleted file mode 100644
index b6fbdfd58dd1..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/execute.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionfind.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::execute</refname>
-  <refpurpose>Execute the statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\DocResult</type><methodname>mysql_xdevapi\CollectionFind::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Execute the find operation;
-   this functionality allows for method chaining.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A <classname>mysql_xdevapi\DocResult</classname> object that can be used
-   to either fetch results from, or to query the status of the operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>CollectionFind example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000cf"
-    ["age"]=>
-    int(18)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(6) "Alfred"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/fields.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/fields.xml
deleted file mode 100644
index 12c863837d75..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/fields.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.fields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::fields</refname>
-  <refpurpose>Set document field filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::fields</methodname>
-   <methodparam><type>string</type><parameter>projection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Defines the columns for the query to return. If not defined,
-   all columns are used.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>projection</parameter></term>
-    <listitem>
-     <para>
-      Can either be a single string or an array of strings identifying the
-      columns to be returned for each document that match the search condition.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::fields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->fields('name')
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(1) {
-    ["name"]=>
-    string(6) "Alfred"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/groupby.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/groupby.xml
deleted file mode 100644
index d976ac3f8b00..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/groupby.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionfind.groupby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::groupBy</refname>
-  <refpurpose>Set grouping criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::groupBy</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function can be used to group the result set by one or more columns.
-   It is often used with aggregate functions such as <literal>COUNT</literal>,
-   <literal>MAX</literal>, <literal>MIN</literal>, <literal>SUM</literal> etc.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      The column or columns that have to be used for the group operation, this can either be a single string
-      or an array of string arguments, one for each column.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::groupBy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-// Assuming $coll is a valid Collection object
-
-// Extract all the documents from the Collection and group the results by the 'name' field
-$res = $coll->find()->groupBy('name')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/having.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/having.xml
deleted file mode 100644
index 5130619948ec..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/having.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.having" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::having</refname>
-  <refpurpose>Set condition for aggregate functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::having</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function can be used after the 'field' operation in order to make a selection on the documents to extract.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      This must be a valid SQL expression, the use of aggreate functions is allowed
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  CollectionFind object that can be used for further processing 
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::having</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-//Assuming $coll is a valid Collection object
-
-//Find all the documents for which the 'age' is greather than 40,
-//Only the columns 'name' and 'age' are returned in the Result object
-$res = $coll->find()->fields(['name','age'])->having('age > 40')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/limit.xml
deleted file mode 100644
index 9a6f6a60d2f6..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/limit.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::limit</refname>
-  <refpurpose>Limit number of returned documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the maximum number of documents to return.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      Maximum number of documents.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used for additional processing;
-   chain with the execute() method to return a DocResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-$create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-$create
-  ->add('{"name": "Reginald", "age": 42, "job": "Butler"}')
-  ->execute();
-
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000f3"
-    ["age"]=>
-    int(42)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(8) "Reginald"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/lockexclusive.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/lockexclusive.xml
deleted file mode 100644
index a328f4c77312..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/lockexclusive.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionfind.lockexclusive" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::lockExclusive</refname>
-  <refpurpose>Execute operation with EXCLUSIVE LOCK</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::lockExclusive</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>lock_waiting_option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Locks the document exclusively.
-   As long as the document is locked,
-   other transactions can't update the document,
-   use <code>SELECT ... LOCK IN SHARE MODE</code>,
-   or read the data in certain transaction isolation levels.
-   Consistent reads ignore any locks set on the records that exist in the read view.
-  </para>
-  <para>
-   To avoid concurrency problems, it makes sense to use this function with the
-   <methodname>mysql_xdevapi\Collection::modify</methodname> method. Essentially, this function uses row locks to serialise
-   access to rows.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lock_waiting_option</parameter></term>
-    <listitem>
-     <para>
-      Optional waiting option. By default it is <constant>MYSQLX_LOCK_DEFAULT</constant>. Valid values are these constants:
-     </para>
-     <itemizedlist>
-      <listitem><para><constant>MYSQLX_LOCK_DEFAULT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_NOWAIT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_SKIP_LOCKED</constant></para></listitem>
-     </itemizedlist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a CollectionFind object that can be used for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::lockExclusive</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$session->startTransaction();
-
-$result = $collection
-  ->find("age > 50")
-  ->lockExclusive()
-  ->execute();
-
-// ... do an operation on the object
-
-// Complete the transaction and unlock the document
-$session->commit();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/lockshared.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/lockshared.xml
deleted file mode 100644
index e8851ee99c61..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/lockshared.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionfind.lockshared" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::lockShared</refname>
-  <refpurpose>Execute operation with SHARED LOCK</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::lockShared</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>lock_waiting_option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Allows to share the documents between multiple transactions which are locking in shared mode.
-  </para>
-  <para>
-   Other sessions can read the rows, but cannot modify them until your transaction commits. 
-  </para>
-  <para>
-   If any of these rows were changed by another transaction that hasn't been committed,
-   the query will wait until that transaction has ended to be able to use the latest values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lock_waiting_option</parameter></term>
-    <listitem>
-     <para>
-      Optional waiting option. By default it is <constant>MYSQLX_LOCK_DEFAULT</constant>. Valid values are these constants:
-     </para>
-     <itemizedlist>
-      <listitem><para><constant>MYSQLX_LOCK_DEFAULT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_NOWAIT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_SKIP_LOCKED</constant></para></listitem>
-     </itemizedlist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used for further processing
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::lockShared</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$session->startTransaction();
-
-$result = $collection
-  ->find("age > 50")
-  ->lockShared()
-  ->execute();
-
-// ... read the object in shared mode
-
-// Complete the transaction and unlock the document
-$session->commit();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/offset.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/offset.xml
deleted file mode 100644
index 58b553e8a77c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/offset.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.offset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::offset</refname>
-  <refpurpose>Skip given number of elements to be returned</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::offset</methodname>
-   <methodparam><type>int</type><parameter>position</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Skip (offset) these number of elements that otherwise would be returned
-   by the find operation. Use with the limit() method.
-  </para>
-  <para>
-   Defining an offset larger than the result set size results in an empty set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-      Number of elements to skip for the limit() operation.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used for additional processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::offset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-$create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-$create
-  ->add('{"name": "Reginald", "age": 42, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find()
-  ->sort('age asc')
-  ->offset(1)
-  ->limit(1)
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000f3"
-    ["age"]=>
-    int(42)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(8) "Reginald"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionfind/sort.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/sort.xml
deleted file mode 100644
index e6ff0f006887..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionfind/sort.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionfind.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionFind::sort</refname>
-  <refpurpose>Set the sorting criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionFind</type><methodname>mysql_xdevapi\CollectionFind::sort</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sort the result set by the field selected in the sort_expr argument. The allowed
-   orders are ASC (Ascending) or DESC (Descending). This operation is equivalent to the 'ORDER BY' SQL operation
-   and it follows the same set of rules.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      One or more sorting expressions can be provided. The evaluation is from left to right,
-      and each expression is separated by a comma.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionFind object that can be used to execute the command, or to add additional operations.
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionFind::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-$create
-  ->add('{"name": "Alfred", "age": 18, "job": "Butler"}')
-  ->execute();
-$create
-  ->add('{"name": "Reginald", "age": 42, "job": "Butler"}')
-  ->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-$result = $collection
-  ->find()
-  ->sort('job desc', 'age asc')
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b53610000000000000106"
-    ["age"]=>
-    int(18)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(6) "Alfred"
-  }
-  [1]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b53610000000000000107"
-    ["age"]=>
-    int(42)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(8) "Reginald"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayappend.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayappend.xml
deleted file mode 100644
index cd2ee3337af4..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayappend.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.arrayappend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::arrayAppend</refname>
-  <refpurpose>Append element to an array field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::arrayAppend</methodname>
-   <methodparam><type>string</type><parameter>collection_field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expression_or_literal</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Add an element to a document's field, as multiple elements of a field are represented as an array.
-   Unlike arrayInsert(), arrayAppend() always appends the new element
-   at the end of the array, whereas arrayInsert() can define the location.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection_field</parameter></term>
-    <listitem>
-     <para>
-      The identifier of the field where the new element is inserted.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expression_or_literal</parameter></term>
-    <listitem>
-     <para>
-      The new element to insert at the end of the document field array.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object that can be used to execute the command, or to add additional operations.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::arrayAppend</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name in ('Bernie', 'Jane')")
-  ->arrayAppend('traits', 'Happy')
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b5361000000000000010c
-            [name] => Bernie
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Brother
-                    [2] => Human
-                    [3] => Happy
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayinsert.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayinsert.xml
deleted file mode 100644
index 3739603289c0..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/arrayinsert.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionmodify.arrayinsert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::arrayInsert</refname>
-  <refpurpose>Insert element into an array field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::arrayInsert</methodname>
-   <methodparam><type>string</type><parameter>collection_field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expression_or_literal</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds an element to a document's field, as multiple elements of a field are
-   represented as an array. Unlike
-   <methodname>mysql_xdevapi\CollectionModify::arrayAppend</methodname> this
-   method allows to specify where the new element is inserted by defining
-   which item it is after, whereas
-   <methodname>mysql_xdevapi\CollectionModify::arrayAppend</methodname> always
-   appends the new element at the end of the array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection_field</parameter></term>
-    <listitem>
-     <para>
-      Identifies the item in the array after which the new element will be inserted.
-      The format of this parameter is
-      <literal><replaceable>FIELD_NAME[ INDEX ]</replaceable></literal> where
-      <replaceable>FIELD_NAME</replaceable> is the name of the document field
-      to add the element to, and <replaceable>INDEX</replaceable>
-      is the INDEX of the element within the field.
-     </para>
-     <para>
-      The INDEX field is zero based, so the first item of the array has an index of 0.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expression_or_literal</parameter></term>
-    <listitem>
-     <para>
-      The new element to insert after FIELD_NAME[ INDEX ]
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object that can be used to execute the command, or to add additional operations
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::arrayInsert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name in ('Bernie', 'Jane')")
-  ->arrayInsert('traits[1]', 'Happy')
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b5361000000000000010d
-            [name] => Bernie
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Happy
-                    [2] => Brother
-                    [3] => Human
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/bind.xml
deleted file mode 100644
index b2f9a9ae6475..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/bind.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::bind</refname>
-  <refpurpose>Bind value to query placeholder</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Bind a parameter to the placeholder in the search condition of the modify operation.
-  </para>
-  <para>
-   The placeholder has the form of :NAME where ':' is a common prefix that must always exists before any NAME
-   where NAME is the name of the placeholder. The bind method accepts a list of placeholders if multiple
-   entities have to be substituted in the search condition of the modify operation.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-      Placeholder values to substitute in the search condition. Multiple values are allowed
-      and have to be passed as an array of mappings PLACEHOLDER_NAME->PLACEHOLDER_VALUE.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object that can be used to execute the command, or to add additional operations.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name = :name")
-  ->bind(['name' => 'Bernie'])
-  ->arrayAppend('traits', 'Happy')
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b53610000000000000110
-            [name] => Bernie
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Brother
-                    [2] => Human
-                    [3] => Happy
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/construct.xml
deleted file mode 100644
index 8cf5e2cc42cf..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/construct.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::__construct</refname>
-  <refpurpose>CollectionModify constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\CollectionModify::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Modifies (updates) a collection and is instantiated by the
-   <methodname>mysql_xdevapi\Collection::modify</methodname> method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name in ('Bernie', 'Jane')")
-  ->arrayAppend('traits', 'Happy')
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b5361000000000000010c
-            [name] => Bernie
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Brother
-                    [2] => Human
-                    [3] => Happy
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/execute.xml
deleted file mode 100644
index 8e75a0fa9034..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/execute.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::execute</refname>
-  <refpurpose>Execute modify operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\CollectionModify::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   The execute method is required to send the CRUD operation request
-   to the MySQL server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object that can be used to verify the status of the operation,
-   such as the number of affected rows.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/limit.xml
deleted file mode 100644
index 8654ab410261..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/limit.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::limit</refname>
-  <refpurpose>Limit number of modified documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Limit the number of documents modified by this operation.
-   Optionally combine with skip() to define an offset value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of documents to modify.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$collection->add('{"name": "Fred",  "age": 21, "job": "Construction"}')->execute();
-$collection->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-$collection->add('{"name": "Betty", "age": 24, "job": "Teacher"}')->execute();
-
-$collection
-  ->modify("job = :job")
-  ->bind(['job' => 'Teacher'])
-  ->set('job', 'Principal')
-  ->limit(1)
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b53610000000000000118
-            [age] => 21
-            [job] => Construction
-            [name] => Fred
-        )
-    [1] => Array
-        (
-            [_id] => 00005b6b53610000000000000119
-            [age] => 23
-            [job] => Principal
-            [name] => Wilma
-        )
-    [2] => Array
-        (
-            [_id] => 00005b6b5361000000000000011a
-            [age] => 24
-            [job] => Teacher
-            [name] => Betty
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/patch.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/patch.xml
deleted file mode 100644
index f0a5cd577267..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/patch.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionmodify.patch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::patch</refname>
-  <refpurpose>Patch document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::patch</methodname>
-   <methodparam><type>string</type><parameter>document</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Takes a patch object and applies it on one or more documents, and
-   can update multiple document properties.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>document</parameter></term>
-    <listitem>
-     <para>
-      A document with the properties to apply to the matching documents.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::patch</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->modify('"Programmatore" IN job')->patch('{"Hobby" : "Programmare"}')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/replace.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/replace.xml
deleted file mode 100644
index bab259cbc042..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/replace.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.replace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::replace</refname>
-  <refpurpose>Replace document field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::replace</methodname>
-   <methodparam><type>string</type><parameter>collection_field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expression_or_literal</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Replace (update) a given field value with a new one.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection_field</parameter></term>
-    <listitem>
-     <para>
-      The document path of the item to set.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expression_or_literal</parameter></term>
-    <listitem>
-     <para>
-     The value to set on the specified attribute.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::replace</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name = :name")
-  ->bind(['name' => 'Bernie'])
-  ->replace("name", "Bern")
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b5361000000000000011b
-            [name] => Bern
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Brother
-                    [2] => Human
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/set.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/set.xml
deleted file mode 100644
index 9eca3fd2aa5b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/set.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionmodify.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::set</refname>
-  <refpurpose>Set document attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::set</methodname>
-   <methodparam><type>string</type><parameter>collection_field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expression_or_literal</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets or updates attributes on documents in a collection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection_field</parameter></term>
-    <listitem>
-     <para>
-     The document path (name) of the item to set.
-    </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expression_or_literal</parameter></term>
-    <listitem>
-     <para>
-      The value to set it to.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::set</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$result = $collection
-  ->add(
-  '{"name":   "Bernie",
-    "traits": ["Friend", "Brother", "Human"]}') 
-  ->execute();
-
-$collection
-  ->modify("name = :name")
-  ->bind(['name' => 'Bernie'])
-  ->set("name", "Bern")
-  ->execute();
-
-$result = $collection
-  ->find()
-  ->execute();
-
-print_r($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [_id] => 00005b6b53610000000000000111
-            [name] => Bern
-            [traits] => Array
-                (
-                    [0] => Friend
-                    [1] => Brother
-                    [2] => Human
-                )
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/skip.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/skip.xml
deleted file mode 100644
index 2e006364cbf9..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/skip.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionmodify.skip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::skip</refname>
-  <refpurpose>Skip elements</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::skip</methodname>
-   <methodparam><type>int</type><parameter>position</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Skips the first N elements that would otherwise be returned by a find operation.
-   If the number of elements skipped is larger than the size of the result set,
-   then the find operation returns an empty set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-      Number of elements to skip.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionModify object to use for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::skip</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$coll->modify('age > :age')->sort('age desc')->unset(['age'])->bind(['age' => 20])->limit(4)->skip(1)->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/sort.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/sort.xml
deleted file mode 100644
index 6bc4f9d2e5cd..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/sort.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionmodify.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::sort</refname>
-  <refpurpose>Set the sorting criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::sort</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sorts the result set by the field selected in the sort_expr argument. The allowed
-   orders are ASC (Ascending) or DESC (Descending). This operation is equivalent to the 'ORDER BY' SQL operation
-   and it follows the same set of rules.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      One or more sort expressions can be provided. The evaluation is from
-      left to right and each expression must be separated by a comma.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   CollectionModify object that can be used for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->modify('true')->sort('name desc', 'age asc')->limit(4)->set('Married', 'NO')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionmodify/unset.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/unset.xml
deleted file mode 100644
index 48f8f14672cc..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionmodify/unset.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-collectionmodify.unset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionModify::unset</refname>
-  <refpurpose>Unset the value of document fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionModify</type><methodname>mysql_xdevapi\CollectionModify::unset</methodname>
-   <methodparam><type>array</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes attributes from documents in a collection.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-      The attributes to remove from documents in a collection.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   CollectionModify object that can be used for further processing.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionModify::unset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->modify('job like :job_name')->unset(["age", "name"])->bind(['job_name' => 'Plumber'])->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionremove/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/bind.xml
deleted file mode 100644
index 17e50ec9d9de..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/bind.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionremove.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionRemove::bind</refname>
-  <refpurpose>Bind value to placeholder</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionRemove</type><methodname>mysql_xdevapi\CollectionRemove::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Bind a parameter to the placeholder in the search condition of the remove operation.
-  </para>
-  <para>
-   The placeholder has the form of :NAME where ':' is a common prefix that must always exists before any NAME
-   where NAME is the name of the placeholder. The bind method accepts a list of placeholders if multiple
-   entities have to be substituted in the search condition of the remove operation.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-      Placeholder values to substitute in the search condition. Multiple values are allowed
-      and have to be passed as an array of mappings PLACEHOLDER_NAME->PLACEHOLDER_VALUE.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionRemove object that can be used to execute the command, or to add additional operations.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionRemove::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->remove('age > :age_from and age < :age_to')->bind(['age_from' => 20, 'age_to' => 50])->limit(7)->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionremove/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/construct.xml
deleted file mode 100644
index 70b7e0ae22ef..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/construct.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionremove.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionRemove::__construct</refname>
-  <refpurpose>CollectionRemove constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\CollectionRemove::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Removes collection documents and is instantiated by the
-   <methodname>mysql_xdevapi\Collection::remove</methodname> method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Collection::remove</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("people");
-
-$collection->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$collection->add('{"name": "Bob",    "age": 19, "job": "Painter"}')->execute();
-
-// Remove all painters
-$collection
-  ->remove("job in ('Painter')")
-  ->execute();
-
-// Remove the oldest butler
-$collection
-  ->remove("job in ('Butler')")
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-
-// Remove record with lowest age
-$collection
-  ->remove('true')
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionremove/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/execute.xml
deleted file mode 100644
index c61f65d1079b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/execute.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionremove.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionRemove::execute</refname>
-  <refpurpose>Execute remove operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\CollectionRemove::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   The execute function needs to be invoked in order to trigger the client to send the CRUD operation request to the server.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Result object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionRemove::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->remove('true')->sort('age desc')->limit(2)->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionremove/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/limit.xml
deleted file mode 100644
index 7ba407ece86e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/limit.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionremove.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionRemove::limit</refname>
-  <refpurpose>Limit number of documents to remove</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionRemove</type><methodname>mysql_xdevapi\CollectionRemove::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of documents to remove.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of documents to remove.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a CollectionRemove object that can be used to execute the command,
-   or to add additional operations.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionRemove::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->remove('job in (\'Barista\', \'Programmatore\', \'Ballerino\', \'Programmatrice\')')->limit(5)->sort(['age desc', 'name asc'])->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/collectionremove/sort.xml b/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/sort.xml
deleted file mode 100644
index cd14ec6a275e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/collectionremove/sort.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-collectionremove.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CollectionRemove::sort</refname>
-  <refpurpose>Set the sorting criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\CollectionRemove</type><methodname>mysql_xdevapi\CollectionRemove::sort</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sort the result set by the field selected in the sort_expr argument. The allowed
-   orders are ASC (Ascending) or DESC (Descending). This operation is equivalent to the 'ORDER BY' SQL operation
-   and it follows the same set of rules.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      One or more sorting expressions can be provided. The evaluation is from left to right,
-      and each expression is separated by a comma.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CollectionRemove object that can be used to execute the command, or to add additional operations.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CollectionRemove::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->remove('true')->sort('age desc')->limit(2)->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/construct.xml
deleted file mode 100644
index 11b56891262e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/construct.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::__construct</refname>
-  <refpurpose>ColumnResult constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\ColumnResult::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Retrieves column metadata, such as its character set; this is instantiated
-   by the <methodname>mysql_xdevapi\RowResult::getColumns</methodname> method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS nonsense")->execute();
-$session->sql("CREATE DATABASE nonsense")->execute();
-$session->sql("CREATE TABLE nonsense.numbers (hello int, world float unsigned)")->execute();
-$session->sql("INSERT INTO  nonsense.numbers values (42, 42)")->execute();
-
-$schema = $session->getSchema("nonsense");
-$table  = $schema->getTable("numbers");
-
-$result1 = $table->select('hello','world')->execute();
-
-// Returns an array of ColumnResult objects
-$columns = $result1->getColumns(); 
-
-foreach ($columns as $column) {
-    echo "\nColumn label " , $column->getColumnLabel();
-    echo " is type "       , $column->getType();
-    echo " and is ", ($column->isNumberSigned() === 0) ? "unsigned." : "signed.";
-}
-
-// Alternatively
-$result2 = $session->sql("SELECT * FROM nonsense.numbers")->execute();
-
-// Returns an array of FieldMetadata objects
-print_r($result2->getColumns()); 
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-Column label hello is type 19 and is signed.
-Column label world is type 4  and is unsigned.
-
-Array
-(
-    [0] => mysql_xdevapi\FieldMetadata Object
-        (
-            [type] => 1
-            [type_name] => SINT
-            [name] => hello
-            [original_name] => hello
-            [table] => numbers
-            [original_table] => numbers
-            [schema] => nonsense
-            [catalog] => def
-            [collation] => 0
-            [fractional_digits] => 0
-            [length] => 11
-            [flags] => 0
-            [content_type] => 0
-        )
-    [1] => mysql_xdevapi\FieldMetadata Object
-        (
-            [type] => 6
-            [type_name] => FLOAT
-            [name] => world
-            [original_name] => world
-            [table] => numbers
-            [original_table] => numbers
-            [schema] => nonsense
-            [catalog] => def
-            [collation] => 0
-            [fractional_digits] => 31
-            [length] => 12
-            [flags] => 1
-            [content_type] => 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/mysql_xdevapi/mysql_xdevapi/columnresult/getcharactersetname.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcharactersetname.xml
deleted file mode 100644
index e2ceb9c31623..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcharactersetname.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getcharactersetname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getCharacterSetName</refname>
-  <refpurpose>Get character set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getCharacterSetName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getCharacterSetName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getcollationname.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcollationname.xml
deleted file mode 100644
index 9a3ea337f3ca..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcollationname.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getcollationname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getCollationName</refname>
-  <refpurpose>Get collation name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getCollationName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getCollationName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnlabel.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnlabel.xml
deleted file mode 100644
index 2ef90221ecda..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnlabel.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getcolumnlabel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getColumnLabel</refname>
-  <refpurpose>Get column label</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getColumnLabel</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getColumnLabel</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnname.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnname.xml
deleted file mode 100644
index 701746b8d396..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getcolumnname.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getcolumnname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getColumnName</refname>
-  <refpurpose>Get column name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getColumnName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getColumnName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getfractionaldigits.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getfractionaldigits.xml
deleted file mode 100644
index 70064d1c5664..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getfractionaldigits.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getfractionaldigits" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getFractionalDigits</refname>
-  <refpurpose>Get fractional digit length</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\ColumnResult::getFractionalDigits</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch the number of fractional digits for column.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getFractionalDigits</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getlength.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getlength.xml
deleted file mode 100644
index ca3dab2d5f87..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getlength.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getLength</refname>
-  <refpurpose>Get column field length</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\ColumnResult::getLength</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getLength</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/getschemaname.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getschemaname.xml
deleted file mode 100644
index ba0937baedae..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/getschemaname.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.getschemaname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getSchemaName</refname>
-  <refpurpose>Get schema name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getSchemaName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Fetch the schema name where the column is stored.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getSchemaName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/gettablelabel.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettablelabel.xml
deleted file mode 100644
index 10b284981498..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettablelabel.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.gettablelabel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getTableLabel</refname>
-  <refpurpose>Get table label</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getTableLabel</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getTableLabel</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/gettablename.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettablename.xml
deleted file mode 100644
index bbcfb0d7d55b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettablename.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.gettablename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getTableName</refname>
-  <refpurpose>Get table name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\ColumnResult::getTableName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Name of the table for the column.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getTableName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/gettype.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettype.xml
deleted file mode 100644
index aef5b09fed24..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/gettype.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::getType</refname>
-  <refpurpose>Get column type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\ColumnResult::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::getType</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/isnumbersigned.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/isnumbersigned.xml
deleted file mode 100644
index b9d7c9567e06..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/isnumbersigned.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.isnumbersigned" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::isNumberSigned</refname>
-  <refpurpose>Check if signed type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\ColumnResult::isNumberSigned</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves a table's column information and is instantiated by the
-   <methodname>mysql_xdevapi\RowResult::getColumns</methodname> method.
-  </para>
-  
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; if a given column has a signed type.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::isNumberSigned</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/columnresult/ispadded.xml b/reference/mysql_xdevapi/mysql_xdevapi/columnresult/ispadded.xml
deleted file mode 100644
index d35395440257..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/columnresult/ispadded.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-columnresult.ispadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ColumnResult::isPadded</refname>
-  <refpurpose>Check if padded</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\ColumnResult::isPadded</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if a given column is padded.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\ColumnResult::isPadded</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/crudoperationbindable/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/crudoperationbindable/bind.xml
deleted file mode 100644
index 9b1e82990595..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/crudoperationbindable/bind.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-crudoperationbindable.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CrudOperationBindable::bind</refname>
-  <refpurpose>Bind value to placeholder</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\CrudOperationBindable</type><methodname>mysql_xdevapi\CrudOperationBindable::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Binds a value to a specific placeholder.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-      The name of the placeholders and the values to bind.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CrudOperationBindable object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CrudOperationBindable::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->modify('name like :name')->arrayInsert('job[0]', 'Calciatore')->bind(['name' => 'ENTITY'])->execute();
-$res = $table->delete()->orderby('age desc')->where('age < 20 and age > 12 and name != :name')->bind(['name' => 'Tierney'])->limit(2)->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/crudoperationlimitable/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/crudoperationlimitable/limit.xml
deleted file mode 100644
index a0c9da170b47..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/crudoperationlimitable/limit.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-crudoperationlimitable.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CrudOperationLimitable::limit</refname>
-  <refpurpose>Set result limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\CrudOperationLimitable</type><methodname>mysql_xdevapi\CrudOperationLimitable::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of records or documents to return.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of records or documents.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CrudOperationLimitable object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CrudOperationLimitable::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->find()->fields(['name as n','age as a','job as j'])->groupBy('j')->limit(11)->execute();
-$res = $table->update()->set('age',69)->where('age > 15 and age < 22')->limit(4)->orderby(['age asc','name desc'])->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/crudoperationskippable/skip.xml b/reference/mysql_xdevapi/mysql_xdevapi/crudoperationskippable/skip.xml
deleted file mode 100644
index 83b36aa131fe..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/crudoperationskippable/skip.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-crudoperationskippable.skip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CrudOperationSkippable::skip</refname>
-  <refpurpose>Number of operations to skip</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\CrudOperationSkippable</type><methodname>mysql_xdevapi\CrudOperationSkippable::skip</methodname>
-   <methodparam><type>int</type><parameter>skip</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Skip this number of records in the returned operation.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>skip</parameter></term>
-    <listitem>
-     <para>
-      Number of elements to skip.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CrudOperationSkippable object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CrudOperationSkippable::skip</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->find('job like \'Programmatore\'')->limit(1)->skip(3)->sort('age asc')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/crudoperationsortable/sort.xml b/reference/mysql_xdevapi/mysql_xdevapi/crudoperationsortable/sort.xml
deleted file mode 100644
index e9c642eba348..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/crudoperationsortable/sort.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-crudoperationsortable.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>CrudOperationSortable::sort</refname>
-  <refpurpose>Sort results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\CrudOperationSortable</type>
-   <methodname>mysql_xdevapi\CrudOperationSortable::sort</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sort the result set by the field selected in the sort_expr argument. The allowed
-   orders are ASC (Ascending) or DESC (Descending). This operation is equivalent to the 'ORDER BY' SQL operation
-   and it follows the same set of rules.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      One or more sorting expressions can be provided. The evaluation is from left to right,
-      and each expression is separated by a comma.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A CrudOperationSortable object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\CrudOperationSortable::sort</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$res = $coll->find('job like \'Cavia\'')->sort('age desc', '_id desc')->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/databaseobject/existsindatabase.xml b/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/existsindatabase.xml
deleted file mode 100644
index 72c64326643f..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/existsindatabase.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-databaseobject.existsindatabase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DatabaseObject::existsInDatabase</refname>
-  <refpurpose>Check if object exists in database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\DatabaseObject::existsInDatabase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Verifies if the database object refers to an object that exists in the database.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if object exists in the database, else &false; if it does not.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DatabaseObject::existsInDatabase</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$existInDb = $dbObj->existsInDatabase();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/databaseobject/getname.xml b/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/getname.xml
deleted file mode 100644
index c4e13be793c6..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/getname.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-databaseobject.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DatabaseObject::getName</refname>
-  <refpurpose>Get object name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\DatabaseObject::getName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch name of this database object.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The name of this database object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DatabaseObject::getName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dbObjName = $dbObj->getName();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/databaseobject/getsession.xml b/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/getsession.xml
deleted file mode 100644
index 72afb71e41ce..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/databaseobject/getsession.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-databaseobject.getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DatabaseObject::getSession</refname>
-  <refpurpose>Get session name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\Session</type><methodname>mysql_xdevapi\DatabaseObject::getSession</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch session associated to the database object.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The Session object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DatabaseObject::getSession</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$session = $dbObj->getSession();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/docresult/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/construct.xml
deleted file mode 100644
index 88551a9923c7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/construct.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-docresult.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DocResult::__construct</refname>
-  <refpurpose>DocResult constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\DocResult::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Fetch document results and warnings, 
-   and is instantiated by CollectionFind.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A DocResult example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$create->add('{"name": "Reginald", "age": 42, "job": "Butler"}')->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// Yields a DocResult object
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->limit(1)
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b536100000000000000f3"
-    ["age"]=>
-    int(42)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(8) "Reginald"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/docresult/fetchall.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/fetchall.xml
deleted file mode 100644
index e1c1fdd946ff..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/fetchall.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-docresult.fetchall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DocResult::fetchAll</refname>
-  <refpurpose>Get all rows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\DocResult::fetchAll</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch all results from a result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A numerical array with all results from the query; each result is
-   an associative array. An empty array is returned if no
-   rows are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DocResult::fetchAll</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$create->add('{"name": "Reginald", "age": 42, "job": "Butler"}')->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// Yields a DocResult object
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->execute();
-
-var_dump($result->fetchAll());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-
-  [0]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b53610000000000000123"
-    ["age"]=>
-    int(42)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(8) "Reginald"
-  }
-
-  [1]=>
-  array(4) {
-    ["_id"]=>
-    string(28) "00005b6b53610000000000000122"
-    ["age"]=>
-    int(18)
-    ["job"]=>
-    string(6) "Butler"
-    ["name"]=>
-    string(6) "Alfred"
-  }
-
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/docresult/fetchone.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/fetchone.xml
deleted file mode 100644
index 42a0cf0ff54a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/fetchone.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-docresult.fetchone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DocResult::fetchOne</refname>
-  <refpurpose>Get one row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\DocResult::fetchOne</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch one result from a result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The result, as an associative array 
-   or &null; if no results are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DocResult::fetchOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$create->add('{"name": "Reginald", "age": 42, "job": "Butler"}')->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// Yields a DocResult object
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->execute();
-
-var_dump($result->fetchOne());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(4) {
-  ["_id"]=>
-  string(28) "00005b6b53610000000000000125"
-  ["age"]=>
-  int(42)
-  ["job"]=>
-  string(6) "Butler"
-  ["name"]=>
-  string(8) "Reginald"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/docresult/getwarnings.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarnings.xml
deleted file mode 100644
index adcdebce17af..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarnings.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-docresult.getwarnings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DocResult::getWarnings</refname>
-  <refpurpose>Get warnings from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Array</type><methodname>mysql_xdevapi\DocResult::getWarnings</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetches warnings generated by MySQL server's last operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of Warning objects from the last operation. Each object
-   defines an error 'message', error 'level', and error 'code'. An empty
-   array is returned if no errors are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DocResult::getWarnings</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$create->add('{"name": "Reginald", "age": 42, "job": "Butler"}')->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// Yields a DocResult object
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->execute();
-
-if (!$result->getWarningsCount()) {
-    echo "There was an error:\n";
-    print_r($result->getWarnings());
-    exit;
-}
-
-var_dump($result->fetchOne());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-There was an error:
-
-Array
-(
-    [0] => mysql_xdevapi\Warning Object
-        (
-            [message] => Something bad and so on
-            [level] => 2
-            [code] => 1365
-        )
-    [1] => mysql_xdevapi\Warning Object
-        (
-            [message] => Something bad and so on
-            [level] => 2
-            [code] => 1365
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml
deleted file mode 100644
index 2da360f981b9..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/docresult/getwarningscount.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-docresult.getwarningscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>DocResult::getWarningsCount</refname>
-  <refpurpose>Get warning count from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\DocResult::getWarningsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of warnings raised by the last operation. Specifically, 
-   these warnings are raised by the MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of warnings from the last operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\DocResult::getWarningsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$create->add('{"name": "Alfred", "age": 18, "job": "Butler"}')->execute();
-$create->add('{"name": "Reginald", "age": 42, "job": "Butler"}')->execute();
-
-// ...
-
-$collection = $schema->getCollection("people");
-
-// Yields a DocResult object
-$result = $collection
-  ->find('job like :job and age > :age')
-  ->bind(['job' => 'Butler', 'age' => 16])
-  ->sort('age desc')
-  ->execute();
-
-if (!$result->getWarningsCount()) {
-    echo "There was an error:\n";
-    print_r($result->getWarnings());
-    exit;
-}
-
-var_dump($result->fetchOne());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(4) {
-  ["_id"]=>
-  string(28) "00005b6b53610000000000000135"
-  ["age"]=>
-  int(42)
-  ["job"]=>
-  string(6) "Butler"
-  ["name"]=>
-  string(8) "Reginald"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/executable/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/executable/execute.xml
deleted file mode 100644
index 77a620df0541..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/executable/execute.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-executable.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Executable::execute</refname>
-  <refpurpose>Execute statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Executable::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Execute the statement from either a collection operation or a table query;
-   this functionality allows for method chaining.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   One of the Result objects, such as Result or SqlStatementResult.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>execute() examples</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$result_sql = $session->sql("CREATE DATABASE addressbook")->execute();
-
-var_dump($result_sql);
-
-
-$schema     = $session->getSchema("addressbook");
-$collection = $schema->createCollection("humans");
-
-$result_collection = $collection->add(
-  '{"name": "Jane",
-    "jobs": [{"title":"Scientist","Salary":18000}, {"title":"Mother","Salary":0}],
-    "hobbies": ["Walking","Making pies"]}');
-
-$result_collection_executed = $result_collection->execute();
-
-var_dump($result_collection);
-var_dump($result_collection_executed);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\SqlStatementResult)#3 (0) {
-}
-
-object(mysql_xdevapi\CollectionAdd)#5 (0) {
-}
-
-object(mysql_xdevapi\Result)#7 (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/mysql_xdevapi/mysql_xdevapi/executionstatus/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/executionstatus/construct.xml
deleted file mode 100644
index a5f80923998c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/executionstatus/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-executionstatus.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ExecutionStatus::__construct</refname>
-  <refpurpose>ExecutionStatus constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\ExecutionStatus::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>mysql_xdevapi\ExecutionStatus::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/expression/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/expression/construct.xml
deleted file mode 100644
index e7578e1bb75e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/expression/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-expression.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Expression::__construct</refname>
-  <refpurpose>Expression constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>mysql_xdevapi\Expression::__construct</methodname>
-   <methodparam><type>string</type><parameter>expression</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>expression</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>mysql_xdevapi\Expression::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/result/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/construct.xml
deleted file mode 100644
index 27a19c014fbf..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/construct.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::__construct</refname>
-  <refpurpose>Result constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Result::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   An object that retrieves generated IDs, AUTO_INCREMENT values, and warnings,
-   for a Result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Result::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("
-  CREATE TABLE addressbook.names
-    (id INT NOT NULL AUTO_INCREMENT, name VARCHAR(30), age INT, PRIMARY KEY (id))
-  ")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->insert("name", "age")->values(["Suzanne", 31],["Julie", 43])->execute();
-$result = $table->insert("name", "age")->values(["Suki", 34])->execute();
-
-$ai = $result->getAutoIncrementValue();
-var_dump($ai);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/result/getaffecteditemscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getaffecteditemscount.xml
deleted file mode 100644
index e1fe71a3de8d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/getaffecteditemscount.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.getaffecteditemscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::getAffectedItemsCount</refname>
-  <refpurpose>Get affected row count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Result::getAffectedItemsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the number of affected rows by the previous operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number (as an integer) of affected rows.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Result::getAffectedItemsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-$result = $collection->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-
-var_dump( $res->getAffectedItemsCount() );
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/mysql_xdevapi/mysql_xdevapi/result/getautoincrementvalue.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getautoincrementvalue.xml
deleted file mode 100644
index 9b62b24a5db9..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/getautoincrementvalue.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.getautoincrementvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::getAutoIncrementValue</refname>
-  <refpurpose>Get autoincremented value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Result::getAutoIncrementValue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the last AUTO_INCREMENT value (last insert id).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The last AUTO_INCREMENT value.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Result::getAutoIncrementValue</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("
-  CREATE TABLE addressbook.names
-    (id INT NOT NULL AUTO_INCREMENT, name VARCHAR(30), age INT, PRIMARY KEY (id))
-  ")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->insert("name", "age")->values(["Suzanne", 31],["Julie", 43])->execute();
-$result = $table->insert("name", "age")->values(["Suki", 34])->execute();
-
-$ai = $result->getAutoIncrementValue();
-var_dump($ai);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(3)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/result/getgeneratedids.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getgeneratedids.xml
deleted file mode 100644
index f947c36ab97a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/getgeneratedids.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.getgeneratedids" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::getGeneratedIds</refname>
-  <refpurpose>Get generated ids</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Result::getGeneratedIds</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch the generated _id values from the last operation. 
-   The unique _id field is generated by the MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of generated _id's from the last operation, 
-   or an empty array if there are none.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Result::getGeneratedIds</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema = $session->getSchema("addressbook");
-$create = $schema->createCollection("people");
-
-$collection = $schema->getCollection("people");
-
-$result = $collection->add(
-  '{"name": "Bernie",
-    "jobs": [{"title":"Cat Herder","Salary":42000}, {"title":"Father","Salary":0}],
-    "hobbies": ["Sports","Making cupcakes"]}',
-  '{"name": "Jane",
-    "jobs": [{"title":"Scientist","Salary":18000}, {"title":"Mother","Salary":0}],
-    "hobbies": ["Walking","Making pies"]}')->execute();
-
-$ids = $result->getGeneratedIds();
-var_dump($ids);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  string(28) "00005b6b53610000000000000064"
-  [1]=>
-  string(28) "00005b6b53610000000000000065"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/result/getwarnings.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getwarnings.xml
deleted file mode 100644
index 2271b26339b1..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/getwarnings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.getwarnings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::getWarnings</refname>
-  <refpurpose>Get warnings from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Result::getWarnings</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve warnings from the last Result operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of Warning objects from the last operation. Each object
-   defines an error 'message', error 'level', and error 'code'. An
-   empty array is returned if no errors are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarnings</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-$warnings = $res->getWarnings();
-
-print_r($warnings);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-    [1] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml
deleted file mode 100644
index ac7a3077733a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/result/getwarningscount.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-result.getwarningscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Result::getWarningsCount</refname>
-  <refpurpose>Get warning count from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Result::getWarningsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the number of warnings from the last Result operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of warnings generated by the last operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarningsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS foo")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-
-echo $res->getWarningsCount();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-2
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/construct.xml
deleted file mode 100644
index 8f41e374f695..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/construct.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::__construct</refname>
-  <refpurpose>RowResult constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\RowResult::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-    Represents the result set obtained from querying the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$row = $table->select('name', 'age')->where('age > 18')->execute()->fetchAll();
-
-print_r($row);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 33
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/fetchall.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/fetchall.xml
deleted file mode 100644
index 44762f8afacd..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/fetchall.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.fetchall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::fetchAll</refname>
-  <refpurpose>Get all rows from result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\RowResult::fetchAll</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch all the rows from the result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A numerical array with all results from the query; each result is
-   an associative array. An empty array is returned if no
-   rows are present.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::fetchAll</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$row = $table->select('name', 'age')->execute()->fetchAll();
-
-print_r($row);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 33
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/fetchone.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/fetchone.xml
deleted file mode 100644
index 68f29b7c4107..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/fetchone.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.fetchone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::fetchOne</refname>
-  <refpurpose>Get row from result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\RowResult::fetchOne</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch one result from the result set.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The result, as an associative array 
-   or &null; if no results are present.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::fetchOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$row = $table->select('name', 'age')->where('age < 40')->execute()->fetchOne();
-
-print_r($row);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [name] => Sam
-    [age] => 33
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml
deleted file mode 100644
index c52e404899cb..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumncount.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.getcolumncount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::getColumnsCount</refname>
-  <refpurpose>Get column count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\RowResult::getColumnsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the column count for columns present in the result set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of columns; 0 if there are none.
-  </para>
- </refsect1>
-
-<refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable xml:id="mysql-xdevapi-rowresult.getcolumncount.changelog">
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.0.14</entry>
-      <entry>
-       Method renamed from getColumnCount() to getColumnsCount().
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getColumnsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE addressbook")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$sql = $session->sql("SELECT * from addressbook.names")->execute();
-
-echo $sql->getColumnsCount();
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-2
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumnnames.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumnnames.xml
deleted file mode 100644
index f33515f7bfbc..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumnnames.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.getcolumnnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::getColumnNames</refname>
-  <refpurpose>Get all column names</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\RowResult::getColumnNames</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve column names for columns present in the result set.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A numerical array of table columns names,
-   or an empty array if the result set is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getColumnNames</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE addressbook")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$sql = $session->sql("SELECT * from addressbook.names")->execute();
-
-$colnames = $sql->getColumnNames();
-  
-print_r($colnames);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => name
-    [1] => age
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumns.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumns.xml
deleted file mode 100644
index f98ea68549f6..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getcolumns.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.getcolumns" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::getColumns</refname>
-  <refpurpose>Get column metadata</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\RowResult::getColumns</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve column metadata for columns present in the result set.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of FieldMetadata objects representing the columns in the result, 
-   or an empty array if the result set is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getColumns</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE addressbook")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$sql = $session->sql("SELECT * from addressbook.names")->execute();
-
-$cols = $sql->getColumns();
-  
-print_r($cols);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\FieldMetadata Object
-        (
-            [type] => 7
-            [type_name] => BYTES
-            [name] => name
-            [original_name] => name
-            [table] => names
-            [original_table] => names
-            [schema] => addressbook
-            [catalog] => def
-            [collation] => 255
-            [fractional_digits] => 0
-            [length] => 65535
-            [flags] => 0
-            [content_type] => 0
-        )
-    [1] => mysql_xdevapi\FieldMetadata Object
-        (
-            [type] => 1
-            [type_name] => SINT
-            [name] => age
-            [original_name] => age
-            [table] => names
-            [original_table] => names
-            [schema] => addressbook
-            [catalog] => def
-            [collation] => 0
-            [fractional_digits] => 0
-            [length] => 11
-            [flags] => 0
-            [content_type] => 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/mysql_xdevapi/mysql_xdevapi/rowresult/getwarnings.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getwarnings.xml
deleted file mode 100644
index a6bbe8f423c3..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getwarnings.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.getwarnings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::getWarnings</refname>
-  <refpurpose>Get warnings from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\RowResult::getWarnings</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve warnings from the last RowResult operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of Warning objects from the last operation. Each object
-   defines an error 'message', error 'level', and error 'code'. An empty
-   array is returned if no errors are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarnings</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-$warnings = $res->getWarnings();
-
-print_r($warnings);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-    [1] => mysql_xdevapi\Warning Object
-        (
-            [message] => Division by 0
-            [level] => 2
-            [code] => 1365
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/rowresult/getwarningscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getwarningscount.xml
deleted file mode 100644
index 7b4d5daee828..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/rowresult/getwarningscount.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-rowresult.getwarningscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>RowResult::getWarningsCount</refname>
-  <refpurpose>Get warning count from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\RowResult::getWarningsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Retrieve the number of warnings from the last RowResult operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of warnings generated by the last operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\RowResult::getWarningsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS foo")->execute();
-$session->sql("CREATE DATABASE foo")->execute();
-$session->sql("CREATE TABLE foo.test_table(x int)")->execute();
-
-$schema = $session->getSchema("foo");
-$table  = $schema->getTable("test_table");
-
-$table->insert(['x'])->values([1])->values([2])->execute();
-
-$res = $table->select(['x/0 as bad_x'])->execute();
-
-echo $res->getWarningsCount();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-2
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/construct.xml
deleted file mode 100644
index c343f3145ef8..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::__construct</refname>
-  <refpurpose>Schema constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Schema::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   The Schema object provides full access to the schema (database).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS food")->execute();
-$session->sql("CREATE DATABASE food")->execute();
-$session->sql("CREATE TABLE food.fruit(name text, rating text)")->execute();
-
-$schema = $session->getSchema("food");
-$schema->createCollection("trees");
-
-print_r($schema->gettables());
-print_r($schema->getcollections());
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [fruit] => mysql_xdevapi\Table Object
-        (
-            [name] => fruit
-        )
-)
-Array
-(
-    [trees] => mysql_xdevapi\Collection Object
-        (
-            [name] => trees
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/createcollection.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/createcollection.xml
deleted file mode 100644
index 939f0472ee6d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/createcollection.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.createcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::createCollection</refname>
-  <refpurpose>Add collection to schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Collection</type><methodname>mysql_xdevapi\Schema::createCollection</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>validate</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a collection within the schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Collection name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>validate</parameter></term>
-    <listitem>
-     <para>
-      Validation definition, as a JSON object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The Collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="changelog">
-    &reftitle.changelog;
-    <informaltable xml:id="mysql-xdevapi-schema.createcollection.changelog">
-     <tgroup cols="2">
-      <thead>
-       <row>
-        <entry>&Version;</entry>
-        <entry>&Description;</entry>
-       </row>
-      </thead>
-      <tbody>
-       <row>
-        <entry>8.0.20</entry>
-        <entry>
-         Added the optional validate parameter.
-        </entry>
-       </row>
-      </tbody>
-     </tgroup>
-    </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::createCollection</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS food")->execute();
-$session->sql("CREATE DATABASE food")->execute();
-$session->sql("CREATE TABLE food.fruit(name text, rating text)")->execute();
-
-$schema = $session->getSchema("food");
-$schema->createCollection("trees");
-
-print_r($schema->gettables());
-print_r($schema->getcollections());
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [fruit] => mysql_xdevapi\Table Object
-        (
-            [name] => fruit
-        )
-)
-Array
-(
-    [trees] => mysql_xdevapi\Collection Object
-        (
-            [name] => trees
-        )
-)
-]]>
-   </screen>
-  </example>
-  <example>
-    <title><methodname>mysql_xdevapi\Schema::createCollection</methodname> example</title>
-    <programlisting role="php">
- <![CDATA[
- <?php
- $collection = $schema->createCollection("mycollection", '{
-	"validation": {
-		"level": "strict",
-		"schema": {
-			"id": "http://json-schema.org/geo",
-			"description": "A geographical coordinate",
-			"type": "object",
-			"properties": {
-				"latitude": {
-					"type": "number"
-				},
-				"longitude": {
-					"type": "number"
-				}
-			},
-			"required": ["latitude", "longitude"]
-		}
-	}
-}');
-// Succeeds
-$collection->add('{"latitude": 10, "longitude": 20}')->execute();
-
-// Fails, invalid types (not numbers)
-$collection->add('{"latitude": "lat", "longitude": "long"}')->execute();
-]]>
-    </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/mysql_xdevapi/mysql_xdevapi/schema/dropcollection.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/dropcollection.xml
deleted file mode 100644
index faca6cd1babd..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/dropcollection.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.dropcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::dropCollection</refname>
-  <refpurpose>Drop collection from schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Schema::dropCollection</methodname>
-   <methodparam><type>string</type><parameter>collection_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collection_name</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::dropCollection</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS food")->execute();
-$session->sql("CREATE DATABASE food")->execute();
-$session->sql("CREATE TABLE food.fruit(name text, rating text)")->execute();
-
-$schema = $session->getSchema("food");
-
-$schema->createCollection("trees");
-$schema->dropCollection("trees");
-$schema->createCollection("buildings");
-
-print_r($schema->gettables());
-print_r($schema->getcollections());
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [fruit] => mysql_xdevapi\Table Object
-        (
-            [name] => fruit
-        )
-)
-Array
-(
-    [buildings] => mysql_xdevapi\Collection Object
-        (
-            [name] => buildings
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/existsindatabase.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/existsindatabase.xml
deleted file mode 100644
index 7ce35ed3979b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/existsindatabase.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.existsindatabase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::existsInDatabase</refname>
-  <refpurpose>Check if exists in database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Schema::existsInDatabase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the current object (schema, table, collection, or view) exists
-   in the schema object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the schema, table, collection, or view still exists in the schema, else &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::existsInDatabase</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS food")->execute();
-$session->sql("CREATE DATABASE food")->execute();
-$session->sql("CREATE TABLE food.fruit(name text, rating text)")->execute();
-
-$schema = $session->getSchema("food");
-$schema->createCollection("trees");
-
-// ...
-
-$trees = $schema->getCollection("trees");
-
-// ...
-
-// Is this collection still in the database (schema)?
-if ($trees->existsInDatabase()) {
-    echo "Yes, the 'trees' collection is still present.";
-}
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Yes, the 'trees' collection is still present.
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/getcollection.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollection.xml
deleted file mode 100644
index aba236ade36c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollection.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.getcollection" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getCollection</refname>
-  <refpurpose>Get collection from schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Collection</type><methodname>mysql_xdevapi\Schema::getCollection</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get a collection from the schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Collection name to retrieve.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The Collection object for the selected collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::getCollection</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS food")->execute();
-$session->sql("CREATE DATABASE food")->execute();
-
-$schema = $session->getSchema("food");
-$schema->createCollection("trees");
-
-// ...
-
-$trees = $schema->getCollection("trees");
-
-var_dump($trees);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Collection)#3 (1) {
-  ["name"]=>
-  string(5) "trees"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/getcollectionastable.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollectionastable.xml
deleted file mode 100644
index a5cd83018d1a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollectionastable.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-schema.getcollectionastable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getCollectionAsTable</refname>
-  <refpurpose>Get collection as a Table object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Table</type><methodname>mysql_xdevapi\Schema::getCollectionAsTable</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>   
-  </methodsynopsis>
-  <para>
-   Get a collection, but as a Table object instead of a Collection object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the collection to instantiate a Table object from.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A <classname>mysql_xdevapi\Table</classname> object for the collection.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>mysql_xdevapi\Schema::getCollectionAsTable</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema  = $session->getSchema("addressbook");
-$collect = $schema->createCollection("people");
-$collect->add('{"name": "Fred",  "age": 21, "job": "Construction"}')->execute();
-$collect->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-
-$table      = $schema->getCollectionAsTable("people");
-$collection = $schema->getCollection("people");
-
-var_dump($table);
-var_dump($collection);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Table)#4 (1) {
-  ["name"]=>
-  string(6) "people"
-}
-
-object(mysql_xdevapi\Collection)#5 (1) {
-  ["name"]=>
-  string(6) "people"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/getcollections.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollections.xml
deleted file mode 100644
index 5be8091cca2e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/getcollections.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schema.getcollections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getCollections</refname>
-  <refpurpose>Get all schema collections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Schema::getCollections</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch a list of collections for this schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of all collections in this schema, where each array element
-   value is a Collection object with the collection name as the key.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Schema::getCollections</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema  = $session->getSchema("addressbook");
-$collect = $schema->createCollection("people");
-$collect->add('{"name": "Fred",  "age": 21, "job": "Construction"}')->execute();
-$collect->add('{"name": "Wilma", "age": 23, "job": "Teacher"}')->execute();
-
-$collections = $schema->getCollections();
-var_dump($collections);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  ["people"]=>
-  object(mysql_xdevapi\Collection)#4 (1) {
-    ["name"]=>
-    string(6) "people"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/getname.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/getname.xml
deleted file mode 100644
index d8bd4a925483..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/getname.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schema.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getName</refname>
-  <refpurpose>Get schema name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Schema::getName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the name of the schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The name of the schema connected to the schema object, as a string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Schema::getName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema  = $session->getSchema("addressbook");
-
-// ...
-
-var_dump($schema->getName());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "addressbook"
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/getsession.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/getsession.xml
deleted file mode 100644
index 0e3f4082680d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/getsession.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schema.getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getSession</refname>
-  <refpurpose>Get schema session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Session</type><methodname>mysql_xdevapi\Schema::getSession</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get a new Session object from the Schema object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Session object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Schema::getSession</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$schema  = $session->getSchema("addressbook");
-
-// ...
-
-$newsession = $schema->getSession();
-
-var_dump($session);
-var_dump($newsession);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Session)#1 (0) {
-}
-
-object(mysql_xdevapi\Session)#3 (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/mysql_xdevapi/mysql_xdevapi/schema/gettable.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/gettable.xml
deleted file mode 100644
index 90f76535519c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/gettable.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schema.gettable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getTable</refname>
-  <refpurpose>Get schema table</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Table</type><methodname>mysql_xdevapi\Schema::getTable</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fetch a Table object for the provided table in the schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the table.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Table object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Schema::getTable</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$row = $table->select('name', 'age')->execute()->fetchAll();
-
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 33
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schema/gettables.xml b/reference/mysql_xdevapi/mysql_xdevapi/schema/gettables.xml
deleted file mode 100644
index 9ae5812560b5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schema/gettables.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schema.gettables" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Schema::getTables</refname>
-  <refpurpose>Get schema tables</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Schema::getTables</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of all tables in this schema, where each array element
-   value is a Table object with the table name as the key.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Schema::getTables</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$session->sql("CREATE TABLE addressbook.cities(name text, population int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('Portland', 639863), ('Seattle', 704352)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$tables = $schema->getTables();
-
-var_dump($tables);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["cities"]=>
-  object(mysql_xdevapi\Table)#3 (1) {
-    ["name"]=>
-    string(6) "cities"
-  }
-
-  ["names"]=>
-  object(mysql_xdevapi\Table)#4 (1) {
-    ["name"]=>
-    string(5) "names"
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/schemaobject/getschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/schemaobject/getschema.xml
deleted file mode 100644
index 0e5a94a9d00d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/schemaobject/getschema.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-schemaobject.getschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SchemaObject::getSchema</refname>
-  <refpurpose>Get schema object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <type>mysql_xdevapi\Schema</type><methodname>mysql_xdevapi\SchemaObject::getSchema</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Used by other objects to retrieve a schema object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current Schema object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::getSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$schema  = $session->getSchema("addressbook");
-
-print_r($schema);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-mysql_xdevapi\Schema Object
-(
-    [name] => addressbook
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/close.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/close.xml
deleted file mode 100644
index 61d28582e0c5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/close.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::close</refname>
-  <refpurpose>Close session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Session::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Close the session with the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the session closed.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$session->close();
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/commit.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/commit.xml
deleted file mode 100644
index 5d919b81b80c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/commit.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.commit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::commit</refname>
-  <refpurpose>Commit transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Object</type><methodname>mysql_xdevapi\Session::commit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Commit the transaction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatementResult object.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::commit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("friends");
-
-$session->startTransaction();
-
-$collection->add('{"John":42, "Sam":33}')->execute();
-$savepoint = $session->setSavepoint();
-
-$session->commit();
-$session->close();
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/construct.xml
deleted file mode 100644
index b923d422e56a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/construct.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::__construct</refname>
-  <refpurpose>Description constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Session::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   A Session object, as initiated by getSession().
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->close();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/createschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/createschema.xml
deleted file mode 100644
index 37b0c047f7e5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/createschema.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.createschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::createSchema</refname>
-  <refpurpose>Create new schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Schema</type><methodname>mysql_xdevapi\Session::createSchema</methodname>
-   <methodparam><type>string</type><parameter>schema_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Creates a new schema.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>schema_name</parameter></term>
-    <listitem>
-     <para>
-      Name of the schema to create.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Schema object on success, and emits an exception on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::createSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$uri  = 'mysqlx://happyuser:password@127.0.0.1:33060/';
-$sess = mysql_xdevapi\getSession($uri);
-
-try {
-
-    if ($schema = $sess->createSchema('fruit')) {
-        echo "Info: I created a schema named 'fruit'\n";
-    }
-    
-} catch (Exception $e) {
-
-   echo $e->getMessage();
-
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Info: I created a schema named 'fruit'
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml
deleted file mode 100644
index cc5684082e09..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/dropschema.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.dropschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::dropSchema</refname>
-  <refpurpose>Drop a schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Session::dropSchema</methodname>
-   <methodparam><type>string</type><parameter>schema_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Drop a schema (database).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-   <varlistentry>
-    <term><parameter>schema_name</parameter></term>
-    <listitem>
-     <para>
-      Name of the schema to drop.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the schema is dropped, or &false; if it does not exist
-   or can't be dropped. 
-  </para>
-  <para>
-   An <constant>E_WARNING</constant> level error is generated if the 
-   schema does not exist.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::dropSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->dropSchema("addressbook");
-
-$session->close();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/generateuuid.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/generateuuid.xml
deleted file mode 100644
index 9f52d6c93da7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/generateuuid.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.generateuuid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::generateUUID</refname>
-  <refpurpose>Get new UUID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Session::generateUUID</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Generate a Universal Unique IDentifier (UUID) generated according to 
-   <link xlink:href="&url.rfc;4122">RFC 4122</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The UUID; a string with a length of 32.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::generateUuid</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$uuid = $session->generateUuid();
-
-var_dump($uuid);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(32) "484B18AC7980F8D4FE84613CDA5EE84B"
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/getdefaultschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/getdefaultschema.xml
deleted file mode 100755
index ba8c9b4bdcee..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/getdefaultschema.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.getdefaultschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::getDefaultSchema</refname>
-  <refpurpose>Get default schema name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>mysql_xdevapi\Schema</type><type>null</type></type><methodname>mysql_xdevapi\Session::getDefaultSchema</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the default schema that's typically set in the connection URI.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The default schema defined by the connection, or &null; if one was not set.
-  </para>
- </refsect1>
- 
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::getSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$uri = "mysqlx://testuser:testpasswd@localhost:33160/testx?ssl-mode=disabled";
-$session = mysql_xdevapi\getSession($uri);
-
-$schema = $session->getDefaultSchema();
-echo $schema->getName();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-testx
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/getschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/getschema.xml
deleted file mode 100644
index c2a0aea4cbe0..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/getschema.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.getschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::getSchema</refname>
-  <refpurpose>Get a new schema object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Schema</type><methodname>mysql_xdevapi\Session::getSchema</methodname>
-   <methodparam><type>string</type><parameter>schema_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A new Schema object for the provided schema name.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>schema_name</parameter></term>
-    <listitem>
-     <para>
-      Name of the schema (database) to fetch a Schema object for.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  A Schema object.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::getSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$schema  = $session->getSchema("addressbook");
-
-print_r($schema);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-mysql_xdevapi\Schema Object
-(
-    [name] => addressbook
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/getschemas.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/getschemas.xml
deleted file mode 100644
index 246337c5be9e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/getschemas.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.getschemas" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::getSchemas</refname>
-  <refpurpose>Get the schemas</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Session::getSchemas</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get schema objects for all schemas available to the session.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array containing objects that represent all of the schemas 
-   available to the session.
-  </para>
- </refsect1>
-
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::getSchemas</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$schemas  = $session->getSchemas();
-
-print_r($schemas);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => mysql_xdevapi\Schema Object
-        (
-            [name] => addressbook
-        )
-    [1] => mysql_xdevapi\Schema Object
-        (
-            [name] => information_schema
-        )
-    ...
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/getserverversion.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/getserverversion.xml
deleted file mode 100644
index 72abd99be953..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/getserverversion.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.getserverversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::getServerVersion</refname>
-  <refpurpose>Get server version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Session::getServerVersion</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the MySQL server version for the session.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The MySQL server version for the session, as an integer such as "80012".
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::getServerVersion</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$version = $session->getServerVersion();
-
-var_dump($version);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(80012)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/listclients.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/listclients.xml
deleted file mode 100644
index 94b702b2c3e6..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/listclients.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.listclients" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::listClients</refname>
-  <refpurpose>Get client list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\Session::listClients</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get a list of client connections to the session's MySQL server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array containing the currently logged clients. The array
-   elements are "client_id", "user", "host", and "sql_session".
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::listClients</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$ids = $session->listClients();
-
-var_dump($ids);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(4) {
-    ["client_id"]=>
-    int(61)
-    ["user"]=>
-    string(4) "root"
-    ["host"]=>
-    string(9) "localhost"
-    ["sql_session"]=>
-    int(72)
-  }
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/quotename.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/quotename.xml
deleted file mode 100644
index d905a7d15491..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/quotename.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.quotename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::quoteName</refname>
-  <refpurpose>Add quotes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Session::quoteName</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   A quoting function to escape SQL names and identifiers. It escapes the identifier 
-   given in accordance to the settings of the current connection. This escape 
-   function should not be used to escape values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The string to quote.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The quoted string.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::quoteName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$first = "MySQL's test";
-var_dump($first);
-var_dump($session->quoteName($first));
-
-$second = 'Another `test` "like" `this`';
-var_dump($second);
-var_dump($session->quoteName($second));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(12) "MySQL's test"
-string(14) "`MySQL's test`"
-
-string(28) "Another `test` "like" `this`"
-string(34) "`Another ``test`` "like" ``this```"
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/releasesavepoint.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/releasesavepoint.xml
deleted file mode 100644
index 1a4d01ac757b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/releasesavepoint.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.releasesavepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::releaseSavepoint</refname>
-  <refpurpose>Release set savepoint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>mysql_xdevapi\Session::releaseSavepoint</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Release a previously set savepoint.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the savepoint to release.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatementResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::releaseSavepoint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("friends");
-
-$session->startTransaction();
-$collection->add( '{"test1":1, "test2":2}' )->execute();
-
-$savepoint = $session->setSavepoint();
-
-$collection->add( '{"test3":3, "test4":4}' )->execute();
-
-$session->releaseSavepoint($savepoint);
-$session->rollback();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/rollback.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/rollback.xml
deleted file mode 100644
index fdeff7bf2eb5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/rollback.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.rollback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::rollback</refname>
-  <refpurpose>Rollback transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>mysql_xdevapi\Session::rollback</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rollback the transaction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatementResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::rollback</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("names");
-
-$session->startTransaction();
-$collection->add( '{"test1":1, "test2":2}' )->execute();
-
-$savepoint = $session->setSavepoint();
-
-$collection->add( '{"test3":3, "test4":4}' )->execute();
-
-$session->releaseSavepoint($savepoint);
-$session->rollback();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/rollbackto.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/rollbackto.xml
deleted file mode 100644
index 41fd6f4c98ce..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/rollbackto.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.rollbackto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::rollbackTo</refname>
-  <refpurpose>Rollback transaction to savepoint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>mysql_xdevapi\Session::rollbackTo</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Rollback the transaction back to the savepoint.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the savepoint to rollback to; case-insensitive.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatementResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::rollbackTo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("names");
-
-$session->startTransaction();
-$collection->add( '{"test1":1, "test2":2}' )->execute();
-
-$savepoint1 = $session->setSavepoint();
-
-$collection->add( '{"test3":3, "test4":4}' )->execute();
-
-$savepoint2 = $session->setSavepoint();
-
-$session->rollbackTo($savepoint1);
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/setsavepoint.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/setsavepoint.xml
deleted file mode 100644
index ed49d206199a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/setsavepoint.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.setsavepoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::setSavepoint</refname>
-  <refpurpose>Create savepoint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Session::setSavepoint</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a new savepoint for the transaction.
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name of the savepoint. The name is auto-generated if the optional <literal>name</literal> 
-      parameter is not defined as 'SAVEPOINT1', 'SAVEPOINT2', and so on.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The name of the save point.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::setSavepoint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("names");
-
-$session->startTransaction();
-$collection->add( '{"test1":1, "test2":2}' )->execute();
-
-$savepoint = $session->setSavepoint();
-
-$collection->add( '{"test3":3, "test4":4}' )->execute();
-
-$session->releaseSavepoint($savepoint);
-$session->rollback();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/sql.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/sql.xml
deleted file mode 100644
index 54f5e2240abf..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/sql.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.sql" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::sql</refname>
-  <refpurpose>Create SQL query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\SqlStatement</type><methodname>mysql_xdevapi\Session::sql</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create a native SQL statement. Placeholders are supported using the native "?" syntax.
-   Use the <literal>execute</literal> method to execute the SQL statement.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      SQL statement to execute.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatement object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::sql</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("CREATE DATABASE addressbook")->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/session/starttransaction.xml b/reference/mysql_xdevapi/mysql_xdevapi/session/starttransaction.xml
deleted file mode 100644
index a78b0fac0abf..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/session/starttransaction.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-session.starttransaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Session::startTransaction</refname>
-  <refpurpose>Start transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>mysql_xdevapi\Session::startTransaction</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Start a new transaction.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An SqlStatementResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Session::startTransaction</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session    = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$collection = $session->getSchema("addressbook")->getCollection("friends");
-
-$session->startTransaction();
-$collection->add( '{"test1":1, "test2":2}' )->execute();
-
-$savepoint = $session->setSavepoint();
-
-$collection->add( '{"test3":3, "test4":4}' )->execute();
-
-$session->releaseSavepoint($savepoint);
-$session->rollback();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/bind.xml
deleted file mode 100644
index 1abf9b1889ba..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/bind.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::bind</refname>
-  <refpurpose>Bind statement parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\SqlStatement</type><methodname>mysql_xdevapi\SqlStatement::bind</methodname>
-   <methodparam><type>string</type><parameter>param</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>param</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatement::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/construct.xml
deleted file mode 100644
index dfa2682aee63..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::__construct</refname>
-  <refpurpose>Description constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\SqlStatement::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>mysql_xdevapi\SqlStatement::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/execute.xml
deleted file mode 100644
index 129a35a9c2a3..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/execute.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::execute</refname>
-  <refpurpose>Execute the operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\SqlStatement::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatement::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/getnextresult.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/getnextresult.xml
deleted file mode 100644
index e2cf22db0716..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/getnextresult.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.getnextresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::getNextResult</refname>
-  <refpurpose>Get next result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\SqlStatement::getNextResult</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatement::getNextResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/getresult.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/getresult.xml
deleted file mode 100644
index 20ded52c0bba..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/getresult.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.getresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::getResult</refname>
-  <refpurpose>Get result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\SqlStatement::getResult</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatement::getResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatement/hasmoreresults.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/hasmoreresults.xml
deleted file mode 100644
index b8a77407a03e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatement/hasmoreresults.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatement.hasmoreresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatement::hasMoreResults</refname>
-  <refpurpose>Check for more results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\SqlStatement::hasMoreResults</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the result set has more objects to fetch.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatement::hasMoreResults</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/construct.xml
deleted file mode 100644
index 9d4f59854c45..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::__construct</refname>
-  <refpurpose>Description constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\SqlStatementResult::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>mysql_xdevapi\SqlStatementResult::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchall.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchall.xml
deleted file mode 100644
index daa235de5538..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchall.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.fetchall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::fetchAll</refname>
-  <refpurpose>Get all rows from result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\SqlStatementResult::fetchAll</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch all the rows from the result set.
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A numerical array with all results from the query; each result is
-   an associative array. An empty array is returned if no
-   rows are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::fetchAll</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS dbtest")->execute();
-$session->sql("CREATE DATABASE dbtest")->execute();
-$session->sql("CREATE TABLE dbtest.workers(name text, age int, job text)")->execute();
-$session->sql("INSERT INTO dbtest.workers values ('John', 42, 'bricklayer'), ('Sam', 33, 'carpenter')")->execute();
-
-$schema = $session->getSchema("dbtest");
-$table  = $schema->getTable("workers");
-
-$rows = $session->sql("SELECT * FROM dbtest.workers")->execute()->fetchAll();
-
-print_r($rows);
-?>
-]]>
-
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 33
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchone.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchone.xml
deleted file mode 100644
index 86032d0cba87..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/fetchone.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.fetchone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::fetchOne</refname>
-  <refpurpose>Get single row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\SqlStatementResult::fetchOne</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch one row from the result set.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The result, as an associative array. In case there is not any
-   result, null will be returned.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::fetchOne</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-$session->sql("DROP DATABASE IF EXISTS dbtest")->execute();
-$session->sql("CREATE DATABASE dbtest")->execute();
-$session->sql("CREATE TABLE dbtest.workers(name text, age int, job text)")->execute();
-$session->sql("INSERT INTO dbtest.workers values ('John', 42, 'bricklayer'), ('Sam', 33, 'carpenter')")->execute();
-
-$schema = $session->getSchema("dbtest");
-$table  = $schema->getTable("workers");
-
-$rows = $session->sql("SELECT * FROM dbtest.workers")->execute()->fetchOne();
-
-print_r($rows);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [name] => John
-    [age] => 42
-    [job] => bricklayer
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getaffecteditemscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getaffecteditemscount.xml
deleted file mode 100644
index 496c70d7d9e5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getaffecteditemscount.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getaffecteditemscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getAffectedItemsCount</refname>
-  <refpurpose>Get affected row count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\SqlStatementResult::getAffectedItemsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getAffectedItemsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml
deleted file mode 100644
index d4b3eef8a41e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumncount.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getcolumncount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getColumnsCount</refname>
-  <refpurpose>Get column count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\SqlStatementResult::getColumnsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of columns; 0 if there are none.
-  </para>
- </refsect1>
-
-<refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable xml:id="mysql-xdevapi-sqlstatementresult.getcolumncount.changelog">
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>8.0.14</entry>
-      <entry>
-       Method renamed from getColumnCount() to getColumnsCount().
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getColumnsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumnnames.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumnnames.xml
deleted file mode 100644
index 48b0acd1fdcb..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumnnames.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getcolumnnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getColumnNames</refname>
-  <refpurpose>Get column names</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\SqlStatementResult::getColumnNames</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getColumnNames</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumns.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumns.xml
deleted file mode 100644
index 80844578cced..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getcolumns.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getcolumns" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getColumns</refname>
-  <refpurpose>Get columns</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Array</type><methodname>mysql_xdevapi\SqlStatementResult::getColumns</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getColumns</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getgeneratedids.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getgeneratedids.xml
deleted file mode 100644
index 8ee7f7a4119b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getgeneratedids.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getgeneratedids" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getGeneratedIds</refname>
-  <refpurpose>Get generated ids</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\SqlStatementResult::getGeneratedIds</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of generated _id's from the last operation, 
-   or an empty array if there are none.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getGeneratedIds</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getlastinsertid.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getlastinsertid.xml
deleted file mode 100644
index e03544717cd1..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getlastinsertid.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getlastinsertid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getLastInsertId</refname>
-  <refpurpose>Get last insert id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>String</type><methodname>mysql_xdevapi\SqlStatementResult::getLastInsertId</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The ID for the last insert operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getLastInsertId</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarnings.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarnings.xml
deleted file mode 100644
index 5efacb90adf5..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarnings.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getwarnings" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getWarnings</refname>
-  <refpurpose>Get warnings from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>mysql_xdevapi\SqlStatementResult::getWarnings</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of Warning objects from the last operation. Each object
-   defines an error 'message', error 'level', and error 'code'. An empty
-   array is returned if no errors are present.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getWarnings</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarningscount.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarningscount.xml
deleted file mode 100644
index 82b4d2e79091..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/getwarningscount.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.getwarningcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::getWarningsCount</refname>
-  <refpurpose>Get warning count from last operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\SqlStatementResult::getWarningCounts</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of warnings raised during the last CRUD operation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::getWarningsCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/hasdata.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/hasdata.xml
deleted file mode 100644
index 528e5912a07a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/hasdata.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.hasdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::hasData</refname>
-  <refpurpose>Check if result has data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\SqlStatementResult::hasData</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &true; if the result set has data.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::hasData</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/nextresult.xml b/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/nextresult.xml
deleted file mode 100644
index 581961120329..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/sqlstatementresult/nextresult.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-sqlstatementresult.nextresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SqlStatementResult::nextResult</refname>
-  <refpurpose>Get next result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\SqlStatementResult::nextResult</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-    &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The next Result object from the result set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\SqlStatementResult::nextResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/statement/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/statement/construct.xml
deleted file mode 100644
index e235fa52babd..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/statement/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-statement.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Statement::__construct</refname>
-  <refpurpose>Description constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Statement::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>mysql_xdevapi\Statement::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/statement/getnextresult.xml b/reference/mysql_xdevapi/mysql_xdevapi/statement/getnextresult.xml
deleted file mode 100644
index 72e560545af7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/statement/getnextresult.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-statement.getnextresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Statement::getNextResult</refname>
-  <refpurpose>Get next result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Statement::getNextResult</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Statement::getNextResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/statement/getresult.xml b/reference/mysql_xdevapi/mysql_xdevapi/statement/getresult.xml
deleted file mode 100644
index 928cf7cf936e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/statement/getresult.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-statement.getresult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Statement::getResult</refname>
-  <refpurpose>Get result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\Statement::getResult</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Statement::getResult</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/statement/hasmoreresults.xml b/reference/mysql_xdevapi/mysql_xdevapi/statement/hasmoreresults.xml
deleted file mode 100644
index 3c02231f0a29..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/statement/hasmoreresults.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-statement.hasmoreresults" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Statement::hasMoreResults</refname>
-  <refpurpose>Check if more results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Statement::hasMoreResults</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-  
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Statement::hasMoreResults</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/construct.xml
deleted file mode 100644
index 95ede0175137..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::__construct</refname>
-  <refpurpose>Table constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Table::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Construct a table object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/count.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/count.xml
deleted file mode 100644
index d1d3bf03f0d2..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/count.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::count</refname>
-  <refpurpose>Get row count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>mysql_xdevapi\Table::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch the number of rows in the table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The total number of rows in the table.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-var_dump($table->count());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(2)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/delete.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/delete.xml
deleted file mode 100644
index ca0b3a3c9d5f..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/delete.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::delete</refname>
-  <refpurpose>Delete rows from table</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableDelete</type><methodname>mysql_xdevapi\Table::delete</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Deletes rows from a table.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableDelete object; use the execute() method to execute the delete query.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::delete</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()->where("name = :name")->orderby("age DESC")->limit(1)->bind(['name' => 'John'])->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/existsindatabase.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/existsindatabase.xml
deleted file mode 100644
index 78c75506c4cd..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/existsindatabase.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.existsindatabase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::existsInDatabase</refname>
-  <refpurpose>Check if table exists in database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Table::existsInDatabase</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Verifies if this table exists in the database.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if table exists in the database, else &false; if it does not.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::existsInDatabase</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-if ($table->existsInDatabase()) {
-  echo "Yes, this table still exists in the session's schema.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Yes, this table still exists in the session's schema.
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/getname.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/getname.xml
deleted file mode 100644
index 0da195809b71..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/getname.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::getName</refname>
-  <refpurpose>Get table name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>mysql_xdevapi\Table::getName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the name of this database object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The name of this database object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::getName</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-var_dump($table->getName());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "names"
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/getschema.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/getschema.xml
deleted file mode 100644
index 950f21c72e6c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/getschema.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.getschema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::getSchema</refname>
-  <refpurpose>Get table schema</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Schema</type><methodname>mysql_xdevapi\Table::getSchema</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Fetch the schema associated with the table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Schema object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::getSchema</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-var_dump($table->getSchema());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Schema)#9 (1) {
-  ["name"]=>
-  string(11) "addressbook"
-}
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/getsession.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/getsession.xml
deleted file mode 100644
index 96ac3e99f1a6..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/getsession.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.getsession" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::getSession</refname>
-  <refpurpose>Get table session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Session</type><methodname>mysql_xdevapi\Table::getSession</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get session associated with the table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Session object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::getSession</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-var_dump($table->getSession());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(mysql_xdevapi\Session)#9 (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/mysql_xdevapi/mysql_xdevapi/table/insert.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/insert.xml
deleted file mode 100644
index 04ba68055235..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/insert.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.insert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::insert</refname>
-  <refpurpose>Insert table rows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableInsert</type><methodname>mysql_xdevapi\Table::insert</methodname>
-   <methodparam><type>mixed</type><parameter>columns</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>more_columns</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Inserts rows into a table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>columns</parameter></term>
-    <listitem>
-     <para>
-      The columns to insert data into. Can be an array
-      with one or more values, or a string.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>more_columns</parameter></term>
-    <listitem>
-     <para>
-      Additional columns definitions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableInsert object; use the execute() method to execute the insert statement.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::insert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table ->insert("name", "age")
-  ->values(["Suzanne", 31],["Julie", 43])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/isview.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/isview.xml
deleted file mode 100644
index 1c59136ab00a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/isview.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="mysql-xdevapi-table.isview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::isView</refname>
-  <refpurpose>Check if table is view</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>mysql_xdevapi\Table::isView</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Determine if the underlying object is a view or not.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &true; if the underlying object is a view, otherwise &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::isView</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-if ($table->isView()) {
-    echo "This is a view.";
-} else {
-    echo "This is not a view.";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-This is not a view.
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/select.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/select.xml
deleted file mode 100644
index 5fd93814abf9..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/select.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.select" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::select</refname>
-  <refpurpose>Select rows from table</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\Table::select</methodname>
-   <methodparam><type>mixed</type><parameter>columns</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>more_columns</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fetches data from a table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>columns</parameter></term>
-    <listitem>
-     <para>
-      The columns to select data from. Can be an array
-      with one or more values, or a string.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>more_columns</parameter></term>
-    <listitem>
-     <para>
-      Additional columns parameter definitions.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object; use the execute() method to execute the
-   select and return a RowResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::count</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$row = $table->select('name', 'age')->execute()->fetchAll();
-
-print_r($row);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 33
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/table/update.xml b/reference/mysql_xdevapi/mysql_xdevapi/table/update.xml
deleted file mode 100644
index 7c5f0d243e4d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/table/update.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-table.update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Table::update</refname>
-  <refpurpose>Update rows in table</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\Table::update</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Updates columns in a table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableUpdate object; use the execute() method to execute the update statement.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\Table::update</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->update()->set('age',34)->where('name = "Sam"')->limit(1)->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/bind.xml
deleted file mode 100644
index e71bdb52e2a7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/bind.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::bind</refname>
-  <refpurpose>Bind delete query parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableDelete</type><methodname>mysql_xdevapi\TableDelete::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Binds a value to a specific placeholder.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-    The name of the placeholder and the value to bind.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableDelete object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("name = :name")
-  ->bind(['name' => 'John'])
-  ->orderby("age DESC")
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/construct.xml
deleted file mode 100644
index 0979fb01ee03..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/construct.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::__construct</refname>
-  <refpurpose>TableDelete constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\TableDelete::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Initiated by using the delete() method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("name = :name")
-  ->bind(['name' => 'John'])
-  ->orderby("age DESC")
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/execute.xml
deleted file mode 100644
index 4f394cf20334..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/execute.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::execute</refname>
-  <refpurpose>Execute delete query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\TableDelete::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Execute the delete query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("name = :name")
-  ->bind(['name' => 'John'])
-  ->orderby("age DESC")
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/limit.xml
deleted file mode 100644
index 3b4a1fb1a74c..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/limit.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::limit</refname>
-  <refpurpose>Limit deleted rows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableDelete</type><methodname>mysql_xdevapi\TableDelete::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of records or documents to delete.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of records or documents to delete.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TableDelete object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("name = :name")
-  ->bind(['name' => 'John'])
-  ->orderby("age DESC")
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/orderby.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/orderby.xml
deleted file mode 100644
index 4492f2b1add4..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/orderby.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.orderby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::orderby</refname>
-  <refpurpose>Set delete sort criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableDelete</type><methodname>mysql_xdevapi\TableDelete::orderby</methodname>
-   <methodparam><type>string</type><parameter>orderby_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the order options for a result set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>orderby_expr</parameter></term>
-    <listitem>
-     <para>
-      The sort definition.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableDelete object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::orderBy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("age = :age")
-  ->bind(['age' => 42])
-  ->orderby("name DESC")
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tabledelete/where.xml b/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/where.xml
deleted file mode 100644
index b76a80049aee..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tabledelete/where.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tabledelete.where" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableDelete::where</refname>
-  <refpurpose>Set delete search condition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableDelete</type><methodname>mysql_xdevapi\TableDelete::where</methodname>
-   <methodparam><type>string</type><parameter>where_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the search condition to filter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>where_expr</parameter></term>
-    <listitem>
-     <para>
-      Define the search condition to filter documents or records.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TableDelete object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableDelete::where</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->delete()
-  ->where("id = :id")
-  ->bind(['id' => 42])
-  ->limit(1)
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableinsert/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/construct.xml
deleted file mode 100644
index 0053cb98d31b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/construct.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableinsert.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableInsert::__construct</refname>
-  <refpurpose>TableInsert constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\TableInsert::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Initiated by using the insert() method.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableInsert::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table
-  ->insert("name", "age")
-  ->values(["Suzanne", 31],["Julie", 43])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableinsert/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/execute.xml
deleted file mode 100644
index 6c609b190dd4..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/execute.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableinsert.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableInsert::execute</refname>
-  <refpurpose>Execute insert query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\Result</type><methodname>mysql_xdevapi\TableInsert::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Execute the statement.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Result object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableInsert::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table
-  ->insert("name", "age")
-  ->values(["Suzanne", 31],["Julie", 43])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableinsert/values.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/values.xml
deleted file mode 100644
index 1ee3fd1745a3..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableinsert/values.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableinsert.values" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableInsert::values</refname>
-  <refpurpose>Add insert row values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableInsert</type><methodname>mysql_xdevapi\TableInsert::values</methodname>
-   <methodparam><type>array</type><parameter>row_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the values to be inserted.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>row_values</parameter></term>
-    <listitem>
-     <para>
-      Values (an array) of columns to insert.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableInsert object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableInsert::values</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table
-  ->insert("name", "age")
-  ->values(["Suzanne", 31],["Julie", 43])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/bind.xml
deleted file mode 100644
index 236e6d40a794..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/bind.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::bind</refname>
-  <refpurpose>Bind select query parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Binds a value to a specific placeholder.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-      The name of the placeholder, and the value to bind.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name','age')
-  ->where('name like :name and age > :age')
-  ->bind(['name' => 'John', 'age' => 42])
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/construct.xml
deleted file mode 100644
index 490854d5053d..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/construct.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::__construct</refname>
-  <refpurpose>TableSelect constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\TableSelect::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   An object returned by the select() method; use execute() to 
-   execute the query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 33)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name','age')
-  ->where('name like :name and age > :age')
-  ->bind(['name' => 'John', 'age' => 42])
-  ->orderBy('age desc')
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/execute.xml
deleted file mode 100644
index a7ddab57d97e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/execute.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::execute</refname>
-  <refpurpose>Execute select statement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\RowResult</type><methodname>mysql_xdevapi\TableSelect::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Execute the select statement by chaining it with the execute() method.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A RowResult object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name','age')
-  ->where('name like :name and age > :age')
-  ->bind(['name' => 'John', 'age' => 42])
-  ->orderBy('age desc')
-  ->execute();
-
-$row = $result->fetchAll();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/groupby.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/groupby.xml
deleted file mode 100644
index 89de849ebe21..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/groupby.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.groupby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::groupBy</refname>
-  <refpurpose>Set select grouping criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::groupBy</methodname>
-   <methodparam><type>mixed</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a grouping criteria for the result set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      The grouping criteria.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::groupBy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 42)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('Suki', 31)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('count(*) as count', 'age')
-  ->groupBy('age')->orderBy('age asc')
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [count] => 1
-            [age] => 31
-        )
-    [1] => Array
-        (
-            [count] => 2
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/having.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/having.xml
deleted file mode 100644
index ac26f2b12f01..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/having.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.having" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::having</refname>
-  <refpurpose>Set select having condition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::having</methodname>
-   <methodparam><type>string</type><parameter>sort_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a condition for records to consider in aggregate function operations.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      A condition on the aggregate functions used on the grouping criteria.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::having</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 42)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('Suki', 31)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('count(*) as count', 'age')
-  ->groupBy('age')->orderBy('age asc')
-  ->having('count > 1')
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [count] => 2
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/limit.xml
deleted file mode 100644
index d3a4270f7952..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/limit.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::limit</refname>
-  <refpurpose>Limit selected rows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of records or documents to return.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of records or documents.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name', 'age')
-  ->limit(1)
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/lockexclusive.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/lockexclusive.xml
deleted file mode 100644
index 72625d33e909..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/lockexclusive.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.lockexclusive" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::lockExclusive</refname>
-  <refpurpose>Execute EXCLUSIVE LOCK</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::lockExclusive</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>lock_waiting_option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Execute a read operation with EXCLUSIVE LOCK. Only one lock can be active at a time.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lock_waiting_option</parameter></term>
-    <listitem>
-     <para>
-      The optional waiting option that defaults to <constant>MYSQLX_LOCK_DEFAULT</constant>.
-      Valid values are:
-     </para>
-     <itemizedlist>
-      <listitem><para><constant>MYSQLX_LOCK_DEFAULT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_NOWAIT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_SKIP_LOCKED</constant></para></listitem>
-     </itemizedlist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::lockExclusive</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$session->startTransaction();
-
-$result = $table->select('name', 'age')
-  ->lockExclusive(MYSQLX_LOCK_NOWAIT)
-  ->execute();
-
-$session->commit();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/lockshared.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/lockshared.xml
deleted file mode 100644
index eeb9a03a2f55..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/lockshared.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.lockshared" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::lockShared</refname>
-  <refpurpose>Execute SHARED LOCK</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::lockShared</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>lock_waiting_option</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Execute a read operation with SHARED LOCK. Only one lock can be active at a time.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>lock_waiting_option</parameter></term>
-    <listitem>
-     <para>
-      The optional waiting option that defaults to <constant>MYSQLX_LOCK_DEFAULT</constant>. 
-      Valid values are:
-     </para>
-     <itemizedlist>
-      <listitem><para><constant>MYSQLX_LOCK_DEFAULT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_NOWAIT</constant></para></listitem>
-      <listitem><para><constant>MYSQLX_LOCK_SKIP_LOCKED</constant></para></listitem>
-     </itemizedlist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::lockShared</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$session->startTransaction();
-
-$result = $table->select('name', 'age')
-  ->lockShared(MYSQLX_LOCK_NOWAIT)
-  ->execute();
-
-$session->commit();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => Sam
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/offset.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/offset.xml
deleted file mode 100644
index 1eb802653798..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/offset.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.offset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::offset</refname>
-  <refpurpose>Set limit offset</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::offset</methodname>
-   <methodparam><type>int</type><parameter>position</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Skip given number of rows in result.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-      The limit offset.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::offset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$session->sql("DROP DATABASE IF EXISTS addressbook")->execute();
-$session->sql("CREATE DATABASE addressbook")->execute();
-$session->sql("CREATE TABLE addressbook.names(name text, age int)")->execute();
-$session->sql("INSERT INTO addressbook.names values ('John', 42), ('Sam', 42)")->execute();
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name', 'age')
-  ->limit(1)
-  ->offset(1)
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => Sam
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/orderby.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/orderby.xml
deleted file mode 100644
index 908e1537aa0e..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/orderby.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.orderby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::orderby</refname>
-  <refpurpose>Set select sort criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::orderby</methodname>
-   <methodparam><type>mixed</type><parameter>sort_expr</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>sort_exprs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the order by criteria.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sort_expr</parameter></term>
-    <listitem>
-     <para>
-      The expressions that define the order by criteria. Can be an array
-      with one or more expressions, or a string.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sort_exprs</parameter></term>
-    <listitem>
-     <para>
-      Additional sort_expr parameters.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::orderBy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name', 'age')
-  ->orderBy('name desc')
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => Sam
-            [age] => 42
-        )
-    [1] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableselect/where.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableselect/where.xml
deleted file mode 100644
index e0d062c739b7..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableselect/where.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableselect.where" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableSelect::where</refname>
-  <refpurpose>Set select search condition</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableSelect</type><methodname>mysql_xdevapi\TableSelect::where</methodname>
-   <methodparam><type>string</type><parameter>where_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the search condition to filter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>where_expr</parameter></term>
-    <listitem>
-     <para>
-      Define the search condition to filter documents or records.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableSelect object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableSelect::where</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$result = $table->select('name','age')
-  ->where('name like :name and age > :age')
-  ->bind(['name' => 'John', 'age' => 42])
-  ->execute();
-
-$row = $result->fetchAll();
-print_r($row);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [name] => John
-            [age] => 42
-        )
-)
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/bind.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/bind.xml
deleted file mode 100644
index c18830221476..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/bind.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::bind</refname>
-  <refpurpose>Bind update query parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::bind</methodname>
-   <methodparam><type>array</type><parameter>placeholder_values</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Binds a value to a specific placeholder.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>placeholder_values</parameter></term>
-    <listitem>
-     <para>
-     The name of the placeholder, and the value to bind, defined
-     as a JSON array.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::bind</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$table->update()
-  ->set('status', 'admin')
-  ->where('name = :name and age > :age')
-  ->bind(['name' => 'Bernie', 'age' => 2000])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/construct.xml
deleted file mode 100644
index baec3abb0841..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::__construct</refname>
-  <refpurpose>TableUpdate constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\TableUpdate::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Initiated by using the update() method.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/execute.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/execute.xml
deleted file mode 100644
index 65b78d23590a..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/execute.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::execute</refname>
-  <refpurpose>Execute update query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Executes the update statement.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/limit.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/limit.xml
deleted file mode 100644
index 4140162ed769..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/limit.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.limit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::limit</refname>
-  <refpurpose>Limit update row count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::limit</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the maximum number of records or documents update.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rows</parameter></term>
-    <listitem>
-     <para>
-      The maximum number of records or documents to update.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::limit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/orderby.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/orderby.xml
deleted file mode 100644
index fa41d2f9e5e0..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/orderby.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.orderby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::orderby</refname>
-  <refpurpose>Set sorting criteria</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::orderby</methodname>
-   <methodparam><type>mixed</type><parameter>orderby_expr</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>orderby_exprs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the sorting criteria.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>orderby_expr</parameter></term>
-    <listitem>
-     <para>
-      The expressions that define the order by criteria. Can be an array
-      with one or more expressions, or a string.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>orderby_exprs</parameter></term>
-    <listitem>
-     <para>
-      Additional sort_expr parameters.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::orderby</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/set.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/set.xml
deleted file mode 100644
index 684f5b8e1c5b..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/set.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::set</refname>
-  <refpurpose>Add field to be updated</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::set</methodname>
-   <methodparam><type>string</type><parameter>table_field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>expression_or_literal</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Updates the column value on records in a table.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>table_field</parameter></term>
-    <listitem>
-     <para>
-      The column name to be updated.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expression_or_literal</parameter></term>
-    <listitem>
-     <para>
-      The value to be set on the specified column.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::set</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/tableupdate/where.xml b/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/where.xml
deleted file mode 100644
index 7b967c6ea897..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/tableupdate/where.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-tableupdate.where" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>TableUpdate::where</refname>
-  <refpurpose>Set search filter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mysql_xdevapi\TableUpdate</type><methodname>mysql_xdevapi\TableUpdate::where</methodname>
-   <methodparam><type>string</type><parameter>where_expr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the search condition to filter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>where_expr</parameter></term>
-    <listitem>
-     <para>
-      The search condition to filter documents or records.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A TableUpdate object.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>mysql_xdevapi\TableUpdate::where</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = mysql_xdevapi\getSession("mysqlx://user:password@localhost");
-
-$schema = $session->getSchema("addressbook");
-$table  = $schema->getTable("names");
-
-$res = $table->update()
-  ->set('level', 3)
-  ->where('age > 15 and age < 22')
-  ->limit(4)
-  ->orderby(['age asc','name desc'])
-  ->execute();
-
-?>
-]]>
-   </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/mysql_xdevapi/mysql_xdevapi/warning/construct.xml b/reference/mysql_xdevapi/mysql_xdevapi/warning/construct.xml
deleted file mode 100644
index 3f7cbd9e4c54..000000000000
--- a/reference/mysql_xdevapi/mysql_xdevapi/warning/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="mysql-xdevapi-warning.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Warning::__construct</refname>
-  <refpurpose>Warning constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>mysql_xdevapi\Warning::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>mysql_xdevapi\Warning::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </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/mysql_xdevapi/reference.xml b/reference/mysql_xdevapi/reference.xml
deleted file mode 100644
index d8f77eabc962..000000000000
--- a/reference/mysql_xdevapi/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.mysql-xdevapi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Mysql_xdevapi &Functions;</title>
-
- &reference.mysql-xdevapi.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/mysql_xdevapi/setup.xml b/reference/mysql_xdevapi/setup.xml
deleted file mode 100644
index 7905ccee8a43..000000000000
--- a/reference/mysql_xdevapi/setup.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="mysql-xdevapi.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="mysql-xdevapi.requirements">
-  &reftitle.required;
-  <para>
-   This extension requires a MySQL 8+ server with the X plugin 
-   enabled (default).
-  </para>
-  <para>
-   Prerequisite libraries for compiling this extension are: 
-   Boost (1.53.0 or higher), OpenSSL, and Protobuf.
-  </para>
-
- </section>
-
- <section xml:id="mysql-xdevapi.installation">
-  &reftitle.install;
-
-  <para>
-   &pecl.moved;
-  </para>
-
-  <para>
-   An example installation procedure on Ubuntu 18.04 with PHP 7.2:
-  </para>
-<programlisting>
-<![CDATA[
-// Dependencies
-$ apt install build-essential libprotobuf-dev libboost-dev openssl protobuf-compiler liblz4-tool zstd
-
-// PHP with the desired extensions; php7.2-dev is required to compile
-$ apt install php7.2-cli php7.2-dev php7.2-mysql php7.2-pdo php7.2-xml
-
-// Compile the extension
-$ pecl install mysql_xdevapi
-]]>
-</programlisting>
-
-  <para>
-    The <literal>pecl install</literal> command does not enable PHP extensions (by default)
-    and enabling PHP extensions can be done in several ways. 
-    Another PHP 7.2 on Ubuntu 18.04 example:
-  </para>
-
-<programlisting>
-<![CDATA[
-// Create its own ini file
-$ echo "extension=mysql_xdevapi.so" > /etc/php/7.2/mods-available/mysql_xdevapi.ini
-
-// Use the 'phpenmod' command (note: it's Debian/Ubuntu specific)
-$ phpenmod -v 7.2 -s ALL mysql_xdevapi
-
-// A 'phpenmod' alternative is to manually symlink it
-// $ ln -s /etc/php/7.2/mods-available/mysql_xdevapi.ini /etc/php/7.2/cli/conf.d/20-mysql_xdevapi.ini
-
-// Let's see which MySQL extensions are enabled now
-$ php -m |grep mysql
-
-mysql_xdevapi
-mysqli
-mysqlnd
-pdo_mysql
-]]>
-</programlisting>
-
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;mysql_xdevapi">&url.pecl.package;mysql_xdevapi</link>.
-  </para>
- </section>
-
- <!-- {{{ Configuration -->
- &reference.mysql-xdevapi.ini;
- <!-- }}} -->
-
-  <section xml:id="mysql-xdevapi.build">
-   <title>Building / Compiling From Source</title>
-   <para>
-     Considerations for compiling this extension from source.
-   </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          The extension name is 'mysql_xdevapi', so use <literal>--enable-mysql-xdevapi</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Boost: required,  optionally use the --with-boost=DIR configure option
-          or set the MYSQL_XDEVAPI_BOOST_ROOT environment variable. Only the
-          boost header files are required; not the binaries.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Google Protocol Buffers (protobuf): required,  optionally use the --with-protobuf=DIR
-          configure option or set the MYSQL_XDEVAPI_PROTOBUF_ROOT environment variable.
-        </para>
-        <para>
-          Optionally use <literal>make protobufs</literal> to generate protobuf files (*.pb.cc/.h),
-          and <literal>make clean-protobufs</literal> to delete generate protobuf files.
-        </para>
-        <para>
-          Windows specific protobuf note: depending on your environment,
-          the static library with a multi-threaded DLL runtime may be needed.
-          To prepare, use the following options:
-          <emphasis>-Dprotobuf_MSVC_STATIC_RUNTIME=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF</emphasis>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Google Protocol Buffers / protocol compiler (protoc): required, ensure that proper
-          'protoc' is available in the PATH while building. It is especially
-          important as Windows PHP SDK batch scripts may overwrite the environment.
-        </para>
-      </listitem>
-        <listitem>
-          <para>
-            Bison: required, and available from the PATH.
-          </para>
-          <para>
-            Windows specific bison note: we strongly recommended that bison delivered with the
-            chosen PHP SDKis used else an error similar to "zend_globals_macros.h(39):
-            error C2375: 'zendparse': redefinition; different linkage
-            Zend/zend_language_parser.h(214): note: see declaration of 'zendparse'" may
-            be the result. Also, Windows PHP SDK batch scripts may overwrite the environment.
-          </para>
-        </listitem>
-      <listitem>
-        <para>
-          Windows Specific Notes: To prepare the environment, see the official
-          Windows build documentation for 
-          <link xlink:href="&url.php.win.build2;">the current SDK</link>.
-        </para>
-        <para>
-          We recommend using the backslash '\\' instead of a slash '/' for all paths.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </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/mysql_xdevapi/versions.xml b/reference/mysql_xdevapi/versions.xml
deleted file mode 100644
index e30f41e1fcaf..000000000000
--- a/reference/mysql_xdevapi/versions.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='mysql_xdevapi\getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\expression' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <!-- Classes and Methods -->
- <function name='mysql_xdevapi\databaseobject' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\databaseobject::getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\databaseobject::getname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\databaseobject::existsindatabase' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\executable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\executable::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\schemaobject' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schemaobject::getschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schemaobject::getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schemaobject::getname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schemaobject::existsindatabase' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\crudoperationbindable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\crudoperationbindable::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\crudoperationlimitable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\crudoperationlimitable::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\crudoperationskippable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\crudoperationskippable::skip' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\crudoperationsortable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\crudoperationsortable::sort' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\warning' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\warning::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\exception' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::__clone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::__wakeup' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::getmessage' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::getcode' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::getfile' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::getline' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::gettrace' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::getprevious' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::gettraceasstring' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\exception::__tostring' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\executionstatus' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\executionstatus::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\expression' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\expression::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\session' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::sql' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::quotename' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::getserverversion' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::generateuuid' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::createschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::dropschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::getdefaultschema' from='PECL mysql-xdevapi &gt;= 8.0.14'/>
- <function name='mysql_xdevapi\session::getschemas' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::getschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::starttransaction' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::commit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::rollback' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::setsavepoint' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::rollbackto' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::releasesavepoint' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::listclients' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\session::close' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\schema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::getname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::existsindatabase' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::createcollection' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::dropcollection' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::getcollection' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::getcollections' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::gettable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::gettables' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::getcollectionastable' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\schema::modifycollection' from='PECL mysql-xdevapi &gt;= 8.0.20'/>
-
- <function name='mysql_xdevapi\collection' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::getname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::existsindatabase' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::count' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::getschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::add' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::find' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::modify' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::remove' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::getone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::replaceone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::addorreplaceone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::removeone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::createindex' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collection::dropindex' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\collectionadd' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionadd::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionadd::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\collectionfind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::fields' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::groupby' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::having' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::sort' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::skip' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::lockshared' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::lockexclusive' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionfind::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\collectionmodify' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::sort' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::skip' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::set' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::unset' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::replace' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::merge' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::patch' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::arrayinsert' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::arrayappend' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::arraydelete' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionmodify::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\collectionremove' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionremove::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionremove::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionremove::sort' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionremove::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\collectionremove::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\statement' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\statement::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\statement::hasmoreresults' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\statement::getresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\statement::getnextresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\sqlstatement' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::hasmoreresults' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::getresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatement::getnextresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\baseresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\baseresult::getwarningcount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\baseresult::getwarnings' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\docresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\docresult::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\docresult::fetchone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\docresult::fetchall' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\docresult::getwarningcount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\docresult::getwarnings' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\result' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::getaffecteditemscount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::getautoincrementvalue' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::getgeneratedids' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::getwarningcount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\result::getwarnings' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\rowresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::fetchone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::fetchall' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::getwarningcount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::getwarnings' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::getcolumncount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::getcolumnnames' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\rowresult::getcolumns' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\sqlstatementresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::hasdata' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::fetchone' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::fetchall' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getaffecteditemscount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getlastinsertid' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getgeneratedids' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getwarningcount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getwarnings' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getcolumncount' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getcolumnnames' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::getcolumns' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\sqlstatementresult::nextresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\columnresult' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getschemaname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::gettablename' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::gettablelabel' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getcolumnname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getcolumnlabel' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getlength' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getfractionaldigits' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::isnumbersigned' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getcollationname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::getcharactersetname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::gettype' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\columnresult::ispadded' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\table' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::getsession' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::getname' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::isview' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::existsindatabase' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::count' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::getschema' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::insert' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::select' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::update' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\table::delete' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\tabledelete' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::where' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::orderby' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tabledelete::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\tableinsert' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableinsert::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableinsert::values' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableinsert::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\tableselect' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::where' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::groupby' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::having' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::orderby' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::offset' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::lockshared' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::lockexclusive' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableselect::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-
- <function name='mysql_xdevapi\tableupdate' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::__construct' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::set' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::where' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::orderby' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::limit' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::bind' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
- <function name='mysql_xdevapi\tableupdate::execute' from='PECL mysql-xdevapi &gt;= 8.0.11'/>
-</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/mysqli/setup.xml b/reference/mysqli/setup.xml
index a93c09e3fb01..c58bd440dace 100644
--- a/reference/mysqli/setup.xml
+++ b/reference/mysqli/setup.xml
@@ -23,15 +23,15 @@
    <emphasis>The server requested authentication method unknown to the client [caching_sha2_password]</emphasis>
    even when <emphasis>caching_sha2_password</emphasis> is not used.
   </para>
-  <para>
+  <simpara>
    This is because MySQL 8 defaults to caching_sha2_password, a plugin that is
    not recognized by the older PHP (mysqlnd) releases. Instead, change it by
    setting <literal>default_authentication_plugin=mysql_native_password</literal>
    in <filename>my.cnf</filename>. The <emphasis>caching_sha2_password</emphasis>
    plugin is fully supported as of PHP 7.4.4. For older releases, the
-   <link linkend="book.mysql-xdevapi">mysql_xdevapi</link> extension does
+   <link xlink:href="../extensions/book.mysql-xdevapi.php">mysql_xdevapi</link> extension does
    support it.
-  </para>
+  </simpara>
 
  </section>
  <!-- }}} -->
diff --git a/reference/mysqlinfo/set.xml b/reference/mysqlinfo/set.xml
index cbeb998edd61..5471976c767e 100644
--- a/reference/mysqlinfo/set.xml
+++ b/reference/mysqlinfo/set.xml
@@ -466,8 +466,6 @@ $ ./configure --with-mysqli=/path/to/mysql_config --with-pdo-mysql=/path/to/mysq
  </book>
 
  &reference.mysqli.book;
- &reference.mysql-xdevapi.book;
- &reference.mysql.book;
  &reference.mysqlnd.book;
 
 </set>
diff --git a/reference/oauth/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/oauth/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/oauth/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/oauth/book.xml b/reference/oauth/book.xml
deleted file mode 100644
index ab305ef480c5..000000000000
--- a/reference/oauth/book.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.oauth">
- <?phpdoc extension-membership="pecl" ?>
- <title>OAuth</title>
-
- <preface xml:id="intro.oauth">
-  &reftitle.intro;
-  <simpara>
-   This extension provides OAuth 1.0a consumer and provider bindings. OAuth is an
-   authorization protocol built on top of HTTP which allows applications
-   to securely access data without having to store usernames and
-   passwords.
-  </simpara>
- </preface>
-
- &reference.oauth.setup;
- &reference.oauth.constants;
- &reference.oauth.examples;
- &reference.oauth.reference;
- &reference.oauth.oauth;
- &reference.oauth.oauthprovider;
- &reference.oauth.oauthexception;
-
-</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/oauth/configure.xml b/reference/oauth/configure.xml
deleted file mode 100644
index 96dd50dffdd4..000000000000
--- a/reference/oauth/configure.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.installation">
- &reftitle.install;
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pear.package;oauth">&url.pear.package;oauth</link>
- </simpara>
-</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/oauth/constants.xml b/reference/oauth/constants.xml
deleted file mode 100644
index 54a0646af142..000000000000
--- a/reference/oauth/constants.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.constants">
- &reftitle.constants;
- &extension.constants;
- <simpara>
-  Most of these constants involve problems, which are also described within the official
-  OAuth <link xlink:href="&url.oauth.problemreporting;">Problem Reporting</link>
-  documentation. Note however, that these constant names are specific to PHP, although
-  the naming scheme is similar.
- </simpara>
- <variablelist>
-  <!-- TODO: Ensure each constant mentions the exact oauth API name/value pair. -->
-  <varlistentry xml:id="constant.oauth-sig-method-rsasha1">
-   <term>
-    <constant>OAUTH_SIG_METHOD_RSASHA1</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     OAuth <emphasis>RSA-SHA1</emphasis> signature method.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-sig-method-hmacsha1">
-   <term>
-    <constant>OAUTH_SIG_METHOD_HMACSHA1</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     OAuth <emphasis>HMAC-SHA1</emphasis> signature method.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-sig-method-hmacsha256">
-   <term>
-    <constant>OAUTH_SIG_METHOD_HMACSHA256</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     OAuth <emphasis>HMAC-SHA256</emphasis> signature method.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-auth-type-authorization">
-   <term>
-    <constant>OAUTH_AUTH_TYPE_AUTHORIZATION</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant represents putting OAuth parameters in the
-     <literal>Authorization</literal> header.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-auth-type-none">
-   <term>
-    <constant>OAUTH_AUTH_TYPE_NONE</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant indicates a NoAuth OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-auth-type-uri">
-   <term>
-    <constant>OAUTH_AUTH_TYPE_URI</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant represents putting OAuth parameters in the request
-     <acronym>URI</acronym>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-auth-type-form">
-   <term>
-    <constant>OAUTH_AUTH_TYPE_FORM</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant represents putting OAuth parameters as part of the
-     HTTP POST body.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-http-method-get">
-   <term>
-    <constant>OAUTH_HTTP_METHOD_GET</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use the <emphasis>GET</emphasis> method for the OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-http-method-post">
-   <term>
-    <constant>OAUTH_HTTP_METHOD_POST</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use the <emphasis>POST</emphasis> method for the OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-http-method-put">
-   <term>
-    <constant>OAUTH_HTTP_METHOD_PUT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use the <emphasis>PUT</emphasis> method for the OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-http-method-head">
-   <term>
-    <constant>OAUTH_HTTP_METHOD_HEAD</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use the <emphasis>HEAD</emphasis> method for the OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-http-method-delete">
-   <term>
-    <constant>OAUTH_HTTP_METHOD_DELETE</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use the <emphasis>DELETE</emphasis> method for the OAuth request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-reqengine-streams">
-   <term>
-    <constant>OAUTH_REQENGINE_STREAMS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Used by <methodname>OAuth::setRequestEngine</methodname> to set the engine to
-     <link linkend="book.stream">PHP streams</link>,
-     as opposed to <constant>OAUTH_REQENGINE_CURL</constant> for
-     <link linkend="book.curl">Curl</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-reqengine-curl">
-   <term>
-    <constant>OAUTH_REQENGINE_CURL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Used by <methodname>OAuth::setRequestEngine</methodname> to set the engine to
-     <link linkend="book.curl">Curl</link>, as opposed to
-     <constant>OAUTH_REQENGINE_STREAMS</constant> for <link linkend="book.stream">PHP streams</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-ok">
-   <term>
-    <constant>OAUTH_OK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Life is good.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-bad-nonce">
-   <term>
-    <constant>OAUTH_BAD_NONCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      The <emphasis>oauth_nonce</emphasis> value was used in a previous request,
-      therefore it cannot be used now.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-bad-timestamp">
-   <term>
-    <constant>OAUTH_BAD_TIMESTAMP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      The <emphasis>oauth_timestamp</emphasis> value was not accepted by the service provider. In
-      this case, the response should also contain the <emphasis>oauth_acceptable_timestamps</emphasis>
-      parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-consumer-key-unknown">
-   <term>
-    <constant>OAUTH_CONSUMER_KEY_UNKNOWN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_consumer_key</emphasis> is temporarily unacceptable to the service provider.
-     For example, the service provider may be throttling the consumer.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-consumer-key-refused">
-   <term>
-    <constant>OAUTH_CONSUMER_KEY_REFUSED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The consumer key was refused.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-invalid-signature">
-   <term>
-    <constant>OAUTH_INVALID_SIGNATURE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      The <emphasis>oauth_signature</emphasis> is invalid, as it does not match the
-      signature computed by the service provider.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-token-used">
-   <term>
-    <constant>OAUTH_TOKEN_USED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_token</emphasis> has been consumed. It can no longer be
-     used because it has already been used in the previous request(s).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-token-expired">
-   <term>
-    <constant>OAUTH_TOKEN_EXPIRED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_token</emphasis> has expired.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-token-revoked">
-   <term>
-    <constant>OAUTH_TOKEN_REVOKED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_token</emphasis> has been revoked, and will never be accepted.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-token-rejected">
-   <term>
-    <constant>OAUTH_TOKEN_REJECTED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_token</emphasis> was not accepted by the service provider.
-     The reason is not known, but it might be because the token was never issued,
-     already consumed, expired, and/or forgotten by the service provider.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-verifier-invalid">
-   <term>
-    <constant>OAUTH_VERIFIER_INVALID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_verifier</emphasis> is incorrect.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-parameter-absent">
-   <term>
-    <constant>OAUTH_PARAMETER_ABSENT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A required parameter was not received. In this case, the response should also
-     contain the <emphasis>oauth_parameters_absent</emphasis> parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.oauth-signature-method-rejected">
-   <term>
-    <constant>OAUTH_SIGNATURE_METHOD_REJECTED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The <emphasis>oauth_signature_method</emphasis> was not accepted by service provider.
-    </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/oauth/examples.xml b/reference/oauth/examples.xml
deleted file mode 100644
index cd18f296a116..000000000000
--- a/reference/oauth/examples.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.examples">
- &reftitle.examples;
-
- <section xml:id="oauth.examples.fireeagle">
-  <title>FireEagle</title>
-  <example>
-   <title/>
-   <programlisting role="php" xml:id="oauth.examples.fireeagle.location">
-<![CDATA[
-<?php
-$req_url = 'https://fireeagle.yahooapis.com/oauth/request_token';
-$authurl = 'https://fireeagle.yahoo.net/oauth/authorize';
-$acc_url = 'https://fireeagle.yahooapis.com/oauth/access_token';
-$api_url = 'https://fireeagle.yahooapis.com/api/0.1';
-$conskey = 'your_consumer_key';
-$conssec = 'your_consumer_secret';
-
-session_start();
-
-// In state=1 the next request should include an oauth_token.
-// If it doesn't go back to 0
-if(!isset($_GET['oauth_token']) && $_SESSION['state']==1) $_SESSION['state'] = 0;
-try {
-  $oauth = new OAuth($conskey,$conssec,OAUTH_SIG_METHOD_HMACSHA1,OAUTH_AUTH_TYPE_URI);
-  $oauth->enableDebug();
-  if(!isset($_GET['oauth_token']) && !$_SESSION['state']) {
-    $request_token_info = $oauth->getRequestToken($req_url);
-    $_SESSION['secret'] = $request_token_info['oauth_token_secret'];
-    $_SESSION['state'] = 1;
-    header('Location: '.$authurl.'?oauth_token='.$request_token_info['oauth_token']);
-    exit;
-  } else if($_SESSION['state']==1) {
-    $oauth->setToken($_GET['oauth_token'],$_SESSION['secret']);
-    $access_token_info = $oauth->getAccessToken($acc_url);
-    $_SESSION['state'] = 2;
-    $_SESSION['token'] = $access_token_info['oauth_token'];
-    $_SESSION['secret'] = $access_token_info['oauth_token_secret'];
-  }
-  $oauth->setToken($_SESSION['token'],$_SESSION['secret']);
-  $oauth->fetch("$api_url/user.json");
-  $json = json_decode($oauth->getLastResponse());
-  print_r($json);
-} catch(OAuthException $E) {
-  print_r($E);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </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/oauth/functions/oauth-get-sbs.xml b/reference/oauth/functions/oauth-get-sbs.xml
deleted file mode 100644
index 1f214dcd0763..000000000000
--- a/reference/oauth/functions/oauth-get-sbs.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.oauth-get-sbs">
- <refnamediv>
-  <refname>oauth_get_sbs</refname>
-  <refpurpose>Generate a Signature Base String</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>oauth_get_sbs</methodname>
-   <methodparam><type>string</type><parameter>http_method</parameter></methodparam>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>request_parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Generates a Signature Base String according to pecl/oauth.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      The HTTP method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>
-      URI to encode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>request_parameters</parameter></term>
-    <listitem>
-     <simpara>
-      Array of request parameters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a Signature Base String.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/functions/oauth-urlencode.xml b/reference/oauth/functions/oauth-urlencode.xml
deleted file mode 100644
index ed1bb5fbebe9..000000000000
--- a/reference/oauth/functions/oauth-urlencode.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.oauth-urlencode">
- <refnamediv>
-  <refname>oauth_urlencode</refname>
-  <refpurpose>Encode a URI to RFC 3986</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>oauth_urlencode</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Encodes a URI to <link xlink:href="&url.rfc;3986">RFC 3986</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>
-      URI to encode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <link xlink:href="&url.rfc;3986">RFC 3986</link> encoded string.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauth.xml b/reference/oauth/oauth.xml
deleted file mode 100644
index 27bef25ecb56..000000000000
--- a/reference/oauth/oauth.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.oauth" role="class">
- <title>The OAuth class</title>
- <titleabbrev>OAuth</titleabbrev>
-
- <partintro>
-
-<!-- {{{ OAuth intro -->
-  <section xml:id="oauth.intro">
-   &reftitle.intro;
-   <simpara>
-    The OAuth extension provides a simple interface to interact with
-    data providers using the OAuth HTTP specification to protect
-    private resources.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="oauth.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>OAuth</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>OAuth</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="oauth.props.debug">debug</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="oauth.props.sslchecks">sslChecks</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="oauth.props.debuginfo">debugInfo</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.oauth')/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.oauth')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="oauth.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="oauth.props.debug">
-     <term><varname>debug</varname></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="oauth.props.sslchecks">
-     <term><varname>sslChecks</varname></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="oauth.props.debuginfo">
-     <term><varname>debugInfo</varname></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-
- </partintro>
-
- &reference.oauth.entities.oauth;
-
-</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/oauth/oauth/construct.xml b/reference/oauth/oauth/construct.xml
deleted file mode 100644
index 503795e67ed6..000000000000
--- a/reference/oauth/oauth/construct.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.construct">
- <refnamediv>
-  <refname>OAuth::__construct</refname>
-  <refpurpose>Create a new OAuth object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>OAuth::__construct</methodname>
-   <methodparam><type>string</type><parameter>consumer_key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>consumer_secret</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>signature_method</parameter><initializer><constant>OAUTH_SIG_METHOD_HMACSHA1</constant></initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>auth_type</parameter><initializer>0</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates a new OAuth object
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>consumer_key</parameter></term>
-    <listitem>
-     <simpara>
-      The consumer key provided by the service provider.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>consumer_secret</parameter></term>
-    <listitem>
-     <simpara>
-      The consumer secret provided by the service provider.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signature_method</parameter></term>
-    <listitem>
-     <simpara>
-      This optional parameter defines which signature method to use, by default it is <constant>OAUTH_SIG_METHOD_HMACSHA1</constant> (HMAC-SHA1).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>auth_type</parameter></term>
-    <listitem>
-     <simpara>
-      This optional parameter defines how to pass the OAuth parameters
-      to a consumer, by default it is
-      <constant>OAUTH_AUTH_TYPE_AUTHORIZATION</constant> (in the
-      <literal>Authorization</literal> header).
-     </simpara>
-    </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/oauth/oauth/destruct.xml b/reference/oauth/oauth/destruct.xml
deleted file mode 100644
index 65e73865ba38..000000000000
--- a/reference/oauth/oauth/destruct.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.destruct">
- <refnamediv>
-  <refname>OAuth::__destruct</refname>
-  <refpurpose>The destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuth::__destruct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   The destructor.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::__construct</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/oauth/oauth/disabledebug.xml b/reference/oauth/oauth/disabledebug.xml
deleted file mode 100644
index 6e6950d3e7b4..000000000000
--- a/reference/oauth/oauth/disabledebug.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.disabledebug">
- <refnamediv>
-  <refname>OAuth::disableDebug</refname>
-  <refpurpose>Turn off verbose debugging</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::disableDebug</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Turns off verbose request information (off by default).
-   Alternatively, the <link linkend="oauth.props.debug">debug</link> property can
-   be set to a &false; value to turn debug off.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 0.99.8</entry>
-      <entry>
-       The related <link linkend="oauth.props.debug">debug</link> property was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::enableDebug</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/oauth/oauth/disableredirects.xml b/reference/oauth/oauth/disableredirects.xml
deleted file mode 100644
index b04b4bc8c6a1..000000000000
--- a/reference/oauth/oauth/disableredirects.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.disableredirects">
- <refnamediv>
-  <refname>OAuth::disableRedirects</refname>
-  <refpurpose>Turn off redirects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::disableRedirects</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Disable redirects from being followed automatically, thus allowing the request to be manually redirected.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::enableRedirects</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/oauth/oauth/disablesslchecks.xml b/reference/oauth/oauth/disablesslchecks.xml
deleted file mode 100644
index a5955ba1fa1d..000000000000
--- a/reference/oauth/oauth/disablesslchecks.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.disablesslchecks">
- <refnamediv>
-  <refname>OAuth::disableSSLChecks</refname>
-  <refpurpose>Turn off SSL checks</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::disableSSLChecks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Turns off the usual SSL peer certificate and host checks,
-   this is not for production environments. Alternatively, the
-   <parameter>sslChecks</parameter> member can be set to &false;
-   to turn SSL checks off.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 0.99.8</entry>
-      <entry>
-       The <parameter>sslChecks</parameter> member was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::enableSSLChecks</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/oauth/oauth/enabledebug.xml b/reference/oauth/oauth/enabledebug.xml
deleted file mode 100644
index 20a5517b8ad2..000000000000
--- a/reference/oauth/oauth/enabledebug.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.enabledebug">
- <refnamediv>
-  <refname>OAuth::enableDebug</refname>
-  <refpurpose>Turn on verbose debugging</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::enableDebug</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Turns on verbose request information useful for debugging,
-   the debug information is stored in the <parameter>debugInfo</parameter>
-   member. Alternatively, the <parameter>debug</parameter> member can
-   be set to a non-&false; value to turn debug on.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 0.99.8</entry>
-      <entry>
-       The <parameter>debug</parameter> and <parameter>debugInfo</parameter> members were added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::disableDebug</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/oauth/oauth/enableredirects.xml b/reference/oauth/oauth/enableredirects.xml
deleted file mode 100644
index 49575da8a18c..000000000000
--- a/reference/oauth/oauth/enableredirects.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.enableredirects">
- <refnamediv>
-  <refname>OAuth::enableRedirects</refname>
-  <refpurpose>Turn on redirects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::enableRedirects</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Follow and sign redirects automatically, which is enabled by default.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::disableRedirects</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/oauth/oauth/enablesslchecks.xml b/reference/oauth/oauth/enablesslchecks.xml
deleted file mode 100644
index 46840ac1eb9e..000000000000
--- a/reference/oauth/oauth/enablesslchecks.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.enablesslchecks">
- <refnamediv>
-  <refname>OAuth::enableSSLChecks</refname>
-  <refpurpose>Turn on SSL checks</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::enableSSLChecks</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Turns on the usual SSL peer certificate and host checks (enabled by default).
-   Alternatively, the <link linkend="oauth.props.sslchecks">sslChecks</link> property can be set to a
-   non-&false; value to turn SSL checks on.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 0.99.8</entry>
-      <entry>
-       The <parameter>sslChecks</parameter> member was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::disableSSLChecks</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/oauth/oauth/fetch.xml b/reference/oauth/oauth/fetch.xml
deleted file mode 100644
index 5508d8ffc5bb..000000000000
--- a/reference/oauth/oauth/fetch.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.fetch">
- <refnamediv>
-  <refname>OAuth::fetch</refname>
-  <refpurpose>Fetch an OAuth protected resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>OAuth::fetch</methodname>
-   <methodparam><type>string</type><parameter>protected_resource_url</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>extra_parameters</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>http_method</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>http_headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetch a resource.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>protected_resource_url</parameter></term>
-    <listitem>
-     <simpara>
-      URL to the OAuth protected resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>extra_parameters</parameter></term>
-    <listitem>
-     <simpara>
-      Extra parameters to send with the request for the resource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <constant>OAUTH_HTTP_METHOD_<replaceable>*</replaceable></constant>
-      OAUTH constants, which includes
-      GET, POST, PUT, HEAD, or DELETE.
-     </simpara>
-     <simpara>
-      HEAD (<constant>OAUTH_HTTP_METHOD_HEAD</constant>) can be useful for
-      discovering information prior to the request (if OAuth credentials are
-      in the <literal>Authorization</literal> header).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>http_headers</parameter></term>
-    <listitem>
-     <simpara>
-      HTTP client headers (such as User-Agent, Accept, etc.)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-     <row>
-      <entry>PECL oauth 0.99.5</entry>
-      <entry>
-       The <parameter>http_method</parameter> parameter was added
-      </entry>
-     </row>
-     <row>
-      <entry>PECL oauth 0.99.8</entry>
-      <entry>
-       The <parameter>http_headers</parameter> parameter was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuth::fetch</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $oauth = new OAuth("consumer_key","consumer_secret",OAUTH_SIG_METHOD_HMACSHA1,OAUTH_AUTH_TYPE_AUTHORIZATION);
-    $oauth->setToken("access_token","access_token_secret");
-
-    $oauth->fetch("http://photos.example.net/photo?file=vacation.jpg");
-
-    $response_info = $oauth->getLastResponseInfo();
-    header("Content-Type: {$response_info["content_type"]}");
-    echo $oauth->getLastResponse();
-} catch(OAuthException $E) {
-    echo "Exception caught!\n";
-    echo "Response: ". $E->lastResponse . "\n";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::getLastResponse</methodname></member>
-   <member><methodname>OAuth::getLastResponseInfo</methodname></member>
-   <member><methodname>OAuth::setToken</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/oauth/oauth/generatesignature.xml b/reference/oauth/oauth/generatesignature.xml
deleted file mode 100644
index 62c21cfc2c55..000000000000
--- a/reference/oauth/oauth/generatesignature.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.generatesignature">
- <refnamediv>
-  <refname>OAuth::generateSignature</refname>
-  <refpurpose>Generate a signature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>OAuth::generateSignature</methodname>
-   <methodparam><type>string</type><parameter>http_method</parameter></methodparam>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>extra_parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Generate a signature based on the final HTTP method, URL and a string/array of parameters.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      HTTP method for request
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      URL for request
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>extra_parameters</parameter></term>
-    <listitem>
-     <simpara>
-      String or array of additional parameters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string containing the generated signature&return.falseforfailure;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauth/getaccesstoken.xml b/reference/oauth/oauth/getaccesstoken.xml
deleted file mode 100644
index a89a5e4d1098..000000000000
--- a/reference/oauth/oauth/getaccesstoken.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getaccesstoken">
- <refnamediv>
-  <refname>OAuth::getAccessToken</refname>
-  <refpurpose>Fetch an access token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>OAuth::getAccessToken</methodname>
-   <methodparam><type>string</type><parameter>access_token_url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>auth_session_handle</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>verifier_token</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>http_method</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetch an access token, secret and any additional response parameters from the service provider.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>access_token_url</parameter></term>
-    <listitem>
-     <simpara>
-      URL to the access token API.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>auth_session_handle</parameter></term>
-    <listitem>
-     <simpara>
-      Authorization session handle, this parameter does not have any
-      citation in the core OAuth 1.0 specification but may be
-      implemented by large providers.
-      <link xlink:href="&url.oauth.scale;">See ScalableOAuth</link>
-      for more information.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>verifier_token</parameter></term>
-    <listitem>
-     <simpara>
-      For service providers which support 1.0a, a <parameter>verifier_token</parameter>
-      must be passed while exchanging the request token for the access
-      token. If the <parameter>verifier_token</parameter> is present in <parameter>$_GET</parameter>
-      or <parameter>$_POST</parameter> it is passed automatically and the caller
-      does not need to specify a <parameter>verifier_token</parameter> (usually if the access token
-      is exchanged at the oauth_callback URL).
-      <link xlink:href="&url.oauth.scale;">See ScalableOAuth</link>
-      for more information.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      HTTP method to use, e.g. <literal>GET</literal> or <literal>POST</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array containing the parsed OAuth response on success or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-     <row>
-      <entry>PECL oauth 0.99.9</entry>
-      <entry>
-       The <parameter>verifier_token</parameter> parameter was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuth::getAccessToken</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $oauth = new OAuth(OAUTH_CONSUMER_KEY,OAUTH_CONSUMER_SECRET);
-    $oauth->setToken($request_token,$request_token_secret);
-    $access_token_info = $oauth->getAccessToken("https://example.com/oauth/access_token");
-    if(!empty($access_token_info)) {
-        print_r($access_token_info);
-    } else {
-        print "Failed fetching access token, response was: " . $oauth->getLastResponse();
-    }
-} catch(OAuthException $E) {
-    echo "Response: ". $E->lastResponse . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [oauth_token] => some_token
-    [oauth_token_secret] => some_token_secret
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::getLastResponse</methodname></member>
-   <member><methodname>OAuth::getLastResponseInfo</methodname></member>
-   <member><methodname>OAuth::setToken</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/oauth/oauth/getcapath.xml b/reference/oauth/oauth/getcapath.xml
deleted file mode 100644
index 22f2513f0720..000000000000
--- a/reference/oauth/oauth/getcapath.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getcapath">
- <refnamediv>
-  <refname>OAuth::getCAPath</refname>
-  <refpurpose>Gets CA information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>OAuth::getCAPath</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets the Certificate Authority information, which includes the
-   ca_path and ca_info set by <methodname>OAuth::setCaPath</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of Certificate Authority information, specifically as
-   <literal>ca_path</literal> and <literal>ca_info</literal> keys within the returned
-   associative array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::setCAPath</methodname></member>
-   <member><methodname>OAuth::getLastResponseInfo</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/oauth/oauth/getlastresponse.xml b/reference/oauth/oauth/getlastresponse.xml
deleted file mode 100644
index 333e20e93c1b..000000000000
--- a/reference/oauth/oauth/getlastresponse.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getlastresponse">
- <refnamediv>
-  <refname>OAuth::getLastResponse</refname>
-  <refpurpose>Get the last response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>OAuth::getLastResponse</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get the raw response of the most recent request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string containing the last response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::getLastResponseInfo</methodname></member>
-   <member><methodname>OAuth::fetch</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/oauth/oauth/getlastresponseheaders.xml b/reference/oauth/oauth/getlastresponseheaders.xml
deleted file mode 100644
index 1a1df9e29518..000000000000
--- a/reference/oauth/oauth/getlastresponseheaders.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getlastresponseheaders">
- <refnamediv>
-  <refname>OAuth::getLastResponseHeaders</refname>
-  <refpurpose>Get headers for last response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>OAuth::getLastResponseHeaders</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get headers for last response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string containing the last response's headers&return.falseforfailure;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauth/getlastresponseinfo.xml b/reference/oauth/oauth/getlastresponseinfo.xml
deleted file mode 100644
index 221990d77719..000000000000
--- a/reference/oauth/oauth/getlastresponseinfo.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getlastresponseinfo">
- <refnamediv>
-  <refname>OAuth::getLastResponseInfo</refname>
-  <refpurpose>Get HTTP information about the last response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>OAuth::getLastResponseInfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get HTTP information about the last response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array containing the response information for the last
-   request. Constants from <function>curl_getinfo</function> may be
-   used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::fetch</methodname></member>
-   <member><methodname>OAuth::getLastResponse</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/oauth/oauth/getrequestheader.xml b/reference/oauth/oauth/getrequestheader.xml
deleted file mode 100644
index df39f8f7a6c3..000000000000
--- a/reference/oauth/oauth/getrequestheader.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getrequestheader">
- <refnamediv>
-  <refname>OAuth::getRequestHeader</refname>
-  <refpurpose>Generate OAuth header string signature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>OAuth::getRequestHeader</methodname>
-   <methodparam><type>string</type><parameter>http_method</parameter></methodparam>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>extra_parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Generate OAuth header string signature based on the final HTTP method, URL and a string/array of parameters
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      HTTP method for request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      URL for request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>extra_parameters</parameter></term>
-    <listitem>
-     <simpara>
-      String or array of additional parameters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string containing the generated request header&return.falseforfailure;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauth/getrequesttoken.xml b/reference/oauth/oauth/getrequesttoken.xml
deleted file mode 100644
index e3fb021df4ec..000000000000
--- a/reference/oauth/oauth/getrequesttoken.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.getrequesttoken">
- <refnamediv>
-  <refname>OAuth::getRequestToken</refname>
-  <refpurpose>Fetch a request token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>OAuth::getRequestToken</methodname>
-   <methodparam><type>string</type><parameter>request_token_url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>callback_url</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>http_method</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetch a request token, secret and any additional response parameters from the service provider.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request_token_url</parameter></term>
-    <listitem>
-     <simpara>
-      URL to the request token API.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback_url</parameter></term>
-    <listitem>
-     <simpara>
-      OAuth callback URL. If <parameter>callback_url</parameter> is passed and is an empty value, it is set to "oob" to address the OAuth 2009.1 advisory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>http_method</parameter></term>
-    <listitem>
-     <simpara>
-      HTTP method to use, e.g. <literal>GET</literal> or <literal>POST</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array containing the parsed OAuth response on success or &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-     <row>
-      <entry>PECL oauth 0.99.9</entry>
-      <entry>
-       The <parameter>callback_url</parameter> parameter was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuth::getRequestToken</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $oauth = new OAuth(OAUTH_CONSUMER_KEY,OAUTH_CONSUMER_SECRET);
-    $request_token_info = $oauth->getRequestToken("https://example.com/oauth/request_token");
-    if(!empty($request_token_info)) {
-        print_r($request_token_info);
-    } else {
-        print "Failed fetching request token, response was: " . $oauth->getLastResponse();
-    }
-} catch(OAuthException $E) {
-    echo "Response: ". $E->lastResponse . "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [oauth_token] => some_token
-    [oauth_token_secret] => some_token_secret
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::getLastResponse</methodname></member>
-   <member><methodname>OAuth::getLastResponseInfo</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/oauth/oauth/setauthtype.xml b/reference/oauth/oauth/setauthtype.xml
deleted file mode 100644
index 2c7c1fbba8c1..000000000000
--- a/reference/oauth/oauth/setauthtype.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setauthtype">
- <refnamediv>
-  <refname>OAuth::setAuthType</refname>
-  <refpurpose>Set authorization type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::setAuthType</methodname>
-   <methodparam><type>int</type><parameter>auth_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set where the OAuth parameters should be passed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>auth_type</parameter></term>
-     <listitem>
-      <para>
-       <parameter>auth_type</parameter> can be one of the following flags (in order of decreasing preference as per OAuth 1.0 section 5.2):
-       <variablelist>
-        <varlistentry>
-         <term><constant>OAUTH_AUTH_TYPE_AUTHORIZATION</constant></term>
-         <listitem>
-         <simpara>
-          Pass the OAuth parameters in the HTTP <literal>Authorization</literal> header.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><constant>OAUTH_AUTH_TYPE_FORM</constant></term>
-        <listitem>
-         <simpara>
-          Append the OAuth parameters to the HTTP POST request body.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><constant>OAUTH_AUTH_TYPE_URI</constant></term>
-        <listitem>
-         <simpara>
-          Append the OAuth parameters to the request URI.
-         </simpara>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><constant>OAUTH_AUTH_TYPE_NONE</constant></term>
-        <listitem>
-         <simpara>
-          None.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if a parameter is correctly set, otherwise &false;
-   (e.g., if an invalid <parameter>auth_type</parameter> is passed in.)
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </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/oauth/oauth/setcapath.xml b/reference/oauth/oauth/setcapath.xml
deleted file mode 100644
index 4b15758c2019..000000000000
--- a/reference/oauth/oauth/setcapath.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setcapath">
- <refnamediv>
-  <refname>OAuth::setCAPath</refname>
-  <refpurpose>Set CA path and info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>OAuth::setCAPath</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>ca_path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ca_info</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the Certificate Authority (<acronym>CA</acronym>), both for path
-   and info.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ca_path</parameter></term>
-    <listitem>
-     <simpara>
-      The CA Path being set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ca_info</parameter></term>
-    <listitem>
-     <simpara>
-      The CA Info being set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; if either <parameter>ca_path</parameter>
-   or <parameter>ca_info</parameter> are considered invalid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::getCaPath</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/oauth/oauth/setnonce.xml b/reference/oauth/oauth/setnonce.xml
deleted file mode 100644
index 342028afcb0f..000000000000
--- a/reference/oauth/oauth/setnonce.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setnonce">
- <refnamediv>
-  <refname>OAuth::setNonce</refname>
-  <refpurpose>Set the nonce for subsequent requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>OAuth::setNonce</methodname>
-   <methodparam><type>string</type><parameter>nonce</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the nonce for all subsequent requests.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nonce</parameter></term>
-    <listitem>
-     <simpara>
-      The value for oauth_nonce.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; if the
-   <parameter>nonce</parameter> is considered invalid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::setToken</methodname></member>
-   <member><methodname>OAuth::setAuthType</methodname></member>
-   <member><methodname>OAuth::setVersion</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/oauth/oauth/setrequestengine.xml b/reference/oauth/oauth/setrequestengine.xml
deleted file mode 100644
index c29a0dbe6e9a..000000000000
--- a/reference/oauth/oauth/setrequestengine.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setrequestengine">
- <refnamediv>
-  <refname>OAuth::setRequestEngine</refname>
-  <refpurpose>The setRequestEngine purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuth::setRequestEngine</methodname>
-   <methodparam><type>int</type><parameter>reqengine</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the Request Engine, that will be sending the HTTP requests.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>reqengine</parameter></term>
-    <listitem>
-     <simpara>
-      The desired request engine. Set to <constant>OAUTH_REQENGINE_STREAMS</constant>
-      to use PHP Streams, or <constant>OAUTH_REQENGINE_CURL</constant> to use
-      <link linkend="book.curl">Curl</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Emits an <classname>OAuthException</classname> exception if an invalid
-   request engine is chosen.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuth::setRequestEngine</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$consumer = new OAuth();
-
-$consumer->setRequestEngine(OAUTH_REQENGINE_STREAMS);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="book.curl">Curl</link></member>
-   <member><link linkend="book.stream">PHP streams</link></member>
-   <member><classname>OAuthException</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/oauth/oauth/setrsacertificate.xml b/reference/oauth/oauth/setrsacertificate.xml
deleted file mode 100644
index e05891e16456..000000000000
--- a/reference/oauth/oauth/setrsacertificate.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setrsacertificate">
- <refnamediv>
-  <refname>OAuth::setRSACertificate</refname>
-  <refpurpose>Set the RSA certificate</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>OAuth::setRSACertificate</methodname>
-   <methodparam><type>string</type><parameter>cert</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the <acronym>RSA</acronym> certificate.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cert</parameter></term>
-    <listitem>
-     <simpara>
-      The <acronym>RSA</acronym> certificate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; on failure (e.g., the RSA certificate
-   cannot be parsed.)
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="oauth.setrsacertificate.example">
-   <title>An <methodname>OAuth::setRsaCertificate</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$consume = new OAuth('1234', '', OAUTH_SIG_METHOD_RSASHA1);
-
-$consume->setRSACertificate(file_get_contents('test.pem'));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::setCaPath</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/oauth/oauth/setsslchecks.xml b/reference/oauth/oauth/setsslchecks.xml
deleted file mode 100644
index 2a736bf9da75..000000000000
--- a/reference/oauth/oauth/setsslchecks.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setsslchecks">
- <refnamediv>
-  <refname>OAuth::setSSLChecks</refname>
-  <refpurpose>Tweak specific SSL checks for requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::setSSLChecks</methodname>
-   <methodparam><type>int</type><parameter>sslcheck</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Tweak specific SSL checks for requests.
-  </simpara>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sslcheck</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauth/settimestamp.xml b/reference/oauth/oauth/settimestamp.xml
deleted file mode 100644
index 1d2c405c87eb..000000000000
--- a/reference/oauth/oauth/settimestamp.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.settimestamp">
- <refnamediv>
-  <refname>OAuth::setTimestamp</refname>
-  <refpurpose>Set the timestamp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>OAuth::setTimestamp</methodname>
-   <methodparam><type>string</type><parameter>timestamp</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the OAuth timestamp for subsequent requests.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timestamp</parameter></term>
-    <listitem>
-     <simpara>
-      The timestamp.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true;, unless the <parameter>timestamp</parameter> is invalid, in which
-   case &false; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL oauth 1.0.0</entry>
-      <entry>
-       &oauth.changelog.error.null;
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuth::setNonce</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/oauth/oauth/settoken.xml b/reference/oauth/oauth/settoken.xml
deleted file mode 100644
index c895962a9049..000000000000
--- a/reference/oauth/oauth/settoken.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.settoken">
- <refnamediv>
-  <refname>OAuth::setToken</refname>
-  <refpurpose>Sets the token and secret</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::setToken</methodname>
-   <methodparam><type>string</type><parameter>token</parameter></methodparam>
-   <methodparam><type>string</type><parameter>token_secret</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set the token and secret for subsequent requests.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>token</parameter></term>
-    <listitem>
-     <simpara>
-      The OAuth token.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>token_secret</parameter></term>
-    <listitem>
-     <simpara>
-      The OAuth token secret.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuth::setToken</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$oauth = new OAuth(OAUTH_CONSUMER_KEY,OAUTH_CONSUMER_SECRET);
-$oauth->setToken("token","token-secret");
-?>
-]]>
-   </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/oauth/oauth/setversion.xml b/reference/oauth/oauth/setversion.xml
deleted file mode 100644
index 7f96fcce644e..000000000000
--- a/reference/oauth/oauth/setversion.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setversion">
- <refnamediv>
-  <refname>OAuth::setVersion</refname>
-  <refpurpose>Set the OAuth version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>OAuth::setVersion</methodname>
-   <methodparam><type>string</type><parameter>version</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the OAuth version for subsequent requests
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <simpara>
-      OAuth version, default value is always "1.0"
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/oauth/oauthexception.xml b/reference/oauth/oauthexception.xml
deleted file mode 100644
index 8f380b17d4e8..000000000000
--- a/reference/oauth/oauthexception.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.oauthexception" role="class">
-
- <title>OAuthException class</title>
- <titleabbrev>OAuthException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ OAuthException intro -->
-  <section xml:id="oauthexception.intro">
-   &reftitle.intro;
-   <simpara>
-    This exception is thrown when exceptional errors occur while using the OAuth extension and contains useful debugging information.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="oauthexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>OAuthException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>OAuthException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="oauthexception.props.lastresponse">lastResponse</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="oauthexception.props.debuginfo">debugInfo</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>
-
-
-<!-- {{{ OAuthException properties -->
-  <section xml:id="oauthexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="oauthexception.props.lastresponse">
-     <term><varname>lastResponse</varname></term>
-     <listitem>
-      <simpara>The response of the exception which occurred, if any</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="oauthexception.props.debuginfo">
-     <term><varname>debugInfo</varname></term>
-     <listitem>
-      <simpara/>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
-</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/oauth/oauthprovider.xml b/reference/oauth/oauthprovider.xml
deleted file mode 100644
index 90352860097f..000000000000
--- a/reference/oauth/oauthprovider.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.oauthprovider" role="class">
-
- <title>The OAuthProvider class</title>
- <titleabbrev>OAuthProvider</titleabbrev>
-
- <partintro>
-
-<!-- {{{ OAuthProvider intro -->
-  <section xml:id="oauthprovider.intro">
-   &reftitle.intro;
-   <simpara>
-    Manages an OAuth provider class.
-   </simpara>
-   <simpara>
-    See also an external in-depth tutorial titled
-    <link xlink:href="&url.oauth.provider.tutorial;">Writing an OAuth Provider Service</link>,
-    which takes a hands-on approach to providing this service. There are also
-    <link xlink:href="&url.oauth.examples;">OAuth provider examples</link> within the OAuth
-    extensions sources.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="oauthprovider.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>OAuthProvider</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>OAuthProvider</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.oauthprovider')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.oauth.entities.oauthprovider;
-
-</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/oauth/oauthprovider/addrequiredparameter.xml b/reference/oauth/oauthprovider/addrequiredparameter.xml
deleted file mode 100644
index ec694b532df6..000000000000
--- a/reference/oauth/oauthprovider/addrequiredparameter.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.addrequiredparameter">
- <refnamediv>
-  <refname>OAuthProvider::addRequiredParameter</refname>
-  <refpurpose>Add required parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>OAuthProvider::addRequiredParameter</methodname>
-   <methodparam><type>string</type><parameter>req_params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add required oauth provider parameters.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>req_params</parameter></term>
-    <listitem>
-     <simpara>
-      The required parameters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::removeRequiredParameter</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/oauth/oauthprovider/callconsumerhandler.xml b/reference/oauth/oauthprovider/callconsumerhandler.xml
deleted file mode 100644
index 3df61cf0435f..000000000000
--- a/reference/oauth/oauthprovider/callconsumerhandler.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.callconsumerhandler">
- <refnamediv>
-  <refname>OAuthProvider::callconsumerHandler</refname>
-  <refpurpose>Calls the consumerNonceHandler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::callconsumerHandler</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Calls the registered consumer handler callback function, which is set
-   with <methodname>OAuthProvider::consumerHandler</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &oauth.callback.error;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::consumerHandler</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/oauth/oauthprovider/calltimestampnoncehandler.xml b/reference/oauth/oauthprovider/calltimestampnoncehandler.xml
deleted file mode 100644
index 6b19bb822902..000000000000
--- a/reference/oauth/oauthprovider/calltimestampnoncehandler.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.calltimestampnoncehandler">
- <refnamediv>
-  <refname>OAuthProvider::callTimestampNonceHandler</refname>
-  <refpurpose>Calls the timestampNonceHandler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::callTimestampNonceHandler</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Calls the registered timestamp handler callback function, which is set
-   with <methodname>OAuthProvider::timestampNonceHandler</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &oauth.callback.error;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::timestampNonceHandler</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/oauth/oauthprovider/calltokenhandler.xml b/reference/oauth/oauthprovider/calltokenhandler.xml
deleted file mode 100644
index 050d3a9b0c4f..000000000000
--- a/reference/oauth/oauthprovider/calltokenhandler.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.calltokenhandler">
- <refnamediv>
-  <refname>OAuthProvider::calltokenHandler</refname>
-  <refpurpose>Calls the tokenNonceHandler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::calltokenHandler</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Calls the registered token handler callback function, which is set
-   with <methodname>OAuthProvider::tokenHandler</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   &oauth.callback.error;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::tokenHandler</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/oauth/oauthprovider/checkoauthrequest.xml b/reference/oauth/oauthprovider/checkoauthrequest.xml
deleted file mode 100644
index 8b06ac3a8124..000000000000
--- a/reference/oauth/oauthprovider/checkoauthrequest.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.checkoauthrequest">
- <refnamediv>
-  <refname>OAuthProvider::checkOAuthRequest</refname>
-  <refpurpose>Check an oauth request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::checkOAuthRequest</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>uri</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks an OAuth request.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>
-      The optional <acronym>URI</acronym>, or endpoint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method</parameter></term>
-    <listitem>
-     <simpara>
-      The <acronym>HTTP</acronym> method. Optionally pass in one of the
-      <constant>OAUTH_HTTP_METHOD_<replaceable>*</replaceable></constant> OAuth constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Emits an <constant>E_ERROR</constant> level error if
-   the HTTP method cannot be detected.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::reportProblem</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/oauth/oauthprovider/construct.xml b/reference/oauth/oauthprovider/construct.xml
deleted file mode 100644
index 9b54240a92a9..000000000000
--- a/reference/oauth/oauthprovider/construct.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.construct">
- <refnamediv>
-  <refname>OAuthProvider::__construct</refname>
-  <refpurpose>Constructs a new OAuthProvider object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>OAuthProvider::__construct</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>params_array</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Initiates a new <classname>OAuthProvider</classname> <type>object</type>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>params_array</parameter></term>
-    <listitem>
-     <simpara>
-      Setting these optional parameters is limited to the
-      <link linkend="features.commandline">CLI SAPI</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <classname>OAuthProvider</classname> <type>object</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuthProvider::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-
-    $op = new OAuthProvider();
-
-    // Uses user-defined callback functions
-    $op->consumerHandler(array($this, 'lookupConsumer'));
-    $op->timestampNonceHandler(array($this, 'timestampNonceChecker'));
-    $op->tokenHandler(array($this, 'myTokenHandler'));
-
-    // Ignore the foo_uri parameter
-    $op->setParam('foo_uri', NULL);
-
-    // No token needed for this end point
-    $op->setRequestTokenPath('/v1/oauth/request_token');
-
-    $op->checkOAuthRequest();
-
-} catch (OAuthException $e) {
-
-    echo OAuthProvider::reportProblem($e);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::setParam</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/oauth/oauthprovider/consumerhandler.xml b/reference/oauth/oauthprovider/consumerhandler.xml
deleted file mode 100644
index 092d541723a1..000000000000
--- a/reference/oauth/oauthprovider/consumerhandler.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.consumerhandler">
- <refnamediv>
-  <refname>OAuthProvider::consumerHandler</refname>
-  <refpurpose>Set the consumerHandler handler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::consumerHandler</methodname>
-   <methodparam><type>callable</type><parameter>callback_function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the consumer handler callback, which will later be called with
-   <methodname>OAuthProvider::callConsumerHandler</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback_function</parameter></term>
-    <listitem>
-     <simpara>
-      The <type>callable</type> functions name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Example <methodname>OAuthProvider::consumerHandler</methodname> callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function lookupConsumer($provider) {
-
-    if ($provider->consumer_key === 'unknown') {
-        return OAUTH_CONSUMER_KEY_UNKNOWN;
-    } else if($provider->consumer_key == 'blacklisted' || $provider->consumer_key === 'throttled') {
-        return OAUTH_CONSUMER_KEY_REFUSED;
-    }
-
-    $provider->consumer_secret = "the_consumers_secret";
-
-    return OAUTH_OK;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::callConsumerHandler</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/oauth/oauthprovider/generatetoken.xml b/reference/oauth/oauthprovider/generatetoken.xml
deleted file mode 100644
index 344ccebb31e0..000000000000
--- a/reference/oauth/oauthprovider/generatetoken.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.generatetoken">
- <refnamediv>
-  <refname>OAuthProvider::generateToken</refname>
-  <refpurpose>Generate a random token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>OAuthProvider::generateToken</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>strong</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Generates a <type>string</type> of pseudo-random bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      The desired token length, in terms of bytes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>strong</parameter></term>
-    <listitem>
-     <simpara>
-      Setting to &true; means <literal>/dev/random</literal> will be used for
-      entropy, as otherwise the non-blocking <literal>/dev/urandom</literal> is used.
-      This parameter is ignored on Windows.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The generated token, as a <type>string</type> of bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If the <parameter>strong</parameter> parameter is &true;, then an
-   <constant>E_WARNING</constant> level error will be emitted when the
-   fallback <function>rand</function> implementation is used to fill
-   the remaining random bytes (e.g., when not enough random data was found,
-   initially).
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuthProvider::generateToken</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$p = new OAuthProvider();
-
-$t = $p->generateToken(4);
-
-echo strlen($t),  PHP_EOL;
-echo bin2hex($t), PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-4
-b6a82c27
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    When not enough random data is available to the system, this function will
-    fill the remaining random bytes using the internal PHP <function>rand</function>
-    implementation.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openssl_random_pseudo_bytes</function></member>
-   <member><function>mcrypt_create_iv</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/oauth/oauthprovider/is2leggedendpoint.xml b/reference/oauth/oauthprovider/is2leggedendpoint.xml
deleted file mode 100644
index 5b02a339d302..000000000000
--- a/reference/oauth/oauthprovider/is2leggedendpoint.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.is2leggedendpoint">
- <refnamediv>
-  <refname>OAuthProvider::is2LeggedEndpoint</refname>
-  <refpurpose>is2LeggedEndpoint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::is2LeggedEndpoint</methodname>
-   <methodparam><type>mixed</type><parameter>params_array</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The 2-legged flow, or request signing. It does not require a token.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>params_array</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <classname>OAuthProvider</classname> <type>object</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>OAuthProvider::is2LeggedEndpoint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$provider = new OAuthProvider();
-
-$provider->is2LeggedEndpoint(true);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::__construct</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/oauth/oauthprovider/isrequesttokenendpoint.xml b/reference/oauth/oauthprovider/isrequesttokenendpoint.xml
deleted file mode 100644
index 7b192c9fa5ec..000000000000
--- a/reference/oauth/oauthprovider/isrequesttokenendpoint.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.isrequesttokenendpoint">
- <refnamediv>
-  <refname>OAuthProvider::isRequestTokenEndpoint</refname>
-  <refpurpose>Sets isRequestTokenEndpoint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::isRequestTokenEndpoint</methodname>
-   <methodparam><type>bool</type><parameter>will_issue_request_token</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>will_issue_request_token</parameter></term>
-    <listitem>
-     <simpara>
-      Sets whether or not it will issue a request token, thus determining if
-      <methodname>OAuthProvider::tokenHandler</methodname> needs to be called.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::setRequestTokenPath</methodname></member>
-   <member><methodname>OAuthProvider::reportProblem</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/oauth/oauthprovider/removerequiredparameter.xml b/reference/oauth/oauthprovider/removerequiredparameter.xml
deleted file mode 100644
index b13fd46791b0..000000000000
--- a/reference/oauth/oauthprovider/removerequiredparameter.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.removerequiredparameter">
- <refnamediv>
-  <refname>OAuthProvider::removeRequiredParameter</refname>
-  <refpurpose>Remove a required parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>OAuthProvider::removeRequiredParameter</methodname>
-   <methodparam><type>string</type><parameter>req_params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes a required parameter.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>req_params</parameter></term>
-    <listitem>
-     <simpara>
-      The required parameter to be removed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::setParam</methodname></member>
-   <member><methodname>OAuthProvider::addRequiredParameter</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/oauth/oauthprovider/reportproblem.xml b/reference/oauth/oauthprovider/reportproblem.xml
deleted file mode 100644
index 109eab1a6ce6..000000000000
--- a/reference/oauth/oauthprovider/reportproblem.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.reportproblem">
- <refnamediv>
-  <refname>OAuthProvider::reportProblem</refname>
-  <refpurpose>Report a problem</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>OAuthProvider::reportProblem</methodname>
-   <methodparam><type>string</type><parameter>oauthexception</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>send_headers</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Pass in a problem as an <classname>OAuthException</classname>, with possible problems listed
-   in the <link linkend="oauth.constants">OAuth constants</link> section.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>oauthexception</parameter></term>
-    <listitem>
-     <simpara>
-      The <classname>OAuthException</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::checkOAuthRequest</methodname></member>
-   <member><methodname>OAuthProvider::isRequestTokenEndpoint</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/oauth/oauthprovider/setparam.xml b/reference/oauth/oauthprovider/setparam.xml
deleted file mode 100644
index 9504da506903..000000000000
--- a/reference/oauth/oauthprovider/setparam.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.setparam">
- <refnamediv>
-  <refname>OAuthProvider::setParam</refname>
-  <refpurpose>Set a parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>OAuthProvider::setParam</methodname>
-   <methodparam><type>string</type><parameter>param_key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>param_val</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a parameter.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>param_key</parameter></term>
-    <listitem>
-     <simpara>
-      The parameter key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>param_val</parameter></term>
-    <listitem>
-     <simpara>
-      The optional parameter value.
-     </simpara>
-     <simpara>
-      To exclude a parameter from signature verification, set
-      its value to &null;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::addRequiredParameter</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/oauth/oauthprovider/setrequesttokenpath.xml b/reference/oauth/oauthprovider/setrequesttokenpath.xml
deleted file mode 100644
index 60aa80684749..000000000000
--- a/reference/oauth/oauthprovider/setrequesttokenpath.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.setrequesttokenpath">
- <refnamediv>
-  <refname>OAuthProvider::setRequestTokenPath</refname>
-  <refpurpose>Set request token path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type><methodname>OAuthProvider::setRequestTokenPath</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the request tokens path.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      The path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::tokenHandler</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/oauth/oauthprovider/timestampnoncehandler.xml b/reference/oauth/oauthprovider/timestampnoncehandler.xml
deleted file mode 100644
index ee8887666a36..000000000000
--- a/reference/oauth/oauthprovider/timestampnoncehandler.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.timestampnoncehandler">
- <refnamediv>
-  <refname>OAuthProvider::timestampNonceHandler</refname>
-  <refpurpose>Set the timestampNonceHandler handler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::timestampNonceHandler</methodname>
-   <methodparam><type>callable</type><parameter>callback_function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the timestamp nonce handler callback, which will later be called with
-   <methodname>OAuthProvider::callTimestampNonceHandler</methodname>. Errors related to
-   timestamp/nonce are thrown to this callback.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback_function</parameter></term>
-    <listitem>
-     <simpara>
-      The <type>callable</type> functions name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Example <methodname>OAuthProvider::timestampNonceHandler</methodname> callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function timestampNonceChecker($provider) {
-
-    if ($provider->nonce === 'bad') {
-        return OAUTH_BAD_NONCE;
-    } elseif ($provider->timestamp == '0') {
-        return OAUTH_BAD_TIMESTAMP;
-    }
-
-    return OAUTH_OK;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::callTimestampNonceHandler</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/oauth/oauthprovider/tokenhandler.xml b/reference/oauth/oauthprovider/tokenhandler.xml
deleted file mode 100644
index 57093cc09fbe..000000000000
--- a/reference/oauth/oauthprovider/tokenhandler.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauthprovider.tokenhandler">
- <refnamediv>
-  <refname>OAuthProvider::tokenHandler</refname>
-  <refpurpose>Set the tokenHandler handler callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>OAuthProvider::tokenHandler</methodname>
-   <methodparam><type>callable</type><parameter>callback_function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the token handler callback, which will later be called with
-   <methodname>OAuthProvider::callTokenHandler</methodname>.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback_function</parameter></term>
-    <listitem>
-     <simpara>
-      The <type>callable</type> functions name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Example <methodname>OAuthProvider::tokenHandler</methodname> callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function tokenHandler($provider) {
-
-    if ($provider->token === 'rejected') {
-        return OAUTH_TOKEN_REJECTED;
-    } elseif ($provider->token === 'revoked') {
-        return OAUTH_TOKEN_REVOKED;
-    }
-
-    $provider->token_secret = "the_tokens_secret";
-    return OAUTH_OK;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>OAuthProvider::callTokenHandler</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/oauth/reference.xml b/reference/oauth/reference.xml
deleted file mode 100644
index 88445283d773..000000000000
--- a/reference/oauth/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.oauth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>OAuth &Functions;</title>
-
- &reference.oauth.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/oauth/setup.xml b/reference/oauth/setup.xml
deleted file mode 100644
index e7f20effd269..000000000000
--- a/reference/oauth/setup.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="oauth.setup">
- &reftitle.setup;
-
- <section xml:id="oauth.requirements">
-  &reftitle.required;
-  <simpara>
-   PECL/oauth requires PHP 5.1 or newer, ext/hash and ext/pcre.
-  </simpara>
-  <simpara>
-   PECL/oauth may optionally require libcurl if selected at build
-   time. If configured with libcurl, it must be built with HTTPS
-   support.
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- &reference.oauth.configure;
- <!-- }}} -->
-
-</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/oauth/versions.xml b/reference/oauth/versions.xml
deleted file mode 100644
index 8313b8987a1e..000000000000
--- a/reference/oauth/versions.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='oauth_urlencode' from='PECL OAuth &gt;=0.99.2'/>
- <function name='oauth_get_sbs' from='PECL OAuth &gt;=0.99.7'/>
-
- <!-- Methods -->
- <function name='oauth' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::__construct' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::__destruct' from='PECL OAuth &gt;= 0.99.9'/>
- <function name='oauth::getrequesttoken' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::getaccesstoken' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::getlastresponse' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::getlastresponseinfo' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::settoken' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::setversion' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::setauthtype' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::setnonce' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::setRequestEngine' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='oauth::setRsaCertificate' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='oauth::setTimestamp' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='oauth::fetch' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauth::enableDebug' from='PECL OAuth &gt;= 0.99.3'/>
- <function name='oauth::disableDebug' from='PECL OAuth &gt;= 0.99.3'/>
- <function name='oauth::disableRedirects' from='PECL OAuth &gt;= 0.99.9'/>
- <function name='oauth::enableRedirects' from='PECL OAuth &gt;= 0.99.9'/>
- <function name='oauth::enableSSLChecks' from='PECL OAuth &gt;= 0.99.5'/>
- <function name='oauth::disableSSLChecks' from='PECL OAuth &gt;= 0.99.5'/>
- <function name='oauth::setCaPath' from='PECL OAuth &gt;= 0.99.8'/>
- <function name='oauth::getCaPath' from='PECL OAuth &gt;= 0.99.8'/>
-
- <function name='oauthexception' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::__clone' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::__construct' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::getmessage' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::getcode' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::getfile' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::getline' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::gettrace' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::getprevious' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::gettraceasstring' from='PECL OAuth &gt;= 0.99.1'/>
- <function name='oauthexception::__tostring' from='PECL OAuth &gt;= 0.99.1'/>
-
- <function name='OAuthProvider' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::addRequiredParameter' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::callConcumserHandler' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::callTimestampNonceHandler' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::callTokenHandler' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::checkOauthRequest' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::__construct' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::consumerHandler' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::generateToken' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::is2LeggedEndpoint' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::isRequestTokenEndpoint' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::removeRequiredParameter' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::reportProblem' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::setParam' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::setRequestTokenPath' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::timestampNonceHandler' from='PECL OAuth &gt;= 1.0.0'/>
- <function name='OAuthProvider::tokenHandler' from='PECL OAuth &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/openal/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/openal/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/openal/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/openal/book.xml b/reference/openal/book.xml
deleted file mode 100644
index a99175c2cd97..000000000000
--- a/reference/openal/book.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.openal">
- <?phpdoc extension-membership="pecl" ?>
- <title>OpenAL Audio Bindings</title>
- <titleabbrev>OpenAL</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.openal">
-  &reftitle.intro;
-  <simpara>
-   Platform independent audio bindings.
-   Requires the <link xlink:href="&url.openal;">OpenAL library</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.openal.setup;
- &reference.openal.constants;
- &reference.openal.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/openal/configure.xml b/reference/openal/configure.xml
deleted file mode 100644
index 3e9790e51092..000000000000
--- a/reference/openal/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="openal.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
- </simpara>
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;openal">&url.pecl.package;openal</link>.
- </simpara>
- <simpara>
-  &pecl.windows.download;
- </simpara>
-</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/openal/constants.xml b/reference/openal/constants.xml
deleted file mode 100644
index 32d1473ddd93..000000000000
--- a/reference/openal/constants.xml
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="openal.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.alc-frequency">
-   <term>
-    <constant>ALC_FREQUENCY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Context Attribute
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.alc-refresh">
-   <term>
-    <constant>ALC_REFRESH</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Context Attribute
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.alc-sync">
-   <term>
-    <constant>ALC_SYNC</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Context Attribute
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-frequency">
-   <term>
-    <constant>AL_FREQUENCY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Buffer Setting
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-bits">
-   <term>
-    <constant>AL_BITS</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Buffer Setting
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-channels">
-   <term>
-    <constant>AL_CHANNELS</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Buffer Setting
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-size">
-   <term>
-    <constant>AL_SIZE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Buffer Setting
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-buffer">
-   <term>
-    <constant>AL_BUFFER</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Integer)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-source-relative">
-   <term>
-    <constant>AL_SOURCE_RELATIVE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Integer)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-source-state">
-   <term>
-    <constant>AL_SOURCE_STATE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Integer)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-pitch">
-   <term>
-    <constant>AL_PITCH</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-gain">
-   <term>
-    <constant>AL_GAIN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-min-gain">
-   <term>
-    <constant>AL_MIN_GAIN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-max-gain">
-   <term>
-    <constant>AL_MAX_GAIN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-max-distance">
-   <term>
-    <constant>AL_MAX_DISTANCE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-rolloff-factor">
-   <term>
-    <constant>AL_ROLLOFF_FACTOR</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-cone-outer-gain">
-   <term>
-    <constant>AL_CONE_OUTER_GAIN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-cone-inner-angle">
-   <term>
-    <constant>AL_CONE_INNER_ANGLE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-cone-outer-angle">
-   <term>
-    <constant>AL_CONE_OUTER_ANGLE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-reference-distance">
-   <term>
-    <constant>AL_REFERENCE_DISTANCE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-position">
-   <term>
-    <constant>AL_POSITION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float Vector)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-velocity">
-   <term>
-    <constant>AL_VELOCITY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float Vector)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-direction">
-   <term>
-    <constant>AL_DIRECTION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float Vector)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-orientation">
-   <term>
-    <constant>AL_ORIENTATION</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source/Listener Setting (Float Vector)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-format-mono8">
-   <term>
-    <constant>AL_FORMAT_MONO8</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     PCM Format
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-format-mono16">
-   <term>
-    <constant>AL_FORMAT_MONO16</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     PCM Format
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-format-stereo8">
-   <term>
-    <constant>AL_FORMAT_STEREO8</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     PCM Format
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-format-stereo16">
-   <term>
-    <constant>AL_FORMAT_STEREO16</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     PCM Format
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-initial">
-   <term>
-    <constant>AL_INITIAL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source State
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-playing">
-   <term>
-    <constant>AL_PLAYING</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source State
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-paused">
-   <term>
-    <constant>AL_PAUSED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source State
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-stopped">
-   <term>
-    <constant>AL_STOPPED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source State
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-looping">
-   <term>
-    <constant>AL_LOOPING</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Source State
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-true">
-   <term>
-    <constant>AL_TRUE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Boolean value recognized by OpenAL
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.al-false">
-   <term>
-    <constant>AL_FALSE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Boolean value recognized by OpenAL
-    </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/openal/functions/openal-buffer-create.xml b/reference/openal/functions/openal-buffer-create.xml
deleted file mode 100644
index 88a38b0d3bb0..000000000000
--- a/reference/openal/functions/openal-buffer-create.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-buffer-create">
- <refnamediv>
-  <refname>openal_buffer_create</refname>
-  <refpurpose>
-   Generate OpenAL buffer
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>openal_buffer_create</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <link linkend="openal.resources">Open AL(Buffer)</link> resource on success or
-   &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_buffer_loadwav</function></member>
-   <member><function>openal_buffer_data</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/openal/functions/openal-buffer-data.xml b/reference/openal/functions/openal-buffer-data.xml
deleted file mode 100644
index ad23e7bec490..000000000000
--- a/reference/openal/functions/openal-buffer-data.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-buffer-data">
- <refnamediv>
-  <refname>openal_buffer_data</refname>
-  <refpurpose>
-   Load a buffer with data
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_buffer_data</methodname>
-   <methodparam><type>resource</type><parameter>buffer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>format</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>freq</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Buffer)</link> resource
-      (previously created by <function>openal_buffer_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      Format of <parameter>data</parameter>, one of:
-      <constant>AL_FORMAT_MONO8</constant>,
-      <constant>AL_FORMAT_MONO16</constant>,
-      <constant>AL_FORMAT_STEREO8</constant>&listendand;
-      <constant>AL_FORMAT_STEREO16</constant>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Block of binary audio data in the <parameter>format</parameter> and
-      <parameter>freq</parameter> specified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>freq</parameter></term>
-    <listitem>
-     <simpara>
-      Frequency of <parameter>data</parameter> given in Hz.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_buffer_loadwav</function></member>
-   <member><function>openal_stream</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/openal/functions/openal-buffer-destroy.xml b/reference/openal/functions/openal-buffer-destroy.xml
deleted file mode 100644
index 091b449053f8..000000000000
--- a/reference/openal/functions/openal-buffer-destroy.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-buffer-destroy">
- <refnamediv>
-  <refname>openal_buffer_destroy</refname>
-  <refpurpose>
-   Destroys an OpenAL buffer
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_buffer_destroy</methodname>
-   <methodparam><type>resource</type><parameter>buffer</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Buffer)</link> resource
-      (previously created by <function>openal_buffer_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_buffer_create</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/openal/functions/openal-buffer-get.xml b/reference/openal/functions/openal-buffer-get.xml
deleted file mode 100644
index 1eb1523bc97c..000000000000
--- a/reference/openal/functions/openal-buffer-get.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-buffer-get">
- <refnamediv>
-  <refname>openal_buffer_get</refname>
-  <refpurpose>
-   Retrieve an OpenAL buffer property
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>openal_buffer_get</methodname>
-   <methodparam><type>resource</type><parameter>buffer</parameter></methodparam>
-   <methodparam><type>int</type><parameter>property</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Buffer)</link> resource
-      (previously created by <function>openal_buffer_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <simpara>
-      Specific property, one of:
-      <constant>AL_FREQUENCY</constant>,
-      <constant>AL_BITS</constant>,
-      <constant>AL_CHANNELS</constant>&listendand;
-      <constant>AL_SIZE</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer value appropriate to the <parameter>property</parameter>
-   requested&return.falseforfailure;.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_buffer_create</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/openal/functions/openal-buffer-loadwav.xml b/reference/openal/functions/openal-buffer-loadwav.xml
deleted file mode 100644
index de0b68d02be4..000000000000
--- a/reference/openal/functions/openal-buffer-loadwav.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-buffer-loadwav">
- <refnamediv>
-  <refname>openal_buffer_loadwav</refname>
-  <refpurpose>
-   Load a .wav file into a buffer
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_buffer_loadwav</methodname>
-   <methodparam><type>resource</type><parameter>buffer</parameter></methodparam>
-   <methodparam><type>string</type><parameter>wavfile</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Buffer)</link> resource
-      (previously created by <function>openal_buffer_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>wavfile</parameter></term>
-    <listitem>
-     <simpara>
-      Path to <filename>.wav</filename> file on
-      <emphasis>local</emphasis> file system.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_buffer_data</function></member>
-   <member><function>openal_stream</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/openal/functions/openal-context-create.xml b/reference/openal/functions/openal-context-create.xml
deleted file mode 100644
index 58c838897fb9..000000000000
--- a/reference/openal/functions/openal-context-create.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-context-create">
- <refnamediv>
-  <refname>openal_context_create</refname>
-  <refpurpose>
-   Create an audio processing context
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>openal_context_create</methodname>
-   <methodparam><type>resource</type><parameter>device</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>device</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Device)</link> resource
-      (previously created by <function>openal_device_open</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <link linkend="openal.resources">Open AL(Context)</link> resource on success or
-   &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_device_open</function></member>
-   <member><function>openal_context_destroy</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/openal/functions/openal-context-current.xml b/reference/openal/functions/openal-context-current.xml
deleted file mode 100644
index 1dd4ea11de93..000000000000
--- a/reference/openal/functions/openal-context-current.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-context-current">
- <refnamediv>
-  <refname>openal_context_current</refname>
-  <refpurpose>
-   Make the specified context current
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_context_current</methodname>
-   <methodparam><type>resource</type><parameter>context</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Context)</link> resource
-      (previously created by <function>openal_context_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_context_create</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/openal/functions/openal-context-destroy.xml b/reference/openal/functions/openal-context-destroy.xml
deleted file mode 100644
index 69dd09e25e94..000000000000
--- a/reference/openal/functions/openal-context-destroy.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-context-destroy">
- <refnamediv>
-  <refname>openal_context_destroy</refname>
-  <refpurpose>
-   Destroys a context
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_context_destroy</methodname>
-   <methodparam><type>resource</type><parameter>context</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Context)</link> resource
-      (previously created by <function>openal_context_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_context_create</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/openal/functions/openal-context-process.xml b/reference/openal/functions/openal-context-process.xml
deleted file mode 100644
index 864e2fc8e459..000000000000
--- a/reference/openal/functions/openal-context-process.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-context-process">
- <refnamediv>
-  <refname>openal_context_process</refname>
-  <refpurpose>
-   Process the specified context
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_context_process</methodname>
-   <methodparam><type>resource</type><parameter>context</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Context)</link> resource
-      (previously created by <function>openal_context_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_context_create</function></member>
-   <member><function>openal_context_current</function></member>
-   <member><function>openal_context_suspend</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/openal/functions/openal-context-suspend.xml b/reference/openal/functions/openal-context-suspend.xml
deleted file mode 100644
index 6733c13a19c2..000000000000
--- a/reference/openal/functions/openal-context-suspend.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-context-suspend">
- <refnamediv>
-  <refname>openal_context_suspend</refname>
-  <refpurpose>
-   Suspend the specified context
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_context_suspend</methodname>
-   <methodparam><type>resource</type><parameter>context</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>context</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Context)</link> resource
-      (previously created by <function>openal_context_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_context_create</function></member>
-   <member><function>openal_context_current</function></member>
-   <member><function>openal_context_process</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/openal/functions/openal-device-close.xml b/reference/openal/functions/openal-device-close.xml
deleted file mode 100644
index 6b92a01c6c2d..000000000000
--- a/reference/openal/functions/openal-device-close.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-device-close">
- <refnamediv>
-  <refname>openal_device_close</refname>
-  <refpurpose>
-   Close an OpenAL device
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_device_close</methodname>
-   <methodparam><type>resource</type><parameter>device</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>device</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Device)</link> resource
-      (previously created by <function>openal_device_open</function>)
-      to be closed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_device_open</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/openal/functions/openal-device-open.xml b/reference/openal/functions/openal-device-open.xml
deleted file mode 100644
index 0582af84ff86..000000000000
--- a/reference/openal/functions/openal-device-open.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-device-open">
- <refnamediv>
-  <refname>openal_device_open</refname>
-  <refpurpose>
-   Initialize the OpenAL audio layer
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>openal_device_open</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>device_desc</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>device_desc</parameter></term>
-    <listitem>
-     <simpara>
-      Open an audio device optionally specified by <parameter>device_desc</parameter>.
-      If <parameter>device_desc</parameter> is not specified the first available audio
-      device will be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <link linkend="openal.resources">Open AL(Device)</link> resource on success or
-   &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_device_close</function></member>
-   <member><function>openal_context_create</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/openal/functions/openal-listener-get.xml b/reference/openal/functions/openal-listener-get.xml
deleted file mode 100644
index bad4dba33a20..000000000000
--- a/reference/openal/functions/openal-listener-get.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-listener-get">
- <refnamediv>
-  <refname>openal_listener_get</refname>
-  <refpurpose>
-   Retrieve a listener property
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>openal_listener_get</methodname>
-   <methodparam><type>int</type><parameter>property</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <simpara>
-      Property to retrieve, one of:
-      <constant>AL_GAIN</constant> (float),
-      <constant>AL_POSITION</constant> (array(float,float,float)),
-      <constant>AL_VELOCITY</constant> (array(float,float,float))&listendand;
-      <constant>AL_ORIENTATION</constant> (array(float,float,float)).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a float or array of floats (as appropriate)&return.falseforfailure;.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_listener_set</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/openal/functions/openal-listener-set.xml b/reference/openal/functions/openal-listener-set.xml
deleted file mode 100644
index 4b453cb3ddda..000000000000
--- a/reference/openal/functions/openal-listener-set.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-listener-set">
- <refnamediv>
-  <refname>openal_listener_set</refname>
-  <refpurpose>
-   Set a listener property
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_listener_set</methodname>
-   <methodparam><type>int</type><parameter>property</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>setting</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <simpara>
-      Property to set, one of:
-      <constant>AL_GAIN</constant> (float),
-      <constant>AL_POSITION</constant> (array(float,float,float)),
-      <constant>AL_VELOCITY</constant> (array(float,float,float))&listendand;
-      <constant>AL_ORIENTATION</constant> (array(float,float,float)).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>setting</parameter></term>
-    <listitem>
-     <simpara>
-      Value to set, either float, or an array of floats as appropriate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_listener_get</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/openal/functions/openal-source-create.xml b/reference/openal/functions/openal-source-create.xml
deleted file mode 100644
index 6534db392ceb..000000000000
--- a/reference/openal/functions/openal-source-create.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-create">
- <refnamediv>
-  <refname>openal_source_create</refname>
-  <refpurpose>
-   Generate a source resource
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>openal_source_create</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <link linkend="openal.resources">Open AL(Source)</link> resource on success or
-   &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_set</function></member>
-   <member><function>openal_source_play</function></member>
-   <member><function>openal_source_destroy</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/openal/functions/openal-source-destroy.xml b/reference/openal/functions/openal-source-destroy.xml
deleted file mode 100644
index ec0b7d69c0bc..000000000000
--- a/reference/openal/functions/openal-source-destroy.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-destroy">
- <refnamediv>
-  <refname>openal_source_destroy</refname>
-  <refpurpose>
-   Destroy a source resource
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_destroy</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_create</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/openal/functions/openal-source-get.xml b/reference/openal/functions/openal-source-get.xml
deleted file mode 100644
index 9cf9bb3e4067..000000000000
--- a/reference/openal/functions/openal-source-get.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-get">
- <refnamediv>
-  <refname>openal_source_get</refname>
-  <refpurpose>
-   Retrieve an OpenAL source property
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>openal_source_get</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-   <methodparam><type>int</type><parameter>property</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <simpara>
-      Property to get, one of:
-      <constant>AL_SOURCE_RELATIVE</constant> (int),
-      <constant>AL_SOURCE_STATE</constant> (int),
-      <constant>AL_PITCH</constant> (float),
-      <constant>AL_GAIN</constant> (float),
-      <constant>AL_MIN_GAIN</constant> (float),
-      <constant>AL_MAX_GAIN</constant> (float),
-      <constant>AL_MAX_DISTANCE</constant> (float),
-      <constant>AL_ROLLOFF_FACTOR</constant> (float),
-      <constant>AL_CONE_OUTER_GAIN</constant> (float),
-      <constant>AL_CONE_INNER_ANGLE</constant> (float),
-      <constant>AL_CONE_OUTER_ANGLE</constant> (float),
-      <constant>AL_REFERENCE_DISTANCE</constant> (float),
-      <constant>AL_POSITION</constant> (array(float,float,float)),
-      <constant>AL_VELOCITY</constant> (array(float,float,float)),
-      <constant>AL_DIRECTION</constant> (array(float,float,float)).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the type associated with the property being retrieved
-  &return.falseforfailure;.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_create</function></member>
-   <member><function>openal_source_set</function></member>
-   <member><function>openal_source_play</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/openal/functions/openal-source-pause.xml b/reference/openal/functions/openal-source-pause.xml
deleted file mode 100644
index f6b600204ea7..000000000000
--- a/reference/openal/functions/openal-source-pause.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-pause">
- <refnamediv>
-  <refname>openal_source_pause</refname>
-  <refpurpose>
-   Pause the source
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_pause</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_stop</function></member>
-   <member><function>openal_source_play</function></member>
-   <member><function>openal_source_rewind</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/openal/functions/openal-source-play.xml b/reference/openal/functions/openal-source-play.xml
deleted file mode 100644
index ae999d7e48f5..000000000000
--- a/reference/openal/functions/openal-source-play.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-play">
- <refnamediv>
-  <refname>openal_source_play</refname>
-  <refpurpose>
-   Start playing the source
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_play</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_stop</function></member>
-   <member><function>openal_source_pause</function></member>
-   <member><function>openal_source_rewind</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/openal/functions/openal-source-rewind.xml b/reference/openal/functions/openal-source-rewind.xml
deleted file mode 100644
index ccec745de6e3..000000000000
--- a/reference/openal/functions/openal-source-rewind.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-rewind">
- <refnamediv>
-  <refname>openal_source_rewind</refname>
-  <refpurpose>
-   Rewind the source
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_rewind</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_stop</function></member>
-   <member><function>openal_source_pause</function></member>
-   <member><function>openal_source_play</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/openal/functions/openal-source-set.xml b/reference/openal/functions/openal-source-set.xml
deleted file mode 100644
index 3ab6b5f8592a..000000000000
--- a/reference/openal/functions/openal-source-set.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-set">
- <refnamediv>
-  <refname>openal_source_set</refname>
-  <refpurpose>
-   Set source property
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_set</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-   <methodparam><type>int</type><parameter>property</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>setting</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <simpara>
-      Property to set, one of:
-      <constant>AL_BUFFER</constant> (OpenAL(Source)),
-      <constant>AL_LOOPING</constant> (bool),
-      <constant>AL_SOURCE_RELATIVE</constant> (int),
-      <constant>AL_SOURCE_STATE</constant> (int),
-      <constant>AL_PITCH</constant> (float),
-      <constant>AL_GAIN</constant> (float),
-      <constant>AL_MIN_GAIN</constant> (float),
-      <constant>AL_MAX_GAIN</constant> (float),
-      <constant>AL_MAX_DISTANCE</constant> (float),
-      <constant>AL_ROLLOFF_FACTOR</constant> (float),
-      <constant>AL_CONE_OUTER_GAIN</constant> (float),
-      <constant>AL_CONE_INNER_ANGLE</constant> (float),
-      <constant>AL_CONE_OUTER_ANGLE</constant> (float),
-      <constant>AL_REFERENCE_DISTANCE</constant> (float),
-      <constant>AL_POSITION</constant> (array(float,float,float)),
-      <constant>AL_VELOCITY</constant> (array(float,float,float)),
-      <constant>AL_DIRECTION</constant> (array(float,float,float)).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>setting</parameter></term>
-    <listitem>
-     <simpara>
-      Value to assign to specified <parameter>property</parameter>.
-      Refer to the description of <parameter>property</parameter>
-      for a description of the value(s) expected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_create</function></member>
-   <member><function>openal_source_get</function></member>
-   <member><function>openal_source_play</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/openal/functions/openal-source-stop.xml b/reference/openal/functions/openal-source-stop.xml
deleted file mode 100644
index a2ffd49c2508..000000000000
--- a/reference/openal/functions/openal-source-stop.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.openal-source-stop">
- <refnamediv>
-  <refname>openal_source_stop</refname>
-  <refpurpose>
-   Stop playing the source
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>openal_source_stop</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_play</function></member>
-   <member><function>openal_source_pause</function></member>
-   <member><function>openal_source_rewind</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/openal/functions/openal-stream.xml b/reference/openal/functions/openal-stream.xml
deleted file mode 100644
index 4c5dc9eeac23..000000000000
--- a/reference/openal/functions/openal-stream.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.openal-stream">
- <refnamediv>
-  <refname>openal_stream</refname>
-  <refpurpose>
-   Begin streaming on a source
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>openal_stream</methodname>
-   <methodparam><type>resource</type><parameter>source</parameter></methodparam>
-   <methodparam><type>int</type><parameter>format</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rate</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source</parameter></term>
-    <listitem>
-     <simpara>
-      An <link linkend="openal.resources">Open AL(Source)</link> resource
-      (previously created by <function>openal_source_create</function>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      Format of <parameter>data</parameter>, one of:
-      <constant>AL_FORMAT_MONO8</constant>,
-      <constant>AL_FORMAT_MONO16</constant>,
-      <constant>AL_FORMAT_STEREO8</constant>&listendand;
-      <constant>AL_FORMAT_STEREO16</constant>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rate</parameter></term>
-    <listitem>
-     <simpara>
-      Frequency of data to stream given in Hz.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a stream resource on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>openal_source_create</function></member>
-   <member><function>fwrite</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/openal/reference.xml b/reference/openal/reference.xml
deleted file mode 100644
index 577a6cf6e6ae..000000000000
--- a/reference/openal/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.openal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>OpenAL &Functions;</title>
-
- &reference.openal.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/openal/resources.xml b/reference/openal/resources.xml
deleted file mode 100644
index a45474e9de76..000000000000
--- a/reference/openal/resources.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="openal.resources">
- &reftitle.resources;
-
- <simpara>
-  This extension defines four resource types:
-  <emphasis>Open AL(Device)</emphasis> - Returned by <function>openal_device_open</function>,
-  <emphasis>Open AL(Context)</emphasis> - Returned by <function>openal_context_create</function>,
-  <emphasis>Open AL(Buffer)</emphasis> - Returned by <function>openal_buffer_create</function>,
-  and <emphasis>Open AL(Source)</emphasis> - Returned by <function>openal_source_create</function>.
- </simpara>
-
-</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/openal/setup.xml b/reference/openal/setup.xml
deleted file mode 100644
index 231bec3e4423..000000000000
--- a/reference/openal/setup.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="openal.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.openal.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- &reference.openal.resources;
- <!-- }}} -->
-
-</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/openal/versions.xml b/reference/openal/versions.xml
deleted file mode 100644
index 9af60e51ed6b..000000000000
--- a/reference/openal/versions.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='openal_buffer_create' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_buffer_data' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_buffer_destroy' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_buffer_get' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_buffer_loadwav' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_context_create' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_context_current' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_context_destroy' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_context_process' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_context_suspend' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_device_close' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_device_open' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_listener_get' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_listener_set' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_create' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_destroy' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_get' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_pause' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_play' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_rewind' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_set' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_source_stop' from='PECL openal &gt;= 0.1.0'/>
- <function name='openal_stream' from='PECL openal &gt;= 0.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/operator/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/operator/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/operator/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/operator/book.xml b/reference/operator/book.xml
deleted file mode 100644
index 4788283f7626..000000000000
--- a/reference/operator/book.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xml:id="book.operator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>Operator Overloading for Objects</title>
- <titleabbrev>Operator Overloading</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.operator">
-  &reftitle.intro;
-  <simpara>
-   This extension defines and implements operator overloading for objects.
-   It allows defining how an object reacts when an operator is used on it.
-  </simpara>
-  <simpara>
-   One example of this is creating a collection type object that has the addition
-   operator overloaded to allow adding elements to the collection or adding two
-   collections together.
-  </simpara>
-  <simpara>
-   Another example is creating an enhanced string class that has the multiplication
-   operator overloaded to allow repeating the string a certain number of times.
-  </simpara>
- </preface>
- <!-- }}} -->
- &reference.operator.setup;
- &reference.operator.overloading;
-</book>
diff --git a/reference/operator/overloading.xml b/reference/operator/overloading.xml
deleted file mode 100644
index 7c623f6f76a2..000000000000
--- a/reference/operator/overloading.xml
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="operator.overloading" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Operator Overloading Magic Methods</title>
- <simpara>
-  The operator overloading extension allows you to define how an object reacts to operators. This is done by implementing the following magic methods:
- </simpara>
- <para>
-  Arithmetic operators:
-  <simplelist>
-   <member><literal>$a::__add($b)</literal></member>
-   <member><literal>$a::__sub($b)</literal></member>
-   <member><literal>$a::__mul($b)</literal></member>
-   <member><literal>$a::__div($b)</literal></member>
-   <member><literal>$a::__mod($b)</literal></member>
-   <member><literal>$a::__pow($b)</literal></member>
-  </simplelist>
- </para>
- <para>
-  Assignment operators:
-  <simplelist>
-   <member><literal>$a::__assign($b)</literal></member>
-   <member><literal>$a::__assign_add($b)</literal></member>
-   <member><literal>$a::__assign_sub($b)</literal></member>
-   <member><literal>$a::__assign_mul($b)</literal></member>
-   <member><literal>$a::__assign_div($b)</literal></member>
-   <member><literal>$a::__assign_mod($b)</literal></member>
-   <member><literal>$a::__assign_pow($b)</literal></member>
-   <member><literal>$a::__assign_bw_and($b)</literal></member>
-   <member><literal>$a::__assign_bw_or($b)</literal></member>
-   <member><literal>$a::__assign_bw_xor($b)</literal></member>
-   <member><literal>$a::__assign_sl($b)</literal></member>
-   <member><literal>$a::__assign_sr($b)</literal></member>
-   <member><literal>$a::__assign_concat($b)</literal></member>
-  </simplelist>
- </para>
- <para>
-  Bitwise operators:
-  <simplelist>
-   <member><literal>$a::__bw_and($b)</literal></member>
-   <member><literal>$a::__bw_or($b)</literal></member>
-   <member><literal>$a::__bw_xor($b)</literal></member>
-   <member><literal>$a::__bw_not()</literal></member>
-   <member><literal>$a::__sl($b)</literal></member>
-   <member><literal>$a::__sr($b)</literal></member>
-  </simplelist>
- </para>
- <para>
-  Comparison operators:
-  <simplelist>
-   <member><literal>$a::__is_equal($b)</literal></member>
-   <member><literal>$a::__is_not_equal($b)</literal></member>
-   <member><literal>$a::__is_identical($b)</literal></member>
-   <member><literal>$a::__is_not_identical($b)</literal></member>
-   <member><literal>$a::__is_smaller($b)</literal></member>
-   <member><literal>$a::__is_smaller_or_equal($b)</literal></member>
-   <member><literal>$a::__is_greater($b)</literal></member>
-   <member><literal>$a::__is_greater_or_equal($b)</literal></member>
-   <member><literal>$a::__spaceship($b)</literal></member>
-  </simplelist>
- </para>
- <para>
-  Incrementing and decrementing operators:
-  <simplelist>
-   <member><literal>$a::__pre_inc()</literal></member>
-   <member><literal>$a::__post_inc()</literal></member>
-   <member><literal>$a::__pre_dec()</literal></member>
-   <member><literal>$a::__post_dec()</literal></member>
-  </simplelist>
- </para>
- <para>
-  String operators:
-  <simplelist>
-   <member><literal>$a::__concat($b)</literal></member>
-  </simplelist>
- </para>
- <section>
-  <title>Operator Overloading Examples</title>
-  <simpara>
-   The following is the class that is used in the testing of the operator overloading extension.
-   It overloads all of the possible operators that can be overloaded for testing.
-  </simpara>
-  <example xml:id="operator.overloading.complete-class">
-   <title>Complete class for operator overloading</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class OperatorOverloading {
-    protected mixed $value;
-
-    //region Standard magic methods
-    public function __get(string $name)
-    {
-        return $this->value;
-    }
-
-    public function __set(string $name, mixed $value)
-    {
-        $this->value = $value;
-    }
-
-    public function __construct(mixed $init = null)
-    {
-        $this->value = $init;
-    }
-    //endregion
-
-    //region Arithmetic Operators
-    public function __add(mixed $val): int|float
-    {
-        return $this->value + $val;
-    }
-
-    public function __div(mixed $val): int|float
-    {
-        return $this->value / $val;
-    }
-
-    public function __mod(mixed $val): int
-    {
-        return $this->value % $val;
-    }
-
-    public function __mul(mixed $val): int|float
-    {
-        return $this->value * $val;
-    }
-
-    public function __pow(mixed $val): int|float
-    {
-        return $this->value ** $val;
-    }
-
-    public function __sub(mixed $val): int|float
-    {
-        return $this->value - $val;
-    }
-    //endregion
-
-    //region Assignment Operators
-    public function __assign(mixed $val): mixed
-    {
-        return $this->value = $val;
-    }
-
-    public function __assign_add(mixed $val): mixed
-    {
-        return $this->value += $val;
-    }
-
-    public function __assign_bw_and(mixed $val): mixed
-    {
-        return $this->value &= $val;
-    }
-
-    public function __assign_bw_or(mixed $val): mixed
-    {
-        return $this->value |= $val;
-    }
-
-    public function __assign_concat(mixed $val): string
-    {
-        return $this->value .= $val;
-    }
-
-    public function __assign_div(mixed $val): mixed
-    {
-        return $this->value /= $val;
-    }
-
-    public function __assign_mod(mixed $val): mixed
-    {
-        return $this->value %= $val;
-    }
-
-    public function __assign_mul(mixed $val): mixed
-    {
-        return $this->value *= $val;
-    }
-
-    public function __assign_pow(mixed $val): mixed
-    {
-        return $this->value **= $val;
-    }
-
-    public function __assign_sl(mixed $val): mixed
-    {
-        return $this->value <<= $val;
-    }
-
-    public function __assign_sr(mixed $val): mixed
-    {
-        return $this->value >>= $val;
-    }
-
-    public function __assign_sub(mixed $val): mixed
-    {
-        return $this->value -= $val;
-    }
-    //endregion
-
-    //region Bitwise Operators
-    public function __bw_and(mixed $val): int
-    {
-        return $this->value & $val;
-    }
-
-    public function __bw_not(): int|string
-    {
-        return ~$this->value;
-    }
-
-    public function __bw_or(mixed $val): int
-    {
-        return $this->value | $val;
-    }
-
-    public function __bw_xor(mixed $val): int
-    {
-        return $this->value ^ $val;
-    }
-
-    public function __sl(mixed $val): int
-    {
-        return $this->value << $val;
-    }
-
-    public function __sr(mixed $val): int
-    {
-        return $this->value >> $val;
-    }
-    //endregion
-
-    //region Comparison Operators
-    public function __is_equal(mixed $val): bool
-    {
-        return $this->value == $val;
-    }
-
-    public function __is_greater(mixed $val): bool
-    {
-        return $this->value > $val;
-    }
-
-    public function __is_greater_or_equal(mixed $val): bool
-    {
-        return $this->value >= $val;
-    }
-
-    public function __is_identical(mixed $val): bool
-    {
-        return $this->value === $val;
-    }
-
-    public function __is_not_equal(mixed $val): bool
-    {
-        return $this->value != $val;
-    }
-
-    public function __is_not_identical(mixed $val): bool
-    {
-        return $this->value !== $val;
-    }
-
-    public function __is_smaller(mixed $val): bool
-    {
-        return $this->value < $val;
-    }
-
-    public function __is_smaller_or_equal(mixed $val): bool
-    {
-        return $this->value <= $val;
-    }
-
-    public function __spaceship(mixed $val): int
-    {
-        return $this->value <=> $val;
-    }
-    //endregion
-
-    //region Incrementing/Decrementing Operators
-    public function __post_dec(): mixed
-    {
-        return $this->value--;
-    }
-
-    public function __post_inc(): mixed
-    {
-        return $this->value++;
-    }
-
-    public function __pre_dec(): mixed
-    {
-        return --$this->value;
-    }
-
-    public function __pre_inc(): mixed
-    {
-        return ++$this->value;
-    }
-    //endregion
-
-    //region String Operators
-    public function __concat(mixed $val): string
-    {
-        return $this->value . $val;
-    }
-    //endregion
-
-}
-
-]]>
-   </programlisting>
-   <simpara>
-    Using the above class, you can overload the operators as follows:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = new OperatorOverloading(5);
-var_dump($a + 10);
-var_dump($a - 10);
-$b = new OperatorOverloading("Hello");
-var_dump($b . " World");
-]]>
-   </programlisting>
-   <simpara>
-    The above code will output:
-   </simpara>
-   <screen>
-<![CDATA[
-int(15)
-int(-5)
-string(11) "Hello World"
-]]>
-   </screen>
-  </example>
- </section>
-</chapter>
diff --git a/reference/operator/setup.xml b/reference/operator/setup.xml
deleted file mode 100644
index 2778b671b803..000000000000
--- a/reference/operator/setup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="operator.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
- <section xml:id="operator.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;operator">&url.pecl.package;operator</link>.
-  </simpara>
-  <simpara>
-   Windows users can download prebuilt release binaries from the <link xlink:href="&url.pecl.package;operator">PECL</link> website.
-  </simpara>
-  <simpara>
-   operator releases are hosted by PECL and the source code by
-   <link xlink:href="&url.git.hub;jb-lopez/pecl-php-operator">github</link>.
-  </simpara>
- </section>
-</chapter>
diff --git a/reference/parallel/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/parallel/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/parallel/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/parallel/book.xml b/reference/parallel/book.xml
deleted file mode 100644
index 923c45b7fac3..000000000000
--- a/reference/parallel/book.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="book.parallel">
- <?phpdoc extension-membership="pecl" ?>
- <title>parallel</title>
- <titleabbrev>parallel</titleabbrev>
-
- <preface xml:id="intro.parallel">
-  &reftitle.intro;
-  <simpara>
-  parallel is a parallel concurrency extension for PHP ≥ 7.2.0.
-  As of parallel 1.2.0, PHP ≥ 8.0.0 is required.
-  </simpara>
-  <simpara>
-   A brief description of the concepts core to parallel follows, more detailed information may be found within this section of the manual.
-  </simpara>
-  <simplesect>
-   <title>Runtime</title>
-   <simpara>
-     A <classname>parallel\Runtime</classname> represents a PHP interpreter thread. A <classname>parallel\Runtime</classname> is configured with an optional bootstrap file passed to <methodname>parallel\Runtime::__construct</methodname>, this is typically an autoloader,
-    or some other preloading routine: The bootstrap file will be included before any task is executed.
-   </simpara>
-   <simpara>
-    After construction the <classname>parallel\Runtime</classname> remains available until it is closed, killed, or destroyed by the normal scoping rules of PHP objects.
-    <methodname>parallel\Runtime::run</methodname> allows the programmer to schedule tasks for execution in parallel.
-    A <classname>parallel\Runtime</classname> has a FIFO schedule, tasks will be executed in the order that they are scheduled.
-   </simpara>
-  </simplesect>
-  <simplesect>
-   <title>Functional API</title>
-   <simpara>
-    parallel implements a functional, higher level API on top of <classname>parallel\Runtime</classname> that provides a single function entry point to executing parallel code
-    with automatic scheduling: <function>parallel\run</function>.
-   </simpara>
-  </simplesect>
-  <simplesect>
-   <title>Task</title>
-   <para>
-    A task is simply a <classname>Closure</classname> intended for parallel execution. The <classname>Closure</classname> may contain almost any instruction, including nested closures.
-    However, there are some instructions that are prohibited in tasks:
-    <itemizedlist>
-     <listitem>
-     <simpara>yield</simpara>
-     </listitem>
-     <listitem>
-     <simpara>use by-reference</simpara>
-     </listitem>
-     <listitem>
-     <simpara>declare class</simpara>
-     </listitem>
-     <listitem>
-     <simpara>declare named function</simpara>
-     </listitem>
-    </itemizedlist>
-   </para>
-   <note>
-    <simpara>
-     Nested closures may yield or use by-reference, but must not contain class or named function declarations.
-    </simpara>
-   </note>
-   <note>
-    <simpara>
-     No instructions are prohibited in the files which the task may include.
-    </simpara>
-   </note>
-  </simplesect>
-  <simplesect>
-   <title>Future</title>
-   <simpara>
-    The <classname>parallel\Future</classname> is used to access the return value from the task, and exposes an API for cancellation of the task.
-   </simpara>
-  </simplesect>
-  <simplesect>
-   <title>Channel</title>
-   <simpara>
-    A task may be scheduled with arguments, use lexical scope variables (by-value), and return a value (via a <classname>parallel\Future</classname>), but these only allow uni-directional communication:
-    They allow the programmer to send data into and retrieve data from a task, but do not allow bi-directional communication between tasks.
-    The <classname>parallel\Channel</classname> API allows bi-directional communication between tasks, a <classname>parallel\Channel</classname> is a socket-like link between tasks that the programmer can use to send and receive data.
-   </simpara>
-  </simplesect>
-  <simplesect>
-   <title>Events</title>
-   <simpara>
-    The <classname>parallel\Events</classname> API implements a native feel (<classname>Traversable</classname>) event loop, and <methodname>parallel\Events::poll</methodname> method.
-    It allows the programmer to work with sets of channels and or futures.
-    The programmer simply adds channels and futures to the event loop, optionally setting the input for writes with <methodname>parallel\Events::setInput</methodname>,
-    and enters into a foreach: parallel will read from and write to objects as they become available yielding <classname>parallel\Events\Event</classname> objects
-    describing the operations that have occurred.
-   </simpara>
-  </simplesect>
-   <simplesect role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="philosophy.parallel"/></member>
-   </simplelist>
-  </simplesect>
- </preface>
-
- &reference.parallel.setup;
- &reference.parallel.philosophy;
- &reference.parallel.functional;
- &reference.parallel.parallel.runtime;
- &reference.parallel.parallel.future;
- &reference.parallel.parallel.channel;
- &reference.parallel.parallel.events;
- &reference.parallel.parallel.events.input;
- &reference.parallel.parallel.events.event;
- &reference.parallel.parallel.events.event.type;
-
- &reference.parallel.parallel.sync;
- <!--&reference.parallel.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/parallel/configure.xml b/reference/parallel/configure.xml
deleted file mode 100644
index d170437eb2b0..000000000000
--- a/reference/parallel/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel.installation">
- &reftitle.install;
-
- <simpara>
-  Use <option role="configure">--with-parallel[=DIR]</option> when compiling PHP.
- </simpara>
-
- <simpara>
-  Windows users should include <filename>php_parallel.dll</filename> into &php.ini;
- </simpara>
-
-</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/parallel/functional.xml b/reference/parallel/functional.xml
deleted file mode 100644
index 1d0ae52518f2..000000000000
--- a/reference/parallel/functional.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="functional.parallel">
- <title>Functional API</title>
- <partintro>
-  <simpara>
-   The <classname>parallel\Runtime</classname> API provides a great degree of control to the power PHP programmer, and those intimately familiar with writing applications that use
-   parallel concurrency.
-  </simpara>
-  <para>
-   The functional API provides less control in exchange for the ability to make decisions for the programmer:
-   <itemizedlist>
-    <listitem>
-    <simpara>all executing runtimes are bootstrapped identically</simpara>
-    </listitem>
-    <listitem>
-    <simpara>scheduling is determined by the API, not the programmer</simpara>
-    </listitem>
-   </itemizedlist>
-   <function>parallel\run</function> provides the guarantee that the task will begin to execute in parallel as soon as allowed by hardware and operating system constraints, without
-   needlessly creating runtimes. For most applications the functional API should be preferred.
-  </para>
- </partintro>
-
- &reference.parallel.functions.parallel.bootstrap;
- &reference.parallel.functions.parallel.run;
-</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/parallel/functions/parallel.bootstrap.xml b/reference/parallel/functions/parallel.bootstrap.xml
deleted file mode 100644
index 75473bd1fd86..000000000000
--- a/reference/parallel/functions/parallel.bootstrap.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="parallel.bootstrap">
- <refnamediv>
-  <refname>parallel\bootstrap</refname>
-  <refpurpose>Bootstrapping</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>parallel\bootstrap</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall use the provided <parameter>file</parameter> to bootstrap all runtimes created for automatic scheduling via <function>parallel\run</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the file to bootstrap all runtimes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\Bootstrap</type> if previously called for this process.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\Bootstrap</type> if called after <function>parallel\run</function>.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="parallel-runtime.run"/></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/parallel/functions/parallel.run.xml b/reference/parallel/functions/parallel.run.xml
deleted file mode 100644
index 32c5e6cf34a9..000000000000
--- a/reference/parallel/functions/parallel.run.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="parallel.run">
- <refnamediv>
-  <refname>parallel\run</refname>
-  <refpurpose>Execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall schedule <parameter>task</parameter> for execution in parallel.
-  </simpara>
-  <methodsynopsis>
-   <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
-   <methodparam><type>array</type><parameter>argv</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall schedule <parameter>task</parameter> for execution in parallel, passing <parameter>argv</parameter> at execution time.
-  </simpara>
- </refsect1>
-
- <refsect1 role="scheduling-characteristics">
-  <title>Automatic Scheduling</title>
-  <simpara>
-   If a <classname>\parallel\Runtime</classname> internally created and cached by a previous call to <function>parallel\run</function> is idle,
-   it will be used to execute the task. If no <classname>\parallel\Runtime</classname> is idle parallel will create and cache a
-   <classname>\parallel\Runtime</classname>.
-  </simpara>
-  <note>
-   <simpara>
-    <classname>\parallel\Runtime</classname> objects created by the programmer are not used for automatic scheduling.
-   </simpara>
-  </note>
- </refsect1>
-
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='parameters'])"/>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='closure-characteristics'])"/>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='argv-characteristics'])"/>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='object-characteristics'])"/>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='returnvalues'])"/>
- <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('parallel-runtime.run')/db:refsect1[@role='exceptions'])"/>
-
- <refsect1 role="seealso">
-   &reftitle.seealso;
-   <simplelist>
-    <member><xref linkend="parallel-runtime.run"/></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/parallel/parallel.channel.xml b/reference/parallel/parallel.channel.xml
deleted file mode 100644
index 0867e97a8267..000000000000
--- a/reference/parallel/parallel.channel.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-channel" role="class">
-
- <title>The parallel\Channel class</title>
- <titleabbrev>parallel\Channel</titleabbrev>
-
- <partintro>
-  <section>
-    <title>Unbuffered Channels</title>
-    <simpara>
-     An unbuffered channel will block on calls to <methodname>parallel\Channel::send</methodname> until there is a receiver, and block on calls to
-     <methodname>parallel\Channel::recv</methodname> until there is a sender. This means an unbuffered channel is not only a way to share data among tasks
-     but also a simple method of synchronization.
-    </simpara>
-    <simpara>
-     An unbuffered channel is the fastest way to share data among tasks, requiring the least copying.
-    </simpara>
-  </section>
-
-  <section>
-    <title>Buffered Channels</title>
-    <simpara>
-     A buffered channel will not block on calls to <methodname>parallel\Channel::send</methodname> until capacity is reached, calls to
-     <methodname>parallel\Channel::recv</methodname> will block until there is data in the buffer.
-    </simpara>
-  </section>
-
-  <section>
-    <title>Closures over Channels</title>
-    <simpara>
-     A powerful feature of parallel channels is that they allow the exchange of closures between tasks (and runtimes).
-    </simpara>
-    <simpara>
-     When a closure is sent over a channel the closure is buffered, it doesn't change the buffering of the channel transmitting the closure,
-     but it does effect the static scope inside the closure: The same closure sent to different runtimes, or the same runtime,
-     will not share their static scope.
-    </simpara>
-    <simpara>
-     This means that whenever a closure is executed that was transmitted by a channel, static state will be as it was when the closure was buffered.
-    </simpara>
-  </section>
-
-  <section>
-   <title>Anonymous Channels</title>
-   <simpara>
-    The anonymous channel constructor allows the programmer to avoid assigning names to every channel: parallel will generate a unique name for anonymous
-    channels.
-   </simpara>
-  </section>
-
-  <section xml:id="parallel-channel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Channel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Channel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Anonymous Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-channel')/db:refentry/db:refsect1[@audience='anonymous']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Access</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-channel')/db:refentry/db:refsect1[@audience='access']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Sharing</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-channel')/db:refentry/db:refsect1[@audience='sharing']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Closing</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-channel')/db:refentry/db:refsect1[@audience='close']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Constant for Infinitely Buffered</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Infinite</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.parallel.parallel.channel.construct;
- &reference.parallel.parallel.channel.make;
- &reference.parallel.parallel.channel.open;
- &reference.parallel.parallel.channel.recv;
- &reference.parallel.parallel.channel.send;
- &reference.parallel.parallel.channel.close;
-
-</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/parallel/parallel.events.event.type.xml b/reference/parallel/parallel.events.event.type.xml
deleted file mode 100644
index c9b6ee5cd629..000000000000
--- a/reference/parallel/parallel.events.event.type.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parallel-events-event-type" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The parallel\Events\Event\Type class</title>
- <titleabbrev>parallel\Events\Event\Type</titleabbrev>
-
- <partintro>
-
-  <section xml:id="parallel-events-event-type.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Events\Event\Type</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Events\Event\Type</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Event::$object was read into Event::$value</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Read</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Input for Event::$source written to Event::$object</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Write</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Event::$object (Channel) was closed</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Close</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Event::$object (Future) was cancelled</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Cancel</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Runtime executing Event::$object (Future) was killed</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Kill</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Event::$object (Future) raised error</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <varname>Error</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/parallel/parallel.events.event.xml b/reference/parallel/parallel.events.event.xml
deleted file mode 100644
index 869fda5f4587..000000000000
--- a/reference/parallel/parallel.events.event.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-events-event" role="class">
-
- <title>The parallel\Events\Event class</title>
- <titleabbrev>parallel\Events\Event</titleabbrev>
-
- <partintro>
-
-  <section>
-   <title>Event Objects</title>
-   <simpara>
-    When an Event is returned, <varname>Event::$object</varname> shall be removed from the loop that returned it, should the event be a write event
-    the <classname>Input</classname> for <varname>Event::$source</varname> shall also be removed.
-   </simpara>
-  </section>
-  <section xml:id="parallel-events-event.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Events\Event</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Events\Event</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Shall be one of <classname>Event\Type</classname> constants</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname>type</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Shall be the source of the event (target name)</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname>source</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Shall be either Future or Channel</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>object</type>
-     <varname>object</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Shall be set for Read/Error events</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname>value</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/parallel/parallel.events.input.xml b/reference/parallel/parallel.events.input.xml
deleted file mode 100644
index dd2e24a8ac4b..000000000000
--- a/reference/parallel/parallel.events.input.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-events-input" role="class">
-
- <title>The parallel\Events\Input class</title>
- <titleabbrev>parallel\Events\Input</titleabbrev>
-
- <partintro>
-
-  <section>
-    <title>Events Input</title>
-    <simpara>
-     An Input object is a container for data that the <classname>parallel\Events</classname> object will write to
-     <classname>parallel\Channel</classname> objects as they become available. Multiple event loops may share an Input container - parallel does not
-     verify the contents of the container when it is set as the input for a <classname>parallel\Events</classname> object.
-    </simpara>
-    <note>
-    <simpara>
-     When a <classname>parallel\Events</classname> object performs a write, the target is removed from the input object as if
-     <methodname>parallel\Events\Input::remove</methodname> were called.
-    </simpara>
-    </note>
-  </section>
-
-  <section xml:id="parallel-events-input.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Events\Input</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Events\Input</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events-input')/db:refentry/db:refsect1[@audience='adding']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events-input')/db:refentry/db:refsect1[@audience='removing']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events-input')/db:refentry/db:refsect1[@audience='clearing']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-&reference.parallel.parallel.entities.input;
-
-</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/parallel/parallel.events.xml b/reference/parallel/parallel.events.xml
deleted file mode 100644
index b45d5e9f58f4..000000000000
--- a/reference/parallel/parallel.events.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-events" role="class">
-
- <title>The parallel\Events class</title>
- <titleabbrev>parallel\Events</titleabbrev>
-
- <partintro>
-  <section>
-    <title>The Event Loop</title>
-    <simpara>
-     The Event loop monitors the state of sets of futures and or channels (targets) in order to perform read (<methodname>parallel\Future::value</methodname>, <methodname>parallel\Channel::recv</methodname>) and write (<methodname>parallel\Channel::send</methodname>) operations as the targets become available and the operations may be performed without blocking the event loop.
-    </simpara>
-  </section>
-  <section xml:id="parallel-events.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Events</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Events</classname>
-     </ooclass>
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Input</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events')/db:refentry/db:refsect1[@audience='input']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Targets</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events')/db:refentry/db:refsect1[@audience='targets']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Behaviour</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events')/db:refentry/db:refsect1[@audience='behaviour']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Polling</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-events')/db:refentry/db:refsect1[@audience='polling']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.parallel.parallel.events.setblocking;
-  &reference.parallel.parallel.events.settimeout;
-  &reference.parallel.parallel.events.setinput;
-  &reference.parallel.parallel.events.addchannel;
-  &reference.parallel.parallel.events.addfuture;
-  &reference.parallel.parallel.events.remove;
-  &reference.parallel.parallel.events.poll;
-
-</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/parallel/parallel.future.xml b/reference/parallel/parallel.future.xml
deleted file mode 100644
index 34204f3bfef2..000000000000
--- a/reference/parallel/parallel.future.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-future" role="class">
-
- <title>The parallel\Future class</title>
- <titleabbrev>parallel\Future</titleabbrev>
-
- <partintro>
-
-  <section>
-    <title>Futures</title>
-    <simpara>
-     A Future represents the return value or uncaught exception from a task, and exposes an API for cancellation.
-    </simpara>
-     <example>
-      <title>Example showing Future as return value</title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-$runtime = new \parallel\Runtime;
-$future  = $runtime->run(function(){
-    return "World";
-});
-printf("Hello %s\n", $future->value());
-?>
-]]>
-      </programlisting>
-      &example.outputs.similar;
-      <screen>
-<![CDATA[
-Hello World
-]]>
-      </screen>
-     </example>
-    <simpara>
-     The behaviour of a future also allows it to be used as a simple synchronization point even where the task does not return a value explicitly.
-    </simpara>
-     <example>
-      <title>Example showing Future as synchronization point</title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-$runtime = new \parallel\Runtime;
-$future  = $runtime->run(function(){
-    echo "in child ";
-    for ($i = 0; $i < 500; $i++) {
-        if ($i % 10 == 0) {
-            echo ".";
-        }
-    }
-    echo " leaving child";
-});
-
-$future->value();
-echo "\nparent continues\n";
-?>
-]]>
-      </programlisting>
-      &example.outputs.similar;
-      <screen>
-<![CDATA[
-in child .................................................. leaving child
-parent continues
-]]>
-      </screen>
-     </example>
-  </section>
-
-  <section xml:id="parallel-future.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Future</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Future</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Resolution</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-future')/db:refentry/db:refsect1[@audience='resolution']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">State</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-future')/db:refentry/db:refsect1[@audience='state']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Cancellation</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-future')/db:refentry/db:refsect1[@audience='cancellation']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.parallel.parallel.entities.future;
-
-</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/parallel/parallel.runtime.xml b/reference/parallel/parallel.runtime.xml
deleted file mode 100644
index 2fe9d3574844..000000000000
--- a/reference/parallel/parallel.runtime.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-runtime" role="class">
-
- <title>The parallel\Runtime class</title>
- <titleabbrev>parallel\Runtime</titleabbrev>
-
- <partintro>
-
-  <section>
-    <title>Runtime Objects</title>
-    <simpara>
-     Each runtime represents a single PHP thread, the thread is created (and bootstrapped) upon construction.
-     The thread then waits for tasks to be scheduled: Scheduled tasks will be executed FIFO and then the thread will resume waiting until
-     more tasks are scheduled, or it's closed, killed, or destroyed by the normal scoping rules of PHP objects.
-    </simpara>
-    <warning>
-     <simpara>
-      When a runtime is destroyed by the normal scoping rules of PHP objects, it will first execute all of the tasks that were scheduled,
-      and block while doing so.
-     </simpara>
-    </warning>
-  </section>
-
-  <section>
-    <title>Runtime Bootstrapping</title>
-    <simpara>
-     When a new runtime is created, it does not share code with the thread (or process) that created it. This means it doesn't have the same
-     classes and functions loaded, nor the same autoloader set. In some cases, a very lightweight runtime is desirable because the tasks that
-     will be scheduled do not need access to the code in the parent thread. In those cases where the tasks do need to access the same code, it
-     is enough to set an autoloader as the bootstrap.
-    </simpara>
-    <note>
-     <simpara>
-      preloading may be used in conjunction with parallel, in this case preloaded code is available without bootstrapping
-     </simpara>
-    </note>
-  </section>
-
-  <section xml:id="parallel-runtime.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Runtime</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Runtime</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Create</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-runtime')/db:refentry/db:refsect1[@audience='create']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Execute</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-runtime')/db:refentry/db:refsect1[@audience='execute']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Join</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-runtime')/db:refentry/db:refsect1[@audience='join']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.parallel.parallel.runtime.construct;
- &reference.parallel.parallel.runtime.run;
- &reference.parallel.parallel.runtime.close;
- &reference.parallel.parallel.runtime.kill;
-
-</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/parallel/parallel.sync.xml b/reference/parallel/parallel.sync.xml
deleted file mode 100644
index 226ce00931e1..000000000000
--- a/reference/parallel/parallel.sync.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.parallel-sync" role="class">
-
- <title>The parallel\Sync class</title>
- <titleabbrev>parallel\Sync</titleabbrev>
-
- <partintro>
-  <section>
-    <title>Low Level Synchronization</title>
-    <simpara>
-     The <classname>parallel\Sync</classname> class provides access to low level synchronization primitives, mutex, condition variables, and allows the implementation of semaphores.
-    </simpara>
-
-    <simpara>
-     Synchronization for most applications is much better implemented using channels, however, in some cases authors of low level code may find it useful to be able to access
-     these lower level mechanisms.
-    </simpara>
-
-  </section>
-
-  <section xml:id="parallel-sync.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>parallel\Sync</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>parallel\Sync</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-sync')/db:refentry/db:refsect1[@audience='construction']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Access</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-sync')/db:refentry/db:refsect1[@audience='access']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-    <classsynopsisinfo role="comment">Synchronization</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parallel-sync')/db:refentry/db:refsect1[@audience='synchronization']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-  &reference.parallel.parallel.sync.construct;
-  &reference.parallel.parallel.sync.get;
-  &reference.parallel.parallel.sync.set;
-  &reference.parallel.parallel.sync.wait;
-  &reference.parallel.parallel.sync.notify;
-  &reference.parallel.parallel.sync.invoke;
-
-</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/parallel/parallel/channel/close.xml b/reference/parallel/parallel/channel/close.xml
deleted file mode 100644
index 81abefb52607..000000000000
--- a/reference/parallel/parallel/channel/close.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.close">
- <refnamediv>
-  <refname>parallel\Channel::close</refname>
-  <refpurpose>Closing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="close">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Channel::close</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall close this channel
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\Closed</type> if channel is closed.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/channel/construct.xml b/reference/parallel/parallel/channel/construct.xml
deleted file mode 100644
index 69bd167132d9..000000000000
--- a/reference/parallel/parallel/channel/construct.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.construct">
- <refnamediv>
-  <refname>parallel\Channel::__construct</refname>
-  <refpurpose>Channel Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="anonymous">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Channel::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall make an anonymous unbuffered channel
-  </simpara>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Channel::__construct</methodname>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall make an anonymous buffered channel with the given capacity
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <simpara>
-      May be <type>Channel::Infinite</type> or a positive integer
-     </simpara>
-    </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/parallel/parallel/channel/make.xml b/reference/parallel/parallel/channel/make.xml
deleted file mode 100644
index 2559bf8c14e2..000000000000
--- a/reference/parallel/parallel/channel/make.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.make">
- <refnamediv>
-  <refname>parallel\Channel::make</refname>
-  <refpurpose>Access</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="access">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Channel</type><methodname>parallel\Channel::make</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall make an unbuffered channel with the given name
-  </simpara>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Channel</type><methodname>parallel\Channel::make</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>capacity</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall make a buffered channel with the given name and capacity
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the channel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>capacity</parameter></term>
-    <listitem>
-     <simpara>
-      May be <type>Channel::Infinite</type> or a positive integer
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\Existence</type> if channel already exists.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/channel/open.xml b/reference/parallel/parallel/channel/open.xml
deleted file mode 100644
index 1a117d431de3..000000000000
--- a/reference/parallel/parallel/channel/open.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.open">
- <refnamediv>
-  <refname>parallel\Channel::open</refname>
-  <refpurpose>Access</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="access">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Channel</type><methodname>parallel\Channel::open</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall open the channel with the given name
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\Existence</type> if channel does not exist.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/channel/recv.xml b/reference/parallel/parallel/channel/recv.xml
deleted file mode 100644
index 245a8de6ece1..000000000000
--- a/reference/parallel/parallel/channel/recv.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.recv">
- <refnamediv>
-  <refname>parallel\Channel::recv</refname>
-  <refpurpose>Sharing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="sharing">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>parallel\Channel::recv</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall recv a value from this channel
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\Closed</type> if channel is closed.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/channel/send.xml b/reference/parallel/parallel/channel/send.xml
deleted file mode 100644
index fde8399f9b87..000000000000
--- a/reference/parallel/parallel/channel/send.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-channel.send">
- <refnamediv>
-  <refname>parallel\Channel::send</refname>
-  <refpurpose>Sharing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="sharing">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Channel::send</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall send the given value on this channel
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\Closed</type> if channel is closed.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Channel\Error\IllegalValue</type> if value is illegal.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/addchannel.xml b/reference/parallel/parallel/events/addchannel.xml
deleted file mode 100644
index ea780221db62..000000000000
--- a/reference/parallel/parallel/events/addchannel.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.addchannel">
- <refnamediv>
-  <refname>parallel\Events::addChannel</refname>
-  <refpurpose>Targets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="targets">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::addChannel</methodname>
-   <methodparam><type>parallel\Channel</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall watch for events on the given <parameter>channel</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error\Existence</type> if channel was already added.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/addfuture.xml b/reference/parallel/parallel/events/addfuture.xml
deleted file mode 100644
index 44365caa5477..000000000000
--- a/reference/parallel/parallel/events/addfuture.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.addfuture">
- <refnamediv>
-  <refname>parallel\Events::addFuture</refname>
-  <refpurpose>Targets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="targets">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::addFuture</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>parallel\Future</type><parameter>future</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall watch for events on the given <parameter>future</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error\Existence</type> if target with the given name was already added.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/poll.xml b/reference/parallel/parallel/events/poll.xml
deleted file mode 100644
index 86074a52a3ed..000000000000
--- a/reference/parallel/parallel/events/poll.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.poll">
- <refnamediv>
-  <refname>parallel\Events::poll</refname>
-  <refpurpose>Polling</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="polling">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>parallel\Events\Event</type><type>null</type></type><methodname>parallel\Events::poll</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Shall poll for the next event
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-   <simpara>
-    Should there be no targets remaining, &null; shall be returned
-   </simpara>
-   <simpara>
-    Should this be a non-blocking loop, and blocking would occur, &null; shall be returned
-   </simpara>
-   <simpara>
-    Otherwise, the <classname>parallel\Events\Event</classname> returned describes the event.
-   </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error\Timeout</type> if timeout is used and reached.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/remove.xml b/reference/parallel/parallel/events/remove.xml
deleted file mode 100644
index 306f00f4c036..000000000000
--- a/reference/parallel/parallel/events/remove.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.remove">
- <refnamediv>
-  <refname>parallel\Events::remove</refname>
-  <refpurpose>Targets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="targets">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::remove</methodname>
-   <methodparam><type>string</type><parameter>target</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall remove the given <parameter>target</parameter>
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error\Existence</type> if target with the given name was not found.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/setblocking.xml b/reference/parallel/parallel/events/setblocking.xml
deleted file mode 100644
index ef6bcee77269..000000000000
--- a/reference/parallel/parallel/events/setblocking.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.setblocking">
- <refnamediv>
-  <refname>parallel\Events::setBlocking</refname>
-  <refpurpose>Behaviour</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="behaviour">
-  &reftitle.description;
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   This differs from setting a timeout of 0 with <methodname>parallel\Events::setTimeout</methodname>, since a timeout of 0, while allowed, will cause an exception
-   to be raised, which may be extremely slow or wasteful if what is really desired is non-blocking behaviour.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::setBlocking</methodname>
-   <methodparam><type>bool</type><parameter>blocking</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall set blocking mode
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error</type> if loop has timeout set.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/setinput.xml b/reference/parallel/parallel/events/setinput.xml
deleted file mode 100644
index df0324f75418..000000000000
--- a/reference/parallel/parallel/events/setinput.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.setinput">
- <refnamediv>
-  <refname>parallel\Events::setInput</refname>
-  <refpurpose>Input</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="input">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::setInput</methodname>
-   <methodparam><type>Input</type><parameter>input</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall set <parameter>input</parameter> for this event loop
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/events/settimeout.xml b/reference/parallel/parallel/events/settimeout.xml
deleted file mode 100644
index 6f4123b27c71..000000000000
--- a/reference/parallel/parallel/events/settimeout.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events.settimeout">
- <refnamediv>
-  <refname>parallel\Events::setTimeout</refname>
-  <refpurpose>Behaviour</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="behaviour">
-  &reftitle.description;
-  <simpara>
-   By default when events are polled for, blocking will occur (at the PHP level) until the first event can be returned: Setting the timeout causes an exception to be
-   thrown when the timeout is reached.
-  </simpara>
-  <simpara>
-   This differs from setting blocking mode to &false; with <methodname>parallel\Events::setBlocking</methodname>, which will not cause an exception to be thrown.
-  </simpara>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events::setTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall set the timeout in microseconds
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Error</type> if loop is non-blocking.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/future/cancel.xml b/reference/parallel/parallel/future/cancel.xml
deleted file mode 100644
index a658dd01ce46..000000000000
--- a/reference/parallel/parallel/future/cancel.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-future.cancel">
- <refnamediv>
-  <refname>parallel\Future::cancel</refname>
-  <refpurpose>Cancellation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="cancellation">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>parallel\Future::cancel</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Shall try to cancel the task
-  </simpara>
-  <note>
-   <simpara>
-    If task is running, it will be interrupted.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    Internal function calls in progress cannot be interrupted.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error\Killed</type> if <type>parallel\Runtime</type> executing task was killed.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error\Cancelled</type> if task was already cancelled.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/future/cancelled.xml b/reference/parallel/parallel/future/cancelled.xml
deleted file mode 100644
index 855b2a7ff7d9..000000000000
--- a/reference/parallel/parallel/future/cancelled.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-future.cancelled">
- <refnamediv>
-  <refname>parallel\Future::cancelled</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="state">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>parallel\Future::cancelled</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall indicate if the task was cancelled
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/future/done.xml b/reference/parallel/parallel/future/done.xml
deleted file mode 100644
index ad17c389448a..000000000000
--- a/reference/parallel/parallel/future/done.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-future.done">
- <refnamediv>
-  <refname>parallel\Future::done</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="state">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>parallel\Future::done</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall indicate if the task is completed
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/future/value.xml b/reference/parallel/parallel/future/value.xml
deleted file mode 100644
index d3f1e77f3e41..000000000000
--- a/reference/parallel/parallel/future/value.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-future.value">
- <refnamediv>
-  <refname>parallel\Future::value</refname>
-  <refpurpose>Resolution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="resolution">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>parallel\Future::value</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall return (and if necessary wait for) return from task
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error</type> if waiting failed (internal error).
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error\Killed</type> if <type>parallel\Runtime</type> executing task was killed.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error\Cancelled</type> if task was cancelled.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Future\Error\Foreign</type> if task raised an unrecognized uncaught exception.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall rethrow <type>Throwable</type> uncaught in task
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/input/add.xml b/reference/parallel/parallel/input/add.xml
deleted file mode 100644
index 618477679f9c..000000000000
--- a/reference/parallel/parallel/input/add.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events-input.add">
- <refnamediv>
-  <refname>parallel\Events\Input::add</refname>
-  <refpurpose>Inputs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="adding">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events\Input::add</methodname>
-   <methodparam><type>string</type><parameter>target</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall set input for the given target
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Input\Error\Existence</type> if input for target already exists.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Input\Error\IllegalValue</type> if value is illegal (&object;, &null;).
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/input/clear.xml b/reference/parallel/parallel/input/clear.xml
deleted file mode 100644
index af70b6762594..000000000000
--- a/reference/parallel/parallel/input/clear.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events-input.clear">
- <refnamediv>
-  <refname>parallel\Events\Input::clear</refname>
-  <refpurpose>Inputs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="clearing">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events\Input::clear</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Shall remove input for all targets
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/input/remove.xml b/reference/parallel/parallel/input/remove.xml
deleted file mode 100644
index 23444d774cd8..000000000000
--- a/reference/parallel/parallel/input/remove.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-events-input.remove">
- <refnamediv>
-  <refname>parallel\Events\Input::remove</refname>
-  <refpurpose>Inputs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="removing">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Events\Input::remove</methodname>
-   <methodparam><type>string</type><parameter>target</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Shall remove input for the given target
-  </simpara>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Events\Input\Error\Existence</type> if input for target does not exist.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/runtime/close.xml b/reference/parallel/parallel/runtime/close.xml
deleted file mode 100644
index ab42e072d89e..000000000000
--- a/reference/parallel/parallel/runtime/close.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-runtime.close">
- <refnamediv>
-  <refname>parallel\Runtime::close</refname>
-  <refpurpose>Runtime Graceful Join</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="join">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Runtime::close</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall request that the runtime shutsdown.
-  </simpara>
-  <note>
-   <simpara>
-    Tasks scheduled for execution will be executed before the shutdown occurs.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\Closed</type> if <type>Runtime</type> was already closed.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/runtime/construct.xml b/reference/parallel/parallel/runtime/construct.xml
deleted file mode 100644
index 1d402835297c..000000000000
--- a/reference/parallel/parallel/runtime/construct.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-runtime.construct">
- <refnamediv>
-  <refname>parallel\Runtime::__construct</refname>
-  <refpurpose>Runtime Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="create">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Runtime::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   Shall construct a new runtime without bootstrapping.
-  </simpara>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Runtime::__construct</methodname>
-   <methodparam><type>string</type><parameter>bootstrap</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Shall construct a bootstrapped runtime.
-  </simpara>
-
- </refsect1>
-
-  <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>bootstrap</parameter></term>
-    <listitem>
-     <simpara>
-      The location of a bootstrap file, generally an autoloader.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error</type> if thread could not be created
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Bootstrap</type> if bootstrapping failed
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/runtime/kill.xml b/reference/parallel/parallel/runtime/kill.xml
deleted file mode 100644
index 69948af15752..000000000000
--- a/reference/parallel/parallel/runtime/kill.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-runtime.kill">
- <refnamediv>
-  <refname>parallel\Runtime::kill</refname>
-  <refpurpose>Runtime Join</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="join">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>parallel\Runtime::kill</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall attempt to force the runtime to shutdown.
-  </simpara>
-  <note>
-   <simpara>
-    Tasks scheduled for execution will not be executed, the currently running task shall be interrupted.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    Internal function calls in progress cannot be interrupted.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\Closed</type> if <type>Runtime</type> was closed.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/runtime/run.xml b/reference/parallel/parallel/runtime/run.xml
deleted file mode 100644
index 39b06180a9fe..000000000000
--- a/reference/parallel/parallel/runtime/run.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-runtime.run">
- <refnamediv>
-  <refname>parallel\Runtime::run</refname>
-  <refpurpose>Execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="execute">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\Runtime::run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall schedule <parameter>task</parameter> for execution in parallel.
-  </simpara>
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Future</type><type>null</type></type><methodname>parallel\Runtime::run</methodname>
-   <methodparam><type>Closure</type><parameter>task</parameter></methodparam>
-   <methodparam><type>array</type><parameter>argv</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall schedule <parameter>task</parameter> for execution in parallel, passing <parameter>argv</parameter> at execution time.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>task</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Closure</classname> with specific characteristics.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>argv</parameter></term>
-    <listitem>
-     <simpara>
-      An <type>array</type> of arguments with specific characteristics to be passed to <parameter>task</parameter> at execution time.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="closure-characteristics">
- <title>Task Characteristics</title>
- <para>
-  Closures scheduled for parallel execution must not:
-  <simplelist>
-   <member>accept or return by reference</member>
-   <member>accept or return internal objects (see notes)</member>
-   <member>execute a limited set of instructions</member>
-  </simplelist>
- </para>
- <para>
-  Instructions prohibited in Closures intended for parallel execution are:
-  <simplelist>
-   <member>yield</member>
-   <member>use by-reference</member>
-   <member>declare class</member>
-   <member>declare named function</member>
-  </simplelist>
- </para>
- <note>
-  <simpara>
-   Nested closures may yield or use by-reference, but must not contain class or named function declarations.
-  </simpara>
- </note>
- <note>
-  <simpara>
-   No instructions are prohibited in the files which the task may include.
-  </simpara>
- </note>
- </refsect1>
-
- <refsect1 role="argv-characteristics">
- <title>Arguments Characteristics</title>
- <para>
-  Arguments must not:
-  <simplelist>
-   <member>contain references</member>
-   <member>contain resources</member>
-   <member>contain internal objects (see notes)</member>
-  </simplelist>
-  <note>
-   <simpara>
-    In the case of file stream resources, the resource will be cast to the file descriptor and passed as <type>int</type> where possible, this is unsupported on Windows.
-   </simpara>
-  </note>
- </para>
- </refsect1>
-
- <refsect1 role="object-characteristics">
-  <title>Internal Objects Notes</title>
-  <simpara>
-   Internal objects generally use a custom structure which cannot be copied by value safely, PHP currently lacks the mechanics to do this (without serialization)
-   and so only objects that do not use a custom structure may be shared.
-  </simpara>
-  <simpara>
-   Some internal objects do not use a custom structure, for example <classname>parallel\Events\Event</classname> and so may be shared.
-  </simpara>
-  <simpara>
-   Closures are a special kind of internal object and support being copied by value, and so may be shared.
-  </simpara>
-  <simpara>
-   Channels are central to writing parallel code and support concurrent access and execution by necessity, and so may be shared.
-  </simpara>
-  <warning>
-   <simpara>
-    A user class that extends an internal class may use a custom structure as defined by the internal class, in which case they cannot be copied by value safely,
-    and so may not be shared.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <warning>
-   <simpara>
-    The return <type>parallel\Future</type> must not be ignored when the task contains a return or throw statement.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\Closed</type> if <type>parallel\Runtime</type> was closed.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\IllegalFunction</type> if <parameter>task</parameter> is a closure created from an internal function.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\IllegalInstruction</type> if <parameter>task</parameter> contains illegal instructions.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\IllegalParameter</type> if <parameter>task</parameter> accepts or <parameter>argv</parameter> contains illegal variables.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Runtime\Error\IllegalReturn</type> if <parameter>task</parameter> returns illegally.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/construct.xml b/reference/parallel/parallel/sync/construct.xml
deleted file mode 100644
index 637f799ff392..000000000000
--- a/reference/parallel/parallel/sync/construct.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.construct">
- <refnamediv>
-  <refname>parallel\Sync::__construct</refname>
-  <refpurpose>Construction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="construction">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::__construct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall construct a new synchronization object with no value
-  </simpara>
-
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::__construct</methodname>
-   <methodparam><type>scalar</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall construct a new synchronization object containing the given scalar value
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Sync\Error\IllegalValue</type> if <parameter>value</parameter> is non-scalar.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/get.xml b/reference/parallel/parallel/sync/get.xml
deleted file mode 100644
index 8a40daf295e4..000000000000
--- a/reference/parallel/parallel/sync/get.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.get">
- <refnamediv>
-  <refname>parallel\Sync::get</refname>
-  <refpurpose>Access</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="access">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>scalar</type><methodname>parallel\Sync::get</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall atomically return the synchronization objects value
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/invoke.xml b/reference/parallel/parallel/sync/invoke.xml
deleted file mode 100644
index 6903f5a170b8..000000000000
--- a/reference/parallel/parallel/sync/invoke.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.invoke">
- <refnamediv>
-  <refname>parallel\Sync::__invoke</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="synchronization">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::__invoke</methodname>
-   <methodparam><type>callable</type><parameter>critical</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall exclusively enter into the critical code
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/notify.xml b/reference/parallel/parallel/sync/notify.xml
deleted file mode 100644
index 91adea8cc5cd..000000000000
--- a/reference/parallel/parallel/sync/notify.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.notify">
- <refnamediv>
-  <refname>parallel\Sync::notify</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="synchronization">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::notify</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>all</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall notify one (by default) or all threads waiting on the synchronization object
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/set.xml b/reference/parallel/parallel/sync/set.xml
deleted file mode 100644
index 543b6a634d9f..000000000000
--- a/reference/parallel/parallel/sync/set.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.set">
- <refnamediv>
-  <refname>parallel\Sync::set</refname>
-  <refpurpose>Access</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="access">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::set</methodname>
-   <methodparam><type>scalar</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall atomically set the value of the synchronization object
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="exceptions">
-  <title>Exceptions</title>
-  <warning>
-   <simpara>
-    Shall throw <type>parallel\Sync\Error\IllegalValue</type> if <parameter>value</parameter> is non-scalar.
-   </simpara>
-  </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/parallel/sync/wait.xml b/reference/parallel/parallel/sync/wait.xml
deleted file mode 100644
index df573818f81f..000000000000
--- a/reference/parallel/parallel/sync/wait.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel-sync.wait">
- <refnamediv>
-  <refname>parallel\Sync::wait</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description" audience="synchronization">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>parallel\Sync::wait</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shall wait for notification on this synchronization object
-  </simpara>
-
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parallel/philosophy.xml b/reference/parallel/philosophy.xml
deleted file mode 100644
index 28eebbfd3f5f..000000000000
--- a/reference/parallel/philosophy.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="philosophy.parallel">
- <title>Philosophy</title>
- <simpara>
-  This section contains philosophies important to writing parallel code and some details about the internal implementation of parallel.
- </simpara>
- <simplesect role="sharing">
-   <title>Do not communicate by sharing memory; instead, share memory by communicating.</title>
-   <simpara>
-    This philosophy which is embraced by parallel has its origins in Go, one of the most widely admired if not used platforms for writing parallel code at the moment.
-    Go programmers have to work hard to live up to this ideal: PHP and parallel do all the hard work for the programmer, and by default.
-   </simpara>
-   <simpara>
-    In conventional threading models found in other languages, generally threads are communicating with one another through nothing more than by virtue of the fact that
-    they operate in the same address space.
-    The programmer must deploy mutual exclusion, condition variables, and other low level threading or synchronization primitives in order to ensure proper communication
-    of state and consistency.
-   </simpara>
-   <simpara>
-    When the conventional model is inversed, it means that threads only share memory as a result of communication (a variable is passed over a Channel for example).
-   </simpara>
-   <simpara>
-    When parallel passes a variable from one thread to another by any means - Task arguments, return via Future, and Channels - it is passed by value.
-    In all but the case of unbuffered channels, the variable is also buffered so that it may not change (or be destroyed) before it is used in whichever thread the variable
-    is being passed to. An unbuffered read over a channel is the only instance in which a thread directly reads memory allocated by another thread, it can do so safely because
-    the thread that owns the memory is waiting for the read to complete before it can continue to manipulate it, and the thread that does not own the memory reads by value. When
-    both threads continue, they are no longer sharing memory.
-   </simpara>
-   <simpara>
-    This makes writing and reasoning about parallel code much easier than the conventional model of threading. It means the programmer does not need to consider that threads
-    may be manipulating data concurrently, because that is not possible.
-   </simpara>
-   <simpara>
-    This also makes PHP the perfect platform for implementing a parallel concurrency API based on CSP (message passing over channels), because PHP itself is shared nothing -
-    PHP threads operate in their own virtual address space by default, and so may only share memory by communicating.
-   </simpara>
- </simplesect>
- <simplesect role="owning">
-  <title>Data should have a definitive single owner</title>
-  <simpara>
-   When approaching the CSP model for the first time, a programmer versed in the traditional model of threading may find themselves looking for concurrent data structures,
-   because that is what they are used too: they pass around shared objects for manipulation.
-  </simpara>
-  <simpara>
-   When it comes to the CSP model, there is no need for data structures to be shared by many tasks, and indeed, it is simpler if they are not. The data should be owned
-   by a single task, changes to (or operations on) that data structure should be communicated over channels and performed by the owner of the data, the success, failure,
-   or result (state) of the change (or operation) being communicated back.
-  </simpara>
-  <simpara>
-   Once again the share nothing nature of PHP and copy by value nature of parallel helps the programmer to achieve this goal, no data will be shared by accident,
-   only ever as a result of communication.
-  </simpara>
- </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/parallel/setup.xml b/reference/parallel/setup.xml
deleted file mode 100644
index 17b6c65b6ad6..000000000000
--- a/reference/parallel/setup.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="parallel.setup">
- <title>Installation</title>
-
- <simplesect xml:id="parallel.requirements">
-  &reftitle.required;
-  <simpara>
- parallel requires a build of PHP with ZTS (Zend Thread Safety) enabled
- (<option role="configure">--enable-zts</option>, or on non-Windows systems prior to PHP 8.0.0,
- <option role="configure">--enable-maintainer-zts</option>)
-  </simpara>
-  <caution>
-  <simpara>
- Zend Thread Safety cannot be enabled post build; it is a build time configuration option.
-  </simpara>
-  </caution>
-  <simpara>
- parallel should build anywhere there is a working Posix Threads header (pthread.h) and ZTS build of PHP, including Windows (using the pthread-w32 project from redhat).
-  </simpara>
- </simplesect>
-
- <simplesect xml:id="parallel.installation">
-  &reftitle.install;
-  <simpara>
-   parallel releases are hosted by PECL and the source code by
-    <link xlink:href="&url.git.hub;krakjoe/parallel">github</link>,
-   the easiest route to installation is the normal PECL route:
-   <link xlink:href="&url.pecl.package;parallel">&url.pecl.package;parallel</link>.
-  </simpara>
-  <simpara>
- Windows users can download prebuilt release binaries from the <link xlink:href="&url.pecl.package;parallel">PECL</link> website.
-  </simpara>
-  <caution>
-   <simpara>
- Windows users need to take the additional step of adding <filename>pthreadVC<replaceable>?</replaceable>.dll</filename> (distributed with Windows releases) to their <envar>PATH</envar>.
-   </simpara>
-  </caution>
- </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/parallel/versions.xml b/reference/parallel/versions.xml
deleted file mode 100644
index 7f6bc0c402d3..000000000000
--- a/reference/parallel/versions.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='parallel\bootstrap' from='1.0.0'/>
- <function name='parallel\run' from='1.0.0'/>
-
- <function name='parallel\runtime' from='0.8.0'/>
- <function name='parallel\runtime::__construct' from='0.8.0'/>
- <function name='parallel\runtime::run' from='0.8.0'/>
- <function name='parallel\runtime::close' from='0.8.0'/>
- <function name='parallel\runtime::kill' from='0.8.0'/>
-
- <function name='parallel\future' from='0.8.0'/>
- <function name='parallel\future::value' from='0.8.0'/>
- <function name='parallel\future::done' from='0.8.0'/>
- <function name='parallel\future::cancel' from='0.9.0'/>
- <function name='parallel\future::cancelled' from='0.9.0'/>
-
- <function name='parallel\channel::__construct' from='1.1.0'/>
- <function name='parallel\channel' from='0.9.0'/>
- <function name='parallel\channel::make' from='0.9.0'/>
- <function name='parallel\channel::open' from='0.9.0'/>
- <function name='parallel\channel::send' from='0.9.0'/>
- <function name='parallel\channel::recv' from='0.9.0'/>
- <function name='parallel\channel::close' from='0.9.0'/>
-
- <function name='parallel\events' from='0.9.0'/>
- <function name='parallel\events::setinput' from='0.9.0'/>
- <function name='parallel\events::addchannel' from='0.9.0'/>
- <function name='parallel\events::addfuture' from='0.9.0'/>
- <function name='parallel\events::remove' from='0.9.0'/>
- <function name='parallel\events::settimeout' from='0.9.0'/>
- <function name='parallel\events::setblocking' from='0.9.0'/>
- <function name='parallel\events::poll' from='0.9.0'/>
-
- <function name='parallel\events\event' from='0.9.0'/>
- <function name='parallel\events\event\type' from='0.9.0'/>
-
- <function name='parallel\events\input' from='0.9.0'/>
- <function name='parallel\events\input::add' from='0.9.0'/>
- <function name='parallel\events\input::remove' from='0.9.0'/>
- <function name='parallel\events\input::clear' from='0.9.0'/>
-
- <function name='parallel\sync' from='1.1.0'/>
- <function name='parallel\sync::__construct' from='1.1.0'/>
- <function name='parallel\sync::set' from='1.1.0'/>
- <function name='parallel\sync::get' from='1.1.0'/>
- <function name='parallel\sync::wait' from='1.1.0'/>
- <function name='parallel\sync::notify' from='1.1.0'/>
- <function name='parallel\sync::__invoke' from='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/parle/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/parle/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/parle/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/parle/book.xml b/reference/parle/book.xml
deleted file mode 100644
index 2e870489e832..000000000000
--- a/reference/parle/book.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-
-<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>
-
- <preface xml:id="intro.parle">
-  &reftitle.intro;
-  &warn.experimental;
-  <para>
-   The parle extension provides general purpose lexing and parsing facilities. The implementation is based on <link xlink:href="&url.parle.lib;">these libraries</link> and requires a <link xlink:href="&url.c14;">C++14</link> capable compiler. The lexer is based on the regex matching, the parser is LALR(1). Lexers and parsers are generated on the fly and can be used immediately after they've been finalized. Parle deals with parsing and lexing, the appropriate data structures representation and processing are the implementer's task. Serialization and code generation are not supported by the extension, yet.
-  </para>
-  <para>
-   Lexer analysis is a process of splitting a character sequence into a list of lexemes. The lexeme list can be then used for the syntax analysis against a formal grammar. These operations are also known as lexing and parsing. This documentation doesn't aim to provide an exhaustive information on lexing and parsing. Good information in this regard is available on the numerous resources on the net. Several usage examples are included, to show the functionality. The extension is useful for PHP programmers both willing to learn or to utilize parsing and lexing. State machines and grammar parsing don't have to be implemented manually, these complex tasks are taken away by parle. Thanks to that, the development can be focused on the actual problem solving.
-  </para>
-  <para>  
-   The common use case for parle is, when a data format is too complex to be handled by the regex matching with PCRE. The practical application is herewith wide. Be it a specific data format, a behavior modification of existing functions, even an own programming language and beyond. The helper methods such as <methodname>Parle\Lexer::dump</methodname> to inspect the generated state machine, or <methodname>Parle\Parser::dump</methodname> to inspect the generated grammar, are useful. The method <methodname>Parle\Parser::trace</methodname> can also be used to track the parsing operation.
-  </para>
- </preface>
-
- &reference.parle.setup;
- &reference.parle.constants;
- &reference.parle.pattern.matching;
- &reference.parle.examples;
- &reference.parle.parle.lexer;
- &reference.parle.parle.rlexer;
- &reference.parle.parle.parser;
- &reference.parle.parle.rparser;
- &reference.parle.parle.stack;
- &reference.parle.parle.token;
- &reference.parle.parle.errorinfo;
- &reference.parle.parle.lexerexception;
- &reference.parle.parle.parserexception;
-
-</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/parle/configure.xml b/reference/parle/configure.xml
deleted file mode 100644
index 8ff3be4a78ed..000000000000
--- a/reference/parle/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="parle.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;parle">&url.pecl.package;parle</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/parle/constants.xml b/reference/parle/constants.xml
deleted file mode 100644
index 4fc28dcaefe8..000000000000
--- a/reference/parle/constants.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="parle.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.parle-internal-utf32">
-   <term>
-    <constant>Parle\INTERNAL_UTF32</constant>
-     <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     Flag whether the internal UTF-32 support is compiled in. Available since parle 0.7.2.
-    </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/parle/examples.xml b/reference/parle/examples.xml
deleted file mode 100644
index 62f8544fc427..000000000000
--- a/reference/parle/examples.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="parle.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
-
- <section xml:id="parle.examples.lexer">
-  <title>Lexer examples</title>
-  <example>
-   <title>Tokenize comma separated integer list</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-use Parle\Token;
-use Parle\Lexer;
-use Parle\LexerException;
-
-/* name => id */
-$token = array(
-        "COMMA" => 1,
-        "CRLF" => 2,
-        "DECIMAL" => 3,
-);
-/* id => name */
-$tokenIdToName = array_flip($token);
-
-$lex = new Lexer;
-$lex->push("[\x2c]", $token["COMMA"]);
-$lex->push("[\r][\n]", $token["CRLF"]);
-$lex->push("[\d]+", $token["DECIMAL"]);
-$lex->build();
-
-$in = "0,1,2\r\n3,42,5\r\n6,77,8\r\n";
-
-$lex->consume($in);
-
-do {
-        $lex->advance();
-        $tok = $lex->getToken();
-
-        if (Token::UNKNOWN == $tok->id) {
-                throw new LexerException("Unknown token '{$tok->value}' at offset {$lex->marker}.");
-        }
-
-        echo "TOKEN: ", $tokenIdToName[$tok->id], PHP_EOL;
-} while (Token::EOI != $tok->id);
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Tokenize assign statement</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-use Parle\{Token, Lexer};
-
-$lex = new Lexer;
-
-$lex->push("\$[a-zA-Z_][a-zA-Z0-9_]*", 1);
-$lex->push("=", 2);
-$lex->push("\d+", 3);
-$lex->push(";", 4);
-
-$lex->build();
-
-$lex->consume('$x = 42; $y = 24;');
-
-
-do {
-    $lex->advance();
-    $tok = $lex->getToken();
-    var_dump($tok);
-} while (Token::EOI != $tok->id);
-]]>
-   </programlisting>
-  </example>
- </section>
- <section xml:id="parle.examples.parser">
-  <title>Parser examples</title>
-  <example>
-   <title>Simple calculator</title>
-   <programlisting role="php">
-<![CDATA[
-<?php 
-
-use Parle\{Parser, ParserException, Lexer, Token};
-
-$p = new Parser;
-$p->token("INTEGER");
-$p->left("'+' '-' '*' '/'");
-
-$p->push("start", "exp");
-$prod_add = $p->push("exp", "exp '+' exp");
-$prod_sub = $p->push("exp", "exp '-' exp");
-$prod_mul = $p->push("exp", "exp '*' exp");
-$prod_div = $p->push("exp", "exp '/' exp");
-$p->push("exp", "INTEGER"); /* Production index unused. */
-
-$p->build();
-
-$lex = new Lexer;
-$lex->push("[+]", $p->tokenId("'+'"));
-$lex->push("[-]", $p->tokenId("'-'"));
-$lex->push("[*]", $p->tokenId("'*'"));
-$lex->push("[/]", $p->tokenId("'/'"));
-$lex->push("\\d+", $p->tokenId("INTEGER"));
-$lex->push("\\s+", Token::SKIP);
-
-$lex->build();
-
-$exp = array(
-    "1 + 1",
-    "33 / 10",
-    "100 * 45",
-    "17 - 45",
-);
-
-foreach ($exp as $in) {
-    if (!$p->validate($in, $lex)) {
-        throw new ParserException("Failed to validate input");
-    }
-
-    $p->consume($in, $lex);
-
-    while (Parser::ACTION_ERROR != $p->action && Parser::ACTION_ACCEPT != $p->action) {
-        switch ($p->action) {
-            case Parser::ACTION_ERROR:
-                throw new ParserException("Parser error");
-                break;
-            case Parser::ACTION_SHIFT:
-            case Parser::ACTION_GOTO:
-            case Parser::ACTION_ACCEPT:
-                break;
-            case Parser::ACTION_REDUCE:
-                switch ($p->reduceId) {
-                    case $prod_add:
-                        $l = $p->sigil(0);
-                        $r = $p->sigil(2);
-                        echo "$l + $r = " . ($l + $r) . "\n";
-                        break;
-                    case $prod_sub:
-                        $l = $p->sigil(0);
-                        $r = $p->sigil(2);
-                        echo "$l - $r = " . ($l - $r) . "\n";
-                        break;
-                    case $prod_mul:
-                        $l = $p->sigil(0);
-                        $r = $p->sigil(2);
-                        echo "$l * $r = " . ($l * $r) . "\n";
-                        break;
-                    case $prod_div:
-                        $l = $p->sigil(0);
-                        $r = $p->sigil(2);
-                    echo "$l / $r = " . ($l / $r) . "\n";
-                        break;
-            }
-            break;
-        }
-        $p->advance();
-    }
-}
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Parse words out from a sentence</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-use Parle\{Lexer, Token, Parser, ParserException};
-
-$p = new Parser;
-$p->token("WORD");
-$p->push("START", "SENTENCE");
-$p->push("SENTENCE", "WORDS");
-$prod_word_0 = $p->push("WORDS", "WORDS WORD");
-$prod_word_1 = $p->push("WORDS", "WORD");
-$p->build();
-
-$lex = new Lexer;
-$lex->push("[^\s]{-}[\.,\:\;\?]+", $p->tokenId("WORD"));
-$lex->push("[\s\.,\:\;\?]+", Token::SKIP);
-$lex->build();
-
-$in = "Dis-moi où est ton papa?";
-$p->consume($in, $lex);
-do {
-    switch ($p->action) {
-    case Parser::ACTION_ERROR:
-        throw new ParserException("Error");
-        break;
-    case Parser::ACTION_SHIFT:
-    case Parser::ACTION_GOTO:
-        /* var_dump($p->trace());*/
-        break;
-    case Parser::ACTION_REDUCE:
-        $rid = $p->reduceId();
-        if ($rid == $prod_word_1) {
-            var_dump($p->sigil(0));
-        } if ($rid == $prod_word_0) {
-            var_dump($p->sigil(1));
-        }
-        break;
-    }
-    $p->advance();
-} while (Parser::ACTION_ACCEPT != $p->action);
-]]>
-   </programlisting>
-  </example>
- </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/parle/parle.errorinfo.xml b/reference/parle/parle.errorinfo.xml
deleted file mode 100644
index 50ddc5ea9e9a..000000000000
--- a/reference/parle/parle.errorinfo.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-errorinfo" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\ErrorInfo class</title>
- <titleabbrev>Parle\ErrorInfo</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\ErrorInfo intro -->
-  <section xml:id="parle-errorinfo.intro">
-   &reftitle.intro;
-   <para>
-    The class represents detailed error information as supplied by <methodname>Parle\Parser::errorInfo</methodname>
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-errorinfo.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\ErrorInfo</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\ErrorInfo</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-errorinfo.props.id">id</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-errorinfo.props.position">position</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>mixed</type>
-     <varname linkend="parle-errorinfo.props.token">token</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <!-- Uncomment if there are some methods, same for the entities item down there. -->
-    <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-errorinfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Parle\ErrorInfo properties -->
-  <section xml:id="parle-errorinfo.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-errorinfo.props.id">
-     <term><varname>id</varname></term>
-     <listitem>
-      <para>Error id.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-errorinfo.props.position">
-     <term><varname>position</varname></term>
-     <listitem>
-      <para>Position in the input, where the error occurred.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-errorinfo.props.token">
-     <term><varname>token</varname></term>
-     <listitem>
-      <para>If applicable - the <classname>Parle\Token</classname> related to the error, otherwise &null;.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- <!--&reference.parle.entities.parle-errorinfo;-->
-
-</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/parle/parle.lexer.xml b/reference/parle/parle.lexer.xml
deleted file mode 100644
index 33f51b8c2ac9..000000000000
--- a/reference/parle/parle.lexer.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-lexer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\Lexer class</title>
- <titleabbrev>Parle\Lexer</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\Lexer intro -->
-  <section xml:id="parle-lexer.intro">
-   &reftitle.intro;
-   <para>
-    Single state lexer class. Lexemes can be defined on the fly. If the particular lexer instance is meant to be used with <classname>Parle\Parser</classname>, the token IDs need to be taken from there. Otherwise, arbitrary token IDs can be supplied. This lexer can give a certain performance advantage over <classname>Parle\RLexer</classname>, if no multiple states are required. Note, that <classname>Parle\RParser</classname> is not compatible with this lexer.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-lexer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\Lexer</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\Lexer</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.constants.icase">Parle\Lexer::ICASE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.constants.dot-not-lf">Parle\Lexer::DOT_NOT_LF</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.constants.dot-not-cr-lf">Parle\Lexer::DOT_NOT_CRLF</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.constants.skip-ws">Parle\Lexer::SKIP_WS</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.constants.match-zero-len">Parle\Lexer::MATCH_ZERO_LEN</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="parle-lexer.props.bol">bol</varname>
-     <initializer>&false;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.props.flags">flags</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.props.state">state</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.props.marker">marker</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-lexer.props.cursor">cursor</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-lexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Parle\Lexer constants -->
-  <section xml:id="parle-lexer.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="parle-lexer.constants.icase">
-     <term><constant>Parle\Lexer::ICASE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-lexer.constants.dot-not-lf">
-     <term><constant>Parle\Lexer::DOT_NOT_LF</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-lexer.constants.dot-not-cr-lf">
-     <term><constant>Parle\Lexer::DOT_NOT_CRLF</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-lexer.constants.skip-ws">
-     <term><constant>Parle\Lexer::SKIP_WS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-lexer.constants.match-zero-len">
-     <term><constant>Parle\Lexer::MATCH_ZERO_LEN</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ Parle\Lexer properties -->
-  <section xml:id="parle-lexer.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-lexer.props.bol">
-     <term><varname>bol</varname></term>
-     <listitem>
-      <para>Start of input flag.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-lexer.props.flags">
-     <term><varname>flags</varname></term>
-     <listitem>
-      <para>Lexer flags.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-lexer.props.state">
-     <term><varname>state</varname></term>
-     <listitem>
-      <para>Current lexer state, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-lexer.props.marker">
-     <term><varname>marker</varname></term>
-     <listitem>
-      <para>Position of the latest token match, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-lexer.props.cursor">
-     <term><varname>cursor</varname></term>
-     <listitem>
-      <para>Current input offset, readonly.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- <!--&reference.parle.entities.parle-lexer;-->
- &reference.parle.parle.entities.lexer;
-
-</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/parle/parle.lexerexception.xml b/reference/parle/parle.lexerexception.xml
deleted file mode 100644
index 0dbdabfe444e..000000000000
--- a/reference/parle/parle.lexerexception.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-lexerexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\LexerException class</title>
- <titleabbrev>Parle\LexerException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\LexerException intro -->
-  <section xml:id="parle-lexerexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-lexerexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\LexerException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\LexerException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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>
-    <!-- Uncomment if there are some methods, same for the entities item down there. -->
-    <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-lexerexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!--
- &reference.parle.entities.parle-lexerexception;
- -->
-
-</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/parle/parle.parser.xml b/reference/parle/parle.parser.xml
deleted file mode 100644
index 192732ef8b61..000000000000
--- a/reference/parle/parle.parser.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-parser" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\Parser class</title>
- <titleabbrev>Parle\Parser</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\Parser intro -->
-  <section xml:id="parle-parser.intro">
-   &reftitle.intro;
-   <para>
-    Parser class. Rules can be defined on the fly. Once finalized, a <classname>Parle\Lexer</classname> instance is required to deliver the token stream.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-parser.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\Parser</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\Parser</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.action-error">Parle\Parser::ACTION_ERROR</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.action-shift">Parle\Parser::ACTION_SHIFT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.action-reduce">Parle\Parser::ACTION_REDUCE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.action-goto">Parle\Parser::ACTION_GOTO</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.action-accept">Parle\Parser::ACTION_ACCEPT</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.error-syntax">Parle\Parser::ERROR_SYNTAX</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.error-non-associative">Parle\Parser::ERROR_NON_ASSOCIATIVE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.constants.error-unknown-token">Parle\Parser::ERROR_UNKNOWN_TOKEN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.props.action">action</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-parser.props.reduceId">reduceId</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-parser')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Parle\Parser constants -->
-  <section xml:id="parle-parser.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="parle-parser.constants.action-error">
-     <term><constant>Parle\Parser::ACTION_ERROR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.action-shift">
-     <term><constant>Parle\Parser::ACTION_SHIFT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.action-reduce">
-     <term><constant>Parle\Parser::ACTION_REDUCE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.action-goto">
-     <term><constant>Parle\Parser::ACTION_GOTO</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.action-accept">
-     <term><constant>Parle\Parser::ACTION_ACCEPT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.error-syntax">
-     <term><constant>Parle\Parser::ERROR_SYNTAX</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.error-non-associative">
-     <term><constant>Parle\Parser::ERROR_NON_ASSOCIATIVE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-parser.constants.error-unknown-token">
-     <term><constant>Parle\Parser::ERROR_UNKNOWN_TOKEN</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ Parle\Parser properties -->
-  <section xml:id="parle-parser.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-parser.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para>Current parser action that matches one of the action class constants, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-parser.props.reduceId">
-     <term><varname>reduceId</varname></term>
-     <listitem>
-      <para>Grammar rule id just processed in the reduce action. The value corresponds either to a token or to a production id. Readonly.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- <!--&reference.parle.entities.parle-parser;-->
- &reference.parle.parle.entities.parser;
-
-</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/parle/parle.parserexception.xml b/reference/parle/parle.parserexception.xml
deleted file mode 100644
index 42e227b985c0..000000000000
--- a/reference/parle/parle.parserexception.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-parserexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\ParserException class</title>
- <titleabbrev>Parle\ParserException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\ParserException intro -->
-  <section xml:id="parle-parserexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-parserexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\ParserException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\ParserException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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>
-    <!-- Uncomment if there are some methods, same for the entities item down there. -->
-    <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-parserexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!--
- &reference.parle.entities.parle-parserexception;
- -->
-
-</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/parle/parle.rlexer.xml b/reference/parle/parle.rlexer.xml
deleted file mode 100644
index 7f476c66d351..000000000000
--- a/reference/parle/parle.rlexer.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-rlexer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\RLexer class</title>
- <titleabbrev>Parle\RLexer</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\RLexer intro -->
-  <section xml:id="parle-rlexer.intro">
-   &reftitle.intro;
-   <para>
-    Multistate lexer class. Lexemes can be defined on the fly. If the particular lexer instance is meant to be used with <classname>Parle\RParser</classname>, the token IDs need to be taken from there. Otherwise, arbitrary token IDs can be supplied. Note, that <classname>Parle\Parser</classname> is not compatible with this lexer.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-rlexer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\RLexer</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\RLexer</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.constants.icase">Parle\RLexer::ICASE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.constants.dot-not-lf">Parle\RLexer::DOT_NOT_LF</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.constants.dot-not-cr-lf">Parle\RLexer::DOT_NOT_CRLF</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.constants.skip-ws">Parle\RLexer::SKIP_WS</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.constants.match-zero-len">Parle\RLexer::MATCH_ZERO_LEN</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="parle-rlexer.props.bol">bol</varname>
-     <initializer>&false;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.props.flags">flags</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.props.state">state</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.props.marker">marker</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rlexer.props.cursor">cursor</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-rlexer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Parle\RLexer constants -->
-  <section xml:id="parle-rlexer.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="parle-rlexer.constants.icase">
-     <term><constant>Parle\RLexer::ICASE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rlexer.constants.dot-not-lf">
-     <term><constant>Parle\RLexer::DOT_NOT_LF</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rlexer.constants.dot-not-cr-lf">
-     <term><constant>Parle\RLexer::DOT_NOT_CRLF</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rlexer.constants.skip-ws">
-     <term><constant>Parle\RLexer::SKIP_WS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rlexer.constants.match-zero-len">
-     <term><constant>Parle\RLexer::MATCH_ZERO_LEN</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ Parle\RLexer properties -->
-  <section xml:id="parle-rlexer.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-rlexer.props.bol">
-     <term><varname>bol</varname></term>
-     <listitem>
-      <para>Start of input flag.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-rlexer.props.flags">
-     <term><varname>flags</varname></term>
-     <listitem>
-      <para>Lexer flags.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-rlexer.props.state">
-     <term><varname>state</varname></term>
-     <listitem>
-      <para>Current lexer state, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-rlexer.props.marker">
-     <term><varname>marker</varname></term>
-     <listitem>
-      <para>Position of the latest token match, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-rlexer.props.cursor">
-     <term><varname>cursor</varname></term>
-     <listitem>
-      <para>Current input offset, readonly.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- <!--&reference.parle.entities.parle-rlexer;-->
- &reference.parle.parle.entities.rlexer;
-
-</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/parle/parle.rparser.xml b/reference/parle/parle.rparser.xml
deleted file mode 100644
index 8f3cf28d7cb8..000000000000
--- a/reference/parle/parle.rparser.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-rparser" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\RParser class</title>
- <titleabbrev>Parle\RParser</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\RParser intro -->
-  <section xml:id="parle-rparser.intro">
-   &reftitle.intro;
-   <para>
-    Parser class. Rules can be defined on the fly. Once finalized, a <classname>Parle\RLexer</classname> instance is required to deliver the token stream.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-rparser.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\RParser</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\RParser</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.action-error">Parle\RParser::ACTION_ERROR</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.action-shift">Parle\RParser::ACTION_SHIFT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.action-reduce">Parle\RParser::ACTION_REDUCE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.action-goto">Parle\RParser::ACTION_GOTO</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.action-accept">Parle\RParser::ACTION_ACCEPT</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.error-syntax">Parle\RParser::ERROR_SYNTAX</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.error-non-associative">Parle\RParser::ERROR_NON_ASSOCIATIVE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.constants.error-unknown-token">Parle\RParser::ERROR_UNKNOWN_TOKEN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.props.action">action</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-rparser.props.reduceId">reduceId</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-rparser')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Parle\RParser constants -->
-  <section xml:id="parle-rparser.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="parle-rparser.constants.action-error">
-     <term><constant>Parle\RParser::ACTION_ERROR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.action-shift">
-     <term><constant>Parle\RParser::ACTION_SHIFT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.action-reduce">
-     <term><constant>Parle\RParser::ACTION_REDUCE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.action-goto">
-     <term><constant>Parle\RParser::ACTION_GOTO</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.action-accept">
-     <term><constant>Parle\RParser::ACTION_ACCEPT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.error-syntax">
-     <term><constant>Parle\RParser::ERROR_SYNTAX</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.error-non-associative">
-     <term><constant>Parle\RParser::ERROR_NON_ASSOCIATIVE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-rparser.constants.error-unknown-token">
-     <term><constant>Parle\RParser::ERROR_UNKNOWN_TOKEN</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ Parle\RParser properties -->
-  <section xml:id="parle-rparser.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-rparser.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para>Current parser action that matches one of the action class constants, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-rparser.props.reduceId">
-     <term><varname>reduceId</varname></term>
-     <listitem>
-      <para>Grammar rule id just processed in the reduce action. The value corresponds either to a token or to a production id. Readonly.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- <!--&reference.parle.entities.parle-rparser;-->
- &reference.parle.parle.entities.rparser;
-
-</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/parle/parle.stack.xml b/reference/parle/parle.stack.xml
deleted file mode 100644
index 928abfa1006d..000000000000
--- a/reference/parle/parle.stack.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-stack" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\Stack class</title>
- <titleabbrev>Parle\Stack</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\Stack intro -->
-  <section xml:id="parle-stack.intro">
-   &reftitle.intro;
-   <para>
-   <classname>Parle\Stack</classname> is a LIFO stack. The elements are inserted and removed only from one end.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-stack.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\Stack</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\Stack</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>bool</type>
-     <varname linkend="parle-stack.props.empty">empty</varname>
-     <initializer>&true;</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-stack.props.size">size</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>mixed</type>
-     <varname linkend="parle-stack.props.top">top</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-stack')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Parle\Lexer properties -->
-  <section xml:id="parle-stack.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-stack.props.empty">
-     <term><varname>empty</varname></term>
-     <listitem>
-      <para>Whether the stack is empty, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-stack.props.size">
-     <term><varname>size</varname></term>
-     <listitem>
-      <para>Stack size, readonly.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-stack.props.top">
-     <term><varname>top</varname></term>
-     <listitem>
-      <para>Element on the top of the stack.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- <!--&reference.parle.entities.parle-stack;-->
- &reference.parle.parle.entities.stack;
-
-</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/parle/parle.token.xml b/reference/parle/parle.token.xml
deleted file mode 100644
index d938c041340e..000000000000
--- a/reference/parle/parle.token.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.parle-token" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Parle\Token class</title>
- <titleabbrev>Parle\Token</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Parle\Token intro -->
-  <section xml:id="parle-token.intro">
-   &reftitle.intro;
-   <para>
-    This class represents a token. Lexer returns instances of this class.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="parle-token.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Parle\Token</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Parle\Token</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-token.constants.eoi">Parle\Token::EOI</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-token.constants.unknown">Parle\Token::UNKNOWN</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="parle-token.constants.skip">Parle\Token::SKIP</varname>
-     <initializer>-2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>int</type>
-     <varname linkend="parle-token.props.id">id</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <type>string</type>
-     <varname linkend="parle-token.props.value">value</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <!-- Uncomment if there are some methods, same for the entities item down there. -->
-    <!--<xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.parle-token')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />-->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Parle\Token properties -->
-  <section xml:id="parle-token.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="parle-token.props.id">
-     <term><varname>id</varname></term>
-     <listitem>
-      <para>Token id.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="parle-token.props.value">
-     <term><varname>value</varname></term>
-     <listitem>
-      <para>Token value.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ Parle\Token constants -->
-  <section xml:id="parle-token.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="parle-token.constants.eoi">
-     <term><constant>Parle\Token::EOI</constant></term>
-     <listitem>
-      <para>End of input token id.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-token.constants.unknown">
-     <term><constant>Parle\Token::UNKNOWN</constant></term>
-     <listitem>
-      <para>Unknown token id.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="parle-token.constants.skip">
-     <term><constant>Parle\Token::SKIP</constant></term>
-     <listitem>
-      <para>Skip token id.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- <!--&reference.parle.entities.parle-token;-->
-
-</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/parle/parle/lexer/advance.xml b/reference/parle/parle/lexer/advance.xml
deleted file mode 100644
index 051a9c5e710c..000000000000
--- a/reference/parle/parle/lexer/advance.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.advance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::advance</refname>
-  <refpurpose>Process next lexer rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::advance</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Processes the next rule and prepares the resulting token data.
-  </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/parle/parle/lexer/build.xml b/reference/parle/parle/lexer/build.xml
deleted file mode 100644
index 9575e551d535..000000000000
--- a/reference/parle/parle/lexer/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.build" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::build</refname>
-  <refpurpose>Finalize the lexer rule set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::build</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rules, previously added with <methodname>Parle\Lexer::push</methodname> are finalized. This method call has to be done after all the necessary rules was pushed. The rule set becomes read only. The lexing can begin.
-  </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/parle/parle/lexer/callout.xml b/reference/parle/parle/lexer/callout.xml
deleted file mode 100644
index 989c6b3b3f04..000000000000
--- a/reference/parle/parle/lexer/callout.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.callout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::callout</refname>
-  <refpurpose>Define token callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::callout</methodname>
-   <methodparam><type>int</type><parameter>id</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Define a callback to be invoked once lexer encounters a particular token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      Token id.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      Callable to be invoked. The callable doesn't receive any arguments and its return value is ignored.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/lexer/consume.xml b/reference/parle/parle/lexer/consume.xml
deleted file mode 100644
index 2018cf6a3d08..000000000000
--- a/reference/parle/parle/lexer/consume.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.consume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::consume</refname>
-  <refpurpose>Pass the data for processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::consume</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Consume the data for lexing. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      Data to be lexed.      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/lexer/dump.xml b/reference/parle/parle/lexer/dump.xml
deleted file mode 100644
index 63f52ef6259d..000000000000
--- a/reference/parle/parle/lexer/dump.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.dump" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::dump</refname>
-  <refpurpose>Dump the state machine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::dump</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Dump the current state machine to stdout. 
-  </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/parle/parle/lexer/gettoken.xml b/reference/parle/parle/lexer/gettoken.xml
deleted file mode 100644
index 79f1374eb0b3..000000000000
--- a/reference/parle/parle/lexer/gettoken.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.gettoken" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::getToken</refname>
-  <refpurpose>Retrieve the current token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-      <modifier>public</modifier> <type>Parle\Token</type><methodname>Parle\Lexer::getToken</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the current token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an instance of <classname>Parle\Token</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/parle/parle/lexer/insertmacro.xml b/reference/parle/parle/lexer/insertmacro.xml
deleted file mode 100644
index 979dd723d2c8..000000000000
--- a/reference/parle/parle/lexer/insertmacro.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.insertmacro" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::insertMacro</refname>
-  <refpurpose>Insert regex macro</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::insertMacro</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Insert a regex macro, that can be later used as a shortcut and included in other regular expressions.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the macros.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>regex</parameter></term>
-    <listitem>
-     <para>
-      Regular expression.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/lexer/push.xml b/reference/parle/parle/lexer/push.xml
deleted file mode 100644
index ee0e8519ae3f..000000000000
--- a/reference/parle/parle/lexer/push.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::push</refname>
-  <refpurpose>Add a lexer rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::push</methodname>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-   <methodparam><type>int</type><parameter>id</parameter></methodparam>
-   <!--<methodparam choice="opt"><type>int</type><parameter>userId</parameter></methodparam>-->
-  </methodsynopsis>
-  <para>
-   Push a pattern for lexeme recognition.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>regex</parameter></term>
-    <listitem>
-     <para>
-      Regular expression used for token matching.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      Token id. If the lexer instance is meant to be used standalone, this can be an arbitrary number. If the lexer instance is going to be passed to the parser, it has to be an id returned by <methodname>Parle\Parser::tokenid</methodname>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <!--<varlistentry>
-    <term><parameter>userId</parameter></term>
-    <listitem>
-     <para>
-      User supplied token id.
-     </para>
-    </listitem>
-   </varlistentry>-->
-  </variablelist>
- </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/parle/parle/lexer/reset.xml b/reference/parle/parle/lexer/reset.xml
deleted file mode 100644
index 41359ca407e3..000000000000
--- a/reference/parle/parle/lexer/reset.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-lexer.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Lexer::reset</refname>
-  <refpurpose>Reset lexer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Lexer::reset</methodname>
-   <methodparam><type>int</type><parameter>pos</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reset lexing optionally supplying the desired offset.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pos</parameter></term>
-    <listitem>
-     <para>
-      Reset position.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/advance.xml b/reference/parle/parle/parser/advance.xml
deleted file mode 100644
index c57168d2f6d1..000000000000
--- a/reference/parle/parle/parser/advance.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.advance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::advance</refname>
-  <refpurpose>Process next parser rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::advance</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Process next parser rule.
-  </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/parle/parle/parser/build.xml b/reference/parle/parle/parser/build.xml
deleted file mode 100644
index b7936aa6cec7..000000000000
--- a/reference/parle/parle/parser/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.build" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::build</refname>
-  <refpurpose>Finalize the grammar rules</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::build</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Any tokens and grammar rules previously added are finalized. The rule set becomes readonly and the parser is ready to start.
-  </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/parle/parle/parser/consume.xml b/reference/parle/parle/parser/consume.xml
deleted file mode 100644
index 5cd79e8da718..000000000000
--- a/reference/parle/parle/parser/consume.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.consume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::consume</refname>
-  <refpurpose>Consume the data for processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::consume</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>Parle\Lexer</type><parameter>lexer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Consume the data for parsing. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      Data to be parsed.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lexer</parameter></term>
-    <listitem>
-     <para>
-      A lexer object containing the lexing rules prepared for the particular grammar.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/dump.xml b/reference/parle/parle/parser/dump.xml
deleted file mode 100644
index a9f4ed6d54ee..000000000000
--- a/reference/parle/parle/parser/dump.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.dump" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::dump</refname>
-  <refpurpose>Dump the grammar</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::dump</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Dump the current grammar to stdout.
-  </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/parle/parle/parser/errorinfo.xml b/reference/parle/parle/parser/errorinfo.xml
deleted file mode 100644
index 3da6e1bae9b6..000000000000
--- a/reference/parle/parle/parser/errorinfo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.errorinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::errorInfo</refname>
-  <refpurpose>Retrieve the error information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Parle\ErrorInfo</type><methodname>Parle\Parser::errorInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the error information in case <methodname>Parle\Parser::action</methodname> returned the error action.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an instance of <classname>Parle\ErrorInfo</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/parle/parle/parser/left.xml b/reference/parle/parle/parser/left.xml
deleted file mode 100644
index 90e93d48e0f3..000000000000
--- a/reference/parle/parle/parser/left.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.left" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::left</refname>
-  <refpurpose>Declare a token with left-associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::left</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal with left associativity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/nonassoc.xml b/reference/parle/parle/parser/nonassoc.xml
deleted file mode 100644
index d536d6751685..000000000000
--- a/reference/parle/parle/parser/nonassoc.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.nonassoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::nonassoc</refname>
-  <refpurpose>Declare a token with no associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::nonassoc</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal, that cannot appear more than once in the row.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/precedence.xml b/reference/parle/parle/parser/precedence.xml
deleted file mode 100644
index 65f085b79beb..000000000000
--- a/reference/parle/parle/parser/precedence.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.precedence" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::precedence</refname>
-  <refpurpose>Declare a precedence rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::precedence</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declares a precedence rule for a fictitious terminal symbol. This rule can be later used in the specific grammar rules.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/push.xml b/reference/parle/parle/parser/push.xml
deleted file mode 100644
index a40783867cbc..000000000000
--- a/reference/parle/parle/parser/push.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::push</refname>
-  <refpurpose>Add a grammar rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Parser::push</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>rule</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Push a grammar rule. The production id returned can be used later in the parsing process to identify the rule matched.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Rule name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rule</parameter></term>
-    <listitem>
-     <para>
-      The rule to be added. The syntax is Bison compatible.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the rule index.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/reset.xml b/reference/parle/parle/parser/reset.xml
deleted file mode 100644
index ac93e570e540..000000000000
--- a/reference/parle/parle/parser/reset.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::reset</refname>
-  <refpurpose>Reset parser state</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::reset</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>tokenId</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reset parser state using the given token id.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tokenId</parameter></term>
-    <listitem>
-     <para>
-      Token id.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/right.xml b/reference/parle/parle/parser/right.xml
deleted file mode 100644
index 50f867167587..000000000000
--- a/reference/parle/parle/parser/right.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.right" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::right</refname>
-  <refpurpose>Declare a token with right-associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::right</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal with right associativity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/sigil.xml b/reference/parle/parle/parser/sigil.xml
deleted file mode 100644
index c737ba254677..000000000000
--- a/reference/parle/parle/parser/sigil.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.sigil" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::sigil</refname>
-  <refpurpose>Retrieve a matching part of a rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\Parser::sigil</methodname>
-   <methodparam><type>int</type><parameter>idx</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve a part of the match by a rule. This method is equivalent to the pseudo variable functionality in Bison.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>idx</parameter></term>
-    <listitem>
-     <para>
-      Match index, zero based.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the matched part. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/sigilcount.xml b/reference/parle/parle/parser/sigilcount.xml
deleted file mode 100644
index 193526f42f37..000000000000
--- a/reference/parle/parle/parser/sigilcount.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.sigilcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::sigilCount</refname>
-  <refpurpose>Number of elements in matched rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Parser::sigilCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get number of elements in the matched rule.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &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/parle/parle/parser/sigilname.xml b/reference/parle/parle/parser/sigilname.xml
deleted file mode 100644
index eef341799174..000000000000
--- a/reference/parle/parle/parser/sigilname.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.sigilname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::sigilName</refname>
-  <refpurpose>Retrieve a rule or token name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\Parser::sigilName</methodname>
-   <methodparam><type>int</type><parameter>idx</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve a partial rule name or token name corresponding to the sigil index.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>idx</parameter></term>
-    <listitem>
-     <para>
-      Match index, zero based.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the matched part. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/token.xml b/reference/parle/parle/parser/token.xml
deleted file mode 100644
index 21c17f358614..000000000000
--- a/reference/parle/parle/parser/token.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.token" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::token</refname>
-  <refpurpose>Declare a token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Parser::token</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal to be used in the grammar.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/parser/tokenid.xml b/reference/parle/parle/parser/tokenid.xml
deleted file mode 100644
index 922a18b26ef6..000000000000
--- a/reference/parle/parle/parser/tokenid.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.tokenid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::tokenId</refname>
-  <refpurpose>Get token id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\Parser::tokenId</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve the id of the named token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Name of the token as used in <methodname>Parle\Parser::token</methodname>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the token id.  
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/parser/trace.xml b/reference/parle/parle/parser/trace.xml
deleted file mode 100644
index 9dfa7e2fbe2d..000000000000
--- a/reference/parle/parle/parser/trace.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.trace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::trace</refname>
-  <refpurpose>Trace the parser operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\Parser::trace</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the current parser operation description. This can be especially useful for studying the parser and to optimize the grammar.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the trace 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/parle/parle/parser/validate.xml b/reference/parle/parle/parser/validate.xml
deleted file mode 100644
index f255e23054b8..000000000000
--- a/reference/parle/parle/parser/validate.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-parser.validate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Parser::validate</refname>
-  <refpurpose>Validate input</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Parle\Parser::validate</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>Parle\Lexer</type><parameter>lexer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Validate an input string. The string is parsed internally, thus this method is useful for the quick input validation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      String to be validated.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lexer</parameter></term>
-    <listitem>
-     <para>
-      A lexer object containing the lexing rules prepared for the particular grammar.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &boolean; witnessing whether the input chimes or not with the defined rules.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rlexer/advance.xml b/reference/parle/parle/rlexer/advance.xml
deleted file mode 100644
index 4201985d98fb..000000000000
--- a/reference/parle/parle/rlexer/advance.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.advance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::advance</refname>
-  <refpurpose>Process next lexer rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::advance</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Processes the next rule and prepares the resulting token data.
-  </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/parle/parle/rlexer/build.xml b/reference/parle/parle/rlexer/build.xml
deleted file mode 100644
index d428fc1df9ac..000000000000
--- a/reference/parle/parle/rlexer/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.build" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::build</refname>
-  <refpurpose>Finalize the lexer rule set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::build</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rules, previously added with <methodname>Parle\RLexer::push</methodname> are finalized. This method call has to be done after all the necessary rules was pushed. The rule set becomes read only. The lexing can begin.
-  </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/parle/parle/rlexer/callout.xml b/reference/parle/parle/rlexer/callout.xml
deleted file mode 100644
index 54c4370c4512..000000000000
--- a/reference/parle/parle/rlexer/callout.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.callout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::callout</refname>
-  <refpurpose>Define token callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::callout</methodname>
-   <methodparam><type>int</type><parameter>id</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Define a callback to be invoked once lexer encounters a particular token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      Token id.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      Callable to be invoked. The callable doesn't receive any arguments and its return value is ignored.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rlexer/consume.xml b/reference/parle/parle/rlexer/consume.xml
deleted file mode 100644
index 53f561c30863..000000000000
--- a/reference/parle/parle/rlexer/consume.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.consume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::consume</refname>
-  <refpurpose>Pass the data for processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::consume</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Consume the data for lexing. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      Data to be lexed.      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rlexer/dump.xml b/reference/parle/parle/rlexer/dump.xml
deleted file mode 100644
index ca8a4f44f471..000000000000
--- a/reference/parle/parle/rlexer/dump.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.dump" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::dump</refname>
-  <refpurpose>Dump the state machine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::dump</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Dump the current state machine to stdout. 
-  </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/parle/parle/rlexer/gettoken.xml b/reference/parle/parle/rlexer/gettoken.xml
deleted file mode 100644
index 2e9e4069015b..000000000000
--- a/reference/parle/parle/rlexer/gettoken.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.gettoken" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::getToken</refname>
-  <refpurpose>Retrieve the current token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Parle\Token</type><methodname>Parle\RLexer::getToken</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrive the current token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an instance of <classname>Parle\Token</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/parle/parle/rlexer/insertmacro.xml b/reference/parle/parle/rlexer/insertmacro.xml
deleted file mode 100644
index cc5187dff5dc..000000000000
--- a/reference/parle/parle/rlexer/insertmacro.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.insertmacro" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::insertMacro</refname>
-  <refpurpose>Insert regex macro</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::insertMacro</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Insert a regex macro, that can be later used as a shortcut and included in other regular expressions.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Name of the macros.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>regex</parameter></term>
-    <listitem>
-     <para>
-      Regular expression.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rlexer/push.xml b/reference/parle/parle/rlexer/push.xml
deleted file mode 100644
index 445f2ba13912..000000000000
--- a/reference/parle/parle/rlexer/push.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::push</refname>
-  <refpurpose>Add a lexer rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::push</methodname>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-   <methodparam><type>int</type><parameter>id</parameter></methodparam>
-   <!--<methodparam choice="opt"><type>int</type><parameter>userId</parameter></methodparam>-->
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::push</methodname>
-   <methodparam><type>string</type><parameter>state</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-   <methodparam><type>int</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newState</parameter></methodparam>
-   <!--<methodparam choice="opt"><type>int</type><parameter>userId</parameter></methodparam>-->
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::push</methodname>
-   <methodparam><type>string</type><parameter>state</parameter></methodparam>
-   <methodparam><type>string</type><parameter>regex</parameter></methodparam>
-   <methodparam><type>string</type><parameter>newState</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Push a pattern for lexeme recognition.
-  </para>
-  <para>A 'start state' and 'exit state' can be specified by using a suitable signature. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>regex</parameter></term>
-    <listitem>
-     <para>
-      Regular expression used for token matching.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      Token id. If the lexer instance is meant to be used standalone, this can be an arbitrary number. If the lexer instance is going to be passed to the parser, it has to be an id returned by <methodname>Parle\RParser::tokenid</methodname>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>state</parameter></term>
-    <listitem>
-     <para>
-      State name. If '*' is used as start state, then the rule is applied to all lexer states.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>newState</parameter></term>
-     <listitem>
-      <para>
-       New state name, after the rule was applied.
-      </para>
-      <para>
-       If '.' is specified as the exit state, then the lexer state is unchanged when that rule matches. An exit state with '&gt;' before the name means push. Use the signature without id for either continuation or to start matching, when a continuation or recursion is required.
-      </para>
-      <para>
-       If '&lt;' is specified as exit state, it means pop. In that case, the signature containing the id can be used to identify the match. Note that even in the case an id is specified, the rule will finish first when all the previous pushes popped.
-      </para>
-     </listitem>
-   </varlistentry>
-   <!--<varlistentry>
-    <term><parameter>userId</parameter></term>
-    <listitem>
-     <para>
-      User supplied token id.
-     </para>
-    </listitem>
-   </varlistentry>-->
-  </variablelist>
- </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/parle/parle/rlexer/pushstate.xml b/reference/parle/parle/rlexer/pushstate.xml
deleted file mode 100644
index 1ec44f8e2d40..000000000000
--- a/reference/parle/parle/rlexer/pushstate.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.pushstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::pushState</refname>
-  <refpurpose>Push a new start state</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\RLexer::pushState</methodname>
-   <methodparam><type>string</type><parameter>state</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This lexer type can have more than one state machine. This allows you to lex different tokens depending on context, thus allowing simple parsing to take place. Once a state pushed, it can be used with a suitable <methodname>Parle\RLexer::push</methodname> signature variant. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>state</parameter></term>
-    <listitem>
-     <para>
-      Name of the state.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rlexer/reset.xml b/reference/parle/parle/rlexer/reset.xml
deleted file mode 100644
index 3075e62efc81..000000000000
--- a/reference/parle/parle/rlexer/reset.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rlexer.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RLexer::reset</refname>
-  <refpurpose>Reset lexer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RLexer::reset</methodname>
-   <methodparam><type>int</type><parameter>pos</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reset lexing optionally supplying the desired offset.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pos</parameter></term>
-    <listitem>
-     <para>
-      Reset position.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/advance.xml b/reference/parle/parle/rparser/advance.xml
deleted file mode 100644
index 65fb8519cdf5..000000000000
--- a/reference/parle/parle/rparser/advance.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.advance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::advance</refname>
-  <refpurpose>Process next parser rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::advance</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Prosess next parser rule.
-  </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/parle/parle/rparser/build.xml b/reference/parle/parle/rparser/build.xml
deleted file mode 100644
index b48745c52981..000000000000
--- a/reference/parle/parle/rparser/build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.build" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::build</refname>
-  <refpurpose>Finalize the grammar rules</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::build</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Any tokens and grammar rules previously added are finalized. The rule set becomes readonly and the parser is ready to start.
-  </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/parle/parle/rparser/consume.xml b/reference/parle/parle/rparser/consume.xml
deleted file mode 100644
index 8de0f5f94d99..000000000000
--- a/reference/parle/parle/rparser/consume.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.consume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::consume</refname>
-  <refpurpose>Consume the data for processing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::consume</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>Parle\RLexer</type><parameter>rlexer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Consume the data for parsing. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      Data to be parsed.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lexer</parameter></term>
-    <listitem>
-     <para>
-      A lexer object containing the lexing rules prepared for the particular grammar.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/dump.xml b/reference/parle/parle/rparser/dump.xml
deleted file mode 100644
index 0d6bd2ee7a0b..000000000000
--- a/reference/parle/parle/rparser/dump.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.dump" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::dump</refname>
-  <refpurpose>Dump the grammar</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::dump</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Dump the current grammar to stdout.
-  </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/parle/parle/rparser/errorinfo.xml b/reference/parle/parle/rparser/errorinfo.xml
deleted file mode 100644
index 1e0c89121ba4..000000000000
--- a/reference/parle/parle/rparser/errorinfo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.errorinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::errorInfo</refname>
-  <refpurpose>Retrieve the error information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Parle\ErrorInfo</type><methodname>Parle\RParser::errorInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the error information in case <methodname>Parle\RParser::action</methodname> returned the error action.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an instance of <classname>Parle\ErrorInfo</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/parle/parle/rparser/left.xml b/reference/parle/parle/rparser/left.xml
deleted file mode 100644
index 5632cc383163..000000000000
--- a/reference/parle/parle/rparser/left.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.left" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::left</refname>
-  <refpurpose>Declare a token with left-associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::left</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal with left associativity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/nonassoc.xml b/reference/parle/parle/rparser/nonassoc.xml
deleted file mode 100644
index 30d89f13c487..000000000000
--- a/reference/parle/parle/rparser/nonassoc.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.nonassoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::nonassoc</refname>
-  <refpurpose>Declare a token with no associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::nonassoc</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal, that cannot appear more than once in the row.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/precedence.xml b/reference/parle/parle/rparser/precedence.xml
deleted file mode 100644
index c0bfa43a13c6..000000000000
--- a/reference/parle/parle/rparser/precedence.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.precedence" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::precedence</refname>
-  <refpurpose>Declare a precedence rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::precedence</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declares a precedence rule for a fictious terminal symbol. This rule can be later used in the specific grammar rules.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/push.xml b/reference/parle/parle/rparser/push.xml
deleted file mode 100644
index 68170695ccdd..000000000000
--- a/reference/parle/parle/rparser/push.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::push</refname>
-  <refpurpose>Add a grammar rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\RParser::push</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>rule</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Push a grammar rule. The production id returned can be used later in the parsing process to identify the rule matched.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Rule name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rule</parameter></term>
-    <listitem>
-     <para>
-      The rule to be added. The syntax is Bison compatible.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the rule index.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rparser/reset.xml b/reference/parle/parle/rparser/reset.xml
deleted file mode 100644
index 2ab1539d8d8b..000000000000
--- a/reference/parle/parle/rparser/reset.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::reset</refname>
-  <refpurpose>Reset parser state</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::reset</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>tokenId</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Reset parser state using the given token id.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tokenId</parameter></term>
-    <listitem>
-     <para>
-      Token id.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/right.xml b/reference/parle/parle/rparser/right.xml
deleted file mode 100644
index 4bc75be44693..000000000000
--- a/reference/parle/parle/rparser/right.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.right" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::right</refname>
-  <refpurpose>Declare a token with right-associativity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::right</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal with right associativity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/sigil.xml b/reference/parle/parle/rparser/sigil.xml
deleted file mode 100644
index 94829a6774fd..000000000000
--- a/reference/parle/parle/rparser/sigil.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.sigil" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::sigil</refname>
-  <refpurpose>Retrieve a matching part of a rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\RParser::sigil</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>idx</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve a part of the match by a rule. This method is equivalent to the pseudo variable functionality in Bison.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>idx</parameter></term>
-    <listitem>
-     <para>
-      Match index, zero based.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the matched part. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rparser/sigilcount.xml b/reference/parle/parle/rparser/sigilcount.xml
deleted file mode 100644
index 87e27015991a..000000000000
--- a/reference/parle/parle/rparser/sigilcount.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.sigilcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::sigilCount</refname>
-  <refpurpose>Number of elements in matched rule</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\RParser::sigilCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get number of elements in the matched rule.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &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/parle/parle/rparser/sigilname.xml b/reference/parle/parle/rparser/sigilname.xml
deleted file mode 100644
index 0d67d9b7ff5c..000000000000
--- a/reference/parle/parle/rparser/sigilname.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.sigilname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::sigilName</refname>
-  <refpurpose>Retrieve a rule or token name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\RParser::sigilName</methodname>
-   <methodparam><type>int</type><parameter>idx</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve a partial rule name or token name corresponding to the sigil index.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>idx</parameter></term>
-    <listitem>
-     <para>
-      Match index, zero based.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the matched part. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rparser/token.xml b/reference/parle/parle/rparser/token.xml
deleted file mode 100644
index d745da7e3033..000000000000
--- a/reference/parle/parle/rparser/token.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.token" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::token</refname>
-  <refpurpose>Declare a token</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\RParser::token</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Declare a terminal to be used in the grammar.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Token name.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/parle/rparser/tokenid.xml b/reference/parle/parle/rparser/tokenid.xml
deleted file mode 100644
index cde47ea9cc29..000000000000
--- a/reference/parle/parle/rparser/tokenid.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.tokenid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::tokenId</refname>
-  <refpurpose>Get token id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Parle\RParser::tokenId</methodname>
-   <methodparam><type>string</type><parameter>tok</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve the id of the named token.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tok</parameter></term>
-    <listitem>
-     <para>
-      Name of the token as used in <methodname>Parle\RParser::token</methodname>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &integer; representing the token id.  
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/rparser/trace.xml b/reference/parle/parle/rparser/trace.xml
deleted file mode 100644
index 703e0f377c24..000000000000
--- a/reference/parle/parle/rparser/trace.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.trace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::trace</refname>
-  <refpurpose>Trace the parser operation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Parle\RParser::trace</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve the current parser operation description. This can be especially useful to study the parser and to optimize the grammar.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; with the trace 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/parle/parle/rparser/validate.xml b/reference/parle/parle/rparser/validate.xml
deleted file mode 100644
index e3fe2b24b919..000000000000
--- a/reference/parle/parle/rparser/validate.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-rparser.validate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\RParser::validate</refname>
-  <refpurpose>Validate input</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Parle\RParser::validate</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>Parle\RLexer</type><parameter>lexer</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Validate an input string. The string is parsed internally, thus this method is useful for the quick input validation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      String to be validated.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>lexer</parameter></term>
-    <listitem>
-     <para>
-      A lexer object containing the lexing rules prepared for the particular grammar.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &boolean; whitnessing whether the input chimes or not with the defined rules.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/parle/parle/stack/pop.xml b/reference/parle/parle/stack/pop.xml
deleted file mode 100644
index 7b4c62912977..000000000000
--- a/reference/parle/parle/stack/pop.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-stack.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Stack::pop</refname>
-  <refpurpose>Pop an item from the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Stack::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/parle/parle/stack/push.xml b/reference/parle/parle/stack/push.xml
deleted file mode 100644
index 1292b164130b..000000000000
--- a/reference/parle/parle/stack/push.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="parle-stack.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Parle\Stack::push</refname>
-  <refpurpose>Push an item into the stack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Parle\Stack::push</methodname>
-   <methodparam><type>mixed</type><parameter>item</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>item</parameter></term>
-    <listitem>
-     <para>
-      Variable to be pushed.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/parle/pattern.matching.xml b/reference/parle/pattern.matching.xml
deleted file mode 100644
index bef88be5c21b..000000000000
--- a/reference/parle/pattern.matching.xml
+++ /dev/null
@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<chapter xml:id="parle.pattern.matching" xmlns="http://docbook.org/ns/docbook">
- <title>Parle pattern matching</title>
- <titleabbrev>Pattern matching</titleabbrev>
- <para>
-  Parle supports regex matching similar to flex.
-  Also supported are the following POSIX character sets:
-  <simplelist type="inline">
-   <member><literal>[:alnum:]</literal></member>
-   <member><literal>[:alpha:]</literal></member>
-   <member><literal>[:blank:]</literal></member>
-   <member><literal>[:cntrl:]</literal></member>
-   <member><literal>[:digit:]</literal></member>
-   <member><literal>[:graph:]</literal></member>
-   <member><literal>[:lower:]</literal></member>
-   <member><literal>[:print:]</literal></member>
-   <member><literal>[:punct:]</literal></member>
-   <member><literal>[:space:]</literal></member>
-   <member><literal>[:upper:]</literal></member>
-   <member><literal>[:xdigit:]</literal></member>
-  </simplelist>.
- </para>
- <para>
-  The Unicode character classes are currently not enabled by default, pass --enable-parle-utf32 to make them available.
-  A particular encoding can be mapped with a correctly constructed regex.
-  For example, to match the EURO symbol encoded in UTF-8, the regular expression <literal>[\xe2][\x82][\xac]</literal> can be used.
-  The pattern for an UTF-8 encoded string could be <literal>[ -\x7f]{+}[\x80-\xbf]{+}[\xc2-\xdf]{+}[\xe0-\xef]{+}[\xf0-\xff]+</literal>.
- </para>
-
- <section xml:id="parle.regex.chars" annotations="chunk:false">
-  <title>Character representations</title>
-  <para>
-   <table>
-    <title>Character representations</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Sequence</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>\a</entry><entry>Alert (bell).</entry>
-      </row>
-      <row>
-       <entry>\b</entry><entry>Backspace.</entry>
-      </row>
-      <row>
-       <entry>\e</entry><entry>ESC character, \x1b.</entry>
-      </row>
-      <row>
-       <entry>\n</entry><entry>Newline.</entry>
-      </row>
-      <row>
-       <entry>\r</entry><entry>Carriage return.</entry>
-      </row>
-      <row>
-       <entry>\f</entry><entry>Form feed, \x0c.</entry>
-      </row>
-      <row>
-       <entry>\t</entry><entry>Horizontal tab, \x09.</entry>
-      </row>
-      <row>
-       <entry>\v</entry><entry>Vertical tab, \x0b.</entry>
-      </row>
-      <row>
-       <entry>\oct</entry><entry>Character specified by a three-digit octal code.</entry>
-      </row>
-      <row>
-       <entry>\xhex</entry><entry>Character specified by a hex code.</entry>
-      </row>
-      <row>
-       <entry>\cchar</entry><entry>Named control character.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
- <section xml:id="parle.regex.charclass" annotations="chunk:false">
-  <title>Character classes</title>
-  <para>
-   <table>
-    <title>Character classes</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Sequence</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>[...]</entry><entry>A single character listed or contained within a listed range. Ranges can be combined with the <literal>{+}</literal> and <literal>{-}</literal> operators. For example <literal>[a-z]{+}[0-9]</literal> is the same as <literal>[0-9a-z]</literal> and <literal>[a-z]{-}[aeiou]</literal> is the same as <literal>[b-df-hj-np-tv-z]</literal>.</entry>
-      </row>
-      <row>
-       <entry>[^...]</entry><entry>A single character not listed and not contained within a listed range.</entry>
-      </row>
-      <row>
-       <entry>.</entry><entry>Any character, default <literal>[^\n].</literal></entry>
-      </row>
-      <row>
-       <entry>\d</entry><entry>Digit character, <literal>[0-9]</literal>.</entry>
-      </row>
-      <row>
-       <entry>\D</entry><entry>Non-digit character, <literal>[^0-9]</literal>.</entry>
-      </row>
-      <row>
-       <entry>\s</entry><entry>White space character, <literal>[ \t\n\r\f\v]</literal>.</entry>
-      </row>
-      <row>
-       <entry>\S</entry><entry>Non-white space character, <literal>[^ \t\n\r\f\v]</literal>.</entry>
-      </row>
-      <row>
-       <entry>\w</entry><entry>Word character, <literal>[a-zA-Z0-9_]</literal>.</entry>
-      </row>
-      <row>
-       <entry>\W</entry><entry>Non-word character, <literal>[^a-zA-Z0-9_]</literal>.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
- <section xml:id="parle.regex.unicodecharclass" annotations="chunk:false">
-  <title>Unicode character classes</title>
-  <para>
-   <table>
-    <title>Unicode character classes</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Sequence</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>\p{C}</entry><entry>Other.</entry>
-      </row>
-      <row>
-       <entry>\p{Cc}</entry><entry>Other, control.</entry>
-      </row>
-      <row>
-       <entry>\p{Cf}</entry><entry>Other, format.</entry>
-      </row>
-      <row>
-       <entry>\p{Co}</entry><entry>Other, private use.</entry>
-      </row>
-      <row>
-       <entry>\p{Cs}</entry><entry>Other, surrogate.</entry>
-      </row>
-      <row>
-       <entry>\p{L}</entry><entry>Letter.</entry>
-      </row>
-      <row>
-       <entry>\p{LC}</entry><entry>Letter, cased.</entry>
-      </row>
-      <row>
-       <entry>\p{Ll}</entry><entry>Letter, lowercase.</entry>
-      </row>
-      <row>
-       <entry>\p{Lm}</entry><entry>Letter, modifier.</entry>
-      </row>
-      <row>
-       <entry>\p{Lo}</entry><entry>Letter, other.</entry>
-      </row>
-      <row>
-       <entry>\p{Lt}</entry><entry>Letter, titlecase.</entry>
-      </row>
-      <row>
-       <entry>\p{Lu}</entry><entry>Letter, uppercase.</entry>
-      </row>
-      <row>
-       <entry>\p{M}</entry><entry>Mark.</entry>
-      </row>
-      <row>
-       <entry>\p{Mc}</entry><entry>Mark, space combining.</entry>
-      </row>
-      <row>
-       <entry>\p{Me}</entry><entry>Mark, enclosing.</entry>
-      </row>
-      <row>
-       <entry>\p{Mn}</entry><entry>Mark, nonspacing.</entry>
-      </row>
-      <row>
-       <entry>\p{N}</entry><entry>Number.</entry>
-      </row>
-      <row>
-       <entry>\p{Nd}</entry><entry>Number, decimal digit.</entry>
-      </row>
-      <row>
-       <entry>\p{Nl}</entry><entry>Number, letter.</entry>
-      </row>
-      <row>
-       <entry>\p{No}</entry><entry>Number, other.</entry>
-      </row>
-      <row>
-       <entry>\p{P}</entry><entry>Punctuation.</entry>
-      </row>
-      <row>
-       <entry>\p{Pc}</entry><entry>Punctiation, connector.</entry>
-      </row>
-      <row>
-       <entry>\p{Pd}</entry><entry>Punctuation, dash.</entry>
-      </row>
-      <row>
-       <entry>\p{Pe}</entry><entry>Punctuation, close.</entry>
-      </row>
-      <row>
-       <entry>\p{Pf}</entry><entry>Punctuation, final quote.</entry>
-      </row>
-      <row>
-       <entry>\p{Pi}</entry><entry>Punctuation, initial quote.</entry>
-      </row>
-      <row>
-       <entry>\p{Po}</entry><entry>Punctuation, other.</entry>
-      </row>
-      <row>
-       <entry>\p{Ps}</entry><entry>Punctuation, open.</entry>
-      </row>
-      <row>
-       <entry>\p{S}</entry><entry>Symbol.</entry>
-      </row>
-      <row>
-       <entry>\p{Sc}</entry><entry>Symbol, currency.</entry>
-      </row>
-      <row>
-       <entry>\p{Sk}</entry><entry>Symbol, modifier.</entry>
-      </row>
-      <row>
-       <entry>\p{Sm}</entry><entry>Symbol, math.</entry>
-      </row>
-      <row>
-       <entry>\p{So}</entry><entry>Symbol, other.</entry>
-      </row>
-      <row>
-       <entry>\p{Z}</entry><entry>Separator.</entry>
-      </row>
-      <row>
-       <entry>\p{Zl}</entry><entry>Separator, line.</entry>
-      </row>
-      <row>
-       <entry>\p{Zp}</entry><entry>Separator, paragraph.</entry>
-      </row>
-      <row>
-       <entry>\p{Zs}</entry><entry>Separator, space.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   These character classes are only available, if the option --enable-parle-utf32 was passed at the compilation time.
-  </para>
- </section>
- <section xml:id="parle.regex.alternation" annotations="chunk:false">
-  <title>Alternation and repetition</title>
-  <para>
-   <table>
-    <title>Alternation and repetition</title>
-    <tgroup cols="3">
-     <thead>
-      <row>
-       <entry>Sequence</entry><entry>Greedy</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>...|...</entry><entry>-</entry><entry>Try sub-patterns in alternation.</entry>
-      </row>
-      <row>
-       <entry>*</entry><entry>yes</entry><entry>Match 0 or more times.</entry>
-      </row>
-      <row>
-       <entry>+</entry><entry>yes</entry><entry>Match 1 or more times.</entry>
-      </row>
-      <row>
-       <entry>?</entry><entry>yes</entry><entry>Match 0 or 1 times.</entry>
-      </row>
-      <row>
-       <entry>{n}</entry><entry>no</entry><entry>Match exactly n times.</entry>
-      </row>
-      <row>
-       <entry>{n,}</entry><entry>yes</entry><entry>Match at least n times.</entry>
-      </row>
-      <row>
-       <entry>{n,m}</entry><entry>yes</entry><entry>Match at least n times but no more than m times.</entry>
-      </row>
-      <row>
-       <entry>*?</entry><entry>no</entry><entry>Match 0 or more times.</entry>
-      </row>
-      <row>
-       <entry>+?</entry><entry>no</entry><entry>Match 1 or more times.</entry>
-      </row>
-      <row>
-       <entry>??</entry><entry>no</entry><entry>Match 0 or 1 times.</entry>
-      </row>
-      <row>
-       <entry>{n,}?</entry><entry>no</entry><entry>Match at least n times.</entry>
-      </row>
-      <row>
-       <entry>{n,m}?</entry><entry>no</entry><entry>Match at least n times but no more than m times.</entry>
-      </row>
-      <row>
-       <entry>{MACRO}</entry><entry>-</entry><entry>Include the regex MACRO in the current regex.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
- <section xml:id="parle.regex.anchors" annotations="chunk:false">
-  <title>Anchors</title>
-  <para>
-   <table>
-    <title>Anchors</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Sequence</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>^</entry><entry>Start of string or after a newline.</entry>
-      </row>
-      <row>
-       <entry>$</entry><entry>End of string or before a newline.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
- <section xml:id="parle.regex.grouping" annotations="chunk:false">
-  <title>Grouping</title>
-  <para>
-   <table>
-    <title>Grouping</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Sequence</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>(...)</entry>
-       <entry>Group a regular expression to override default operator precedence.</entry>
-      </row>
-      <row>
-       <entry valign="top">(?r-s:pattern)</entry>
-       <entry>
-        <simpara>
-         Apply option r and omit option s while interpreting pattern.
-         Options may be zero or more of the characters i, s, or x.
-        </simpara>
-        <simpara>
-         <literal>i</literal> means case-insensitive.
-        </simpara>
-        <simpara>
-         <literal>-i</literal> means case-sensitive.
-        </simpara>
-        <simpara>
-         <literal>s</literal> alters the meaning of <literal>.</literal> to match any character whatsoever.
-        </simpara>
-        <simpara>
-         <literal>-s</literal> alters the meaning of <literal>.</literal> to match any character except <literal>\n</literal>.
-        </simpara>
-        <simpara>
-         <literal>x</literal> ignores comments and whitespace in patterns.
-         Whitespace is ignored unless it is backslash-escaped, contained within <literal>""s</literal>,
-         or appears inside a character range.
-        </simpara>
-        <simpara>
-         These options can be applied globally at the rules level by passing a combination of the bit flags to the lexer.
-        </simpara>
-       </entry>
-      </row>
-      <row>
-       <entry>(?# comment )</entry>
-       <entry>Omit everything within (). The first ) character encountered ends the pattern. It is not possible for the comment to contain a ) character. The comment may span lines.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </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/parle/setup.xml b/reference/parle/setup.xml
deleted file mode 100644
index 2dfd5784b65a..000000000000
--- a/reference/parle/setup.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="parle.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="parle.requirements">
-  &reftitle.required;
-  <para>
-   PHP 7.4 or above is supported. A C++14 capable compiler is required. A successful extension build was produced with at least clang 5.0, GCC 5.0 and Visual Studio 2015.
-  </para>
- </section>
-
- <section xml:id="parle.installation">
-  &reftitle.install;
-  <para>
-       &pecl.moved;
-  </para>
-  <para>
-    &pecl.info;
-  <link xlink:href="&url.pecl.package;parle">&url.pecl.package;parle</link>.
-  </para>
-  <para>
-   <table>
-    <title>Available configure options</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Option</entry><entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>--enable-parle</entry><entry>Enable parle extension.</entry>
-      </row>
-      <row>
-       <entry>--enable-parle-utf32</entry><entry>Enable internal UTF-32 support. Available since parle 0.7.2.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </section>
-
- <!--
- <section xml:id="parle.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/parle/versions.xml b/reference/parle/versions.xml
deleted file mode 100644
index 9528df2f3b21..000000000000
--- a/reference/parle/versions.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='parle\errorinfo' from='PECL parle &gt;= 0.5.2'/>
-
- <function name='parle\token' from='PECL parle &gt;= 0.5.2'/>
-
- <function name='parle\lexer' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::push' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::gettoken' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::build' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::consume' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::advance' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::bol' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::restart' from='PECL parle &gt;= 0.5.1' to='PECL parle &lt; 0.7.1'/>
- <function name='parle\lexer::insertmacro' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::dump' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::flags' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexer::reset' from='PECL parle &gt;= 0.7.1'/>
- <function name='parle\lexer::callout' from='PECL parle &gt;= 0.7.2'/>
-
- <function name='parle\rlexer' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::push' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::gettoken' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::build' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::consume' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::advance' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::bol' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::restart' from='PECL parle &gt;= 0.5.1' to='PECL parle &lt; 0.7.1'/>
- <function name='parle\rlexer::pushstate' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::state' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::insertmacro' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::dump' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::flags' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\rlexer::reset' from='PECL parle &gt;= 0.7.1'/>
- <function name='parle\rlexer::callout' from='PECL parle &gt;= 0.7.2'/>
-
- <function name='parle\parser' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::token' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::left' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::right' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::nonassoc' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::precedence' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::build' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::push' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::validate' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::tokenid' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::reduceid' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::action' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::sigil' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::advance' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::consume' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::dump' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::trace' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::errorinfo' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parser::reset' from='PECL parle &gt;= 0.7.1'/>
- <function name='parle\parser::sigilCount' from='PECL parle &gt;= 0.8.4'/>
- <function name='parle\parser::sigilName' from='PECL parle &gt;= 0.8.4'/>
-
- <function name='parle\rparser' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::token' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::left' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::right' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::nonassoc' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::precedence' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::build' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::push' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::validate' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::tokenid' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::reduceid' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::action' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::sigil' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::advance' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::consume' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::dump' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::trace' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::errorinfo' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\rparser::reset' from='PECL parle &gt;= 0.7.1'/>
- <function name='parle\rparser::sigilCount' from='PECL parle &gt;= 0.8.4'/>
- <function name='parle\rparser::sigilName' from='PECL parle &gt;= 0.8.4'/>
-
- <function name='parle\stack' from='PECL parle &gt;= 0.7.0'/>
- <function name='parle\stack::empty' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\stack::pop' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\stack::push' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\stack::size' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\stack::top' from='PECL parle &gt;= 0.5.1'/>
-
- <function name='parle\lexerexception' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::__clone' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::__construct' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::__wakeup' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::getmessage' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::getcode' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::getfile' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::getline' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::gettrace' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::getprevious' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::gettraceasstring' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\lexerexception::__tostring' from='PECL parle &gt;= 0.5.1'/>
-
- <function name='parle\parserexception' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::__clone' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::__construct' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::__wakeup' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::getmessage' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::getcode' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::getfile' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::getline' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::gettrace' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::getprevious' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::gettraceasstring' from='PECL parle &gt;= 0.5.1'/>
- <function name='parle\parserexception::__tostring' from='PECL parle &gt;= 0.5.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
--->
diff --git a/reference/pdo/drivers.xml b/reference/pdo/drivers.xml
index e293e86ad9c0..52f0b50b0bc7 100644
--- a/reference/pdo/drivers.xml
+++ b/reference/pdo/drivers.xml
@@ -17,7 +17,7 @@
      </thead>
      <tbody>
       <row>
-       <entry><link linkend="ref.pdo-cubrid">PDO_CUBRID</link></entry>
+       <entry><link xlink:href="../extensions/ref.pdo-cubrid.php">PDO_CUBRID</link></entry>
        <entry>Cubrid</entry>
       </row>
       <row>
@@ -29,11 +29,11 @@
        <entry>Firebird</entry>
       </row>
       <row>
-       <entry><link linkend="ref.pdo-ibm">PDO_IBM</link></entry>
+       <entry><link xlink:href="../extensions/ref.pdo-ibm.php">PDO_IBM</link></entry>
        <entry>IBM DB2</entry>
       </row>
       <row>
-       <entry><link linkend="ref.pdo-informix">PDO_INFORMIX</link></entry>
+       <entry><link xlink:href="../extensions/ref.pdo-informix.php">PDO_INFORMIX</link></entry>
        <entry>IBM Informix Dynamic Server</entry>
       </row>
       <row>
@@ -57,7 +57,7 @@
        <entry>SQLite 3 and SQLite 2</entry>
       </row>
       <row>
-       <entry><link linkend="ref.pdo-sqlsrv">PDO_SQLSRV</link></entry>
+       <entry><link xlink:href="../extensions/ref.pdo-sqlsrv.php">PDO_SQLSRV</link></entry>
        <entry>Microsoft SQL Server / SQL Azure</entry>
       </row>
      </tbody>
@@ -66,16 +66,12 @@
   </para>
  </partintro>
 
- &reference.pdo-cubrid.reference;
  &reference.pdo-dblib.reference;
  &reference.pdo-dblib.pdo-dblib;
  &reference.pdo-firebird.reference;
  &reference.pdo-firebird.pdo-firebird;
- &reference.pdo-ibm.reference;
- &reference.pdo-informix.reference;
  &reference.pdo-mysql.reference;
  &reference.pdo-mysql.pdo-mysql;
- &reference.pdo-sqlsrv.reference;
  &reference.pdo-oci.reference;
  &reference.pdo-odbc.reference;
  &reference.pdo-odbc.pdo-odbc;
diff --git a/reference/pdo_cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/pdo_cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/pdo_cubrid/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/pdo_cubrid/configure.xml b/reference/pdo_cubrid/configure.xml
deleted file mode 100644
index 8ad8101eeb7c..000000000000
--- a/reference/pdo_cubrid/configure.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ref.pdo-cubrid.installation">
- &reftitle.install;
- <para>
-  To build the PDO_CUBRID extension, the CUBRID DBMS must be installed on the
-  same system as PHP.
-
-  PDO_CUBRID is a &link.pecl; extension, so follow the instructions in
-  <xref linkend="install.pecl"/>
-  to install the PDO_CUBRID extension.
-  Issue the <command>configure</command> command to point to the location of the
-  CUBRID base dir as follows:
-  <screen>
-<![CDATA[
-   $ ./configure --with-pdo-cubrid=/path/to/CUBRID[,shared]
-]]>
-  </screen>
-  The <command>configure</command> command defaults to the value of the
-  <envar>CUBRID</envar>
-  environment variable.
- </para>
- <simpara>
-  &pecl.windows.download; Detailed information about installation on Linux and
-  Windows manually, please read build-guide.html in PECL package CUBRID for
-  reference.
- </simpara>
-</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/pdo_cubrid/constants.xml b/reference/pdo_cubrid/constants.xml
deleted file mode 100644
index e6bba23c09b1..000000000000
--- a/reference/pdo_cubrid/constants.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="pdo-cubrid.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &pdo.driver-constants;
-  <para>
-   The following constants can be used when setting the database attribute.
-   They can be passed to <function>PDO::getAttribute</function> or
-   <function>PDO::setAttribute</function>.
-  <table>
-   <title>PDO::CUBRID attribute flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row xml:id="pdo.constants.cubrid-attr-isolation-level">
-       <entry><constant>PDO::CUBRID_ATTR_ISOLATION_LEVEL</constant></entry>
-       <entry>Transaction isolation level for the database connection.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-attr-lock-timeout">
-       <entry><constant>PDO::CUBRID_ATTR_LOCK_TIMEOUT</constant></entry>
-       <entry>Transaction timeout in seconds.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-attr-max-string-length">
-       <entry><constant>PDO::CUBRID_ATTR_MAX_STRING_LENGTH</constant></entry>
-       <entry>Read only. The maximum string length for bit, varbit, char,
-        varchar, nchar, nchar varying data types when using CUBRID PDO
-        API.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when setting the transaction isolation
-   level. They can be passed to <function>PDO::getAttribute</function> or
-   returned by <function>PDO::setAttribute</function>.
-  <table>
-   <title>PDO::CUBRID isolation level flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row xml:id="pdo.constants.tran-commit-class-uncommit-instance">
-       <entry><constant>PDO::TRAN_COMMIT_CLASS_UNCOMMIT_INSTANCE</constant></entry>
-       <entry>The lowest isolation level (1). A dirty, non-repeatable or
-        phantom read may occur for the tuple and a non-repeatable read may
-        occur for the table as well.</entry>
-      </row>
-      <row xml:id="pdo.constants.tran-commit-class-commit-instance">
-       <entry><constant>PDO::TRAN_COMMIT_CLASS_COMMIT_INSTANCE</constant></entry>
-       <entry>A relatively low isolation level (2). A dirty read does not
-        occur, but non-repeatable or phantom read may occur.</entry>
-      </row>
-      <row xml:id="pdo.constants.tran-rep-class-uncommit-instance">
-       <entry><constant>PDO::TRAN_REP_CLASS_UNCOMMIT_INSTANCE</constant></entry>
-       <entry>The default isolation of CUBRID (3). A dirty, non-repeatable or
-        phantom read may occur for the tuple, but repeatable read is ensured
-        for the table.</entry>
-      </row>
-      <row xml:id="pdo.constants.tran-rep-class-commit-instance">
-       <entry><constant>PDO::TRAN_REP_CLASS_COMMIT_INSTANCE</constant></entry>
-       <entry>A relatively low isolation level (4). A dirty read does not
-        occur, but non-repeatable or phantom read may.</entry>
-      </row>
-      <row xml:id="pdo.constants.tran-rep-class-rep-instance">
-       <entry><constant>PDO::TRAN_REP_CLASS_REP_INSTANCE</constant></entry>
-       <entry>A relatively high isolation level (5). A dirty or non-repeatable
-       read does not occur, but a phantom read may.</entry>
-      </row>
-      <row xml:id="pdo.constants.tran-serializable">
-       <entry><constant>PDO::TRAN_SERIALIZABLE</constant></entry>
-       <entry>The highest isolation level (6). Problems concerning concurrency
-       (e.g. dirty read, non-repeatable read, phantom read, etc.) do not
-       occur.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-
-  <para>
-   The following constants can be used when getting schema information. They
-   can be passed to <function>PDO::cubrid_schema</function>.
-  <table>
-   <title>PDO::CUBRID schema flags</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Constant</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row xml:id="pdo.constants.cubrid-sch-table">
-       <entry><constant>PDO::CUBRID_SCH_TABLE</constant></entry>
-       <entry>Get name and type of table in CUBRID.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-view">
-       <entry><constant>PDO::CUBRID_SCH_VIEW</constant></entry>
-       <entry>Get name and type of view in CUBRID.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-query-spec">
-       <entry><constant>PDO::CUBRID_SCH_QUERY_SPEC</constant></entry>
-       <entry>Get the query definition of view.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-attribute">
-       <entry><constant>PDO::CUBRID_SCH_ATTRIBUTE</constant></entry>
-       <entry>Get the attributes of table column.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-table-attribute">
-       <entry><constant>PDO::CUBRID_SCH_TABLE_ATTRIBUTE</constant></entry>
-       <entry>Get the attributes of table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-method">
-       <entry><constant>PDO::CUBRID_SCH_METHOD</constant></entry>
-       <entry>Get the instance method. The instance method is a method called
-       by a class instance. It is used more often than the class method
-       because most operations are executed in the instance.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-table-method">
-       <entry><constant>PDO::CUBRID_SCH_TABLE_METHOD</constant></entry>
-       <entry>Get the class method. The class method is a method called by a
-        class object. It is usually used to create a new class instance or to
-        initialize it. It is also used to access or update class
-        attributes.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-method-file">
-       <entry><constant>PDO::CUBRID_SCH_METHOD_FILE</constant></entry>
-       <entry>Get the information of the file where the method of the table is
-        defined.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-super-table">
-       <entry><constant>PDO::CUBRID_SCH_SUPER_TABLE</constant></entry>
-       <entry>Get the name and type of table which table inherites attributes
-        from.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-sub-table">
-       <entry><constant>PDO::CUBRID_SCH_SUB_TABLE</constant></entry>
-       <entry>Get the name and type of table which inherites attributes from
-        this table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-constraint">
-       <entry><constant>PDO::CUBRID_SCH_CONSTRAINT</constant></entry>
-       <entry>Get the table constraints.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-trigger">
-       <entry><constant>PDO::CUBRID_SCH_TRIGGER</constant></entry>
-       <entry>Get the table triggers.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-table-privilege">
-       <entry><constant>PDO::CUBRID_SCH_TABLE_PRIVILEGE</constant></entry>
-       <entry>Get the privilege information of table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-col-privilege">
-       <entry><constant>PDO::CUBRID_SCH_COL_PRIVILEGE</constant></entry>
-       <entry>Get the privilege information of column.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-direct-super-table">
-       <entry><constant>PDO::CUBRID_SCH_DIRECT_SUPER_TABLE</constant></entry>
-       <entry>Get the direct super table of table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-primary-key">
-       <entry><constant>PDO::CUBRID_SCH_PRIMARY_KEY</constant></entry>
-       <entry>Get the table primary key.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-imported-keys">
-       <entry><constant>PDO::CUBRID_SCH_IMPORTED_KEYS</constant></entry>
-       <entry>Get imported keys of table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-exported-keys">
-       <entry><constant>PDO::CUBRID_SCH_EXPORTED_KEYS</constant></entry>
-       <entry>Get exported keys of table.</entry>
-      </row>
-      <row xml:id="pdo.constants.cubrid-sch-cross-reference">
-       <entry><constant>PDO::CUBRID_SCH_CROSS_REFERENCE</constant></entry>
-       <entry>Get reference relationship of two tables.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </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/pdo_cubrid/pdo_overloaded/cubrid-schema.xml b/reference/pdo_cubrid/pdo_overloaded/cubrid-schema.xml
deleted file mode 100644
index b2339b268d30..000000000000
--- a/reference/pdo_cubrid/pdo_overloaded/cubrid-schema.xml
+++ /dev/null
@@ -1,545 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Generated by xml_proto.php v2.3. Found in /scripts directory of phpdoc. -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="pdo.cubrid-schema">
- <refnamediv>
-  <refname>PDO::cubrid_schema</refname>
-  <refpurpose>Get the requested schema information</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>PDO::cubrid_schema</methodname>
-   <methodparam><type>int</type><parameter>schema_type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>table_name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>col_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function is used to get the requested schema information from
-   database. You have to designate <parameter>table_name</parameter>, if you
-   want to get information on certain table, <parameter>col_name</parameter>,
-   if you want to get information on certain column (can be used only with
-   PDO::CUBRID_SCH_COL_PRIVILEGE).
-  </simpara>
-
-  <simpara>
-  The result of this 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.
-  </simpara>
-
-  <table>
-  <title>Result Composition of Each Type</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>Schema</entry>
-      <entry>Column Number</entry>
-      <entry>Column Name</entry>
-      <entry>Value</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PDO::CUBRID_SCH_TABLE</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>0:system table 1:view 2:table</entry>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_VIEW</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>1:view</entry>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_QUERY_SPEC</entry>
-      <entry>1</entry>
-      <entry>QUERY_SPEC</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_ATTRIBUTE / PDO::CUBRID_SCH_TABLE_ATTRIBUTE</entry>
-      <entry>1</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>DOMAIN</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>SCALE</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>PRECISION</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>INDEXED</entry>
-      <entry>1:indexed</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>NOT NULL</entry>
-      <entry>1:not null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>SHARED</entry>
-      <entry>1:shared</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>UNIQUE</entry>
-      <entry>1:unique</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>DEFAULT</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>10</entry>
-      <entry>ATTR_ORDER</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>11</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>12</entry>
-      <entry>SOURCE_CLASS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>13</entry>
-      <entry>IS_KEY</entry>
-      <entry>1:key</entry>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_METHOD / PDO::CUBRID_SCH_TABLE_METHOD</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>RET_DOMAIN</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>ARG_DOMAIN</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_METHOD_FILE</entry>
-      <entry>1</entry>
-      <entry>METHOD_FILE</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_SUPER_TABLE / PDO::CUBRID_SCH_DIRECT_SUPER_TABLE / PDO::CUBRID_SCH_SUB_TABLE</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>TYPE</entry>
-      <entry>0:system table 1:view 2:table</entry>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_CONSTRAINT</entry>
-      <entry>1</entry>
-      <entry>TYPE</entry>
-      <entry>0:unique 1:index 2:reverse unique 3:reverse index</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>NUM_PAGES</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>NUM_KEYS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>PRIMARY_KEY</entry>
-      <entry>1:primary key</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>KEY_ORDER</entry>
-      <entry>base:1</entry>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_TRIGGER</entry>
-      <entry>1</entry>
-      <entry>NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>STATUS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>EVENT</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>TARGET_CLASS</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>TARGET_ATTR</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>ACTION_TIME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>ACTION</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>PRIORITY</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>CONDITION_TIME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>10</entry>
-      <entry>CONDITION</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_TABLE_PRIVILEGE / PDO::CUBRID_SCH_COL_PRIVILEGE</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME / ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>PRIVILEGE</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>GRANTABLE</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_PRIMARY_KEY</entry>
-      <entry>1</entry>
-      <entry>CLASS_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>ATTR_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>KEY_SEQ</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>KEY_NAME</entry>
-      <entry/>
-     </row>
-
-     <row>
-      <entry>PDO::CUBRID_SCH_IMPORTED_KEYS / PDO::CUBRID_SCH_EXPORTED_KEYS / PDO::CUBRID_SCH_CROSS_REFERENCE</entry>
-      <entry>1</entry>
-      <entry>PKTABLE_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>2</entry>
-      <entry>PKCOLUMN_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>3</entry>
-      <entry>FKTABLE_NAME</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>4</entry>
-      <entry>FKCOLUMN_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>5</entry>
-      <entry>KEY_SEQ</entry>
-      <entry>base:1</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>6</entry>
-      <entry>UPDATE_ACTION</entry>
-      <entry>0:cascade 1:restrict 2:no action 3:set null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>7</entry>
-      <entry>DELETE_ACTION</entry>
-      <entry>0:cascade 1:restrict 2:no action 3:set null</entry>
-     </row>
-     <row>
-      <entry/>
-      <entry>8</entry>
-      <entry>FK_NAME</entry>
-      <entry/>
-     </row>
-     <row>
-      <entry/>
-      <entry>9</entry>
-      <entry>PK_NAME</entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>schema_type</parameter></term>
-    <listitem>
-     <simpara>
-      Schema type that you want to know.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>table_name</parameter></term>
-    <listitem>
-     <simpara>
-      Table you want to know the schema of.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>col_name</parameter></term>
-    <listitem>
-     <simpara>
-      Column you want to know the schema of.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Array containing the schema information, when process is successful;
-  </simpara>
-  <simpara>
-    FALSE, when process is unsuccessful
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>PDO::cubrid_schema</function> example</title>
-   <simpara>
-    This example shows how to get primary key and foreign keys of table game.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pk_list = $dbh->cubrid_schema(PDO::CUBRID_SCH_PRIMARY_KEY, "game");
-print_r($pk_list);
-
-$fk_list = $dbh->cubrid_schema(PDO::CUBRID_SCH_IMPORTED_KEYS, "game");
-print_r($fk_list);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Result:
-Array
-(
-    [0] => Array
-        (
-            [CLASS_NAME] => game
-            [ATTR_NAME] => athlete_code
-            [KEY_SEQ] => 3
-            [KEY_NAME] => pk_game_host_year_event_code_athlete_code
-        )
-
-    [1] => Array
-        (
-            [CLASS_NAME] => game
-            [ATTR_NAME] => event_code
-            [KEY_SEQ] => 2
-            [KEY_NAME] => pk_game_host_year_event_code_athlete_code
-        )
-
-    [2] => Array
-        (
-            [CLASS_NAME] => game
-            [ATTR_NAME] => host_year
-            [KEY_SEQ] => 1
-            [KEY_NAME] => pk_game_host_year_event_code_athlete_code
-        )
-
-)
-Array
-(
-    [0] => Array
-        (
-            [PKTABLE_NAME] => athlete
-            [PKCOLUMN_NAME] => code
-            [FKTABLE_NAME] => game
-            [FKCOLUMN_NAME] => athlete_code
-            [KEY_SEQ] => 1
-            [UPDATE_RULE] => 1
-            [DELETE_RULE] => 1
-            [FK_NAME] => fk_game_athlete_code
-            [PK_NAME] => pk_athlete_code
-        )
-
-    [1] => Array
-        (
-            [PKTABLE_NAME] => event
-            [PKCOLUMN_NAME] => code
-            [FKTABLE_NAME] => game
-            [FKCOLUMN_NAME] => event_code
-            [KEY_SEQ] => 1
-            [UPDATE_RULE] => 1
-            [DELETE_RULE] => 1
-            [FK_NAME] => fk_game_event_code
-            [PK_NAME] => pk_event_code
-        )
-
-)
-]]>
-   </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/pdo_cubrid/reference.xml b/reference/pdo_cubrid/reference.xml
deleted file mode 100644
index 4d69210fff5a..000000000000
--- a/reference/pdo_cubrid/reference.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xmlns="http://docbook.org/ns/docbook" xml:id="ref.pdo-cubrid"><?phpdoc extension-membership="pecl" ?>
- <title>CUBRID PDO Driver (PDO_CUBRID)</title>
- <titleabbrev>CUBRID PDO Driver</titleabbrev>
- <partintro>
-
-  <section xml:id="pdo-cubrid.intro">&reftitle.intro;
-   <simpara>
-    PDO_CUBRID is a driver that implements the
-    <link linkend="intro.pdo">PHP Data Objects (PDO) interface</link>
-    to enable access from PHP to CUBRID databases.
-   </simpara>
-   <note><simpara>
-    Current version of PDO_CUBRID doesn't support persistent connection now.
-   </simpara></note>
-  </section>
-
-  <!-- Information found in configure.xml -->
-  &reference.pdo-cubrid.configure;
-
-  <section xml:id="ref.pdo-cubrid.features">
-   <title>PDO_CUBRID Features</title>
-
-   <section>
-    <title>Scrollable cursors</title>
-    <simpara>
-     PDO_CUBRID supports scrollable cursors. The default cursor type is
-     forward only, and you can use parameter driver_options in
-     <methodname>PDO::prepare</methodname> to change cursor type.
-    </simpara>
-   </section>
-
-   <section>
-    <title>Timeout</title>
-    <simpara>
-     PDO_CUBRID supports sql statement execution timeout setting;
-     You can use <methodname>PDO::setAttribute</methodname> to set timeout value.
-    </simpara>
-   </section>
-
-   <section>
-    <title>Autocommit_mode and Transaction</title>
-
-    <simpara>
-     PDO_CUBRID supports both autocommit_mode and transaction, and
-     autocommit_mode is enabled by default. You can use
-     <methodname>PDO::setAttribute</methodname> to change its state.
-    </simpara>
-
-    <simpara>
-     If you use <methodname>PDO::beginTransaction</methodname> to begin a
-     transaction, it will disable autocommit_mode automatically and
-     restore it after <methodname>PDO::commit</methodname> or
-     <methodname>PDO::rollBack</methodname>.
-    </simpara>
-
-    <note>
-     <simpara>
-      Prior do disabling autocommit_mode
-      any pending work is automatically committed.
-     </simpara>
-    </note>
-   </section>
-
-   <section>
-    <title>Multiple SQL Statements</title>
-
-    <simpara>
-     PDO_CUBRID supports Multiple SQL statements.
-     Multiple SQL statements are separated by semicolons (<literal>;</literal>).
-    </simpara>
-   </section>
-
-   <section>
-    <title>Schema Information</title>
-
-    <simpara>
-     PDO_CUBRID implements <methodname>PDO::cubrid_schema</methodname>
-     to get schema information.
-    </simpara>
-   </section>
-
-   <section>
-    <title>LOBs</title>
-
-    <simpara>
-     PDO_CUBRID supports BLOB/CLOB data type. The LOB in PDO is
-     represented as a stream, so you can insert LOBs by binding a stream,
-     and get LOBs by reading a stream returned by CUBRID PDO.
-     For example:
-    </simpara>
-
-    <example>
-     <title>Insert LOBs in CUBRID PDO</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$fp = fopen('lob_test.png', 'rb');
-
-$sql_stmt = "INSERT INTO lob_test(name, content) VALUES('lob_test.png', ?)";
-
-$stmt = $dbh->prepare($sql_stmt);
-$ret = $stmt->bindParam(1, $fp, PDO::PARAM_LOB);
-$ret = $stmt->execute();
-?>
-]]>
-     </programlisting>
-    </example>
-
-    <example>
-     <title>Fetch LOBs in CUBRID PDO</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$sql_stmt = "SELECT content FROM lob_test WHERE name='lob_test.png'";
-
-$stmt = $dbh->prepare($sql_stmt);
-$stmt->execute();
-$result = $stmt->fetch(PDO::FETCH_NUM);
-
-header("Content-Type: image/png");
-fpassthru($result[0]);
-?>
-]]>
-     </programlisting>
-    </example>
-   </section>
-
-   <section>
-    <title>Column meta</title>
-
-    <para>
-     The <methodname>PDOStatement::getColumnMeta</methodname> in CUBRID PDO
-     will return an associative array containing the following values:
-     <simplelist>
-      <member>type</member>
-      <member>name</member>
-      <member>table</member>
-      <member>def</member>
-      <member>precision</member>
-      <member>scale</member>
-      <member>not_null</member>
-      <member>auto_increment</member>
-      <member>unique_key</member>
-      <member>multiple_key</member>
-      <member>primary_key</member>
-      <member>foreign_key</member>
-      <member>reverse_index</member>
-      <member>reverse_unique</member>
-     </simplelist>
-    </para>
-   </section>
-
-   <section>
-    <title>Collection Data Type</title>
-
-    <simpara>
-     PDO_CUBRID supports SET/MULTISET/SEQUENCE data type.
-     If you don't specify data type, the default data type is char.
-     For example:
-    </simpara>
-
-    <example>
-     <title>Insert set in CUBRID PDO with default data type.</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$conn_str ="cubrid:dbname=demodb;host=localhost;port=33000";
-$cubrid_pdo = new PDO($conn_str, 'dba', '');
-
-$cubrid_pdo->exec("DROP TABLE if exists test_tbl");
-$cubrid_pdo->exec("CREATE TABLE test_tbl (col_1 SET(VARCHAR))");
-
-$sql_stmt_insert = "INSERT INTO test_tbl VALUES (?);";
-$stmt = $cubrid_pdo->prepare($sql_stmt_insert);
-$data = array("abc","def","ghi");
-$ret = $stmt->bindParam(1, $data, PDO::PARAM_NULL);
-$ret = $stmt->execute();
-var_Dump($ret);
-?>
-]]>
-     </programlisting>
-    </example>
-
-    <example>
-     <title>Specify data type when insert set in CUBRID PDO</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-$conn_str ="cubrid:dbname=demodb;host=localhost;port=33000";
-$cubrid_pdo = new PDO($conn_str, 'dba', '');
-
-$cubrid_pdo->exec("DROP TABLE if exists test_tbl");
-$cubrid_pdo->exec("CREATE TABLE test_tbl (col_1 SET(int))");
-
-$sql_stmt_insert = "INSERT INTO test_tbl VALUES (?);";
-$stmt = $cubrid_pdo->prepare($sql_stmt_insert);
-$data = array(1,2,3,4);
-$ret = $stmt->bindParam(1, $data, 0,0,"int");
-$ret = $stmt->execute();
-var_Dump($ret);
-?>
-]]>
-     </programlisting>
-    </example>
-
-    <para>
-     CUBRID Bind Data Types for the fifth parameter of
-     <methodname>PDOStatement::bindParam</methodname>:
-     <simplelist>
-      <member>CHAR</member>
-      <member>STRING</member>
-      <member>NCHAR</member>
-      <member>VARNCHAR</member>
-      <member>BIT</member>
-      <member>VARBIT</member>
-      <member>NUMERIC</member>
-      <member>NUMBER</member>
-      <member>INT</member>
-      <member>SHORT</member>
-      <member>BIGINT</member>
-      <member>MONETARY</member>
-      <member>FLOAT</member>
-      <member>DOUBLE</member>
-      <member>DATE</member>
-      <member>TIME</member>
-      <member>DATETIME</member>
-      <member>TIMESTAMP</member>
-     </simplelist>
-    </para>
-   </section>
-  </section>
-
-   <!-- Information found in constants.xml -->
-   &reference.pdo-cubrid.constants;
-
-  </partintro>
-
-  <refentry xml:id="ref.pdo-cubrid.connection">
-   <refnamediv>
-    <refname>PDO_CUBRID DSN</refname>
-    <refpurpose>Connecting to CUBRID databases</refpurpose>
-   </refnamediv>
-
-   <refsect1 role="description">
-    &reftitle.description;
-    <para>
-     The PDO_CUBRID Data Source Name (DSN) is composed of the following elements, delimited by semicolons:
-     <variablelist>
-      <varlistentry>
-       <term>DSN prefix</term>
-       <listitem>
-        <para>
-        The DSN prefix is <userinput>cubrid:</userinput>.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>host</literal></term>
-       <listitem>
-        <simpara>
-         The hostname on which the database server resides.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>port</literal></term>
-       <listitem>
-        <simpara>
-         The port on which the database server is running.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>dbname</literal></term>
-       <listitem>
-        <simpara>
-         The name of the database.
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </para>
-   </refsect1>
-
-   <refsect1 role="notes">
-    &reftitle.notes;
-    <note>
-     <simpara>
-      When you establish the connection to CUBRID, you should give username and
-      password except DSN.
-     </simpara>
-    </note>
-   </refsect1>
-
-   <refsect1 role="examples">
-    &reftitle.examples;
-    <example>
-     <title>PDO_CUBRID DSN examples</title>
-     <para>
-      The following example shows a PDO_CUBRID DSN for connecting to a CUBRID database:
-      <programlisting><![CDATA[
-cubrid:host=localhost;port=33000;dbname=demodb
-]]>
-      </programlisting>
-     </para>
-    </example>
-   </refsect1>
-  </refentry>
-
-  &reference.pdo-cubrid.entities.pdo-overloaded;
-
- </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/pdo_ibm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/pdo_ibm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/pdo_ibm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/pdo_ibm/configure.xml b/reference/pdo_ibm/configure.xml
deleted file mode 100644
index 1f62f321d8ed..000000000000
--- a/reference/pdo_ibm/configure.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ref.pdo-ibm.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  To build the PDO_IBM extension, the DB2 Client v9.1 or later must be 
-  installed on the same system as PHP. The DB2 Client can be downloaded 
-  from the IBM <link xlink:href="&url.ibmdb2.ad;">Application Development 
-  Site</link>.
- </para>
- <note>
-  <title>Note</title>
-   <para>
-    The DB2 Client v9.1 or later supports direct access to DB2 for Linux, 
-    UNIX, and Windows v8 and v9.1 servers.
-   </para>
-   <para>
-    The DB2 Client v9.1 also supports access to DB2 UDB for i5 and DB2 UDB 
-    for z/OS servers using the separately purchased <link xlink:href="&url.ibmdb2.con;">DB2 
-    Connect product</link>.
-   </para>
- </note>
- <para>
-  PDO_IBM is a &link.pecl; extension, so follow the instructions in
-  <xref linkend='install.pecl' /> to install the PDO_IBM extension.
-  Issue the <command>configure</command> command to point to the location of the
-  DB2 Client header files and libraries as follows:
-  <screen>
-<![CDATA[
-bash$ ./configure --with-pdo-ibm=/path/to/sqllib[,shared]
-]]>
-  </screen>
-  The <command>configure</command> command defaults to the value of the 
-  <envar>DB2DIR</envar> environment variable.
- </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/pdo_ibm/ini.xml b/reference/pdo_ibm/ini.xml
deleted file mode 100644
index f036a85b1510..000000000000
--- a/reference/pdo_ibm/ini.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="pdo-ibm.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>PDO_IBM Configuration Options</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="pdo-ibm.configuration.list">
-     <row>
-      <entry><link linkend="ini.pdo-ibm.i5-dbcs-alloc">pdo_ibm.i5_dbcs_alloc</link></entry>
-      <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Added in PDO_IBM 1.5.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.pdo-ibm.i5-override-ccsid">pdo_ibm.i5_override_ccsid</link></entry>
-      <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Added in PDO_IBM 1.5.0</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
-</para>
-
-&ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.pdo-ibm.i5-dbcs-alloc">
-    <term>
-     <parameter>pdo_ibm.i5_dbcs_alloc</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      This options affects the internal buffer allocation strategy on IBM i.
-      By default, this option is 0. When this option is set, buffers are
-      allocated with a much larger size, in case the database is misleading
-      about character size when converting between encodings. This option uses
-      six times as much memory for buffers (to account for the largest possible
-      UTF-8 sequences), but may be needed if truncated data is returned.
-      <itemizedlist>
-       <listitem>
-        <para>
-         0 - Minimum size buffers are allocated.
-        </para>
-       </listitem>
-       <listitem>
-        <para>
-         1 - Larger size buffers are allocated.
-        </para>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.pdo-ibm.i5-override-ccsid">
-    <term>
-     <parameter>pdo_ibm.i5_override_ccsid</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      The ASCII CCSID to use for conversion from EBCDIC on IBM i. Setting this
-      to 1208 will use UTF-8. By default, this is 0, which will select the
-      default ASCII job CCSID.
-     </para>
-     <para>
-      To learn more about CCSIDs on IBM i, consult the
-      <link xlink:href="&url.ibm.ccsid;">IBM documentation</link>.
-     </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/pdo_ibm/reference.xml b/reference/pdo_ibm/reference.xml
deleted file mode 100644
index 1e34f476f67b..000000000000
--- a/reference/pdo_ibm/reference.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="ref.pdo-ibm" xmlns="http://docbook.org/ns/docbook">
- <?phpdoc extension-membership="pecl" ?>
-  <title>IBM PDO Driver (PDO_IBM)</title>
-  <titleabbrev>IBM PDO Driver</titleabbrev>
-  <partintro>
-
-   <section xml:id="pdo-ibm.intro">
-    &reftitle.intro;
-    <para>
-     PDO_IBM is a driver that implements the <link linkend="intro.pdo">PHP Data
-     Objects (PDO)</link> interface to enable access from PHP to IBM databases.
-    </para>
-   </section>
-
-   <!-- Information found in configure.xml -->
-   &reference.pdo-ibm.configure;
-   <!-- Information found in ini.xml -->
-   &reference.pdo-ibm.ini;
-
-  </partintro>
-
-  <refentry xml:id="ref.pdo-ibm.connection">
-   <refnamediv>
-    <refname>PDO_IBM DSN</refname>
-    <refpurpose>Connecting to IBM databases</refpurpose>
-   </refnamediv>
-
-   <refsect1 role="description">
-    &reftitle.description;
-    <para>
-     The PDO_IBM Data Source Name (DSN) is based on the IBM CLI DSN. The major
-     components of the PDO_IBM DSN are:
-     <variablelist>
-      <varlistentry>
-       <term>DSN prefix</term>
-       <listitem>
-        <para>
-        The DSN prefix is <userinput>ibm:</userinput>.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>DSN</term>
-       <listitem>
-        <para>
-         The DSN can be any of the following:
-         <itemizedlist>
-          <listitem>
-           <para>
-            a) Data source setup using <filename>db2cli.ini</filename>
-            or <filename>odbc.ini</filename>
-           </para>
-          </listitem>
-          <listitem>
-           <para>
-            b) Catalogued database name i.e. database alias in the DB2 client
-            catalog
-           </para>
-          </listitem>
-          <listitem>
-           <para>
-             c) Complete connection string in the following format:
-             <code>DRIVER={IBM DB2 ODBC DRIVER};DATABASE=<parameter>database</parameter>;HOSTNAME=<parameter>hostname</parameter>;PORT=<parameter>port</parameter>;PROTOCOL=TCPIP;UID=<parameter>username</parameter>;PWD=<parameter>password</parameter>;</code>
-             where the parameters represent the following values:
-             <variablelist>
-              <varlistentry>
-               <term><parameter>database</parameter></term>
-               <listitem>
-                <para>
-                 The name of the database.
-                </para>
-               </listitem>
-              </varlistentry>
-              <varlistentry>
-               <term><parameter>hostname</parameter></term>
-               <listitem>
-                <para>
-                 The hostname or IP address of the database server.
-                </para>
-               </listitem>
-              </varlistentry>
-              <varlistentry>
-               <term><parameter>port</parameter></term>
-               <listitem>
-                <para>
-                 The TCP/IP port on which the database is listening for
-                 requests.
-                </para>
-               </listitem>
-              </varlistentry>
-              <varlistentry>
-               <term><parameter>username</parameter></term>
-               <listitem>
-                <para>
-                 The username with which you are connecting to the
-                 database.
-                </para>
-               </listitem>
-              </varlistentry>
-              <varlistentry>
-               <term><parameter>password</parameter></term>
-               <listitem>
-                <para>
-                 The password with which you are connecting to the database.
-                </para>
-               </listitem>
-              </varlistentry>
-             </variablelist>
-            </para>
-           </listitem>
-          </itemizedlist>
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </para>
-   </refsect1>
-   <refsect1 role="examples">
-    &reftitle.examples;
-    <para>
-     <example>
-      <title>PDO_IBM DSN example using <filename>db2cli.ini</filename></title>
-      <para>
-       The following example shows a PDO_IBM DSN for connecting to an DB2
-       database cataloged as DB2_9 in <filename>db2cli.ini</filename>:
-       <programlisting><![CDATA[
-$db = new PDO("ibm:DSN=DB2_9", "", "");
-
-[DB2_9]
-Database=testdb
-Protocol=tcpip
-Hostname=11.22.33.444
-Servicename=56789
-]]></programlisting>
-      </para>
-     </example>
-     <example>
-      <title>PDO_IBM DSN example using a connection string</title>
-      <para>
-       The following example shows a PDO_IBM DSN for connecting to an DB2
-       database named <userinput>testdb</userinput> using the DB2 CLI
-       connection string syntax.
-       <programlisting><![CDATA[
-$db = new PDO("ibm:DRIVER={IBM DB2 ODBC DRIVER};DATABASE=testdb;" .
-  "HOSTNAME=11.22.33.444;PORT=56789;PROTOCOL=TCPIP;", "testuser", "tespass");
-]]>
-       </programlisting>
-      </para>
-     </example>
-
-    </para>
-   </refsect1>
-  </refentry>
-
- </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/pdo_informix/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/pdo_informix/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/pdo_informix/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/pdo_informix/configure.xml b/reference/pdo_informix/configure.xml
deleted file mode 100644
index 0137a6d14ab2..000000000000
--- a/reference/pdo_informix/configure.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ref.pdo-informix.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
- <para>
-  To build the PDO_INFORMIX extension, the Informix Client SDK 2.81 UC1 or
-  higher must be installed on the same system as PHP. The Informix Client
-  SDK is available from the <link xlink:href="&url.informix.csdk;">IBM Informix
-  Support Site</link>.
- </para>
- <para>
-  PDO_INFORMIX is a &link.pecl; extension, so follow the instructions in
-  <xref linkend='install.pecl' /> to install the PDO_INFORMIX extension.
-  Issue the <command>configure</command> command to point to the location of the
-  Informix Client SDK header files and libraries as follows:
-  <screen>
-<![CDATA[
-   bash$ ./configure --with-pdo-informix=/path/to/SDK[,shared]
-]]>
-  </screen>
-  The <command>configure</command> command defaults to the value of the
-  <envar>INFORMIXDIR</envar> environment variable.
- </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/pdo_informix/reference.xml b/reference/pdo_informix/reference.xml
deleted file mode 100644
index d9c934adc4ad..000000000000
--- a/reference/pdo_informix/reference.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <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 PDO Driver (PDO_INFORMIX)</title>
-  <titleabbrev>Informix PDO Driver</titleabbrev>
-  <partintro>
-
-   <section xml:id="pdo-informix.intro">
-    &reftitle.intro;
-    <para>
-     PDO_INFORMIX is a driver that implements the <link linkend="intro.pdo">PHP Data
-     Objects (PDO)</link> interface to enable access from PHP to Informix databases.
-    </para>
-   </section>
-
-   <!-- Information found in configure.xml -->
-   &reference.pdo-informix.configure;
-
-   <section xml:id="ref.pdo-informix.features.cursors">
-    <title>Scrollable cursors</title>
-    <para>
-     PDO_INFORMIX supports scrollable cursors; however, they are not enabled
-     by default. To enable scrollable cursor support, you must either set
-     <userinput>ENABLESCROLLABLECURSORS=1</userinput> in the corresponding ODBC
-     connection settings in <filename>odbc.ini</filename> or pass
-     the <userinput>EnableScrollableCursors=1</userinput> clause in the DSN
-     connection string.
-    </para>
-   </section>
-
-  </partintro>
-
-  <refentry xml:id="ref.pdo-informix.connection">
-   <refnamediv>
-    <refname>PDO_INFORMIX DSN</refname>
-    <refpurpose>Connecting to Informix databases</refpurpose>
-   </refnamediv>
-
-   <refsect1 role="description">
-    &reftitle.description;
-    <para>
-     The PDO_INFORMIX Data Source Name (DSN) is based on the Informix ODBC DSN
-     string. Details on configuring an Informix ODBC DSN are available from
-     the <link xlink:href="&url.informix.dsn;">Informix Dynamic Server Information
-      Center</link>. The major components of the PDO_INFORMIX DSN are:
-     <variablelist>
-      <varlistentry>
-       <term>DSN prefix</term>
-       <listitem>
-        <para>
-        The DSN prefix is <userinput>informix:</userinput>.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>DSN</term>
-       <listitem>
-        <para>
-         The DSN can be either a data source setup using
-         <filename>odbc.ini</filename> or a complete <link
-          xlink:href="&url.informix.connectionstring;">connection string</link>.
-        </para>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </para>
-   </refsect1>
-   <refsect1 role="examples">
-    &reftitle.examples;
-    <para>
-     <example>
-      <title>PDO_INFORMIX DSN example using <filename>odbc.ini</filename></title>
-      <para>
-       The following example shows a PDO_INFORMIX DSN for connecting to
-       an Informix database cataloged as Infdrv33 in
-       <filename>odbc.ini</filename>:
-       <programlisting><![CDATA[
-$db = new PDO("informix:DSN=Infdrv33", "", "");
-]]></programlisting>
-       <programlisting><![CDATA[
-[ODBC Data Sources]
-Infdrv33=INFORMIX 3.3 32-BIT
-
-[Infdrv33]
-Driver=/opt/informix/csdk_2.81.UC1G2/lib/cli/iclis09b.so
-Description=INFORMIX 3.3 32-BIT
-Database=common_db
-LogonID=testuser
-pwd=testpass
-Servername=ids_server
-DB_LOCALE=en_US.819
-OPTIMIZEAUTOCOMMIT=1
-ENABLESCROLLABLECURSORS=1
-]]></programlisting>
-      </para>
-     </example>
-     <example>
-      <title>PDO_INFORMIX DSN example using a connection string</title>
-      <para>
-       The following example shows a PDO_INFORMIX DSN for connecting to
-       an Informix database named <userinput>common_db</userinput> using the
-       Informix connection string syntax.
-       <programlisting><![CDATA[
-$db = new PDO("informix:host=host.domain.com; service=9800;
-    database=common_db; server=ids_server; protocol=onsoctcp;
-    EnableScrollableCursors=1", "testuser", "tespass");
-]]>
-       </programlisting>
-      </para>
-     </example>
-
-    </para>
-   </refsect1>
-  </refentry>
-
- </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/pdo_mysql/reference.xml b/reference/pdo_mysql/reference.xml
index 7f6835effa52..e562eb166f51 100644
--- a/reference/pdo_mysql/reference.xml
+++ b/reference/pdo_mysql/reference.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
- <reference xml:id="ref.pdo-mysql" xmlns="http://docbook.org/ns/docbook">
+ <reference xml:id="ref.pdo-mysql" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
   <?phpdoc extension-membership="bundledexternal" ?>
   <title>MySQL PDO Driver (PDO_MYSQL)</title>
   <titleabbrev>MySQL PDO Driver</titleabbrev>
@@ -29,15 +29,15 @@
      <emphasis>The server requested authentication method unknown to the client [caching_sha2_password]</emphasis>
      even when <emphasis>caching_sha2_password</emphasis> is not used.
     </para>
-    <para>
+    <simpara>
      This is because MySQL 8 defaults to caching_sha2_password, a plugin that is
      not recognized by the older PHP (mysqlnd) releases. Instead, change it by
      setting <literal>default_authentication_plugin=mysql_native_password</literal>
      in <filename>my.cnf</filename>. The <emphasis>caching_sha2_password</emphasis>
      plugin is fully supported as of PHP 7.4.4. For older releases, the
-     <link linkend="book.mysql-xdevapi">mysql_xdevapi</link> extension does
+     <link xlink:href="../extensions/book.mysql-xdevapi.php">mysql_xdevapi</link> extension does
      support it.
-    </para>
+    </simpara>
 
     <warning>
      <para>
diff --git a/reference/pdo_sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/pdo_sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/pdo_sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/pdo_sqlsrv/configure.xml b/reference/pdo_sqlsrv/configure.xml
deleted file mode 100644
index 7a2cbbaa30bb..000000000000
--- a/reference/pdo_sqlsrv/configure.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ref.pdo-sqlsrv.installation">
- &reftitle.install;
- <simpara>
-  The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>.
-  The driver sources are hosted in a <link xlink:href="&url.sqlsrv.repo;">public repository</link>.
- </simpara>
- <simpara>
-  For more information about system requirements, see
-  <link xlink:href="&url.sqlsrv.system.requirements;">SQLSRV System Requirements</link>.
- </simpara>
- <simpara>
-  On Windows the PDO_SQLSRV extension is enabled by downloading and adding
-  appropriate DLL files to the PHP extension directory and the corresponding
-  entry to the &php.ini; file.
- </simpara>
- <simpara>
-  On Linux and macOS, the PDO_SQLSRV extension can be installed using
-  &link.pecl;.
-  See the <link xlink:href="&url.sqlsrv.linux-mac;">installation tutorial</link>
-  for details.
- </simpara>
-</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/pdo_sqlsrv/constants.xml b/reference/pdo_sqlsrv/constants.xml
deleted file mode 100644
index 8258a7db19b2..000000000000
--- a/reference/pdo_sqlsrv/constants.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="pdo-sqlsrv.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &pdo.driver-constants;
- <variablelist>
-  <varlistentry xml:id="pdo.constants.sqlsrv-txn-read-uncommitted">
-   <term>
-    <constant>PDO::SQLSRV_TXN_READ_UNCOMMITTED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant is an acceptable value for the SQLSRV DSN key TransactionIsolation. 
-     This constant sets the transaction isolation level for the connection to 
-     Read Uncommitted.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-txn-read-committed">
-   <term>
-    <constant>PDO::SQLSRV_TXN_READ_COMMITTED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant is an acceptable value for the SQLSRV DSN key TransactionIsolation. 
-     This constant sets the transaction isolation level for the connection to 
-     Read Committed.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-txn-repeatable-read">
-   <term>
-    <constant>PDO::SQLSRV_TXN_REPEATABLE_READ</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant is an acceptable value for the SQLSRV DSN key TransactionIsolation. 
-     This constant sets the transaction isolation level for the connection to 
-     Repeateable Read.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-txn-snapshot">
-   <term>
-    <constant>PDO::SQLSRV_TXN_SNAPSHOT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant is an acceptable value for the SQLSRV DSN key TransactionIsolation. 
-     This constant sets the transaction isolation level for the connection to Snapshot.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-txn-serializable">
-   <term>
-    <constant>PDO::SQLSRV_TXN_SERIALIZABLE</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This constant is an acceptable value for the SQLSRV DSN key TransactionIsolation. 
-     This constant sets the transaction isolation level for the connection to 
-     Serializable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-encoding-binary">
-   <term>
-    <constant>PDO::SQLSRV_ENCODING_BINARY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that data is sent/retrieved as a raw byte stream to/from the server 
-     without performing encoding or translation. This constant can be passed to 
-     PDOStatement::setAttribute, PDO::prepare, PDOStatement::bindColumn, and 
-     PDOStatement::bindParam.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-encoding-system">
-   <term>
-    <constant>PDO::SQLSRV_ENCODING_SYSTEM</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that data is sent/retrieved to/from the server as 8-bit characters 
-     as specified in the code page of the Windows locale that is set on the system. 
-     Any multi-byte characters or characters that do not map into this code page 
-     are substituted with a single byte question mark (?) character. This constant 
-     can be passed to PDOStatement::setAttribute, PDO::setAttribute, PDO::prepare, 
-     PDOStatement::bindColumn, and PDOStatement::bindParam.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-encoding-utf8">
-   <term>
-    <constant>PDO::SQLSRV_ENCODING_UTF8</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that data is sent/retrieved to/from the server in UTF-8 encoding. 
-     This is the default encoding. This constant can be passed to 
-     PDOStatement::setAttribute, PDO::setAttribute, PDO::prepare, 
-     PDOStatement::bindColumn, and PDOStatement::bindParam.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-encoding-default">
-   <term>
-    <constant>PDO::SQLSRV_ENCODING_DEFAULT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Specifies that data is sent/retrieved to/from the server according to 
-     PDO::SQLSRV_ENCODING_SYSTEM if specified during connection. The connection's 
-     encoding is used if specified in a prepare statement. This constant can be 
-     passed to PDOStatement::setAttribute, PDO::setAttribute, PDO::prepare, 
-     PDOStatement::bindColumn, and PDOStatement::bindParam.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-attr-query-timeout">
-   <term>
-    <constant>PDO::SQLSRV_ATTR_QUERY_TIMEOUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A non-negative integer representing the timeout period, in seconds. Zero (0) 
-     is the default and means no timeout. This constant can be passed to 
-     PDOStatement::setAttribute, PDO::setAttribute, and PDO::prepare.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="pdo.constants.sqlsrv-attr-direct-query">
-   <term>
-    <constant>PDO::SQLSRV_ATTR_DIRECT_QUERY</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Indicates that a query should be executed directly, without being prepared. 
-     This constant can be passed to PDO::setAttribute, and PDO::prepare. For more 
-     information, see 
-     <link xlink:href="&url.sqlsrv.direct.execution;">Direct and Prepared Statement Execution</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-</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/pdo_sqlsrv/reference.xml b/reference/pdo_sqlsrv/reference.xml
deleted file mode 100644
index 8519db3ef16e..000000000000
--- a/reference/pdo_sqlsrv/reference.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xmlns="http://docbook.org/ns/docbook" xml:id="ref.pdo-sqlsrv">
- <?phpdoc extension-membership="pecl" ?>
-  <title>Microsoft SQL Server PDO Driver (PDO_SQLSRV)</title>
-  <titleabbrev>MS SQL Server PDO Driver</titleabbrev>
-  <partintro>
-
-   <section xml:id="pdo-sqlsrv.intro">
-   &reftitle.intro;
-    <simpara>
-     PDO_SQLSRV is a driver that implements the <link linkend="intro.pdo">PHP
-     Data Objects (PDO) interface</link>
-     to enable access from PHP to MS SQL Server (starting with SQL Server 2005)
-     and SQL Azure databases.
-    </simpara>
-   </section>
-   &reference.pdo-sqlsrv.configure;
-   &reference.pdo-sqlsrv.constants;
-  </partintro>
-
-  <refentry xml:id="ref.pdo-sqlsrv.connection">
-   <refnamediv>
-    <refname>PDO_SQLSRV DSN</refname>
-    <refpurpose>Connecting to MS SQL Server and SQL Azure databases</refpurpose>
-   </refnamediv>
-
-   <refsect1 role="description">
-    &reftitle.description;
-    <para>
-     The PDO_SQLSRV Data Source Name (DSN) is composed of the following elements:
-     <variablelist>
-      <varlistentry>
-       <term>DSN prefix</term>
-       <listitem>
-        <para>
-        The DSN prefix is <userinput>sqlsrv:</userinput>.
-        </para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>APP</literal></term>
-       <listitem>
-        <simpara>
-         The application name used in tracing.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>ConnectionPooling</literal></term>
-       <listitem>
-        <simpara>
-         Specifies whether the connection is assigned from a connection pool
-         (1 or &true;) or not (0 or &false;).
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>Database</literal></term>
-       <listitem>
-        <simpara>
-         The name of the database.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>Encrypt</literal></term>
-       <listitem>
-        <simpara>
-         Specifies whether the communication with SQL Server is encrypted
-         (1 or &true;) or unencrypted (0 or &false;).
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>Failover_Partner</literal></term>
-       <listitem>
-        <simpara>
-         Specifies the server and instance of the database's mirror (if enabled
-         and configured) to use when the primary server is unavailable.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>LoginTimeout</literal></term>
-       <listitem>
-        <simpara>
-         Specifies the number of seconds to wait before failing the connection attempt.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>MultipleActiveResultSets</literal></term>
-       <listitem>
-        <simpara>
-         Disables or explicitly enables support for multiple active Result sets (MARS).
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>QuotedId</literal></term>
-       <listitem>
-        <simpara>
-         Specifies whether to use SQL-92 rules for quoted identifiers (1 or &true;)
-         or to use legacy Transact-SQL rules (0 or &false;).
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>Server</literal></term>
-       <listitem>
-        <simpara>
-         The name of the database server.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>TraceFile</literal></term>
-       <listitem>
-        <simpara>
-         Specifies the path for the file used for trace data.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>TraceOn</literal></term>
-       <listitem>
-        <simpara>
-         Specifies whether ODBC tracing is enabled (1 or &true;) or disabled
-         (0 or &false;) for the connection being established.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>TransactionIsolation</literal></term>
-       <listitem>
-        <simpara>
-         Specifies the transaction isolation level. The accepted values for this
-         option are PDO::SQLSRV_TXN_READ_UNCOMMITTED, PDO::SQLSRV_TXN_READ_COMMITTED,
-         PDO::SQLSRV_TXN_REPEATABLE_READ, PDO::SQLSRV_TXN_SNAPSHOT, and
-         PDO::SQLSRV_TXN_SERIALIZABLE.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>TrustServerCertificate</literal></term>
-       <listitem>
-        <simpara>
-         Specifies whether the client should trust (1 or &true;) or reject
-         (0 or &false;) a self-signed server certificate.
-        </simpara>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term><literal>WSID</literal></term>
-       <listitem>
-        <simpara>
-         Specifies the name of the computer for tracing.
-        </simpara>
-       </listitem>
-      </varlistentry>
-     </variablelist>
-    </para>
-   </refsect1>
-
-   <refsect1 role="examples">
-    &reftitle.examples;
-    <example>
-     <title>PDO_SQLSRV DSN examples</title>
-     <para>
-      The following example shows how to connect to a specified MS SQL Server database:
-      <programlisting>
-<![CDATA[
-$c = new PDO("sqlsrv:Server=localhost;Database=testdb", "UserName", "Password");
-]]>
-      </programlisting>
-      </para>
-      <para>
-      The following example shows how to connect to a MS SQL Server database on
-      a specified port:
-      <programlisting>
-<![CDATA[
-$c = new PDO("sqlsrv:Server=localhost,1521;Database=testdb", "UserName", "Password");
-]]>
-      </programlisting>
-     </para>
-     <para>
-      The following example shows how to connect to a SQL Azure database with
-      server ID 12345abcde. Note that when you connect to SQL Azure with PDO,
-      your username will be UserName@12345abcde (UserName@ServerId).
-      <programlisting>
-<![CDATA[
-$c = new PDO("sqlsrv:Server=12345abcde.database.windows.net;Database=testdb", "UserName@12345abcde", "Password");
-]]>
-      </programlisting>
-     </para>
-    </example>
-   </refsect1>
-  </refentry>
-
- </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/ps/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ps/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ps/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ps/book.xml b/reference/ps/book.xml
deleted file mode 100644
index ae6d2cba9413..000000000000
--- a/reference/ps/book.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- Author: Uwe Steinmann <steinm@php.net> -->
- 
-<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>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.ps">
-  &reftitle.intro;
-  <para>
-   This module allows to create PostScript documents. It has many
-   similarities with the pdf extension. Actually the API is almost
-   identical and one can in many cases just replace the prefix of
-   each function from pdf_ to ps_. This also works for functions which
-   has no meaning in the PostScript document (like adding hyperlinks)
-   but will have an effect if the document is converted to PDF.
-  </para>
-  <para>Documents created by this extension are sometimes even superior
-   to documents created with the pdf extension, because pslib's text
-   rendering functions can handle kerning, hyphenation and ligatures
-   which results in much better output of boxed text.
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.ps.setup;
- &reference.ps.constants;
- &reference.ps.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/ps/configure.xml b/reference/ps/configure.xml
deleted file mode 100644
index 63b384c73267..000000000000
--- a/reference/ps/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="ps.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;ps">&url.pecl.package;ps</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/ps/constants.xml b/reference/ps/constants.xml
deleted file mode 100644
index d695ec10e6f3..000000000000
--- a/reference/ps/constants.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="ps.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <para>
-  The following two tables lists all constants defined by the ps extension.
-  <table xml:id="ps.table-linecap">
-   <title>Constants for line caps</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Meaning</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.ps-linecap-butt">
-      <entry><constant>ps_LINECAP_BUTT</constant></entry>
-      <entry></entry>
-     </row>
-     <row xml:id="constant.ps-linecap-round">
-      <entry><constant>ps_LINECAP_ROUND</constant></entry>
-      <entry></entry>
-     </row>
-     <row xml:id="constant.ps-linecap-squared">
-      <entry><constant>ps_LINECAP_SQUARED</constant></entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="ps.table-linejoin">
-   <title>Constants for line joins</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Name</entry>
-      <entry>Meaning</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.ps-linejoin-miter">
-      <entry><constant>ps_LINEJOIN_MITER</constant></entry>
-      <entry></entry>
-     </row>
-     <row xml:id="constant.ps-linejoin-round">
-      <entry><constant>ps_LINEJOIN_ROUND</constant></entry>
-      <entry></entry>
-     </row>
-     <row xml:id="constant.ps-linejoin-bevel">
-      <entry><constant>ps_LINEJOIN_BEVEL</constant></entry>
-      <entry></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/ps/functions/ps-add-bookmark.xml b/reference/ps/functions/ps-add-bookmark.xml
deleted file mode 100644
index 8ef8002e22a1..000000000000
--- a/reference/ps/functions/ps-add-bookmark.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-bookmark" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_add_bookmark</refname>
-  <refpurpose>Add bookmark to current page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_add_bookmark</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>parent</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>open</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a bookmark for the current page. Bookmarks usually appear in
-   PDF-Viewers left of the page in a hierarchical tree. Clicking on a
-   bookmark will jump to the given page.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text used for displaying the bookmark.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>parent</parameter></term>
-     <listitem>
-      <para>
-       A bookmark previously created by this function which
-       is used as the parent of the new bookmark.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>open</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>open</parameter> is unequal to zero the bookmark will
-       be shown open by the pdf viewer.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The returned value is a reference for the bookmark. It is only used if
-   the bookmark shall be used as a parent. The value is greater zero if
-   the function succeeds. In case of an error zero will
-   be returned.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_add_launchlink</function></member>
-    <member><function>ps_add_pdflink</function></member>
-    <member><function>ps_add_weblink</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/ps/functions/ps-add-launchlink.xml b/reference/ps/functions/ps-add-launchlink.xml
deleted file mode 100644
index ff860b67f92a..000000000000
--- a/reference/ps/functions/ps-add-launchlink.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-launchlink" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_add_launchlink</refname>
-  <refpurpose>Adds link which launches file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_add_launchlink</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>llx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lly</parameter></methodparam>
-   <methodparam><type>float</type><parameter>urx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ury</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a hyperlink at the given position pointing to a file program
-   which is being started when clicked on. The hyperlink's source position
-   is a rectangle
-   with its lower left corner at (llx, lly) and its upper right corner at
-   (urx, ury). The rectangle has by default a thin blue border.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>llx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lly</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>urx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ury</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The path of the program to be started, when the link is clicked on.
-      </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>ps_add_locallink</function></member>
-    <member><function>ps_add_pdflink</function></member>
-    <member><function>ps_add_weblink</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/ps/functions/ps-add-locallink.xml b/reference/ps/functions/ps-add-locallink.xml
deleted file mode 100644
index 99ca817bd315..000000000000
--- a/reference/ps/functions/ps-add-locallink.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-locallink" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_add_locallink</refname>
-  <refpurpose>Adds link to a page in the same document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_add_locallink</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>llx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lly</parameter></methodparam>
-   <methodparam><type>float</type><parameter>urx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ury</parameter></methodparam>
-   <methodparam><type>int</type><parameter>page</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a hyperlink at the given position pointing to a page in the same
-   document. Clicking on the link will jump to the given page. The first page
-   in a document has number 1.
-  </para>
-  <para>
-   The hyperlink's source position is a rectangle with its lower left corner at
-   (<parameter>llx</parameter>, <parameter>lly</parameter>) and its upper
-   right corner at (<parameter>urx</parameter>, <parameter>ury</parameter>).
-   The rectangle has by default a thin blue border.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>llx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lly</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>urx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ury</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>page</parameter></term>
-     <listitem>
-      <para>
-       The number of the page displayed when clicking on the link.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>dest</parameter> determines how the document
-       is being viewed. It can be <literal>fitpage</literal>,
-       <literal>fitwidth</literal>, <literal>fitheight</literal>, or
-       <literal>fitbbox</literal>.
-      </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>ps_add_launchlink</function></member>
-    <member><function>ps_add_pdflink</function></member>
-    <member><function>ps_add_weblink</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/ps/functions/ps-add-note.xml b/reference/ps/functions/ps-add-note.xml
deleted file mode 100644
index 36d345428afd..000000000000
--- a/reference/ps/functions/ps-add-note.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-note" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_add_note</refname>
-  <refpurpose>Adds note to current page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_add_note</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>llx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lly</parameter></methodparam>
-   <methodparam><type>float</type><parameter>urx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ury</parameter></methodparam>
-   <methodparam><type>string</type><parameter>contents</parameter></methodparam>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-   <methodparam><type>string</type><parameter>icon</parameter></methodparam>
-   <methodparam><type>int</type><parameter>open</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a note at a certain position on the page. Notes are like little
-   rectangular sheets with text on it, which can be placed anywhere on
-   a page. They
-   are shown either folded or unfolded. If folded, the specified icon
-   is used as a placeholder.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>llx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lly</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>urx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ury</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>contents</parameter></term>
-     <listitem>
-      <para>
-       The text of the note.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>title</parameter></term>
-     <listitem>
-      <para>
-       The title of the note as displayed in the header of the note.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>icon</parameter></term>
-     <listitem>
-      <para>
-       The icon shown if the note is folded. This parameter can be set
-       to <literal>comment</literal>, <literal>insert</literal>,
-       <literal>note</literal>, <literal>paragraph</literal>,
-       <literal>newparagraph</literal>, <literal>key</literal>, or
-       <literal>help</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>open</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>open</parameter> is unequal to zero the note will
-       be shown unfolded after opening the document with a pdf viewer.
-      </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>ps_add_pdflink</function></member>
-    <member><function>ps_add_launchlink</function></member>
-    <member><function>ps_add_locallink</function></member>
-    <member><function>ps_add_weblink</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/ps/functions/ps-add-pdflink.xml b/reference/ps/functions/ps-add-pdflink.xml
deleted file mode 100644
index c5243bf37a5c..000000000000
--- a/reference/ps/functions/ps-add-pdflink.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-pdflink" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_add_pdflink</refname>
-  <refpurpose>Adds link to a page in a second pdf document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_add_pdflink</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>llx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lly</parameter></methodparam>
-   <methodparam><type>float</type><parameter>urx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ury</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>page</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a hyperlink at the given position pointing to a second pdf document.
-   Clicking on the link will branch to the document at the given page. The
-   first page in a document has number 1.
-  </para>
-  <para>
-   The hyperlink's source position is a rectangle with its lower left corner at
-   (<parameter>llx</parameter>, <parameter>lly</parameter>) and its upper
-   right corner at (<parameter>urx</parameter>, <parameter>ury</parameter>).
-   The rectangle has by default a thin blue border.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>llx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lly</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>urx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ury</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The name of the pdf document to be opened when clicking on
-       this link.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>page</parameter></term>
-     <listitem>
-      <para>
-       The page number of the destination pdf document
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>dest</parameter> determines how the document
-       is being viewed. It can be <literal>fitpage</literal>,
-       <literal>fitwidth</literal>, <literal>fitheight</literal>, or
-       <literal>fitbbox</literal>.
-      </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>ps_add_launchlink</function></member>
-    <member><function>ps_add_locallink</function></member>
-    <member><function>ps_add_weblink</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/ps/functions/ps-add-weblink.xml b/reference/ps/functions/ps-add-weblink.xml
deleted file mode 100644
index 16078990f7ba..000000000000
--- a/reference/ps/functions/ps-add-weblink.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-add-weblink" xmlns="http://docbook.org/ns/docbook">
-  <refnamediv>
-  <refname>ps_add_weblink</refname>
-  <refpurpose>Adds link to a web location</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_add_weblink</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>llx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>lly</parameter></methodparam>
-   <methodparam><type>float</type><parameter>urx</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ury</parameter></methodparam>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a hyperlink at the given position pointing to a web page. The 
-   hyperlink's source position is a rectangle with its lower left corner at
-   (<parameter>llx</parameter>, <parameter>lly</parameter>) and
-   its upper right corner at (<parameter>urx</parameter>,
-   <parameter>ury</parameter>). The rectangle has by default a thin
-   blue border.
-  </para>
-  &ps.note.visible;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>llx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lly</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the lower left corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>urx</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ury</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the upper right corner.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>url</parameter></term>
-     <listitem>
-      <para>
-       The url of the hyperlink to be opened when clicking on
-       this link, e.g. <literal>http://www.php.net</literal>.
-      </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>ps_add_launchlink</function></member>
-    <member><function>ps_add_locallink</function></member>
-    <member><function>ps_add_pdflink</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/ps/functions/ps-arc.xml b/reference/ps/functions/ps-arc.xml
deleted file mode 100644
index 0d0bc013af1e..000000000000
--- a/reference/ps/functions/ps-arc.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-arc" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_arc</refname>
-  <refpurpose>Draws an arc counterclockwise</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_arc</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>beta</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Draws a portion of a circle with at middle point at
-   (<parameter>x</parameter>, <parameter>y</parameter>). The arc starts at an
-   angle of <parameter>alpha</parameter> and ends at an angle of
-   <parameter>beta</parameter>. It is drawn counterclockwise (use
-   <function>ps_arcn</function> to draw clockwise). The subpath added
-   to the current path starts on the arc at angle <parameter>alpha</parameter>
-   and ends on the arc at angle <parameter>beta</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the circle 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       The start angle given in degrees.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>beta</parameter></term>
-     <listitem>
-      <para>
-       The end angle given in degrees.
-      </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>ps_arcn</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/ps/functions/ps-arcn.xml b/reference/ps/functions/ps-arcn.xml
deleted file mode 100644
index 0a6e8346713f..000000000000
--- a/reference/ps/functions/ps-arcn.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-arcn" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_arcn</refname>
-  <refpurpose>Draws an arc clockwise</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_arcn</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>alpha</parameter></methodparam>
-   <methodparam><type>float</type><parameter>beta</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Draws a portion of a circle with at middle point at
-   (<parameter>x</parameter>, <parameter>y</parameter>). The arc starts at an
-   angle of <parameter>alpha</parameter> and ends at an angle of
-   <parameter>beta</parameter>. It is drawn clockwise (use
-   <function>ps_arc</function> to draw counterclockwise). The subpath added to
-   the current path starts on the arc at angle <parameter>beta</parameter> and
-   ends on the arc at angle <parameter>alpha</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the circle 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>alpha</parameter></term>
-     <listitem>
-      <para>
-       The starting angle given in degrees.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>beta</parameter></term>
-     <listitem>
-      <para>
-       The end angle given in degrees.
-      </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>ps_arc</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/ps/functions/ps-begin-page.xml b/reference/ps/functions/ps-begin-page.xml
deleted file mode 100644
index 084c18edf18d..000000000000
--- a/reference/ps/functions/ps-begin-page.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-begin-page" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_begin_page</refname>
-  <refpurpose>Start a new page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_begin_page</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Starts a new page. Although the parameters <parameter>width</parameter>
-   and <parameter>height</parameter> imply a different page size for each
-   page, this is not possible in PostScript. The first call of
-   <function>ps_begin_page</function> will set the page size for the whole
-   document. Consecutive calls will have no effect, except for creating a new
-   page. The situation is different if you intent to convert the PostScript
-   document into PDF. This function places pdfmarks into the document which
-   can set the size for each page indiviually. The resulting PDF document will
-   have different page sizes.
-  </para>
-  <para>
-   Though PostScript does not know different page sizes, pslib places
-   a bounding box for each page into the document. This size is evaluated
-   by some PostScript viewers and will have precedence over the BoundingBox
-   in the Header of the document. This can lead to unexpected results when
-   you set a BoundingBox whose lower left corner is not (0, 0), because the
-   bounding box of the page will always have a lower left corner (0, 0)
-   and overwrites the global setting.
-  </para>
-  <para>
-   Each page is encapsulated into save/restore. This means, that most of the
-   settings made on one page will not be retained on the next page.
-  </para>
-  <para>
-   If there is up to the first call of <function>ps_begin_page</function> no
-   call of <function>ps_findfont</function>, then the header of the PostScript
-   document will be output and the bounding box will be set to the size of
-   the first page. The lower left corner of the bounding box is set to (0, 0).
-   If <function>ps_findfont</function> was called before, then the
-   header has been output already, and the document will not have a valid
-   bounding box. In order to prevent this, one should call
-   <function>ps_set_info</function> to set the info field
-   <literal>BoundingBox</literal> and possibly <literal>Orientation</literal>
-   before any <function>ps_findfont</function> or
-   <function>ps_begin_page</function> calls.
-  </para>
-  <note>
-   <para>
-    Up to version 0.2.6 of pslib, this function will always overwrite
-    the BoundingBox and Orientation, if it has been set before with
-    <function>ps_set_info</function> and <function>ps_findfont</function>
-    has not been called before.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the page in pixel, e.g. 596 for A4 format.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the page in pixel, e.g. 842 for A4 format.
-      </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>ps_end_page</function></member>
-    <member><function>ps_findfont</function></member>
-    <member><function>ps_set_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/ps/functions/ps-begin-pattern.xml b/reference/ps/functions/ps-begin-pattern.xml
deleted file mode 100644
index fe9c63352243..000000000000
--- a/reference/ps/functions/ps-begin-pattern.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-begin-pattern" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_begin_pattern</refname>
-  <refpurpose>Start a new pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>ps_begin_pattern</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xstep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ystep</parameter></methodparam>
-   <methodparam><type>int</type><parameter>painttype</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Starts a new pattern. A pattern is like a page containing e.g. a drawing
-   which can be used for filling areas. It is used like a color by calling
-   <function>ps_setcolor</function> and setting the color space to
-   <literal>pattern</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the pattern in pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the pattern in pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xstep</parameter></term>
-     <listitem>
-      <para>
-       The distance in pixel of placements of the pattern in
-       horizontal direction.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ystep</parameter></term>
-     <listitem>
-      <para>
-       The distance in pixel of placements of the pattern in
-       vertical direction.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>painttype</parameter></term>
-     <listitem>
-      <para>
-       Must be 1 or 2.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The identifier of the pattern &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating and using a pattern</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-
-if (!ps_open_file($ps, "pattern.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_parameter($ps, "warning", "true");
-ps_set_info($ps, "Creator", "pattern.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Pattern example");
-
-
-$pspattern = ps_begin_pattern($ps, 10.0, 10.0, 10.0, 10.0, 1);
-ps_setlinewidth($ps, 0.2);
-ps_setcolor($ps, "stroke", "rgb", 0.0, 0.0, 1.0, 0.0);
-ps_moveto($ps, 0, 0);
-ps_lineto($ps, 7, 7);
-ps_stroke($ps);
-ps_moveto($ps, 0, 7);
-ps_lineto($ps, 7, 0);
-ps_stroke($ps);
-ps_end_pattern($ps);
-
-ps_begin_page($ps, 596, 842);
-ps_setcolor($ps, "both", "pattern", $pspattern, 0.0, 0.0, 0.0);
-ps_rect($ps, 50, 400, 200, 200);
-ps_fill($ps);
-ps_end_page($ps);
-
-ps_close($ps);
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_end_pattern</function></member>
-    <member><function>ps_setcolor</function></member>
-    <member><function>ps_shading_pattern</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/ps/functions/ps-begin-template.xml b/reference/ps/functions/ps-begin-template.xml
deleted file mode 100644
index b131a6767321..000000000000
--- a/reference/ps/functions/ps-begin-template.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-begin-template" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_begin_template</refname>
-   <refpurpose>Start a new template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_begin_template</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Starts a new template. A template is called a form in the postscript
-   language. It is created similar to a pattern but used like an image.
-   Templates are often used for drawings which are placed several times
-   through out the document, e.g. like a company logo. All drawing functions
-   may be used within a template. The template will not be drawn until
-   it is placed by <function>ps_place_image</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the template in pixel.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the template in pixel.
-      </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 and using a template</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-
-if (!ps_open_file($ps, "template.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_parameter($ps, "warning", "true");
-ps_set_info($ps, "Creator", "template.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Template example");
-
-$pstemplate = ps_begin_template($ps, 30.0, 30.0);
-ps_moveto($ps, 0, 0);
-ps_lineto($ps, 30, 30);
-ps_moveto($ps, 0, 30);
-ps_lineto($ps, 30, 0);
-ps_stroke($ps);
-ps_end_template($ps);
-
-ps_begin_page($ps, 596, 842);
-ps_place_image($ps, $pstemplate, 20.0, 20.0, 1.0);
-ps_place_image($ps, $pstemplate, 50.0, 30.0, 0.5);
-ps_place_image($ps, $pstemplate, 70.0, 70.0, 0.6);
-ps_place_image($ps, $pstemplate, 30.0, 50.0, 1.3);
-ps_end_page($ps);
-
-ps_close($ps);
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_end_template</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/ps/functions/ps-circle.xml b/reference/ps/functions/ps-circle.xml
deleted file mode 100644
index 530ba9a240a2..000000000000
--- a/reference/ps/functions/ps-circle.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-circle" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_circle</refname>
-  <refpurpose>Draws a circle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_circle</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Draws a circle with its middle point at (<parameter>x</parameter>,
-   <parameter>y</parameter>). The circle starts and ends at position
-   (<parameter>x</parameter>+<parameter>radius</parameter>,
-   <parameter>y</parameter>). If this function is called outside a path it
-   will start a new path. If it is called within a path it will add the circle
-   as a subpath. If the last drawing operation does not end in point
-   (<parameter>x</parameter>+<parameter>radius</parameter>,
-   <parameter>y</parameter>) then there will be a gap in the path.
-   </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       The x-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       The y-coordinate of the circle's middle point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>radius</parameter></term>
-     <listitem>
-      <para>
-       The radius of the circle 
-      </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>ps_arc</function></member>
-    <member><function>ps_arcn</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/ps/functions/ps-clip.xml b/reference/ps/functions/ps-clip.xml
deleted file mode 100644
index 5d293e96db11..000000000000
--- a/reference/ps/functions/ps-clip.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-clip" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_clip</refname>
-  <refpurpose>Clips drawing to current path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_clip</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Takes the current path and uses it to define the border of a clipping area.
-   Everything drawn outside of that area will not be visible.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_closepath</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/ps/functions/ps-close-image.xml b/reference/ps/functions/ps-close-image.xml
deleted file mode 100644
index 608452b68383..000000000000
--- a/reference/ps/functions/ps-close-image.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-close-image" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_close_image</refname>
-  <refpurpose>Closes image and frees memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>void</type><type>false</type></type><methodname>ps_close_image</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>imageid</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes an image and frees its resources. Once an image is closed
-   it cannot be used anymore.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>imageid</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the image as returned by
-       <function>ps_open_image</function> or
-       <function>ps_open_image_file</function>.
-      </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>
-   <simplelist>
-    <member><function>ps_open_image</function></member>
-    <member><function>ps_open_image_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/ps/functions/ps-close.xml b/reference/ps/functions/ps-close.xml
deleted file mode 100644
index b9d02100786c..000000000000
--- a/reference/ps/functions/ps-close.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_close</refname>
-  <refpurpose>Closes a PostScript document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_close</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes the PostScript document.
-  </para>
-  <para>
-   This function writes the trailer of the PostScript document.
-   It also writes the bookmark tree. <function>ps_close</function> does
-   not free any resources, which is done by <function>ps_delete</function>.
-  </para>
-  <para>
-   This function is also called by <function>ps_delete</function> if it
-   has not been called before.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_open_file</function></member>
-    <member><function>ps_delete</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/ps/functions/ps-closepath-stroke.xml b/reference/ps/functions/ps-closepath-stroke.xml
deleted file mode 100644
index 19d9c632222e..000000000000
--- a/reference/ps/functions/ps-closepath-stroke.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-closepath-stroke" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_closepath_stroke</refname>
-  <refpurpose>Closes and strokes path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_closepath_stroke</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects the last point with first point of a path and draws the resulting
-   closed line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_closepath</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/ps/functions/ps-closepath.xml b/reference/ps/functions/ps-closepath.xml
deleted file mode 100644
index b3638daa344b..000000000000
--- a/reference/ps/functions/ps-closepath.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-closepath" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_closepath</refname>
-  <refpurpose>Closes path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_closepath</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Connects the last point with the first point of a path. The resulting
-   path can be used for stroking, filling, clipping, etc..
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_clip</function></member>
-    <member><function>ps_closepath_stroke</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/ps/functions/ps-continue-text.xml b/reference/ps/functions/ps-continue-text.xml
deleted file mode 100644
index 2bf1aded0d62..000000000000
--- a/reference/ps/functions/ps-continue-text.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-continue-text" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_continue_text</refname>
-  <refpurpose>Continue text in next line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_continue_text</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Output a text one line below the last line. The line spacing is
-   taken from the value "leading" which must be set with
-   <function>ps_set_value</function>. The actual position of the
-   text is determined by the values "textx" and "texty" which can be requested
-   with <function>ps_get_value</function>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to output.
-      </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>ps_show</function></member>
-    <member><function>ps_show_xy</function></member>
-    <member><function>ps_show_boxed</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/ps/functions/ps-curveto.xml b/reference/ps/functions/ps-curveto.xml
deleted file mode 100644
index 453127f2702e..000000000000
--- a/reference/ps/functions/ps-curveto.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-curveto" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_curveto</refname>
-  <refpurpose>Draws a curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_curveto</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x3</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y3</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Add a section of a cubic Bézier curve described by the three given control
-   points to the current path.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x1</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of first control point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y1</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of first control point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x2</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of second control point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y2</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of second control point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x3</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of third control point.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y3</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of third control point.
-      </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>ps_lineto</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/ps/functions/ps-delete.xml b/reference/ps/functions/ps-delete.xml
deleted file mode 100644
index 40ec9eefcd74..000000000000
--- a/reference/ps/functions/ps-delete.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-delete" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_delete</refname>
-  <refpurpose>Deletes all resources of a PostScript document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_delete</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Mainly frees memory used by the document. Also closes a file, if it was not
-   closed before with <function>ps_close</function>. You should in any case
-   close the file with <function>ps_close</function> before, because
-   <function>ps_close</function> not just closes the file but also outputs a
-   trailor containing PostScript comments like the number of pages in the
-   document and adding the bookmark hierarchy.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_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/ps/functions/ps-end-page.xml b/reference/ps/functions/ps-end-page.xml
deleted file mode 100644
index 496fc9dc6e4c..000000000000
--- a/reference/ps/functions/ps-end-page.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-end-page" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_end_page</refname>
-  <refpurpose>End a page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_end_page</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Ends a page which was started with <function>ps_begin_page</function>.
-   Ending a page will leave the current drawing context, which e.g. requires
-   to reload fonts if they were loading within the page, and to set many
-   other drawing parameters like the line width, or color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_begin_page</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/ps/functions/ps-end-pattern.xml b/reference/ps/functions/ps-end-pattern.xml
deleted file mode 100644
index 6ee2ab204205..000000000000
--- a/reference/ps/functions/ps-end-pattern.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-end-pattern" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_end_pattern</refname>
-  <refpurpose>End a pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_end_pattern</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Ends a pattern which was started with <function>ps_begin_pattern</function>.
-   Once a pattern has been ended, it can be used like a color to fill
-   areas.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_begin_pattern</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/ps/functions/ps-end-template.xml b/reference/ps/functions/ps-end-template.xml
deleted file mode 100644
index 72fadedca6b7..000000000000
--- a/reference/ps/functions/ps-end-template.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-end-template" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_end_template</refname>
-  <refpurpose>End a template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_end_template</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Ends a template which was started with <function>ps_begin_template</function>.
-   Once a template has been ended, it can be used like an image.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_begin_template</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/ps/functions/ps-fill-stroke.xml b/reference/ps/functions/ps-fill-stroke.xml
deleted file mode 100644
index c81d44da87d8..000000000000
--- a/reference/ps/functions/ps-fill-stroke.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-fill-stroke" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_fill_stroke</refname>
-  <refpurpose>Fills and strokes the current path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_fill_stroke</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>   
-  </methodsynopsis>
-  <para>
-   Fills and draws the path constructed with previously called drawing
-   functions like <function>ps_lineto</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_fill</function></member>
-    <member><function>ps_stroke</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/ps/functions/ps-fill.xml b/reference/ps/functions/ps-fill.xml
deleted file mode 100644
index b263334d975c..000000000000
--- a/reference/ps/functions/ps-fill.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-fill" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_fill</refname>
-  <refpurpose>Fills the current path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_fill</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fills the path constructed with previously called drawing functions like
-   <function>ps_lineto</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_fill_stroke</function></member>
-    <member><function>ps_stroke</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/ps/functions/ps-findfont.xml b/reference/ps/functions/ps-findfont.xml
deleted file mode 100644
index 288334c5bb07..000000000000
--- a/reference/ps/functions/ps-findfont.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-findfont" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_findfont</refname>
-  <refpurpose>Loads a font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_findfont</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fontname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>encoding</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>embed</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Loads a font for later use. Before text is output with a loaded font it
-   must be set with <function>ps_setfont</function>. This function needs the
-   adobe font metric file in order to calculate the space used up by the
-   characters. A font which is loaded within a page will only be available on
-   that page. Fonts which are to be used in the complete document have to be
-   loaded before the first call of <function>ps_begin_page</function>. Calling
-   <function>ps_findfont</function> between pages will make that font
-   available for all following pages.
-  </para>
-  <para>
-   The name of the afm file must be
-   <parameter>fontname</parameter><literal>.afm</literal>. If the font
-   shall be embedded the file
-   <parameter>fontname</parameter><literal>.pfb</literal> containing
-   the font outline must be present as well.
-  </para>
-  <para>
-   Calling <function>ps_findfont</function> before the first page requires
-   to output the postscript header which includes the BoundingBox for
-   the whole document. Usually the BoundingBox is set with the first call
-   of <function>ps_begin_page</function> which now comes after
-   <function>ps_findfont</function>. Consequently the BoundingBox has not
-   been set and a warning will be issued when <function>ps_findfont</function>
-   is called. In order to prevent this situation, one should call
-   <function>ps_set_parameter</function> to set the BoundingBox before
-   <function>ps_findfont</function> is called.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontname</parameter></term>
-     <listitem>
-      <para>
-       The name of the font.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       <function>ps_findfont</function> will try to load the file passed in
-       the parameter <parameter>encoding</parameter>. Encoding files are of
-       the same syntax as those used by <command>dvips(1)</command>. They
-       contain a font encoding vector (which is currently not used but must be
-       present) and a list of extra ligatures to extend the list of ligatures
-       derived from the afm file.
-      </para>
-      <para>
-       <parameter>encoding</parameter> can be &null; or the empty string if
-       the default encoding (TeXBase1) shall be used.
-      </para>
-      <para>
-       If the encoding is set to <literal>builtin</literal> then there
-       will be no reencoding and the font specific encoding will be used. This
-       is very useful with symbol fonts.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>embed</parameter></term>
-     <listitem>
-      <para>
-       If set to a value >0 the font will be embedded into the document. This
-       requires the font outline (.pfb file) to be present.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the identifier of the font or zero in case of an error. The
-   identifier is a positive number.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_begin_page</function></member>
-    <member><function>ps_setfont</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/ps/functions/ps-get-buffer.xml b/reference/ps/functions/ps-get-buffer.xml
deleted file mode 100644
index 1c37fb54b348..000000000000
--- a/reference/ps/functions/ps-get-buffer.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-get-buffer" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_get_buffer</refname>
-  <refpurpose>Fetches the full buffer containig the generated PS data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ps_get_buffer</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>This function is not implemented yet. It will always return an empty
-   string. The idea for a later implementation is to write the contents of
-   the postscript file into an internal buffer if in memory creation is
-   requested, and retrieve the buffer content with this function.
-   Currently, documents
-   created in memory are send to the browser without buffering.
-  </para>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_open_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/ps/functions/ps-get-parameter.xml b/reference/ps/functions/ps-get-parameter.xml
deleted file mode 100644
index 39cd9947fbaa..000000000000
--- a/reference/ps/functions/ps-get-parameter.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-get-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_get_parameter</refname>
-  <refpurpose>Gets certain parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>ps_get_parameter</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>modifier</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets several parameters which were directly set by
-   <function>ps_set_parameter</function> or indirectly by one of the other
-   functions. Parameters are by definition string
-   values. This function cannot be used to retrieve resources which were also
-   set by <function>ps_set_parameter</function>.
-  </para>
-  <para>
-   The parameter <parameter>name</parameter> can have the following values.
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><literal>fontname</literal></term>
-     <listitem>
-      <para>
-       The name of the currently active font or the font whose
-       identifier is passed in parameter <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>fontencoding</literal></term>
-     <listitem>
-      <para>
-       The encoding of the currently active font.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>dottedversion</literal></term>
-     <listitem>
-      <para>
-       The version of the underlying pslib library in the format
-       &lt;major&gt;.&lt;minor&gt;.&lt;subminor&gt;
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>scope</literal></term>
-     <listitem>
-      <para>
-       The current drawing scope. Can be object, document, null, page,
-       pattern, path, template, prolog, font, glyph.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>ligaturedisolvechar</literal></term>
-     <listitem>
-      <para>
-       The character which dissolves a ligature. If your are using a font
-       which contains the ligature `ff' and `|' is the char to dissolve the
-       ligature, then `f|f' will result in two `f' instead of the ligature `ff'.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>imageencoding</literal></term>
-     <listitem>
-      <para>
-       The encoding used for encoding images. Can be either
-       <literal>hex</literal> or <literal>85</literal>. hex encoding
-       uses two bytes in the postscript file each byte in the image.
-       85 stand for Ascii85 encoding.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>linenumbermode</literal></term>
-     <listitem>
-      <para>
-       Set to <literal>paragraph</literal> if lines are numbered
-       within a paragraph or <literal>box</literal> if they are
-       numbered within the surrounding box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>linebreak</literal></term>
-     <listitem>
-      <para>
-       Only used if text is output with <function>ps_show_boxed</function>.
-       If set to &true; a carriage return will add a line
-       break.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>parbreak</literal></term>
-     <listitem>
-      <para>
-       Only used if text is output with <function>ps_show_boxed</function>.
-       If set to &true; a carriage return will start
-       a new paragraph.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>hyphenation</literal></term>
-     <listitem>
-      <para>
-       Only used if text is output with <function>ps_show_boxed</function>.
-       If set to &true; the paragraph will be hyphenated
-       if a hypen dictionary is set and exists.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>hyphendict</literal></term>
-     <listitem>
-      <para>
-       Filename of the dictionary used for hyphenation pattern.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>modifier</parameter></term>
-     <listitem>
-      <para>
-       An identifier needed if a parameter of a resource is requested,
-       e.g. the size of an image. In such a case the resource id is
-       passed.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the parameter &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_set_parameter</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/ps/functions/ps-get-value.xml b/reference/ps/functions/ps-get-value.xml
deleted file mode 100644
index 798acdcb17ef..000000000000
--- a/reference/ps/functions/ps-get-value.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-get-value" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_get_value</refname>
-  <refpurpose>Gets certain values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>ps_get_value</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>modifier</parameter></methodparam>
-  </methodsynopsis>
-  <para>Gets several values which were set by
-   <function>ps_set_value</function>. Values are by definition float values.
-  </para>
-  <para>
-   The parameter <parameter>name</parameter> can have the following values.
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><literal>fontsize</literal></term>
-     <listitem>
-      <para>
-       The size of the currently active font or the font whose
-       identifier is passed in parameter <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>font</literal></term>
-     <listitem>
-      <para>
-       The currently active font itself.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>imagewidth</literal></term>
-     <listitem>
-      <para>
-       The width of the image whose id is passed in the parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>imageheight</literal></term>
-     <listitem>
-      <para>
-       The height of the image whose id is passed in the parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>capheight</literal></term>
-     <listitem>
-      <para>
-       The height of a capital M in the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>ascender</literal></term>
-     <listitem>
-      <para>
-       The ascender of the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>descender</literal></term>
-     <listitem>
-      <para>
-       The descender of the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>italicangle</literal></term>
-     <listitem>
-      <para>
-       The italicangle of the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>underlineposition</literal></term>
-     <listitem>
-      <para>
-       The underlineposition of the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>underlinethickness</literal></term>
-     <listitem>
-      <para>
-       The underlinethickness of the currently active font or the font
-       whose identifier is passed in parameter
-       <parameter>modifier</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>textx</literal></term>
-     <listitem>
-      <para>
-       The current x-position for text output.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>texty</literal></term>
-     <listitem>
-      <para>
-       The current y-position for text output.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>textrendering</literal></term>
-     <listitem>
-      <para>
-       The current mode for text rendering.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>textrise</literal></term>
-     <listitem>
-      <para>
-       The space by which text is risen above the base line.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>leading</literal></term>
-     <listitem>
-      <para>
-       The distance between text lines in points.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>wordspacing</literal></term>
-     <listitem>
-      <para>
-       The space between words as a multiple of the width of a space char.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>charspacing</literal></term>
-     <listitem>
-      <para>
-       The space between chars. If charspacing is != 0.0 ligatures will
-       always be dissolved.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>hyphenminchars</literal></term>
-     <listitem>
-      <para>
-       Minimum number of chars hyphenated at the end of a word.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>parindent</literal></term>
-     <listitem>
-      <para>
-       Indention of the first n line in a paragraph.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>numindentlines</literal></term>
-     <listitem>
-      <para>
-       Number of line in a paragraph to indent if parindent != 0.0.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>parskip</literal></term>
-     <listitem>
-      <para>
-       Distance between paragraphs.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>linenumberspace</literal></term>
-     <listitem>
-      <para>
-       Overall space in front of each line for the line number.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>linenumbersep</literal></term>
-     <listitem>
-      <para>
-       Space between the line and the line number.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>major</literal></term>
-     <listitem>
-      <para>
-       The major version number of pslib.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>minor</literal></term>
-     <listitem>
-      <para>
-       The minor version number of pslib.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><literal>subminor</literal>, <literal>revision</literal></term>
-     <listitem>
-      <para>
-       The subminor version number of pslib.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>modifier</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>modifier</parameter> specifies the resource
-       for which the value is to be retrieved. This can be the id of a font or
-       an image.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the parameter or &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_set_value</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/ps/functions/ps-hyphenate.xml b/reference/ps/functions/ps-hyphenate.xml
deleted file mode 100644
index 0d8fbe27d1ca..000000000000
--- a/reference/ps/functions/ps-hyphenate.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-hyphenate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_hyphenate</refname>
-  <refpurpose>Hyphenates a word</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>ps_hyphenate</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Hyphenates the passed word. <function>ps_hyphenate</function> evaluates the
-   value hyphenminchars (set by <function>ps_set_value</function>) and
-   the parameter hyphendict (set by <function>ps_set_parameter</function>).
-   hyphendict must be set before calling this function.
-  </para>
-  <para>
-   This function requires the locale category <constant>LC_CTYPE</constant> to be set properly.
-   This is done when the extension is initialized by using the environment
-   variables. On Unix systems read the man page of locale for more information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <simpara>
-       <parameter>text</parameter> should not contain any non alpha
-       characters. Possible positions for breaks are returned in an array of
-       integer numbers. Each number is the position of the char in
-       <parameter>text</parameter> after which a hyphenation can take place.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of integers indicating the position of possible breaks in
-   the text &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Hyphennate a text</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$word = "Koordinatensystem";
-$psdoc = ps_new();
-ps_set_parameter($psdoc, "hyphendict", "hyph_de.dic");
-$hyphens = ps_hyphenate($psdoc, $word);
-for($i=0; $i<strlen($word); $i++) {
-  echo $word[$i];
-  if(in_array($i, $hyphens))
-    echo "-";
-}
-ps_delete($psdoc);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Ko-ordi-na-ten-sys-tem
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <!-- <member><function>ps_boot</function></member> -->
-    <member><function>ps_show_boxed</function></member>
-    <member>locale(1)</member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/ps-include-file.xml b/reference/ps/functions/ps-include-file.xml
deleted file mode 100644
index 893a2e45f71b..000000000000
--- a/reference/ps/functions/ps-include-file.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ps-include-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_include_file</refname>
-  <refpurpose>Reads an external file with raw PostScript code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_include_file</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-      </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/ps/functions/ps-lineto.xml b/reference/ps/functions/ps-lineto.xml
deleted file mode 100644
index 4b4870db50dc..000000000000
--- a/reference/ps/functions/ps-lineto.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-lineto" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_lineto</refname>
-  <refpurpose>Draws a line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_lineto</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a straight line from the current point to the given coordinates to the
-   current path. Use <function>ps_moveto</function> to set the starting point
-   of the line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the end point of the line.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the end point of the line.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Drawing a rectangle</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-if (!ps_open_file($ps, "rectangle.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_info($ps, "Creator", "rectangle.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Lineto example");
-
-ps_begin_page($ps, 596, 842);
-ps_moveto($ps, 100, 100);
-ps_lineto($ps, 100, 200);
-ps_lineto($ps, 200, 200);
-ps_lineto($ps, 200, 100);
-ps_lineto($ps, 100, 100);
-ps_stroke($ps);
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_moveto</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/ps/functions/ps-makespotcolor.xml b/reference/ps/functions/ps-makespotcolor.xml
deleted file mode 100644
index 10bcfe6c6cb1..000000000000
--- a/reference/ps/functions/ps-makespotcolor.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-makespotcolor" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_makespotcolor</refname>
-  <refpurpose>Create spot color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_makespotcolor</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>reserved</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a spot color from the current fill color. The fill color must be
-   defined in rgb, cmyk or gray colorspace. The spot color name can be an
-   arbitrary name. A spot color can be set as any color with
-   <function>ps_setcolor</function>. When the document is not printed
-   but displayed by an postscript viewer the given color in the specified
-   color space is use.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the spot color, e.g. Pantone 5565.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The id of the new spot color or 0 in case of an error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creating and using a spot color</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-if (!ps_open_file($ps, "spotcolor.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_info($ps, "Creator", "spotcolor.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Spot color example");
-
-ps_begin_page($ps, 596, 842);
-ps_setcolor($ps, "fill", "cmyk", 0.37, 0.0, 0.34, 0.34);
-$spotcolor = ps_makespotcolor($ps, "PANTONE 5565 C", 0);
-ps_setcolor($ps, "fill", "spot", $spotcolor, 0.5, 0.0, 0.0);
-ps_moveto($ps, 100, 100);
-ps_lineto($ps, 100, 200);
-ps_lineto($ps, 200, 200);
-ps_lineto($ps, 200, 100);
-ps_lineto($ps, 100, 100);
-ps_fill($ps);
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-    <para>
-     This example creates the spot color "PANTONE 5565 C" which
-     is a darker green (olive) and fills a rectangle with 50% intensity.
-    </para>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_setcolor</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/ps/functions/ps-moveto.xml b/reference/ps/functions/ps-moveto.xml
deleted file mode 100644
index 2d92d0c74bfe..000000000000
--- a/reference/ps/functions/ps-moveto.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-moveto" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_moveto</refname>
-  <refpurpose>Sets current point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_moveto</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the current point to new coordinates. If this is the first call of
-   <function>ps_moveto</function> after a previous path has been ended then it
-   will start a new path. If this function is called in the middle of a path
-   it will just set the current point and start a subpath.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the point to move to.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the point to move to.
-      </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>ps_lineto</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/ps/functions/ps-new.xml b/reference/ps/functions/ps-new.xml
deleted file mode 100644
index 53ee4ef7ced3..000000000000
--- a/reference/ps/functions/ps-new.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-new" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_new</refname>
-  <refpurpose>Creates a new PostScript document object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ps_new</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Creates a new document instance. It does not create the file on disk or in
-   memory, it just sets up everything. <function>ps_new</function> is usually
-   followed by a call of <function>ps_open_file</function> to actually create
-   the postscript document.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Resource of PostScript document&return.falseforfailure;. The return value
-   is passed to all other functions as the first argument.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_delete</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/ps/functions/ps-open-file.xml b/reference/ps/functions/ps-open-file.xml
deleted file mode 100644
index 3faa89323da4..000000000000
--- a/reference/ps/functions/ps-open-file.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-open-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_open_file</refname>
-  <refpurpose>Opens a file for output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_open_file</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new file on disk and writes the PostScript document into it. The
-   file will be closed when <function>ps_close</function> is called.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The name of the postscript file.
-       If <parameter>filename</parameter> is not passed the document will be
-       created in memory and all output will go straight to the browser.
-      </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>ps_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/ps/functions/ps-open-image-file.xml b/reference/ps/functions/ps-open-image-file.xml
deleted file mode 100644
index 148d53dc22b8..000000000000
--- a/reference/ps/functions/ps-open-image-file.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-open-image-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_open_image_file</refname>
-  <refpurpose>Opens image from file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_open_image_file</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>stringparam</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>intparam</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Loads an image for later use.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of the image. Possible values are <literal>png</literal>,
-       <literal>jpeg</literal>, or <literal>eps</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The name of the file containing the image data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stringparam</parameter></term>
-     <listitem>
-      <para>
-       Not used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>intparam</parameter></term>
-     <listitem>
-      <para>
-       Not used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns identifier of image or zero in case of an error. The identifier is
-   a positive number greater than 0.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_open_image</function></member>
-    <member><function>ps_place_image</function></member>
-    <member><function>ps_close_image</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/ps/functions/ps-open-image.xml b/reference/ps/functions/ps-open-image.xml
deleted file mode 100644
index 685663fd78e2..000000000000
--- a/reference/ps/functions/ps-open-image.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-open-image" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_open_image</refname>
-  <refpurpose>Reads an image for later placement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_open_image</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam><type>int</type><parameter>components</parameter></methodparam>
-   <methodparam><type>int</type><parameter>bpc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-   <para>
-    Reads an image which is already available in memory. The parameter
-    <parameter>source</parameter> is currently not evaluated and assumed to be
-    <literal>memory</literal>. The image data is a sequence of pixels starting
-    in th upper left corner and ending in the lower right corner. Each pixel
-    consists of <parameter>components</parameter> color components, and each
-    component has <parameter>bpc</parameter> bits.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of the image. Possible values are <literal>png</literal>,
-       <literal>jpeg</literal>, or <literal>eps</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>source</parameter></term>
-     <listitem>
-      <para>
-       Not used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       The image data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>length</parameter></term>
-     <listitem>
-      <para>
-       The length of the image data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>components</parameter></term>
-     <listitem>
-      <para>
-       The number of components for each pixel. This can be
-       1 (gray scale images), 3 (rgb images), or 4 (cmyk, rgba images).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bpc</parameter></term>
-     <listitem>
-      <para>
-       Number of bits per component (quite often 8).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>params</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns identifier of image or zero in case of an error. The identifier is
-   a positive number greater than 0.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_open_image_file</function></member>
-    <member><function>ps_place_image</function></member>
-    <member><function>ps_close_image</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/ps/functions/ps-open-memory-image.xml b/reference/ps/functions/ps-open-memory-image.xml
deleted file mode 100644
index b7ea3fcf49b8..000000000000
--- a/reference/ps/functions/ps-open-memory-image.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ps-open-memory-image" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_open_memory_image</refname>
-  <refpurpose>Takes an GD image and returns an image for placement in a PS document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_open_memory_image</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>gd</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>gd</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/ps/functions/ps-place-image.xml b/reference/ps/functions/ps-place-image.xml
deleted file mode 100644
index dd4ed8d32808..000000000000
--- a/reference/ps/functions/ps-place-image.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-place-image" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_place_image</refname>
-  <refpurpose>Places image on the page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_place_image</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>imageid</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>scale</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Places a formerly loaded image on the page. The image can be scaled.
-   If the image shall be rotated as well, you will have to rotate the
-   coordinate system before with <function>ps_rotate</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>imageid</parameter></term>
-     <listitem>
-      <para>
-       The resource identifier of the image as returned by 
-       <function>ps_open_image</function> or
-       <function>ps_open_image_file</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the lower left corner of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the lower left corner of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <para>
-       The scaling factor for the image. A scale of 1.0 will result
-       in a resolution of 72 dpi, because each pixel is equivalent to
-       1 point.
-      </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>ps_open_image</function></member>
-    <member><function>ps_open_image_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/ps/functions/ps-rect.xml b/reference/ps/functions/ps-rect.xml
deleted file mode 100644
index fa2f81e7c757..000000000000
--- a/reference/ps/functions/ps-rect.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-rect" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_rect</refname>
-  <refpurpose>Draws a rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_rect</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Draws a rectangle with its lower left corner at (<parameter>x</parameter>,
-   <parameter>y</parameter>). The rectangle starts and ends in its lower left
-   corner. If this function is called outside a path it will start a new path.
-   If it is called within a path it will add the rectangle as a subpath. If
-   the last drawing operation does not end in the lower left corner then there
-   will be a gap in the path.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the lower left corner of the rectangle.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the lower left corner of the rectangle.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of the image.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       The height of the image.
-      </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>ps_arc</function></member>
-    <member><function>ps_circle</function></member>
-    <member><function>ps_lineto</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/ps/functions/ps-restore.xml b/reference/ps/functions/ps-restore.xml
deleted file mode 100644
index 590e3d2dfe93..000000000000
--- a/reference/ps/functions/ps-restore.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-restore" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_restore</refname>
-  <refpurpose>Restore previously save context</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_restore</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Restores a previously saved graphics context. Any call of
-   <function>ps_save</function> must be accompanied by a call to
-   <function>ps_restore</function>. All coordinate transformations, line
-   style settings, color settings, etc. are being restored to the state
-   before the call of <function>ps_save</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_save</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/ps/functions/ps-rotate.xml b/reference/ps/functions/ps-rotate.xml
deleted file mode 100644
index 6d954e21aa2c..000000000000
--- a/reference/ps/functions/ps-rotate.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-rotate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_rotate</refname>
-  <refpurpose>Sets rotation factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_rotate</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>rot</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the rotation of the coordinate system.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>rot</parameter></term>
-     <listitem>
-      <para>
-       Angle of rotation in degree.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Rotation of the coordinate system</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function rectangle($ps) {
-    ps_moveto($ps, 0, 0);
-    ps_lineto($ps, 0, 50);
-    ps_lineto($ps, 50, 50);
-    ps_lineto($ps, 50, 0);
-    ps_lineto($ps, 0, 0);
-    ps_stroke($ps);
-}
-
-$ps = ps_new();
-if (!ps_open_file($ps, "rotation.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_info($ps, "Creator", "rotation.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Rotation example");
-ps_set_info($ps, "BoundingBox", "0 0 596 842");
-
-$psfont = ps_findfont($ps, "Helvetica", "", 0);
-
-ps_begin_page($ps, 596, 842);
-ps_set_text_pos($ps, 100, 100);
-ps_save($ps);
-ps_translate($ps, 100, 100);
-ps_rotate($ps, 45);
-rectangle($ps);
-ps_restore($ps);
-ps_setfont($ps, $psfont, 8.0);
-ps_show($ps, "Text without rotation");
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-    <para>
-     The above example illustrates a very common way of rotating a
-     graphic (in this case just a rectangle) by simply rotating the
-     coordinate system. Since the graphic's coordinate system assumes
-     (0,0) to be the origin, the page coordinate system is also translated
-     to place the graphics not on the edge of the page. Pay attention
-     to the order of <function>ps_translate</function> and
-     <function>ps_rotate</function>.  In the above case the rectancle is
-     rotated around the point (100, 100) in the untranslated coordinate
-     system. Switching the two statements has a completely
-     different result.
-    </para>
-    <para>
-     In order to output the following text at the original position, all
-     modifications of the coordinate system are encapsulated in
-     <function>ps_save</function> and <function>ps_restore</function>.
-    </para>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_scale</function></member>
-    <member><function>ps_translate</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/ps/functions/ps-save.xml b/reference/ps/functions/ps-save.xml
deleted file mode 100644
index f9f170d845d6..000000000000
--- a/reference/ps/functions/ps-save.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-save" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_save</refname>
-  <refpurpose>Save current context</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_save</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Saves the current graphics context, containing colors, translation and
-   rotation settings and some more. A saved context can be restored with
-   <function>ps_restore</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_restore</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/ps/functions/ps-scale.xml b/reference/ps/functions/ps-scale.xml
deleted file mode 100644
index 5f7bfdb1d42e..000000000000
--- a/reference/ps/functions/ps-scale.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-scale" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_scale</refname>
-  <refpurpose>Sets scaling factor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_scale</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets horizontal and vertical scaling of the coordinate system.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       Scaling factor in horizontal direction.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       Scaling factor in vertical direction.
-      </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>ps_rotate</function></member>
-    <member><function>ps_translate</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/ps/functions/ps-set-border-color.xml b/reference/ps/functions/ps-set-border-color.xml
deleted file mode 100644
index 9bfc127ef2f9..000000000000
--- a/reference/ps/functions/ps-set-border-color.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-border-color" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_border_color</refname>
-  <refpurpose>Sets color of border for annotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_border_color</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>red</parameter></methodparam>
-   <methodparam><type>float</type><parameter>green</parameter></methodparam>
-   <methodparam><type>float</type><parameter>blue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Links added with one of the functions <function>ps_add_weblink</function>,
-   <function>ps_add_pdflink</function>, etc. will be displayed with a
-   surounded rectangle when the postscript document is converted to
-   pdf and viewed in a pdf viewer. This rectangle is not visible in
-   the postscript document.
-   This function sets the color of the rectangle's border line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>red</parameter></term>
-     <listitem>
-      <para>
-       The red component of the border color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>green</parameter></term>
-     <listitem>
-      <para>
-       The green component of the border color.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>blue</parameter></term>
-     <listitem>
-      <para>
-       The blue component of the border color.
-      </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>ps_set_border_dash</function></member>
-    <member><function>ps_set_border_style</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/ps/functions/ps-set-border-dash.xml b/reference/ps/functions/ps-set-border-dash.xml
deleted file mode 100644
index 5d0d7eae9206..000000000000
--- a/reference/ps/functions/ps-set-border-dash.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-border-dash" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_border_dash</refname>
-  <refpurpose>Sets length of dashes for border of annotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_border_dash</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>black</parameter></methodparam>
-   <methodparam><type>float</type><parameter>white</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Links added with one of the functions <function>ps_add_weblink</function>,
-   <function>ps_add_pdflink</function>, etc. will be displayed with a
-   surounded rectangle when the postscript document is converted to
-   pdf and viewed in a pdf viewer. This rectangle is not visible in
-   the postscript document.
-   This function sets the length of the black and white portion of a
-   dashed border line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>black</parameter></term>
-     <listitem>
-      <para>
-       The length of the dash.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>white</parameter></term>
-     <listitem>
-      <para>
-       The length of the gap between dashes.
-      </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>ps_set_border_color</function></member>
-    <member><function>ps_set_border_style</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/ps/functions/ps-set-border-style.xml b/reference/ps/functions/ps-set-border-style.xml
deleted file mode 100644
index e1c439a6edf1..000000000000
--- a/reference/ps/functions/ps-set-border-style.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-border-style" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_border_style</refname>
-  <refpurpose>Sets border style of annotations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_border_style</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>style</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Links added with one of the functions <function>ps_add_weblink</function>,
-   <function>ps_add_pdflink</function>, etc. will be displayed with a
-   surounded rectangle when the postscript document is converted to
-   pdf and viewed in a pdf viewer. This rectangle is not visible in
-   the postscript document.
-   This function sets the appearance and width of the border line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>style</parameter></term>
-     <listitem>
-      <para>
-       <parameter>style</parameter> can be <literal>solid</literal> or
-       <literal>dashed</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The line width of the border. 
-      </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>ps_set_border_color</function></member>
-    <member><function>ps_set_border_dash</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/ps/functions/ps-set-info.xml b/reference/ps/functions/ps-set-info.xml
deleted file mode 100644
index b00cf190998f..000000000000
--- a/reference/ps/functions/ps-set-info.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_info</refname>
-  <refpurpose>Sets information fields of document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_info</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets certain information fields of the document. This fields will be shown
-   as a comment in the header of the PostScript file. If the document is
-   converted to pdf this fields will also be used for the document
-   information.
-  </para>
-  <para>
-   The <literal>BoundingBox</literal> is usually set to the value given to the
-   first page. This only works if <function>ps_findfont</function> has not
-   been called before. In such cases the BoundingBox would be left unset
-   unless you set it explicitly with this function.
-  </para>
-  <para>
-   This function will have no effect anymore when the header of the postscript
-   file has been already written. It must be called before the first page
-   or the first call of <function>ps_findfont</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The name of the information field to set. The values which can be
-       set are <literal>Keywords</literal>, <literal>Subject</literal>,
-       <literal>Title</literal>, <literal>Creator</literal>,
-       <literal>Author</literal>, <literal>BoundingBox</literal>, and
-       <literal>Orientation</literal>. Be aware that some of them has a
-       meaning to PostScript viewers.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the information field. The field
-       <literal>Orientation</literal> can be set to either
-       <literal>Portrait</literal> or <literal>Landscape</literal>. The
-       <literal>BoundingBox</literal> is a string consisting of four numbers.
-       The first two numbers are the coordinates of the lower left corner of
-       the page. The last two numbers are the coordinates of the upper
-       right corner.
-      </para>
-      <note>
-       <para>
-        Up to version 0.2.6 of pslib, the BoundingBox and Orientation
-        will be overwritten by <function>ps_begin_page</function>,
-        unless <function>ps_findfont</function> has been called before.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_findfont</function></member>
-    <member><function>ps_begin_page</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/ps/functions/ps-set-parameter.xml b/reference/ps/functions/ps-set-parameter.xml
deleted file mode 100644
index dd263eb897e2..000000000000
--- a/reference/ps/functions/ps-set-parameter.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_parameter</refname>
-  <refpurpose>Sets certain parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_parameter</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets several parameters which are used by many functions. Parameters are by
-   definition string values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       For a list of possible names see <function>ps_get_parameter</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the parameter.
-      </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>ps_get_parameters</function></member>
-    <member><function>ps_set_value</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/ps/functions/ps-set-text-pos.xml b/reference/ps/functions/ps-set-text-pos.xml
deleted file mode 100644
index dd42dd48f27c..000000000000
--- a/reference/ps/functions/ps-set-text-pos.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-text-pos" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_text_pos</refname>
-  <refpurpose>Sets position for text output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_text_pos</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the position for the next text output. You may alternatively set the x
-   and y value separately by calling <function>ps_set_value</function> and
-   choosing <literal>textx</literal> respectively <literal>texty</literal> as
-   the value name.
-  </para>
-  <para>
-   If you want to output text at a certain position it is more convenient
-   to use <function>ps_show_xy</function> instead of setting the text position
-   and calling <function>ps_show</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the new text position.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the new text position.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Placing text at a given position</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-if (!ps_open_file($ps, "text.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_info($ps, "Creator", "rectangle.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Text placement example");
-
-ps_begin_page($ps, 596, 842);
-$psfont = ps_findfont($ps, "Helvetica", "", 0);
-ps_setfont($ps, $psfont, 8.0);
-ps_show_xy($ps, "Some text at (100, 100)", 100, 100);
-
-ps_set_value($ps, "textx", 100);
-ps_set_value($ps, "texty", 120);
-ps_show($ps, "Some text at (100, 120)");
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_set_value</function></member>
-    <member><function>ps_show</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/ps/functions/ps-set-value.xml b/reference/ps/functions/ps-set-value.xml
deleted file mode 100644
index be58ad777cfa..000000000000
--- a/reference/ps/functions/ps-set-value.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-set-value" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_set_value</refname>
-  <refpurpose>Sets certain values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_set_value</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets several values which are used by many functions. Parameters are by
-   definition float values.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>name</parameter> can be one of the following:
-       <variablelist>
-        <varlistentry>
-         <term>textrendering</term>
-         <listitem>
-          <para>
-           The way how text is shown.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>textx</term>
-         <listitem>
-          <para>
-           The x coordinate for text output.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>texty</term>
-         <listitem>
-          <para>
-           The y coordinate for text output.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>wordspacing</term>
-         <listitem>
-          <para>
-           The distance between words relative to the width of a space.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>leading</term>
-         <listitem>
-          <para>
-           The distance between lines in pixels.
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the parameter.
-      </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>ps_get_value</function></member>
-    <member><function>ps_set_parameter</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/ps/functions/ps-setcolor.xml b/reference/ps/functions/ps-setcolor.xml
deleted file mode 100644
index 8e4c79710816..000000000000
--- a/reference/ps/functions/ps-setcolor.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setcolor" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setcolor</refname>
-  <refpurpose>Sets current color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setcolor</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>colorspace</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c3</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c4</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the color for drawing, filling, or both.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>type</parameter> can be 
-       <literal>both</literal>, <literal>fill</literal>, or
-       <literal>fillstroke</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>colorspace</parameter></term>
-     <listitem>
-      <para>
-       The colorspace should be one of <literal>gray</literal>,
-       <literal>rgb</literal>, <literal>cmyk</literal>, 
-       <literal>spot</literal>, <literal>pattern</literal>. Depending on the
-       colorspace either only the first, the first three or all parameters
-       will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c1</parameter></term>
-     <listitem>
-      <para>
-       Depending on the colorspace this is either the red component (rgb),
-       the cyan component (cmyk), the gray value (gray), the identifier of
-       the spot color or the identifier of the pattern.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c2</parameter></term>
-     <listitem>
-      <para>
-       Depending on the colorspace this is either the green component (rgb),
-       the magenta component (cmyk).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c3</parameter></term>
-     <listitem>
-      <para>
-       Depending on the colorspace this is either the blue component (rgb),
-       the yellow component (cmyk).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c4</parameter></term>
-     <listitem>
-      <para>
-       This must only be set in cmyk colorspace and specifies the black
-       component.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <para>
-    The second parameter is currently not always evaluated. The color is
-    sometimes set for filling and drawing just as if
-    <literal>fillstroke</literal> were passed.
-   </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/ps/functions/ps-setdash.xml b/reference/ps/functions/ps-setdash.xml
deleted file mode 100644
index 09deb8103ce7..000000000000
--- a/reference/ps/functions/ps-setdash.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setdash" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setdash</refname>
-  <refpurpose>Sets appearance of a dashed line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setdash</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>on</parameter></methodparam>
-   <methodparam><type>float</type><parameter>off</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the length of the black and white portions of a dashed line.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>on</parameter></term>
-     <listitem>
-      <para>
-       The length of the dash.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>off</parameter></term>
-     <listitem>
-      <para>
-       The length of the gap between dashes.
-      </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>ps_setpolydash</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/ps/functions/ps-setflat.xml b/reference/ps/functions/ps-setflat.xml
deleted file mode 100644
index 88926dcecab9..000000000000
--- a/reference/ps/functions/ps-setflat.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setflat" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setflat</refname>
-  <refpurpose>Sets flatness</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setflat</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>value</parameter> must be between 0.2 and 1.
-      </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/ps/functions/ps-setfont.xml b/reference/ps/functions/ps-setfont.xml
deleted file mode 100644
index 5c2d452d2dc2..000000000000
--- a/reference/ps/functions/ps-setfont.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setfont" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setfont</refname>
-  <refpurpose>Sets font to use for following output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setfont</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fontid</parameter></methodparam>
-   <methodparam><type>float</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a font, which has to be loaded before with
-   <function>ps_findfont</function>. Outputting text without setting a font
-   results in an error.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontid</parameter></term>
-     <listitem>
-      <para>
-       The font identifier as returned by <function>ps_findfont</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The size of the font.
-      </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>ps_findfont</function></member>
-    <member><function>ps_set_text_pos</function> for an example.</member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/ps-setgray.xml b/reference/ps/functions/ps-setgray.xml
deleted file mode 100644
index 20e59e6d4f6c..000000000000
--- a/reference/ps/functions/ps-setgray.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setgray" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setgray</refname>
-  <refpurpose>Sets gray value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setgray</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>gray</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the gray value for all following drawing operations.
-  </para>
- </refsect1>
- 
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>gray</parameter></term>
-     <listitem>
-      <para>
-       The value must be between 0 (white) and 1 (black).
-      </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>ps_setcolor</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/ps/functions/ps-setlinecap.xml b/reference/ps/functions/ps-setlinecap.xml
deleted file mode 100644
index 4fec1ecf2c01..000000000000
--- a/reference/ps/functions/ps-setlinecap.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setlinecap" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setlinecap</refname>
-  <refpurpose>Sets appearance of line ends</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setlinecap</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets how line ends look like.
-  </para>
- </refsect1>
- 
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of line ends. Possible values are
-       <literal>PS_LINECAP_BUTT</literal>,
-       <literal>PS_LINECAP_ROUND</literal>, or
-       <literal>PS_LINECAP_SQUARED</literal>.
-      </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>ps_setlinejoin</function></member>
-    <member><function>ps_setlinewidth</function></member>
-    <member><function>ps_setmiterlimit</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/ps/functions/ps-setlinejoin.xml b/reference/ps/functions/ps-setlinejoin.xml
deleted file mode 100644
index f645a31597d0..000000000000
--- a/reference/ps/functions/ps-setlinejoin.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setlinejoin" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setlinejoin</refname>
-  <refpurpose>Sets how contected lines are joined</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setlinejoin</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets how lines are joined.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The way lines are joined. Possible values are
-       <literal>PS_LINEJOIN_MITER</literal>,
-       <literal>PS_LINEJOIN_ROUND</literal>, or
-       <literal>PS_LINEJOIN_BEVEL</literal>.
-      </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>ps_setlinecap</function></member>
-    <member><function>ps_setlinewidth</function></member>
-    <member><function>ps_setmiterlimit</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/ps/functions/ps-setlinewidth.xml b/reference/ps/functions/ps-setlinewidth.xml
deleted file mode 100644
index 1d6a667f1b7e..000000000000
--- a/reference/ps/functions/ps-setlinewidth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setlinewidth" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setlinewidth</refname>
-  <refpurpose>Sets width of a line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setlinewidth</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the line width for all following drawing operations.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       The width of lines in points.
-      </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>ps_setlinecap</function></member>
-    <member><function>ps_setlinejoin</function></member>
-    <member><function>ps_setmiterlimit</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/ps/functions/ps-setmiterlimit.xml b/reference/ps/functions/ps-setmiterlimit.xml
deleted file mode 100644
index 17fe1f6914a5..000000000000
--- a/reference/ps/functions/ps-setmiterlimit.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setmiterlimit" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setmiterlimit</refname>
-  <refpurpose>Sets the miter limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setmiterlimit</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If two lines join in a small angle and the line join is set to
-   <literal>PS_LINEJOIN_MITER</literal>, then
-   the resulting spike will be very long. The miter limit is the maximum
-   ratio of the miter length (the length of the spike) and the line width.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The maximum ratio between the miter length and the line width. Larger
-       values (&gt; 10) will result in very long spikes when two lines meet
-       in a small angle. Keep the default unless you know what you are doing.
-      </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>ps_setlinecap</function></member>
-    <member><function>ps_setlinejoin</function></member>
-    <member><function>ps_setlinewidth</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/ps/functions/ps-setoverprintmode.xml b/reference/ps/functions/ps-setoverprintmode.xml
deleted file mode 100644
index 68cc16497eea..000000000000
--- a/reference/ps/functions/ps-setoverprintmode.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ps-setoverprintmode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setoverprintmode</refname>
-  <refpurpose>Sets overprint mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setoverprintmode</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-      </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/ps/functions/ps-setpolydash.xml b/reference/ps/functions/ps-setpolydash.xml
deleted file mode 100644
index a48b24805e3d..000000000000
--- a/reference/ps/functions/ps-setpolydash.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-setpolydash" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_setpolydash</refname>
-  <refpurpose>Sets appearance of a dashed line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_setpolydash</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>arr</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the length of the black and white portions of a dashed line.
-   <function>ps_setpolydash</function> is used to set more complicated dash
-   patterns.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr</parameter></term>
-     <listitem>
-      <para>
-       <parameter>arr</parameter> is a list of length elements alternately for
-       the black and white portion.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Drawing a dashed line</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$ps = ps_new();
-if (!ps_open_file($ps, "polydash.ps")) {
-   print "Cannot open PostScript file\n";
-     exit;
-}
-
-ps_set_info($ps, "Creator", "polydash.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Poly dash example");
-
-ps_begin_page($ps, 596, 842);
-ps_setpolydash($ps, array(10, 5, 2, 5));
-ps_moveto($ps, 100, 100);
-ps_lineto($ps, 200, 200);
-ps_stroke($ps);
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-]]>
-    </programlisting>
-    <para>
-     This example draws a line with a 10 and 2 points long line, and
-     gaps of 5 points inbetween.
-    </para>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_setdash</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/ps/functions/ps-shading-pattern.xml b/reference/ps/functions/ps-shading-pattern.xml
deleted file mode 100644
index ca47ee5fd561..000000000000
--- a/reference/ps/functions/ps-shading-pattern.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-shading-pattern" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_shading_pattern</refname>
-  <refpurpose>Creates a pattern based on a shading</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>ps_shading_pattern</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>shadingid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>optlist</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a pattern based on a shading, which has to be created before with
-   <function>ps_shading</function>. Shading patterns can be used like regular
-   patterns.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>shadingid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of a shading previously created with
-       <function>ps_shading</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>optlist</parameter></term>
-     <listitem>
-      <para>
-       This argument is not currently used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The identifier of the pattern &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_shading</function></member>
-    <member><function>ps_shfill</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/ps/functions/ps-shading.xml b/reference/ps/functions/ps-shading.xml
deleted file mode 100644
index 6e611f556d88..000000000000
--- a/reference/ps/functions/ps-shading.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-shading" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_shading</refname>
-  <refpurpose>Creates a shading for later use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>ps_shading</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x0</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y0</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c1</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c2</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c3</parameter></methodparam>
-   <methodparam><type>float</type><parameter>c4</parameter></methodparam>
-   <methodparam><type>string</type><parameter>optlist</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a shading, which can be used by <function>ps_shfill</function> or
-   <function>ps_shading_pattern</function>.
-  </para>
-  <para>
-   The color of the shading can be in any color space except for
-   <literal>pattern</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The type of shading can be either <literal>radial</literal> or
-       <literal>axial</literal>. Each shading starts with the current fill
-       color and ends with the given color values passed in the parameters
-       <parameter>c1</parameter> to <parameter>c4</parameter>
-       (see <function>ps_setcolor</function> for their meaning).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x0, x1, y0, y1</parameter></term>
-     <listitem>
-      <para>
-       The coordinates <parameter>x0</parameter>, <parameter>y0</parameter>,
-       <parameter>x1</parameter>, <parameter>y1</parameter> are the start and
-       end point of the shading. If the type of shading is
-       <literal>radial</literal> the two points are the middle points of
-       a starting and ending circle.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>c1, c2, c3, c4</parameter></term>
-     <listitem>
-      <para>
-       See <function>ps_setcolor</function> for their meaning.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>optlist</parameter></term>
-     <listitem>
-      <para>
-       If the shading is of type <literal>radial</literal> the
-       <parameter>optlist</parameter> must also contain the parameters
-       <literal>r0</literal> and <literal>r1</literal> with the radius of the
-       start and end circle.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the identifier of the pattern &return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_shading_pattern</function></member>
-    <member><function>ps_shfill</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/ps/functions/ps-shfill.xml b/reference/ps/functions/ps-shfill.xml
deleted file mode 100644
index 394cdbd843d9..000000000000
--- a/reference/ps/functions/ps-shfill.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-shfill" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_shfill</refname>
-  <refpurpose>Fills an area with a shading</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_shfill</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>shadingid</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Fills an area with a shading, which has to be created before with
-   <function>ps_shading</function>. This is an alternative way to creating
-   a pattern from a shading <function>ps_shading_pattern</function> and using
-   the pattern as the filling color.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>shadingid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of a shading previously created with
-       <function>ps_shading</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>ps_shading</function></member>
-    <member><function>ps_shading_pattern</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/ps/functions/ps-show-boxed.xml b/reference/ps/functions/ps-show-boxed.xml
deleted file mode 100644
index ed7887b6969b..000000000000
--- a/reference/ps/functions/ps-show-boxed.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-show-boxed" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_show_boxed</refname>
-  <refpurpose>Output text in a box</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ps_show_boxed</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>float</type><parameter>left</parameter></methodparam>
-   <methodparam><type>float</type><parameter>bottom</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hmode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>feature</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Outputs a text in a given box. The lower left corner of the box is at
-   (<parameter>left</parameter>, <parameter>bottom</parameter>). Line breaks
-   will be inserted where needed. Multiple spaces are treated as one.
-   Tabulators are treated as spaces.
-  </para>
-  <para>
-   The text will be hyphenated if the parameter
-   <parameter>hyphenation</parameter> is set to &true;
-   and the parameter <parameter>hyphendict</parameter> contains a valid
-   filename for a hyphenation
-   file. The line spacing is taken from the value <literal>leading</literal>.
-   Paragraphs can be
-   separated by an empty line just like in TeX. If the value
-   <literal>parindent</literal> is
-   set to value &gt; 0.0 then the first n lines will be indented. The number n
-   of lines is set by the parameter <literal>numindentlines</literal>.
-   In order to prevent
-   indenting of the first m paragraphs set the value
-   <literal>parindentskip</literal> to a
-   positive number.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to be output into the given box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>left</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the lower left corner of the box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>bottom</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the lower left corner of the box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>width</parameter></term>
-     <listitem>
-      <para>
-       Width of the box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>height</parameter></term>
-     <listitem>
-      <para>
-       Height of the box.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>hmode</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>hmode</parameter> can be <literal>justify</literal>,
-       <literal>fulljustify</literal>, <literal>right</literal>, <literal>left</literal>, or <literal>center</literal>.
-       The difference of <literal>justify</literal> and <literal>fulljustify</literal> just affects the last line of the box. In
-       <literal>fulljustify</literal> mode the last line will be left and right justified unless
-       this is also the last line of paragraph. In <literal>justify</literal> mode it will always
-       be left justified.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>feature</parameter></term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
-  <refsect2>
-   <title>Used parameters</title>
-   <para>
-    The output of <function>ps_show_boxed</function> can be configured with
-    several parameters and values which must be set with either
-    <function>ps_set_parameter</function> or <function>ps_set_value</function>.
-    Beside the parameters and values which affect text output, the following
-    parameters and values are evaluated.
-    <variablelist>
-     <varlistentry>
-      <term>leading (value)</term>
-      <listitem>
-       <para>Distance between baselines of two consecutive lines.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>linebreak (parameter)</term>
-      <listitem>
-       <para>
-        Set to &true; if you want a carriage return to start a new line instead
-        of treating it as a space. Defaults to &false;.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>parbreak (parameter)</term>
-      <listitem>
-       <para>
-        Set to &true; if you want a carriage return on a single line to start a
-        new paragraph instead of treating it as a space. Defaults to &true;.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>hyphenation (parameter)</term>
-      <listitem>
-       <para>
-        Set to &true; in order to turn hyphenation on. This requires a
-        dictionary to be set with the parameter <parameter>hyphendict</parameter>. Defaults to
-        &false;.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>hyphendict (parameter)</term>
-      <listitem>
-       <para>
-        Filename of the dictionary used for hyphenation pattern (see below).
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>hyphenminchar (value)</term>
-      <listitem>
-       <para>
-        The number of chars which must at least be left over before or after
-        the hyphen. This implies that only words of at least two times this
-        value will be hyphenated. The default value is three. Setting a value
-        of zero will result in the default value.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>parindent (value)</term>
-      <listitem>
-       <para>
-        Set the amount of space in pixel for indenting the first m lines of a
-        paragraph. m can be set with the value <literal>numindentlines</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>parskip (value)</term>
-      <listitem>
-       <para>
-        Set the amount of extra space in pixel between paragraphs. Defaults to
-        <literal>0</literal> which will result in a normal line distance.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>numindentlines (value)</term>
-      <listitem>
-       <para>
-        Number of lines from the start of the paragraph which will be indented.
-        Defaults to <literal>1</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>parindentskip (value)</term>
-      <listitem>
-       <para>
-        Number of paragraphs in the box whose first lines will not be indented.
-        This defaults to <literal>0</literal>. This is useful for paragraphs right after a section
-        heading or text being continued in a second box. In both case one would
-        set this to <literal>1</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>linenumbermode (parameter)</term>
-      <listitem>
-       <para>
-        Set how lines are to be numbered. Possible values are <literal>box</literal> for
-        numbering lines in the whole box or <literal>paragraph</literal> to number lines within
-        each paragraph.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>linenumberspace (value)</term>
-      <listitem>
-       <para>
-        The space for the column left of the numbered line containing the line
-        number. The line number will be right justified into this column.
-        Defaults to <literal>20</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-     <varlistentry>
-      <term>linenumbersep (value)</term>
-      <listitem>
-       <para>
-        The space between the column with line numbers and the line itself.
-        Defaults to <literal>5</literal>.
-       </para>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-  </refsect2>
-
-  <refsect2>
-   <title>Hyphenation</title>
-   <para>
-    Text is hyphenated if the parameter <literal>hyphenation</literal> is set
-    to true and a valid hyphenation dictionary is set. pslib does not ship its own
-    hyphenation dictionary but uses one from openoffice, scribus or koffice.
-    You can find their dictionaries for different languages in one of the
-    following directories if the software is installed:
-    <simplelist>
-     <member>
-      <filename class="directory">/usr/share/apps/koffice/hyphdicts/</filename>
-     </member>
-     <member>
-      <filename class="directory">/usr/lib/scribus/dicts/</filename>
-     </member>
-     <member>
-      <filename class="directory">/usr/lib/openoffice/share/dict/ooo/</filename>
-     </member>
-    </simplelist>
-    Currently scribus appears to have the most complete hyphenation
-    dictionaries.
-   </para>
-  </refsect2>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Number of characters that could not be written.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_continue_text</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/ps/functions/ps-show-xy.xml b/reference/ps/functions/ps-show-xy.xml
deleted file mode 100644
index 2ff14292bca2..000000000000
--- a/reference/ps/functions/ps-show-xy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-show-xy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_show_xy</refname>
-  <refpurpose>Output text at given position</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_show_xy</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Output a text at the given text position.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to be output.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the lower left corner of the box surrounding the text.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the lower left corner of the box surrounding the text.
-      </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>ps_continue_text</function></member>
-    <member><function>ps_show</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/ps/functions/ps-show-xy2.xml b/reference/ps/functions/ps-show-xy2.xml
deleted file mode 100644
index a892cd85cd3e..000000000000
--- a/reference/ps/functions/ps-show-xy2.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ps-show-xy2" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_show_xy2</refname>
-  <refpurpose>Output text at position</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_show_xy2</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
-   <methodparam><type>float</type><parameter>xcoor</parameter></methodparam>
-   <methodparam><type>float</type><parameter>ycoor</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
- </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/ps/functions/ps-show.xml b/reference/ps/functions/ps-show.xml
deleted file mode 100644
index de397b263ec1..000000000000
--- a/reference/ps/functions/ps-show.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-show" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_show</refname>
-  <refpurpose>Output text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_show</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Output a text at the current text position. The text position can be set
-   by storing the x and y coordinates into the values <literal>textx</literal>
-   and <literal>texty</literal> with the function
-   <function>ps_set_value</function>. The function will issue an
-   error if a font was not set before with <function>ps_setfont</function>.
-  </para>
-  <para>
-   <function>ps_show</function> evaluates the following parameters and values
-   as set by <function>ps_set_parameter</function> and
-   <function>ps_set_value</function>.
-  </para>
-  <variablelist>
-   <varlistentry>
-    <term>charspacing (value)</term>
-    <listitem>
-     <para>
-      Distance between two consecutive glyphs. If this value is unequal to
-      zero then all ligatures will be resolved. Values less than zero are
-      allowed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>kerning (parameter)</term>
-    <listitem>
-     <para>
-      Setting this parameter to "false" will turn off kerning. Kerning is
-      turned on by default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>ligatures (parameter)</term>
-    <listitem>
-     <para>
-      Setting this parameter to "false" will turn off the use of ligatures. 
-      Ligatures are turned on by default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>underline (parameter)</term>
-    <listitem>
-     <para>
-      Setting this parameter to "true" will turn on underlining. Underlining
-      is turned off by default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>overline (parameter)</term>
-    <listitem>
-     <para>
-      Setting this parameter to "true" will turn on overlining. Overlining is
-      turned off by default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>strikeout (parameter)</term>
-    <listitem> 
-     <para>
-      Setting this parameter to "true" will turn on striking out. Striking out
-      is turned off by default.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to be output.
-      </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>ps_continue_text</function></member>
-    <member><function>ps_show_xy</function></member>
-    <member><function>ps_setfont</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/ps/functions/ps-show2.xml b/reference/ps/functions/ps-show2.xml
deleted file mode 100644
index a00dd68c00bf..000000000000
--- a/reference/ps/functions/ps-show2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ps-show2" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_show2</refname>
-  <refpurpose>Output a text at current position</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_show2</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>int</type><parameter>len</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Output text at the current position. Do not print more than <parameter>len</parameter> characters.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text to be output.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>len</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of characters to print.
-      </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/ps/functions/ps-string-geometry.xml b/reference/ps/functions/ps-string-geometry.xml
deleted file mode 100644
index f052af4a2a23..000000000000
--- a/reference/ps/functions/ps-string-geometry.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-string-geometry" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_string_geometry</refname>
-  <refpurpose>Gets geometry of a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ps_string_geometry</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fontid</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>size</parameter><initializer>0.0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function is similar to <function>ps_stringwidth</function> but returns
-   an array of dimensions containing the width, ascender, and descender
-   of the text.
-   </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text for which the geometry is to be calculated.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of the font to be used. If not font is specified
-       the current font will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The size of the font. If no size is specified the current size
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An array of the dimensions of a string. The element 'width' contains the
-   width of the string as returned by <function>ps_stringwidth</function>. The
-   element 'descender' contains the maximum descender and 'ascender' the
-   maximum ascender of the string.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_continue_text</function></member>
-    <member><function>ps_stringwidth</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/ps/functions/ps-stringwidth.xml b/reference/ps/functions/ps-stringwidth.xml
deleted file mode 100644
index 5572b113003f..000000000000
--- a/reference/ps/functions/ps-stringwidth.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev  -->
-<refentry xml:id="function.ps-stringwidth" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_stringwidth</refname>
-  <refpurpose>Gets width of a string</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>ps_stringwidth</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fontid</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>size</parameter><initializer>0.0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the width of a string in points if it was output
-   in the given font and font size.
-   This function needs an Adobe font
-   metrics file to calculate the precise width. If kerning is turned on,
-   it will be taken into account.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>text</parameter></term>
-     <listitem>
-      <para>
-       The text for which the width is to be calculated.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of the font to be used. If not font is specified
-       the current font will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The size of the font. If no size is specified the current size
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Width of a string in points.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_string_geometry</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/ps/functions/ps-stroke.xml b/reference/ps/functions/ps-stroke.xml
deleted file mode 100644
index 865b995873ec..000000000000
--- a/reference/ps/functions/ps-stroke.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-stroke" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_stroke</refname>
-  <refpurpose>Draws the current path</refpurpose>
- </refnamediv>
-
-<refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_stroke</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Draws the path constructed with previously called drawing functions like
-   <function>ps_lineto</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_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>ps_closepath_stroke</function></member>
-    <member><function>ps_fill</function></member>
-    <member><function>ps_fill_stroke</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/ps/functions/ps-symbol-name.xml b/reference/ps/functions/ps-symbol-name.xml
deleted file mode 100644
index 4807c2df2fc5..000000000000
--- a/reference/ps/functions/ps-symbol-name.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-symbol-name" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_symbol_name</refname>
-  <refpurpose>Gets name of a glyph</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ps_symbol_name</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ord</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fontid</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function needs an Adobe font metrics file to know which glyphs are
-   available.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ord</parameter></term>
-     <listitem>
-      <para>
-       The parameter <parameter>ord</parameter> is the position of the glyph
-       in the font encoding vector.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of the font to be used. If not font is specified
-       the current font will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The name of a glyph in the given font.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_symbol</function></member>
-    <member><function>ps_symbol_width</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/ps/functions/ps-symbol-width.xml b/reference/ps/functions/ps-symbol-width.xml
deleted file mode 100644
index 84872d6af29f..000000000000
--- a/reference/ps/functions/ps-symbol-width.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-symbol-width" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_symbol_width</refname>
-  <refpurpose>Gets width of a glyph</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>float</type><methodname>ps_symbol_width</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ord</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fontid</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>size</parameter><initializer>0.0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the width of a glyph in points if it was output in the given
-   font and font size.  This function needs an Adobe font metrics file to
-   calculate the precise width.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ord</parameter></term>
-     <listitem>
-      <para>
-       The position of the glyph in the font encoding vector.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fontid</parameter></term>
-     <listitem>
-      <para>
-       The identifier of the font to be used. If not font is specified
-       the current font will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The size of the font. If no size is specified the current size
-       is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The width of a glyph in points.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_symbol</function></member>
-    <member><function>ps_symbol_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/ps/functions/ps-symbol.xml b/reference/ps/functions/ps-symbol.xml
deleted file mode 100644
index 978e94dc2b8d..000000000000
--- a/reference/ps/functions/ps-symbol.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-symbol" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_symbol</refname>
-  <refpurpose>Output a glyph</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_symbol</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ord</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Output the glyph at position <parameter>ord</parameter> in the font
-   encoding vector of the current font. The font encoding for a font can be
-   set when loading the font with <function>ps_findfont</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ord</parameter></term>
-     <listitem>
-      <para>
-       The position of the glyph in the font encoding vector.
-      </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>ps_symbol_name</function></member>
-    <member><function>ps_symbol_width</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/ps/functions/ps-translate.xml b/reference/ps/functions/ps-translate.xml
deleted file mode 100644
index 5c4521bfec63..000000000000
--- a/reference/ps/functions/ps-translate.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/ps.xml, last change in rev 1.12 -->
-<refentry xml:id="function.ps-translate" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ps_translate</refname>
-  <refpurpose>Sets translation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ps_translate</methodname>
-   <methodparam><type>resource</type><parameter>psdoc</parameter></methodparam>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a new initial point of the coordinate system.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>psdoc</parameter></term>
-     <listitem>
-      <para>
-       Resource identifier of the postscript file
-       as returned by <function>ps_new</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <para>
-       x-coordinate of the origin of the translated coordinate system.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>y</parameter></term>
-     <listitem>
-      <para>
-       y-coordinate of the origin of the translated coordinate system.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Translation of the coordinate system</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function rectangle($ps) {
-    ps_moveto($ps, 0, 0);
-    ps_lineto($ps, 0, 50);
-    ps_lineto($ps, 50, 50);
-    ps_lineto($ps, 50, 0);
-    ps_lineto($ps, 0, 0);
-    ps_stroke($ps);
-}
-
-$ps = ps_new();
-if (!ps_open_file($ps, "translate.ps")) {
-  print "Cannot open PostScript file\n";
-  exit;
-}
-
-ps_set_info($ps, "Creator", "translate.php");
-ps_set_info($ps, "Author", "Uwe Steinmann");
-ps_set_info($ps, "Title", "Translated example");
-ps_set_info($ps, "BoundingBox", "0 0 596 842");
-
-$psfont = ps_findfont($ps, "Helvetica", "", 0);
-
-ps_begin_page($ps, 596, 842);
-ps_set_text_pos($ps, 100, 100);
-ps_translate($ps, 500, 750);
-rectangle($ps);
-ps_translate($ps, -500, -750);
-ps_setfont($ps, $psfont, 8.0);
-ps_show($ps, "Text at initial position");
-ps_end_page($ps);
-
-ps_begin_page($ps, 596, 842);
-ps_set_text_pos($ps, 100, 100);
-ps_save($ps);
-ps_translate($ps, 500, 750);
-rectangle($ps);
-ps_restore($ps);
-ps_setfont($ps, $psfont, 8.0);
-ps_show($ps, "Text at initial position");
-ps_end_page($ps);
-
-ps_delete($ps);
-?>
-
-]]>
-    </programlisting>
-    <para>The above example demonstrates two possible ways to place
-     a graphic (in this case just a rectangle) at any position on the page,
-     while the graphic itself uses its own coordinate system. The trick is
-     to change the origin of the current coordinate system before drawing
-     the rectangle. The translation has to be undone after the graphic has
-     been drawn.
-    </para>
-    <para>
-     On the second page a slightly different and more elegant approach is
-     applied. Instead of undoing the translation with a second call of
-     <function>ps_translate</function> the graphics context is saved before
-     modifying the coordinate system and restored after drawing the rectangle.
-    </para>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>ps_scale</function></member>
-    <member><function>ps_rotate</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/ps/reference.xml b/reference/ps/reference.xml
deleted file mode 100644
index fca9882f3f1c..000000000000
--- a/reference/ps/reference.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ps" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>PS &Functions;</title>
-
- <partintro>
-  <section xml:id="ps.contact">
-   <title>Contact Information</title>
-   <para>
-    If you have comments, bugfixes, enhancements for either this extension or
-    pslib then please drop me a mail
-    <link xlink:href="mailto:steinm@php.net">steinm@php.net</link>. Any help is very
-     welcome.
-   </para>
-  </section>
-
- </partintro>
-
- &reference.ps.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/ps/setup.xml b/reference/ps/setup.xml
deleted file mode 100644
index e0d5098017ef..000000000000
--- a/reference/ps/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ps.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="ps.requirements">
-  &reftitle.required;
-  <para>
-   You need at least pslib &gt;= 0.1.12. The ps library (pslib)
-   is available at <link xlink:href="&url.pslib;">&url.pslib;</link>.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.ps.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="ps.resources">
-  &reftitle.resources;
-  <para>
-   This extension defines a PostScript document resource returned by
-   <function>ps_new</function>.
-  </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/ps/versions.xml b/reference/ps/versions.xml
deleted file mode 100644
index d7f126044588..000000000000
--- a/reference/ps/versions.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='ps_add_annotation' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_bookmark' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_kerning' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_add_launchlink' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_ligature' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_add_locallink' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_note' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_pdflink' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_thumbnail' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_add_weblink' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_arc' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_arcn' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_attach_file' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_begin_font' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_begin_glyph' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_begin_page' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_begin_pattern' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_begin_template' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_circle' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_clip' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_close' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_close_image' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_closepath' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_closepath_fill_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_closepath_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_concat' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_continue_text' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_curveto' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_delete' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_end_font' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_end_glyph' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_end_page' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_end_pattern' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_end_template' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_endpath' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_fill' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_fill_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_findfont' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_get_buffer' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_get_parameter' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_get_value' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_glyhp_list' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_glyhp_show' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_glyhp_width' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_glyph_list' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_glyph_show' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_glyph_width' from='PECL ps &gt;= 1.3.5'/>
- <function name='ps_hyphenate' from='PECL ps &gt;= 1.1.1'/>
- <function name='ps_include_file' from='PECL ps &gt;= 1.3.4'/>
- <function name='ps_initgraphics' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_lineto' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_makespotcolor' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_moveto' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_new' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_open_ccitt' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_open_file' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_open_image' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_open_image_file' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_open_memory_image' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_place_image' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_rect' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_restore' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_rotate' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_save' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_scale' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_border_color' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_border_dash' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_border_style' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_info' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_parameter' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_text_pos' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_set_value' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setcolor' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setdash' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setflat' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setfont' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setgray' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setgray_fill' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setgray_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setlinecap' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setlinejoin' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setlinewidth' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setmatrix' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setmiterlimit' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setoverprint' from='PECL ps 1.2.2'/>
- <function name='ps_setoverprintmode' from='PECL ps &gt;= 1.3.0'/>
- <function name='ps_setpolydash' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setrgbcolor' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setrgbcolor_fill' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_setrgbcolor_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_shading' from='PECL ps &gt;= 1.3.0'/>
- <function name='ps_shading_pattern' from='PECL ps &gt;= 1.3.0'/>
- <function name='ps_shfill' from='PECL ps &gt;= 1.3.0'/>
- <function name='ps_show' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_show2' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_show_boxed' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_show_xy' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_show_xy2' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_skew' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_string_geometry' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_stringwidth' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_stroke' from='PECL ps &gt;= 1.1.0'/>
- <function name='ps_symbol' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_symbol_name' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_symbol_width' from='PECL ps &gt;= 1.2.0'/>
- <function name='ps_translate' from='PECL ps &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
--->
\ No newline at end of file
diff --git a/reference/pthreads/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/pthreads/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/pthreads/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/pthreads/book.xml b/reference/pthreads/book.xml
deleted file mode 100644
index b60c8b78b542..000000000000
--- a/reference/pthreads/book.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.pthreads">
- <?phpdoc extension-membership="pecl" ?>
- <title>pthreads</title>
- <titleabbrev>pthreads</titleabbrev>
-
- <preface xml:id="intro.pthreads">
-  &reftitle.intro;
-  <simpara>
-   pthreads is an object-orientated API that provides all of the tools needed
-   for multi-threading in PHP. PHP applications can create, read, write,
-   execute and synchronize with Threads, Workers and Threaded objects.
-  </simpara>
-  <warning>
-   <simpara>
-    This extension is considered unmaintained and dead.
-   </simpara>
-  </warning>
-  <tip>
-   <simpara>
-    Consider using <link linkend="book.parallel">parallel</link> instead.
-   </simpara>
-  </tip>
-  <warning>
-   <simpara>
-    The pthreads extension cannot be used in a web server environment.
-    Threading in PHP is therefore restricted to CLI-based applications only.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    pthreads (v3) can only be used with PHP 7.2+: This is due to ZTS
-    mode being unsafe in 7.0 and 7.1.
-   </simpara>
-  </warning>
-  <simpara>
-   The <classname>Threaded</classname> class forms the basis of the
-   functionality that allows pthreads to operate. It exposes synchronization
-   methods and some useful interfaces for the programmer.
-  </simpara>
-  <simpara>
-   The <classname>Thread</classname> class enables for threads to be created by
-   simply extending it and implementing a <literal>run</literal> method. Any
-   members can be written to and read by any context with a reference to the
-   thread. Any context can also execute any public and protected methods.
-   The body of the run method will be executed in a separate thread when the
-   <methodname>Thread::start</methodname> method of the implementation is
-   called from the context that created it. Only the context that creates a
-   thread can start and join it.
-  </simpara>
-  <simpara>
-   The <classname>Worker</classname> class has a persistent state, and will be
-   available from the call to <methodname>Thread::start</methodname> (an
-   inherited method) until the object goes out of scope, or is explicitly
-   shutdown (via <methodname>Worker::shutdown</methodname>). Any context with a
-   reference to the worker object can stack tasks onto the Worker (via
-   <methodname>Worker::stack</methodname>), where these tasks will be executed
-   by the worker in a separate thread. The <literal>run</literal> method of a
-   worker object will be executed before any objects on the worker's stack,
-   enabling for resources to be initialized that the objects to be executed may
-   need.
-  </simpara>
-  <simpara>
-   The <classname>Pool</classname> class is used to create a group of workers
-   to distribute <classname>Threaded</classname> objects amongst them. It is
-   the easiest and most efficient way of using multiple threads in PHP
-   applications.
-  </simpara>
-  <caution>
-   <simpara>
-    The <classname>Pool</classname> class does not extend the
-    <classname>Threaded</classname> class, and so pool-based objects are
-    considered a normal PHP objects. As such, its instances of it should not be
-    shared amongst different contexts.
-   </simpara>
-  </caution>
-  <simpara>
-   The <classname>Volatile</classname> class is new to pthreads v3. It is used
-   to denote mutable <classname>Threaded</classname> properties of
-   <classname>Threaded</classname> classes (since these are now immutable by
-   default). It is also used to store PHP arrays in
-   <classname>Threaded</classname> contexts.
-  </simpara>
-  <simpara>
-   Synchronization is an important ability when threading. All of the objects
-   that pthreads creates have built in synchronization in the (which will be
-   familiar to java programmers) form of
-   <methodname>Threaded::wait</methodname> and
-   <methodname>Threaded::notify</methodname>. Calling
-   <methodname>Threaded::wait</methodname> on an object will cause the context
-   to wait for another context to call
-   <methodname>Threaded::notify</methodname> on the same object. This mechanism
-   allows for powerful synchronization between <classname>Threaded</classname>
-   objects in PHP.
-  </simpara>
-  <caution>
-  <simpara>
-   Any objects that are intended for use in the multi-threaded parts of your
-   application should extend <classname>Threaded</classname>.
-  </simpara>
-  </caution>
-  <simpara>
- Data Storage:
- As a rule of thumb, any data type that can be serialized can be used as a member of a Threaded object, it can be read and written from any context with a reference to the Threaded Object.
- Not every type of data is stored serially, basic types are stored in their true form.
- Complex types, Arrays, and Objects that are not Threaded are stored serially; they can be read and written to the Threaded Object from any context with a reference.
- With the exception of Threaded Objects any reference used to set a member of a Threaded Object is separated from the reference in the Threaded Object;
- the same data can be read directly from the Threaded Object at any time by any context with a reference to the Threaded Object.
-  </simpara>
-  <simpara>
- Static Members:
- When a new context is created ( Thread or Worker ), they are generally copied, but resources and objects with internal state are nullified (for safety reasons). This allows them to function as a kind of thread local storage. For example, upon starting the context, a class whose static members include connection information for a database server, and the connection itself, will only have the simple connection information copied, not the connection. Allowing the new context to initiate a connection in the same way as the context that created it, storing the connection in the same place without affecting the original context.
-  </simpara>
-  <caution>
-  <simpara>
- When print_r, var_dump and other object debug functions are executed, they do not include recursion protection.
-  </simpara>
-  </caution>
-  <note>
-   <simpara>
- Resources:
- The extensions and functionality that define resources in PHP are completely unprepared for this kind of environment; pthreads makes provisions for Resources to be shared among contexts, however, for most types of resource it should be considered unsafe. Extreme caution and care should be used when sharing resources among contexts.
-   </simpara>
-  </note>
-  <caution>
-   <simpara>
- In the environment which pthreads executes, some restrictions and limitations are necessary in order to provide a stable environment.
-   </simpara>
-  </caution>
- </preface>
-
- &reference.pthreads.setup;
- &reference.pthreads.constants;
- &reference.pthreads.threaded;
- &reference.pthreads.thread;
- &reference.pthreads.worker;
- &reference.pthreads.collectable;
- &reference.pthreads.pool;
- &reference.pthreads.volatile;
-
-</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/pthreads/collectable.xml b/reference/pthreads/collectable.xml
deleted file mode 100644
index 51553ec798d9..000000000000
--- a/reference/pthreads/collectable.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.collectable" role="class">
-
- <title>The Collectable interface</title>
- <titleabbrev>Collectable</titleabbrev>
-
- <partintro>
-<!-- {{{ Collectable intro -->
-  <section xml:id="collectable.intro">
-   &reftitle.intro;
-
-   <simpara>
-    Represents a garbage-collectable object.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="collectable.synopsis">
-   &reftitle.interfacesynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Collectable</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <oointerface>
-      <interfacename>Collectable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.collectable')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.pthreads.entities.collectable;
-
-</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/pthreads/collectable/isgarbage.xml b/reference/pthreads/collectable/isgarbage.xml
deleted file mode 100644
index 1001901c0c24..000000000000
--- a/reference/pthreads/collectable/isgarbage.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="collectable.isgarbage">
- <refnamediv>
-  <refname>Collectable::isGarbage</refname>
-  <refpurpose>Determine whether an object has been marked as garbage</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>true</type><methodname>Collectable::isGarbage</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Can be called in <methodname>Pool::collect</methodname> to determine if this object is garbage.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.true.always;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     &return.type.true;
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Pool::collect</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/pthreads/configure.xml b/reference/pthreads/configure.xml
deleted file mode 100644
index c925c2fe42f0..000000000000
--- a/reference/pthreads/configure.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pthreads.installation">
- &reftitle.install;
-
- <simpara>
-  Use <option role="configure">--enable-maintainer-zts</option> when compiling PHP.
- </simpara>
-
- <simpara>
-  Windows users should include <filename>php_pthreads.dll</filename> into &php.ini;
- </simpara>
-
- <note>
-  <simpara>
-   Windows users also have to make sure that <filename>pthreadVC2.dll</filename>
-   (included with the distribution) is present in one of the folders specified
-   in the <envar>PATH</envar> environment variable.
-  </simpara>
- </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/pthreads/constants.xml b/reference/pthreads/constants.xml
deleted file mode 100644
index ebcdb94c2ed5..000000000000
--- a/reference/pthreads/constants.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pthreads.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.pthreads-inherit-all">
-   <term>
-    <constant>PTHREADS_INHERIT_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    The default options for all Threads, causes pthreads to copy the environment when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-none">
-   <term>
-    <constant>PTHREADS_INHERIT_NONE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Do not inherit anything when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-ini">
-   <term>
-    <constant>PTHREADS_INHERIT_INI</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit INI entries when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-constants">
-   <term>
-    <constant>PTHREADS_INHERIT_CONSTANTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit user declared constants when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-classes">
-   <term>
-    <constant>PTHREADS_INHERIT_CLASSES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit user declared classes when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-functions">
-   <term>
-    <constant>PTHREADS_INHERIT_FUNCTIONS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit user declared functions when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-includes">
-   <term>
-    <constant>PTHREADS_INHERIT_INCLUDES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit included file information when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-inherit-comments">
-   <term>
-    <constant>PTHREADS_INHERIT_COMMENTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Inherit all comments when new Threads are started
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.pthreads-allow-headers">
-   <term>
-    <constant>PTHREADS_ALLOW_HEADERS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Allow new Threads to send headers to standard output (normally prohibited)
-    </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/pthreads/pool.xml b/reference/pthreads/pool.xml
deleted file mode 100644
index f8eb53aa9cd9..000000000000
--- a/reference/pthreads/pool.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.pool" role="class">
-
- <title>The Pool class</title>
- <titleabbrev>Pool</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Pool intro -->
-  <section xml:id="pool.intro">
-   &reftitle.intro;
-   <simpara>
-   A Pool is a container for, and controller of, an adjustable number of Workers.
-   </simpara>
-   <simpara>
-   Pooling provides a higher level abstraction of the Worker functionality, including the management of references in the way required by pthreads.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="pool.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Pool</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Pool</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="pool.props.size">size</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="pool.props.class">class</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="pool.props.workers">workers</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="pool.props.ctor">ctor</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="pool.props.last">last</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pool')/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.pool')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Pool properties -->
-  <section xml:id="pool.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="pool.props.size">
-     <term><varname>size</varname></term>
-     <listitem>
-      <simpara>maximum number of Workers this Pool can use</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="pool.props.class">
-     <term><varname>class</varname></term>
-     <listitem>
-      <simpara>the class of the Worker</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="pool.props.workers">
-     <term><varname>workers</varname></term>
-     <listitem>
-      <simpara>references to Workers</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="pool.props.ctor">
-     <term><varname>ctor</varname></term>
-     <listitem>
-      <simpara>the arguments for constructor of new Workers</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="pool.props.last">
-     <term><varname>last</varname></term>
-     <listitem>
-      <simpara>offset in workers of the last Worker used</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.pthreads.entities.pool;
-
-</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/pthreads/pool/collect.xml b/reference/pthreads/pool/collect.xml
deleted file mode 100644
index 43c7ee071738..000000000000
--- a/reference/pthreads/pool/collect.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.collect">
- <refnamediv>
-  <refname>Pool::collect</refname>
-  <refpurpose>Collect references to completed tasks</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Pool::collect</methodname>
-   <methodparam choice="opt"><type>Callable</type><parameter>collector</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Allows the pool to collect references determined to be garbage by the
-   optionally given collector.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collector</parameter></term>
-    <listitem>
-     <simpara>
-      A Callable collector that returns a boolean on whether the task can be
-      collected or not. Only in rare cases should a custom collector need to
-      be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of remaining tasks in the pool to be collected.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL pthreads 3.0.0</entry>
-      <entry>
-       An integer is now returned, and the <parameter>collector</parameter>
-       parameter is now optional.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A basic example of <methodname>Pool::collect</methodname></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pool = new Pool(4);
-
-for ($i = 0; $i < 15; ++$i) {
-    $pool->submit(new class extends Threaded {});
-}
-
-while ($pool->collect()); // blocks until all tasks have finished executing
-
-$pool->shutdown();
-]]>
-   </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/pthreads/pool/construct.xml b/reference/pthreads/pool/construct.xml
deleted file mode 100644
index 83a9c07afbff..000000000000
--- a/reference/pthreads/pool/construct.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.construct">
- <refnamediv>
-  <refname>Pool::__construct</refname>
-  <refpurpose>Creates a new Pool of Workers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Pool::__construct</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ctor</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Construct a new pool of workers. Pools lazily create their threads, which
-   means new threads will only be spawned when they are required to execute
-   tasks.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      The maximum number of workers for this pool to create
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <simpara>
-      The class for new Workers. If no class is given, then it defaults to the
-      <classname>Worker</classname> class.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ctor</parameter></term>
-    <listitem>
-     <simpara>
-      An array of arguments to be passed to new workers' constructors
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Creating Pools</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyWorker extends Worker {
-
-    public function __construct(Something $something) {
-        $this->something = $something;
-    }
-
-    public function run() {
-        /** ... **/
-    }
-}
-
-$pool = new Pool(8, \MyWorker::class, [new Something()]);
-
-var_dump($pool);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(Pool)#1 (6) {
-  ["size":protected]=>
-  int(8)
-  ["class":protected]=>
-  string(8) "MyWorker"
-  ["workers":protected]=>
-  NULL
-  ["work":protected]=>
-  NULL
-  ["ctor":protected]=>
-  array(1) {
-    [0]=>
-    object(Something)#2 (0) {
-    }
-  }
-  ["last":protected]=>
-  int(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/pthreads/pool/resize.xml b/reference/pthreads/pool/resize.xml
deleted file mode 100644
index d5be09548360..000000000000
--- a/reference/pthreads/pool/resize.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.resize">
- <refnamediv>
-  <refname>Pool::resize</refname>
-  <refpurpose>Resize the Pool</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Pool::resize</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Resize the Pool
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-  The maximum number of Workers this Pool can create
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/pthreads/pool/shutdown.xml b/reference/pthreads/pool/shutdown.xml
deleted file mode 100644
index 91550d200146..000000000000
--- a/reference/pthreads/pool/shutdown.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.shutdown">
- <refnamediv>
-  <refname>Pool::shutdown</refname>
-  <refpurpose>Shutdown all workers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Pool::shutdown</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shuts down all of the workers in the pool. This will block until all
-   submitted tasks have been executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Shutting down a pool</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Task extends Threaded
-{
-    public function run()
-    {
-        usleep(500000);
-    }
-}
-
-$pool = new Pool(4);
-
-for ($i = 0; $i < 10; ++$i) {
-    $pool->submit(new Task());
-}
-
-$pool->shutdown(); // blocks until all submitted tasks have finished executing
-]]>
-   </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/pthreads/pool/submit.xml b/reference/pthreads/pool/submit.xml
deleted file mode 100644
index ec96bed83c90..000000000000
--- a/reference/pthreads/pool/submit.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.submit">
- <refnamediv>
-  <refname>Pool::submit</refname>
-  <refpurpose>Submits an object for execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Pool::submit</methodname>
-   <methodparam><type>Threaded</type><parameter>task</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Submit the task to the next Worker in the Pool
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>task</parameter></term>
-    <listitem>
-     <simpara>
-  The task for execution
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
- the identifier of the Worker executing the object
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Submitting Tasks</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyWork extends Threaded {
-
-    public function run() {
-        /* ... */
-    }
-}
-
-class MyWorker extends Worker {
-
-    public function __construct(Something $something) {
-        $this->something = $something;
-    }
-
-    public function run() {
-        /** ... **/
-    }
-}
-
-$pool = new Pool(8, \MyWorker::class, [new Something()]);
-$pool->submit(new MyWork());
-var_dump($pool);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(Pool)#1 (6) {
-  ["size":protected]=>
-  int(8)
-  ["class":protected]=>
-  string(8) "MyWorker"
-  ["workers":protected]=>
-  array(1) {
-    [0]=>
-    object(MyWorker)#4 (1) {
-      ["something"]=>
-      object(Something)#5 (0) {
-      }
-    }
-  }
-  ["work":protected]=>
-  array(1) {
-    [0]=>
-    object(MyWork)#3 (1) {
-      ["worker"]=>
-      object(MyWorker)#5 (1) {
-        ["something"]=>
-        object(Something)#6 (0) {
-        }
-      }
-    }
-  }
-  ["ctor":protected]=>
-  array(1) {
-    [0]=>
-    object(Something)#2 (0) {
-    }
-  }
-  ["last":protected]=>
-  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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/pthreads/pool/submitTo.xml b/reference/pthreads/pool/submitTo.xml
deleted file mode 100644
index cfec954c9f72..000000000000
--- a/reference/pthreads/pool/submitTo.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pool.submitTo">
- <refnamediv>
-  <refname>Pool::submitTo</refname>
-  <refpurpose>Submits a task to a specific worker for execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Pool::submitTo</methodname>
-   <methodparam><type>int</type><parameter>worker</parameter></methodparam>
-   <methodparam><type>Threaded</type><parameter>task</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Submit a task to the specified worker in the pool. The workers are indexed
-   from 0, and will only exist if the pool has needed to create them (since
-   threads are lazily spawned).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>worker</parameter></term>
-    <listitem>
-     <simpara>
-      The worker to stack the task onto, indexed from <literal>0</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>task</parameter></term>
-    <listitem>
-     <simpara>
-      The task for execution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The identifier of the worker that accepted the task.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Submitting tasks to a specific worker</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Task extends Threaded {
-    public function run() {
-        var_dump(Thread::getCurrentThreadID());
-    }
-}
-
-$pool = new Pool(2);
-
-$pool->submit(new Task());
-
-for ($i = 0; $i < 5; ++$i) {
-    $pool->submitTo(0, new Task()); // stack all tasks onto the first worker
-}
-
-$pool->submitTo(1, new Task()); // cannot stack the task onto the second worker due to it not existing yet
-
-$pool->shutdown();
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(4475011072)
-int(4475011072)
-int(4475011072)
-int(4475011072)
-int(4475011072)
-int(4475011072)
-
-Fatal error: Uncaught Exception: The selected worker (1) does not exist in %s:%d
-]]>
-   </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/pthreads/setup.xml b/reference/pthreads/setup.xml
deleted file mode 100644
index 97318f420cb1..000000000000
--- a/reference/pthreads/setup.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="pthreads.setup">
- &reftitle.setup;
-
- <section xml:id="pthreads.requirements">
-  &reftitle.required;
-  <simpara>
- pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled
- (<option role="configure">--enable-zts</option>, or on non-Windows systems prior to PHP 8.0.0,
- <option role="configure">--enable-maintainer-zts</option>)
-  </simpara>
-  <caution>
-  <simpara>
- Zend Thread Safety cannot be enabled post build; it is a build time configuration option.
-  </simpara>
-  </caution>
-  <simpara>
- pthreads should build anywhere there is a working Posix Threads header (pthread.h) and ZTS build of PHP, including Windows (using the pthread-w32 project from redhat).
-  </simpara>
- </section>
-
- <section xml:id="pthreads.installation">
-  &reftitle.install;
-  <simpara>
-   pthreads releases are hosted by PECL and the source code by
-    <link xlink:href="&url.git.hub;krakjoe/pthreads">github</link>,
-   the easiest route to installation is the normal PECL route:
-   <link xlink:href="&url.pecl.package;pthreads">&url.pecl.package;pthreads</link>.
-  </simpara>
-  <simpara>
- Windows users can download prebuilt release binaries from the <link xlink:href="&url.pecl.package;pthreads">PECL</link> website.
-  </simpara>
-  <caution>
-   <simpara>
- Windows users need to take the additional step of adding pthreadVC2.dll (distributed with Windows releases) to their <envar>PATH</envar>.
-   </simpara>
-  </caution>
- </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/pthreads/thread.xml b/reference/pthreads/thread.xml
deleted file mode 100644
index 3093a869ebda..000000000000
--- a/reference/pthreads/thread.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.thread" role="class">
-
- <title>The Thread class</title>
- <titleabbrev>Thread</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Thread intro -->
-  <section xml:id="thread.intro">
-   &reftitle.intro;
-   <simpara>
-  When the start method of a Thread is invoked, the run method code will be executed in separate Thread, in parallel.
-   </simpara>
-   <simpara>
-  After the run method is executed the Thread will exit immediately, it will be joined with the creating Thread at the appropriate time.
-   </simpara>
-   <warning>
-   <simpara>
-  Relying on the engine to determine when a Thread should join may cause undesirable behaviour; the programmer should be explicit, where possible.
-   </simpara>
-   </warning>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="thread.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Thread</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Thread</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Threaded</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.thread')/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.threaded')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.pthreads.entities.thread;
-
-</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/pthreads/thread/getcreatorid.xml b/reference/pthreads/thread/getcreatorid.xml
deleted file mode 100644
index 5fe20d26a8b5..000000000000
--- a/reference/pthreads/thread/getcreatorid.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.getcreatorid">
- <refnamediv>
-  <refname>Thread::getCreatorId</refname>
-  <refpurpose>Identification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Thread::getCreatorId</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Will return the identity of the Thread that created the referenced Thread
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  A numeric identity
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Return the identity of the Thread or Process that created the referenced Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        printf("%s created by Thread #%lu\n", __CLASS__, $this->getCreatorId());
-    }
-}
-$my = new My();
-$my->start();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-My created by Thread #123456778899
-]]>
-   </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/pthreads/thread/getcurrentthread.xml b/reference/pthreads/thread/getcurrentthread.xml
deleted file mode 100644
index 74b19ea612c0..000000000000
--- a/reference/pthreads/thread/getcurrentthread.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.getcurrentthread">
- <refnamediv>
-  <refname>Thread::getCurrentThread</refname>
-  <refpurpose>Identification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>Thread</type><methodname>Thread::getCurrentThread</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
- Return a reference to the currently executing Thread
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
- An object representing the currently executing Thread
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Return the currently executing Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        var_dump(Thread::getCurrentThread());
-    }
-}
-$my = new My();
-$my->start();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(My)#2 (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/pthreads/thread/getcurrentthreadid.xml b/reference/pthreads/thread/getcurrentthreadid.xml
deleted file mode 100644
index 1cc35796e48c..000000000000
--- a/reference/pthreads/thread/getcurrentthreadid.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.getcurrentthreadid">
- <refnamediv>
-  <refname>Thread::getCurrentThreadId</refname>
-  <refpurpose>Identification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Thread::getCurrentThreadId</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Will return the identity of the currently executing Thread
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  A numeric identity
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Return the identity of the currently executing Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        printf("%s is Thread #%lu\n", __CLASS__, Thread::getCurrentThreadId());
-    }
-}
-$my = new My();
-$my->start();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-My is Thread #123456778899
-]]>
-   </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/pthreads/thread/getthreadid.xml b/reference/pthreads/thread/getthreadid.xml
deleted file mode 100644
index 3beab6e40373..000000000000
--- a/reference/pthreads/thread/getthreadid.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.getthreadid">
- <refnamediv>
-  <refname>Thread::getThreadId</refname>
-  <refpurpose>Identification</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Thread::getThreadId</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Will return the identity of the referenced Thread
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  A numeric identity
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Return the identity of the referenced Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        printf("%s is Thread #%lu\n", __CLASS__, $this->getThreadId());
-    }
-}
-$my = new My();
-$my->start();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-My is Thread #123456778899
-]]>
-   </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/pthreads/thread/isjoined.xml b/reference/pthreads/thread/isjoined.xml
deleted file mode 100644
index d687caf89dbb..000000000000
--- a/reference/pthreads/thread/isjoined.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.isjoined">
- <refnamediv>
-  <refname>Thread::isJoined</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Thread::isJoined</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Tell if the referenced Thread has been joined
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Detect the state of the referenced Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-var_dump($my->isJoined());
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notify();
-}, $my);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </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/pthreads/thread/isstarted.xml b/reference/pthreads/thread/isstarted.xml
deleted file mode 100644
index adc3efab4ceb..000000000000
--- a/reference/pthreads/thread/isstarted.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.isstarted">
- <refnamediv>
-  <refname>Thread::isStarted</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Thread::isStarted</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
- Tell if the referenced Thread was started
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Tell if the referenced Thread was started</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker = new Worker();
-$worker->start();
-var_dump($worker->isStarted());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/thread/join.xml b/reference/pthreads/thread/join.xml
deleted file mode 100644
index b73729fcd0f6..000000000000
--- a/reference/pthreads/thread/join.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.join">
- <refnamediv>
-  <refname>Thread::join</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Thread::join</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Causes the calling context to wait for the referenced Thread to finish executing
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Join with the referenced Thread</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        /* ... */
-    }
-}
-$my = new My();
-$my->start();
-/* ... */
-var_dump($my->join());
-/* ... */
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/thread/start.xml b/reference/pthreads/thread/start.xml
deleted file mode 100644
index 3fc234e73935..000000000000
--- a/reference/pthreads/thread/start.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.start">
- <refnamediv>
-  <refname>Thread::start</refname>
-  <refpurpose>Execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Thread::start</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Will start a new Thread to execute the implemented run method
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-  An optional mask of inheritance constants, by default PTHREADS_INHERIT_ALL
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Starting Threads</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        /** ... **/
-    }
-}
-$my = new My();
-var_dump($my->start());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded.xml b/reference/pthreads/threaded.xml
deleted file mode 100644
index 9988c1757c40..000000000000
--- a/reference/pthreads/threaded.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.threaded" role="class">
-
- <title>The Threaded class</title>
- <titleabbrev>Threaded</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Threaded intro -->
-  <section xml:id="threaded.intro">
-   &reftitle.intro;
-   <simpara>
-  Threaded objects form the basis of pthreads ability to execute user code in parallel; they expose synchronization methods and various useful interfaces.
-   </simpara>
-   <simpara>
-  Threaded objects, most importantly, provide implicit safety for the programmer; all operations on the object scope are safe.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="threaded.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Threaded</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Threaded</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Collectable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.threaded')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.pthreads.entities.threaded;
-
-</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/pthreads/threaded/chunk.xml b/reference/pthreads/threaded/chunk.xml
deleted file mode 100644
index 48487c151fc9..000000000000
--- a/reference/pthreads/threaded/chunk.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.chunk">
- <refnamediv>
-  <refname>Threaded::chunk</refname>
-  <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Threaded::chunk</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>preserve</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Fetches a chunk of the objects property table of the given size, optionally preserving keys
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-  The number of items to fetch
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>preserve</parameter></term>
-    <listitem>
-     <simpara>
-  Preserve the keys of members, by default false
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  An array of items from the objects property table
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Fetch a chunk of the property table</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$safe = new Threaded();
-
-while (count($safe) < 10) {
-    $safe[] = count($safe);
-}
-
-var_dump($safe->chunk(5));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-}
-]]>
-   </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/pthreads/threaded/count.xml b/reference/pthreads/threaded/count.xml
deleted file mode 100644
index 0d6400ef2755..000000000000
--- a/reference/pthreads/threaded/count.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.count">
- <refnamediv>
-  <refname>Threaded::count</refname>
-  <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Threaded::count</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
- Returns the number of properties for this object
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Counting the properties of an object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$safe = new Threaded();
-
-while (count($safe) < 10) {
-    $safe[] = count($safe);
-}
-
-var_dump(count($safe));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(10)
-]]>
-   </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/pthreads/threaded/extend.xml b/reference/pthreads/threaded/extend.xml
deleted file mode 100644
index 51c5bcc70b48..000000000000
--- a/reference/pthreads/threaded/extend.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.extend">
- <refnamediv>
-  <refname>Threaded::extend</refname>
-  <refpurpose>Runtime Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::extend</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Makes thread safe standard class at runtime
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <simpara>
-  The class to extend
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Runtime inheritance</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My {}
-
-Threaded::extend(My::class);
-
-$my = new My();
-
-var_dump($my instanceof Threaded);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/isrunning.xml b/reference/pthreads/threaded/isrunning.xml
deleted file mode 100644
index 6f1282eec5d5..000000000000
--- a/reference/pthreads/threaded/isrunning.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="thread.isrunning">
- <refnamediv>
-  <refname>Threaded::isRunning</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::isRunning</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Tell if the referenced object is executing
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  A boolean indication of state
-  <note>
-    <simpara>
-     An object is considered running while executing the run method
-    </simpara>
-   </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Detect the state of the referenced object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-var_dump($my->isRunning());
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notify();
-}, $my);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/isterminated.xml b/reference/pthreads/threaded/isterminated.xml
deleted file mode 100644
index d3d04f4089af..000000000000
--- a/reference/pthreads/threaded/isterminated.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.isterminated">
- <refnamediv>
-  <refname>Threaded::isTerminated</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::isTerminated</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Tell if the referenced object was terminated during execution; suffered fatal errors, or threw uncaught exceptions
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  A boolean indication of state
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Detect the state of the referenced object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        i_do_not_exist();
-    }
-}
-$my = new My();
-$my->start();
-$my->join();
-var_dump($my->isTerminated());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/merge.xml b/reference/pthreads/threaded/merge.xml
deleted file mode 100644
index 4101731a255d..000000000000
--- a/reference/pthreads/threaded/merge.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.merge">
- <refnamediv>
-  <refname>Threaded::merge</refname>
-  <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::merge</methodname>
-   <methodparam><type>mixed</type><parameter>from</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Merges data into the current object
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <simpara>
-  The data to merge
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>overwrite</parameter></term>
-    <listitem>
-     <simpara>
-  Overwrite existing keys, by default true
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Merging into the property table of a threaded object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$array = [];
-
-while (count($array) < 10)
-    $array[] = count($array);
-
-$stdClass = new stdClass();
-$stdClass->foo = "foo";
-$stdClass->bar = "bar";
-$stdClass->baz = "baz";
-
-$safe = new Threaded();
-$safe->merge($array);
-
-$safe->foo = "bar";
-$safe->merge($stdClass, false);
-
-var_dump($safe);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-object(Threaded)#2 (13) {
-  ["0"]=>
-  int(0)
-  ["1"]=>
-  int(1)
-  ["2"]=>
-  int(2)
-  ["3"]=>
-  int(3)
-  ["4"]=>
-  int(4)
-  ["5"]=>
-  int(5)
-  ["6"]=>
-  int(6)
-  ["7"]=>
-  int(7)
-  ["8"]=>
-  int(8)
-  ["9"]=>
-  int(9)
-  ["foo"]=>
-  string(3) "bar"
-  ["bar"]=>
-  string(3) "bar"
-  ["baz"]=>
-  string(3) "baz"
-}
-]]>
-   </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/pthreads/threaded/notify.xml b/reference/pthreads/threaded/notify.xml
deleted file mode 100644
index d02455943d11..000000000000
--- a/reference/pthreads/threaded/notify.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.notify">
- <refnamediv>
-  <refname>Threaded::notify</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::notify</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Send notification to the referenced object
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Notifications and Waiting</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        /** cause this thread to wait **/
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-/** send notification to the waiting thread **/
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notify();
-}, $my);
-var_dump($my->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/notifyone.xml b/reference/pthreads/threaded/notifyone.xml
deleted file mode 100644
index 3b990dfb63a2..000000000000
--- a/reference/pthreads/threaded/notifyone.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.notifyone">
- <refnamediv>
-  <refname>Threaded::notifyOne</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::notifyOne</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Send notification to the referenced object. This unblocks at least one of the
-  blocked threads (as opposed to unblocking all of them, as seen with
-  <methodname>Threaded::notify</methodname>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Notifications and Waiting</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        /** cause this thread to wait **/
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-/** send notification to the waiting thread **/
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notifyOne();
-}, $my);
-var_dump($my->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/pop.xml b/reference/pthreads/threaded/pop.xml
deleted file mode 100644
index b318051948ae..000000000000
--- a/reference/pthreads/threaded/pop.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.pop">
- <refnamediv>
-  <refname>Threaded::pop</refname>
-  <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::pop</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Pops an item from the objects property table
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The last item from the objects property table
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Popping the last item from the property table of a threaded object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$safe = new Threaded();
-
-while (count($safe) < 10)
-    $safe[] = count($safe);
-
-var_dump($safe->pop());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(9)
-]]>
-   </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/pthreads/threaded/run.xml b/reference/pthreads/threaded/run.xml
deleted file mode 100644
index 85f42b008529..000000000000
--- a/reference/pthreads/threaded/run.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.run">
- <refnamediv>
-  <refname>Threaded::run</refname>
-  <refpurpose>Execution</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Threaded::run</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  The programmer should always implement the run method for objects that are intended for execution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The methods return value, if used, will be ignored
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/pthreads/threaded/shift.xml b/reference/pthreads/threaded/shift.xml
deleted file mode 100644
index a1f4d9b9648f..000000000000
--- a/reference/pthreads/threaded/shift.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.shift">
- <refnamediv>
-  <refname>Threaded::shift</refname>
-  <refpurpose>Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Threaded::shift</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  Shifts an item from the objects property table
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The first item from the objects property table
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Shifting the first item from the property table of a threaded object</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$safe = new Threaded();
-
-while (count($safe) < 10)
-    $safe[] = count($safe);
-
-var_dump($safe->shift());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(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/pthreads/threaded/synchronized.xml b/reference/pthreads/threaded/synchronized.xml
deleted file mode 100644
index 19024ab483ca..000000000000
--- a/reference/pthreads/threaded/synchronized.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.synchronized">
- <refnamediv>
-  <refname>Threaded::synchronized</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Threaded::synchronized</methodname>
-   <methodparam><type>Closure</type><parameter>block</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Executes the block while retaining the referenced objects synchronization lock for the calling context
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-   <variablelist>
-   <varlistentry>
-    <term><parameter>block</parameter></term>
-    <listitem>
-     <simpara>
-  The block of code to execute
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-  Variable length list of arguments to use as function arguments to the block
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  The return value from the block
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Synchronizing</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notify();
-}, $my);
-var_dump($my->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/threaded/wait.xml b/reference/pthreads/threaded/wait.xml
deleted file mode 100644
index a6e5de14f880..000000000000
--- a/reference/pthreads/threaded/wait.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="threaded.wait">
- <refnamediv>
-  <refname>Threaded::wait</refname>
-  <refpurpose>Synchronization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Threaded::wait</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  Will cause the calling context to wait for notification from the referenced object
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-  An optional timeout in microseconds
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Notifications and Waiting</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My extends Thread {
-    public function run() {
-        /** cause this thread to wait **/
-        $this->synchronized(function($thread){
-            if (!$thread->done)
-                $thread->wait();
-        }, $this);
-    }
-}
-$my = new My();
-$my->start();
-/** send notification to the waiting thread **/
-$my->synchronized(function($thread){
-    $thread->done = true;
-    $thread->notify();
-}, $my);
-var_dump($my->join());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/versions.xml b/reference/pthreads/versions.xml
deleted file mode 100644
index f14b5742e1cc..000000000000
--- a/reference/pthreads/versions.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Classes and Methods -->
-
- <function name='threaded' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::run' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::wait' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::notify' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::notifyone' from='PECL pthreads &gt;= 3.0.0'/>
- <function name='threaded::isrunning' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::isterminated' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::synchronized' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::merge' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::shift' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::chunk' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::pop' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::count' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='threaded::extend' from='PECL pthreads &gt;= 2.0.8'/>
-
- <function name='thread' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::start' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::join' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::isstarted' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::isjoined' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::getthreadid' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::getcreatorid' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::getcurrentthreadid' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='thread::getcurrentthread' from='PECL pthreads &gt;= 2.0.0'/>
-
- <function name='worker' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::shutdown' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::stack' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::unstack' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::getstacked' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::isshutdown' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='worker::collect' from='PECL pthreads &gt;= 3.0.0'/>
-
- <function name='pool' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::__construct' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::resize' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::submit' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::submitto' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::collect' from='PECL pthreads &gt;= 2.0.0'/>
- <function name='pool::shutdown' from='PECL pthreads &gt;= 2.0.0'/>
-
- <function name='collectable' from='PECL pthreads &gt;= 2.0.8'/>
- <function name='collectable::isgarbage' from='PECL pthreads &gt;= 2.0.8'/>
-
- <function name='volatile' from='PECL pthreads &gt;= 3.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/pthreads/volatile.xml b/reference/pthreads/volatile.xml
deleted file mode 100644
index 9d1dd0a50700..000000000000
--- a/reference/pthreads/volatile.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="class.volatile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" role="class">
-
- <title>The Volatile class</title>
- <titleabbrev>Volatile</titleabbrev>
-
- <partintro>
-
-  <section xml:id="volatile.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>Volatile</classname> class is new to pthreads v3. Its
-    introduction is a consequence of the new immutability semantics of
-    <classname>Threaded</classname> members of <classname>Threaded</classname>
-    classes. The <classname>Volatile</classname> class enables for mutability
-    of its <classname>Threaded</classname> members, and is also used to store
-    PHP arrays in <classname>Threaded</classname> contexts.
-   </simpara>
-  </section>
-
-  <section xml:id="volatile.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis>
-    <ooclass><classname>Volatile</classname></ooclass>
-
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Volatile</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Threaded</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Collectable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.threaded')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-
-  </section>
-
-  <section xml:id="volatile.examples">
-   &reftitle.examples;
-   <example xml:id="volatile.example.immutable">
-    <title>New immutability semantics of Threaded</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-class Task extends Threaded
-{
-    public function __construct()
-    {
-        $this->data = new Threaded();
-
-        // attempt to overwrite a Threaded property of a Threaded class (invalid)
-        $this->data = new stdClass();
-    }
-}
-
-var_dump((new Task())->data);
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-RuntimeException: Threaded members previously set to Threaded objects are immutable, cannot overwrite data in %s:%d
-]]>
-    </screen>
-   </example>
-   <example xml:id="volatile.example.basic">
-    <title>Volatile use-case</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-class Task extends Volatile
-{
-    public function __construct()
-    {
-        $this->data = new Threaded();
-
-        // attempt to overwrite a Threaded property of a Volatile class (valid)
-        $this->data = new stdClass();
-    }
-}
-
-var_dump((new Task())->data);
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-object(stdClass)#3 (0) {
-}
-]]>
-    </screen>
-   </example>
-  </section>
-
- </partintro>
-
-</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/pthreads/worker.xml b/reference/pthreads/worker.xml
deleted file mode 100644
index a0f511a5599a..000000000000
--- a/reference/pthreads/worker.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.worker" role="class">
-
- <title>The Worker class</title>
- <titleabbrev>Worker</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Worker intro -->
-  <section xml:id="worker.intro">
-   &reftitle.intro;
-   <simpara>
-   Worker Threads have a persistent context, as such should be used over Threads in most cases.
-   </simpara>
-   <simpara>
-   When a Worker is started, the run method will be executed, but the Thread will not leave until one of the following conditions are met:
-   </simpara>
-   <itemizedlist>
-    <listitem>
-    <simpara>the Worker goes out of scope (no more references remain)</simpara>
-    </listitem>
-    <listitem>
-    <simpara>the programmer calls shutdown</simpara>
-    </listitem>
-    <listitem>
-    <simpara>the script dies</simpara>
-    </listitem>
-   </itemizedlist>
-   <simpara>
-   This means the programmer can reuse the context throughout execution; placing objects on the stack of the Worker will cause the Worker to
-   execute the stacked objects run method.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="worker.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Worker</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Worker</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Thread</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.worker')/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.thread')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.pthreads.entities.worker;
-
-</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/pthreads/worker/collect.xml b/reference/pthreads/worker/collect.xml
deleted file mode 100644
index 3eabd66ddd82..000000000000
--- a/reference/pthreads/worker/collect.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.collect">
- <refnamediv>
-  <refname>Worker::collect</refname>
-  <refpurpose>Collect references to completed tasks</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Worker::collect</methodname>
-   <methodparam choice="opt"><type>Callable</type><parameter>collector</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Allows the worker to collect references determined to be garbage by the
-   optionally given collector.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>collector</parameter></term>
-    <listitem>
-     <simpara>
-      A Callable collector that returns a boolean on whether the task can be
-      collected or not. Only in rare cases should a custom collector need to
-      be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of remaining tasks on the worker's stack to be collected.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A basic example of <methodname>Worker::collect</methodname></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker = new Worker();
-
-echo "There are currently {$worker->collect()} tasks on the stack to be collected\n";
-
-for ($i = 0; $i < 15; ++$i) {
-    $worker->stack(new class extends Threaded {});
-}
-
-echo "There are {$worker->collect()} tasks remaining on the stack to be collected\n";
-
-$worker->start();
-
-while ($worker->collect()); // blocks until all tasks have finished executing
-
-echo "There are now {$worker->collect()} tasks on the stack to be collected\n";
-
-$worker->shutdown();
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-There are currently 0 tasks on the stack to be collected
-There are 15 tasks remaining on the stack to be collected
-There are now 0 tasks on the stack to be collected
-]]>
-   </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/pthreads/worker/getstacked.xml b/reference/pthreads/worker/getstacked.xml
deleted file mode 100644
index b685a3e79745..000000000000
--- a/reference/pthreads/worker/getstacked.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.getstacked">
- <refnamediv>
-  <refname>Worker::getStacked</refname>
-  <refpurpose>Gets the remaining stack size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Worker::getStacked</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the number of tasks left on the stack
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of tasks currently waiting to be executed by the worker
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A basic example of <classname>Worker::getStacked</classname></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker = new Worker();
-
-for ($i = 0; $i < 5; ++$i) {
-    $worker->stack(new class extends Threaded {});
-}
-
-echo "There are {$worker->getStacked()} stacked tasks\n";
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-There are 5 stacked tasks
-]]>
-   </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/pthreads/worker/isshutdown.xml b/reference/pthreads/worker/isshutdown.xml
deleted file mode 100644
index 7387dc1d9b1d..000000000000
--- a/reference/pthreads/worker/isshutdown.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.isshutdown">
- <refnamediv>
-  <refname>Worker::isShutdown</refname>
-  <refpurpose>State Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Worker::isShutdown</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Whether the worker has been shutdown or not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns whether the worker has been shutdown or not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Detect the state of a worker</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker = new Worker();
-$worker->start();
-
-var_dump($worker->isShutdown());
-
-$worker->shutdown();
-
-var_dump($worker->isShutdown());
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-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/pthreads/worker/shutdown.xml b/reference/pthreads/worker/shutdown.xml
deleted file mode 100644
index efe438c5a863..000000000000
--- a/reference/pthreads/worker/shutdown.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.shutdown">
- <refnamediv>
-  <refname>Worker::shutdown</refname>
-  <refpurpose>Shutdown the worker</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Worker::shutdown</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Shuts down the worker after executing all of the stacked tasks.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Shutdown the referenced worker</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$my = new Worker();
-$my->start();
-/* stack/execute tasks */
-var_dump($my->shutdown());
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/pthreads/worker/stack.xml b/reference/pthreads/worker/stack.xml
deleted file mode 100644
index 5f52d80aea9a..000000000000
--- a/reference/pthreads/worker/stack.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.stack">
- <refnamediv>
-  <refname>Worker::stack</refname>
-  <refpurpose>Stacking work</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Worker::stack</methodname>
-   <methodparam><type>Threaded</type><parameter role="reference">work</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Appends the new work to the stack of the referenced worker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>work</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Threaded</classname> object to be executed by the worker.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new size of the stack.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Stacking a task for execution onto a worker</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$worker = new Worker();
-$work = new class extends Threaded {};
-
-var_dump($worker->stack($work));]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/pthreads/worker/unstack.xml b/reference/pthreads/worker/unstack.xml
deleted file mode 100644
index 8eda43e85276..000000000000
--- a/reference/pthreads/worker/unstack.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="worker.unstack">
- <refnamediv>
-  <refname>Worker::unstack</refname>
-  <refpurpose>Unstacking work</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Worker::unstack</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Removes the first task (the oldest one) in the stack.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new size of the stack.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL pthreads 3.0.0</entry>
-      <entry>
-       The parameter to specify the task to unstack has been removed. Now, only the
-       first task in the stack is removed.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Removing objects from the stack of Workers</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$my = new Worker();
-$work = new class extends Threaded {};
-
-var_dump($my->stack($work));
-var_dump($my->unstack());
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(1)
-int(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/quickhash/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/quickhash/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/quickhash/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/quickhash/book.xml b/reference/quickhash/book.xml
deleted file mode 100644
index 06d1b87a66b8..000000000000
--- a/reference/quickhash/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.quickhash">
- <?phpdoc extension-membership="pecl" ?>
- <title>Quickhash</title>
- <titleabbrev>Quickhash</titleabbrev>
-
- <preface xml:id="intro.quickhash">
-  &reftitle.intro;
-  <simpara>
-   The quickhash extension contains a set of specific strongly-typed classes
-   to deal with specific set and hash implementations.
-  </simpara>
- </preface>
-
- &reference.quickhash.setup;
- &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/examples.xml b/reference/quickhash/examples.xml
deleted file mode 100644
index d3344306b32f..000000000000
--- a/reference/quickhash/examples.xml
+++ /dev/null
@@ -1,149 +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 e11d18640de4..000000000000
--- a/reference/quickhash/quickhashinthash.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.quickhashinthash" role="class">
-
- <title>The QuickHashIntHash class</title>
- <titleabbrev>QuickHashIntHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntHash intro -->
-  <section xml:id="quickhashinthash.intro">
-   &reftitle.intro;
-   <simpara>
-    This class wraps around a hash containing integer numbers, where the
-    values are also integer numbers. Hashes are also available as
-    implementation of the <interfacename>ArrayAccess</interfacename> interface.
-   </simpara>
-   <simpara>
-    Hashes can also be iterated over with <link linkend="control-structures.foreach"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </simpara>
-  </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>
-      <simpara>If enabled, adding duplicate elements to a set (through either <methodname>QuickHashIntHash::add</methodname> or
-      <methodname>QuickHashIntHash::loadFromFile</methodname>) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <simpara>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the <link linkend="ini.memory-limit">memory_limit</link> settings.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-no-hash">
-     <term><constant>QuickHashIntHash::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <simpara>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.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntHash::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <simpara>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashinthash.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntHash::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <simpara>Selects a variant hashing algorithm.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashinthash;
-
-</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/quickhashinthash/add.xml b/reference/quickhash/quickhashinthash/add.xml
deleted file mode 100644
index d85702ec4475..000000000000
--- a/reference/quickhash/quickhashinthash/add.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.add">
- <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>
-  <simpara>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   <constant>QuickHashIntHash::CHECK_FOR_DUPES</constant> has been passed when the hash was created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The optional value of the entry to add. If no value is specified,
-      <literal>1</literal> will be used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 7ba6b1ce9ec2..000000000000
--- a/reference/quickhash/quickhashinthash/construct.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.construct">
- <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>
-  <simpara>
-   This constructor creates a new <classname>QuickHashIntHash</classname>. 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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>64</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      The options that you can pass in are: <constant>QuickHashIntHash::CHECK_FOR_DUPES</constant>,
-      which makes sure no duplicate entries are added to the hash;
-      <constant>QuickHashIntHash::DO_NOT_USE_ZEND_ALLOC</constant> to not use PHP's internal memory
-      manager as well as one of <constant>QuickHashIntHash::HASHER_NO_HASH</constant>,
-      <constant>QuickHashIntHash::HASHER_JENKINS1</constant> or <constant>QuickHashIntHash::HASHER_JENKINS2</constant>.
-      These last three configure which hashing algorithm to use. All options
-      can be combined using bitmasks.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntHash</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 6f6f7c0c9b75..000000000000
--- a/reference/quickhash/quickhashinthash/delete.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.delete">
- <refnamediv>
-  <refname>QuickHashIntHash::delete</refname>
-  <refpurpose>This method deletes an 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>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 9feabc65a1f8..000000000000
--- a/reference/quickhash/quickhashinthash/exists.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.exists">
- <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>
-  <simpara>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to check for whether it exists in the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 2b6f23566858..000000000000
--- a/reference/quickhash/quickhashinthash/get.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.get">
- <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>
-  <simpara>
-   This method retrieves a value from the hash by its key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to retrieve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 400939a74b46..000000000000
--- a/reference/quickhash/quickhashinthash/getsize.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.getsize">
- <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>
-  <simpara>
-   Returns the number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 2d5c58f8f0fb..000000000000
--- a/reference/quickhash/quickhashinthash/loadfromfile.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.loadfromfile">
- <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>
-  <simpara>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature <literal>'QH\0x11\0'</literal>, 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:
-  </simpara>
-  <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>
-  <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>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to read the hash from.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntHash</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 bc20e9cc3f12..000000000000
--- a/reference/quickhash/quickhashinthash/loadfromstring.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.loadfromstring">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>contents</parameter></term>
-    <listitem>
-     <simpara>
-      The string containing a serialized format of the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntHash</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 fb0d7ac04b13..000000000000
--- a/reference/quickhash/quickhashinthash/savetofile.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.savetofile">
- <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>
-  <simpara>
-   This method stores an existing hash to a file on disk, in the same format
-   that <methodname>QuickHashIntHash::loadFromFile</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to store the hash in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 554657cb7107..000000000000
--- a/reference/quickhash/quickhashinthash/savetostring.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.savetostring">
- <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>
-  <simpara>
-   This method returns a serialized version of the hash in the same format that
-   <methodname>QuickHashIntHash::loadFromString</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 8cad6bd2aa90..000000000000
--- a/reference/quickhash/quickhashinthash/set.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.set">
- <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>int</type><methodname>QuickHashIntHash::set</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   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
-   <constant>QuickHashIntHash::CHECK_FOR_DUPES</constant> during hash creation to prevent duplicate
-   keys from being part of the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add or update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The new value to set the entry with.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   2 if the entry was newly added, 1 if the entry was found and updated, or 0
-   if there was an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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 "\n\nSet->Update\n";
-var_dump($hash->set(46692, 29906));
-var_dump($hash->get(46692));
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Set->Add
-bool(false)
-int(2)
-int(16091)
-
-Set->Update
-int(1)
-int(29906)
-]]>
-   </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/quickhash/quickhashinthash/update.xml b/reference/quickhash/quickhashinthash/update.xml
deleted file mode 100644
index 2f519c976bae..000000000000
--- a/reference/quickhash/quickhashinthash/update.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashinthash.update">
- <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>
-  <simpara>
-   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 <constant>QuickHashIntHash::CHECK_FOR_DUPES</constant> during hash
-   creation to prevent duplicate keys from being part of the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The new value to update the entry with.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 f4f67f0fd375..000000000000
--- a/reference/quickhash/quickhashintset.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.quickhashintset" role="class">
-
- <title>The QuickHashIntSet class</title>
- <titleabbrev>QuickHashIntSet</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntSet intro -->
-  <section xml:id="quickhashintset.intro">
-   &reftitle.intro;
-   <simpara>
-    This class wraps around a set containing integer numbers.
-   </simpara>
-   <simpara>
-    Sets can also be iterated over with <link linkend="control-structures.foreach"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </simpara>
-  </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>
-      <simpara>If enabled, adding duplicate elements to a set (through either <methodname>QuickHashIntSet::add</methodname> or
-      <methodname>QuickHashIntSet::loadFromFile</methodname>) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <simpara>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the <link linkend="ini.memory-limit">memory_limit</link> settings.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-no-hash">
-     <term><constant>QuickHashIntSet::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <simpara>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.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntSet::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <simpara>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintset.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntSet::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <simpara>Selects a variant hashing algorithm.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashintset;
-
-</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/quickhashintset/add.xml b/reference/quickhash/quickhashintset/add.xml
deleted file mode 100644
index 2a38463881fa..000000000000
--- a/reference/quickhash/quickhashintset/add.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.add">
- <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>
-  <simpara>
-   This method adds a new entry to the set, and returns whether the entry was
-   added. Entries are by default always added unless
-   <constant>QuickHashIntSet::CHECK_FOR_DUPES</constant> has been passed when the set was created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 be488e71f3ae..000000000000
--- a/reference/quickhash/quickhashintset/construct.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.construct">
- <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>
-  <simpara>
-   This constructor creates a new <classname>QuickHashIntSet</classname>. 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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      The options that you can pass in are: <constant>QuickHashIntSet::CHECK_FOR_DUPES</constant>,
-      which makes sure no duplicate entries are added to the set;
-      <constant>QuickHashIntSet::DO_NOT_USE_ZEND_ALLOC</constant> to not use PHP's internal memory
-      manager as well as one of <constant>QuickHashIntSet::HASHER_NO_HASH</constant>,
-      <constant>QuickHashIntSet::HASHER_JENKINS1</constant> or <constant>QuickHashIntSet::HASHER_JENKINS2</constant>.
-      These last three configure which hashing algorithm to use. All options
-      can be combined using bitmasks.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntSet</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 a54d42390219..000000000000
--- a/reference/quickhash/quickhashintset/delete.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.delete">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 80462da314b5..000000000000
--- a/reference/quickhash/quickhashintset/exists.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.exists">
- <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>
-  <simpara>
-   This method checks whether an entry with the provided key exists in the
-   set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to check for whether it exists in the set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 4a9c6d7470a0..000000000000
--- a/reference/quickhash/quickhashintset/getsize.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.getsize">
- <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>
-  <simpara>
-   Returns the number of elements in the set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of elements in the set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 b083b4306d03..000000000000
--- a/reference/quickhash/quickhashintset/loadfromfile.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.loadfromfile">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to read the set from.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntSet</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d3d0001c3211..000000000000
--- a/reference/quickhash/quickhashintset/loadfromstring.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.loadfromstring">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>contents</parameter></term>
-    <listitem>
-     <simpara>
-      The string containing a serialized format of the set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>64</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntSet</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 f3c55336a8f2..000000000000
--- a/reference/quickhash/quickhashintset/savetofile.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.savetofile">
- <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>
-  <simpara>
-   This method stores an existing set to a file on disk, in the same format
-   that <methodname>QuickHashIntSet::loadFromFile</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to store the hash in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 88739feed541..000000000000
--- a/reference/quickhash/quickhashintset/savetostring.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintset.savetostring">
- <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>
-  <simpara>
-   This method returns a serialized version of the set in the same format that
-   <methodname>QuickHashIntSet::loadFromString</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 b01650ddb663..000000000000
--- a/reference/quickhash/quickhashintstringhash.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.quickhashintstringhash" role="class">
-
- <title>The QuickHashIntStringHash class</title>
- <titleabbrev>QuickHashIntStringHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashIntStringHash intro -->
-  <section xml:id="quickhashintstringhash.intro">
-   &reftitle.intro;
-   <simpara>
-    This class wraps around a hash containing integer numbers, where the
-    values are strings. Hashes are also available as implementation of the
-    <interfacename>ArrayAccess</interfacename> interface.
-   </simpara>
-   <simpara>
-    Hashes can also be iterated over with <link linkend="control-structures.foreach"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </simpara>
-  </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>
-      <simpara>If enabled, adding duplicate elements to a set (through either <methodname>QuickHashIntStringHash::add</methodname> or
-       <methodname>QuickHashIntStringHash::loadFromFile</methodname>) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <simpara>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the <link linkend="ini.memory-limit">memory_limit</link> settings.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-no-hash">
-     <term><constant>QuickHashIntStringHash::HASHER_NO_HASH</constant></term>
-     <listitem>
-      <simpara>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.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-jenkins1">
-     <term><constant>QuickHashIntStringHash::HASHER_JENKINS1</constant></term>
-     <listitem>
-      <simpara>This is the default hashing function to turn the integer hashes
-      into bucket list indexes.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashintstringhash.constants.hasher-jenkins2">
-     <term><constant>QuickHashIntStringHash::HASHER_JENKINS2</constant></term>
-     <listitem>
-      <simpara>Selects a variant hashing algorithm.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashintstringhash;
-
-</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/quickhashintstringhash/add.xml b/reference/quickhash/quickhashintstringhash/add.xml
deleted file mode 100644
index 8c1da7fe83a7..000000000000
--- a/reference/quickhash/quickhashintstringhash/add.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.add">
- <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>
-  <simpara>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   <constant>QuickHashIntStringHash::CHECK_FOR_DUPES</constant> has been passed when the hash was created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value of the entry to add. If a non-string is passed, it will be
-      converted to a string automatically if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d9a8ff8cc104..000000000000
--- a/reference/quickhash/quickhashintstringhash/construct.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.construct">
- <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>
-  <simpara>
-   This constructor creates a new <classname>QuickHashIntStringHash</classname>. 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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>64</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      The options that you can pass in are: <constant>QuickHashIntStringHash::CHECK_FOR_DUPES</constant>,
-      which makes sure no duplicate entries are added to the hash;
-      <constant>QuickHashIntStringHash::DO_NOT_USE_ZEND_ALLOC</constant> to not use PHP's internal memory
-      manager as well as one of <constant>QuickHashIntStringHash::HASHER_NO_HASH</constant>,
-      <constant>QuickHashIntStringHash::HASHER_JENKINS1</constant> or <constant>QuickHashIntStringHash::HASHER_JENKINS2</constant>.
-      These last three configure which hashing algorithm to use. All options
-      can be combined using bitmasks.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntStringHash</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 db78a1f4d47b..000000000000
--- a/reference/quickhash/quickhashintstringhash/delete.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.delete">
- <refnamediv>
-  <refname>QuickHashIntStringHash::delete</refname>
-  <refpurpose>This method deletes an 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>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 02aeedee0f8d..000000000000
--- a/reference/quickhash/quickhashintstringhash/exists.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.exists">
- <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>
-  <simpara>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to check for whether it exists in the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 4d25e125d133..000000000000
--- a/reference/quickhash/quickhashintstringhash/get.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.get">
- <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>
-  <simpara>
-   This method retrieves a value from the hash by its key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to retrieve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 759f0a9cc043..000000000000
--- a/reference/quickhash/quickhashintstringhash/getsize.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.getsize">
- <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>
-  <simpara>
-   Returns the number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c4399960ab45..000000000000
--- a/reference/quickhash/quickhashintstringhash/loadfromfile.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.loadfromfile">
- <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>
-  <simpara>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature <literal>'QH\0x12\0'</literal>, 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:
-  </simpara>
-  <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>
-  <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>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to read the hash from.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashIntStringHash</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 eeb787754835..000000000000
--- a/reference/quickhash/quickhashintstringhash/loadfromstring.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.loadfromstring">
- <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>
-  <simpara>
-   This factory method creates a new hash from a definition in a string. The
-   format is the same as the one used in "loadFromFile".
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>contents</parameter></term>
-    <listitem>
-     <simpara>
-      The string containing a serialized format of the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new QuickHashIntStringHash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 7e4a000c8b6f..000000000000
--- a/reference/quickhash/quickhashintstringhash/savetofile.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.savetofile">
- <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>
-  <simpara>
-   This method stores an existing hash to a file on disk, in the same format
-   that loadFromFile() can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to store the hash in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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, "forty three" ) );
-var_dump( $hash->exists( 4 ) );
-var_dump( $hash->add( 4, "fifty two" ) );
-
-$hash->saveToFile( '/tmp/test.string.hash' );
-?>
-]]>
-   </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/quickhash/quickhashintstringhash/savetostring.xml b/reference/quickhash/quickhashintstringhash/savetostring.xml
deleted file mode 100644
index bdf4eee30f60..000000000000
--- a/reference/quickhash/quickhashintstringhash/savetostring.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.savetostring">
- <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>
-  <simpara>
-   This method returns a serialized version of the hash in the same format that
-   <methodname>QuickHashIntStringHash::loadFromString</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 7eda7c21bd40..000000000000
--- a/reference/quickhash/quickhashintstringhash/set.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.set">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add or update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value of the entry to add. If a non-string is passed, it will be
-      converted to a string automatically if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   2 if the entry was found and updated, 1 if the entry was newly added or 0
-   if there was an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c049ace25116..000000000000
--- a/reference/quickhash/quickhashintstringhash/update.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashintstringhash.update">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The new value for the entry. If a non-string is passed, it will be
-      converted to a string automatically if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 7267486d8bbe..000000000000
--- a/reference/quickhash/quickhashstringinthash.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.quickhashstringinthash" role="class">
-
- <title>The QuickHashStringIntHash class</title>
- <titleabbrev>QuickHashStringIntHash</titleabbrev>
-
- <partintro>
-
-<!-- {{{ QuickHashStringIntHash intro -->
-  <section xml:id="quickhashstringinthash.intro">
-   &reftitle.intro;
-   <simpara>
-    This class wraps around a hash containing strings, where the
-    values are integer numbers. Hashes are also available as
-    implementation of the <interfacename>ArrayAccess</interfacename> interface.
-   </simpara>
-   <simpara>
-    Hashes can also be iterated over with <link linkend="control-structures.foreach"><literal>foreach</literal></link> as the <interfacename>Iterator</interfacename> interface is
-    implemented as well. The order of which elements are returned in is not
-    guaranteed.
-   </simpara>
-  </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>
-      <simpara>If enabled, adding duplicate elements to a set (through either <methodname>QuickHashStringIntHash::add</methodname> or
-      <methodname>QuickHashStringIntHash::loadFromFile</methodname>) will result in those elements to be dropped from the
-      set. This will take up extra time, so only used when it is required.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="quickhashstringinthash.constants.do-not-use-zend-alloc">
-     <term><constant>QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC</constant></term>
-     <listitem>
-      <simpara>Disables the use of PHP's internal memory manager for internal
-      set structures. With this option enabled, internal allocations will not
-      count towards the <link linkend="ini.memory-limit">memory_limit</link> settings.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.quickhash.entities.quickhashstringinthash;
-
-</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/quickhashstringinthash/add.xml b/reference/quickhash/quickhashstringinthash/add.xml
deleted file mode 100644
index 9a39d5a111a7..000000000000
--- a/reference/quickhash/quickhashstringinthash/add.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.add">
- <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>
-  <simpara>
-   This method adds a new entry to the hash, and returns whether the entry was
-   added. Entries are by default always added unless
-   <constant>QuickHashStringIntHash::CHECK_FOR_DUPES</constant> has been passed when the hash was created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value of the entry to add.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was added, and &false; if the entry was not added.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c64878013cd6..000000000000
--- a/reference/quickhash/quickhashstringinthash/construct.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.construct">
- <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>
-  <simpara>
-   This constructor creates a new <classname>QuickHashStringIntHash</classname>. 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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>64</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      The options that you can pass in are:
-      <constant>QuickHashStringIntHash::CHECK_FOR_DUPES</constant>, which makes sure no duplicate
-      entries are added to the hash and
-      <constant>QuickHashStringIntHash::DO_NOT_USE_ZEND_ALLOC</constant> to not use PHP's internal
-      memory manager.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashStringIntHash</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 dc73c7eb41b0..000000000000
--- a/reference/quickhash/quickhashstringinthash/delete.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.delete">
- <refnamediv>
-  <refname>QuickHashStringIntHash::delete</refname>
-  <refpurpose>This method deletes an 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>
-  <simpara>
-   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.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to delete.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was deleted, and &false; if the entry was not deleted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 770a6da1de72..000000000000
--- a/reference/quickhash/quickhashstringinthash/exists.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.exists">
- <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>
-  <simpara>
-   This method checks whether an entry with the provided key exists in the
-   hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to check for whether it exists in the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when the entry was found, or &false; when the entry is not
-   found.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 92e95eed4d82..000000000000
--- a/reference/quickhash/quickhashstringinthash/get.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.get">
- <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>
-  <simpara>
-   This method retrieves a value from the hash by its key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to retrieve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The value if the key exists, or &null; if the key wasn't part of the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 198da274aa38..000000000000
--- a/reference/quickhash/quickhashstringinthash/getsize.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.getsize">
- <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>
-  <simpara>
-   Returns the number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The number of elements in the hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 a98e309699fe..000000000000
--- a/reference/quickhash/quickhashstringinthash/loadfromfile.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.loadfromfile">
- <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>
-  <simpara>
-   This factory method creates a new hash from a definition file on disk. The
-   file format consists of a signature <literal>'QH\0x21\0'</literal>, 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:
-  </simpara>
-  <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>
-  <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>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to read the hash from.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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 <literal>4</literal> to <literal>4194304</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      The same options that the class' constructor takes; except that the size
-      option is ignored. It is read from the file format (unlike the
-      <classname>QuickHashIntHash</classname> and <classname>QuickHashIntStringHash</classname> classes, where it is
-      automatically calculated from the number of entries in the hash.)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new <classname>QuickHashStringIntHash</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 b11f61bfbbaa..000000000000
--- a/reference/quickhash/quickhashstringinthash/loadfromstring.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.loadfromstring">
- <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>
-  <simpara>
-   This factory method creates a new hash from a definition in a string. The
-   format is the same as the one used in "loadFromFile".
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>contents</parameter></term>
-    <listitem>
-     <simpara>
-      The string containing a serialized format of the hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      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.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      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.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a new QuickHashStringIntHash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 9a02a7024b10..000000000000
--- a/reference/quickhash/quickhashstringinthash/savetofile.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.savetofile">
- <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>
-  <simpara>
-   This method stores an existing hash to a file on disk, in the same format
-   that loadFromFile() can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to store the hash in.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>QuickHashStringIntHash::saveToFile</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash->add( "forty three", 42 ) );
-var_dump( $hash->add( "fifty two", 52 ) );
-
-$hash->saveToFile( '/tmp/test.hash.string' );
-?>
-]]>
-   </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/quickhash/quickhashstringinthash/savetostring.xml b/reference/quickhash/quickhashstringinthash/savetostring.xml
deleted file mode 100644
index 9560477cab0e..000000000000
--- a/reference/quickhash/quickhashstringinthash/savetostring.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.savetostring">
- <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>
-  <simpara>
-   This method returns a serialized version of the hash in the same format that
-   <methodname>QuickHashStringIntHash::loadFromString</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This method returns a serialized format of an existing hash, in the same format
-   that <methodname>QuickHashStringIntHash::loadFromString</methodname> can read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>QuickHashStringIntHash::saveToString</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$hash = new QuickHashStringIntHash( 1024 );
-var_dump( $hash->add( "forty three", 42 ) );
-var_dump( $hash->add( "fifty two", 52 ) );
-
-var_dump( $hash->saveToString() );
-?>
-]]>
-   </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/quickhash/quickhashstringinthash/set.xml b/reference/quickhash/quickhashstringinthash/set.xml
deleted file mode 100644
index 287e5d51803f..000000000000
--- a/reference/quickhash/quickhashstringinthash/set.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.set">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to add or update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value of the entry to add. If a non-string is passed, it will be
-      converted to a string automatically if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   2 if the entry was found and updated, 1 if the entry was newly added or 0
-   if there was an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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( "forty six thousand six hundred ninety two" ) );
-var_dump( $hash->set( "forty six thousand six hundred ninety two", 16091 ) );
-var_dump( $hash->get( "forty six thousand six hundred ninety two" ) );
-
-echo "Set->Update\n";
-var_dump( $hash->set( "forty six thousand six hundred ninety two", 29906 ) );
-var_dump( $hash->get( "forty 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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 e85e604a64e5..000000000000
--- a/reference/quickhash/quickhashstringinthash/update.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhashstringinthash.update">
- <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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The key of the entry to update.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The new value for the entry. If a non-string is passed, it will be
-      converted to a string automatically if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &true; when the entry was found and updated, and &false; if the entry was
-   not part of the hash already.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <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>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 845652e51805..000000000000
--- a/reference/quickhash/setup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="quickhash.setup">
- &reftitle.setup;
-
- <section xml:id="quickhash.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires no additional libraries.
-  </simpara>
- </section>
-
- <section xml:id="quickhash.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;quickhash">&url.pecl.package;quickhash</link>
-  </simpara>
- </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 765d28430f96..000000000000
--- a/reference/quickhash/versions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<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/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/radius/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/radius/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/radius/book.xml b/reference/radius/book.xml
deleted file mode 100644
index 3aa5c354bb78..000000000000
--- a/reference/radius/book.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.radius">
- <?phpdoc extension-membership="pecl" ?>
- <title>Radius</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.radius">
-  &reftitle.intro;
-  <simpara>
-   This package is based on the libradius (Remote Authentication Dial In User
-   Service) of FreeBSD. It allows clients to perform authentication and
-   accounting by means of network requests to remote servers.
-  </simpara>
-  <simpara>
-   This PECL extension adds full support for Radius Authentication
-   (<link xlink:href="&url.rfc;2865">RFC 2865</link>) and Radius Accounting
-   (<link xlink:href="&url.rfc;2866">RFC 2866</link>). This package is available
-   for Unix (tested on FreeBSD and Linux) and for Windows.
-  </simpara>
-  <note>
-   <simpara>
-    An exact description for libradius can be found
-    <link xlink:href="&url.libradius;">here</link>. A detailed description of the
-    configuration file can be found <link xlink:href="&url.libradius.conf;">here</link>.
-   </simpara>
-  </note>
- </preface>
- <!-- }}} -->
-
- &reference.radius.setup;
- &reference.radius.constants;
- &reference.radius.examples;
- &reference.radius.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/radius/configure.xml b/reference/radius/configure.xml
deleted file mode 100644
index 781f5e4fe40a..000000000000
--- a/reference/radius/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="radius.installation">
- &reftitle.install;
- <simpara>
-  &pecl.moved;
- </simpara>
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;radius">&url.pecl.package;radius</link>.
- </simpara>
-</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/radius/constants.xml b/reference/radius/constants.xml
deleted file mode 100644
index 38a5714f4db1..000000000000
--- a/reference/radius/constants.xml
+++ /dev/null
@@ -1,2004 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="radius.constants">
- &reftitle.constants;
- &extension.constants;
-
- <variablelist>
-  <varlistentry xml:id="constant.radius-mppe-key-len">
-   <term>
-    <constant>RADIUS_MPPE_KEY_LEN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The maximum length of MPPE keys.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <section xml:id="radius.constants.options">
-  <title>RADIUS Options</title>
-
-  <simpara>
-   Several RADIUS functions accept option flags as bitmasks. The constants
-   representing those flags are listed below.
-  </simpara>
-
-  <variablelist>
-   <varlistentry xml:id="constant.radius-option-salt">
-    <term>
-     <constant>RADIUS_OPTION_SALT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      When set, this option will result in the attribute value being
-      salt-encrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-option-tagged">
-    <term>
-     <constant>RADIUS_OPTION_TAGGED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      When set, this option will result in the attribute value being tagged
-      with the value of the tag parameter.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
-
- <section xml:id="radius.constants.packets">
-  <title>RADIUS Packet Types</title>
-
-  <simpara>
-   RADIUS packets, whether requests or responses, always include a type. These
-   constants are provided to make it easier to specify types when using
-   <function>radius_create_request</function> and when comparing the result of
-   <function>radius_send_request</function>.
-  </simpara>
-
-  <variablelist>
-   <varlistentry xml:id="constant.radius-access-request">
-    <term>
-     <constant>RADIUS_ACCESS_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Access-Request, used to authenticate a user against a RADIUS server.
-      Access request packets must include a
-      <link linkend="constant.radius-nas-ip-address"><constant>RADIUS_NAS_IP_ADDRESS</constant></link>
-      or a
-      <link linkend="constant.radius-nas-identifier"><constant>RADIUS_NAS_IDENTIFIER</constant></link>
-      attribute, must also include a
-      <link linkend="constant.radius-user-password"><constant>RADIUS_USER_PASSWORD</constant></link>,
-      <link linkend="constant.radius-chap-password"><constant>RADIUS_CHAP_PASSWORD</constant></link>
-      or a
-      <link linkend="constant.radius-state"><constant>RADIUS_STATE</constant></link>
-      attribute, and should include a
-      <link linkend="constant.radius-user-name"><constant>RADIUS_USER_NAME</constant></link>
-      attribute.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-access-accept">
-    <term>
-     <constant>RADIUS_ACCESS_ACCEPT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Access-Accept response to an Access-Request indicating that the
-      RADIUS server authenticated the user successfully.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-access-reject">
-    <term>
-     <constant>RADIUS_ACCESS_REJECT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Access-Reject response to an Access-Request indicating that the
-      RADIUS server could not authenticate the user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-access-challenge">
-    <term>
-     <constant>RADIUS_ACCESS_CHALLENGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Access-Challenge response to an Access-Request indicating that the
-      RADIUS server requires further information in another Access-Request
-      before authenticating the user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-accounting-request">
-    <term>
-     <constant>RADIUS_ACCOUNTING_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Accounting-Request, used to convey accounting information for a
-      service to the RADIUS server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-accounting-response">
-    <term>
-     <constant>RADIUS_ACCOUNTING_RESPONSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      An Accounting-Response response to an Accounting-Request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-coa-request">
-    <term>
-     <constant>RADIUS_COA_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A CoA-Request, sent from the RADIUS server to indicate that the
-      authorisations within the user session have changed. A response must be
-      sent in the form of a CoA-ACK or a CoA-NAK.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-coa-ack">
-    <term>
-     <constant>RADIUS_COA_ACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A CoA-ACK, sent to the RADIUS server to indicate that the user
-      authorisations have been updated.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-coa-nak">
-    <term>
-     <constant>RADIUS_COA_NAK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A CoA-NAK, sent to the RADIUS server to indicate that the user
-      authorisations could not be updated.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-disconnect-request">
-    <term>
-     <constant>RADIUS_DISCONNECT_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A Disconnect-Request, sent from the RADIUS server to indicate that the
-      user session must be terminated.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-disconnect-ack">
-    <term>
-     <constant>RADIUS_DISCONNECT_ACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A Disconnect-ACK, sent to the RADIUS server to indicate that the user
-      session has been terminated.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-disconnect-nak">
-    <term>
-     <constant>RADIUS_DISCONNECT_NAK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A Disconnect-NAK, sent to the RADIUS server to indicate that the user
-      session could not be terminated.
-     </simpara>
-     <simpara>
-      This constant is available in PECL radius 1.3.0 and later.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
-
- <section xml:id="radius.constants.attributes">
-  <title>RADIUS Attribute Types</title>
-
-  <simpara>
-   These constants define RADIUS attribute types that can be used with
-   <function>radius_put_addr</function>, <function>radius_put_attr</function>,
-   <function>radius_put_int</function> and
-   <function>radius_put_string</function>.
-  </simpara>
-
-  <variablelist>
-   <varlistentry xml:id="constant.radius-user-name">
-    <term>
-     <constant>RADIUS_USER_NAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The User-Name attribute. The attribute value is expected to be a
-      <type>string</type> containing the name of the user being authenticated,
-      and can be set using <function>radius_put_attr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-user-password">
-    <term>
-     <constant>RADIUS_USER_PASSWORD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The User-Password attribute. The attribute value is expected to be a
-      <type>string</type> containing the user's password, and can be set using
-      <function>radius_put_attr</function>. This value will be obfuscated on
-      transmission as described in
-      <link xlink:href="&url.rfc;2865">section 5.2 of RFC 2865</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-chap-password">
-    <term>
-     <constant>RADIUS_CHAP_PASSWORD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Chap-Password attribute. The attribute value is expected to be a
-      <type>string</type> with the first byte containing the CHAP identifier,
-      and the subsequent 16 bytes containing the MD5 hash of the CHAP
-      identifier, the plaintext password and the CHAP challenge value
-      concatenated together. Note that the CHAP challenge value should also be
-      sent separately in a
-      <link linkend="constant.radius-chap-challenge"><constant>RADIUS_CHAP_CHALLENGE</constant></link>
-      attribute.
-     </simpara>
-     <example>
-      <title>Using CHAP passwords</title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-// Firstly, we'll create an authentication handle and request.
-$radh = radius_auth_open();
-radius_add_server($radh, $server, $port, $secret, 3, 3);
-radius_create_request($radh, RADIUS_ACCESS_REQUEST);
-
-// Assuming $password contains the plaintext password, we now:
-
-// Generate a challenge.
-$challenge = mt_rand();
-
-// Specify a CHAP identifier.
-$ident = 1;
-
-// Add the Chap-Password attribute.
-$cp = hash('md5', pack('Ca*', $ident, $password.$challenge), true);
-radius_put_attr($radh, RADIUS_CHAP_PASSWORD, pack('C', $ident).$cp);
-
-// Add the Chap-Challenge attribute.
-radius_put_attr($radh, RADIUS_CHAP_CHALLENGE, $challenge);
-
-/* From here, you would add the remaining attributes and
- * call radius_send_request(). */
-?>
-]]>
-      </programlisting>
-     </example>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-nas-ip-address">
-    <term>
-     <constant>RADIUS_NAS_IP_ADDRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The NAS-IP-Address attribute. The attribute value is expected to the IP
-      address of the RADIUS client encoded as an <type>int</type>, which
-      can be set using <function>radius_put_addr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-nas-port">
-    <term>
-     <constant>RADIUS_NAS_PORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The NAS-Port attribute. The attribute value is expected to be the
-      physical port of the user on the RADIUS client encoded as an
-      <type>int</type>, which can be set using
-      <function>radius_put_int</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-service-type">
-    <term>
-     <constant>RADIUS_SERVICE_TYPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Service-Type attribute. The attribute value indicates the service
-      type the user is requesting, and is expected to be an
-      <type>int</type>, which can be set using
-      <function>radius_put_int</function>.
-     </simpara>
-     <para>
-      A number of constants are provided to represent the possible values of
-      this attribute. They include:
-      <simplelist>
-       <member><constant>RADIUS_LOGIN</constant></member>
-       <member><constant>RADIUS_FRAMED</constant></member>
-       <member><constant>RADIUS_CALLBACK_LOGIN</constant></member>
-       <member><constant>RADIUS_CALLBACK_FRAMED</constant></member>
-       <member><constant>RADIUS_OUTBOUND</constant></member>
-       <member><constant>RADIUS_ADMINISTRATIVE</constant></member>
-       <member><constant>RADIUS_NAS_PROMPT</constant></member>
-       <member><constant>RADIUS_AUTHENTICATE_ONLY</constant></member>
-       <member><constant>RADIUS_CALLBACK_NAS_PROMPT</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-protocol">
-    <term>
-     <constant>RADIUS_FRAMED_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      The Framed-Protocol attribute. The attribute value is expected to be an
-      <type>int</type> indicating the framing to be used for framed
-      access, and can be set using <function>radius_put_int</function>. The
-      possible attribute values include these constants:
-      <simplelist>
-       <member><constant>RADIUS_PPP</constant></member>
-       <member><constant>RADIUS_SLIP</constant></member>
-       <member><constant>RADIUS_ARAP</constant></member>
-       <member><constant>RADIUS_GANDALF</constant></member>
-       <member><constant>RADIUS_XYLOGICS</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-ip-address">
-    <term>
-     <constant>RADIUS_FRAMED_IP_ADDRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-IP-Address attribute. The attribute value is expected to be
-      the address of the user's network encoded as an <type>int</type>,
-      which can be set using <function>radius_put_addr</function> and
-      retrieved using <function>radius_cvt_addr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-ip-netmask">
-    <term>
-     <constant>RADIUS_FRAMED_IP_NETMASK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-IP-Netmask attribute. The attribute value is expected to be
-      the netmask of the user's network encoded as an <type>int</type>,
-      which can be set using <function>radius_put_addr</function> and
-      retrieved using <function>radius_cvt_addr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-routing">
-    <term>
-     <constant>RADIUS_FRAMED_ROUTING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-Routing attribute. The attribute value is expected to be an
-      <type>int</type> indicating the routing method for the user, which
-      can be set using <function>radius_put_int</function>.
-     </simpara>
-     <para>
-      Possible values include:
-      <simplelist>
-       <member><literal>0</literal>: No routing</member>
-       <member><literal>1</literal>: Send routing packets</member>
-       <member><literal>2</literal>: Listen for routing packets</member>
-       <member><literal>3</literal>: Send and listen</member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-filter-id">
-    <term>
-     <constant>RADIUS_FILTER_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Filter-ID attribute. The attribute value is expected to be an
-      implementation-specific, human-readable <type>string</type> of filters,
-      which can be set using <function>radius_put_attr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-mtu">
-    <term>
-     <constant>RADIUS_FRAMED_MTU</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-MTU attribute. The attribute value is expected to be an
-      <type>int</type> indicating the MTU to be configured for the user,
-      and can be set using <function>radius_put_int</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-compression">
-    <term>
-     <constant>RADIUS_FRAMED_COMPRESSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      The Framed-Compression attribute. The attribute value is expected to be
-      an <type>int</type> indicating the compression protocol to be used,
-      and can be set using <function>radius_put_int</function>. Possible
-      values include these constants:
-      <simplelist>
-       <member><constant>RADIUS_COMP_NONE</constant>: No compression</member>
-       <member><constant>RADIUS_COMP_VJ</constant>: VJ TCP/IP header compression</member>
-       <member><constant>RADIUS_COMP_IPXHDR</constant>: IPX header compression</member>
-       <member>
-        <constant>RADIUS_COMP_STAC_LZS</constant>:
-        Stac-LZS compression (added in PECL radius 1.3.0b2)
-       </member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-ip-host">
-    <term>
-     <constant>RADIUS_LOGIN_IP_HOST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Login-IP-Host attribute. The attribute value is expected to the IP
-      address to connect the user to, encoded as an <type>int</type>,
-      which can be set using <function>radius_put_addr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-service">
-    <term>
-     <constant>RADIUS_LOGIN_SERVICE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Login-Service attribute. The attribute value is an
-      <type>int</type> indicating the service to connect the user to on
-      the login host. The value can be converted to a PHP integer via
-      <function>radius_cvt_int</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-tcp-port">
-    <term>
-     <constant>RADIUS_LOGIN_TCP_PORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Login-TCP-Port attribute. The attribute value is an
-      <type>int</type> indicating the port to connect the user to on the
-      login host. The value can be converted to a PHP integer via
-      <function>radius_cvt_int</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-reply-message">
-    <term>
-     <constant>RADIUS_REPLY_MESSAGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Reply-Message attribute. The attribute value is a
-      <type>string</type> containing text that may be displayed to the user in
-      response to an access request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-callback-number">
-    <term>
-     <constant>RADIUS_CALLBACK_NUMBER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Callback-Number attribute. The attribute value is a
-      <type>string</type> containing the dialing string to use for callback.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-callback-id">
-    <term>
-     <constant>RADIUS_CALLBACK_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Callback-Id attribute. The attribute value is a <type>string</type>
-      containing an implementation-specific name of the place to be called.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-route">
-    <term>
-     <constant>RADIUS_FRAMED_ROUTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-Route attribute. The attribute value is a <type>string</type>
-      containing an implementation-specific set of routes to be configured for
-      the user.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-ipx-network">
-    <term>
-     <constant>RADIUS_FRAMED_IPX_NETWORK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Framed-IPX-Network attribute. The attribute value is an
-      <type>int</type> containing the IPX network to be configured for the
-      user, or <literal>0xFFFFFFFE</literal> to indicate that the RADIUS
-      client should select the network, and can be accessed via
-      <function>radius_cvt_int</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-state">
-    <term>
-     <constant>RADIUS_STATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The State attribute. The attribute value is an implementation-defined
-      <type>string</type> included in an Access-Challenge from a server that
-      must be included in the subsequent Access-Request, and can be set using
-      <function>radius_put_attr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-class">
-    <term>
-     <constant>RADIUS_CLASS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Class attribute. The attribute value is an arbitrary
-      <type>string</type> included in an Access-Accept message that should
-      then be sent to the accounting server in Accounting-Request messages,
-      and can be set using <function>radius_put_attr</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-vendor-specific">
-    <term>
-     <constant>RADIUS_VENDOR_SPECIFIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The Vendor-Specific attribute. In general, vendor attribute values
-      should be set using <function>radius_put_vendor_addr</function>,
-      <function>radius_put_vendor_attr</function>,
-      <function>radius_put_vendor_int</function> and
-      <function>radius_put_vendor_string</function>, rather than directly.
-     </simpara>
-     <simpara>
-      This constant is mostly useful when interpreting vendor specific
-      attributes in responses from a RADIUS server; when a vendor specific
-      attribute is received, the <function>radius_get_vendor_attr</function>
-      function should be used to access the vendor ID, attribute type and
-      attribute value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-session-timeout">
-    <term>
-     <constant>RADIUS_SESSION_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session timeout
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-idle-timeout">
-    <term>
-     <constant>RADIUS_IDLE_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Idle timeout
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-termination-action">
-    <term>
-     <constant>RADIUS_TERMINATION_ACTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Termination action
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-called-station-id">
-    <term>
-     <constant>RADIUS_CALLED_STATION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Called Station Id
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-calling-station-id">
-    <term>
-     <constant>RADIUS_CALLING_STATION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Calling Station Id
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-nas-identifier">
-    <term>
-     <constant>RADIUS_NAS_IDENTIFIER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      NAS ID
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-proxy-state">
-    <term>
-     <constant>RADIUS_PROXY_STATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Proxy State
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-lat-service">
-    <term>
-     <constant>RADIUS_LOGIN_LAT_SERVICE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Login LAT Service
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-lat-node">
-    <term>
-     <constant>RADIUS_LOGIN_LAT_NODE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Login LAT Node
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-lat-group">
-    <term>
-     <constant>RADIUS_LOGIN_LAT_GROUP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Login LAT Group
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-appletalk-link">
-    <term>
-     <constant>RADIUS_FRAMED_APPLETALK_LINK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Framed Appletalk Link
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-appletalk-network">
-    <term>
-     <constant>RADIUS_FRAMED_APPLETALK_NETWORK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Framed Appletalk Network
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed-appletalk-zone">
-    <term>
-     <constant>RADIUS_FRAMED_APPLETALK_ZONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Framed Appletalk Zone
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-chap-challenge">
-    <term>
-     <constant>RADIUS_CHAP_CHALLENGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Challenge
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-nas-port-type">
-    <term>
-     <constant>RADIUS_NAS_PORT_TYPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      NAS port type, one of:
-      <simplelist>
-       <member><constant>RADIUS_ASYNC</constant></member>
-       <member><constant>RADIUS_SYNC</constant></member>
-       <member><constant>RADIUS_ISDN_SYNC</constant></member>
-       <member><constant>RADIUS_ISDN_ASYNC_V120</constant></member>
-       <member><constant>RADIUS_ISDN_ASYNC_V110</constant></member>
-       <member><constant>RADIUS_VIRTUAL</constant></member>
-       <member><constant>RADIUS_PIAFS</constant></member>
-       <member><constant>RADIUS_HDLC_CLEAR_CHANNEL</constant></member>
-       <member><constant>RADIUS_X_25</constant></member>
-       <member><constant>RADIUS_X_75</constant></member>
-       <member><constant>RADIUS_G_3_FAX</constant></member>
-       <member><constant>RADIUS_SDSL</constant></member>
-       <member><constant>RADIUS_ADSL_CAP</constant></member>
-       <member><constant>RADIUS_ADSL_DMT</constant></member>
-       <member><constant>RADIUS_IDSL</constant></member>
-       <member><constant>RADIUS_ETHERNET</constant></member>
-       <member><constant>RADIUS_XDSL</constant></member>
-       <member><constant>RADIUS_CABLE</constant></member>
-       <member><constant>RADIUS_WIRELESS_OTHER</constant></member>
-       <member><constant>RADIUS_WIRELESS_IEEE_802_11</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-port-limit">
-    <term>
-     <constant>RADIUS_PORT_LIMIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Port Limit
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-login-lat-port">
-    <term>
-     <constant>RADIUS_LOGIN_LAT_PORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Login LAT Port
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-connect-info">
-    <term>
-     <constant>RADIUS_CONNECT_INFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Connect info
-     </simpara>
-    </listitem>
-   </varlistentry>
-    <varlistentry xml:id="constant.radius-acct-status-type">
-    <term>
-     <constant>RADIUS_ACCT_STATUS_TYPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      Accounting status type, one of:
-      <simplelist>
-       <member><constant>RADIUS_START</constant></member>
-       <member><constant>RADIUS_STOP</constant></member>
-       <member><constant>RADIUS_ACCOUNTING_ON</constant></member>
-       <member><constant>RADIUS_ACCOUNTING_OFF</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-delay-time">
-    <term>
-     <constant>RADIUS_ACCT_DELAY_TIME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting delay time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-input-octets">
-    <term>
-     <constant>RADIUS_ACCT_INPUT_OCTETS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting input bytes
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-output-octets">
-    <term>
-     <constant>RADIUS_ACCT_OUTPUT_OCTETS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting output bytes
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-session-id">
-    <term>
-     <constant>RADIUS_ACCT_SESSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting session ID
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-authentic">
-    <term>
-     <constant>RADIUS_ACCT_AUTHENTIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      Accounting authentic, one of:
-      <simplelist>
-       <member><constant>RADIUS_AUTH_RADIUS</constant></member>
-       <member><constant>RADIUS_AUTH_LOCAL</constant></member>
-       <member><constant>RADIUS_AUTH_REMOTE</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-session-time">
-    <term>
-     <constant>RADIUS_ACCT_SESSION_TIME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting session time
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-input-packets">
-    <term>
-     <constant>RADIUS_ACCT_INPUT_PACKETS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting input packets
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-output-packets">
-    <term>
-     <constant>RADIUS_ACCT_OUTPUT_PACKETS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting output packets
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-terminate-cause">
-    <term>
-     <constant>RADIUS_ACCT_TERMINATE_CAUSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      Accounting terminate cause, one of:
-      <simplelist>
-       <member><constant>RADIUS_TERM_USER_REQUEST</constant></member>
-       <member><constant>RADIUS_TERM_LOST_CARRIER</constant></member>
-       <member><constant>RADIUS_TERM_LOST_SERVICE</constant></member>
-       <member><constant>RADIUS_TERM_IDLE_TIMEOUT</constant></member>
-       <member><constant>RADIUS_TERM_SESSION_TIMEOUT</constant></member>
-       <member><constant>RADIUS_TERM_ADMIN_RESET</constant></member>
-       <member><constant>RADIUS_TERM_ADMIN_REBOOT</constant></member>
-       <member><constant>RADIUS_TERM_PORT_ERROR</constant></member>
-       <member><constant>RADIUS_TERM_NAS_ERROR</constant></member>
-       <member><constant>RADIUS_TERM_NAS_REQUEST</constant></member>
-       <member><constant>RADIUS_TERM_NAS_REBOOT</constant></member>
-       <member><constant>RADIUS_TERM_PORT_UNNEEDED</constant></member>
-       <member><constant>RADIUS_TERM_PORT_PREEMPTED</constant></member>
-       <member><constant>RADIUS_TERM_PORT_SUSPENDED</constant></member>
-       <member><constant>RADIUS_TERM_SERVICE_UNAVAILABLE</constant></member>
-       <member><constant>RADIUS_TERM_CALLBACK</constant></member>
-       <member><constant>RADIUS_TERM_USER_ERROR</constant></member>
-       <member><constant>RADIUS_TERM_HOST_REQUEST</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-multi-session-id">
-    <term>
-     <constant>RADIUS_ACCT_MULTI_SESSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting multi session ID
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-acct-link-count">
-    <term>
-     <constant>RADIUS_ACCT_LINK_COUNT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Accounting link count
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <variablelist>
-   <title>Service-Type Constants</title>
-   <varlistentry xml:id="constant.radius-login">
-    <term>
-     <constant>RADIUS_LOGIN</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-framed">
-    <term>
-     <constant>RADIUS_FRAMED</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-callback-login">
-    <term>
-     <constant>RADIUS_CALLBACK_LOGIN</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-callback-framed">
-    <term>
-     <constant>RADIUS_CALLBACK_FRAMED</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-outbound">
-    <term>
-     <constant>RADIUS_OUTBOUND</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-administrative">
-    <term>
-     <constant>RADIUS_ADMINISTRATIVE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-nas-prompt">
-    <term>
-     <constant>RADIUS_NAS_PROMPT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-authenticate-only">
-    <term>
-     <constant>RADIUS_AUTHENTICATE_ONLY</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-callback-nas-prompt">
-    <term>
-     <constant>RADIUS_CALLBACK_NAS_PROMPT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>Framed-Protocol Constants</title>
-   <varlistentry xml:id="constant.radius-ppp">
-    <term>
-     <constant>RADIUS_PPP</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-slip">
-    <term>
-     <constant>RADIUS_SLIP</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-arap">
-    <term>
-     <constant>RADIUS_ARAP</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-gandalf">
-    <term>
-     <constant>RADIUS_GANDALF</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-xylogics">
-    <term>
-     <constant>RADIUS_XYLOGICS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>Framed-Compression Constants</title>
-   <varlistentry xml:id="constant.radius-comp-none">
-    <term>
-     <constant>RADIUS_COMP_NONE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-comp-vj">
-    <term>
-     <constant>RADIUS_COMP_VJ</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-comp-ipxhdr">
-    <term>
-     <constant>RADIUS_COMP_IPXHDR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-comp-stac-lzs">
-    <term>
-     <constant>RADIUS_COMP_STAC_LZS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>NAS Port Type Constants</title>
-   <varlistentry xml:id="constant.radius-async">
-    <term>
-     <constant>RADIUS_ASYNC</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-sync">
-    <term>
-     <constant>RADIUS_SYNC</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-isdn-sync">
-    <term>
-     <constant>RADIUS_ISDN_SYNC</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-isdn-async-v120">
-    <term>
-     <constant>RADIUS_ISDN_ASYNC_V120</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-isdn-async-v110">
-    <term>
-     <constant>RADIUS_ISDN_ASYNC_V110</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-virtual">
-    <term>
-     <constant>RADIUS_VIRTUAL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-piafs">
-    <term>
-     <constant>RADIUS_PIAFS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-hdlc-clear-channel">
-    <term>
-     <constant>RADIUS_HDLC_CLEAR_CHANNEL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-x-25">
-    <term>
-     <constant>RADIUS_X_25</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-x-75">
-    <term>
-     <constant>RADIUS_X_75</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-g-3-fax">
-    <term>
-     <constant>RADIUS_G_3_FAX</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-sdsl">
-    <term>
-     <constant>RADIUS_SDSL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-adsl-cap">
-    <term>
-     <constant>RADIUS_ADSL_CAP</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-adsl-dmt">
-    <term>
-     <constant>RADIUS_ADSL_DMT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-idsl">
-    <term>
-     <constant>RADIUS_IDSL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-ethernet">
-    <term>
-     <constant>RADIUS_ETHERNET</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-xdsl">
-    <term>
-     <constant>RADIUS_XDSL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-cable">
-    <term>
-     <constant>RADIUS_CABLE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-wireless-other">
-    <term>
-     <constant>RADIUS_WIRELESS_OTHER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-wireless-ieee-802-11">
-    <term>
-     <constant>RADIUS_WIRELESS_IEEE_802_11</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>Accounting Status Type Constants</title>
-   <varlistentry xml:id="constant.radius-start">
-    <term>
-     <constant>RADIUS_START</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-stop">
-    <term>
-     <constant>RADIUS_STOP</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-accounting-on">
-    <term>
-     <constant>RADIUS_ACCOUNTING_ON</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-accounting-off">
-    <term>
-     <constant>RADIUS_ACCOUNTING_OFF</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>Accounting Authentic Constants</title>
-   <varlistentry xml:id="constant.radius-auth-radius">
-    <term>
-     <constant>RADIUS_AUTH_RADIUS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-auth-local">
-    <term>
-     <constant>RADIUS_AUTH_LOCAL</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-auth-remote">
-    <term>
-     <constant>RADIUS_AUTH_REMOTE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
-  <variablelist>
-   <title>Accounting Terminate Cause Constants</title>
-   <varlistentry xml:id="constant.radius-term-user-request">
-    <term>
-     <constant>RADIUS_TERM_USER_REQUEST</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-lost-carrier">
-    <term>
-     <constant>RADIUS_TERM_LOST_CARRIER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-lost-service">
-    <term>
-     <constant>RADIUS_TERM_LOST_SERVICE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-idle-timeout">
-    <term>
-     <constant>RADIUS_TERM_IDLE_TIMEOUT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-session-timeout">
-    <term>
-     <constant>RADIUS_TERM_SESSION_TIMEOUT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-admin-reset">
-    <term>
-     <constant>RADIUS_TERM_ADMIN_RESET</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-admin-reboot">
-    <term>
-     <constant>RADIUS_TERM_ADMIN_REBOOT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-port-error">
-    <term>
-     <constant>RADIUS_TERM_PORT_ERROR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-nas-error">
-    <term>
-     <constant>RADIUS_TERM_NAS_ERROR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-nas-request">
-    <term>
-     <constant>RADIUS_TERM_NAS_REQUEST</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-nas-reboot">
-    <term>
-     <constant>RADIUS_TERM_NAS_REBOOT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-port-unneeded">
-    <term>
-     <constant>RADIUS_TERM_PORT_UNNEEDED</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-port-preempted">
-    <term>
-     <constant>RADIUS_TERM_PORT_PREEMPTED</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-port-suspended">
-    <term>
-     <constant>RADIUS_TERM_PORT_SUSPENDED</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-service-unavailable">
-    <term>
-     <constant>RADIUS_TERM_SERVICE_UNAVAILABLE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-callback">
-    <term>
-     <constant>RADIUS_TERM_CALLBACK</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-user-error">
-    <term>
-     <constant>RADIUS_TERM_USER_ERROR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-term-host-request">
-    <term>
-     <constant>RADIUS_TERM_HOST_REQUEST</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
-
- <section xml:id="radius.constants.vendor-specific">
-  <title>RADIUS Vendor Specific Attribute Types</title>
-
-  <variablelist>
-   <varlistentry xml:id="constant.radius-vendor-microsoft">
-    <term>
-     <constant>RADIUS_VENDOR_MICROSOFT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <para>
-      Microsoft specific vendor attributes (<link xlink:href="&url.rfc;2548">RFC 2548</link>), one of:
-       <simplelist>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_RESPONSE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_ERROR</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_PW_1</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_PW_2</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_LM_ENC_PW</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_NT_ENC_PW</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_RAS_VENDOR</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_DOMAIN</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_CHALLENGE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_BAP_USAGE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_LINK_DROP_TIME_LIMIT</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_MPPE_SEND_KEY</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_MPPE_RECV_KEY</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_RAS_VERSION</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_OLD_ARAP_PASSWORD</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_NEW_ARAP_PASSWORD</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_FILTER</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_ACCT_AUTH_TYPE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_ACCT_EAP_TYPE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP2_RESPONSE</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP2_SUCCESS</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_CHAP2_PW</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_SECONDARY_DNS_SERVER</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_PRIMARY_NBNS_SERVER</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_SECONDARY_NBNS_SERVER</constant></member>
-       <member><constant>RADIUS_MICROSOFT_MS_ARAP_CHALLENGE</constant></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-response">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_RESPONSE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-error">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_ERROR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-pw-1">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_PW_1</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-pw-2">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_PW_2</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-lm-enc-pw">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_LM_ENC_PW</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-nt-enc-pw">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_NT_ENC_PW</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-mppe-encryption-policy">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-mppe-encryption-types">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-ras-vendor">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_RAS_VENDOR</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-domain">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_DOMAIN</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-challenge">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_CHALLENGE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap-mppe-keys">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP_MPPE_KEYS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-bap-usage">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_BAP_USAGE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-link-utilization-threshold">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-link-drop-time-limit">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_LINK_DROP_TIME_LIMIT</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-mppe-send-key">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_MPPE_SEND_KEY</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-mppe-recv-key">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_MPPE_RECV_KEY</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-ras-version">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_RAS_VERSION</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-old-arap-password">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_OLD_ARAP_PASSWORD</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-new-arap-password">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_NEW_ARAP_PASSWORD</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-arap-password-change-reason">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-filter">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_FILTER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-acct-auth-type">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_ACCT_AUTH_TYPE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-acct-eap-type">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_ACCT_EAP_TYPE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap2-response">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP2_RESPONSE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap2-success">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP2_SUCCESS</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-chap2-pw">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_CHAP2_PW</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-primary-dns-server">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_PRIMARY_DNS_SERVER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-secondary-dns-server">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_SECONDARY_DNS_SERVER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-primary-nbns-server">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_PRIMARY_NBNS_SERVER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-secondary-nbns-server">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_SECONDARY_NBNS_SERVER</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.radius-microsoft-ms-arap-challenge">
-    <term>
-     <constant>RADIUS_MICROSOFT_MS_ARAP_CHALLENGE</constant>
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/radius/examples.xml b/reference/radius/examples.xml
deleted file mode 100644
index 23393df55202..000000000000
--- a/reference/radius/examples.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="radius.examples">
- &reftitle.examples;
- <!-- FIXME: Copy&paste the examples from this "package" -->
- <para>
-  Howto start?
-  <itemizedlist>
-   <listitem><simpara>get a radius resource</simpara></listitem>
-   <listitem><simpara>configure the library</simpara></listitem>
-   <listitem><simpara>create the request</simpara></listitem>
-   <listitem><simpara>put attributes</simpara></listitem>
-   <listitem><simpara>send the request</simpara></listitem>
-   <listitem><simpara>receive attributes</simpara></listitem>
-   <listitem><simpara>close the radius resource (optional)</simpara></listitem>
-  </itemizedlist>
-  Take also a look at the examples in this package.
- </para>
- <simpara>
-  The package contains an example php script. This script demonstrates howto
-  authenticate with radius using PAP or CHAP (md5). If you authenticate with
-  Microsoft Radius servers then its not possible to use CHAP (md5). If you
-  would like to authenticate with Microsoft Servers you have to use
-  MS-CHAPv1 or MS-CHAPv2, but its more complicated, because you need md4,
-  sha1 and des to generate the right data. The enclosed examples demonstrate
-  all authentication-methods, including MS-CHAPv1 and MS-CHAPv2. To get the
-  MS-CHAP to work you need the <link linkend="ref.mcrypt">mcrypt</link> and
-  the <link linkend="ref.mhash">mhash</link> extension, starting with
-  version 1.2 of the package, the mcrypt extension is no longer needed.
- </simpara>
-</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
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/radius-acct-open.xml b/reference/radius/functions/radius-acct-open.xml
deleted file mode 100644
index e8e528743254..000000000000
--- a/reference/radius/functions/radius-acct-open.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-acct-open">
- <refnamediv>
-  <refname>radius_acct_open</refname>
-  <refpurpose>Creates a Radius handle for accounting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>radius_acct_open</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a handle on success, &false; on error. This function only fails if
-   insufficient memory is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_acct_open</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$res = radius_acct_open ()
-    or die ("Could not create handle");
-print "Handle successfully created";
-?>
-]]>
-   </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/radius/functions/radius-add-server.xml b/reference/radius/functions/radius-add-server.xml
deleted file mode 100644
index df74a4b3368e..000000000000
--- a/reference/radius/functions/radius-add-server.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-add-server">
- <refnamediv>
-  <refname>radius_add_server</refname>
-  <refpurpose>Adds a server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_add_server</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>secret</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max_tries</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>radius_add_server</function> may be called multiple times, and it
-   may be used together with <function>radius_config</function>. At most 10
-   servers may be specified. When multiple servers are given, they are tried
-   in round-robin fashion until a valid response is received, or until each
-   server's <parameter>max_tries</parameter> limit has been reached.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius_handle</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>hostname</parameter> parameter specifies the server host,
-      either as a fully qualified domain name or as a dotted-quad IP address
-      in text form.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      The <parameter>port</parameter> specifies the UDP port to contact on
-      the server. If port is given as 0, the library looks up the
-      <systemitem class="resource">radius/udp</systemitem> or
-      <systemitem class="resource">radacct/udp</systemitem> service in the
-      network services database, and uses the port found there.  If no entry
-      is found, the library uses the standard Radius ports, 1812 for
-      authentication and 1813 for accounting.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>secret</parameter></term>
-    <listitem>
-     <simpara>
-      The shared secret for the server host is passed to the
-      <parameter>secret</parameter> parameter. The Radius protocol ignores
-      all but the leading 128 bytes of the shared secret.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      The timeout for receiving replies from the server is passed to the
-      <parameter>timeout</parameter> parameter, in units of seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_tries</parameter></term>
-    <listitem>
-     <simpara>
-      The maximum number of repeated requests to make before giving up is
-      passed into the <parameter>max_tries</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_add_server</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!radius_add_server($res, 'radius.example.com', 1812, 'testing123', 3, 3)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br>";
-    exit;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_config</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/radius/functions/radius-auth-open.xml b/reference/radius/functions/radius-auth-open.xml
deleted file mode 100644
index ff99e4e99cff..000000000000
--- a/reference/radius/functions/radius-auth-open.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-auth-open">
- <refnamediv>
-  <refname>radius_auth_open</refname>
-  <refpurpose>Creates a Radius handle for authentication</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>radius_auth_open</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a handle on success, &false; on error. This function only fails if
-   insufficient memory is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_auth_open</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$radh = radius_auth_open()
-    or die ("Could not create handle");
-echo "Handle successfully created";
-?>
-]]>
-   </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/radius/functions/radius-close.xml b/reference/radius/functions/radius-close.xml
deleted file mode 100644
index 9bfd0869fdf6..000000000000
--- a/reference/radius/functions/radius-close.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-close">
-   <refnamediv>
-    <refname>radius_close</refname>
-    <refpurpose>Frees all ressources</refpurpose>
-   </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_close</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   It is not needed to call this function because php frees all resources at
-   the end of each request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/radius-config.xml b/reference/radius/functions/radius-config.xml
deleted file mode 100644
index 9913aab34f06..000000000000
--- a/reference/radius/functions/radius-config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.radius-config">
- <refnamediv>
-  <refname>radius_config</refname>
-  <refpurpose>Causes the library to read the given configuration file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_config</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Before issuing any Radius requests, the library must be made aware of the
-   servers it can contact. The easiest way to configure the library is to
-   call <function>radius_config</function>. <function>radius_config</function>
-   causes the library to read a configuration file whose format is described
-   in <link xlink:href="&url.libradius.conf;">radius.conf</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius_handle</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-      The pathname of the configuration file is passed as the file argument
-      to <function>radius_config</function>. The library can also be
-      configured programmatically by calls to
-      <function>radius_add_server</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_add_server</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/radius/functions/radius-create-request.xml b/reference/radius/functions/radius-create-request.xml
deleted file mode 100644
index 543ac9a626ec..000000000000
--- a/reference/radius/functions/radius-create-request.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-create-request">
-   <refnamediv>
-    <refname>radius_create_request</refname>
-    <refpurpose>Create accounting or authentication request</refpurpose>
-   </refnamediv>
-
- <refsect1 role="description">
- &reftitle.description;
- <methodsynopsis>
-  <type>bool</type><methodname>radius_create_request</methodname>
-  <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  <methodparam><type>int</type><parameter>type</parameter></methodparam>
- </methodsynopsis>
-  <simpara>
-   A Radius request consists of a code specifying the kind of request, and
-   zero or more attributes which provide additional information. To begin
-   constructing a new request, call <function>radius_create_request</function>.
-  </simpara>
-  <note>
-   <simpara>
-    Attention: You must call this function, before you can put any attribute!
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>radius_handle</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <simpara>
-      Type is <constant>RADIUS_ACCESS_REQUEST</constant> or
-      <constant>RADIUS_ACCOUNTING_REQUEST</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_create_request</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!radius_create_request($res, RADIUS_ACCESS_REQUEST)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br />";
-    exit;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_send_request</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/radius/functions/radius-cvt-addr.xml b/reference/radius/functions/radius-cvt-addr.xml
deleted file mode 100644
index 3ad4396805a3..000000000000
--- a/reference/radius/functions/radius-cvt-addr.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-cvt-addr">
- <refnamediv>
-  <refname>radius_cvt_addr</refname>
-  <refpurpose>Converts raw data to IP-Address</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_cvt_addr</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts raw data to IP-Address
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Input data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the IP-Address.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_cvt_addr</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-
-    switch ($attr) {
-
-    case RADIUS_FRAMED_IP_ADDRESS:
-        $ip = radius_cvt_addr($data);
-        echo "IP: $ip<br>\n";
-        break;
-
-    case RADIUS_FRAMED_IP_NETMASK:
-        $mask = radius_cvt_addr($data);
-        echo "MASK: $mask<br>\n";
-        break;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_cvt_int</function></member>
-   <member><function>radius_cvt_string</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/radius/functions/radius-cvt-int.xml b/reference/radius/functions/radius-cvt-int.xml
deleted file mode 100644
index 83b0ef72e258..000000000000
--- a/reference/radius/functions/radius-cvt-int.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-cvt-int">
- <refnamediv>
-  <refname>radius_cvt_int</refname>
-  <refpurpose>Converts raw data to integer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>radius_cvt_int</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts raw data to integer
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Input data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the integer, retrieved from data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_cvt_int</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-
-    switch ($attr) {
-
-    case RADIUS_FRAMED_MTU:
-        $mtu = radius_cvt_int($data);
-        echo "MTU: $mtu<br>\n";
-        break;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_cvt_addr</function></member>
-   <member><function>radius_cvt_string</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/radius/functions/radius-cvt-string.xml b/reference/radius/functions/radius-cvt-string.xml
deleted file mode 100644
index 8e84a2e3e05c..000000000000
--- a/reference/radius/functions/radius-cvt-string.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-cvt-string">
- <refnamediv>
-  <refname>radius_cvt_string</refname>
-  <refpurpose>Converts raw data to string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_cvt_string</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Converts raw data to string
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Input data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string, retrieved from data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_cvt_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-
-    switch ($attr) {
-
-    case RADIUS_FILTER_ID:
-        $id = radius_cvt_string($data);
-        echo "Filter ID: $id<br>\n";
-        break;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_cvt_addr</function></member>
-   <member><function>radius_cvt_int</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/radius/functions/radius-demangle-mppe-key.xml b/reference/radius/functions/radius-demangle-mppe-key.xml
deleted file mode 100644
index 0fbf976de672..000000000000
--- a/reference/radius/functions/radius-demangle-mppe-key.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.radius-demangle-mppe-key">
- <refnamediv>
-  <refname>radius_demangle_mppe_key</refname>
-  <refpurpose>Derives mppe-keys from mangled data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_demangle_mppe_key</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mangled</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   When using MPPE with MS-CHAPv2, the send- and recv-keys are mangled
-   (see <link xlink:href="&url.rfc;2548">RFC 2548</link>), however this function is
-   useless, because I don't think that there is or will be a PPTP-MPPE
-   implementation in PHP.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   <varlistentry>
-    <term><parameter>mangled</parameter></term>
-    <listitem>
-     <simpara>
-      The mangled data to demangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the demangled string, or &false; on error.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:n
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/radius-demangle.xml b/reference/radius/functions/radius-demangle.xml
deleted file mode 100644
index 7040e2ae5511..000000000000
--- a/reference/radius/functions/radius-demangle.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-demangle">
- <refnamediv>
-  <refname>radius_demangle</refname>
-  <refpurpose>Demangles data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_demangle</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>mangled</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Some data (Passwords, MS-CHAPv1 MPPE-Keys) is mangled for security reasons,
-   and must be demangled before you can use them.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   <varlistentry>
-    <term><parameter>mangled</parameter></term>
-    <listitem>
-     <simpara>
-      The mangled data to demangle
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the demangled string, or &false; on error.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/radius-get-attr.xml b/reference/radius/functions/radius-get-attr.xml
deleted file mode 100644
index f47d90642ebe..000000000000
--- a/reference/radius/functions/radius-get-attr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-get-attr">
- <refnamediv>
-  <refname>radius_get_attr</refname>
-  <refpurpose>Extracts an attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>radius_get_attr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Like Radius requests, each response may contain zero or more attributes.
-   After a response has been received successfully by
-   <function>radius_send_request</function>, its attributes can be extracted
-   one by one using <function>radius_get_attr</function>. Each time
-   <function>radius_get_attr</function> is called, it gets the next attribute
-   from the current response.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array containing the attribute-type and the data, or
-   error number &lt;= 0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_get_attr</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-    printf("Got Attr:%d %d Bytes %s\n", $attr, strlen($data), bin2hex($data));
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_attr</function></member>
-   <member><function>radius_get_vendor_attr</function></member>
-   <member><function>radius_put_vendor_attr</function></member>
-   <member><function>radius_send_request</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/radius/functions/radius-get-tagged-attr-data.xml b/reference/radius/functions/radius-get-tagged-attr-data.xml
deleted file mode 100644
index 6e6e043da02b..000000000000
--- a/reference/radius/functions/radius-get-tagged-attr-data.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-get-tagged-attr-data">
- <refnamediv>
-  <refname>radius_get_tagged_attr_data</refname>
-  <refpurpose>Extracts the data from a tagged attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>radius_get_tagged_attr_data</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If a tagged attribute has been returned from
-   <function>radius_get_attr</function>,
-   <function>radius_get_tagged_attr_data</function> will return the data from
-   the attribute.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The tagged attribute to be decoded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the data from the tagged attribute &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_get_tagged_attr_data</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-
-    $tag = radius_get_tagged_attr_tag($data);
-    $value = radius_get_tagged_attr_data($data);
-
-    printf("Got tagged attribute with tag %d and value %s\n", $tag, $value);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_get_attr</function></member>
-   <member><function>radius_get_tagged_attr_tag</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/radius/functions/radius-get-tagged-attr-tag.xml b/reference/radius/functions/radius-get-tagged-attr-tag.xml
deleted file mode 100644
index edd086c15921..000000000000
--- a/reference/radius/functions/radius-get-tagged-attr-tag.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-get-tagged-attr-tag">
- <refnamediv>
-  <refname>radius_get_tagged_attr_tag</refname>
-  <refpurpose>Extracts the tag from a tagged attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>radius_get_tagged_attr_tag</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If a tagged attribute has been returned from
-   <function>radius_get_attr</function>,
-   <function>radius_get_tagged_attr_data</function> will return the tag from
-   the attribute.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The tagged attribute to be decoded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the tag from the tagged attribute &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_get_tagged_attr_tag</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-
-    $tag = radius_get_tagged_attr_tag($data);
-    $value = radius_get_tagged_attr_data($data);
-
-    printf("Got tagged attribute with tag %d and value %s\n", $tag, $value);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_get_attr</function></member>
-   <member><function>radius_get_tagged_attr_data</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/radius/functions/radius-get-vendor-attr.xml b/reference/radius/functions/radius-get-vendor-attr.xml
deleted file mode 100644
index d4ea39c22dbe..000000000000
--- a/reference/radius/functions/radius-get-vendor-attr.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xml:id="function.radius-get-vendor-attr" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>radius_get_vendor_attr</refname>
-  <refpurpose>Extracts a vendor specific attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>radius_get_vendor_attr</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If <function>radius_get_attr</function> returns
-   <constant>RADIUS_VENDOR_SPECIFIC</constant>,
-   <function>radius_get_vendor_attr</function> may be called to determine the
-   vendor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Input data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an associative array containing the attribute-type, vendor and the
-   data, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_get_vendor_attr</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-while ($resa = radius_get_attr($res)) {
-
-    if (!is_array($resa)) {
-        printf ("Error getting attribute: %s\n",  radius_strerror($res));
-        exit;
-    }
-
-    $attr = $resa['attr'];
-    $data = $resa['data'];
-    printf("Got Attr:%d %d Bytes %s\n", $attr, strlen($data), bin2hex($data));
-    if ($attr == RADIUS_VENDOR_SPECIFIC) {
-
-        $resv = radius_get_vendor_attr($data);
-        if (is_array($resv)) {
-            $vendor = $resv['vendor'];
-            $attrv = $resv['attr'];
-            $datav = $resv['data'];
-            printf("Got Vendor Attr:%d %d Bytes %s\n", $attrv, strlen($datav), bin2hex($datav));
-        }
-
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_get_attr</function></member>
-   <member><function>radius_put_vendor_attr</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/radius/functions/radius-put-addr.xml b/reference/radius/functions/radius-put-addr.xml
deleted file mode 100644
index 721f3873a440..000000000000
--- a/reference/radius/functions/radius-put-addr.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-addr">
- <refnamediv>
-  <refname>radius_put_addr</refname>
-  <refpurpose>Attaches an IP address attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_addr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>addr</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches an IP address attribute to the current RADIUS request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>addr</parameter></term>
-    <listitem>
-     <simpara>
-      An IPv4 address in string form, such as <literal>10.0.0.1</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </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/radius/functions/radius-put-attr.xml b/reference/radius/functions/radius-put-attr.xml
deleted file mode 100644
index b45d50a763b8..000000000000
--- a/reference/radius/functions/radius-put-attr.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-attr">
- <refnamediv>
-  <refname>radius_put_attr</refname>
-  <refpurpose>Attaches a binary attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_attr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches a binary attribute to the current RADIUS request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value, which will be treated as a raw binary string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_put_attr</function> example</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-mt_srand(time());
-$chall = mt_rand();
-$chapval = hash('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>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_get_attr</function></member>
-   <member><function>radius_get_vendor_attr</function></member>
-   <member><function>radius_put_vendor_attr</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/radius/functions/radius-put-int.xml b/reference/radius/functions/radius-put-int.xml
deleted file mode 100644
index 983fe0441a6e..000000000000
--- a/reference/radius/functions/radius-put-int.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-int">
- <refnamediv>
-  <refname>radius_put_int</refname>
-  <refpurpose>Attaches an integer attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_int</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches an integer attribute to the current RADIUS request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_put_int</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!radius_put_int($res, RAD_FRAMED_PROTOCOL, RAD_PPP)) {
-   echo 'RadiusError:' . radius_strerror($res). "\n<br />";
-   exit;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_string</function></member>
-   <member><function>radius_put_vendor_int</function></member>
-   <member><function>radius_put_vendor_string</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/radius/functions/radius-put-string.xml b/reference/radius/functions/radius-put-string.xml
deleted file mode 100644
index 712498540f63..000000000000
--- a/reference/radius/functions/radius-put-string.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-string">
- <refnamediv>
-  <refname>radius_put_string</refname>
-  <refpurpose>Attaches a string attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_string</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches a string attribute to the current RADIUS request. In general,
-   <function>radius_put_attr</function> is a more useful function for
-   attaching string attributes, as it is binary safe.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value. This value is expected by the underlying library
-      to be null terminated, therefore this parameter is not binary safe.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_put_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!radius_put_string($res, RADIUS_USER_NAME, 'billy')) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br />";
-    exit;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_int</function></member>
-   <member><function>radius_put_vendor_int</function></member>
-   <member><function>radius_put_vendor_string</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/radius/functions/radius-put-vendor-addr.xml b/reference/radius/functions/radius-put-vendor-addr.xml
deleted file mode 100644
index 2c574a186506..000000000000
--- a/reference/radius/functions/radius-put-vendor-addr.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-vendor-addr">
- <refnamediv>
-  <refname>radius_put_vendor_addr</refname>
-  <refpurpose>Attaches a vendor specific IP address attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_vendor_addr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>vendor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>addr</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches an IP address vendor specific attribute to the current RADIUS
-   request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.vendor;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>addr</parameter></term>
-    <listitem>
-     <simpara>
-      An IPv4 address in string form, such as <literal>10.0.0.1</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </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/radius/functions/radius-put-vendor-attr.xml b/reference/radius/functions/radius-put-vendor-attr.xml
deleted file mode 100644
index f75af26f3a17..000000000000
--- a/reference/radius/functions/radius-put-vendor-attr.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-vendor-attr">
-   <refnamediv>
-    <refname>radius_put_vendor_attr</refname>
-    <refpurpose>Attaches a vendor specific binary attribute</refpurpose>
-   </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_vendor_attr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>vendor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches a vendor specific binary attribute to the current RADIUS request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.vendor;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value, which will be treated as a raw binary string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>radius_put_vendor_attr</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!radius_put_vendor_attr($res, RADIUS_VENDOR_MICROSOFT, RAD_MICROSOFT_MS_CHAP_CHALLENGE, $challenge)) {
-    echo 'RadiusError:' . radius_strerror($res). "\n<br />";
-    exit;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_get_vendor_attr</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/radius/functions/radius-put-vendor-int.xml b/reference/radius/functions/radius-put-vendor-int.xml
deleted file mode 100644
index 16aeae851b77..000000000000
--- a/reference/radius/functions/radius-put-vendor-int.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-vendor-int">
- <refnamediv>
-  <refname>radius_put_vendor_int</refname>
-  <refpurpose>Attaches a vendor specific integer attribute</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_vendor_int</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>vendor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches a vendor specific integer attribute to the current RADIUS request.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.vendor;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_vendor_string</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/radius/functions/radius-put-vendor-string.xml b/reference/radius/functions/radius-put-vendor-string.xml
deleted file mode 100644
index 46eb4cdc9c7b..000000000000
--- a/reference/radius/functions/radius-put-vendor-string.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-put-vendor-string">
-   <refnamediv>
-    <refname>radius_put_vendor_string</refname>
-    <refpurpose>Attaches a vendor specific string attribute</refpurpose>
-   </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>radius_put_vendor_string</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>vendor</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attaches a vendor specific string attribute to the current RADIUS request.
-   In general, <function>radius_put_vendor_attr</function> is a more useful
-   function for attaching string attributes, as it is binary safe.
-  </simpara>
-  &radius.request.required;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-   &radius.parameter.vendor;
-   &radius.parameter.attribute-type;
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The attribute value. This value is expected by the underlying library
-      to be null terminated, therefore this parameter is not binary safe.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &radius.parameter.options;
-   &radius.parameter.tag;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL radius 1.3.0</entry>
-      <entry>
-       The <parameter>options</parameter> and <parameter>tag</parameter>
-       parameters were added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_vendor_int</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/radius/functions/radius-request-authenticator.xml b/reference/radius/functions/radius-request-authenticator.xml
deleted file mode 100644
index 796482b10f0d..000000000000
--- a/reference/radius/functions/radius-request-authenticator.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-request-authenticator">
- <refnamediv>
-  <refname>radius_request_authenticator</refname>
-  <refpurpose>Returns the request authenticator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_request_authenticator</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The request authenticator is needed for demangling mangled data like
-   passwords and encryption-keys.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the request authenticator as string, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_demangle</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/radius/functions/radius-salt-encrypt-attr.xml b/reference/radius/functions/radius-salt-encrypt-attr.xml
deleted file mode 100644
index ae4f5d5585ef..000000000000
--- a/reference/radius/functions/radius-salt-encrypt-attr.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-salt-encrypt-attr">
- <refnamediv>
-  <refname>radius_salt_encrypt_attr</refname>
-  <refpurpose>Salt-encrypts a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>radius_salt_encrypt_attr</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Applies the RADIUS salt-encryption algorithm to the given value.
-  </simpara>
-  <simpara>
-   In general, this is achieved automatically by providing the
-   <constant>RADIUS_OPTION_SALT</constant> option to an attribute setter
-   function, but this function can be used if low-level request construction
-   is required.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The data to be salt-encrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the salt-encrypted data &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_put_addr</function></member>
-   <member><function>radius_put_attr</function></member>
-   <member><function>radius_put_int</function></member>
-   <member><function>radius_put_string</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/radius/functions/radius-send-request.xml b/reference/radius/functions/radius-send-request.xml
deleted file mode 100644
index cc30df0d6343..000000000000
--- a/reference/radius/functions/radius-send-request.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-send-request">
- <refnamediv>
-  <refname>radius_send_request</refname>
-  <refpurpose>Sends the request and waits for a reply</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>radius_send_request</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   After the Radius request has been constructed, it is sent by
-   <function>radius_send_request</function>.
-  </simpara>
-  <simpara>
-   The <function>radius_send_request</function> function sends the request and
-   waits for a valid reply, retrying the defined servers in round-robin
-   fashion as necessary.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If a valid response is received, <function>radius_send_request</function>
-   returns the Radius code which specifies the type of the response. This will
-   typically be <constant>RADIUS_ACCESS_ACCEPT</constant>,
-   <constant>RADIUS_ACCESS_REJECT</constant>, or
-   <constant>RADIUS_ACCESS_CHALLENGE</constant>. If no valid response is
-   received, <function>radius_send_request</function> returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>radius_create_request</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/radius/functions/radius-server-secret.xml b/reference/radius/functions/radius-server-secret.xml
deleted file mode 100644
index 79cfd6b30e91..000000000000
--- a/reference/radius/functions/radius-server-secret.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-server-secret">
- <refnamediv>
-  <refname>radius_server_secret</refname>
-  <refpurpose>Returns the shared secret</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_server_secret</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The shared secret is needed as salt for demangling mangled data like
-   passwords and encryption-keys.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the server's shared secret as string, or &false; on error.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/radius-strerror.xml b/reference/radius/functions/radius-strerror.xml
deleted file mode 100644
index 75b441af92ab..000000000000
--- a/reference/radius/functions/radius-strerror.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/radius.xml, last change in rev 1.9 -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.radius-strerror">
- <refnamediv>
-  <refname>radius_strerror</refname>
-  <refpurpose>Returns an error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>radius_strerror</methodname>
-   <methodparam><type>resource</type><parameter>radius_handle</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If Radius-functions fail then they record an error message. This error
-   message can be retrieved with this function.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &radius.parameter.handle;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns error messages as string from failed radius functions.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/reference.xml b/reference/radius/reference.xml
deleted file mode 100644
index 91feca46d95e..000000000000
--- a/reference/radius/reference.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.radius" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Radius &Functions;</title>
-
- &reference.radius.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/radius/setup.xml b/reference/radius/setup.xml
deleted file mode 100644
index 6cd9dd57c6fd..000000000000
--- a/reference/radius/setup.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="radius.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.radius.configure;
- <!-- }}} -->
-
-</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/radius/versions.xml b/reference/radius/versions.xml
deleted file mode 100644
index b659f6833c40..000000000000
--- a/reference/radius/versions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='radius_acct_open' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_add_server' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_auth_open' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_close' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_config' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_create_request' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_cvt_addr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_cvt_int' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_cvt_string' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_demangle' from='PECL radius &gt;= 1.2.0'/>
- <function name='radius_demangle_mppe_key' from='PECL radius &gt;= 1.2.0'/>
- <function name='radius_get_attr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_get_tagged_attr_data' from='PECL radius &gt;= 1.3.0'/>
- <function name='radius_get_tagged_attr_tag' from='PECL radius &gt;= 1.3.0'/>
- <function name='radius_get_vendor_attr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_addr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_attr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_int' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_string' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_vendor_addr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_vendor_attr' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_vendor_int' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_put_vendor_string' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_request_authenticator' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_salt_encrypt_attr' from='PECL radius &gt;= 1.3.0'/>
- <function name='radius_send_request' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_server_secret' from='PECL radius &gt;= 1.1.0'/>
- <function name='radius_strerror' from='PECL radius &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/rar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/rar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/rar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/rar/book.xml b/reference/rar/book.xml
deleted file mode 100644
index 47e9a39e9cd6..000000000000
--- a/reference/rar/book.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.rar">
- <?phpdoc extension-membership="pecl" ?>
- <title>Rar Archiving</title>
- <titleabbrev>Rar</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.rar">
-  &reftitle.intro;
-  <simpara>
-   Rar is a powerful and effective archiver created by Eugene Roshal.
-   This extension gives you possibility to read Rar archives but
-   doesn't support writing Rar archives, because this is not supported
-   by the UnRar library and is directly prohibited by its license.
-  </simpara>
-  <simpara>
-   More information about Rar and UnRar can be found at <link xlink:href="&url.rar;">&url.rar;</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.rar.setup;
- &reference.rar.constants;
- &reference.rar.examples;
- &reference.rar.reference;
- &reference.rar.rararchive;
- &reference.rar.rarentry;
- &reference.rar.rarexception;
-
-</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/rar/constants.xml b/reference/rar/constants.xml
deleted file mode 100644
index 1eee6cdd9696..000000000000
--- a/reference/rar/constants.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="rar.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.rar-host-msdos">
-   <term>
-    <constant>RAR_HOST_MSDOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <link linkend="rarentry.constants.host-msdos"><constant>RarEntry::HOST_MSDOS</constant></link> instead.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rar-host-os2">
-   <term>
-    <constant>RAR_HOST_OS2</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <link linkend="rarentry.constants.host-os2"><constant>RarEntry::HOST_OS2</constant></link> instead.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rar-host-win32">
-   <term>
-    <constant>RAR_HOST_WIN32</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <link linkend="rarentry.constants.host-win32"><constant>RarEntry::HOST_WIN32</constant></link> instead.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rar-host-unix">
-   <term>
-    <constant>RAR_HOST_UNIX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <link linkend="rarentry.constants.host-unix"><constant>RarEntry::HOST_UNIX</constant></link> instead.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rar-host-beos">
-   <term>
-    <constant>RAR_HOST_BEOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <link linkend="rarentry.constants.host-beos"><constant>RarEntry::HOST_BEOS</constant></link> instead.
-    </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/rar/examples.xml b/reference/rar/examples.xml
deleted file mode 100644
index e8fa7cbc7853..000000000000
--- a/reference/rar/examples.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rar.examples">
- &reftitle.examples;
-
- <simpara>
-  See also the examples under <link linkend="wrappers.rar"><literal>rar://</literal> wrapper</link>.
- </simpara>
-
- <example>
-  <title>On-the-fly decompression</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-if (!array_key_exists("i", $_GET) || !is_numeric($_GET["i"]))
-    die("Index unspecified or non-numeric");
-$index = (int) $_GET["i"];
-
-$arch = RarArchive::open("example.rar");
-if ($arch === FALSE)
-    die("Cannot open example.rar");
-
-$entries = $arch->getEntries();
-if ($entries === FALSE)
-    die("Cannot retrieve entries");
-
-if (!array_key_exists($index, $entries))
-    die("No such index: $index");
-
-$orfilename = $entries[$index]->getName(); //UTF-8 encoded
-
-$filesize = $entries[$index]->getUnpackedSize();
-
-/* you could check HTTP_IF_MODIFIED_SINCE here and compare with
- * $entries[$index]->getFileTime(). You could also send a
- * "Last modified" header */
-
-$fp = $entries[$index]->getStream();
-if ($fp === FALSE)
-    die("Cannot open file with index $index insided the archive.");
-
-$arch->close(); //no longer needed; stream is independent
-
-function detectUserAgent() {
-    if (!array_key_exists('HTTP_USER_AGENT', $_SERVER))
-        return "Other";
-
-    $uas = $_SERVER['HTTP_USER_AGENT'];
-    if (preg_match("@Opera/@", $uas))
-        return "Opera";
-    if (preg_match("@Firefox/@", $uas))
-        return "Firefox";
-    if (preg_match("@Chrome/@", $uas))
-        return "Chrome";
-    if (preg_match("@MSIE ([0-9.]+);@", $uas, $matches)) {
-        if (((float) $matches[1]) >= 7.0)
-            return "IE";
-    }
-
-    return "Other";
-}
-
-/*
- * We have 3 options:
- * - For FF and Opera, which support RFC 2231, use that format.
- * - For IE and Chrome, use attwithfnrawpctenclong
- *   (http://greenbytes.de/tech/tc2231/#attwithfnrawpctenclong)
- * - For the others, convert to ISO-8859-1, if possible
- */
-$formatRFC2231 = 'Content-Disposition: attachment; filename*=UTF-8\'\'%s';
-$formatDef = 'Content-Disposition: attachment; filename="%s"';
-
-switch (detectUserAgent()) {
-    case "Opera":
-    case "Firefox":
-        $orfilename = rawurlencode($orfilename);
-        $format = $formatRFC2231;
-        break;
-
-    case "IE":
-    case "Chrome":
-        $orfilename = rawurlencode($orfilename);
-        $format = $formatDef;
-        break;
-    default:
-        if (function_exists('iconv'))
-            $orfilename =
-                @iconv("UTF-8", "ISO-8859-1//TRANSLIT", $orfilename);
-        $format = $formatDef;
-}
-
-header(sprintf($format, $orfilename));
-//cannot send error messages from now on (headers already sent)
-
-//replace by real content type, perhaps infering from the file extension
-$contentType = "application/octet-stream";
-header("Content-Type: $contentType");
-
-header("Content-Transfer-Encoding: binary");
-
-header("Content-Length: $filesize");
-
-if ($_SERVER['REQUEST_METHOD'] == "HEAD")
-    die();
-
-while (!feof($fp)) {
-    $s = @fread($fp, 8192);
-    if ($s === false)
-        break; //useless to send error messages
-
-    echo $s;
-}
-?>
-]]>
-  </programlisting>
- </example>
- <simpara>
-  This example opens a RAR file and presents the requested file inside the RAR archive for download to the client.
- </simpara>
-
- <example>
-  <title>RAR extension filesystem extraction example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Can't open Rar archive");
-
-$entries = rar_list($rar_file);
-
-foreach ($entries as $entry) {
-    echo 'Filename: ' . $entry->getName() . "\n";
-    echo 'Packed size: ' . $entry->getPackedSize() . "\n";
-    echo 'Unpacked size: ' . $entry->getUnpackedSize() . "\n";
-
-    $entry->extract('/dir/extract/to/');
-}
-
-rar_close($rar_file);
-
-?>
-]]>
-  </programlisting>
- </example>
- <simpara>
-  This example opens a RAR file archive and extracts each entry to the
-  specified directory.
- </simpara>
-
-</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/rar/functions/rar-wrapper-cache-stats.xml b/reference/rar/functions/rar-wrapper-cache-stats.xml
deleted file mode 100644
index b8b8c2b413d9..000000000000
--- a/reference/rar/functions/rar-wrapper-cache-stats.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rar-wrapper-cache-stats">
- <refnamediv>
-  <refname>rar_wrapper_cache_stats</refname>
-  <refpurpose>Cache hits and misses for the URL wrapper</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rar_wrapper_cache_stats</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rar/rararchive.xml b/reference/rar/rararchive.xml
deleted file mode 100644
index a158b5adb053..000000000000
--- a/reference/rar/rararchive.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rararchive" role="class">
-
- <title>The RarArchive class</title>
- <titleabbrev>RarArchive</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RarArchive intro -->
-  <section xml:id="rararchive.intro">
-   &reftitle.intro;
-   <simpara>
-    This class represents a RAR archive, which may be formed by several volumes (parts) and which contains
-    a number of RAR entries (i.e., files, directories and other special objects such as symbolic links).
-   </simpara>
-   <simpara>
-    Objects of this class can be traversed, yielding the entries stored in the respective RAR archive.
-    Those entries can also be obtained through <methodname>RarArchive::getEntry</methodname> and
-    <methodname>RarArchive::getEntries</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rararchive.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RarArchive</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>RarArchive</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Traversable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rararchive')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.rar.entities.rararchive;
-
-</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/rar/rararchive/close.xml b/reference/rar/rararchive/close.xml
deleted file mode 100644
index bdcbc7f67fff..000000000000
--- a/reference/rar/rararchive/close.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.close">
- <refnamediv>
-  <refname>RarArchive::close</refname>
-  <refname>rar_close</refname>
-  <refpurpose>Close RAR archive and free all resources</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RarArchive::close</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>rar_close</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Close RAR archive and free all allocated resources.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 2.0.0</entry>
-      <entry>
-       The RAR entries returned by <methodname>RarArchive::getEntry</methodname>
-       and <methodname>RarArchive::getEntries</methodname> are now invalidated when
-       calling this method. This means that all instance methods called for
-       such entries and not guaranteed to succeed.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('latest_winrar.rar');
-echo $rar_arch."\n";
-$rar_arch->close();
-echo $rar_arch."\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-RAR Archive "D:\php_rar\trunk\tests\latest_winrar.rar"
-RAR Archive "D:\php_rar\trunk\tests\latest_winrar.rar" (closed)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = rar_open('latest_winrar.rar');
-echo $rar_arch."\n";
-rar_close($rar_arch);
-echo $rar_arch."\n";
-?>
-]]>
-    </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/rar/rararchive/getcomment.xml b/reference/rar/rararchive/getcomment.xml
deleted file mode 100644
index 3c197af145f7..000000000000
--- a/reference/rar/rararchive/getcomment.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.getcomment">
- <refnamediv>
-  <refname>RarArchive::getComment</refname>
-  <refname>rar_comment_get</refname>
-  <refpurpose>Get comment text from the RAR archive</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarArchive::getComment</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>string</type><methodname>rar_comment_get</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get the (global) comment stored in the RAR archive. It may be up to 64 KiB long.
-  </simpara>
-  <note>
-   <simpara>
-    This extension does not support comments at the entry level.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the comment or &null; if there is none.
-  </simpara>
-  <note>
-    <simpara>
-      RAR has currently no support for unicode comments. The encoding of the
-      result of this function is not specified, but it will probably be
-      Windows-1252.
-    </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('commented.rar');
-echo $rar_arch->getComment();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-This is the comment of the file commented.rar.
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = rar_open('commented.rar');
-echo rar_comment_get($rar_arch);
-?>
-]]>
-    </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/rar/rararchive/getentries.xml b/reference/rar/rararchive/getentries.xml
deleted file mode 100644
index 981992e53b0b..000000000000
--- a/reference/rar/rararchive/getentries.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.getentries">
- <refnamediv>
-  <refname>RarArchive::getEntries</refname>
-  <refname>rar_list</refname>
-  <refpurpose>Get full list of entries from the RAR archive</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>false</type></type><methodname>RarArchive::getEntries</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>rar_list</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get entries list (files and directories) from the RAR archive.
-  </simpara>
-  <note>
-   <simpara>
-    If the archive has
-    entries with the same name, this method, together with <type>RarArchive</type>
-    <literal>foreach</literal> iteration and array-like access with numeric indexes,
-    are the only ones to access all the entries (i.e.,
-    <methodname>RarArchive::getEntry</methodname> and the <link linkend="wrappers.rar">
-    <literal>rar://</literal> wrapper</link> are insufficient).
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>rar_list</function> returns array of <type>RarEntry</type> objects
-   &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 3.0.0</entry>
-      <entry>
-       Support for RAR archives with repeated entry names is no longer defective.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('solid.rar');
-if ($rar_arch === FALSE)
-    die("Could not open RAR archive.");
-
-$rar_entries = $rar_arch->getEntries();
-if ($rar_entries === FALSE)
-    die("Could not retrieve entries.");
-
-echo "Found " . count($rar_entries) . " entries.\n";
-
-foreach ($rar_entries as $e) {
-    echo $e;
-    echo "\n";
-}
-$rar_arch->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Found 2 entries.
-RarEntry for file "tese.txt" (23b93a7a)
-RarEntry for file "unrardll.txt" (2ed64b6e)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = rar_open('solid.rar');
-if ($rar_arch === FALSE)
-    die("Could not open RAR archive.");
-
-$rar_entries = rar_list($rar_arch);
-if ($rar_entries === FALSE)
-    die("Could retrieve entries.");
-
-echo "Found " . count($rar_entries) . " entries.\n";
-
-foreach ($rar_entries as $e) {
-    echo $e;
-    echo "\n";
-}
-rar_close($rar_arch);
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarArchive::getEntry</methodname></member>
-   <member><link linkend="wrappers.rar"><literal>rar://</literal> wrapper</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/rar/rararchive/getentry.xml b/reference/rar/rararchive/getentry.xml
deleted file mode 100644
index f98731c75df7..000000000000
--- a/reference/rar/rararchive/getentry.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.getentry">
- <refnamediv>
-  <refname>RarArchive::getEntry</refname>
-  <refname>rar_entry_get</refname>
-  <refpurpose>Get entry object from the RAR archive</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>RarEntry</type><type>false</type></type><methodname>RarArchive::getEntry</methodname>
-   <methodparam><type>string</type><parameter>entryname</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type class="union"><type>RarEntry</type><type>false</type></type><methodname>rar_entry_get</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-   <methodparam><type>string</type><parameter>entryname</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get entry object (file or directory) from the RAR archive.
-  </simpara>
-  <note>
-    <simpara>You can also get entry objects using <methodname>RarArchive::getEntries</methodname>.</simpara>
-    <simpara>Note that a RAR archive can have multiple entries with the same name; this method
-    will retrieve only the first.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>entryname</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the entry within the RAR archive.
-     </simpara>
-     <note>
-       <simpara>The path must be the same returned by
-       <methodname>RarEntry::getName</methodname>.</simpara>
-    </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the matching <type>RarEntry</type> object &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('solid.rar');
-if ($rar_arch === FALSE)
-    die("Could not open RAR archive.");
-$rar_entry = $rar_arch->getEntry('tese.txt');
-if ($rar_entry === FALSE)
-    die("Could not get such entry");
-echo get_class($rar_entry)."\n";
-echo $rar_entry;
-$rar_arch->close();
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-RarEntry
-RarEntry for file "tese.txt" (23b93a7a)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = rar_open('solid.rar');
-if ($rar_arch === FALSE)
-    die("Could not open RAR archive.");
-$rar_entry = rar_entry_get($rar_arch, 'tese.txt');
-if ($rar_entry === FALSE)
-    die("Could not get such entry");
-echo get_class($rar_entry)."\n";
-echo $rar_entry;
-rar_close($rar_arch);
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarArchive::getEntries</methodname></member>
-   <member><link linkend="wrappers.rar"><literal>rar://</literal> wrapper</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/rar/rararchive/isbroken.xml b/reference/rar/rararchive/isbroken.xml
deleted file mode 100644
index 1b1a5046f471..000000000000
--- a/reference/rar/rararchive/isbroken.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.isbroken">
- <refnamediv>
-  <refname>RarArchive::isBroken</refname>
-  <refname>rar_broken_is</refname>
-  <refpurpose>Test whether an archive is broken (incomplete)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RarArchive::isBroken</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>rar_broken_is</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function determines whether an archive is incomplete, i.e., if a volume is missing or a volume is truncated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the archive is broken, &false; otherwise. This function may also
-   return &false; if the passed file has already been closed. The only way
-   to tell the two cases apart is to enable
-   exceptions with <methodname>RarException::setUsingExceptions</methodname>; however,
-   this should be unnecessary as a program should not operate on closed files.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function retnull() { return null; }
-$file = dirname(__FILE__) . "/multi_broken.part1.rar";
-/* Third argument is used to omit notice */
-$arch = RarArchive::open($file, null, 'retnull');
-var_dump($arch->isBroken());
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function retnull() { return null; }
-$file = dirname(__FILE__) . "/multi_broken.part1.rar";
-/* Third argument is used to omit notice */
-$arch = rar_open($file, null, 'retnull');
-var_dump(rar_broken_is($arch));
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarArchive::setAllowBroken</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/rar/rararchive/issolid.xml b/reference/rar/rararchive/issolid.xml
deleted file mode 100644
index b111a94ed136..000000000000
--- a/reference/rar/rararchive/issolid.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.issolid">
- <refnamediv>
-  <refname>RarArchive::isSolid</refname>
-  <refname>rar_solid_is</refname>
-  <refpurpose>Check whether the RAR archive is solid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RarArchive::isSolid</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>rar_solid_is</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Check whether the RAR archive is solid. Individual file extraction is slower on solid
-   archives.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the archive is solid, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$arch1 = RarArchive::open("store_method.rar");
-$arch2 = RarArchive::open("solid.rar");
-echo "$arch1: " . ($arch1->isSolid()?'yes':'no') ."\n";
-echo "$arch2: " . ($arch2->isSolid()?'yes':'no') . "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-RAR Archive "C:\php_rar\trunk\tests\store_method.rar": no
-RAR Archive "C:\php_rar\trunk\tests\solid.rar": yes
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$arch1 = rar_open("store_method.rar");
-$arch2 = rar_open("solid.rar");
-echo "$arch1: " . (rar_solid_is($arch1)?'yes':'no') ."\n";
-echo "$arch2: " . (rar_solid_is($arch2)?'yes':'no') . "\n";
-?>
-]]>
-    </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/rar/rararchive/open.xml b/reference/rar/rararchive/open.xml
deleted file mode 100644
index b7014b3216ab..000000000000
--- a/reference/rar/rararchive/open.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.open">
- <refnamediv>
-  <refname>RarArchive::open</refname>
-  <refname>rar_open</refname>
-  <refpurpose>Open RAR archive</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>RarArchive</type><type>false</type></type><methodname>RarArchive::open</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>volume_callback</parameter><initializer>NULL</initializer></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type class="union"><type>RarArchive</type><type>false</type></type><methodname>rar_open</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>volume_callback</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Open specified RAR archive and return <type>RarArchive</type> instance representing it.
-  </simpara>
-  <note>
-   <simpara>
-    If opening a multi-volume archive, the path of the first volume should be passed as the first parameter.
-    Otherwise, not all files will be shown. This is by design.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the Rar archive.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      A plain password, if needed to decrypt the headers. It will also be used by default
-      if encrypted files are found. Note that the files may have
-      different passwords in respect to the headers and among them.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>volume_callback</parameter></term>
-    <listitem>
-     <simpara>
-      A function that receives one parameter – the path of the volume
-      that was not found – and returns a string with the correct path
-      for such volume or &null; if such volume does
-      not exist or is not known. The programmer should ensure the
-      passed function doesn't cause loops as this function is called
-      repeatedly if the path returned in a previous call did not
-      correspond to the needed volume. Specifying this parameter omits
-      the notice that would otherwise be emitted whenever a volume is
-      not found; an implementation that only returns &null;
-      can therefore be used to merely omit such notices.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-  <warning>
-   <simpara>
-    Prior to version 2.0.0, this function would not handle relative
-    paths correctly. Use <function>realpath</function> as a workaround.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the requested <type>RarArchive</type> instance &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 3.0.0</entry>
-      <entry>
-       <parameter>volume_callback</parameter> was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('encrypted_headers.rar', 'samplepassword');
-if ($rar_arch === FALSE)
-    die("Failed opening file");
-
-$entries = $rar_arch->getEntries();
-if ($entries === FALSE)
-    die("Failed fetching entries");
-
-echo "Found " . count($entries) . " files.\n";
-
-if (empty($entries))
-    die("No valid entries found.");
-
-$stream = reset($entries)->getStream();
-if ($stream === FALSE)
-    die("Failed opening first file");
-
-$rar_arch->close();
-
-echo "Content of first one follows:\n";
-echo stream_get_contents($stream);
-
-fclose($stream);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Found 2 files.
-Content of first one follows:
-Encrypted file 1 contents.
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = rar_open('encrypted_headers.rar', 'samplepassword');
-if ($rar_arch === FALSE)
-    die("Failed opening file");
-
-$entries = rar_list($rar_arch);
-if ($entries === FALSE)
-    die("Failed fetching entries");
-
-echo "Found " . count($entries) . " files.\n";
-
-if (empty($entries))
-    die("No valid entries found.");
-
-$stream = reset($entries)->getStream();
-if ($stream === FALSE)
-    die("Failed opening first file");
-
-rar_close($rar_arch);
-
-echo "Content of first one follows:\n";
-echo stream_get_contents($stream);
-
-fclose($stream);
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>Volume Callback</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* In this example, there's a volume named multi_broken.part1.rar
- * whose next volume is named multi.part2.rar */
-function resolve($vol) {
-    if (preg_match('/_broken/', $vol))
-        return str_replace('_broken', '', $vol);
-    else
-        return null;
-}
-$rar_file1 = rar_open(dirname(__FILE__).'/multi_broken.part1.rar', null, 'resolve');
-$entry = $rar_file1->getEntry('file2.txt');
-$entry->extract(null, dirname(__FILE__) . "/temp_file2.txt");
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="wrappers.rar"><literal>rar://</literal> wrapper</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/rar/rararchive/setallowbroken.xml b/reference/rar/rararchive/setallowbroken.xml
deleted file mode 100644
index 9526c0ac41d8..000000000000
--- a/reference/rar/rararchive/setallowbroken.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.setallowbroken">
- <refnamediv>
-  <refname>RarArchive::setAllowBroken</refname>
-  <refpurpose>Whether opening broken archives is allowed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>RarArchive::setAllowBroken</methodname>
-    <methodparam><type>bool</type><parameter>allow_broken</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>rar_allow_broken_set</methodname>
-   <methodparam><type>RarArchive</type><parameter>rarfile</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>allow_broken</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This method defines whether broken archives can be read or all the operations that
-   attempt to extract the archive entries will fail. Broken archives are archives for
-   which no error is detected when the file is opened but an error occurs when reading
-   the entries.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>rarfile</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>RarArchive</type> object, opened with <function>rar_open</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>allow_broken</parameter></term>
-    <listitem>
-     <simpara>
-      Whether to allow reading broken files (&true;) or not (&false;).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; &return.falseforfailure;. It will only fail if the file has
-   already been closed.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function retnull() { return null; }
-$file = dirname(__FILE__) . "/multi_broken.part1.rar";
-/* Third argument omits "volume not found" message */
-$a = RarArchive::open($file, null, 'retnull');
-$a->setAllowBroken(true);
-foreach ($a->getEntries() as $e) {
-    echo "$e\n";
-}
-var_dump(count($a));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-RarEntry for file "file1.txt" (52b28202)
-int(1)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function retnull() { return null; }
-$file = dirname(__FILE__) . "/multi_broken.part1.rar";
-/* Third argument omits "volume not found" message */
-$a = rar_open($file, null, 'retnull');
-rar_allow_broken_set($a, true);
-foreach (rar_list($a) as $e) {
-    echo "$e\n";
-}
-var_dump(count($a));
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarArchive::isBroken</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/rar/rararchive/tostring.xml b/reference/rar/rararchive/tostring.xml
deleted file mode 100644
index 1126fb56210b..000000000000
--- a/reference/rar/rararchive/tostring.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rararchive.tostring">
- <refnamediv>
-  <refname>RarArchive::__toString</refname>
-  <refpurpose>Get text representation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarArchive::__toString</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Provides a string representation for this <type>RarArchive</type> object. It currently shows
-   the full path name of the archive volume that was opened and whether the resource is valid
-   or was already closed through a call to <methodname>RarArchive::close</methodname>.
-  </simpara>
-  <simpara>
-   This method may be used only for debugging purposes, as there are no guarantees as to which
-   information the result contains or how it is formatted.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A textual representation of this <type>RarArchive</type> object.
-   The content of this representation is unspecified.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarArchive::__toString</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rar_arch = RarArchive::open('latest_winrar.rar');
-echo $rar_arch."\n";
-$rar_arch->close();
-echo $rar_arch."\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-RAR Archive "D:\php_rar\trunk\tests\latest_winrar.rar"
-RAR Archive "D:\php_rar\trunk\tests\latest_winrar.rar" (closed)
-]]>
-   </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/rar/rarentry.xml b/reference/rar/rarentry.xml
deleted file mode 100644
index 839b07553cfe..000000000000
--- a/reference/rar/rarentry.xml
+++ /dev/null
@@ -1,680 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rarentry" role="class">
-
- <title>The <classname>RarEntry</classname> class</title>
- <titleabbrev>RarEntry</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RarEntry intro -->
-  <section xml:id="rarentry.intro">
-   &reftitle.intro;
-   <simpara>
-    A RAR entry, representing a directory or a compressed file inside a RAR archive.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rarentry.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RarEntry</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>RarEntry</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-msdos">RarEntry::HOST_MSDOS</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-os2">RarEntry::HOST_OS2</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-win32">RarEntry::HOST_WIN32</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-unix">RarEntry::HOST_UNIX</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-macos">RarEntry::HOST_MACOS</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.host-beos">RarEntry::HOST_BEOS</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-readonly">RarEntry::ATTRIBUTE_WIN_READONLY</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-hidden">RarEntry::ATTRIBUTE_WIN_HIDDEN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-system">RarEntry::ATTRIBUTE_WIN_SYSTEM</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-directory">RarEntry::ATTRIBUTE_WIN_DIRECTORY</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-archive">RarEntry::ATTRIBUTE_WIN_ARCHIVE</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-device">RarEntry::ATTRIBUTE_WIN_DEVICE</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-normal">RarEntry::ATTRIBUTE_WIN_NORMAL</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-temporary">RarEntry::ATTRIBUTE_WIN_TEMPORARY</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-sparse-file">RarEntry::ATTRIBUTE_WIN_SPARSE_FILE</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-reparse-point">RarEntry::ATTRIBUTE_WIN_REPARSE_POINT</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-compressed">RarEntry::ATTRIBUTE_WIN_COMPRESSED</varname>
-     <initializer>2048</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-offline">RarEntry::ATTRIBUTE_WIN_OFFLINE</varname>
-     <initializer>4096</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-not-content-indexed">RarEntry::ATTRIBUTE_WIN_NOT_CONTENT_INDEXED</varname>
-     <initializer>8192</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-encrypted">RarEntry::ATTRIBUTE_WIN_ENCRYPTED</varname>
-     <initializer>16384</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-win-virtual">RarEntry::ATTRIBUTE_WIN_VIRTUAL</varname>
-     <initializer>65536</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-world-execute">RarEntry::ATTRIBUTE_UNIX_WORLD_EXECUTE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-world-write">RarEntry::ATTRIBUTE_UNIX_WORLD_WRITE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-world-read">RarEntry::ATTRIBUTE_UNIX_WORLD_READ</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-group-execute">RarEntry::ATTRIBUTE_UNIX_GROUP_EXECUTE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-group-write">RarEntry::ATTRIBUTE_UNIX_GROUP_WRITE</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-group-read">RarEntry::ATTRIBUTE_UNIX_GROUP_READ</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-owner-execute">RarEntry::ATTRIBUTE_UNIX_OWNER_EXECUTE</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-owner-write">RarEntry::ATTRIBUTE_UNIX_OWNER_WRITE</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-owner-read">RarEntry::ATTRIBUTE_UNIX_OWNER_READ</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-sticky">RarEntry::ATTRIBUTE_UNIX_STICKY</varname>
-     <initializer>512</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-setgid">RarEntry::ATTRIBUTE_UNIX_SETGID</varname>
-     <initializer>1024</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-setuid">RarEntry::ATTRIBUTE_UNIX_SETUID</varname>
-     <initializer>2048</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-final-quartet">RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</varname>
-     <initializer>61440</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-fifo">RarEntry::ATTRIBUTE_UNIX_FIFO</varname>
-     <initializer>4096</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-char-dev">RarEntry::ATTRIBUTE_UNIX_CHAR_DEV</varname>
-     <initializer>8192</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-directory">RarEntry::ATTRIBUTE_UNIX_DIRECTORY</varname>
-     <initializer>16384</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-block-dev">RarEntry::ATTRIBUTE_UNIX_BLOCK_DEV</varname>
-     <initializer>24576</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-regular-file">RarEntry::ATTRIBUTE_UNIX_REGULAR_FILE</varname>
-     <initializer>32768</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-sym-link">RarEntry::ATTRIBUTE_UNIX_SYM_LINK</varname>
-     <initializer>40960</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="rarentry.constants.attribute-unix-socket">RarEntry::ATTRIBUTE_UNIX_SOCKET</varname>
-     <initializer>49152</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rarentry')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ RarEntry constants -->
-  <section xml:id="rarentry.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="rarentry.constants.host-msdos">
-     <term><constant>RarEntry::HOST_MSDOS</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, MS-DOS was used to
-      add this entry. Use instead of <constant>RAR_HOST_MSDOS</constant>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.host-os2">
-     <term><constant>RarEntry::HOST_OS2</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, OS/2 was used to
-      add this entry. Intended to replace <constant>RAR_HOST_OS2</constant>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.host-win32">
-     <term><constant>RarEntry::HOST_WIN32</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, Microsoft Windows was used to
-      add this entry. Intended to replace <constant>RAR_HOST_WIN32</constant>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.host-unix">
-     <term><constant>RarEntry::HOST_UNIX</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, an unspecified UNIX OS was used to
-      add this entry. Intended to replace <constant>RAR_HOST_UNIX</constant>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.host-macos">
-     <term><constant>RarEntry::HOST_MACOS</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, Mac OS was used to
-      add this entry.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.host-beos">
-     <term><constant>RarEntry::HOST_BEOS</constant></term>
-     <listitem>
-      <simpara>If the return value of <methodname>RarEntry::getHostOs</methodname> equals this constant, BeOS was used to
-      add this entry. Intended to replace <constant>RAR_HOST_BEOS</constant>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-readonly">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_READONLY</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a read-only attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-hidden">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_HIDDEN</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a hidden attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-system">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_SYSTEM</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a system attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-directory">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_DIRECTORY</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a directory attribute (entry is a directory). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows. See also
-      <methodname>RarEntry::isDirectory</methodname>, which also works with entries that were not added in WinRAR.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-archive">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_ARCHIVE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with an archive attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-device">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_DEVICE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a device attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-normal">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_NORMAL</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a normal file attribute (entry is NOT a directory). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows. See also
-      <methodname>RarEntry::isDirectory</methodname>, which also works with entries that were not added in WinRAR.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-temporary">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_TEMPORARY</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a temporary attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-sparse-file">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_SPARSE_FILE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a sparse file attribute (file is an NTFS sparse file). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-reparse-point">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_REPARSE_POINT</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a reparse point attribute (entry is an NTFS reparse point, e.g. a
-      directory junction or a mount file system). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-compressed">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_COMPRESSED</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a compressed attribute (NTFS only). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-offline">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_OFFLINE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with an offline attribute (entry is offline and not accessible). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-not-content-indexed">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_NOT_CONTENT_INDEXED</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a not content indexed attribute (entry is to be indexed). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-encrypted">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_ENCRYPTED</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with an encrypted attribute (NTFS only). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-win-virtual">
-     <term><constant>RarEntry::ATTRIBUTE_WIN_VIRTUAL</constant></term>
-     <listitem>
-      <simpara>Bit that represents a Windows entry with a virtual attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is Microsoft Windows.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-world-execute">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_WORLD_EXECUTE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is world executable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-world-write">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_WORLD_WRITE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is world writable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-world-read">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_WORLD_READ</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is world readable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-group-execute">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_GROUP_EXECUTE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is group executable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-group-write">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_GROUP_WRITE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is group writable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-group-read">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_GROUP_READ</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is group readable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-owner-execute">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_OWNER_EXECUTE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is owner executable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-owner-write">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_OWNER_WRITE</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is owner writable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-owner-read">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_OWNER_READ</constant></term>
-     <listitem>
-      <simpara>Bit that represents a UNIX entry that is owner readable. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-sticky">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_STICKY</constant></term>
-     <listitem>
-      <simpara>Bit that represents the UNIX sticky bit. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-setgid">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_SETGID</constant></term>
-     <listitem>
-      <simpara>Bit that represents the UNIX setgid attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-setuid">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_SETUID</constant></term>
-     <listitem>
-      <simpara>Bit that represents the UNIX setuid attribute. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-final-quartet">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></term>
-     <listitem>
-      <simpara>Mask to isolate the last four bits (nibble) of UNIX attributes
-      (_S_IFMT, the type of file mask). To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constants <link linkend="rarentry.constants.attribute-unix-fifo"><constant>RarEntry::ATTRIBUTE_UNIX_FIFO</constant></link>,
-      <link linkend="rarentry.constants.attribute-unix-char-dev"><constant>RarEntry::ATTRIBUTE_UNIX_CHAR_DEV</constant></link>,
-      <link linkend="rarentry.constants.attribute-unix-directory"><constant>RarEntry::ATTRIBUTE_UNIX_DIRECTORY</constant></link>,
-      <link linkend="rarentry.constants.attribute-unix-block-dev"><constant>RarEntry::ATTRIBUTE_UNIX_BLOCK_DEV</constant></link>,
-      <link linkend="rarentry.constants.attribute-unix-regular-file"><constant>RarEntry::ATTRIBUTE_UNIX_REGULAR_FILE</constant></link>,
-      <link linkend="rarentry.constants.attribute-unix-sym-link"><constant>RarEntry::ATTRIBUTE_UNIX_SYM_LINK</constant></link> and
-      <link linkend="rarentry.constants.attribute-unix-socket"><constant>RarEntry::ATTRIBUTE_UNIX_SOCKET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-fifo">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_FIFO</constant></term>
-     <listitem>
-      <simpara>Unix FIFOs will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-char-dev">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_CHAR_DEV</constant></term>
-     <listitem>
-      <simpara>Unix character devices will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-directory">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_DIRECTORY</constant></term>
-     <listitem>
-      <simpara>Unix directories will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>. See also
-      <methodname>RarEntry::isDirectory</methodname>, which also works with entries that
-      were added in other operating systems.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-block-dev">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_BLOCK_DEV</constant></term>
-     <listitem>
-      <simpara>Unix block devices will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-regular-file">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_REGULAR_FILE</constant></term>
-     <listitem>
-      <simpara>Unix regular files (not directories) will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>. See also
-      <methodname>RarEntry::isDirectory</methodname>, which also works with entries that
-      were added in other operating systems.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-sym-link">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_SYM_LINK</constant></term>
-     <listitem>
-      <simpara>Unix symbolic links will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="rarentry.constants.attribute-unix-socket">
-     <term><constant>RarEntry::ATTRIBUTE_UNIX_SOCKET</constant></term>
-     <listitem>
-      <simpara>Unix sockets will have attributes whose last four bits have this value. To be used with
-      <methodname>RarEntry::getAttr</methodname> on entries whose host OS is UNIX and with the
-      constant <link linkend="rarentry.constants.attribute-unix-final-quartet">
-      <constant>RarEntry::ATTRIBUTE_UNIX_FINAL_QUARTET</constant></link>.</simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.rar.entities.rarentry;
-
-</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/rar/rarentry/extract.xml b/reference/rar/rarentry/extract.xml
deleted file mode 100644
index 8fe1cd89a129..000000000000
--- a/reference/rar/rarentry/extract.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.extract">
- <refnamediv>
-  <refname>RarEntry::extract</refname>
-  <refpurpose>Extract entry from the archive</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>RarEntry::extract</methodname>
-    <methodparam><type>string</type><parameter>dir</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>filepath</parameter><initializer>""</initializer></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>password</parameter><initializer>NULL</initializer></methodparam>
-    <methodparam choice="opt"><type>bool</type><parameter>extended_data</parameter><initializer>&false;</initializer></methodparam>
-   </methodsynopsis>
-  <simpara>
-   <methodname>RarEntry::extract</methodname> extracts the entry's data.
-   It will create new file in the specified
-   <parameter>dir</parameter> with the name identical to the entry's name,
-   unless the second argument is specified. See below for more information.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>dir</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the directory where files should be extracted. This parameter is
-      considered if and only if <parameter>filepath</parameter> is not. If both
-      parameters are empty an extraction to the current directory will be
-      attempted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>filepath</parameter></term>
-    <listitem>
-     <simpara>
-      Path (relative or absolute) containing the directory and filename of the
-      extracted file. This parameter overrides both the parameter
-      <parameter>dir</parameter> and the original file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password used to encrypt this entry. If the entry is not encrypted, this value will not be used and can
-      be omitted. If this parameter is omitted and the entry is encrypted, the password given to
-      <function>rar_open</function>, if any, will be used. If a wrong password is given, either explicitly
-      or implicitly via <function>rar_open</function>, CRC checking will fail and this method will fail and return &false;.
-      If no password is given and one is required, this method will fail and return &false;.
-      You can check whether an entry is encrypted with <methodname>RarEntry::isEncrypted</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-  <varlistentry>
-   <term><parameter>extended_data</parameter></term>
-   <listitem>
-    <simpara>
-      If &true;, extended information such as NTFS ACLs and Unix owner information will be set in the extract
-      files, as long as it's present in the archive.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  </variablelist>
-  <warning>
-      <simpara>Prior to version 2.0.0, this function would not handle relative
-      paths correctly. Use <function>realpath</function> as a workaround.</simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 3.0.0</entry>
-      <entry>
-       <parameter>extended_data</parameter> was added.
-      </entry>
-     </row>
-     <row>
-      <entry>PECL rar 3.0.0</entry>
-      <entry>
-       Support for RAR archives with repeated entry names is no longer defective.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>RarEntry::extract</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-$entry->extract('/dir/to'); // create /dir/to/Dir/file.txt
-$entry->extract(false, '/dir/to/new_name.txt'); // create /dir/to/new_name.txt
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>How to extract all files in archive: </title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* example by Erik Jenssen aka erix */
-
-$filename = "foobar.rar";
-$filepath = "/home/foo/bar/";
-
-$rar_file = rar_open($filepath.$filename);
-$list = rar_list($rar_file);
-foreach($list as $file) {
-    $entry = rar_entry_get($rar_file, $file);
-    $entry->extract("."); // extract to the current dir
-}
-rar_close($rar_file);
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarEntry::getStream</methodname></member>
-   <member><link linkend="wrappers.rar"><literal>rar://</literal> wrapper</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/rar/rarentry/getattr.xml b/reference/rar/rarentry/getattr.xml
deleted file mode 100644
index 0df6a2a67471..000000000000
--- a/reference/rar/rarentry/getattr.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getattr">
- <refnamediv>
-  <refname>RarEntry::getAttr</refname>
-  <refpurpose>Get attributes of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getAttr</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the OS-dependent attributes of the archive entry.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the attributes or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getAttr</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Can't open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'dir/in/the/archive') or die("Can't find such entry");
-
-$host_os = $entry->getHostOs();
-$attr = $entry->getAttr();
-
-switch($host_os) {
-    case RAR_HOST_MSDOS:
-    case RAR_HOST_OS2:
-    case RAR_HOST_WIN32:
-    case RAR_HOST_MACOS:
-        printf("%c%c%c%c%c%c\n",
-                ($attr & 0x08) ? 'V' : '.',
-                ($attr & 0x10) ? 'D' : '.',
-                ($attr & 0x01) ? 'R' : '.',
-                ($attr & 0x02) ? 'H' : '.',
-                ($attr & 0x04) ? 'S' : '.',
-                ($attr & 0x20) ? 'A' : '.');
-        break;
-    case RAR_HOST_UNIX:
-    case RAR_HOST_BEOS:
-        switch ($attr & 0xF000)
-        {
-            case 0x4000:
-                printf("d");
-                break;
-            case 0xA000:
-                printf("l");
-                break;
-            default:
-                printf("-");
-                break;
-        }
-        printf("%c%c%c%c%c%c%c%c%c\n",
-                ($attr & 0x0100) ? 'r' : '-',
-                ($attr & 0x0080) ? 'w' : '-',
-                ($attr & 0x0040) ? (($attr & 0x0800) ? 's':'x'):(($attr & 0x0800) ? 'S':'-'),
-                ($attr & 0x0020) ? 'r' : '-',
-                ($attr & 0x0010) ? 'w' : '-',
-                ($attr & 0x0008) ? (($attr & 0x0400) ? 's':'x'):(($attr & 0x0400) ? 'S':'-'),
-                ($attr & 0x0004) ? 'r' : '-',
-                ($attr & 0x0002) ? 'w' : '-',
-                ($attr & 0x0001) ? 'x' : '-');
-        break;
-}
-
-rar_close($rar_file);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarEntry::getHostOs</methodname></member>
-   <member>The constants in <classname>RarEntry</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/rar/rarentry/getcrc.xml b/reference/rar/rarentry/getcrc.xml
deleted file mode 100644
index 93c7eb5000c2..000000000000
--- a/reference/rar/rarentry/getcrc.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getcrc">
- <refnamediv>
-  <refname>RarEntry::getCrc</refname>
-  <refpurpose>Get CRC of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarEntry::getCrc</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns an hexadecimal string representation of the CRC of the archive entry.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the CRC of the archive entry or &false; on error.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 2.0.0</entry>
-      <entry>
-       This method now returns correct values for multiple volume archives.
-      </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/rar/rarentry/getfiletime.xml b/reference/rar/rarentry/getfiletime.xml
deleted file mode 100644
index fd39b3c4ded6..000000000000
--- a/reference/rar/rarentry/getfiletime.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getfiletime">
- <refnamediv>
-  <refname>RarEntry::getFileTime</refname>
-  <refpurpose>Get entry last modification time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarEntry::getFileTime</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Gets entry last modification time.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns entry last modification time as string in format
-   <literal>YYYY-MM-DD HH:II:SS</literal>, or &false; on error.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rar/rarentry/gethostos.xml b/reference/rar/rarentry/gethostos.xml
deleted file mode 100644
index cb41184daae3..000000000000
--- a/reference/rar/rarentry/gethostos.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.gethostos">
- <refnamediv>
-  <refname>RarEntry::getHostOs</refname>
-  <refpurpose>Get entry host OS</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getHostOs</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the code of the host OS of the archive entry.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the code of the host OS, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-   <para>
-   <example>
-    <title><methodname>RarEntry::getHostOs</methodname> example (version &gt;= 2.0.0)</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-switch ($entry->getHostOs()) {
-    case RarEntry::HOST_MSDOS:
-        echo "MS-DOS\n";
-        break;
-    case RarEntry::HOST_OS2:
-        echo "OS2\n";
-        break;
-    case RarEntry::HOST_WIN32:
-        echo "Win32\n";
-        break;
-    case RarEntry::HOST_MACOS:
-        echo "MacOS\n";
-        break;
-    case RarEntry::HOST_UNIX:
-        echo "Unix/Linux\n";
-        break;
-    case RarEntry::HOST_BEOS:
-        echo "BeOS\n";
-        break;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-
-   <example>
-    <title><methodname>RarEntry::getHostOs</methodname> example (version &lt;= 1.0.0)</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-switch ($entry->getHostOs()) {
-    case RAR_HOST_MSDOS:
-        echo "MS-DOS\n";
-        break;
-    case RAR_HOST_OS2:
-        echo "OS2\n";
-        break;
-    case RAR_HOST_WIN32:
-        echo "Win32\n";
-        break;
-    case RAR_HOST_MACOS:
-        echo "MacOS\n";
-        break;
-    case RAR_HOST_UNIX:
-        echo "Unix/Linux\n";
-        break;
-    case RAR_HOST_BEOS:
-        echo "BeOS\n";
-        break;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarEntry::extract</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/rar/rarentry/getmethod.xml b/reference/rar/rarentry/getmethod.xml
deleted file mode 100644
index 0a5fe81cf39f..000000000000
--- a/reference/rar/rarentry/getmethod.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getmethod">
- <refnamediv>
-  <refname>RarEntry::getMethod</refname>
-  <refpurpose>Get pack method of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getMethod</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>RarEntry::getMethod</methodname> returns number of the method used when adding
-   current archive entry.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the method number or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getMethod</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-echo "Method number: " . $entry->getMethod();
-
-?>
-]]>
-   </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/rar/rarentry/getname.xml b/reference/rar/rarentry/getname.xml
deleted file mode 100644
index 14ccde1b657d..000000000000
--- a/reference/rar/rarentry/getname.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getname">
- <refnamediv>
-  <refname>RarEntry::getName</refname>
-  <refpurpose>Get name of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarEntry::getName</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the name (with path) of the archive entry.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the entry name as a string, or &false; on error.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 2.0.0</entry>
-      <entry>
-       As of version 2.0.0, the returned string is encoded in Unicode/UTF-8.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-//this example is safe even in pages not encoded in UTF-8
-//for those encoded in UTF-8, the call to mb_convert_encoding is unnecessary
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-echo "Entry name: " . mb_convert_encoding(
-    htmlentities(
-        $entry->getName(),
-        ENT_COMPAT,
-        "UTF-8"
-    ),
-    "HTML-ENTITIES",
-    "UTF-8"
-);
-
-?>
-]]>
-   </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/rar/rarentry/getpackedsize.xml b/reference/rar/rarentry/getpackedsize.xml
deleted file mode 100644
index 487a66f036b1..000000000000
--- a/reference/rar/rarentry/getpackedsize.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getpackedsize">
- <refnamediv>
-  <refname>RarEntry::getPackedSize</refname>
-  <refpurpose>Get packed size of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getPackedSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get packed size of the archive entry.
-  </simpara>
-  <note>
-    <simpara>Note that on platforms with 32-bit longs (that includes Windows
-    x64), the maximum size returned is capped at 2 GiB. Check the constant
-    <constant>PHP_INT_MAX</constant>.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the packed size, or &false; on error.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 2.0.0</entry>
-      <entry>
-       This method now returns correct values of packed sizes bigger than 2 GiB
-       on platforms with 64-bit <type>int</type>s and never
-       returns negative values on other platforms.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getPackedSize</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-echo "Packed size of " . $entry->getName() . " = " . $entry->getPackedSize() . " bytes";
-
-?>
-]]>
-   </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/rar/rarentry/getstream.xml b/reference/rar/rarentry/getstream.xml
deleted file mode 100644
index b22facb229bf..000000000000
--- a/reference/rar/rarentry/getstream.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getstream">
- <refnamediv>
-  <refname>RarEntry::getStream</refname>
-  <refpurpose>Get file handler for entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>resource</type><type>false</type></type><methodname>RarEntry::getStream</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a file handler that
-   supports read operations. This handler provides on-the-fly decompression
-   for this entry.
-  </simpara>
-  <simpara>
-    The handler is not invalidated by calling
-    <function>rar_close</function>.
-  </simpara>
-  <warning>
-   <simpara>The resulting stream has no integrity verification. In particular, file corruption and
-   decryption with a wrong a key will not be detected. It is the programmer's responsability to use the entry's CRC
-   to check for integrity, if he so wishes.</simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password used to encrypt this entry. If the entry is not encrypted, this value will not be used and can
-      be omitted. If this parameter is omitted and the entry is encrypted, the password given to
-      <function>rar_open</function>, if any, will be used. If a wrong password is given, either explicitly
-      or implicitly via <function>rar_open</function>, this method's resulting stream will produce wrong
-      output. If no password is given and one is required, this method will fail and return &false;.
-      You can check whether an entry is encrypted with <methodname>RarEntry::isEncrypted</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The file handler &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 3.0.0</entry>
-      <entry>
-       Support for RAR archives with repeated entry names is no longer defective.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getStream</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar');
-if ($rar_file === false)
-    die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt');
-if ($entry === false)
-    die("Failed to find such entry");
-
-$stream = $entry->getStream();
-if ($stream === false)
-    die("Failed to obtain stream.");
-
-rar_close($rar_file); //stream is independent from file
-
-while (!feof($stream)) {
-    $buff = fread($stream, 8192);
-    if ($buff !== false)
-        echo $buff;
-    else
-        break; //fread error
-}
-
-fclose($stream);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarEntry::extract</methodname></member>
-   <member><link linkend="wrappers.rar"><literal>rar://</literal> wrapper</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/rar/rarentry/getunpackedsize.xml b/reference/rar/rarentry/getunpackedsize.xml
deleted file mode 100644
index 15c987a2da1e..000000000000
--- a/reference/rar/rarentry/getunpackedsize.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getunpackedsize">
- <refnamediv>
-  <refname>RarEntry::getUnpackedSize</refname>
-  <refpurpose>Get unpacked size of the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getUnpackedSize</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get unpacked size of the archive entry.
-  </simpara>
-  <note>
-    <simpara>Note that on platforms with 32-bit longs (that includes Windows
-    x64), the maximum size returned is capped at 2 GiB. Check the constant
-    <constant>PHP_INT_MAX</constant>.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the unpacked size, or &false; on error.
-  </simpara>
- </refsect1>
-
-  <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rar 2.0.0</entry>
-      <entry>
-       This method now returns correct values of unpacked sizes bigger than
-       2 GiB on platforms with 64-bit <type>int</type>s and never
-       returns negative values on other platforms.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.returnvalues;
-  <example>
-   <title><methodname>RarEntry::getUnpackedSize</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-echo "Unpacked size of " . $entry->getName() . " = " . $entry->getUnpackedSize() . " bytes";
-
-?>
-]]>
-   </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/rar/rarentry/getversion.xml b/reference/rar/rarentry/getversion.xml
deleted file mode 100644
index 2984d76ba2ae..000000000000
--- a/reference/rar/rarentry/getversion.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.getversion">
- <refnamediv>
-  <refname>RarEntry::getVersion</refname>
-  <refpurpose>Get minimum version of RAR program required to unpack the entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>RarEntry::getVersion</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns minimum version of RAR program (e.g. WinRAR) required to unpack the entry.
-   It is encoded as 10 * major version + minor version.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the version or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RarEntry::getVersion</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$rar_file = rar_open('example.rar') or die("Failed to open Rar archive");
-
-$entry = rar_entry_get($rar_file, 'Dir/file.txt') or die("Failed to find such entry");
-
-echo "Rar version required for unpacking: " . $entry->getVersion();
-
-?>
-]]>
-   </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/rar/rarentry/isdirectory.xml b/reference/rar/rarentry/isdirectory.xml
deleted file mode 100644
index d591f319d669..000000000000
--- a/reference/rar/rarentry/isdirectory.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.isdirectory">
- <refnamediv>
-  <refname>RarEntry::isDirectory</refname>
-  <refpurpose>Test whether an entry represents a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RarEntry::isDirectory</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Tests whether the current entry is a directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if this entry is a directory and &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-  This function is only available starting with version 2.0.0, but one can
-  also test whether an entry is a directory by checking the entry attributes,
-  like this (only works for files compressed in RAR for Windows or Unix):
-  <programlisting role="php">
-<![CDATA[
-<?php
-//...
-//Open file, get entry and store in variable $e...
-//...
-
-$isDirectory = (bool) ((($e->getHostOs() == RAR_HOST_WIN32) && ($e->getAttr() & 0x10)) ||
-    (($e->getHostOs() == RAR_HOST_UNIX) && (($e->getAttr() & 0xf000) == 0x4000)));
-?>
-]]>
-  </programlisting>
-  </para>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rar/rarentry/isencrypted.xml b/reference/rar/rarentry/isencrypted.xml
deleted file mode 100644
index 1e2de6487eb1..000000000000
--- a/reference/rar/rarentry/isencrypted.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.isencrypted">
- <refnamediv>
-  <refname>RarEntry::isEncrypted</refname>
-  <refpurpose>Test whether an entry is encrypted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RarEntry::isEncrypted</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Tests whether the current entry contents are encrypted.
-  </simpara>
-  <note>
-    <simpara>The password used may differ between files inside the same RAR archive.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the current entry is encrypted and &false; otherwise.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rar/rarentry/tostring.xml b/reference/rar/rarentry/tostring.xml
deleted file mode 100644
index 2a0d80cba4e1..000000000000
--- a/reference/rar/rarentry/tostring.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarentry.tostring">
- <refnamediv>
-  <refname>RarEntry::__toString</refname>
-  <refpurpose>Get text representation of entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>RarEntry::__toString</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   <methodname>RarEntry::__toString</methodname> returns a textual representation for this entry. It includes whether
-   the entry is a file or a directory (symbolic links and other special objects will be treated as files),
-   the UTF-8 name of the entry and its CRC. The form and content of this representation may be changed in the future,
-   so they cannot be relied upon.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A textual representation for the entry.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rar/rarexception.xml b/reference/rar/rarexception.xml
deleted file mode 100644
index cb5283dc2be6..000000000000
--- a/reference/rar/rarexception.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rarexception" role="class">
-
- <title>The RarException class</title>
- <titleabbrev>RarException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RarException intro -->
-  <section xml:id="rarexception.intro">
-   &reftitle.intro;
-   <simpara>
-    This class serves two purposes: it is the type of the exceptions thrown by the RAR extension
-    functions and methods and it allows, through static methods to query and define the error
-    behaviour of the extension, i.e., whether exceptions are thrown or only warnings are emitted.
-   </simpara>
-   <simpara>
-    The following error codes are used:
-   </simpara>
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      -1 - error outside UnRAR library
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      11 - insufficient memory
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      12 - bad data
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      13 - bad archive
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      14 - unknown format
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      15 - file open error
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      16 - file create error
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      17 - file close error
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      18 - read error
-     </simpara>
-    </listitem>
-     <listitem>
-     <simpara>
-      19 - write error
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      20 - buffer too small
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      21 - unknown RAR error
-     </simpara>
-    </listitem>
-
-    <listitem>
-     <simpara>
-      22 - password required but not given
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rarexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RarException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>RarException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rarexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.rar.entities.rarexception;
-
-</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/rar/rarexception/isusingexceptions.xml b/reference/rar/rarexception/isusingexceptions.xml
deleted file mode 100644
index 390f100376d3..000000000000
--- a/reference/rar/rarexception/isusingexceptions.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarexception.isusingexceptions">
- <refnamediv>
-  <refname>RarException::isUsingExceptions</refname>
-  <refpurpose>Check whether error handling with exceptions is in use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>RarException::isUsingExceptions</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Checks whether the RAR functions will emit warnings and return error values or whether they
-   will throw exceptions in most of the circumstances (does not include some programmatic
-   errors such as passing the wrong type of arguments).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if exceptions are being used, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>RarException::isUsingExceptions</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-//The default is not to use exceptions
-var_dump(RarException::isUsingExceptions());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarException::setUsingExceptions</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/rar/rarexception/setusingexceptions.xml b/reference/rar/rarexception/setusingexceptions.xml
deleted file mode 100644
index 89bd365e508f..000000000000
--- a/reference/rar/rarexception/setusingexceptions.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rarexception.setusingexceptions">
- <refnamediv>
-  <refname>RarException::setUsingExceptions</refname>
-  <refpurpose>Activate and deactivate error handling with exceptions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>RarException::setUsingExceptions</methodname>
-   <methodparam><type>bool</type><parameter>using_exceptions</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If and only if the argument is &true;, then, instead of emitting warnings and returning a special value indicating error when the UnRAR library encounters an error, an exception of type <type>RarException</type> will be thrown.
-  </simpara>
-  <simpara>
-   Exceptions will also be thrown for the following errors, which occur outside the library (their error code will be -1):
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     attempting some operations on a closed <type>RarArchive</type> object or a <type>RarEntry</type> object relative to the first;
-    </simpara>
-   </listitem>
-
-   <listitem>
-    <simpara>
-     attempting to get an entry that does not exist with <methodname>RarArchive::getEntry</methodname>.
-    </simpara>
-   </listitem>
-  </itemizedlist>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>using_exceptions</parameter></term>
-    <listitem>
-     <simpara>
-      Should be &true; to activate exception throwing, &false; to deactivate (the default).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>RarException::setUsingExceptions</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(RarException::isUsingExceptions());
-$arch = RarArchive::open("does_not_exist.rar");
-var_dump($arch);
-
-RarException::setUsingExceptions(true);
-var_dump(RarException::isUsingExceptions());
-$arch = RarArchive::open("does_not_exist.rar");
-var_dump($arch); //not reached
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-
-Warning: RarArchive::open(): Failed to open does_not_exist.rar: ERAR_EOPEN (file open error) in C:\php_rar\trunk\tests\test.php on line 3
-bool(false)
-bool(true)
-
-Fatal error: Uncaught exception 'RarException' with message 'unRAR internal error: Failed to open does_not_exist.rar: ERAR_EOPEN (file open error)' in C:\php_rar\trunk\tests\test.php:8
-Stack trace:
-#0 C:\php_rar\trunk\tests\test.php(8): RarArchive::open('does_not_exist....')
-#1 {main}
-  thrown in C:\php_rar\trunk\tests\test.php on line 8
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>RarException::isUsingExceptions</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/rar/reference.xml b/reference/rar/reference.xml
deleted file mode 100644
index 227798807b0f..000000000000
--- a/reference/rar/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.rar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Rar &Functions;</title>
-
- &reference.rar.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/rar/setup.xml b/reference/rar/setup.xml
deleted file mode 100644
index 8f591d1221d0..000000000000
--- a/reference/rar/setup.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rar.setup">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- <section xml:id="rar.installation">
-  &reftitle.install;
-  <simpara>
-   Rar is currently available through PECL
-   <link xlink:href="&url.pecl.package;rar">&url.pecl.package;rar</link>.
-  </simpara>
-  <simpara>
-   Also you can use the PECL installer to install the Rar extension,
-   using the following command: <command>pecl -v install rar</command>.
-  </simpara>
-  <para>
-   You can always download the <filename>tar.gz</filename> package and install Rar by hand:
-   <example>
-    <title>Rar installation</title>
-    <programlisting role="shell">
-<![CDATA[
-gunzip rar-xxx.tgz
-tar -xvf rar-xxx.tar
-cd rar-xxx
-phpize
-./configure && make && make install
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <simpara>
-   Windows users will enable <filename>php_rar.dll</filename> inside
-   of &php.ini; in order to use these functions.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="rar.resources">
-  &reftitle.resources;
-  <simpara>
-   This extension registers three internal classes:
-   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>.
-  </simpara>
-  <simpara>
-   This extension also register a stream resource, called "rar" and a URL
-   wrapper called "rar wrapper" and registered under the prefix "rar".
-  </simpara>
- </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/rar/versions.xml b/reference/rar/versions.xml
deleted file mode 100644
index e20045e76309..000000000000
--- a/reference/rar/versions.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='rar_open' from='PECL rar &gt;= 0.1'/>
- <function name='rar_list' from='PECL rar &gt;= 0.1'/>
- <function name='rar_entry_get' from='PECL rar &gt;= 0.1'/>
- <function name='rar_solid_is' from='PECL rar &gt;= 2.0.0'/>
- <function name='rar_comment_get' from='PECL rar &gt;= 2.0.0'/>
- <function name='rar_broken_is' from='PECL rar &gt;= 3.0.0'/>
- <function name='rar_allow_broken_set' from='PECL rar &gt;= 3.0.0'/>
- <function name='rar_close' from='PECL rar &gt;= 0.1'/>
- <function name='rar_wrapper_cache_stats' from='PECL rar &gt;= 3.0.0'/>
-
- <!-- Methods -->
- <function name='rararchive' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::open' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::getentries' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::getentry' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::issolid' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::getcomment' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::isbroken' from='PECL rar &gt;= 3.0.0'/>
- <function name='rararchive::setallowbroken' from='PECL rar &gt;= 3.0.0'/>
- <function name='rararchive::close' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::__tostring' from='PECL rar &gt;= 2.0.0'/>
- <function name='rararchive::__construct' from='PECL rar &gt;= 2.0.0'/>
-
- <function name='rarentry' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::extract' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getposition' from='PECL rar &gt;= 3.0.0'/>
- <function name='rarentry::getname' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getunpackedsize' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getpackedsize' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::gethostos' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getfiletime' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getcrc' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getattr' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getversion' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getmethod' from='PECL rar &gt;= 0.1'/>
- <function name='rarentry::getstream' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarentry::isdirectory' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarentry::isencrypted' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarentry::__tostring' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarentry::__construct' from='PECL rar &gt;= 2.0.0'/>
-
- <function name='rarexception' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::setusingexceptions' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::isusingexceptions' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::__clone' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::__construct' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::getmessage' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::getcode' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::getfile' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::getline' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::gettrace' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::getprevious' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::gettraceasstring' from='PECL rar &gt;= 2.0.0'/>
- <function name='rarexception::__tostring' from='PECL rar &gt;= 2.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/recode/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/recode/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/recode/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/recode/book.xml b/reference/recode/book.xml
deleted file mode 100644
index 8550fb19aa44..000000000000
--- a/reference/recode/book.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: deprecated -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.recode">
- <?phpdoc extension-membership="pecl" ?>
- <title>GNU Recode</title>
- <titleabbrev>Recode</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.recode">
-  &reftitle.intro;
-  &warn.pecl.unmaintained;
-  <simpara>
-   This module contains an interface to the GNU Recode library. The GNU
-   Recode library converts files between various coded character sets and
-   surface encodings. When this cannot be achieved exactly, it may get rid
-   of the offending characters or fall back on approximations. The library
-   recognises or produces nearly 150 different character sets and is able to
-   convert files between almost any pair. Most
-   <link xlink:href="&url.rfc;1345">RFC 1345</link> character sets are
-   supported.
-  </simpara>
-  <note>
-   <simpara>
-    This extension is unbundled and moved to <link xlink:href="&url.pecl.package;recode">PECL</link>
-    as of PHP 7.4.0.
-    Consider to use the <link linkend="book.mbstring">Multibyte String</link> or
-    <link linkend="book.iconv">iconv</link> extensions instead.
-   </simpara>
-  </note>
-  &note.no-windows.extension;
- </preface>
- <!-- }}} -->
-
- &reference.recode.setup;
- &reference.recode.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/recode/configure.xml b/reference/recode/configure.xml
deleted file mode 100644
index 18c79a9c2625..000000000000
--- a/reference/recode/configure.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="recode.installation">
- &reftitle.install;
-
- <section xml:id="recode.installation.php74">
-  <title>PHP 7.4</title>
-  <simpara>
-   &pecl.moved-ver;7.4.0
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;recode">&url.pecl.package;recode</link>.
-  </simpara>
- </section>
-
- <section xml:id="recode.installation.phplt74">
-  <title>PHP &lt; 7.4</title>
-  <simpara>
-   To be able to use the functions defined in this
-   module you must compile your PHP interpreter using the
-   <option role="configure">--with-recode[=DIR]</option>
-   option.
-  </simpara>
-  <warning>
-   <simpara>
-    Crashes and startup problems of PHP may be encountered
-    when loading the recode as extension <emphasis role="strong">after</emphasis> loading any extension of <link linkend="ref.mysql">mysql</link> or <link linkend="ref.imap">imap</link>. Loading the recode before those
-    extension has proved to fix the problem.  This is due a technical problem
-    that both the c-client library used by imap and recode have their own
-    <literal>hash_lookup()</literal> function and both mysql and recode have
-    their own <literal>hash_insert</literal> function.
-   </simpara>
-  </warning>
-  &warn.imaprecodeyaz;
- </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/recode/functions/recode-file.xml b/reference/recode/functions/recode-file.xml
deleted file mode 100644
index 00db5b578ad7..000000000000
--- a/reference/recode/functions/recode-file.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.recode-file">
- <refnamediv>
-  <refname>recode_file</refname>
-  <refpurpose>Recode from file to file according to recode request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>recode_file</methodname>
-   <methodparam><type>string</type><parameter>request</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>input</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>output</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Recode the file referenced by file handle
-   <parameter>input</parameter> into the file referenced by file
-   handle <parameter>output</parameter> according to the recode
-   <parameter>request</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <simpara>
-      The desired recode request type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      A local file handle <type>resource</type> for
-      the <parameter>input</parameter>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>output</parameter></term>
-    <listitem>
-     <simpara>
-      A local file handle <type>resource</type> for
-      the <parameter>output</parameter>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &false;, if unable to comply, &true; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-  <title>Basic <function>recode_file</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$input = fopen('input.txt', 'r');
-$output = fopen('output.txt', 'w');
-recode_file("us..flat", $input, $output);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   This function does not currently process file handles referencing
-   remote files (URLs). Both file handles must refer to local files.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>fopen</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/recode/functions/recode-string.xml b/reference/recode/functions/recode-string.xml
deleted file mode 100644
index 4cc32aa96669..000000000000
--- a/reference/recode/functions/recode-string.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.recode-string">
- <refnamediv>
-  <refname>recode_string</refname>
-  <refpurpose>Recode a string according to a recode request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>recode_string</methodname>
-   <methodparam><type>string</type><parameter>request</parameter></methodparam>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Recode the string <parameter>string</parameter> according to
-   the recode request <parameter>request</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <simpara>
-      The desired recode request type
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <simpara>
-      The <type>string</type> to be recoded
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the recoded <type>string</type> or &false;, if unable to
-   perform the recode request.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic <function>recode_string</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo recode_string("us..flat", "The following character has a diacritical mark: á");
-?>
-
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-   <simpara>
-    A simple recode request may be &quot;lat1..iso646-de&quot;.
-   </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    The GNU Recode documentation of your installation for detailed
-    instructions about recode requests.
-   </member>
-   <member><function>mb_convert_encoding</function></member>
-   <member><methodname>UConverter::transcode</methodname></member>
-   <member><function>iconv</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/recode/functions/recode.xml b/reference/recode/functions/recode.xml
deleted file mode 100644
index eba43335d941..000000000000
--- a/reference/recode/functions/recode.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- splitted from ./en/functions/recode.xml, last change in rev 1.3 -->
-<refentry xml:id="function.recode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>recode</refname>
-  <refpurpose>&Alias; <function>recode_string</function></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>
-   &info.function.alias;
-   <function>recode_string</function>.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/recode/reference.xml b/reference/recode/reference.xml
deleted file mode 100644
index cb018c339c00..000000000000
--- a/reference/recode/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.recode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Recode &Functions;</title>
-
- &reference.recode.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/recode/setup.xml b/reference/recode/setup.xml
deleted file mode 100644
index d58cb86b71cc..000000000000
--- a/reference/recode/setup.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="recode.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="recode.requirements">
-  &reftitle.required;
-  <simpara>
-   You must have GNU Recode 3.5 or higher installed on your system.
-   You can download the package from <link xlink:href="&url.recode;">&url.recode;</link>.
-  </simpara>
-  <warning>
-   <simpara>
-    The Recode library version 3.6 adds weird characters behind converted
-    strings under certain circumstances. Thus it's safer to use Recode v3.5
-    or one of the available alternatives like the
-    <link linkend="ref.iconv">iconv</link> or
-    <link linkend="ref.mbstring">mbstring</link> extension.
-   </simpara>
-  </warning>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.recode.configure;
- <!-- }}} -->
-
-</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/recode/versions.xml b/reference/recode/versions.xml
deleted file mode 100644
index 0cd03fbdfcc4..000000000000
--- a/reference/recode/versions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name="recode" from="PHP 4, PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="recode_file" from="PHP 4, PHP 5, PHP 7 &lt; 7.4.0"/>
- <function name="recode_string" from="PHP 4, PHP 5, PHP 7 &lt; 7.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
--->
diff --git a/reference/rnp/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/rnp/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/rnp/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/rnp/book.xml b/reference/rnp/book.xml
deleted file mode 100644
index 7c283f6d1e52..000000000000
--- a/reference/rnp/book.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- State: experimental -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.rnp">
- <?phpdoc extension-membership="pecl" ?>
- <title>Rnp</title>
- <titleabbrev>Rnp</titleabbrev>
-
- <preface xml:id="intro.rnp">
-  &reftitle.intro;
-  &warn.experimental;
-  <simpara>
-   This module allows you to use <link xlink:href="&url.rnp;">RNP</link> library.
-   RNP is a high performance C++ OpenPGP
-   library used by Mozilla Thunderbird.
-  </simpara>
- </preface>
-
- &reference.rnp.setup;
- &reference.rnp.constants;
- &reference.rnp.examples;
- &reference.rnp.reference;
-
- &reference.rnp.rnpffi;
-
-</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/rnp/configure.xml b/reference/rnp/configure.xml
deleted file mode 100644
index 40b85fec37e2..000000000000
--- a/reference/rnp/configure.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;rnp">&url.pecl.package;rnp</link>
- </simpara>
-
-</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/rnp/constants.xml b/reference/rnp/constants.xml
deleted file mode 100644
index 86d84e17d09d..000000000000
--- a/reference/rnp/constants.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.rnp-keystore-gpg">
-   <term>
-    <constant>RNP_KEYSTORE_GPG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Keystore format "GPG".
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-keystore-kbx">
-   <term>
-    <constant>RNP_KEYSTORE_KBX</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Keystore format "KBX". For public keys only.
-     A keybox is a file format used to store public keys along with meta information and indices.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-keystore-g10">
-   <term>
-    <constant>RNP_KEYSTORE_G10</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Keystore format "G10". For private keys.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-load-save-public-keys">
-   <term>
-    <constant>RNP_LOAD_SAVE_PUBLIC_KEYS</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Load or save public keys only. Can be OR-ed with <constant>RNP_LOAD_SAVE_SECRET_KEYS</constant>
-     to load both public and private keys to the FFI context or save them from the context.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-load-save-secret-keys">
-   <term>
-    <constant>RNP_LOAD_SAVE_SECRET_KEYS</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Load or save secret keys only. Can be OR-ed with <constant>RNP_LOAD_SAVE_PUBLIC_KEYS</constant>
-     to load both public and private keys to the FFI context or save them from the context.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-load-save-permissive">
-   <term>
-    <constant>RNP_LOAD_SAVE_PERMISSIVE</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Allows to ignore bad signature/key/subkey packets during key import.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-load-save-single">
-   <term>
-    <constant>RNP_LOAD_SAVE_SINGLE</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     If set, only the first key will be loaded.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-load-save-base64">
-   <term>
-    <constant>RNP_LOAD_SAVE_BASE64</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Allow import of base64-encoded keys (autocrypt ones).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-symm-alg">
-   <term>
-    <constant>RNP_FEATURE_SYMM_ALG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available symmetric encryption algorithms.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-aead-alg">
-   <term>
-    <constant>RNP_FEATURE_AEAD_ALG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available AEAD algorithms.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-prot-mode">
-   <term>
-    <constant>RNP_FEATURE_PROT_MODE</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available protection modes.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-pk-alg">
-   <term>
-    <constant>RNP_FEATURE_PK_ALG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available public key algorithms.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-hash-alg">
-   <term>
-    <constant>RNP_FEATURE_HASH_ALG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available hash algorithms.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-comp-alg">
-   <term>
-    <constant>RNP_FEATURE_COMP_ALG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available compression algorithms.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-feature-curve">
-   <term>
-    <constant>RNP_FEATURE_CURVE</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     List available elliptic curves.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-dump-mpi">
-   <term>
-    <constant>RNP_DUMP_MPI</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump MPI (Multi-precision integer) values.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-dump-raw">
-   <term>
-    <constant>RNP_DUMP_RAW</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump raw packet contents as well.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-dump-grip">
-   <term>
-    <constant>RNP_DUMP_GRIP</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump key fingerprints and grips.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-json-dump-mpi">
-   <term>
-    <constant>RNP_JSON_DUMP_MPI</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump MPI (Multi-precision integer) values.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-json-dump-raw">
-   <term>
-    <constant>RNP_JSON_DUMP_RAW</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump raw packet contents as well.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-json-dump-grip">
-   <term>
-    <constant>RNP_JSON_DUMP_GRIP</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Dump key fingerprints and grips.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-encrypt-nowrap">
-   <term>
-    <constant>RNP_ENCRYPT_NOWRAP</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Allows encryption of signed message. Message is not wrapped
-     into literal data packet.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-export-armored">
-   <term>
-    <constant>RNP_KEY_EXPORT_ARMORED</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Enable ASCII-armoring of exported data.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-export-public">
-   <term>
-    <constant>RNP_KEY_EXPORT_PUBLIC</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Export public key.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-export-secret">
-   <term>
-    <constant>RNP_KEY_EXPORT_SECRET</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Export secret key.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-export-subkeys">
-   <term>
-    <constant>RNP_KEY_EXPORT_SUBKEYS</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     If primary key is being exported, all subkeys will be exported too.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-export-base64">
-   <term>
-    <constant>RNP_KEY_EXPORT_BASE64</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Export base64-encoded autocrypt key instead of binary.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-remove-public">
-   <term>
-    <constant>RNP_KEY_REMOVE_PUBLIC</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Remove public key.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-remove-secret">
-   <term>
-    <constant>RNP_KEY_REMOVE_SECRET</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Remove secret key.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rnp-key-remove-subkeys">
-   <term>
-    <constant>RNP_KEY_REMOVE_SUBKEYS</constant>
-    (<type>integer</type>)
-   </term>
-   <listitem>
-    <simpara>
-     If primary key is being deleted, all of its subkeys will be removed too.
-    </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/rnp/examples.xml b/reference/rnp/examples.xml
deleted file mode 100644
index 6ce2920c464f..000000000000
--- a/reference/rnp/examples.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.examples">
- &reftitle.examples;
- <section xml:id="rnp.examples-clearsign">
-  <title>Clearsign text</title>
-  <simpara>
-   This example will clearsign a given text.
-  </simpara>
-  <example>
-   <title>RNP clearsign example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// init FFI object
-$ffi = rnp_ffi_create('GPG', 'GPG');
-
-// generate RSA key
-$key = rnp_op_generate_key($ffi, 'test@example.com', 'RSA');
-
-// sign
-$data = "Example text to sign";
-$signature = rnp_op_sign_cleartext($ffi, $data, array($key));
-
-echo $signature;
-
-// destroy FFI object
-rnp_ffi_destroy($ffi);
-?>
-]]>
-   </programlisting>
-  </example>
- </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/rnp/functions/rnp-backend-string.xml b/reference/rnp/functions/rnp-backend-string.xml
deleted file mode 100644
index 3e95ecdfaa34..000000000000
--- a/reference/rnp/functions/rnp-backend-string.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-backend-string">
- <refnamediv>
-  <refname>rnp_backend_string</refname>
-  <refpurpose>Return cryptographic backend library name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rnp_backend_string</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Backend name string. Currently supported
-   backends are "Botan" and "OpenSSL".
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-backend-version.xml b/reference/rnp/functions/rnp-backend-version.xml
deleted file mode 100644
index ddc1afbd62cb..000000000000
--- a/reference/rnp/functions/rnp-backend-version.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-backend-version">
- <refnamediv>
-  <refname>rnp_backend_version</refname>
-  <refpurpose>Return cryptographic backend library version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rnp_backend_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Version string.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-decrypt.xml b/reference/rnp/functions/rnp-decrypt.xml
deleted file mode 100644
index 375eb3afe68b..000000000000
--- a/reference/rnp/functions/rnp-decrypt.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-decrypt">
- <refnamediv>
-  <refname>rnp_decrypt</refname>
-  <refpurpose>Decrypt PGP message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_decrypt</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Private keys used for decryption should be loaded into the FFI object before calling this function.
-   If password encryption was used, then password provider should be set by calling
-   <function>rnp_ffi_set_pass_provider</function>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      Encrypted message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Decrypted message on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-dump-packets-to-json.xml b/reference/rnp/functions/rnp-dump-packets-to-json.xml
deleted file mode 100644
index 1165c609868f..000000000000
--- a/reference/rnp/functions/rnp-dump-packets-to-json.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-dump-packets-to-json">
- <refnamediv>
-  <refname>rnp_dump_packets_to_json</refname>
-  <refpurpose>Dump OpenPGP packets stream information to the JSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_dump_packets_to_json</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      Input string containing OpenPGP data, either in binary or ASCII-armored format.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      See <constant>RNP_JSON_DUMP_<replaceable>*</replaceable></constant> predefined constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   JSON string with dump&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-dump-packets.xml b/reference/rnp/functions/rnp-dump-packets.xml
deleted file mode 100644
index bb36934cb00a..000000000000
--- a/reference/rnp/functions/rnp-dump-packets.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-dump-packets">
- <refnamediv>
-  <refname>rnp_dump_packets</refname>
-  <refpurpose>Dump OpenPGP packets stream information in humand-readable format</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_dump_packets</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      Input string containing OpenPGP data, either in binary or ASCII-armored format.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      See <constant>RNP_DUMP_<replaceable>*</replaceable></constant> predefined constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Text describing packet sequence&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-ffi-create.xml b/reference/rnp/functions/rnp-ffi-create.xml
deleted file mode 100644
index 60f5a0a81e97..000000000000
--- a/reference/rnp/functions/rnp-ffi-create.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-ffi-create">
- <refnamediv>
-  <refname>rnp_ffi_create</refname>
-  <refpurpose>Create the top-level object used for interacting with the library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>RnpFFI</type><type>false</type></type><methodname>rnp_ffi_create</methodname>
-   <methodparam><type>string</type><parameter>pub_format</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sec_format</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pub_format</parameter></term>
-    <listitem>
-     <simpara>
-      the format of the public keyring, RNP_KEYSTORE_GPG or other
-      RNP_KEYSTORE_* constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sec_format</parameter></term>
-    <listitem>
-     <simpara>
-      the format of the secret keyring, RNP_KEYSTORE_GPG or other
-      RNP_KEYSTORE_* constant
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <type>RnpFFI</type> object on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-ffi-destroy.xml b/reference/rnp/functions/rnp-ffi-destroy.xml
deleted file mode 100644
index 445f4b4483a3..000000000000
--- a/reference/rnp/functions/rnp-ffi-destroy.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-ffi-destroy">
- <refnamediv>
-  <refname>rnp_ffi_destroy</refname>
-  <refpurpose>Destroy the top-level object used for interacting with the library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>rnp_ffi_destroy</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-ffi-set-pass-provider.xml b/reference/rnp/functions/rnp-ffi-set-pass-provider.xml
deleted file mode 100644
index 9541be180c7f..000000000000
--- a/reference/rnp/functions/rnp-ffi-set-pass-provider.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-ffi-set-pass-provider">
- <refnamediv>
-  <refname>rnp_ffi_set_pass_provider</refname>
-  <refpurpose>Set password provider callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_ffi_set_pass_provider</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>password_callback</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets password provider function. This function can ask for the password on a standard input
-   (if PHP script is executed in a command line environment), display GUI dialog or provide
-   password in any other possible ways. Requested passwords are used to encrypt or decrypt
-   secret keys or perform symmetric encryption/decryption operations.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password_callback</parameter></term>
-    <listitem>
-     <para>
-      The function that is to be called for every password request.  It has the following signature:
-      <methodsynopsis>
-       <type>bool</type><methodname><replaceable>password_callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-       <methodparam><type>string</type><parameter>pgp_context</parameter></methodparam>
-       <methodparam><type>string</type><parameter role="reference">password</parameter></methodparam>
-      </methodsynopsis>
-      <simplelist>
-       <member><literal>$key_fp</literal> - The key fingerprint, if any. Can be empty.</member>
-       <member><literal>$pgp_context</literal> - String describing why the key is being requested.</member>
-       <member><literal>$password</literal> - Password string reference where provided password should be stored to.</member>
-      </simplelist>
-      Callback function should return &true; if password was successfully set&return.falseforfailure;.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-      <title>simple callback function example</title>
-      <programlisting role="php">
-<![CDATA[
-<?php
-function password_callback(string $key_fp, string $pgp_context, string &$password)
-{
-    $password = "password";
-
-    return true;
-}
-
-$ffi = rnp_ffi_create('GPG', 'GPG');
-
-rnp_ffi_set_pass_provider($ffi, 'password_callback');
-]]>
-      </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/rnp/functions/rnp-import-keys.xml b/reference/rnp/functions/rnp-import-keys.xml
deleted file mode 100644
index b8a372c0c8e1..000000000000
--- a/reference/rnp/functions/rnp-import-keys.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-import-keys">
- <refnamediv>
-  <refname>rnp_import_keys</refname>
-  <refpurpose>Import keys from PHP string to the keyring and receive JSON describing new/updated keys</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_import_keys</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      OpenPGP packets containing key(s) to be loaded. Can be either binary or ASCII armored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      See <constant>RNP_LOAD_SAVE_<replaceable>*</replaceable></constant> predefined constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   JSON string with information about new and updated keys on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-import-signatures.xml b/reference/rnp/functions/rnp-import-signatures.xml
deleted file mode 100644
index 08ef6bb3b3c0..000000000000
--- a/reference/rnp/functions/rnp-import-signatures.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-import-signatures">
- <refnamediv>
-  <refname>rnp_import_signatures</refname>
-  <refpurpose>Import standalone signatures to the keyring and receive JSON describing updated keys</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_import_signatures</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      OpenPGP packets containing signatures to be imported. Can be either binary or ASCII armored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Currently must be 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   JSON string with information about updated keys on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-key-export-autocrypt.xml b/reference/rnp/functions/rnp-key-export-autocrypt.xml
deleted file mode 100644
index 2ffd07add302..000000000000
--- a/reference/rnp/functions/rnp-key-export-autocrypt.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-export-autocrypt">
- <refnamediv>
-  <refname>rnp_key_export_autocrypt</refname>
-  <refpurpose>
-   Export minimal key for autocrypt feature (just 5 packets: key, uid, signature,
-   encryption subkey, signature)
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_key_export_autocrypt</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>subkey_fp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>uid</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Primary key fingerprint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>subkey_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Subkey to export. Can be an empty string
-      to pick the first suitable subkey.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>uid</parameter></term>
-    <listitem>
-     <simpara>
-      User ID to export. Can be an empty string
-      if exported key has only one uid.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Only <constant>RNP_KEY_EXPORT_BASE64</constant> is currently supported. Enabling
-      it would export base64-encoded key data instead of binary.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   OpenPGP packets of exported key on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-key-export-revocation.xml b/reference/rnp/functions/rnp-key-export-revocation.xml
deleted file mode 100644
index f2b726e4c9c0..000000000000
--- a/reference/rnp/functions/rnp-key-export-revocation.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-export-revocation">
- <refnamediv>
-  <refname>rnp_key_export_revocation</refname>
-  <refpurpose>Generate and export primary key revocation signature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_key_export_revocation</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note: to revoke a key you'll need to import this signature into the keystore or use
-   <function>rnp_key_revoke</function> function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Key fingerprint of the primary key to be revoked.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      <constant>RNP_KEY_EXPORT_ARMORED</constant> or 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation.</entry>
-        </row>
-        <row>
-         <entry><literal>"code"</literal></entry>
-         <entry>string</entry>
-         <entry>Code reason for revocation code. Possible values: 'no', 'superseded', 'compromised',
-          'retired'. If not defined, then value 'no' will be used by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"reason"</literal></entry>
-         <entry>string</entry>
-         <entry>Textual representation of the reason for revocation.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Exported revocation signature on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-key-export.xml b/reference/rnp/functions/rnp-key-export.xml
deleted file mode 100644
index 0de544b5f002..000000000000
--- a/reference/rnp/functions/rnp-key-export.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-export">
- <refnamediv>
-  <refname>rnp_key_export</refname>
-  <refpurpose>Export a key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_key_export</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Key fingerprint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      See <constant>RNP_KEY_EXPORT_<replaceable>*</replaceable></constant> predefined constants
-      (except <constant>RNP_KEY_EXPORT_BASE64</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   OpenPGP packets of exported key (binary or ASCII-armored) on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-key-get-info.xml b/reference/rnp/functions/rnp-key-get-info.xml
deleted file mode 100644
index d3449edb272a..000000000000
--- a/reference/rnp/functions/rnp-key-get-info.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-get-info">
- <refnamediv>
-  <refname>rnp_key_get_info</refname>
-  <refpurpose>Get information about the key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>rnp_key_get_info</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Key fingerprint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An associative array with information about the key&return.falseforfailure;.
-  </simpara>
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Data type</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>"is_primary"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is the primary key.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_sub"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is a subkey.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_valid"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if public key is valid.
-       This includes checks of the self-signatures,
-       expiration times, revocations and so on.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_revoked"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is revoked.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_superseded"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is superseded. Present only if the key is revoked.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_compromised"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is compromised. Present only if the key is revoked.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_retired"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is retired. Present only if the key is revoked.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_expired"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is expired.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"have_secret"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key has secret part.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_locked"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is currently locked. Only present for secret keys.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"is_protected"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key is protected. Only present for secret keys.
-       A protected key is one that is encrypted and can be safely held in memory
-       and locked/unlocked as needed.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"have_public"</literal></entry>
-      <entry>boolean</entry>
-      <entry>
-       &true; if this key has public part. Generally all keys would have public part.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"valid_till"</literal></entry>
-      <entry>integer</entry>
-      <entry>
-       The timestamp till which key can be considered as valid.
-       Note: this will take into account not only key's expiration, but revocations as well.
-       For the subkey primary key's validity time will be also checked.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"bits"</literal></entry>
-      <entry>integer</entry>
-      <entry>
-       Number of bits in the key. For EC-based keys it will contain size of the curve.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"alg"</literal></entry>
-      <entry>string</entry>
-      <entry>
-       Key algorithm name.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"subkeys"</literal></entry>
-      <entry>array</entry>
-      <entry>
-       An indexed array containing fingerprint strings of subkeys. Only present for
-       primary keys. Could be empty if primary key has no subkeys.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"uids"</literal></entry>
-      <entry>array</entry>
-      <entry>
-       An indexed array containing user ID strings. Only present for
-       primary keys. Could be empty if primary key has no user ID-s.
-      </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/rnp/functions/rnp-key-remove.xml b/reference/rnp/functions/rnp-key-remove.xml
deleted file mode 100644
index 6c811cb4c737..000000000000
--- a/reference/rnp/functions/rnp-key-remove.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-remove">
- <refnamediv>
-  <refname>rnp_key_remove</refname>
-  <refpurpose>Remove a key from keyring(s)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_key_remove</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note: you need to call <function>rnp_save_keys</function> to write updated keyring(s) out.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Key fingerprint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      See <constant>RNP_KEY_REMOVE_<replaceable>*</replaceable></constant> constants. Flag <constant>RNP_KEY_REMOVE_SUBKEYS</constant> will work only for
-      the primary key and will remove all of its subkeys as well.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-key-revoke.xml b/reference/rnp/functions/rnp-key-revoke.xml
deleted file mode 100644
index ffc2aedc8269..000000000000
--- a/reference/rnp/functions/rnp-key-revoke.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-key-revoke">
- <refnamediv>
-  <refname>rnp_key_revoke</refname>
-  <refpurpose>Revoke a key or subkey by generating and adding revocation signature</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_key_revoke</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_fp</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note: you need to call <function>rnp_save_keys</function> to write updated keyring(s) out.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Key fingerprint.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Currently must be 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation.</entry>
-        </row>
-        <row>
-         <entry><literal>"code"</literal></entry>
-         <entry>string</entry>
-         <entry>Code reason for revocation code. Possible values: 'no', 'superseded', 'compromised',
-          'retired'. If not defined, then value 'no' will be used by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"reason"</literal></entry>
-         <entry>string</entry>
-         <entry>Textual representation of the reason for revocation.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-list-keys.xml b/reference/rnp/functions/rnp-list-keys.xml
deleted file mode 100644
index d8700260f20a..000000000000
--- a/reference/rnp/functions/rnp-list-keys.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-list-keys">
- <refnamediv>
-  <refname>rnp_list_keys</refname>
-  <refpurpose>Enumerate all keys present in a keyring by specified identifer type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>rnp_list_keys</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>identifier_type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>identifier_type</parameter></term>
-    <listitem>
-     <simpara>
-      Key identifier type ("userid", "keyid", "grip", "fingerprint").
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An associative array where key is an identifier string and value is a PGP key fingerprint&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-load-keys-from-path.xml b/reference/rnp/functions/rnp-load-keys-from-path.xml
deleted file mode 100644
index bd720d023816..000000000000
--- a/reference/rnp/functions/rnp-load-keys-from-path.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-load-keys-from-path">
- <refnamediv>
-  <refname>rnp_load_keys_from_path</refname>
-  <refpurpose>Load keys from specified path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_load_keys_from_path</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam><type>string</type><parameter>input_path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note that for G10, the input must be a directory (which must already exist).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.key-format;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input_path</parameter></term>
-    <listitem>
-     <simpara>
-      file or directory containing the keys.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.loadsave-flags;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-load-keys.xml b/reference/rnp/functions/rnp-load-keys.xml
deleted file mode 100644
index 8aad54993aa8..000000000000
--- a/reference/rnp/functions/rnp-load-keys.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-load-keys">
- <refnamediv>
-  <refname>rnp_load_keys</refname>
-  <refpurpose>Load keys from PHP string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_load_keys</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note that for G10, the input must be a directory (which must already exist).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.key-format;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>input</parameter></term>
-    <listitem>
-     <simpara>
-      OpenPGP packets containing key(s) to be loaded. Can be either binary or ASCII armored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.loadsave-flags;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-locate-key.xml b/reference/rnp/functions/rnp-locate-key.xml
deleted file mode 100644
index 33f5d4ac6f5c..000000000000
--- a/reference/rnp/functions/rnp-locate-key.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-locate-key">
- <refnamediv>
-  <refname>rnp_locate_key</refname>
-  <refpurpose>Search for the key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_locate_key</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>identifier_type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>identifier</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note: only valid userids are checked while searching by userid.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>identifier_type</parameter></term>
-    <listitem>
-     <simpara>
-      Identifier type string: "userid", "keyid", "fingerprint", "grip".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     <simpara>
-      PGP User ID (name and email) for "userid" type, hexadecimal string
-      that represents key id, fingerprint or key grip correspondingly.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns hexadecimal fingerprint of the key found on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-encrypt.xml b/reference/rnp/functions/rnp-op-encrypt.xml
deleted file mode 100644
index 6e950d50c562..000000000000
--- a/reference/rnp/functions/rnp-op-encrypt.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-encrypt">
- <refnamediv>
-  <refname>rnp_op_encrypt</refname>
-  <refpurpose>Encrypt message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_op_encrypt</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam><type>array</type><parameter>recipient_keys_fp</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      Message to be encrypted.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recipient_keys_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Array with fingerprints of recipient's keys. At least one key must be present.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"compression_alg"</literal></entry>
-         <entry>string</entry>
-         <entry>Compression algorithm. Both
-	   <literal>"compression_alg"</literal> and <literal>"compression_level"</literal>
-	   must be set in order to enable data compression.
-	 </entry>
-        </row>
-        <row>
-         <entry><literal>"compression_level"</literal></entry>
-         <entry>integer</entry>
-         <entry>Compression level, 0-9. 0 disables compression.</entry>
-        </row>
-        <row>
-         <entry><literal>"armor"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Enable ASCII-armored output. Disabled by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"add_signature"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Encrypted message will be also signed.</entry>
-        </row>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation. "add_signature" option should be set to &true;</entry>
-        </row>
-        <row>
-         <entry><literal>"creation_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature creation time in seconds since Jan, 1 1970 UTC. By default current time is used.</entry>
-        </row>
-        <row>
-         <entry><literal>"expiration_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature expiration time in seconds since the creation time. 0 value is used to mark
-          signature as non-expiring (default value).</entry>
-        </row>
-        <row>
-         <entry><literal>"password"</literal></entry>
-         <entry>string</entry>
-         <entry>Add password which is used to encrypt data.</entry>
-        </row>
-        <row>
-         <entry><literal>"cipher"</literal></entry>
-         <entry>string</entry>
-         <entry>
-          Set symmetric encryption algorithm. Possible values are "IDEA", "TRIPLEDES",
-	  "CAST5", "BLOWFISH", "AES128", "AES192", "AES256", "TWOFISH", "CAMELLIA128",
-          "CAMELLIA192", "CAMELLIA256", "SM4".
-	 </entry>
-        </row>
-        <row>
-         <entry><literal>"aead"</literal></entry>
-         <entry>string</entry>
-         <entry>
-          Set AEAD mode algorithm. Possible values are "None" to disable AEAD, "EAX", "OCB".
-	 </entry>
-        </row>
-        <row>
-         <entry><literal>"aead_bits"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set chunk length for AEAD mode via number of chunk size bits. Must be between 0 to 56.</entry>
-        </row>
-        <row>
-         <entry><literal>"flags"</literal></entry>
-         <entry>integer</entry>
-         <entry>
-          Set additional encryption flags. Supported flags: RNP_ENCRYPT_NOWRAP - do not wrap the data in a literal data packet. This
-          would allow to encrypt already signed data.
-         </entry>
-        </row>
-        <row>
-         <entry><literal>"file_name"</literal></entry>
-         <entry>string</entry>
-         <entry>Set the internally stored file name for the data being encrypted. Special value _CONSOLE may be used to mark message
-          as 'for your eyes only', i.e. it should not be stored anywhere but only displayed
-          to the receiver. Default is the empty string.</entry>
-        </row>
-        <row>
-         <entry><literal>"file_mtime"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set input file modification date in seconds since Jan, 1 1970 UTC.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Encrypted data on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-generate-key.xml b/reference/rnp/functions/rnp-op-generate-key.xml
deleted file mode 100644
index 180da42717b8..000000000000
--- a/reference/rnp/functions/rnp-op-generate-key.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-generate-key">
- <refnamediv>
-  <refname>rnp_op_generate_key</refname>
-  <refpurpose>Generate key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_op_generate_key</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>userid</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key_alg</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>sub_alg</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>userid</parameter></term>
-    <listitem>
-     <simpara>
-      PGP User ID - text that is intended to represent
-      the name and email address of the key holder.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_alg</parameter></term>
-    <listitem>
-     <simpara>
-      Primary key algorithm (i.e. 'RSA', 'DSA', etc).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sub_alg</parameter></term>
-    <listitem>
-     <simpara>
-      Subkey algorithm. If not set, subkey will not be generated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"bits"</literal></entry>
-         <entry>integer</entry>
-         <entry>Primary key size in bits. Applicable only to RSA, DSA and El-Gamal keys.</entry>
-        </row>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Hash algorithm used in self signature or subkey binding signature.</entry>
-        </row>
-        <row>
-         <entry><literal>"dsa_qbits"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set size of a <literal>q</literal> parameter for DSA key.
-          Note: appropriate default value will be set, depending on key bits. However you may
-          override it if needed.</entry>
-        </row>
-        <row>
-         <entry><literal>"curve"</literal></entry>
-         <entry>string</entry>
-         <entry>Set the curve used for ECC key. Note: this is only applicable for ECDSA, ECDH and SM2 keys.</entry>
-        </row>
-        <row>
-         <entry><literal>"request_password"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Enable requesting password via password provider. This password
-          will be used for key encryption. Password provider callback function should be set in
-	  advance by calling <function>rnp_ffi_set_pass_provider</function>.
-          Note: this setting will be ignored if password was set via<literal>"password"</literal></entry>
-        </row>
-        <row>
-         <entry><literal>"password"</literal></entry>
-         <entry>string</entry>
-         <entry>Set the password used to encrypt the secret key data.</entry>
-        </row>
-        <row>
-         <entry><literal>"expiration"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set the key and subkey expiration time in seconds.</entry>
-        </row>
-        <row>
-         <entry><literal>"sub_bits"</literal></entry>
-         <entry>integer</entry>
-         <entry>Subkey size in bits. Applicable only to RSA, DSA and El-Gamal keys.</entry>
-        </row>
-        <row>
-         <entry><literal>"sub_hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Hash algorithm used in subkey self signature or subkey binding signature.</entry>
-        </row>
-        <row>
-         <entry><literal>"sub_curve"</literal></entry>
-         <entry>string</entry>
-         <entry>Set the curve used for ECC subkey. Note: this is only applicable for ECDSA, ECDH and SM2 keys.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Fingerprint of the generated primary key&return.falseforfailure;. This fingerprint can be used
-   later to reference the key in sign and encrypt operations. The key data is stored in FFI
-   memory context and can be saved using
-   <function>rnp_save_keys</function> or <function>rnp_save_keys_to_path</function>.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-sign-cleartext.xml b/reference/rnp/functions/rnp-op-sign-cleartext.xml
deleted file mode 100644
index 337ccbe4fb5e..000000000000
--- a/reference/rnp/functions/rnp-op-sign-cleartext.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-sign-cleartext">
- <refnamediv>
-  <refname>rnp_op_sign_cleartext</refname>
-  <refpurpose>Perform signing operation on a textual data, return cleartext signed message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_op_sign_cleartext</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to be signed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>keys_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Array with key fingerprints. At least one key must be provided.
-      Keys should be present in <parameter>ffi</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"armor"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Enable ASCII-armored output. Disabled by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation.</entry>
-        </row>
-        <row>
-         <entry><literal>"creation_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature creation time in seconds since Jan, 1 1970 UTC. By default current time is used.</entry>
-        </row>
-        <row>
-         <entry><literal>"expiration_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature expiration time in seconds since the creation time. 0 value is used to mark
-          signature as non-expiring (default value).</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Cleartext signed message containing source data with
-   additional headers and ASCII-armored signature on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-sign-detached.xml b/reference/rnp/functions/rnp-op-sign-detached.xml
deleted file mode 100644
index 3824bab71b50..000000000000
--- a/reference/rnp/functions/rnp-op-sign-detached.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-sign-detached">
- <refnamediv>
-  <refname>rnp_op_sign_detached</refname>
-  <refpurpose>Perform signing operation, return detached signature(s)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_op_sign_detached</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to be signed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>keys_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Array with key fingerprints. At least one key must be provided.
-      Keys should be present in <parameter>ffi</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"armor"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Enable ASCII-armored output. Disabled by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation.</entry>
-        </row>
-        <row>
-         <entry><literal>"creation_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature creation time in seconds since Jan, 1 1970 UTC. By default current time is used.</entry>
-        </row>
-        <row>
-         <entry><literal>"expiration_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature expiration time in seconds since the creation time. 0 value is used to mark
-          signature as non-expiring (default value).</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Detached signature(s) data on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-sign.xml b/reference/rnp/functions/rnp-op-sign.xml
deleted file mode 100644
index 8a7125c3a0cf..000000000000
--- a/reference/rnp/functions/rnp-op-sign.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-sign">
- <refnamediv>
-  <refname>rnp_op_sign</refname>
-  <refpurpose>Perform signing operation on a binary data, return embedded signature(s)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_op_sign</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>array</type><parameter>keys_fp</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to be signed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>keys_fp</parameter></term>
-    <listitem>
-     <simpara>
-      Array with key fingerprints. At least one key must be provided.
-      Keys should be present in <parameter>ffi</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array with options.
-     </simpara>
-     <informaltable>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Data type</entry>
-         <entry>&Description;</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry><literal>"compression_alg"</literal></entry>
-         <entry>string</entry>
-         <entry>Compression algorithm. Both
-	   <literal>"compression_alg"</literal> and <literal>"compression_level"</literal>
-	   must be set in order to enable data compression.
-	 </entry>
-        </row>
-        <row>
-         <entry><literal>"compression_level"</literal></entry>
-         <entry>integer</entry>
-         <entry>Compression level, 0-9. 0 disables compression.</entry>
-        </row>
-        <row>
-         <entry><literal>"armor"</literal></entry>
-         <entry>boolean</entry>
-         <entry>Enable ASCII-armored output. Disabled by default.</entry>
-        </row>
-        <row>
-         <entry><literal>"hash"</literal></entry>
-         <entry>string</entry>
-         <entry>Set hash algorithm used during signature calculation.</entry>
-        </row>
-        <row>
-         <entry><literal>"creation_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature creation time in seconds since Jan, 1 1970 UTC. By default current time is used.</entry>
-        </row>
-        <row>
-         <entry><literal>"expiration_time"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set signature expiration time in seconds since the creation time. 0 value is used to mark
-          signature as non-expiring (default value).</entry>
-        </row>
-        <row>
-         <entry><literal>"file_name"</literal></entry>
-         <entry>string</entry>
-         <entry>Set input file name.Special value _CONSOLE may be used to mark message
-          as 'for your eyes only', i.e. it should not be stored anywhere but only displayed
-          to the receiver. Default is the empty string.</entry>
-        </row>
-        <row>
-         <entry><literal>"file_mtime"</literal></entry>
-         <entry>integer</entry>
-         <entry>Set input file modification date in seconds since Jan, 1 1970 UTC.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </informaltable>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Data with embedded signature(s) on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-op-verify-detached.xml b/reference/rnp/functions/rnp-op-verify-detached.xml
deleted file mode 100644
index 6b04837f0601..000000000000
--- a/reference/rnp/functions/rnp-op-verify-detached.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-verify-detached">
- <refnamediv>
-  <refname>rnp_op_verify_detached</refname>
-  <refpurpose>Verify detached signatures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>rnp_op_verify_detached</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signature</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Source data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signature</parameter></term>
-    <listitem>
-     <simpara>
-      Detached signature data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An associative array with information about verification results&return.falseforfailure;.
-  </simpara>
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Data type</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>"verification_status"</literal></entry>
-      <entry>string</entry>
-      <entry>
-       Overall verification result, either "Success" string or appropriate error message.
-       "Success" result is set when at least one signature is valid and successfully verified.
-       Individual verification results for each signature can be checked in the "signatures" array.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"file_name"</literal></entry>
-      <entry>string</entry>
-      <entry>File name.</entry>
-     </row>
-     <row>
-      <entry><literal>"file_mtime"</literal></entry>
-      <entry>integer</entry>
-      <entry>File modification time.</entry>
-     </row>
-     <row>
-      <entry><literal>"mode"</literal></entry>
-      <entry>string</entry>
-      <entry>Data protection (encryption) mode used in processed message.
-      Currently defined values are "none", "cfb", "cfb-mdc", "aead-ocb", "aead-eax".
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"cipher"</literal></entry>
-      <entry>string</entry>
-      <entry>Symmetric cipher used for data encryption.</entry>
-     </row>
-     <row>
-      <entry><literal>"valid_integrity"</literal></entry>
-      <entry>boolean</entry>
-      <entry>&true; if message integrity protection was used (i.e. MDC or AEAD) and it was
-      validated successfully.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"signatures"</literal></entry>
-      <entry>array</entry>
-      <entry>
-       An associative array describing each signature found. See description below.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
-  <simpara>
-   "signatures" sub-array.
-  </simpara>
-  <informaltable>
-  <tgroup cols="2">
-   <thead>
-    <row>
-     <entry>Key</entry>
-     <entry>Data type</entry>
-     <entry>&Description;</entry>
-    </row>
-   </thead>
-  <tbody>
-   <row>
-    <entry>"verification_status"</entry>
-    <entry>string</entry>
-    <entry>Signature verification status, either "Success" string or appropriate error message.</entry>
-   </row>
-   <row>
-    <entry>"creation_time"</entry>
-    <entry>integer</entry>
-    <entry>Signature creation time in seconds since Jan, 1 1970 UTC.</entry>
-   </row>
-   <row>
-    <entry>"expiration_time"</entry>
-    <entry>integer</entry>
-    <entry>Signature expiration time in seconds since the creation time or 0 if signature never expires.</entry>
-   </row>
-   <row>
-    <entry>"hash"</entry>
-    <entry>string</entry>
-    <entry>Hash function algorithm used to calculate the signature.</entry>
-   </row>
-   <row>
-    <entry>"signing_key"</entry>
-    <entry>string</entry>
-    <entry>Fingerprint of the key used for signing. Could be "Not found" if corresponding public key is not loaded to the FFI object.</entry>
-   </row>
-   <row>
-    <entry>"signature_type"</entry>
-    <entry>string</entry>
-    <entry>
-     Signature type. Currently defined values are: 'binary', 'text', 'standalone', 'certification (generic)', 'certification (persona)',
-     'certification (casual)', 'certification (positive)', 'subkey binding', 'primary key binding', 'direct', 'key revocation',
-     'subkey revocation', 'certification revocation', 'timestamp', 'uknown: 0..255'.
-    </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/rnp/functions/rnp-op-verify.xml b/reference/rnp/functions/rnp-op-verify.xml
deleted file mode 100644
index 087df9957e2b..000000000000
--- a/reference/rnp/functions/rnp-op-verify.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-op-verify">
- <refnamediv>
-  <refname>rnp_op_verify</refname>
-  <refpurpose>Verify embedded or cleartext signatures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>rnp_op_verify</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Signed data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An associative array with information about verification results&return.falseforfailure;.
-  </simpara>
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Data type</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>"verification_status"</literal></entry>
-      <entry>string</entry>
-      <entry>
-       Overall verification result, either "Success" string or appropriate error message.
-       "Success" result is set when at least one signature is valid and successfully verified.
-       Individual verification results for each signature can be checked in the "signatures" array.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"file_name"</literal></entry>
-      <entry>string</entry>
-      <entry>File name.</entry>
-     </row>
-     <row>
-      <entry><literal>"file_mtime"</literal></entry>
-      <entry>integer</entry>
-      <entry>File modification time.</entry>
-     </row>
-     <row>
-      <entry><literal>"mode"</literal></entry>
-      <entry>string</entry>
-      <entry>Data protection (encryption) mode used in processed message.
-      Currently defined values are "none", "cfb", "cfb-mdc", "aead-ocb", "aead-eax".
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"cipher"</literal></entry>
-      <entry>string</entry>
-      <entry>Symmetric cipher used for data encryption.</entry>
-     </row>
-     <row>
-      <entry><literal>"valid_integrity"</literal></entry>
-      <entry>boolean</entry>
-      <entry>&true; if message integrity protection was used (i.e. MDC or AEAD) and it was
-      validated successfully.
-      </entry>
-     </row>
-     <row>
-      <entry><literal>"signatures"</literal></entry>
-      <entry>array</entry>
-      <entry>
-       An associative array describing each signature found. See description below.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
-  <simpara>
-   "signatures" sub-array.
-  </simpara>
-  <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Key</entry>
-       <entry>Data type</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-    <tbody>
-     <row>
-      <entry>"verification_status"</entry>
-      <entry>string</entry>
-      <entry>Signature verification status, either "Success" string or appropriate error message.</entry>
-     </row>
-     <row>
-      <entry>"creation_time"</entry>
-      <entry>integer</entry>
-      <entry>Signature creation time in seconds since Jan, 1 1970 UTC.</entry>
-     </row>
-     <row>
-      <entry>"expiration_time"</entry>
-      <entry>integer</entry>
-      <entry>Signature expiration time in seconds since the creation time or 0 if signature never expires.</entry>
-     </row>
-     <row>
-      <entry>"hash"</entry>
-      <entry>string</entry>
-      <entry>Hash function algorithm used to calculate the signature.</entry>
-     </row>
-     <row>
-      <entry>"signing_key"</entry>
-      <entry>string</entry>
-      <entry>Fingerprint of the key used for signing. Could be "Not found" if corresponding public key is not loaded to the FFI object.</entry>
-     </row>
-     <row>
-      <entry>"signature_type"</entry>
-      <entry>string</entry>
-      <entry>
-       Signature type. Currently defined values are: 'binary', 'text', 'standalone', 'certification (generic)', 'certification (persona)',
-       'certification (casual)', 'certification (positive)', 'subkey binding', 'primary key binding', 'direct', 'key revocation',
-       'subkey revocation', 'certification revocation', 'timestamp', 'uknown: 0..255'.
-      </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/rnp/functions/rnp-save-keys-to-path.xml b/reference/rnp/functions/rnp-save-keys-to-path.xml
deleted file mode 100644
index 0949051b3f66..000000000000
--- a/reference/rnp/functions/rnp-save-keys-to-path.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-save-keys-to-path">
- <refnamediv>
-  <refname>rnp_save_keys_to_path</refname>
-  <refpurpose>Save keys to specified path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_save_keys_to_path</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam><type>string</type><parameter>output_path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Saves keys present in the FFI object (loaded or generated) to the specified file or directory.
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.key-format;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>output_path</parameter></term>
-    <listitem>
-     <simpara>
-      File or directory path where keys should be saved to.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.loadsave-flags;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-save-keys.xml b/reference/rnp/functions/rnp-save-keys.xml
deleted file mode 100644
index d46cc2ddfe75..000000000000
--- a/reference/rnp/functions/rnp-save-keys.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-save-keys">
- <refnamediv>
-  <refname>rnp_save_keys</refname>
-  <refpurpose>Save keys to PHP string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rnp_save_keys</methodname>
-   <methodparam><type>RnpFFI</type><parameter>ffi</parameter></methodparam>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">output</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Note that for G10, the output must be a directory (which must already exist).
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ffi</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.ffi-description;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.key-format;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>output</parameter></term>
-    <listitem>
-     <simpara>
-      key packets will be saved to the string referenced by <parameter>output</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      &rnp.parameter.loadsave-flags;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-supported-features.xml b/reference/rnp/functions/rnp-supported-features.xml
deleted file mode 100644
index 0d54f6ed7a0f..000000000000
--- a/reference/rnp/functions/rnp-supported-features.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-supported-features">
- <refnamediv>
-  <refname>rnp_supported_features</refname>
-  <refpurpose>Get supported features in JSON format</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>rnp_supported_features</methodname>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get the JSON formatted string containing array of supported rnp feature values (algorithms, curves, etc) by type.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <simpara>
-      See RNP_FEATURE_* constants for supported values.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   String containing JSON formatted array of supported algorithms, curves, etc&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-version-string-full.xml b/reference/rnp/functions/rnp-version-string-full.xml
deleted file mode 100644
index 33e10a52fc23..000000000000
--- a/reference/rnp/functions/rnp-version-string-full.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-version-string-full">
- <refnamediv>
-  <refname>rnp_version_string_full</refname>
-  <refpurpose>Full version string of RNP library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rnp_version_string_full</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns full version string of RNP library.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/functions/rnp-version-string.xml b/reference/rnp/functions/rnp-version-string.xml
deleted file mode 100644
index e277f615df51..000000000000
--- a/reference/rnp/functions/rnp-version-string.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rnp-version-string">
- <refnamediv>
-  <refname>rnp_version_string</refname>
-  <refpurpose>RNP library version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rnp_version_string</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns RNP library version string.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rnp/reference.xml b/reference/rnp/reference.xml
deleted file mode 100644
index a330159f40ef..000000000000
--- a/reference/rnp/reference.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="ref.rnp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Rnp &Functions;</title>
-
- &reference.rnp.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/rnp/rnpffi.xml b/reference/rnp/rnpffi.xml
deleted file mode 100644
index 6b7490b6e3d2..000000000000
--- a/reference/rnp/rnpffi.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rnpffi" role="class">
- <title>The RnpFFI class</title>
- <titleabbrev>RnpFFI</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RnpFFI intro -->
-  <section xml:id="rnpffi.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rnpffi.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RnpFFI</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>RnpFFI</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/rnp/setup.xml b/reference/rnp/setup.xml
deleted file mode 100644
index 4ddd8ad602a6..000000000000
--- a/reference/rnp/setup.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rnp.setup">
- &reftitle.setup;
-
- <section xml:id="rnp.requirements">
-  &reftitle.required;
-  <simpara>
-   In order to use RNP library functions you need to install the<link xlink:href="&url.rnp;">RNP</link> library. RNP library version &gt;= 0.16.2
-   is required.
-  </simpara>
- </section>
-
- &reference.rnp.configure;
-
-</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/rnp/versions.xml b/reference/rnp/versions.xml
deleted file mode 100644
index d72dfd92e48e..000000000000
--- a/reference/rnp/versions.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='rnp_backend_string' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_backend_version' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_supported_features' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_version_string' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_version_string_full' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_ffi_create' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_ffi_destroy' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_load_keys' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_load_keys_from_path' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_save_keys' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_save_keys_to_path' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_dump_packets' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_dump_packets_to_json' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_generate_key' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_ffi_set_pass_provider' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_sign' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_sign_cleartext' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_sign_detached' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_verify' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_verify_detached' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_op_encrypt' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_decrypt' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_locate_key' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_list_keys' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_get_info' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_export' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_export_autocrypt' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_import_keys' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_remove' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_revoke' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_key_export_revocation' from='PECL rnp &gt;= 0.1.1'/>
- <function name='rnp_import_signatures' from='PECL rnp &gt;= 0.1.1'/>
-
- <!-- Classes and Methods -->
- <function name='rnpffi' from='PECL rnp &gt;= 0.1.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
--->
diff --git a/reference/rpminfo/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/rpminfo/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/rpminfo/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/rpminfo/book.xml b/reference/rpminfo/book.xml
deleted file mode 100644
index 395e53f2a49c..000000000000
--- a/reference/rpminfo/book.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.rpminfo">
-  &reftitle.intro;
-  <simpara>
-   This extension enables you to retrieve information from RPM files
-   or from the installed RPMs database.
-  </simpara>
-  <simpara>
-   It also provides a <literal>rpm</literal> stream wrapper to retrieve RPM content
-   (since version 1.0.0 with librpm  &gt;=  4.13).
-  </simpara>
- </preface>
-
- &reference.rpminfo.setup;
- &reference.rpminfo.constants;
- &reference.rpminfo.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/rpminfo/constants.xml b/reference/rpminfo/constants.xml
deleted file mode 100644
index c7d59aa18e41..000000000000
--- a/reference/rpminfo/constants.xml
+++ /dev/null
@@ -1,2937 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="rpminfo.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
-
- <variablelist>
-  <title>Miscellaneous constants</title>
-  <varlistentry xml:id="constant.rpmversion">
-   <term>
-    <constant>RPMVERSION</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     System librpm version.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist>
-  <title>RPM Senses</title>
-  <varlistentry xml:id="constant.rpmsense-any">
-   <term>
-    <constant>RPMSENSE_ANY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-less">
-   <term>
-    <constant>RPMSENSE_LESS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-greater">
-   <term>
-    <constant>RPMSENSE_GREATER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-equal">
-   <term>
-    <constant>RPMSENSE_EQUAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-posttrans">
-   <term>
-    <constant>RPMSENSE_POSTTRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-prereq">
-   <term>
-    <constant>RPMSENSE_PREREQ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-pretrans">
-   <term>
-    <constant>RPMSENSE_PRETRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-interp">
-   <term>
-    <constant>RPMSENSE_INTERP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-script-pre">
-   <term>
-    <constant>RPMSENSE_SCRIPT_PRE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-script-post">
-   <term>
-    <constant>RPMSENSE_SCRIPT_POST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-script-preun">
-   <term>
-    <constant>RPMSENSE_SCRIPT_PREUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-script-postun">
-   <term>
-    <constant>RPMSENSE_SCRIPT_POSTUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-script-verify">
-   <term>
-    <constant>RPMSENSE_SCRIPT_VERIFY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-find-requires">
-   <term>
-    <constant>RPMSENSE_FIND_REQUIRES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-find-provides">
-   <term>
-    <constant>RPMSENSE_FIND_PROVIDES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-triggerin">
-   <term>
-    <constant>RPMSENSE_TRIGGERIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-triggerun">
-   <term>
-    <constant>RPMSENSE_TRIGGERUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-triggerpostun">
-   <term>
-    <constant>RPMSENSE_TRIGGERPOSTUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-missingok">
-   <term>
-    <constant>RPMSENSE_MISSINGOK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-rpmlib">
-   <term>
-    <constant>RPMSENSE_RPMLIB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-triggerprein">
-   <term>
-    <constant>RPMSENSE_TRIGGERPREIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-keyring">
-   <term>
-    <constant>RPMSENSE_KEYRING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmsense-config">
-   <term>
-    <constant>RPMSENSE_CONFIG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist>
-  <title>RPM Mire</title>
-  <varlistentry xml:id="constant.rpmmire-default">
-   <term>
-    <constant>RPMMIRE_DEFAULT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Search pattern is a regular expression with
-     <literal>\.</literal>, <literal>.*</literal>,
-     and <literal>^...$</literal> added.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmmire-strcmp">
-   <term>
-    <constant>RPMMIRE_STRCMP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Search pattern is a <type>string</type>,
-     using <code>strcmp(3)</code>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmmire-regex">
-   <term>
-    <constant>RPMMIRE_REGEX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Search pattern is a regular expression,
-     using <code>regcomp(3)</code>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmmire-glob">
-   <term>
-    <constant>RPMMIRE_GLOB</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Search pattern is a glob expression,
-     using <code>fnmatch(3)</code>.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist>
-  <title>RPM tags</title>
-  <varlistentry xml:id="constant.rpmtag-arch">
-   <term>
-    <constant>RPMTAG_ARCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-archsuffix">
-   <term>
-    <constant>RPMTAG_ARCHSUFFIX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.18
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-archivesize">
-   <term>
-    <constant>RPMTAG_ARCHIVESIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-basenames">
-   <term>
-    <constant>RPMTAG_BASENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Name (not path) of files, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-bugurl">
-   <term>
-    <constant>RPMTAG_BUGURL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-buildarchs">
-   <term>
-    <constant>RPMTAG_BUILDARCHS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-buildhost">
-   <term>
-    <constant>RPMTAG_BUILDHOST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-buildtime">
-   <term>
-    <constant>RPMTAG_BUILDTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-c">
-   <term>
-    <constant>RPMTAG_C</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-changelogname">
-   <term>
-    <constant>RPMTAG_CHANGELOGNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-changelogtext">
-   <term>
-    <constant>RPMTAG_CHANGELOGTEXT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-changelogtime">
-   <term>
-    <constant>RPMTAG_CHANGELOGTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-classdict">
-   <term>
-    <constant>RPMTAG_CLASSDICT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-conflictflags">
-   <term>
-    <constant>RPMTAG_CONFLICTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-conflictname">
-   <term>
-    <constant>RPMTAG_CONFLICTNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Conflicting dependencies, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-conflictnevrs">
-   <term>
-    <constant>RPMTAG_CONFLICTNEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-conflicts">
-   <term>
-    <constant>RPMTAG_CONFLICTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-conflictversion">
-   <term>
-    <constant>RPMTAG_CONFLICTVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-cookie">
-   <term>
-    <constant>RPMTAG_COOKIE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-dbinstance">
-   <term>
-    <constant>RPMTAG_DBINSTANCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-dependsdict">
-   <term>
-    <constant>RPMTAG_DEPENDSDICT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-description">
-   <term>
-    <constant>RPMTAG_DESCRIPTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-dirindexes">
-   <term>
-    <constant>RPMTAG_DIRINDEXES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-dirnames">
-   <term>
-    <constant>RPMTAG_DIRNAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Directory of files, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-distribution">
-   <term>
-    <constant>RPMTAG_DISTRIBUTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-disttag">
-   <term>
-    <constant>RPMTAG_DISTTAG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-disturl">
-   <term>
-    <constant>RPMTAG_DISTURL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-dsaheader">
-   <term>
-    <constant>RPMTAG_DSAHEADER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-e">
-   <term>
-    <constant>RPMTAG_E</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-encoding">
-   <term>
-    <constant>RPMTAG_ENCODING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-enhanceflags">
-   <term>
-    <constant>RPMTAG_ENHANCEFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-enhancename">
-   <term>
-    <constant>RPMTAG_ENHANCENAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Weak dependencies, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-enhancenevrs">
-   <term>
-    <constant>RPMTAG_ENHANCENEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-enhances">
-   <term>
-    <constant>RPMTAG_ENHANCES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-enhanceversion">
-   <term>
-    <constant>RPMTAG_ENHANCEVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-epoch">
-   <term>
-    <constant>RPMTAG_EPOCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-epochnum">
-   <term>
-    <constant>RPMTAG_EPOCHNUM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-evr">
-   <term>
-    <constant>RPMTAG_EVR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-excludearch">
-   <term>
-    <constant>RPMTAG_EXCLUDEARCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-excludeos">
-   <term>
-    <constant>RPMTAG_EXCLUDEOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-exclusivearch">
-   <term>
-    <constant>RPMTAG_EXCLUSIVEARCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-exclusiveos">
-   <term>
-    <constant>RPMTAG_EXCLUSIVEOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filecaps">
-   <term>
-    <constant>RPMTAG_FILECAPS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileclass">
-   <term>
-    <constant>RPMTAG_FILECLASS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filecolors">
-   <term>
-    <constant>RPMTAG_FILECOLORS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filecontexts">
-   <term>
-    <constant>RPMTAG_FILECONTEXTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filedependsn">
-   <term>
-    <constant>RPMTAG_FILEDEPENDSN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filedependsx">
-   <term>
-    <constant>RPMTAG_FILEDEPENDSX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filedevices">
-   <term>
-    <constant>RPMTAG_FILEDEVICES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filedigestalgo">
-   <term>
-    <constant>RPMTAG_FILEDIGESTALGO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filedigests">
-   <term>
-    <constant>RPMTAG_FILEDIGESTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileflags">
-   <term>
-    <constant>RPMTAG_FILEFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filegroupname">
-   <term>
-    <constant>RPMTAG_FILEGROUPNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileinodes">
-   <term>
-    <constant>RPMTAG_FILEINODES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filelangs">
-   <term>
-    <constant>RPMTAG_FILELANGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filelinktos">
-   <term>
-    <constant>RPMTAG_FILELINKTOS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filemd5s">
-   <term>
-    <constant>RPMTAG_FILEMD5S</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filemodes">
-   <term>
-    <constant>RPMTAG_FILEMODES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filemtimes">
-   <term>
-    <constant>RPMTAG_FILEMTIMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filenames">
-   <term>
-    <constant>RPMTAG_FILENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filenlinks">
-   <term>
-    <constant>RPMTAG_FILENLINKS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileprovide">
-   <term>
-    <constant>RPMTAG_FILEPROVIDE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filerdevs">
-   <term>
-    <constant>RPMTAG_FILERDEVS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filerequire">
-   <term>
-    <constant>RPMTAG_FILEREQUIRE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filesignaturelength">
-   <term>
-    <constant>RPMTAG_FILESIGNATURELENGTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filesignatures">
-   <term>
-    <constant>RPMTAG_FILESIGNATURES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filesizes">
-   <term>
-    <constant>RPMTAG_FILESIZES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filestates">
-   <term>
-    <constant>RPMTAG_FILESTATES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerconds">
-   <term>
-    <constant>RPMTAG_FILETRIGGERCONDS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerflags">
-   <term>
-    <constant>RPMTAG_FILETRIGGERFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerindex">
-   <term>
-    <constant>RPMTAG_FILETRIGGERINDEX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggername">
-   <term>
-    <constant>RPMTAG_FILETRIGGERNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     File trigger name, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerpriorities">
-   <term>
-    <constant>RPMTAG_FILETRIGGERPRIORITIES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerscriptflags">
-   <term>
-    <constant>RPMTAG_FILETRIGGERSCRIPTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerscriptprog">
-   <term>
-    <constant>RPMTAG_FILETRIGGERSCRIPTPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerscripts">
-   <term>
-    <constant>RPMTAG_FILETRIGGERSCRIPTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggertype">
-   <term>
-    <constant>RPMTAG_FILETRIGGERTYPE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-filetriggerversion">
-   <term>
-    <constant>RPMTAG_FILETRIGGERVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileusername">
-   <term>
-    <constant>RPMTAG_FILEUSERNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fileverifyflags">
-   <term>
-    <constant>RPMTAG_FILEVERIFYFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-fscontexts">
-   <term>
-    <constant>RPMTAG_FSCONTEXTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-gif">
-   <term>
-    <constant>RPMTAG_GIF</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-group">
-   <term>
-    <constant>RPMTAG_GROUP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Group of the package, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-hdrid">
-   <term>
-    <constant>RPMTAG_HDRID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Deprecated, use <constant>RPMTAG_SHA1HEADER</constant> instead. Removed in librpm 6.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headercolor">
-   <term>
-    <constant>RPMTAG_HEADERCOLOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headeri18ntable">
-   <term>
-    <constant>RPMTAG_HEADERI18NTABLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headerimage">
-   <term>
-    <constant>RPMTAG_HEADERIMAGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headerimmutable">
-   <term>
-    <constant>RPMTAG_HEADERIMMUTABLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headerregions">
-   <term>
-    <constant>RPMTAG_HEADERREGIONS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-headersignatures">
-   <term>
-    <constant>RPMTAG_HEADERSIGNATURES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-icon">
-   <term>
-    <constant>RPMTAG_ICON</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-installcolor">
-   <term>
-    <constant>RPMTAG_INSTALLCOLOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-installtid">
-   <term>
-    <constant>RPMTAG_INSTALLTID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Installation transaction ID, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-installtime">
-   <term>
-    <constant>RPMTAG_INSTALLTIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-instfilenames">
-   <term>
-    <constant>RPMTAG_INSTFILENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Path of files, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-instprefixes">
-   <term>
-    <constant>RPMTAG_INSTPREFIXES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-license">
-   <term>
-    <constant>RPMTAG_LICENSE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-longarchivesize">
-   <term>
-    <constant>RPMTAG_LONGARCHIVESIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-longfilesizes">
-   <term>
-    <constant>RPMTAG_LONGFILESIZES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-longsigsize">
-   <term>
-    <constant>RPMTAG_LONGSIGSIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-longsize">
-   <term>
-    <constant>RPMTAG_LONGSIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-modularitylabel">
-   <term>
-    <constant>RPMTAG_MODULARITYLABEL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-n">
-   <term>
-    <constant>RPMTAG_N</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-name">
-   <term>
-    <constant>RPMTAG_NAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Package name, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nevr">
-   <term>
-    <constant>RPMTAG_NEVR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nevra">
-   <term>
-    <constant>RPMTAG_NEVRA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nopatch">
-   <term>
-    <constant>RPMTAG_NOPATCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nosource">
-   <term>
-    <constant>RPMTAG_NOSOURCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nvr">
-   <term>
-    <constant>RPMTAG_NVR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-nvra">
-   <term>
-    <constant>RPMTAG_NVRA</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-o">
-   <term>
-    <constant>RPMTAG_O</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-obsoleteflags">
-   <term>
-    <constant>RPMTAG_OBSOLETEFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-obsoletename">
-   <term>
-    <constant>RPMTAG_OBSOLETENAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Obsoleted packages, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-obsoletenevrs">
-   <term>
-    <constant>RPMTAG_OBSOLETENEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-obsoletes">
-   <term>
-    <constant>RPMTAG_OBSOLETES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-obsoleteversion">
-   <term>
-    <constant>RPMTAG_OBSOLETEVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldenhances">
-   <term>
-    <constant>RPMTAG_OLDENHANCES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldenhancesflags">
-   <term>
-    <constant>RPMTAG_OLDENHANCESFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldenhancesname">
-   <term>
-    <constant>RPMTAG_OLDENHANCESNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldenhancesversion">
-   <term>
-    <constant>RPMTAG_OLDENHANCESVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldfilenames">
-   <term>
-    <constant>RPMTAG_OLDFILENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldsuggests">
-   <term>
-    <constant>RPMTAG_OLDSUGGESTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldsuggestsflags">
-   <term>
-    <constant>RPMTAG_OLDSUGGESTSFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldsuggestsname">
-   <term>
-    <constant>RPMTAG_OLDSUGGESTSNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-oldsuggestsversion">
-   <term>
-    <constant>RPMTAG_OLDSUGGESTSVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-optflags">
-   <term>
-    <constant>RPMTAG_OPTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-orderflags">
-   <term>
-    <constant>RPMTAG_ORDERFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-ordername">
-   <term>
-    <constant>RPMTAG_ORDERNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-orderversion">
-   <term>
-    <constant>RPMTAG_ORDERVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-origbasenames">
-   <term>
-    <constant>RPMTAG_ORIGBASENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-origdirindexes">
-   <term>
-    <constant>RPMTAG_ORIGDIRINDEXES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-origdirnames">
-   <term>
-    <constant>RPMTAG_ORIGDIRNAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-origfilenames">
-   <term>
-    <constant>RPMTAG_ORIGFILENAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-os">
-   <term>
-    <constant>RPMTAG_OS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-p">
-   <term>
-    <constant>RPMTAG_P</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-packager">
-   <term>
-    <constant>RPMTAG_PACKAGER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-patch">
-   <term>
-    <constant>RPMTAG_PATCH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-patchesflags">
-   <term>
-    <constant>RPMTAG_PATCHESFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-patchesname">
-   <term>
-    <constant>RPMTAG_PATCHESNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-patchesversion">
-   <term>
-    <constant>RPMTAG_PATCHESVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloadcompressor">
-   <term>
-    <constant>RPMTAG_PAYLOADCOMPRESSOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloaddigest">
-   <term>
-    <constant>RPMTAG_PAYLOADDIGEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloaddigestalt">
-   <term>
-    <constant>RPMTAG_PAYLOADDIGESTALT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     With librpm &gt;= 4.16.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloaddigestalgo">
-   <term>
-    <constant>RPMTAG_PAYLOADDIGESTALGO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloadflags">
-   <term>
-    <constant>RPMTAG_PAYLOADFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-payloadformat">
-   <term>
-    <constant>RPMTAG_PAYLOADFORMAT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-pkgid">
-   <term>
-    <constant>RPMTAG_PKGID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Deprecated, use <constant>RPMTAG_SIGMD5</constant> instead. Removed in librpm 6.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-platform">
-   <term>
-    <constant>RPMTAG_PLATFORM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-policies">
-   <term>
-    <constant>RPMTAG_POLICIES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-policyflags">
-   <term>
-    <constant>RPMTAG_POLICYFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-policynames">
-   <term>
-    <constant>RPMTAG_POLICYNAMES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-policytypes">
-   <term>
-    <constant>RPMTAG_POLICYTYPES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-policytypesindexes">
-   <term>
-    <constant>RPMTAG_POLICYTYPESINDEXES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postin">
-   <term>
-    <constant>RPMTAG_POSTIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postinflags">
-   <term>
-    <constant>RPMTAG_POSTINFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postinprog">
-   <term>
-    <constant>RPMTAG_POSTINPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-posttrans">
-   <term>
-    <constant>RPMTAG_POSTTRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-posttransflags">
-   <term>
-    <constant>RPMTAG_POSTTRANSFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-posttransprog">
-   <term>
-    <constant>RPMTAG_POSTTRANSPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postun">
-   <term>
-    <constant>RPMTAG_POSTUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postunflags">
-   <term>
-    <constant>RPMTAG_POSTUNFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postunprog">
-   <term>
-    <constant>RPMTAG_POSTUNPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postuntrans">
-   <term>
-    <constant>RPMTAG_POSTUNTRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postuntransflags">
-   <term>
-    <constant>RPMTAG_POSTUNTRANSFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-postuntransprog">
-   <term>
-    <constant>RPMTAG_POSTUNTRANSPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-prefixes">
-   <term>
-    <constant>RPMTAG_PREFIXES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-prein">
-   <term>
-    <constant>RPMTAG_PREIN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preinflags">
-   <term>
-    <constant>RPMTAG_PREINFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preinprog">
-   <term>
-    <constant>RPMTAG_PREINPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-pretrans">
-   <term>
-    <constant>RPMTAG_PRETRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-pretransflags">
-   <term>
-    <constant>RPMTAG_PRETRANSFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-pretransprog">
-   <term>
-    <constant>RPMTAG_PRETRANSPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preun">
-   <term>
-    <constant>RPMTAG_PREUN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preunflags">
-   <term>
-    <constant>RPMTAG_PREUNFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preunprog">
-   <term>
-    <constant>RPMTAG_PREUNPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preuntrans">
-   <term>
-    <constant>RPMTAG_PREUNTRANS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preuntransflags">
-   <term>
-    <constant>RPMTAG_PREUNTRANSFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-preuntransprog">
-   <term>
-    <constant>RPMTAG_PREUNTRANSPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-provideflags">
-   <term>
-    <constant>RPMTAG_PROVIDEFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-providename">
-   <term>
-    <constant>RPMTAG_PROVIDENAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Provided dependencies, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-providenevrs">
-   <term>
-    <constant>RPMTAG_PROVIDENEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-provides">
-   <term>
-    <constant>RPMTAG_PROVIDES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-provideversion">
-   <term>
-    <constant>RPMTAG_PROVIDEVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-pubkeys">
-   <term>
-    <constant>RPMTAG_PUBKEYS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-r">
-   <term>
-    <constant>RPMTAG_R</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recommendflags">
-   <term>
-    <constant>RPMTAG_RECOMMENDFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recommendname">
-   <term>
-    <constant>RPMTAG_RECOMMENDNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Recommended weak dependencies, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recommendnevrs">
-   <term>
-    <constant>RPMTAG_RECOMMENDNEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recommends">
-   <term>
-    <constant>RPMTAG_RECOMMENDS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recommendversion">
-   <term>
-    <constant>RPMTAG_RECOMMENDVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-recontexts">
-   <term>
-    <constant>RPMTAG_RECONTEXTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-release">
-   <term>
-    <constant>RPMTAG_RELEASE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-removetid">
-   <term>
-    <constant>RPMTAG_REMOVETID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-requireflags">
-   <term>
-    <constant>RPMTAG_REQUIREFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-requirename">
-   <term>
-    <constant>RPMTAG_REQUIRENAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Required dependencies, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-requirenevrs">
-   <term>
-    <constant>RPMTAG_REQUIRENEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-requires">
-   <term>
-    <constant>RPMTAG_REQUIRES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-requireversion">
-   <term>
-    <constant>RPMTAG_REQUIREVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-rpmversion">
-   <term>
-    <constant>RPMTAG_RPMVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-rsaheader">
-   <term>
-    <constant>RPMTAG_RSAHEADER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sha1header">
-   <term>
-    <constant>RPMTAG_SHA1HEADER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     SHA1 signature, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sha256header">
-   <term>
-    <constant>RPMTAG_SHA256HEADER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-siggpg">
-   <term>
-    <constant>RPMTAG_SIGGPG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sigmd5">
-   <term>
-    <constant>RPMTAG_SIGMD5</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     MD5 signature, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sigpgp">
-   <term>
-    <constant>RPMTAG_SIGPGP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sigsize">
-   <term>
-    <constant>RPMTAG_SIGSIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-size">
-   <term>
-    <constant>RPMTAG_SIZE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-source">
-   <term>
-    <constant>RPMTAG_SOURCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sourcepackage">
-   <term>
-    <constant>RPMTAG_SOURCEPACKAGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sourcepkgid">
-   <term>
-    <constant>RPMTAG_SOURCEPKGID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sourcerpm">
-   <term>
-    <constant>RPMTAG_SOURCERPM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-spec">
-   <term>
-    <constant>RPMTAG_SPEC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.18
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-suggestflags">
-   <term>
-    <constant>RPMTAG_SUGGESTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-suggestname">
-   <term>
-    <constant>RPMTAG_SUGGESTNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Suggested weak dependencies, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-suggestnevrs">
-   <term>
-    <constant>RPMTAG_SUGGESTNEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-suggests">
-   <term>
-    <constant>RPMTAG_SUGGESTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-suggestversion">
-   <term>
-    <constant>RPMTAG_SUGGESTVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-summary">
-   <term>
-    <constant>RPMTAG_SUMMARY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-supplementflags">
-   <term>
-    <constant>RPMTAG_SUPPLEMENTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-supplementname">
-   <term>
-    <constant>RPMTAG_SUPPLEMENTNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Weak dependencies, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-supplementnevrs">
-   <term>
-    <constant>RPMTAG_SUPPLEMENTNEVRS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-supplements">
-   <term>
-    <constant>RPMTAG_SUPPLEMENTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-supplementversion">
-   <term>
-    <constant>RPMTAG_SUPPLEMENTVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-sysusers">
-   <term>
-    <constant>RPMTAG_SYSUSERS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.19
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerconds">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERCONDS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerflags">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerindex">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERINDEX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggername">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Transaction file trigger name, with database index, requires librpm &gt;= 4.13.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerpriorities">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERPRIORITIES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerscriptflags">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERSCRIPTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerscriptprog">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERSCRIPTPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerscripts">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERSCRIPTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggertype">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERTYPE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-transfiletriggerversion">
-   <term>
-    <constant>RPMTAG_TRANSFILETRIGGERVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-translationurl">
-   <term>
-    <constant>RPMTAG_TRANSLATIONURL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.18
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerconds">
-   <term>
-    <constant>RPMTAG_TRIGGERCONDS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerflags">
-   <term>
-    <constant>RPMTAG_TRIGGERFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerindex">
-   <term>
-    <constant>RPMTAG_TRIGGERINDEX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggername">
-   <term>
-    <constant>RPMTAG_TRIGGERNAME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Trigger name, with database index.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerscriptflags">
-   <term>
-    <constant>RPMTAG_TRIGGERSCRIPTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerscriptprog">
-   <term>
-    <constant>RPMTAG_TRIGGERSCRIPTPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerscripts">
-   <term>
-    <constant>RPMTAG_TRIGGERSCRIPTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggertype">
-   <term>
-    <constant>RPMTAG_TRIGGERTYPE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-triggerversion">
-   <term>
-    <constant>RPMTAG_TRIGGERVERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-upstreamreleases">
-   <term>
-    <constant>RPMTAG_UPSTREAMRELEASES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Requires librpm &gt;= 4.18
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-url">
-   <term>
-    <constant>RPMTAG_URL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-v">
-   <term>
-    <constant>RPMTAG_V</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-vcs">
-   <term>
-    <constant>RPMTAG_VCS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-vendor">
-   <term>
-    <constant>RPMTAG_VENDOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-verbose">
-   <term>
-    <constant>RPMTAG_VERBOSE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-verifyscript">
-   <term>
-    <constant>RPMTAG_VERIFYSCRIPT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-verifyscriptflags">
-   <term>
-    <constant>RPMTAG_VERIFYSCRIPTFLAGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-verifyscriptprog">
-   <term>
-    <constant>RPMTAG_VERIFYSCRIPTPROG</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-veritysignaturealgo">
-   <term>
-    <constant>RPMTAG_VERITYSIGNATUREALGO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     With librpm &gt;= 4.17.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-veritysignatures">
-   <term>
-    <constant>RPMTAG_VERITYSIGNATURES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     With librpm &gt;= 4.17.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-version">
-   <term>
-    <constant>RPMTAG_VERSION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.rpmtag-xpm">
-   <term>
-    <constant>RPMTAG_XPM</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/rpminfo/functions/rpmaddtag.xml b/reference/rpminfo/functions/rpmaddtag.xml
deleted file mode 100644
index 2ec234cc8df8..000000000000
--- a/reference/rpminfo/functions/rpmaddtag.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmaddtag" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>rpmaddtag</refname>
-  <refpurpose>Add tag retrieved in query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rpmaddtag</methodname>
-   <methodparam><type>int</type><parameter>tag</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Add an additional retrieved tag in subsequent queries.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tag</parameter></term>
-    <listitem>
-     <simpara>
-      One of <constant>RPMTAG_<replaceable>*</replaceable></constant> constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpminfo</function></member>
-   <member><function>rpmdbinfo</function></member>
-   <member><function>rpmdbsearch</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/rpminfo/functions/rpmdbinfo.xml b/reference/rpminfo/functions/rpmdbinfo.xml
deleted file mode 100644
index 5f6a4569aa84..000000000000
--- a/reference/rpminfo/functions/rpmdbinfo.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmdbinfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>rpmdbinfo</refname>
-  <refpurpose>Get information from installed RPM</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>rpmdbinfo</methodname>
-   <methodparam><type>string</type><parameter>nevr</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>full</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve information about an installed package, from the system RPM database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nevr</parameter></term>
-    <listitem>
-     <simpara>
-      Name with optional epoch, version and release.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>full</parameter></term>
-    <listitem>
-     <simpara>
-      If &true; all information headers for the file are retrieved, else only a minimal set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of <type>array</type> of information, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>rpmdbinfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-rpmaddtag(RPMTAG_INSTALLTIME);
-$info = rpmdbinfo("php-pecl-rpminfo");
-print_r($info);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [Name] => php-pecl-rpminfo
-            [Version] => 0.4.2
-            [Release] => 1.fc31
-            [Summary] => RPM information
-            [Installtime] => 1586244687
-            [Arch] => x86_64
-        )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmaddtag</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/rpminfo/functions/rpmdbsearch.xml b/reference/rpminfo/functions/rpmdbsearch.xml
deleted file mode 100644
index 91ee47f47558..000000000000
--- a/reference/rpminfo/functions/rpmdbsearch.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmdbsearch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>rpmdbsearch</refname>
-  <refpurpose>Search RPM packages</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>rpmdbsearch</methodname>
-   <methodparam><type>string</type><parameter>pattern</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>rpmtag</parameter><initializer>RPMTAG_NAME</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>rpmmire</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>full</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Search packages in the system RPM database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pattern</parameter></term>
-    <listitem>
-     <simpara>
-      Value to search for.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rpmtag</parameter></term>
-    <listitem>
-     <simpara>
-      Search criterion, which is one of the
-      <constant>RPMTAG_<replaceable>*</replaceable></constant> constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rpmmire</parameter></term>
-    <listitem>
-     <simpara>
-      Pattern type, which is one of the
-      <constant>RPMMIRE_<replaceable>*</replaceable></constant> constants.
-      When &lt; 0 the criterion must equal the value, and database index is used if possible.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>full</parameter></term>
-    <listitem>
-     <simpara>
-      If &true; all information headers for the file are retrieved, else only a minimal set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of <type>array</type> of information, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Searching for the package owning a file</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$info = rpmdbsearch("/usr/bin/php", RPMTAG_INSTFILENAMES);
-print_r($info);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [Name] => php-cli
-            [Version] => 7.4.4
-            [Release] => 1.fc32
-            [Summary] => Command-line interface for PHP
-            [Arch] => x86_64
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmaddtag</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/rpminfo/functions/rpmdefine.xml b/reference/rpminfo/functions/rpmdefine.xml
deleted file mode 100644
index df70c5eddca6..000000000000
--- a/reference/rpminfo/functions/rpmdefine.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmdefine" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>rpmdefine</refname>
-  <refpurpose>Define or change a RPM macro value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rpmdefine</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Define or change a RPM macro value.
-  </simpara>
-  <simpara>
-   This can be used to select the database path and backend to use
-   instead of system default one.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      Macro name, options, body.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>rpmdefine</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// use an old database (bdb) from an EL-8 chroot
-rpmdefine("_dbpath /var/lib/mock/almalinux-8-x86_64/root/var/lib/rpm");
-rpmdefine("_db_backend bdb_ro");
-print_r(rpmdbinfo("almalinux-release")[0]["Summary"]);
-
-// use a new database (sqlite) from a Fedora-41 chroot
-rpmdefine("_dbpath /var/lib/mock/fedora-41-x86_64/root/usr/lib/sysimage/rpm");
-rpmdefine("_db_backend sqlite");
-print_r(rpmdbinfo("fedora-release")[0]["Summary"]);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-AlmaLinux release file
-Fedora release files
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmexpand</function></member>
-   <member><function>rpmdbinfo</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/rpminfo/functions/rpmexpand.xml b/reference/rpminfo/functions/rpmexpand.xml
deleted file mode 100644
index 0ed967e89036..000000000000
--- a/reference/rpminfo/functions/rpmexpand.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmexpand" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>rpmexpand</refname>
-  <refpurpose>Retrieve expanded value of a RPM macro</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rpmexpand</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve expanded value of a RPM macro.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      Text with RPM macros to expand.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <type>string</type> with concatenated macro expansions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>rpmexpand</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$distro = rpmexpand("%{?fedora:Fedora %{fedora}}%{?rhel:Enterprise Linux %{rhel}}");
-print_r($distro);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Fedora 41
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmexpandnumeric</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/rpminfo/functions/rpmexpandnumeric.xml b/reference/rpminfo/functions/rpmexpandnumeric.xml
deleted file mode 100644
index d630a926e8ec..000000000000
--- a/reference/rpminfo/functions/rpmexpandnumeric.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmexpandnumeric" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>rpmexpandnumeric</refname>
-  <refpurpose>Retrieve numerical value of a RPM macro</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>rpmexpandnumeric</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve numerical value of a RPM macro.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <simpara>
-      Text with RPM macros to expand.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Macro expansion as a <type>int</type>.
-   Boolean values (<literal>Y</literal> or <literal>y</literal> returns 1,
-   <literal>N</literal> or <literal>n</literal> returns <literal>0</literal>)
-   are permitted as well.
-   An undefined macro returns <literal>0</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>rpmexpandnumeric</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$bits = rpmexpandnumeric("%__isa_bits");
-print_r($bits);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-64
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmexpand</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/rpminfo/functions/rpmgetsymlink.xml b/reference/rpminfo/functions/rpmgetsymlink.xml
deleted file mode 100644
index d72f746ca6d8..000000000000
--- a/reference/rpminfo/functions/rpmgetsymlink.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmgetsymlink" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>rpmgetsymlink</refname>
-  <refpurpose>Get target of a symlink</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>null</type></type><methodname>rpmgetsymlink</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get target of a symlink.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path of the RPM file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      Name of the symlink file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <type>string</type> with target of the symlink,
-   &null; on error, or an empty string if not a symlink.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rpminfo/functions/rpminfo.xml b/reference/rpminfo/functions/rpminfo.xml
deleted file mode 100644
index ed0b1eda573d..000000000000
--- a/reference/rpminfo/functions/rpminfo.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpminfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>rpminfo</refname>
-  <refpurpose>Get information from a RPM file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>rpminfo</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>full</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieve information about a local file, a RPM package.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path of the RPM file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>full</parameter></term>
-    <listitem>
-     <simpara>
-      If &true; all information headers for the file are retrieved,
-      else only a minimal set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error</parameter></term>
-    <listitem>
-     <simpara>
-      If provided, will receive the possible error message,
-      and will avoid a runtime warning.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of information, or &null; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>rpminfo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-rpmaddtag(RPMTAG_BUILDTIME);
-$info = rpminfo("./php-pecl-rpminfo-0.4.2-1.el8.remi.7.4.x86_64.rpm");
-print_r($info);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Array
-(
-    [Name] => php-pecl-rpminfo
-    [Version] => 0.4.2
-    [Release] => 1.el8
-    [Summary] => RPM information
-    [Buildtime] => 1586244821
-    [Arch] => x86_64
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rpmaddtag</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/rpminfo/functions/rpmvercmp.xml b/reference/rpminfo/functions/rpmvercmp.xml
deleted file mode 100644
index 3e7db17bec7a..000000000000
--- a/reference/rpminfo/functions/rpmvercmp.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.rpmvercmp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>rpmvercmp</refname>
-  <refpurpose>RPM version comparison</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>bool</type></type><methodname>rpmvercmp</methodname>
-   <methodparam><type>string</type><parameter>evr1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>evr2</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>operator</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Compare two RPM package versions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>evr1</parameter></term>
-    <listitem>
-     <simpara>
-      First <literal>epoch:version-release</literal> string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>evr2</parameter></term>
-    <listitem>
-     <simpara>
-      Second <literal>epoch:version-release</literal> string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>operator</parameter></term>
-    <listitem>
-     <para>
-      An optional operator.
-      The possible operators are:
-      <simplelist type="inline">
-       <member><literal>&lt;</literal></member>
-       <member><literal>lt</literal></member>
-       <member><literal>&lt;=</literal></member>
-       <member><literal>le</literal></member>
-       <member><literal>&gt;</literal></member>
-       <member><literal>gt</literal></member>
-       <member><literal>&gt;=</literal></member>
-       <member><literal>ge</literal></member>
-       <member><literal>==</literal></member>
-       <member><literal>=</literal></member>
-       <member><literal>eq</literal></member>
-       <member><literal>!=</literal></member>
-       <member><literal>&lt;&gt;</literal></member>
-       <member><literal>ne</literal></member>
-      </simplelist>.
-     </para>
-     <simpara>
-      This parameter is case-sensitive, values should be lowercase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <literal>-1</literal> if <parameter>evr1</parameter> is less than
-   <parameter>evr2</parameter>, <literal>1</literal> if <parameter>evr1</parameter> is
-   greater than <parameter>evr2</parameter>, and <literal>0</literal> if they are equal.
-  </simpara>
-  <simpara>
-   When using the optional <parameter>operator</parameter> argument, the
-   function will return &true; if the relationship is the one specified
-   by the operator, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL rpminfo 0.7.0</entry>
-      <entry>
-       Optional <parameter>operator</parameter> was added.
-      </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/rpminfo/reference.xml b/reference/rpminfo/reference.xml
deleted file mode 100644
index 795ea5478720..000000000000
--- a/reference/rpminfo/reference.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.rpminfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>RpmInfo &Functions;</title>
-
- &reference.rpminfo.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/rpminfo/setup.xml b/reference/rpminfo/setup.xml
deleted file mode 100644
index 4e0f8d39e9f5..000000000000
--- a/reference/rpminfo/setup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="rpminfo.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="rpminfo.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires <link xlink:href="&url.librpm;">librpm</link> version 4.11.3 or higher.
-  </simpara>
- </section>
-
- <section xml:id="rpminfo.installation">
-  <title>Installation via PECL</title>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;rpminfo">&url.pecl.package;rpminfo</link>.
-  </simpara>
- </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/rpminfo/versions.xml b/reference/rpminfo/versions.xml
deleted file mode 100644
index ca4e295df6ef..000000000000
--- a/reference/rpminfo/versions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='rpmaddtag' from='PECL rpminfo &gt;= 0.5.0'/>
- <function name='rpmdbinfo' from='PECL rpminfo &gt;= 0.2.0'/>
- <function name='rpmdbsearch' from='PECL rpminfo &gt;= 0.3.0'/>
- <function name='rpminfo' from='PECL rpminfo &gt;= 0.1.0'/>
- <function name='rpmvercmp' from='PECL rpminfo &gt;= 0.1.0'/>
- <function name='rpmgetsymlink' from='PECL rpminfo &gt;= 1.1.0'/>
- <function name='rpmexpand' from='PECL rpminfo &gt;= 1.2.0'/>
- <function name='rpmexpandnumeric' from='PECL rpminfo &gt;= 1.2.0'/>
- <function name='rpmdefine' from='PECL rpminfo &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/rrd/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/rrd/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/rrd/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/rrd/book.xml b/reference/rrd/book.xml
deleted file mode 100644
index b9c2d8c989a5..000000000000
--- a/reference/rrd/book.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.rrd">
- <?phpdoc extension-membership="pecl" ?>
- <title>RRDtool</title>
- <titleabbrev>RRD</titleabbrev>
-
- <preface xml:id="intro.rrd">
-  &reftitle.intro;
-  <simpara>
-   The PECL/rrd extension provides bindings to the RRDtool C library.
-   RRDtool is the open source industry standard, high performance data
-   logging and graphing system for time series data.
-  </simpara>
-  <simpara>
-   The RRDtool homepage is <link xlink:href="&url.rrd;">&url.rrd;</link>.
-  </simpara>
- </preface>
-
- &reference.rrd.setup;
- &reference.rrd.examples;
- &reference.rrd.reference;
-
- &reference.rrd.rrdcreator;
- &reference.rrd.rrdgraph;
- &reference.rrd.rrdupdater;
-</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/rrd/configure.xml b/reference/rrd/configure.xml
deleted file mode 100644
index 0ab2eadb38d1..000000000000
--- a/reference/rrd/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrd.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;rrd">&url.pecl.package;rrd</link>
- </simpara>
-
-</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/rrd/examples.xml b/reference/rrd/examples.xml
deleted file mode 100644
index f69c7dff142d..000000000000
--- a/reference/rrd/examples.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrd.examples">
- &reftitle.examples;
- <section xml:id="rrd.examples-procedural">
-  <title>Procedural PECL/rrd example</title>
-  <example>
-   <title>Procedural usage of rrd</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rrdFile = dirname(__FILE__) . "/speed.rrd";
-
-//create rrd file
-rrd_create($rrdFile,
- array(
-  "--start",920804400,
-  "DS:speed:COUNTER:600:U:U",
-  "RRA:AVERAGE:0.5:1:24",
-  "RRA:AVERAGE:0.5:6:10"
-  )
-);
-
-//update rrd file
-rrd_update($rrdFile,
- array(
-  "920804700:12345",
-  "920805000:12357"
-  )
-);
-
-//graph output
-rrd_graph(dirname(__FILE__) . "/speed.png",
- array(
-  "--start", "920804400",
-  "--end", "920808000",
-  "--vertical-label", "m/s",
-  "DEF:myspeed=$rrdFile:speed:AVERAGE",
-  "CDEF:realspeed=myspeed,1000,*",
-  "LINE2:realspeed#FF0000"
- )
-);
-?>
-]]>
-   </programlisting>
-  </example>
- </section>
-
- <section xml:id="rrd.examples-oop">
-  <title>OOP PECL/rrd example</title>
-  <example>
-   <title>OO usage of rrd</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$rrdFile = dirname(__FILE__) . "/speed.rrd";
-$outputPngFile = dirname(__FILE__) . "/speed.png";
-
-$creator = new RRDCreator($rrdFile, "now -10d", 500);
-$creator->addDataSource("speed:COUNTER:600:U:U");
-$creator->addArchive("AVERAGE:0.5:1:24");
-$creator->addArchive("AVERAGE:0.5:6:10");
-$creator->save();
-
-$updater = new RRDUpdater($rrdFile);
-$updater->update(array("speed" => "12345"), "920804700");
-$updater->update(array("speed" => "12357"), "920805000");
-
-$graphObj = new RRDGraph($outputPngFile);
-$graphObj->setOptions(
-    array(
-        "--start" => "920804400",
-        "--end" => 920808000,
-        "--vertical-label" => "m/s",
-        "DEF:myspeed=$rrdFile:speed:AVERAGE",
-        "CDEF:realspeed=myspeed,1000,*",
-        "LINE2:realspeed#FF0000"
-    )
-);
-$graphObj->save();
-?>
-]]>
-   </programlisting>
-  </example>
- </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/rrd/functions/rrd-create.xml b/reference/rrd/functions/rrd-create.xml
deleted file mode 100644
index 5fc90c196226..000000000000
--- a/reference/rrd/functions/rrd-create.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-create">
- <refnamediv>
-  <refname>rrd_create</refname>
-  <refpurpose>Creates rrd database file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rrd_create</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates the rdd database file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Filename for newly created rrd file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options for rrd create - list of strings. See man page of rrd create
-      for whole list of options.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-error.xml b/reference/rrd/functions/rrd-error.xml
deleted file mode 100644
index e17d13558179..000000000000
--- a/reference/rrd/functions/rrd-error.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-error">
- <refnamediv>
-  <refname>rrd_error</refname>
-  <refpurpose>Gets latest error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rrd_error</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns latest global rrd error message.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Latest error message.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-fetch.xml b/reference/rrd/functions/rrd-fetch.xml
deleted file mode 100644
index 0f78a72d2747..000000000000
--- a/reference/rrd/functions/rrd-fetch.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-fetch">
- <refnamediv>
-  <refname>rrd_fetch</refname>
-  <refpurpose>Fetch the data for graph as array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>rrd_fetch</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets data for graph output from RRD database file as array. This function
-   has same result as <function>rrd_graph</function>,  but fetched data are
-   returned as array, no image file is created.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Array of options for resolution specification.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns information about retrieved graph data.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-first.xml b/reference/rrd/functions/rrd-first.xml
deleted file mode 100644
index d545e7e1b3cc..000000000000
--- a/reference/rrd/functions/rrd-first.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-first">
- <refnamediv>
-  <refname>rrd_first</refname>
-  <refpurpose>Gets the timestamp of the first sample from rrd file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>rrd_first</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>raaindex</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the first data sample from the specified RRA of the RRD file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>raaindex</parameter></term>
-    <listitem>
-     <simpara>
-      The index number of the RRA that is to be examined. Default value is 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Integer number of unix timestamp,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-graph.xml b/reference/rrd/functions/rrd-graph.xml
deleted file mode 100644
index 0fb120af5a33..000000000000
--- a/reference/rrd/functions/rrd-graph.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-graph">
- <refnamediv>
-  <refname>rrd_graph</refname>
-  <refpurpose>Creates image from a data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>rrd_graph</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates image for a particular data from RRD file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename to output the graph to. This will generally end in either
-      <literal>.png</literal>, <literal>.svg</literal> or
-      <literal>.eps</literal>, depending on the format you want to output.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options for generating image. See man page of rrd graph for all
-      possible options. All options (data definitions, variable definitions, etc.)
-      are allowed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array with information about generated image is returned,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-info.xml b/reference/rrd/functions/rrd-info.xml
deleted file mode 100644
index 53cfc952e8eb..000000000000
--- a/reference/rrd/functions/rrd-info.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-info">
- <refnamediv>
-  <refname>rrd_info</refname>
-  <refpurpose>Gets information about rrd file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>rrd_info</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns information about particular RRD database file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array with information about requested RRD file,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-last.xml b/reference/rrd/functions/rrd-last.xml
deleted file mode 100644
index 5252bc6e24cc..000000000000
--- a/reference/rrd/functions/rrd-last.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-last">
- <refnamediv>
-  <refname>rrd_last</refname>
-  <refpurpose>Gets unix timestamp of the last sample</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>rrd_last</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the UNIX timestamp of the most recent update of the RRD database.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Integer as unix timestamp of the most recent data from the RRD database.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-lastupdate.xml b/reference/rrd/functions/rrd-lastupdate.xml
deleted file mode 100644
index 6ef4fd2f5951..000000000000
--- a/reference/rrd/functions/rrd-lastupdate.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-lastupdate">
- <refnamediv>
-  <refname>rrd_lastupdate</refname>
-  <refpurpose>Gets information about last updated data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>rrd_lastupdate</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets array of the UNIX timestamp and the values stored for each date in the
-   most recent update of the RRD database file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array of information about last update,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-restore.xml b/reference/rrd/functions/rrd-restore.xml
deleted file mode 100644
index b044e6f94b8b..000000000000
--- a/reference/rrd/functions/rrd-restore.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-restore">
- <refnamediv>
-  <refname>rrd_restore</refname>
-  <refpurpose>Restores the RRD file from XML dump</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rrd_restore</methodname>
-   <methodparam><type>string</type><parameter>xml_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>rrd_file</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Restores the RRD file from the XML dump.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>xml_file</parameter></term>
-    <listitem>
-     <simpara>
-      XML filename with the dump of the original RRD database file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rrd_file</parameter></term>
-    <listitem>
-     <simpara>
-      Restored RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Array of options for restoring. See man page for rrd restore.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-tune.xml b/reference/rrd/functions/rrd-tune.xml
deleted file mode 100644
index af1663ea0959..000000000000
--- a/reference/rrd/functions/rrd-tune.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-tune">
- <refnamediv>
-  <refname>rrd_tune</refname>
-  <refpurpose>Tunes some RRD database file header options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rrd_tune</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change some options in the RRD dabase header file. E.g. renames the source for
-   the data etc.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options with RRD database file properties which will be changed. See
-      rrd tune man page for details.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-update.xml b/reference/rrd/functions/rrd-update.xml
deleted file mode 100644
index fec478ef6c27..000000000000
--- a/reference/rrd/functions/rrd-update.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-update">
- <refnamediv>
-  <refname>rrd_update</refname>
-  <refpurpose>Updates the RRD database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>rrd_update</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Updates the RRD database file. The input data is time interpolated according to the
-   properties of the RRD database file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      RRD database file name. This database will be updated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options for updating the RRD database. This is list of strings. See man page of rrd update
-      for whole list of options.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-version.xml b/reference/rrd/functions/rrd-version.xml
deleted file mode 100644
index 505415be38e9..000000000000
--- a/reference/rrd/functions/rrd-version.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-version">
- <refnamediv>
-  <refname>rrd_version</refname>
-  <refpurpose>Gets information about underlying rrdtool library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>rrd_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns information about underlying rrdtool library.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   String with rrdtool version number e.g. "1.4.3".
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrd-xport.xml b/reference/rrd/functions/rrd-xport.xml
deleted file mode 100644
index 5ab548a81ffe..000000000000
--- a/reference/rrd/functions/rrd-xport.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrd-xport">
- <refnamediv>
-  <refname>rrd_xport</refname>
-  <refpurpose>Exports the information about RRD database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>rrd_xport</methodname>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Exports the information about RRD database file. This data can be converted
-   to XML file via user space PHP script and then restored back as RRD database
-   file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Array of options for the export, see rrd xport man page.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Array with information about RRD database file,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/functions/rrdc-disconnect.xml b/reference/rrd/functions/rrdc-disconnect.xml
deleted file mode 100644
index 3eb8c804d3f0..000000000000
--- a/reference/rrd/functions/rrdc-disconnect.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.rrdc-disconnect">
- <refnamediv>
-  <refname>rrdc_disconnect</refname>
-  <refpurpose>Close any outstanding connection to rrd caching daemon</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>rrdc_disconnect</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Close any outstanding connection to rrd caching daemon.
-  </simpara>
-  <simpara>
-   This function is automatically called when the whole PHP process is terminated.
-   It depends on used SAPI. For example, it's called automatically at the end
-   of command line script.
-  </simpara>
-  <simpara>
-   It's up user whether he wants to call this function at the end of every request
-   or otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-  &return.void;
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/reference.xml b/reference/rrd/reference.xml
deleted file mode 100644
index 3a49b799a0f6..000000000000
--- a/reference/rrd/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.rrd" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>RRD &Functions;</title>
-
- &reference.rrd.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/rrd/rrdcreator.xml b/reference/rrd/rrdcreator.xml
deleted file mode 100644
index f6ff937b8642..000000000000
--- a/reference/rrd/rrdcreator.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rrdcreator" role="class">
- <title>The RRDCreator class</title>
- <titleabbrev>RRDCreator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RRDCreator intro -->
-  <section xml:id="rrdcreator.intro">
-   &reftitle.intro;
-   <simpara>
-    Class for creation of RRD database file.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rrdcreator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RRDCreator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>RRDCreator</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdcreator')/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.rrdcreator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.rrd.entities.rrdcreator;
-
-</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/rrd/rrdcreator/addarchive.xml b/reference/rrd/rrdcreator/addarchive.xml
deleted file mode 100644
index 80d10b28d964..000000000000
--- a/reference/rrd/rrdcreator/addarchive.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdcreator.addarchive">
- <refnamediv>
-  <refname>RRDCreator::addArchive</refname>
-  <refpurpose>Adds RRA - archive of data values for each data source</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>RRDCreator::addArchive</methodname>
-   <methodparam><type>string</type><parameter>description</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds RRA definition by description of archive. Archive consists  of a
-   number of data values or statistics for each of the defined data-sources (DS).
-   Data sources are defined by method <methodname>RRDCreator::addDataSource</methodname>.
-   You need call this method for each requested archive.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>description</parameter></term>
-    <listitem>
-     <simpara>
-      Definition of archive - RRA. This has same format as RRA definition in
-      rrd create command. See man page of rrd create for more details.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/rrdcreator/adddatasource.xml b/reference/rrd/rrdcreator/adddatasource.xml
deleted file mode 100644
index 13dfb5146a8f..000000000000
--- a/reference/rrd/rrdcreator/adddatasource.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdcreator.adddatasource">
- <refnamediv>
-  <refname>RRDCreator::addDataSource</refname>
-  <refpurpose>Adds data source definition for RRD database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>RRDCreator::addDataSource</methodname>
-   <methodparam><type>string</type><parameter>description</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   RRD can accept input from several data sources (DS), e.g incoming and outgoing
-   traffic. This method adds data source by description. You need call
-   this method for each data source.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>description</parameter></term>
-    <listitem>
-     <simpara>
-      Definition of data source - DS. This has same format as DS definition in
-      rrd create command. See man page of rrd create for more details.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/rrdcreator/construct.xml b/reference/rrd/rrdcreator/construct.xml
deleted file mode 100644
index 0750a72ca5bb..000000000000
--- a/reference/rrd/rrdcreator/construct.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdcreator.construct">
- <refnamediv>
-  <refname>RRDCreator::__construct</refname>
-  <refpurpose>Creates new <classname>RRDCreator</classname> instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>RRDCreator::__construct</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>startTime</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>step</parameter><initializer>0</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates new <classname>RRDCreator</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path for newly created RRD database file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>startTime</parameter></term>
-    <listitem>
-     <simpara>
-      Time for the first value in RRD database. Parameter supports all formats
-      which are supported by rrd create call.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>int<parameter>step</parameter></term>
-    <listitem>
-     <simpara>
-      Base interval in seconds with which data will be fed into the RRD database.
-     </simpara>
-    </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/rrd/rrdcreator/save.xml b/reference/rrd/rrdcreator/save.xml
deleted file mode 100644
index 1028ca9ba302..000000000000
--- a/reference/rrd/rrdcreator/save.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdcreator.save">
- <refnamediv>
-  <refname>RRDCreator::save</refname>
-  <refpurpose>Saves the RRD database to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>RRDCreator::save</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Saves the RRD database into file, which name is defined by <methodname>RRDCreator::__construct</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/rrdgraph.xml b/reference/rrd/rrdgraph.xml
deleted file mode 100644
index 3c501064d833..000000000000
--- a/reference/rrd/rrdgraph.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rrdgraph" role="class">
-
- <title>The RRDGraph class</title>
- <titleabbrev>RRDGraph</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RRDGraph intro -->
-  <section xml:id="rrdgraph.intro">
-   &reftitle.intro;
-   <simpara>
-    Class for exporting data from RRD database to image file.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rrdgraph.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RRDGraph</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>RRDGraph</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdgraph')/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.rrdgraph')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.rrd.entities.rrdgraph;
-
-</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/rrd/rrdgraph/construct.xml b/reference/rrd/rrdgraph/construct.xml
deleted file mode 100644
index 48471e19dcc5..000000000000
--- a/reference/rrd/rrdgraph/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdgraph.construct">
- <refnamediv>
-  <refname>RRDGraph::__construct</refname>
-  <refpurpose>Creates new <classname>RRDGraph</classname> instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>RRDGraph::__construct</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates new <classname>RRDGraph</classname> instance. This instance is responsible for rendering
-   the result of RRD database query into image.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Full path for the newly created image.
-     </simpara>
-    </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/rrd/rrdgraph/save.xml b/reference/rrd/rrdgraph/save.xml
deleted file mode 100644
index 84f7487fe44c..000000000000
--- a/reference/rrd/rrdgraph/save.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdgraph.save">
- <refnamediv>
-  <refname>RRDGraph::save</refname>
-  <refpurpose>Saves the result of query into image</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>RRDGraph::save</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Saves the result of RRD database query into image defined by
-   <methodname>RRDGraph::__construct</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns array with information about generated image,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/rrdgraph/saveverbose.xml b/reference/rrd/rrdgraph/saveverbose.xml
deleted file mode 100644
index f85f95839e8a..000000000000
--- a/reference/rrd/rrdgraph/saveverbose.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdgraph.saveverbose">
- <refnamediv>
-  <refname>RRDGraph::saveVerbose</refname>
-  <refpurpose>Saves the RRD database query into image and returns the verbose
-   information about generated graph
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>RRDGraph::saveVerbose</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Saves the RRD database query into image file defined by method <methodname>RRDGraph::__construct</methodname>
-   and returns the verbose information about generated graph, if "-" is used as image
-   filename, image data are also returned in result array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns array with detailed information about generated image,&return.falseforfailure;.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/rrd/rrdgraph/setoptions.xml b/reference/rrd/rrdgraph/setoptions.xml
deleted file mode 100644
index 5ac27770af45..000000000000
--- a/reference/rrd/rrdgraph/setoptions.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdgraph.setoptions">
- <refnamediv>
-  <refname>RRDGraph::setOptions</refname>
-  <refpurpose>Sets the options for rrd graph export</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>RRDGraph::setOptions</methodname>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      List of options for the image generation from the RRD database file. It can
-      be list of strings or list of strings with keys for better readability. Read
-      the rrd graph man pages for list of available options.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>RRDGraph::setOptions</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$graphObj->setOptions(array(
-    "--start" => "920804400",
-    "--end" => 920808000,
-    "--vertical-label" => "m/s",
-    "DEF:myspeed=$rrdFile:speed:AVERAGE",
-    "CDEF:realspeed=myspeed,1000,*",
-    "LINE2:realspeed#FF0000"
-));
-?>
-]]>
-    </programlisting>
-   </example>
-
-   <example>
-    <title>Set multiple color options</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$graphObj->setOptions(array(
-    "--start" => "920804400",
-    "--end" => 920808000,
-    "--vertical-label" => "m/s",
-    "--color=BACK#00000000",
-    "--color=GRID#00000000",
-    "--color=MGRID#00000000",
-    "DEF:myspeed=$rrdFile:speed:AVERAGE",
-    "CDEF:realspeed=myspeed,1000,*",
-    "LINE2:realspeed#FF0000"
-));
-?>
-]]>
-    </programlisting>
-    <simpara>
-     Don't use key value syntax for same rrd option. It looks more readable, but
-     it doesn't work.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$graphObj->setOptions(array(
-    "--color" => "BACK#00000000",
-    "--color" => "GRID#00000000",
-    "--color" => "MGRID#00000000"
-));
-?>
-]]>
-    </programlisting>
-    <simpara>
-     In nature of php it's same as
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$graphObj->setOptions(array(
-    "--color" => "MGRID#00000000"
-));
-?>
-]]>
-    </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/rrd/rrdupdater.xml b/reference/rrd/rrdupdater.xml
deleted file mode 100644
index 48ff5926ab64..000000000000
--- a/reference/rrd/rrdupdater.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.rrdupdater" role="class">
-
- <title>The RRDUpdater class</title>
- <titleabbrev>RRDUpdater</titleabbrev>
-
- <partintro>
-
-<!-- {{{ RRDUpdater intro -->
-  <section xml:id="rrdupdater.intro">
-   &reftitle.intro;
-   <simpara>
-    Class for updating RDD database file.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="rrdupdater.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>RRDUpdater</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>RRDUpdater</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.rrdupdater')/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.rrdupdater')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.rrd.entities.rrdupdater;
-
-</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/rrd/rrdupdater/construct.xml b/reference/rrd/rrdupdater/construct.xml
deleted file mode 100644
index a10b1cae0566..000000000000
--- a/reference/rrd/rrdupdater/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdupdater.construct">
- <refnamediv>
-  <refname>RRDUpdater::__construct</refname>
-  <refpurpose>Creates new <classname>RRDUpdater</classname> instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>RRDUpdater::__construct</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates new RRDUpdater instance. This instance is responsible for updating
-   the RRD database file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Filesystem path for RRD database file, which will be updated.
-     </simpara>
-    </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/rrd/rrdupdater/update.xml b/reference/rrd/rrdupdater/update.xml
deleted file mode 100644
index 78d0b1c211d8..000000000000
--- a/reference/rrd/rrdupdater/update.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrdupdater.update">
- <refnamediv>
-  <refname>RRDUpdater::update</refname>
-  <refpurpose>Update the RRD database file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-   <methodsynopsis>
-    <modifier>public</modifier> <type>bool</type><methodname>RRDUpdater::update</methodname>
-    <methodparam><type>array</type><parameter>values</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>time</parameter>
-     <initializer>time()</initializer>
-    </methodparam>
-   </methodsynopsis>
-  <simpara>
-   Updates the RRD file defined via <methodname>RRDUpdater::__construct</methodname>.
-   The file is updated with a specific values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-     <simpara>
-      Data for update. Key is data source name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>time</parameter></term>
-    <listitem>
-     <simpara>
-      Time value for updating the RRD with a particular data. Default value
-      is current time.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Throws a <classname>Exception</classname> on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>RRDUpdater::update</methodname> examples</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$updator = new RRDUpdater("speed.rrd");
-//updates the data source "speed" with value "12411"
-//for time defined by timestamp "920807700"
-$updator->update(array("speed" => "12411"), "920807700");
-?>
-]]>
-   </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/rrd/setup.xml b/reference/rrd/setup.xml
deleted file mode 100644
index 95fea8424b40..000000000000
--- a/reference/rrd/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="rrd.setup">
- &reftitle.setup;
-
- <section xml:id="rrd.requirements">
-  &reftitle.required;
-  <simpara>
-   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.
-   PECL/rrd is tested with librrd 1.4.3, older or newer versions might or might not
-   work for you.
-  </simpara>
-  <warning>
-   <simpara>
-    Librrd and hence extension itself aren't mostly thread safe. There are many
-    global and shared states in librrd. It can be dangerous use this extension
-    in multi threaded environments like Apache2 mpm worker.
-    If there are many parallel requests, one request can change some global
-    librrd state of other runnig requests.
-   </simpara>
-  </warning>
- </section>
-
- <section xml:id="rrd.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;rrd">&url.pecl.package;rrd</link>.
-  </simpara>
- </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/rrd/versions.xml b/reference/rrd/versions.xml
deleted file mode 100644
index 254198bc74dd..000000000000
--- a/reference/rrd/versions.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='rrd_update' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_create' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_graph' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_error' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_fetch' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_first' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_info' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_last' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_lastupdate' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_restore' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_tune' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_xport' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrd_version' from='PECL rrd &gt;= 1.0.0'/>
- <function name='rrdc_disconnect' from='PECL rrd &gt;= 1.1.2'/>
-
- <!-- Methods -->
- <function name='rrdgraph' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdgraph::__construct' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdgraph::save' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdgraph::saveverbose' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdgraph::setoptions' from='PECL rrd &gt;= 0.9.0'/>
-
- <function name='rrdcreator' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdcreator::__construct' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdcreator::save' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdcreator::adddatasource' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdcreator::addarchive' from='PECL rrd &gt;= 0.9.0'/>
-
- <function name='rrdupdater' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdupdater::__construct' from='PECL rrd &gt;= 0.9.0'/>
- <function name='rrdupdater::update' from='PECL rrd &gt;= 0.9.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/runkit7/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/runkit7/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/runkit7/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/runkit7/book.xml b/reference/runkit7/book.xml
deleted file mode 100644
index 88bcd9f94876..000000000000
--- a/reference/runkit7/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.runkit7">
-  &reftitle.intro;
-  <simpara>
-   The runkit7 extension provides means to modify constants,
-   user-defined functions, and user-defined classes.
-   It also provides for custom superglobal variables.
-  </simpara>
-
-  <simpara>
-   This package is a fork of the
-   <link xlink:href="&url.pecl.package;runkit">runkit</link> package providing PHP 7 support.
-  </simpara>
- </preface>
-
- &reference.runkit7.setup;
- &reference.runkit7.constants;
- &reference.runkit7.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/runkit7/constants.xml b/reference/runkit7/constants.xml
deleted file mode 100644
index 20a74373a6d2..000000000000
--- a/reference/runkit7/constants.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="runkit7.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.runkit7-import-functions">
-   <term>
-    <constant>RUNKIT7_IMPORT_FUNCTIONS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-   <simpara>
-    <function>runkit7_import</function> flag indicating
-    that normal functions should be imported from the
-    specified file.
-   </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-class-methods">
-   <term>
-    <constant>RUNKIT7_IMPORT_CLASS_METHODS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag indicating
-    that class methods should be imported from the
-    specified file.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-class-consts">
-   <term>
-    <constant>RUNKIT7_IMPORT_CLASS_CONSTS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag indicating
-    that class constants should be imported from the
-    specified file.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-class-props">
-   <term>
-    <constant>RUNKIT7_IMPORT_CLASS_PROPS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag indicating
-    that class standard properties should be imported
-    from the specified file.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-class-static-props">
-   <term>
-    <constant>RUNKIT7_IMPORT_CLASS_STATIC_PROPS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag indicating
-    that class static properties should be imported
-    from the specified file. Available since Runkit 1.0.1.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-classes">
-   <term>
-    <constant>RUNKIT7_IMPORT_CLASSES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag representing
-    a bitwise OR of the <constant>RUNKIT7_IMPORT_CLASS_<replaceable>*</replaceable></constant>
-    constants.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-import-override">
-   <term>
-    <constant>RUNKIT7_IMPORT_OVERRIDE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    <function>runkit7_import</function> flag indicating that
-    if any of the imported functions, methods, constants,
-    or properties already exist, they should be replaced with
-    the new definitions.  If this flag is not set, then any
-    imported definitions which already exist will be discarded.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-acc-return-reference">
-   <term>
-    <constant>RUNKIT7_ACC_RETURN_REFERENCE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Include this flag to make the function or method being created or redeclared return a reference.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-acc-public">
-   <term>
-    <constant>RUNKIT7_ACC_PUBLIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Flag for <function>runkit7_method_add</function> and <function>runkit7_method_redefine</function> to make the method public.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-acc-protected">
-   <term>
-    <constant>RUNKIT7_ACC_PROTECTED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Flag for <function>runkit7_method_add</function> and <function>runkit7_method_redefine</function> to make the method protected.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-acc-private">
-   <term>
-    <constant>RUNKIT7_ACC_PRIVATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Flag for <function>runkit7_method_add</function> and <function>runkit7_method_redefine</function> to make the method private.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-acc-static">
-   <term>
-    <constant>RUNKIT7_ACC_STATIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Flag for <function>runkit7_method_add</function> and <function>runkit7_method_redefine</function> to make the method static.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-feature-manipulation">
-   <term>
-    <constant>RUNKIT7_FEATURE_MANIPULATION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equal to 1 if runtime manipulation is enabled, and 0 otherwise.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-feature-superglobals">
-   <term>
-    <constant>RUNKIT7_FEATURE_SUPERGLOBALS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Equal to 1 if custom superglobals are enabled, and 0 otherwise.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.runkit7-feature-sandbox">
-   <term>
-    <constant>RUNKIT7_FEATURE_SANDBOX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Always 0, it's impractical to implement the sandbox feature in php 7.
-    </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/runkit7/functions/runkit7-constant-add.xml b/reference/runkit7/functions/runkit7-constant-add.xml
deleted file mode 100644
index 2e1603614c1a..000000000000
--- a/reference/runkit7/functions/runkit7-constant-add.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-constant-add">
- <refnamediv>
-  <refname>runkit7_constant_add</refname>
-  <refpurpose>
-   Similar to define(), but allows defining in class definitions as well
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_constant_add</methodname>
-   <methodparam><type>string</type><parameter>constant_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>newVisibility</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>constant_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of constant to declare.  Either a string to indicate a global constant,
-       or <literal>classname::constname</literal> to indicate a class constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-       NULL, Bool, Long, Double, String, Array, or Resource value to store in the new constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>newVisibility</parameter></term>
-    <listitem>
-     <simpara>
-      Visibility of the constant, for class constants. Public by default.
-      One of the <constant>RUNKIT7_ACC_<replaceable>*</replaceable></constant> constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>define</function></member>
-   <member><function>runkit7_constant_redefine</function></member>
-   <member><function>runkit7_constant_remove</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/runkit7/functions/runkit7-constant-redefine.xml b/reference/runkit7/functions/runkit7-constant-redefine.xml
deleted file mode 100644
index 4a13862b1f89..000000000000
--- a/reference/runkit7/functions/runkit7-constant-redefine.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-constant-redefine">
- <refnamediv>
-  <refname>runkit7_constant_redefine</refname>
-  <refpurpose>Redefine an already defined constant</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_constant_redefine</methodname>
-   <methodparam><type>string</type><parameter>constant_name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>new_visibility</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>constant_name</parameter></term>
-    <listitem>
-     <simpara>
-       Constant to redefine.  Either the name of a global constant,
-       or <literal>classname::constname</literal> indicating class constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-       Value to assign to the constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_visibility</parameter></term>
-    <listitem>
-     <simpara>
-      The new visibility of the constant, for class constants.
-      Unchanged by default.
-      One of the <constant>RUNKIT7_ACC_<replaceable>*</replaceable></constant> constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_constant_add</function></member>
-   <member><function>runkit7_constant_remove</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/runkit7/functions/runkit7-constant-remove.xml b/reference/runkit7/functions/runkit7-constant-remove.xml
deleted file mode 100644
index f743ae0b7fbc..000000000000
--- a/reference/runkit7/functions/runkit7-constant-remove.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-constant-remove">
- <refnamediv>
-  <refname>runkit7_constant_remove</refname>
-  <refpurpose>
-   Remove/Delete an already defined constant
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_constant_remove</methodname>
-   <methodparam><type>string</type><parameter>constant_name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>constant_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the constant to remove.  Either the name of a global constant,
-       or <literal>classname::constname</literal> indicating a class constant.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>define</function></member>
-   <member><function>runkit7_constant_add</function></member>
-   <member><function>runkit7_constant_redefine</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/runkit7/functions/runkit7-function-add.xml b/reference/runkit7/functions/runkit7-function-add.xml
deleted file mode 100644
index e5df6aa94f21..000000000000
--- a/reference/runkit7/functions/runkit7-function-add.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-function-add">
- <refnamediv>
-  <refname>runkit7_function_add</refname>
-  <refpurpose>
-   Add a new function, similar to <function>create_function</function>
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_add</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>argument_list</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>return_by_reference</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_add</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the function to be created
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>argument_list</parameter></term>
-    <listitem>
-     <simpara>
-      Comma separated argument list
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>code</parameter></term>
-    <listitem>
-     <simpara>
-      Code making up the function
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>closure</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>closure</classname> that defines the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>return_by_reference</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the function should return by reference.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>doc_comment</parameter></term>
-    <listitem>
-     <simpara>
-      The doc comment of the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>return_type</parameter></term>
-    <listitem>
-     <simpara>
-      The return type of the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_strict</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the function should behave as if it were declared in a file with <literal>strict_types=1</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>runkit7_function_add</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-runkit7_function_add('testme','$a,$b','echo "The value of a is $a\n"; echo "The value of b is $b\n";');
-testme(1,2);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-The value of a is 1
-The value of b is 2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>create_function</function></member>
-   <member><function>runkit7_function_redefine</function></member>
-   <member><function>runkit7_function_copy</function></member>
-   <member><function>runkit7_function_rename</function></member>
-   <member><function>runkit7_function_remove</function></member>
-   <member><function>runkit7_method_add</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/runkit7/functions/runkit7-function-copy.xml b/reference/runkit7/functions/runkit7-function-copy.xml
deleted file mode 100644
index 46b0fd0bb993..000000000000
--- a/reference/runkit7/functions/runkit7-function-copy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-function-copy">
- <refnamediv>
-  <refname>runkit7_function_copy</refname>
-  <refpurpose>
-   Copy a function to a new function name
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_copy</methodname>
-   <methodparam><type>string</type><parameter>source_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>target_name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the existing function
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>target_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the new function to copy the definition to
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>runkit7_function_copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function original() {
-  echo "In a function\n";
-}
-runkit7_function_copy('original','duplicate');
-original();
-duplicate();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-In a function
-In a function
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_function_add</function></member>
-   <member><function>runkit7_function_redefine</function></member>
-   <member><function>runkit7_function_rename</function></member>
-   <member><function>runkit7_function_remove</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/runkit7/functions/runkit7-function-redefine.xml b/reference/runkit7/functions/runkit7-function-redefine.xml
deleted file mode 100644
index 4969f757718a..000000000000
--- a/reference/runkit7/functions/runkit7-function-redefine.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-function-redefine">
- <refnamediv>
-  <refname>runkit7_function_redefine</refname>
-  <refpurpose>
-   Replace a function definition with a new implementation
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_redefine</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>argument_list</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>return_by_reference</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_redefine</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
-
-  &note.runkit.internal-override;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of function to redefine
-     </simpara>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-     <term><parameter>argument_list</parameter></term>
-     <listitem>
-      <simpara>
-       New list of arguments to be accepted by function
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>code</parameter></term>
-     <listitem>
-      <simpara>
-       New code implementation
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>closure</parameter></term>
-     <listitem>
-      <simpara>
-       A <classname>closure</classname> that defines the function.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>return_by_reference</parameter></term>
-     <listitem>
-      <simpara>
-       Whether the function should return by reference.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>doc_comment</parameter></term>
-     <listitem>
-      <simpara>
-       The doc comment of the function.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>return_type</parameter></term>
-    <listitem>
-     <simpara>
-      The return type of the function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_strict</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the function behaves as if it was declared in a file with <literal>strict_types=1</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>runkit7_function_redefine</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function testme() {
-  echo "Original Testme Implementation\n";
-}
-testme();
-runkit7_function_redefine('testme','','echo "New Testme Implementation\n";');
-testme();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Original Testme Implementation
-New Testme Implementation
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_function_add</function></member>
-   <member><function>runkit7_function_copy</function></member>
-   <member><function>runkit7_function_rename</function></member>
-   <member><function>runkit7_function_remove</function></member>
-   <member><function>runkit7_method_redefine</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/runkit7/functions/runkit7-function-remove.xml b/reference/runkit7/functions/runkit7-function-remove.xml
deleted file mode 100644
index dab175505e6a..000000000000
--- a/reference/runkit7/functions/runkit7-function-remove.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-function-remove">
- <refnamediv>
-  <refname>runkit7_function_remove</refname>
-  <refpurpose>
-   Remove a function definition
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_remove</methodname>
-   <methodparam><type>string</type><parameter>function_name</parameter></methodparam>
-  </methodsynopsis>
-
-  &note.runkit.internal-override;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the function to be deleted
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_function_add</function></member>
-   <member><function>runkit7_function_copy</function></member>
-   <member><function>runkit7_function_redefine</function></member>
-   <member><function>runkit7_function_rename</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/runkit7/functions/runkit7-function-rename.xml b/reference/runkit7/functions/runkit7-function-rename.xml
deleted file mode 100644
index f25286456af2..000000000000
--- a/reference/runkit7/functions/runkit7-function-rename.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-function-rename">
- <refnamediv>
-  <refname>runkit7_function_rename</refname>
-  <refpurpose>
-   Change a function's name
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_function_rename</methodname>
-   <methodparam><type>string</type><parameter>source_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>target_name</parameter></methodparam>
-  </methodsynopsis>
-
-  &note.runkit.internal-override;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>source_name</parameter></term>
-    <listitem>
-     <simpara>
-       Current function name
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>target_name</parameter></term>
-    <listitem>
-     <simpara>
-       New function name
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_function_add</function></member>
-   <member><function>runkit7_function_copy</function></member>
-   <member><function>runkit7_function_redefine</function></member>
-   <member><function>runkit7_function_remove</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/runkit7/functions/runkit7-import.xml b/reference/runkit7/functions/runkit7-import.xml
deleted file mode 100644
index 363423784d8b..000000000000
--- a/reference/runkit7/functions/runkit7-import.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-import">
- <refnamediv>
-  <refname>runkit7_import</refname>
-  <refpurpose>
-   Process a PHP file importing function and class definitions, overwriting where appropriate
-  </refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  <warning xmlns="http://docbook.org/ns/docbook">
-   <simpara>This feature has been <emphasis>removed</emphasis> in PECL runkit7 4.0.0.</simpara>
-  </warning>
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_import</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Similar to <function>include</function>. However, any code residing outside
-   of a function or class is simply ignored.
-   Additionally, depending on the value of <parameter>flags</parameter>,
-   any functions or classes which already exist in the currently running environment
-   may be automatically overwritten by their new definitions.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-       Filename to import function and class definitions from
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-       Bitwise OR of the <link linkend="runkit7.constants"><literal>RUNKIT7_IMPORT_*</literal>
-       family of constants</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/runkit7/functions/runkit7-method-add.xml b/reference/runkit7/functions/runkit7-method-add.xml
deleted file mode 100644
index 4dd2bf829755..000000000000
--- a/reference/runkit7/functions/runkit7-method-add.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-method-add">
- <refnamediv>
-  <refname>runkit7_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>runkit7_method_add</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>argument_list</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_add</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-     <simpara>
-       The class to which this method will be added
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method_name</parameter></term>
-    <listitem>
-     <simpara>
-       The name of the method to add
-     </simpara>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-     <term><parameter>argument_list</parameter></term>
-     <listitem>
-      <simpara>
-       Comma-delimited list of arguments for the newly-created method
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>code</parameter></term>
-     <listitem>
-      <simpara>
-       The code to be evaluated when <parameter>method_name</parameter>
-       is called
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>closure</parameter></term>
-     <listitem>
-      <simpara>
-       A <classname>closure</classname> that defines the method.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <simpara>
-       The type of method to create, can be
-       <constant>RUNKIT7_ACC_PUBLIC</constant>,
-       <constant>RUNKIT7_ACC_PROTECTED</constant> or
-       <constant>RUNKIT7_ACC_PRIVATE</constant> optionally combined via bitwise OR with
-       <constant>RUNKIT7_ACC_STATIC</constant>
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>doc_comment</parameter></term>
-     <listitem>
-      <simpara>
-       The doc comment of the method.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>return_type</parameter></term>
-    <listitem>
-     <simpara>
-      The return type of the method.
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_strict</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the method behaves as if it were declared in a file with <literal>strict_types=1</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>runkit7_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
-runkit7_method_add(
-    'Example',
-    'add',
-    '$num1, $num2',
-    'return $num1 + $num2;',
-    RUNKIT7_ACC_PUBLIC
-);
-
-// add 12 + 4
-echo $e->add(12, 4);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-16
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_method_copy</function></member>
-   <member><function>runkit7_method_redefine</function></member>
-   <member><function>runkit7_method_remove</function></member>
-   <member><function>runkit7_method_rename</function></member>
-   <member><function>runkit7_function_add</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/runkit7/functions/runkit7-method-copy.xml b/reference/runkit7/functions/runkit7-method-copy.xml
deleted file mode 100644
index 62c4cddac272..000000000000
--- a/reference/runkit7/functions/runkit7-method-copy.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-method-copy">
- <refnamediv>
-  <refname>runkit7_method_copy</refname>
-  <refpurpose>Copies a method from class to another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_copy</methodname>
-   <methodparam><type>string</type><parameter>destination_class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>destination_method_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source_class</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>source_method_name</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>destination_class</parameter></term>
-    <listitem>
-     <simpara>
-       Destination class for copied method
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>destination_method_name</parameter></term>
-    <listitem>
-     <simpara>
-       Destination method name
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source_class</parameter></term>
-    <listitem>
-     <simpara>
-       Source class of the method to copy
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source_method_name</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the method to copy from the source class. If this parameter is
-       omitted, the value of <parameter>destination_method_name</parameter> is assumed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>runkit7_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()
-runkit7_method_copy('Bar', 'baz', 'Foo', 'example');
-
-// output copied function
-echo Bar::baz();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-foo!
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_method_add</function></member>
-   <member><function>runkit7_method_redefine</function></member>
-   <member><function>runkit7_method_remove</function></member>
-   <member><function>runkit7_method_rename</function></member>
-   <member><function>runkit7_function_copy</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/runkit7/functions/runkit7-method-redefine.xml b/reference/runkit7/functions/runkit7-method-redefine.xml
deleted file mode 100644
index e8bbfce4b1bb..000000000000
--- a/reference/runkit7/functions/runkit7-method-redefine.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-method-redefine">
- <refnamediv>
-  <refname>runkit7_method_redefine</refname>
-  <refpurpose>Dynamically changes the code of the given method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_redefine</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>argument_list</parameter></methodparam>
-   <methodparam><type>string</type><parameter>code</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_redefine</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>closure</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>RUNKIT7_ACC_PUBLIC</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>doc_comment</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>return_type</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_strict</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-     <simpara>
-       The class in which to redefine the method
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method_name</parameter></term>
-    <listitem>
-     <simpara>
-       The name of the method to redefine
-     </simpara>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-     <term><parameter>argument_list</parameter></term>
-     <listitem>
-      <simpara>
-       Comma-delimited list of arguments for the redefined method
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>code</parameter></term>
-     <listitem>
-      <simpara>
-       The new code to be evaluated when <parameter>method_name</parameter>
-       is called
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>closure</parameter></term>
-     <listitem>
-      <simpara>
-       A <classname>closure</classname> that defines the method.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <simpara>
-       The redefined method can be
-       <constant>RUNKIT7_ACC_PUBLIC</constant>,
-       <constant>RUNKIT7_ACC_PROTECTED</constant> or
-       <constant>RUNKIT7_ACC_PRIVATE</constant> optionally combined via bitwise OR with
-       <constant>RUNKIT7_ACC_STATIC</constant>
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>doc_comment</parameter></term>
-     <listitem>
-      <simpara>
-       The doc comment of the method.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>return_type</parameter></term>
-    <listitem>
-     <simpara>
-      The return type of the method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_strict</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the method behaves as if it was declared in a file with <literal>strict_types=1</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>runkit7_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
-runkit7_method_redefine(
-    'Example',
-    'foo',
-    '',
-    'return "bar!\n";',
-    RUNKIT7_ACC_PUBLIC
-);
-
-// output Example::foo() (after redefine)
-echo "After: " . $e->foo();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Before: foo!
-After: bar!
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_method_add</function></member>
-   <member><function>runkit7_method_copy</function></member>
-   <member><function>runkit7_method_remove</function></member>
-   <member><function>runkit7_method_rename</function></member>
-   <member><function>runkit7_function_redefine</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/runkit7/functions/runkit7-method-remove.xml b/reference/runkit7/functions/runkit7-method-remove.xml
deleted file mode 100644
index 0dfb8b03f8bf..000000000000
--- a/reference/runkit7/functions/runkit7-method-remove.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-method-remove">
- <refnamediv>
-  <refname>runkit7_method_remove</refname>
-  <refpurpose>Dynamically removes the given method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_remove</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-  </methodsynopsis>
-  &note.runkit.selfmanipulation;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-     <simpara>
-       The class in which to remove the method
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method_name</parameter></term>
-    <listitem>
-     <simpara>
-       The name of the method to remove
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>runkit7_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
-runkit7_method_remove(
-    'Example',
-    'foo'
-);
-
-echo implode(' ', get_class_methods('Example'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bar
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_method_add</function></member>
-   <member><function>runkit7_method_copy</function></member>
-   <member><function>runkit7_method_redefine</function></member>
-   <member><function>runkit7_method_rename</function></member>
-   <member><function>runkit7_function_remove</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/runkit7/functions/runkit7-method-rename.xml b/reference/runkit7/functions/runkit7-method-rename.xml
deleted file mode 100644
index d1cde58ae0ee..000000000000
--- a/reference/runkit7/functions/runkit7-method-rename.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-method-rename">
- <refnamediv>
-  <refname>runkit7_method_rename</refname>
-  <refpurpose>Dynamically changes the name of the given method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>runkit7_method_rename</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>source_method_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>target_method_name</parameter></methodparam>
-  </methodsynopsis>
-  &note.runkit.selfmanipulation;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-     <simpara>
-       The class in which to rename the method
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>source_method_name</parameter></term>
-    <listitem>
-     <simpara>
-       The name of the method to rename
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>target_method_name</parameter></term>
-    <listitem>
-     <simpara>
-       The new name to give to the renamed method
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>runkit7_method_rename</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Example {
-    function foo() {
-        return "foo!\n";
-    }
-}
-
-// Rename the 'foo' method to 'bar'
-runkit7_method_rename(
-    'Example',
-    'foo',
-    'bar'
-);
-
-// output renamed function
-echo (new Example)->bar();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-foo!
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>runkit7_method_add</function></member>
-   <member><function>runkit7_method_copy</function></member>
-   <member><function>runkit7_method_redefine</function></member>
-   <member><function>runkit7_method_remove</function></member>
-   <member><function>runkit7_function_rename</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/runkit7/functions/runkit7-object-id.xml b/reference/runkit7/functions/runkit7-object-id.xml
deleted file mode 100644
index 979ce50dc6fa..000000000000
--- a/reference/runkit7/functions/runkit7-object-id.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-object-id">
- <refnamediv>
-  <refname>runkit7_object_id</refname>
-  <refpurpose>
-   Return the integer object handle for given object
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>runkit7_object_id</methodname>
-   <methodparam><type>object</type><parameter>obj</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function is equivalent to <function>spl_object_id</function>.
-  </simpara>
-  <simpara>
-   This function returns a unique identifier for the object. The object id is
-   unique for the lifetime of the object. Once the object is destroyed, its id
-   may be reused for other objects. This behavior is similar to
-   <function>spl_object_hash</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>obj</parameter></term>
-    <listitem>
-     <simpara>
-      Any object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An integer identifier that is unique for each currently existing object and
-   is always the same for each object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    When an object is destroyed, its id may be reused for other objects.
-   </simpara>
-  </note>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>spl_object_id</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/runkit7/functions/runkit7-superglobals.xml b/reference/runkit7/functions/runkit7-superglobals.xml
deleted file mode 100644
index bd581a5a2e58..000000000000
--- a/reference/runkit7/functions/runkit7-superglobals.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-superglobals">
- <refnamediv>
-  <refname>runkit7_superglobals</refname>
-  <refpurpose>
-   Return numerically indexed array of registered superglobals
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>runkit7_superglobals</methodname>
-   <void/>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a numerically indexed array of the currently registered superglobals.
-   i.e. _GET, _POST, _REQUEST, _COOKIE, _SESSION, _SERVER, _ENV, _FILES
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="language.variables.scope">Variable Scope</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/runkit7/functions/runkit7-zval-inspect.xml b/reference/runkit7/functions/runkit7-zval-inspect.xml
deleted file mode 100644
index aa5bb696fa3e..000000000000
--- a/reference/runkit7/functions/runkit7-zval-inspect.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.runkit7-zval-inspect">
- <refnamediv>
-  <refname>runkit7_zval_inspect</refname>
-  <refpurpose>Returns information about the passed in value with data types, reference counts, etc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>runkit7_zval_inspect</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to return the representation of
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <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;
-  <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>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <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>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/runkit7/ini.xml b/reference/runkit7/ini.xml
deleted file mode 100644
index c22358cb98bf..000000000000
--- a/reference/runkit7/ini.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="runkit7.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Runkit Configuration Options</title>
-   <tgroup cols="4">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody xml:id="runkit7.configuration.list">
-     <row>
-      <entry><link linkend="ini.runkit7.superglobal">runkit.superglobal</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
-      <entry/>
-     </row>
-     <row>
-      <entry><link linkend="ini.runkit7.internal-override">runkit.internal_override</link></entry>
-      <entry>"0"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry/>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.runkit7.superglobal">
-   <term>
-    <parameter>runkit.superglobal</parameter>
-    <type>string</type>
-   </term>
-   <listitem>
-    <simpara>
-     Comma-separated list of variable names to be treated as superglobals.
-     This value should be set in the systemwide php.ini file, but may work
-     in perdir configuration contexts depending on your SAPI.
-    </simpara>
-    <example>
-     <title>Custom Superglobals with runkit.superglobal=_FOO,_BAR in php.ini</title>
-     <programlisting role="php">
-      <![CDATA[
-<?php
-function show_values() {
-  echo "Foo is $_FOO\n";
-  echo "Bar is $_BAR\n";
-  echo "Baz is $_BAZ\n";
-}
-
-$_FOO = 'foo';
-$_BAR = 'bar';
-$_BAZ = 'baz';
-
-/* Displays foo and bar, but not baz */
-show_values();
-?>
-]]>
-     </programlisting>
-    </example>
-   </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="ini.runkit7.internal-override">
-   <term>
-    <parameter>runkit.internal_override</parameter>
-    <type>bool</type>
-   </term>
-   <listitem>
-    <simpara>
-     Enables ability to modify/rename/remove internal functions.
-    </simpara>
-   </listitem>
-  </varlistentry>
-
- </variablelist>
-</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/runkit7/reference.xml b/reference/runkit7/reference.xml
deleted file mode 100644
index cf9c69f04814..000000000000
--- a/reference/runkit7/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.runkit7" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>runkit7 &Functions;</title>
-
- &reference.runkit7.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/runkit7/setup.xml b/reference/runkit7/setup.xml
deleted file mode 100644
index 3ecef8b9d023..000000000000
--- a/reference/runkit7/setup.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="runkit7.setup">
- &reftitle.setup;
-
- <section xml:id="runkit7.requirements">
-  &reftitle.required;
-  <simpara>
-   <emphasis>Modifying Constants, Functions, Classes, and Methods</emphasis>
-   as well as <emphasis>Custom Superglobals</emphasis>
-   works with all releases of PHP 7.  No special requirements are
-   necessary.
-  </simpara>
- </section>
-
- <section xml:id="runkit7.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;runkit7">&url.pecl.package;runkit7</link>.
-  </simpara>
-  <simpara>
-   &pecl.windows.download.avail;
-  </simpara>
- </section>
-
- &reference.runkit7.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/runkit7/versions.xml b/reference/runkit7/versions.xml
deleted file mode 100644
index 6a56e5199cae..000000000000
--- a/reference/runkit7/versions.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='runkit7_zval_inspect' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_object_id' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_superglobals' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_import' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_function_add' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_function_remove' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_function_rename' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_function_redefine' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_function_copy' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_method_add' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_method_redefine' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_method_remove' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_method_rename' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_method_copy' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_constant_redefine' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_constant_remove' from='PECL runkit7 &gt;= Unknown'/>
- <function name='runkit7_constant_add' from='PECL runkit7 &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/scoutapm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/scoutapm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/scoutapm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/scoutapm/book.xml b/reference/scoutapm/book.xml
deleted file mode 100644
index 48914cbad050..000000000000
--- a/reference/scoutapm/book.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.scoutapm">
- <?phpdoc extension-membership="pecl" ?>
- <title>ScoutAPM</title>
- <titleabbrev>ScoutAPM</titleabbrev>
-
- <preface xml:id="intro.scoutapm">
-  &reftitle.intro;
-  &note.no-windows.extension;
-  <simpara>
-   ScoutAPM's extension for PHP provides additional capabilities to application
-   monitoring over just using the base PHP userland library.
-  </simpara>
- </preface>
-
- &reference.scoutapm.setup;
- &reference.scoutapm.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/scoutapm/configure.xml b/reference/scoutapm/configure.xml
deleted file mode 100644
index 117c9d1d803f..000000000000
--- a/reference/scoutapm/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="scoutapm.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;scoutapm">&url.pecl.package;scoutapm</link>
- </simpara>
-
-
-</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/scoutapm/functions/scoutapm-get-calls.xml b/reference/scoutapm/functions/scoutapm-get-calls.xml
deleted file mode 100644
index c4c5febb343e..000000000000
--- a/reference/scoutapm/functions/scoutapm-get-calls.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.scoutapm-get-calls">
- <refnamediv>
-  <refname>scoutapm_get_calls</refname>
-  <refpurpose>Returns a list of instrumented calls that have occurred</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>scoutapm_get_calls</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>Returns a list of any instrumented function calls since <function>scoutapm_get_calls</function> was last called. The list is cleared each time the function is called.</simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>scoutapm_get_calls</function> returns an array containing a list
-   of all recorded calls to instrumented function calls.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example><title>Fetch instrumented calls</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-file_get_contents('a.txt');
-file_get_contents('b.txt');
-
-print_r(scoutapm_get_calls());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-    <![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [function] => file_get_contents
-            [entered] => 1576839727.7934
-            [exited] => 1576839727.7935
-            [time_taken] => 2.7894973754883E-5
-            [argv] => Array
-                (
-                    [0] => a.txt
-                )
-
-        )
-
-    [1] => Array
-        (
-            [function] => file_get_contents
-            [entered] => 1576839727.7935
-            [exited] => 1576839727.7935
-            [time_taken] => 7.8678131103516E-6
-            [argv] => Array
-                (
-                    [0] => b.txt
-                )
-
-        )
-
-)
-]]>
-   </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/scoutapm/functions/scoutapm-list-instrumented-functions.xml b/reference/scoutapm/functions/scoutapm-list-instrumented-functions.xml
deleted file mode 100644
index 6d1bfc68758b..000000000000
--- a/reference/scoutapm/functions/scoutapm-list-instrumented-functions.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.scoutapm-list-instrumented-functions">
- <refnamediv>
-  <refname>scoutapm_list_instrumented_functions</refname>
-  <refpurpose>List functions scoutapm will instrument.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>scoutapm_list_instrumented_functions</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>Returns a list of the functions the extension will instrument.</simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   <function>scoutapm_list_instrumented_functions</function> returns an array
-   containing a list of all functions that the scoutapm extension is able to
-   instrument in the current installation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example><title>Fetch the list of functions scoutapm will instrument</title>
-   <programlisting role="php">
-    <![CDATA[
-<?php
-print_r(scoutapm_list_instrumented_functions());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-    <![CDATA[
-Array
-(
-    [0] => file_get_contents
-    [1] => file_put_contents
-    [2] => fopen
-    [3] => fread
-    [4] => fwrite
-    [5] => pdo->exec
-    [6] => pdo->query
-    [7] => pdo->prepare
-    [8] => pdostatement->execute
-)
-]]>
-   </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/scoutapm/reference.xml b/reference/scoutapm/reference.xml
deleted file mode 100644
index 7042d566b30a..000000000000
--- a/reference/scoutapm/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.scoutapm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Scoutapm &Functions;</title>
-
- &reference.scoutapm.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/scoutapm/setup.xml b/reference/scoutapm/setup.xml
deleted file mode 100644
index b9df23f224b5..000000000000
--- a/reference/scoutapm/setup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="scoutapm.setup">
- &reftitle.setup;
-
- <section xml:id="scoutapm.requirements">
-  &reftitle.required;
-  <itemizedlist>
-   <listitem>
-    <simpara>PHP &gt;= 7.1.0</simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows is not currently supported</simpara>
-   </listitem>
-  </itemizedlist>
- </section>
-
- <section xml:id="scoutapm.installation">
-  &reftitle.install;
-  <para>
-   This extension is available on PECL. Run:
-   <programlisting>
-    <![CDATA[
-$ sudo pecl install scoutapm
-]]>
-   </programlisting>
-   You may need to add Scout to your <emphasis>php.ini</emphasis>, for example:
-   <programlisting>
-<![CDATA[
-extension=scoutapm.so
-]]>
-   </programlisting>
-  </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/scoutapm/versions.xml b/reference/scoutapm/versions.xml
deleted file mode 100644
index 8941641eec7d..000000000000
--- a/reference/scoutapm/versions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='scoutapm_get_calls' from='PECL scoutapm &gt;= 1.0.0'/>
- <function name='scoutapm_list_instrumented_functions' from='PECL scoutapm &gt;= 1.0.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/seaslog/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/seaslog/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/seaslog/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/seaslog/book.xml b/reference/seaslog/book.xml
deleted file mode 100644
index 66f77d0a764b..000000000000
--- a/reference/seaslog/book.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.seaslog">
- <?phpdoc extension-membership="pecl" ?>
- <title>Seaslog</title>
- <titleabbrev>Seaslog</titleabbrev>
-
- <preface xml:id="intro.seaslog">
-  &reftitle.intro;
-   <simpara>
-   The <acronym>Seaslog</acronym> is an effective,fast,stable log extension for PHP.
-  </simpara>
-  <simpara>
-  The log journal，which is usually the operate record of the system，
-  software and the application record.
-  Through the analysis of the log，it can facilitate users to understand the operation of the system，
-  software and the application situation.
-  If your application log is rich enough,
-  it can also analyze the previous use’s operation behavior,type,
-  regional distribution or other more information.
-  The application log also points the multiple levels at the same time,
-  you can easily get the application analysis of health status,
-  timely find problems and quick positioning, and solve the problem, remedy the loss.
-  </simpara>
-  <simpara>
-  The error_log, syslog function which built in PHP is powerful and excellent performance,
-  but due to various defects (error_log have no error level, no fixed format, syslog regardless of module,
-  and mix with system log ), reducing a lot of flexibility , and can't meet the application requirements.
-  </simpara>
-  <simpara>
-  The good news is that there are a number of third-party log class library established
-  to make up for the defects, such as log4php, plog, monolog (of course,
-  there are many applications in the project development of the log class).
-  </simpara>
-  <para>
-  So is there a log of libraries meet the following requirements：
-    <simplelist>
-        <member>Modules, classification</member>
-        <member>Simple configuration (preferably without configuration)</member>
-        <member>Clear log format and easy understanding</member>
-        <member>Simple application and well performance</member>
-    </simplelist>
-    <acronym>Seaslog</acronym> just meet these demands.
-  </para>
-  <para>
-  What is provided at present:
-    <simplelist>
-        <member>In the PHP project, record the log specification and repidly.</member>
-        <member>Configure the default log directory and module</member>
-        <member>Specified log directory and capture current configuration</member>
-        <member>Preliminary analysis of the early warning framework</member>
-        <member>Efficient log buffer and convenient buffer debug</member>
-        <member>Follow the PSR-3 log interface specification</member>
-        <member>Automatically record error information</member>
-        <member>Automatically record abnormal information</member>
-        <member>Support Connect the TCP port, send with RFC5424</member>
-        <member>Support Connect the UDP port, send with RFC5424</member>
-        <member>Support RequestId differentiated requests</member>
-        <member>Support for log template customizations</member>
-    </simplelist>
-  </para>
-  <simpara>
-   Read More <link xlink:href="&url.seaslog.document;">SeasLog Document</link> at Github.
-  </simpara>
- </preface>
-
- &reference.seaslog.setup;
- &reference.seaslog.constants;
- &reference.seaslog.examples;
- &reference.seaslog.reference;
- &reference.seaslog.seaslog;
-
-</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/seaslog/configure.xml b/reference/seaslog/configure.xml
deleted file mode 100644
index f7b4ce23c8d9..000000000000
--- a/reference/seaslog/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;seaslog">&url.pecl.package;seaslog</link>
- </simpara>
-
-
-</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/seaslog/constants.xml b/reference/seaslog/constants.xml
deleted file mode 100644
index 95d8e78d9c38..000000000000
--- a/reference/seaslog/constants.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.seaslog-version">
-   <term>
-    <constant>SEASLOG_VERSION</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-author">
-   <term>
-    <constant>SEASLOG_AUTHOR</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-all">
-   <term>
-    <constant>SEASLOG_ALL</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "ALL"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-debug">
-   <term>
-    <constant>SEASLOG_DEBUG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "DEBUG" - Detailed debug information.Fine-grained information events.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-info">
-   <term>
-    <constant>SEASLOG_INFO</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "INFO" - Interesting events.Emphasizes the running process of the application.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-notice">
-   <term>
-    <constant>SEASLOG_NOTICE</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "NOTICE" - Normal but significant events.Information that is more important than the INFO level during execution.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-warning">
-   <term>
-    <constant>SEASLOG_WARNING</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "WARNING" - Exceptional occurrences that are not errors.Potentially aberrant information that needs attention and needs to be repaired.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-error">
-   <term>
-    <constant>SEASLOG_ERROR</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "ERROR" - Runtime errors that do not require immediate action but should typically.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-critical">
-   <term>
-    <constant>SEASLOG_CRITICAL</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "CRITICAL" - Critical conditions.Need to be repaired immediately, and the program component is unavailable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-alert">
-   <term>
-    <constant>SEASLOG_ALERT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "ALERT" - Action must be taken immediately.Immediate attention should be given to relevant personnel for emergency repairs.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-emergency">
-   <term>
-    <constant>SEASLOG_EMERGENCY</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-    "EMERGENCY" - System is unusable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-detail-order-asc">
-   <term>
-    <constant>SEASLOG_DETAIL_ORDER_ASC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    1
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-detail-order-desc">
-   <term>
-    <constant>SEASLOG_DETAIL_ORDER_DESC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    2
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-appender-file">
-   <term>
-    <constant>SEASLOG_APPENDER_FILE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    1
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-appender-tcp">
-   <term>
-    <constant>SEASLOG_APPENDER_TCP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    2
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-appender-udp">
-   <term>
-    <constant>SEASLOG_APPENDER_UDP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    3
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-close-logger-stream-mod-all">
-   <term>
-    <constant>SEASLOG_CLOSE_LOGGER_STREAM_MOD_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     1
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-close-logger-stream-mod-assign">
-   <term>
-    <constant>SEASLOG_CLOSE_LOGGER_STREAM_MOD_ASSIGN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     2
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-request-variable-domain-port">
-   <term>
-    <constant>SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     1
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-request-variable-request-uri">
-   <term>
-    <constant>SEASLOG_REQUEST_VARIABLE_REQUEST_URI</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     2
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-request-variable-request-method">
-   <term>
-    <constant>SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     3
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.seaslog-request-variable-client-ip">
-   <term>
-    <constant>SEASLOG_REQUEST_VARIABLE_CLIENT_IP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     4
-    </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/seaslog/examples.xml b/reference/seaslog/examples.xml
deleted file mode 100644
index 46907abbdabc..000000000000
--- a/reference/seaslog/examples.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.examples">
- &reftitle.examples;
-
- <example>
-  <title>Get and set base path</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$basePath1 = SeasLog::getBasePath();
-
-SeasLog::setBasePath('/log/base_test');
-$basePath2 = SeasLog::getBasePath();
-
-var_dump($basePath1,$basePath2);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-string(12) "/var/log/www"
-string(14) "/log/base_test"
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Get and set logger</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$lastLogger1 = SeasLog::getLastLogger();
-
-SeasLog::setLogger('testModule/app1');
-$lastLogger2 = SeasLog::getLastLogger();
-
-var_dump($lastLogger1,$lastLogger2);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-string(7) "default"
-string(15) "testModule/app1"
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Fast write log</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-SeasLog::log(SEASLOG_ERROR,'this is a error test by ::log');
-SeasLog::debug('this is a {userName} debug',array('{userName}' => 'neeke'));
-SeasLog::info('this is a info log');
-SeasLog::notice('this is a notice log');
-SeasLog::warning('your {website} was down,please {action} it ASAP!',array('{website}' => 'github.com','{action}' => 'rboot'));
-SeasLog::error('a error log');
-SeasLog::critical('some thing was critical');
-SeasLog::alert('yes this is a {messageName}',array('{messageName}' => 'alertMSG'));
-SeasLog::emergency('Just now, the house next door was completely burnt out! {note}',array('{note}' => 'it`s a joke'));
-?>
-]]>
-  </programlisting>
-  <simpara>
-   As the default, <emphasis>seaslog.default_template = "%T | %L | %P | %Q | %t | %M"</emphasis>.
-   That's mean,as the default,log record style is： `{dateTime} | {level} | {pid} | {uniqid} | {timeStamp} | {logInfo}`.
-  </simpara>
-  &example.outputs.similar;
-  <simpara>
-   <emphasis>seaslog.appender = 1</emphasis>
-  </simpara>
-  <screen>
-<![CDATA[
-2014-07-27 08:53:52 | ERROR | 23625 | 599159975a9ff | 1406422432.786 | this is a error test by log
-2014-07-27 08:53:52 | DEBUG | 23625 | 599159975a9ff | 1406422432.786 | this is a neeke debug
-2014-07-27 08:53:52 | INFO | 23625 | 599159975a9ff | 1406422432.787 | this is a info log
-2014-07-27 08:53:52 | NOTICE | 23625 | 599159975a9ff | 1406422432.787 | this is a notice log
-2014-07-27 08:53:52 | WARNING | 23625 | 599159975a9ff | 1406422432.787 | your github.com was down,please rboot it ASAP!
-2014-07-27 08:53:52 | ERROR | 23625 | 599159975a9ff | 1406422432.787 | a error log
-2014-07-27 08:53:52 | CRITICAL | 23625 | 599159975a9ff | 1406422432.787 | some thing was critical
-2014-07-27 08:53:52 | EMERGENCY | 23625 | 599159975a9ff | 1406422432.787 | Just now, the house next door was completely burnt out! it is a joke
-]]>
-  </screen>
-  &example.outputs.similar;
-  <simpara>
-   <emphasis>seaslog.appender = 2</emphasis> or <emphasis>seaslog.appender = 3</emphasis>
-  </simpara>
-  <screen>
-<![CDATA[
-The log style finally formatted such as:
-<15>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | DEBUG | 21423 | 599157af4e937 | 1466787583.322 | this is a neeke debug
-<14>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | INFO | 21423 | 599157af4e937 | 1466787583.323 | this is a info log
-<13>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | NOTICE | 21423 | 599157af4e937 | 1466787583.324 | this is a notice log
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Fast count some type of log count value</title>
-  <simpara>
-   <emphasis>SeasLog</emphasis> get count value of `grep -wc` use system pipe and return to PHP (array or int).
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$countResult1 = SeasLog::analyzerCount();
-$countResult2 = SeasLog::analyzerCount(SEASLOG_WARNING);
-$countResult3 = SeasLog::analyzerCount(SEASLOG_ERROR,date('Ymd',time()));
-
-var_dump($countResult1,$countResult2,$countResult3);
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-array(8) {
-  ["DEBUG"]=>
-  int(3)
-  ["INFO"]=>
-  int(3)
-  ["NOTICE"]=>
-  int(3)
-  ["WARNING"]=>
-  int(3)
-  ["ERROR"]=>
-  int(6)
-  ["CRITICAL"]=>
-  int(3)
-  ["ALERT"]=>
-  int(3)
-  ["EMERGENCY"]=>
-  int(3)
-}
-int(7)
-int(1)
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Acquisit some type of log list</title>
-  <simpara>
-   <emphasis>SeasLog</emphasis> get count value of `grep -w` use system pipe and return array to PHP.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$detailErrorArray = SeasLog::analyzerDetail(SEASLOG_ERROR);
-var_dump($detailErrorArray);
-
-var_dump(SeasLog::analyzerDetail(SEASLOG_ERROR,date('Ymd',time())));
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-array(6) {
-  [0] =>
-  string(83) "2014-02-24 00:14:02 | ERROR | 8568 | 599157af4e937 | 1393172042.717 | test error 3 "
-  [1] =>
-  string(83) "2014-02-24 00:14:04 | ERROR | 8594 | 5991576584446 | 1393172044.104 | test error 3 "
-  [2] =>
-  string(83) "2014-02-24 00:14:04 | ERROR | 8620 | 1502697015147 | 1393172044.862 | test error 3 "
-  [3] =>
-  string(83) "2014-02-24 00:14:05 | ERROR | 8646 | 599159975a9ff | 1393172045.989 | test error 3 "
-  [4] =>
-  string(83) "2014-02-24 00:14:07 | ERROR | 8672 | 599159986ec28 | 1393172047.882 | test error 3 "
-  [5] =>
-  string(83) "2014-02-24 00:14:08 | ERROR | 8698 | 5991599981cec | 1393172048.736 | test error 3 "
-}
-
-array(2) {
-  [0] =>
-  string(83) "2014-02-24 00:14:02 | ERROR | 8568 | 599157af4e937 | 1393172042.717 | test error 3 "
-  [1] =>
-  string(83) "2014-02-24 00:14:04 | ERROR | 8594 | 5991576584446 | 1393172044.104 | test error 3 "
-}
-]]>
-  </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/seaslog/functions/seaslog-get-author.xml b/reference/seaslog/functions/seaslog-get-author.xml
deleted file mode 100644
index 0485117cd778..000000000000
--- a/reference/seaslog/functions/seaslog-get-author.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.seaslog-get-author">
- <refnamediv>
-  <refname>seaslog_get_author</refname>
-  <refpurpose>Get SeasLog author.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>seaslog_get_author</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return SeasLog author as string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>seaslog_get_author</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(seaslog_get_author());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(29) "Chitao.Gao  [ neeke@php.net ]"
-]]>
-   </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/seaslog/functions/seaslog-get-version.xml b/reference/seaslog/functions/seaslog-get-version.xml
deleted file mode 100644
index 18e51f3adfbf..000000000000
--- a/reference/seaslog/functions/seaslog-get-version.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.seaslog-get-version">
- <refnamediv>
-  <refname>seaslog_get_version</refname>
-  <refpurpose>Get SeasLog version.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>seaslog_get_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return SeasLog version (SEASLOG_VERSION) as string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>seaslog_get_version</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(seaslog_get_version());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "1.8.4"
-]]>
-   </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/seaslog/ini.xml b/reference/seaslog/ini.xml
deleted file mode 100644
index cb94b2832a68..000000000000
--- a/reference/seaslog/ini.xml
+++ /dev/null
@@ -1,628 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="seaslog.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <table>
-  <title>Seaslog &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.seaslog.appender">seaslog.appender</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.appender-retry">seaslog.appender_retry</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.level">seaslog.level</link></entry>
-     <entry>8</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.remote-host">seaslog.remote_host</link></entry>
-     <entry>127.0.0.1</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.remote-port">seaslog.remote_port</link></entry>
-     <entry>514</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.remote-timeout">seaslog.remote_timeout</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.default-basepath">seaslog.default_basepath</link></entry>
-     <entry>/var/log/www</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.default-logger">seaslog.default_logger</link></entry>
-     <entry>default</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.default-template">seaslog.default_template</link></entry>
-     <entry>%T | %L | %P | %Q | %t | %M</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.default-datetime-format">seaslog.default_datetime_format</link></entry>
-     <entry>Y-m-d H:i:s</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.trace-error">seaslog.trace_error</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.trace-exception">seaslog.trace_exception</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.trace-notice">seaslog.trace_notice</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.trace-warning">seaslog.trace_warning</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.buffer-size">seaslog.buffer_size</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.disting-type">seaslog.disting_type</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.disting-folder">seaslog.disting_folder</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.disting-by-hour">seaslog.disting_by_hour</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_SYSTEM</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.recall-depth">seaslog.recall_depth</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.trim-wrap">seaslog.trim_wrap</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.ignore-warning">seaslog.ignore_warning</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.seaslog.throw-exception">seaslog.throw_exception</link></entry>
-     <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.seaslog.appender">
-    <term>
-     <parameter>seaslog.appender</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch the Record Log Data Store. 1File 2TCP 3UDP (Switch default 1)
-     </simpara>
-     <simpara>
-       SeasLog will send log to  tcp://remote_host:remote_port or udp://remote_host:remote_port server,
-      when <emphasis>seaslog.appender</emphasis> configured to <literal>2 (TCP)</literal> or <literal>3 (UDP)</literal>.
-     </simpara>
-     <simpara>
-       When <emphasis>SeasLog</emphasis> send log to TCP/UDP，style follow RFC5424.
-      The <literal>{logInfo}</literal> affected by  <emphasis>seaslog.default_template</emphasis>.
-     </simpara>
-     <screen>
-   <![CDATA[
-The log style finally formatted such as:
-<15>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | DEBUG | 21423 | 599157af4e937 | 1466787583.322 | this is a neeke debug
-<14>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | INFO | 21423 | 599157af4e937 | 1466787583.323 | this is a info log
-<13>1 2017-08-27T01:24:59+08:00 vagrant-ubuntu-trusty test/logger[27171]: 2016-06-25 00:59:43 | NOTICE | 21423 | 599157af4e937 | 1466787583.324 | this is a notice log
-    ]]>
-     </screen>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.appender-retry">
-    <term>
-     <parameter>seaslog.appender_retry</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Record Log Retry Count.
-      Default 0 (Do Not Retry)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.buffer-disabled-in-cli">
-    <term>
-     <parameter>seaslog.buffer_disabled_in_cli</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Disable buffer in cli. 1-Y 0-N(Default)
-     </simpara>
-     <simpara>
-      Switch the configure buffer_disabled_in_cli on.
-      The buffer_disabled_in_cli switch default off.
-      If switch buffer_disabled_in_cli on, and running in cli,
-      seaslog.use_buffer setting will be discarded,
-      Seaslog write to the Data Store IMMEDIATELY.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.buffer-size">
-    <term>
-     <parameter>seaslog.buffer_size</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Configure the buffer_size with 100.
-      The buffer_size default 0, it’s meaning don’t use buffer.
-      If buffer_size &gt; 0,SeasLog will rewritten down into the Data Store
-      when the prerecorded log in memory count &gt;= this buffer_size,and then refresh the memory poll.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.default-basepath">
-    <term>
-     <parameter>seaslog.default_basepath</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Default Log Base Path. Defult "/var/log/www".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.default-datetime-format">
-    <term>
-     <parameter>seaslog.default_datetime_format</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      The DateTime Style.  Default "Y-m-d H:i:s".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.default-logger">
-    <term>
-     <parameter>seaslog.default_logger</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Default Logger Path. Default "default".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.disting-by-hour">
-    <term>
-     <parameter>seaslog.disting_by_hour</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch use the logger with hour. 1-Y 0-N(Default)
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.disting_by_hour = 1</emphasis> Switch use Logger DisTing by hour.
-       It’s  meaning SeasLog will create the file each one hour.
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.disting-folder">
-    <term>
-     <parameter>seaslog.disting_folder</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch use the logger with folder. 1-Y(Default) 0-N
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.disting_folder = 1</emphasis> Switch use Logger DisTing by folder,
-       it’s meaning SeasLog will create the file deistic by folder,
-       and when this configure close SeasLog will create file
-       use underline connect Logger and Time like default_20180211.log.
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.disting-type">
-    <term>
-     <parameter>seaslog.disting_type</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch use the logger with type. 1-Y 0-N(Default)
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.disting_type = 1</emphasis> Switch use Logger DisTing by type,
-       it’s meaning SeasLog will create the file deistic info\warn\error and the other type.
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.ignore-warning">
-    <term>
-     <parameter>seaslog.ignore_warning</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch ignore SeasLog warning. 1-On(Default) 0-Off
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.ignore_warning = 1</emphasis> Open a warning to ignore SeasLog itself.
-       When directory permissions or receive server ports are blocked, they are ignored;
-       when closed, a warning is thrown.
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.level">
-    <term>
-     <parameter>seaslog.level</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Record logger level. Default 8 (All of them).
-      0-EMERGENCY 1-ALERT 2-CRITICAL 3-ERROR 4-WARNING 5-NOTICE 6-INFO 7-DEBUG 8-ALL
-     </simpara>
-     <note>
-       <simpara>
-         Tips: The configuration item has changed since the 1.7.0 version.
-         Before the 1.7.0 version, the smaller the value, the more logs are taken according to the level:
-         0-all 1-debug 2-info 3-notice 4-warning 5-error 6-critical 7-alert 8-emergency
-         Before the 1.7.0 version, Default 0 (All of them).
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.recall-depth">
-    <term>
-     <parameter>seaslog.recall_depth</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Log function recall depth.Will affected variable <literal>LineNo</literal> in <literal>%F</literal>.
-      Default 0
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.remote-host">
-    <term>
-     <parameter>seaslog.remote_host</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      If you use  Record TCP or UDP, configure this remote ip. Default "127.0.0.1"
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.remote-port">
-    <term>
-     <parameter>seaslog.remote_port</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      If you use Record TCP or UDP, configure this remote port. Default 514
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.remote-timeout">
-    <term>
-     <parameter>seaslog.remote_timeout</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      If you use Record TCP or UDP, configure this remote timeout. Default 1 second
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.throw-exception">
-    <term>
-     <parameter>seaslog.throw_exception</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch throw SeasLog exception. 1-On(Default) 0-Off
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.throw_exception = 1</emphasis> Open an exception that throws the SeasLog to throw itself.
-       When the directory authority or the receive server port is blocked,
-       throw an exception; do not throw an exception when closed.
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.trace-error">
-    <term>
-     <parameter>seaslog.trace_error</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Automatic Record final error with default logger. 1-Y(Default) 0-N
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.trace-exception">
-    <term>
-     <parameter>seaslog.trace_exception</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Automatic Record exception with default logger. 1-Y 0-N(Default)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.trace-notice">
-    <term>
-     <parameter>seaslog.trace_notice</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Automatic Record notice with default logger. 1-Y 0-N(Default)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.trace-warning">
-    <term>
-     <parameter>seaslog.trace_warning</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Automatic Record warning with default logger. 1-Y 0-N(Default)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.trim-wrap">
-    <term>
-     <parameter>seaslog.trim_wrap</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Trim the \n and \r in log message. 1-On 0-Off(Default)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.use-buffer">
-    <term>
-     <parameter>seaslog.use_buffer</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Switch use the log buffer with memory. 1-Y 0-N(Default)
-     </simpara>
-     <note>
-       <simpara>
-       <emphasis>seaslog.use_buffer = 1</emphasis> Switch the configure use_buffer on.
-       The use_buffer switch default off.
-       If switch use_buffer on, SeasLog prerecord the log with memory,
-       and them would be rewritten down into the Data Store by request shutdown
-       or php process exit (PHP RSHUTDOWN or PHP MSHUTDOWN).
-       </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.seaslog.default-template">
-    <term>
-     <parameter>seaslog.default_template</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Default Log template.
-      Default "%T | %L | %P | %Q | %t | %M".
-     </simpara>
-     <note>
-       <simpara>
-       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.
-       </simpara>
-       <simpara>
-       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>
-       </simpara>
-       <simpara>
-        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>
-       </simpara>
-       <table>
-         <title>Seaslog Default Variable Table</title>
-         <tgroup cols="2">
-           <thead>
-             <row>
-               <entry>Variable Name</entry>
-               <entry>Description</entry>
-             </row>
-           </thead>
-           <tbody>
-             <row>
-               <entry>%L</entry>
-               <entry>Level.</entry>
-             </row>
-             <row>
-               <entry>%M</entry>
-               <entry>Message.</entry>
-             </row>
-             <row>
-               <entry>%T</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 <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 <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>
-               <entry>%H</entry>
-               <entry>HostName.</entry>
-             </row>
-             <row>
-               <entry>%P</entry>
-               <entry>ProcessId.</entry>
-             </row>
-             <row>
-               <entry>%D</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 <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 <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 <literal>local</literal>.
-               Priority value: HTTP_X_REAL_IP &gt; HTTP_X_FORWARDED_FOR &gt; REMOTE_ADDR</entry>
-             </row>
-             <row>
-               <entry>%F</entry>
-              <entry>FileName:LineNo. Such as <literal>UserService.php:118</literal>.</entry>
-             </row>
-             <row>
-               <entry>%U</entry>
-              <entry>MemoryUsage. byte. Call <literal>zend_memory_usage</literal>.</entry>
-             </row>
-             <row>
-               <entry>%u</entry>
-              <entry>PeakMemoryUsage. byte. Call <literal>zend_memory_peak_usage</literal>.</entry>
-             </row>
-             <row>
-               <entry>%C</entry>
-              <entry><literal>TODO</literal> Class::Action. Such as <literal>UserService::getUserInfo</literal></entry>
-             </row>
-           </tbody>
-           </tgroup>
-       </table>
-     </note>
-    </listitem>
-   </varlistentry>
- </variablelist>
-</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/seaslog/reference.xml b/reference/seaslog/reference.xml
deleted file mode 100644
index e95a5412621c..000000000000
--- a/reference/seaslog/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.seaslog" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Seaslog &Functions;</title>
-
- &reference.seaslog.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/seaslog/seaslog.xml b/reference/seaslog/seaslog.xml
deleted file mode 100644
index c91a1185a03e..000000000000
--- a/reference/seaslog/seaslog.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.seaslog" role="class">
-
- <title>The SeasLog class</title>
- <titleabbrev>SeasLog</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SeasLog intro -->
-  <section xml:id="seaslog.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="seaslog.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SeasLog</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SeasLog</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.seaslog')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.seaslog.entities.seaslog;
-
-</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/seaslog/seaslog/alert.xml b/reference/seaslog/seaslog/alert.xml
deleted file mode 100644
index 7f33abc54a0b..000000000000
--- a/reference/seaslog/seaslog/alert.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.alert">
- <refnamediv>
-  <refname>SeasLog::alert</refname>
-  <refpurpose>Record alert log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::alert</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record alert log information.
-    <note>
-      <simpara>
-        "ALERT" - Action must be taken immediately.
-        Immediate attention should be given to relevant personnel for emergency repairs.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::alert</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::alert('log message'));
-
-//with content
-var_dump(SeasLog::alert('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::alert('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | ALERT | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | ALERT | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | ALERT | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/analyzercount.xml b/reference/seaslog/seaslog/analyzercount.xml
deleted file mode 100644
index 8168dbdfc6d2..000000000000
--- a/reference/seaslog/seaslog/analyzercount.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.analyzercount">
- <refnamediv>
-  <refname>SeasLog::analyzerCount</refname>
-  <refpurpose>Get log count by level, log_path and key_word</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>SeasLog::analyzerCount</methodname>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>log_path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key_word</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    `SeasLog` get count value of `grep -ai '{level}' | grep -aic '{key_word}'`
-    use system pipe and return to PHP (array or int).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>level</parameter></term>
-    <listitem>
-     <simpara>
-      String. The log information level.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>log_path</parameter></term>
-    <listitem>
-     <simpara>
-      String. The log information path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_word</parameter></term>
-    <listitem>
-     <simpara>
-      String. The search key word for log information.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If `level` is SEASLOG_ALL or Empty, return all levels count as `array`.
-   If `level` is SEASLOG_INFO or the other level, return count as `int`.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::analyzerCount</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$countResult1 = SeasLog::analyzerCount();
-
-//with `level`
-$countResult2 = SeasLog::analyzerCount(SEASLOG_DEBUG);
-
-//with `level` and `log_path`
-$countResult3 = SeasLog::analyzerCount(SEASLOG_ERROR,date('Ymd',time()));
-
-//with `level` and `key_word`
-$countResult4 = SeasLog::analyzerCount(SEASLOG_DEBUG,NULL,'accessToken');
-
-var_dump($countResult1,$countResult2,$countResult3,$countResult4);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(8) {
-  ["DEBUG"]=>
-  int(180)
-  ["INFO"]=>
-  int(214)
-  ["NOTICE"]=>
-  int(0)
-  ["WARNING"]=>
-  int(0)
-  ["ERROR"]=>
-  int(228)
-  ["CRITICAL"]=>
-  int(244)
-  ["ALERT"]=>
-  int(1)
-  ["EMERGENCY"]=>
-  int(0)
-}
-
-int(180)
-
-int(228)
-
-int(29)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::analyzerDetail</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/seaslog/seaslog/analyzerdetail.xml b/reference/seaslog/seaslog/analyzerdetail.xml
deleted file mode 100644
index b09dd856b4c8..000000000000
--- a/reference/seaslog/seaslog/analyzerdetail.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.analyzerdetail">
- <refnamediv>
-  <refname>SeasLog::analyzerDetail</refname>
-  <refpurpose>Get log detail by level, log_path, key_word, start, limit, order</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>SeasLog::analyzerDetail</methodname>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>log_path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key_word</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>order</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    `SeasLog` get results of
-    `grep -ai '{level}' | grep -ai '{key_word}' |  sed -n '{start},{limit}'p`
-    use system pipe and return array to PHP.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>level</parameter></term>
-    <listitem>
-     <simpara>
-      String. The log information level.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>log_path</parameter></term>
-    <listitem>
-     <simpara>
-      String. The log information path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key_word</parameter></term>
-    <listitem>
-     <simpara>
-      String. The search key word for log information.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <simpara>
-      Int. Default is `1`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Int. Default is `20`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>order</parameter></term>
-    <listitem>
-     <para>
-      Int. Default is <link linkend="constant.seaslog-detail-order-asc">SEASLOG_DETAIL_ORDER_ASC</link>.
-      See also:
-        <simplelist>
-         <member><link linkend="constant.seaslog-detail-order-asc">SEASLOG_DETAIL_ORDER_ASC</link></member>
-         <member><link linkend="constant.seaslog-detail-order-desc">SEASLOG_DETAIL_ORDER_DESC</link></member>
-        </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return results as array.
-   <note>
-    <simpara>
-     When `start`,`limit` is not NULL and in Windows,
-     SeasLog will threw exception with message 'Param start and limit don't support Windows'.
-    </simpara>
-   </note>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::analyzerDetail</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$result1 = SeasLog::analyzerDetail(SEASLOG_ERROR);
-
-//with `logger` and `key_word`
-$result2 = SeasLog::analyzerDetail(SEASLOG_ERROR,'test/logger/','neeke');
-
-//with `start` and `limit`
-$result3 = SeasLog::analyzerDetail(SEASLOG_ERROR,'test/logger/','neeke',1,2);
-
-var_dump($result1,$result2,$result3);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(20) {
-  [0]=>
-  string(93) "2018-07-09 12:52:53 | ERROR | 12247 | 5b42ea2580e51 | 1531111973.528 | log message from neeke"
-  [1]=>
-  string(93) "2018-07-09 12:52:54 | ERROR | 12256 | 5b42ea26d6657 | 1531111974.878 | log message from neeke"
-  [2]=>
-  string(93) "2018-07-09 12:52:55 | ERROR | 12265 | 5b42ea277b8d4 | 1531111975.506 | log message from neeke"
-  [3]=>
-  string(104) "2018-07-09 12:52:55 | ERROR | 12274 | 5b42ea27db5dc | 1531111975.898 | log message from the other people"
-...
-}
-
-array(3) {
-  [0]=>
-  string(93) "2018-07-09 12:52:53 | ERROR | 12247 | 5b42ea2580e51 | 1531111973.528 | log message from neeke"
-  [1]=>
-  string(93) "2018-07-09 12:52:54 | ERROR | 12256 | 5b42ea26d6657 | 1531111974.878 | log message from neeke"
-  [2]=>
-  string(93) "2018-07-09 12:52:55 | ERROR | 12265 | 5b42ea277b8d4 | 1531111975.506 | log message from neeke"
-}
-
-array(2) {
-  [0]=>
-  string(93) "2018-07-09 12:52:53 | ERROR | 12247 | 5b42ea2580e51 | 1531111973.528 | log message from neeke"
-  [1]=>
-  string(93) "2018-07-09 12:52:54 | ERROR | 12256 | 5b42ea26d6657 | 1531111974.878 | log message from neeke"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::analyzerCount</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/seaslog/seaslog/closeloggerstream.xml b/reference/seaslog/seaslog/closeloggerstream.xml
deleted file mode 100644
index 8adefbbcde10..000000000000
--- a/reference/seaslog/seaslog/closeloggerstream.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.closeloggerstream">
- <refnamediv>
-  <refname>SeasLog::closeLoggerStream</refname>
-  <refpurpose>Manually release stream flow from logger</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::closeLoggerStream</methodname>
-   <methodparam><type>int</type><parameter>model</parameter></methodparam>
-   <methodparam><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Manually release stream flow from logger.
-   SeasLog caches the stream handle opened by the log logger to save the overhead of creating a stream. The handle will be automatically released at the end of the request.
-   If in CLI mode, the process will also automatically release when it exits. Or you can use the following functions to manually release(manually release function needs to update SeasLog 1.8.6 or updated version).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>model</parameter></term>
-    <listitem>
-     <para>
-      Constant int.
-      <simplelist>
-       <member><link linkend="constant.seaslog-close-logger-stream-mod-all">SEASLOG_CLOSE_LOGGER_STREAM_MOD_ALL</link></member>
-       <member><link linkend="constant.seaslog-close-logger-stream-mod-assign">SEASLOG_CLOSE_LOGGER_STREAM_MOD_ASSIGN</link></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The logger name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on released stream flow success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SeasLog::closeLoggerStream</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::closeLoggerStream());
-var_dump(SeasLog::closeLoggerStream(SEASLOG_CLOSE_LOGGER_STREAM_MOD_ALL));
-var_dump(SeasLog::closeLoggerStream(SEASLOG_CLOSE_LOGGER_STREAM_MOD_ASSIGN, 'logger_name'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-bool(true)
-bool(true)
-bool(true)
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::setLogger</methodname></member>
-   <member><methodname>SeasLog::getLastLogger</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/seaslog/seaslog/construct.xml b/reference/seaslog/seaslog/construct.xml
deleted file mode 100644
index 09514e369c73..000000000000
--- a/reference/seaslog/seaslog/construct.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.construct">
- <refnamediv>
-  <refname>SeasLog::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SeasLog::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
-   <title><function>SeasLog::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </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/seaslog/seaslog/critical.xml b/reference/seaslog/seaslog/critical.xml
deleted file mode 100644
index 329c20010a4c..000000000000
--- a/reference/seaslog/seaslog/critical.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.critical">
- <refnamediv>
-  <refname>SeasLog::critical</refname>
-  <refpurpose>Record critical log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::critical</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record critical log information.
-    <note>
-      <simpara>
-        "CRITICAL" - Critical conditions.Need to be repaired immediately, and the program component is unavailable.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::critical</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::critical('log message'));
-
-//with content
-var_dump(SeasLog::critical('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::critical('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | CRITICAL | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | CRITICAL | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | CRITICAL | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/debug.xml b/reference/seaslog/seaslog/debug.xml
deleted file mode 100644
index c532adeec8ac..000000000000
--- a/reference/seaslog/seaslog/debug.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.debug">
- <refnamediv>
-  <refname>SeasLog::debug</refname>
-  <refpurpose>Record debug log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::debug</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record debug log information.
-    <note>
-      <simpara>
-        "DEBUG" - Detailed debug information.Fine-grained information events.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::debug</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::debug('log message'));
-
-//with content
-var_dump(SeasLog::debug('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::debug('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | DEBUG | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | DEBUG | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | DEBUG | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/destruct.xml b/reference/seaslog/seaslog/destruct.xml
deleted file mode 100644
index 67c5179e91a8..000000000000
--- a/reference/seaslog/seaslog/destruct.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.destruct">
- <refnamediv>
-  <refname>SeasLog::__destruct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SeasLog::__destruct</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::__destruct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </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/seaslog/seaslog/emergency.xml b/reference/seaslog/seaslog/emergency.xml
deleted file mode 100644
index 3233cdd4d884..000000000000
--- a/reference/seaslog/seaslog/emergency.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.emergency">
- <refnamediv>
-  <refname>SeasLog::emergency</refname>
-  <refpurpose>Record emergency log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::emergency</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record emergency log information.
-    <note>
-      <simpara>
-        "EMERGENCY" - System is unusable.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::emergency</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::emergency('log message'));
-
-//with content
-var_dump(SeasLog::emergency('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::emergency('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | EMERGENCY | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | EMERGENCY | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | EMERGENCY | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/error.xml b/reference/seaslog/seaslog/error.xml
deleted file mode 100644
index 53277504a1e2..000000000000
--- a/reference/seaslog/seaslog/error.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.error">
- <refnamediv>
-  <refname>SeasLog::error</refname>
-  <refpurpose>Record error log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::error</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record error log information.
-    <note>
-      <simpara>
-        "ERROR" - Runtime errors that do not require immediate action but should typically.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::error</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::error('log message'));
-
-//with content
-var_dump(SeasLog::error('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::error('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | ERROR | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | ERROR | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | ERROR | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/flushbuffer.xml b/reference/seaslog/seaslog/flushbuffer.xml
deleted file mode 100644
index 6fbd39717ea7..000000000000
--- a/reference/seaslog/seaslog/flushbuffer.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.flushbuffer">
- <refnamediv>
-  <refname>SeasLog::flushBuffer</refname>
-  <refpurpose>Flush logs buffer, dump to appender file, or send to remote api with tcp/udp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::flushBuffer</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-    Flush logs buffer by <link linkend="ini.seaslog.appender">seaslog.appender</link>:
-    dump to file, or send to remote api with tcp/udp.
-    <note>
-     <simpara>
-     See also:
-     <link linkend="ini.seaslog.appender-retry">seaslog.appender_retry</link>
-     <link linkend="ini.seaslog.remote-host">seaslog.remote_host</link>
-     <link linkend="ini.seaslog.remote-port">seaslog.remote_port</link>
-     </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on flush buffer success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::flushBuffer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-SeasLog::info('info log');
-SeasLog::debug('debug log');
-var_dump(SeasLog::getBuffer());
-var_dump(SeasLog::flushBuffer());
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(79) "2018-07-07 10:47:58 | INFO | 71910 | 5b4029ded6009 | 1530931678.877 | info log
-"
-    [1]=>
-    string(81) "2018-07-07 10:47:58 | DEBUG | 71910 | 5b4029ded6009 | 1530931678.877 | debug log
-"
-  }
-}
-bool(true)
-array(0) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link></member>
-   <member><link linkend="ini.seaslog.buffer-size">seaslog.buffer_size</link></member>
-   <member><link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link></member>
-   <member><methodname>SeasLog::getBufferEnabled</methodname></member>
-   <member><methodname>SeasLog::getBuffer</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/seaslog/seaslog/getbasepath.xml b/reference/seaslog/seaslog/getbasepath.xml
deleted file mode 100644
index 027114ac6635..000000000000
--- a/reference/seaslog/seaslog/getbasepath.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getbasepath">
- <refnamediv>
-  <refname>SeasLog::getBasePath</refname>
-  <refpurpose>Get SeasLog base path.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Seaslog::getBasePath</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Use the Function <methodname>SeasLog::getBasePath</methodname>
-     will get the value of <link linkend="ini.seaslog.default-basepath">seaslog.default_basepath</link>
-     what configured in php.ini(seaslog.ini).
-  </simpara>
-  <simpara>
-    If you use <methodname>Seaslog::setBasePath</methodname>, will change the result.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return <link linkend="ini.seaslog.default-basepath">seaslog.default_basepath</link> as string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SeasLog::getBasePath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::getBasePath());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(12) "/var/log/www"
-]]>
-   </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/seaslog/seaslog/getbuffer.xml b/reference/seaslog/seaslog/getbuffer.xml
deleted file mode 100644
index 3b2e50d732f4..000000000000
--- a/reference/seaslog/seaslog/getbuffer.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getbuffer">
- <refnamediv>
-  <refname>SeasLog::getBuffer</refname>
-  <refpurpose>Get the logs buffer in memory as array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>SeasLog::getBuffer</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return an array from logs buffer in memory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::getBuffer</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::info('info log'));
-var_dump(SeasLog::debug('debug log'));
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-array(1) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(79) "2018-07-07 10:43:32 | INFO | 71785 | 5b4028d4c58d5 | 1530931412.810 | info log
-"
-    [1]=>
-    string(81) "2018-07-07 10:43:32 | DEBUG | 71785 | 5b4028d4c58d5 | 1530931412.810 | debug log
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link></member>
-   <member><link linkend="ini.seaslog.buffer-size">seaslog.buffer_size</link></member>
-   <member><link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link></member>
-   <member><methodname>SeasLog::getBufferEnabled</methodname></member>
-   <member><methodname>SeasLog::flushBuffer</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/seaslog/seaslog/getbufferenabled.xml b/reference/seaslog/seaslog/getbufferenabled.xml
deleted file mode 100644
index 1da3fcf24a7f..000000000000
--- a/reference/seaslog/seaslog/getbufferenabled.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getbufferenabled">
- <refnamediv>
-  <refname>SeasLog::getBufferEnabled</refname>
-  <refpurpose>Determin if buffer enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::getBufferEnabled</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Result join <link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link>
-    and <link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link>.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on <link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link> is true.
-   If switch <link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link> on, and running in cli,
-   seaslog.use_buffer setting will be discarded, Seaslog write to the Data Store IMMEDIATELY.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::getBufferEnabled</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::getBufferEnabled());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.use-buffer">seaslog.use_buffer</link></member>
-   <member><link linkend="ini.seaslog.buffer-size">seaslog.buffer_size</link></member>
-   <member><link linkend="ini.seaslog.buffer-disabled-in-cli">seaslog.buffer_disabled_in_cli</link></member>
-   <member><methodname>SeasLog::getBuffer</methodname></member>
-   <member><methodname>SeasLog::flushBuffer</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/seaslog/seaslog/getdatetimeformat.xml b/reference/seaslog/seaslog/getdatetimeformat.xml
deleted file mode 100644
index 590310883f4f..000000000000
--- a/reference/seaslog/seaslog/getdatetimeformat.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getdatetimeformat">
- <refnamediv>
-  <refname>SeasLog::getDatetimeFormat</refname>
-  <refpurpose>Get SeasLog datetime format style</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>SeasLog::getDatetimeFormat</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Get SeasLog datetime format style.
-    Use the Function <methodname>SeasLog::getDatetimeFormat</methodname> will
-    get the value of <link linkend="ini.seaslog.default-datetime-format">seaslog.default_datetime_format</link>
-    what configured in php.ini(seaslog.ini).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    Get SeasLog datetime format style of
-    <link linkend="ini.seaslog.default-datetime-format">seaslog.default_datetime_format</link>.
-    Use the Function <methodname>SeasLog::setDatetimeFormat</methodname>
-    will change this value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::getDatetimeFormat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::getDateTimeFormat());
-var_dump(SeasLog::setDateTimeFormat('Ymd His'));
-var_dump(SeasLog::getDateTimeFormat());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "Y-m-d H:i:s"
-bool(true)
-string(7) "Ymd His"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::setDatetimeFormat</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/seaslog/seaslog/getlastlogger.xml b/reference/seaslog/seaslog/getlastlogger.xml
deleted file mode 100644
index 541ed10a4a05..000000000000
--- a/reference/seaslog/seaslog/getlastlogger.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getlastlogger">
- <refnamediv>
-  <refname>SeasLog::getLastLogger</refname>
-  <refpurpose>Get SeasLog last logger path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>SeasLog::getLastLogger</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Use the Function <methodname>SeasLog::getLastLogger</methodname> will
-    get the value of <link linkend="ini.seaslog.default-logger">seaslog.default_logger</link>
-    what configured in php.ini(seaslog.ini).
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Use the Function <methodname>SeasLog::setLogger</methodname>
-   will change the value of function <methodname>SeasLog::getLastLogger</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::getLastLogger</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::getLastLogger());
-SeasLog::setLogger('theNewLogger');
-var_dump(SeasLog::getLastLogger());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "default"
-string(12) "theNewLogger"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::setLogger</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/seaslog/seaslog/getrequestid.xml b/reference/seaslog/seaslog/getrequestid.xml
deleted file mode 100644
index d0e2e08a0f9d..000000000000
--- a/reference/seaslog/seaslog/getrequestid.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getrequestid">
- <refnamediv>
-  <refname>SeasLog::getRequestID</refname>
-  <refpurpose>Get SeasLog request_id differentiated requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>SeasLog::getRequestID</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    To distinguish a single request, such as not invoking the
-    <methodname>SeasLog::setRequestId</methodname> function，
-    the unique value generated by the built-in `static char *get_uniqid ()`
-    function is used when the request is initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return string generated by the built-in `static char *get_uniqid ()` function,
-   or setted by <methodname>SeasLog::setRequestId</methodname> function.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::getRequestID</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::getRequestID());
-var_dump(SeasLog::setRequestID('reqeust_id_test_'.time()));
-var_dump(SeasLog::getRequestID());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(13) "5b3f21a209519"
-bool(true)
-string(26) "reqeust_id_test_1530864034"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::setRequestID</methodname></member>
-   <member>The Variable `%Q` in
-   <link linkend="ini.seaslog.default-template">Seaslog Default Variable Table</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/seaslog/seaslog/getrequestvariable.xml b/reference/seaslog/seaslog/getrequestvariable.xml
deleted file mode 100644
index 4ea982274883..000000000000
--- a/reference/seaslog/seaslog/getrequestvariable.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.getrequestvariable">
- <refnamediv>
-  <refname>SeasLog::getRequestVariable</refname>
-  <refpurpose>Get SeasLog request variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::getRequestVariable</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get SeasLog request variable.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      Constant int.
-      <simplelist>
-       <member><link linkend="constant.seaslog-request-variable-domain-port">SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT</link></member>
-       <member><link linkend="constant.seaslog-request-variable-request-uri">SEASLOG_REQUEST_VARIABLE_REQUEST_URI</link></member>
-       <member><link linkend="constant.seaslog-request-variable-request-method">SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD</link></member>
-       <member><link linkend="constant.seaslog-request-variable-client-ip">SEASLOG_REQUEST_VARIABLE_CLIENT_IP</link></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return request variable value on set success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SeasLog::getRequestVariable</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$sDomainPort = 'domain:port';
-$sRequestUri = 'uri';
-$sRequestMethod = 'method';
-$sClientIp = 'client_ip';
-
-$iErrorKey = 1000;
-
-$oSeasLog = new SeasLog();
-
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT, $sDomainPort));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_URI, $sRequestUri));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD, $sRequestMethod));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_CLIENT_IP, $sClientIp));
-
-var_dump($oSeasLog->setRequestVariable($iErrorKey,NULL));
-
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT) == $sDomainPort);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_URI) == $sRequestUri);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD) == $sRequestMethod);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_CLIENT_IP) == $sClientIp);
-
-var_dump($oSeasLog->getRequestVariable($iErrorKey));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::setRequestVariable</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/seaslog/seaslog/info.xml b/reference/seaslog/seaslog/info.xml
deleted file mode 100644
index eb70baeccc88..000000000000
--- a/reference/seaslog/seaslog/info.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.info">
- <refnamediv>
-  <refname>SeasLog::info</refname>
-  <refpurpose>Record info log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::info</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record info log information.
-    <note>
-      <simpara>
-        "INFO" - Interesting events.Emphasizes the running process of the application.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::info('log message'));
-
-//with content
-var_dump(SeasLog::info('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::info('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | INFO | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | INFO | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | INFO | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/log.xml b/reference/seaslog/seaslog/log.xml
deleted file mode 100644
index 45ff072eb8ea..000000000000
--- a/reference/seaslog/seaslog/log.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.log">
- <refnamediv>
-  <refname>SeasLog::log</refname>
-  <refpurpose>The Common Record Log Function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::log</methodname>
-   <methodparam><type>string</type><parameter>level</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    The Common Record Log Function.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>level</parameter></term>
-    <listitem>
-     <para>
-      Can use level in:
-      <simplelist>
-        <member><link linkend="constant.seaslog-debug">SEASLOG_DEBUG</link></member>
-        <member><link linkend="constant.seaslog-info">SEASLOG_INFO</link></member>
-        <member><link linkend="constant.seaslog-notice">SEASLOG_NOTICE</link></member>
-        <member><link linkend="constant.seaslog-warning">SEASLOG_WARNING</link></member>
-        <member><link linkend="constant.seaslog-error">SEASLOG_ERROR</link></member>
-        <member><link linkend="constant.seaslog-critical">SEASLOG_CRITICAL</link></member>
-        <member><link linkend="constant.seaslog-alert">SEASLOG_ALERT</link></member>
-        <member><link linkend="constant.seaslog-emergency">SEASLOG_EMERGENCY</link></member>
-      </simplelist>
-      Or you can create a new level self-help.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::log</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::log(SEASLOG_INFO,'info log'));
-var_dump(SeasLog::getBuffer());
-
-//create a new level self-help.
-var_dump(SeasLog::log('MySelfLevel','info log'));
-var_dump(SeasLog::getBuffer());
-
-//with `content`
-var_dump(SeasLog::log('MySelfLevel','info log {NAME}',array('NAME' => 'neeke')));
-var_dump(SeasLog::getBuffer());
-
-//with `logger`
-var_dump(SeasLog::log('MySelfLevel','info log {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-var_dump(SeasLog::getBuffer());
-
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-array(1) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(79) "2018-07-07 11:12:37 | INFO | 72427 | 5b402fa56a2ea | 1530933157.436 | info log
-"
-  }
-}
-
-bool(true)
-array(1) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(86) "2018-07-07 11:13:59 | MySelfLevel | 72470 | 5b402ff781c5e | 1530933239.532 | info log
-"
-  }
-}
-
-bool(true)
-array(1) {
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:28:12 | MySelfLevel | 72833 | 5b40334ce6a2f | 1530934092.946 | info log neeke
-"
-  }
-}
-
-bool(true)
-array(1) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(86) "2018-07-07 11:20:12 | INFO | 72616 | 5b40316c3641e | 1530933612.222 | info log neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</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/seaslog/seaslog/notice.xml b/reference/seaslog/seaslog/notice.xml
deleted file mode 100644
index ea3c2023501e..000000000000
--- a/reference/seaslog/seaslog/notice.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.notice">
- <refnamediv>
-  <refname>SeasLog::notice</refname>
-  <refpurpose>Record notice log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::notice</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record notice log information.
-    <note>
-      <simpara>
-        "NOTICE" - Normal but significant events.Information that is more important than the INFO level during execution.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::notice</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::notice('log message'));
-
-//with content
-var_dump(SeasLog::notice('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::notice('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | NOTICE | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | NOTICE | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | NOTICE | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::warning</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/seaslog/setbasepath.xml b/reference/seaslog/seaslog/setbasepath.xml
deleted file mode 100644
index 8e6781b86c87..000000000000
--- a/reference/seaslog/seaslog/setbasepath.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setbasepath">
- <refnamediv>
-  <refname>SeasLog::setBasePath</refname>
-  <refpurpose>Set SeasLog base path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::setBasePath</methodname>
-   <methodparam><type>string</type><parameter>base_path</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Set SeasLog base path.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>base_path</parameter></term>
-    <listitem>
-     <simpara>
-      String.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on setted base path success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SeasLog::setBasePath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </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/seaslog/seaslog/setdatetimeformat.xml b/reference/seaslog/seaslog/setdatetimeformat.xml
deleted file mode 100644
index a641455a43a3..000000000000
--- a/reference/seaslog/seaslog/setdatetimeformat.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setdatetimeformat">
- <refnamediv>
-  <refname>SeasLog::setDatetimeFormat</refname>
-  <refpurpose>Set SeasLog datetime format style</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::setDatetimeFormat</methodname>
-   <methodparam><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Set SeasLog datetime format style.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <simpara>
-      String. Such as `Y-m-d H:i:s` or `Ymd His`. See also first param `format` at <function>date</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on setted datetime format success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::setDatetimeFormat</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::setDateTimeFormat('Ymd His'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::getDateTimeFormat</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/seaslog/seaslog/setlogger.xml b/reference/seaslog/seaslog/setlogger.xml
deleted file mode 100644
index d6833c4b577a..000000000000
--- a/reference/seaslog/seaslog/setlogger.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setlogger">
- <refnamediv>
-  <refname>SeasLog::setLogger</refname>
-  <refpurpose>Set SeasLog logger name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::setLogger</methodname>
-   <methodparam><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Use the Function <methodname>SeasLog::setLogger</methodname>
-     will change the value of function <methodname>SeasLog::getLastLogger</methodname>.
-    Than's mean, SeasLog will record loginfo into the logger directory.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      Logger name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on created logger disectory success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::setLogger</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::setLogger('testModule/testLogger'));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::getLastLogger</methodname></member>
-   <member><methodname>SeasLog::closeLoggerStream</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/seaslog/seaslog/setrequestid.xml b/reference/seaslog/seaslog/setrequestid.xml
deleted file mode 100644
index a44ad97cd54d..000000000000
--- a/reference/seaslog/seaslog/setrequestid.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setrequestid">
- <refnamediv>
-  <refname>SeasLog::setRequestID</refname>
-  <refpurpose>Set SeasLog request_id differentiated requests</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::setRequestID</methodname>
-   <methodparam><type>string</type><parameter>request_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-    To distinguish a single request, such as not invoking the
-    <methodname>SeasLog::setRequestId</methodname> function，
-    the unique value generated by the built-in `static char *get_uniqid ()`
-    function is used when the request is initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request_id</parameter></term>
-    <listitem>
-     <simpara>
-      String.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on set request_id success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::setRequestID</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::setRequestID(time() . rand()));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::getRequestID</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/seaslog/seaslog/setrequestvariable.xml b/reference/seaslog/seaslog/setrequestvariable.xml
deleted file mode 100644
index d8821b4a797a..000000000000
--- a/reference/seaslog/seaslog/setrequestvariable.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setrequestvariable">
- <refnamediv>
-  <refname>SeasLog::setRequestVariable</refname>
-  <refpurpose>Manually set SeasLog request variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::setRequestVariable</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Manually set SeasLog request variable.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      Constant int.
-      <simplelist>
-       <member><link linkend="constant.seaslog-request-variable-domain-port">SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT</link></member>
-       <member><link linkend="constant.seaslog-request-variable-request-uri">SEASLOG_REQUEST_VARIABLE_REQUEST_URI</link></member>
-       <member><link linkend="constant.seaslog-request-variable-request-method">SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD</link></member>
-       <member><link linkend="constant.seaslog-request-variable-client-ip">SEASLOG_REQUEST_VARIABLE_CLIENT_IP</link></member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The request variable value.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on set success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SeasLog::setRequestVariable</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$sDomainPort = 'domain:port';
-$sRequestUri = 'uri';
-$sRequestMethod = 'method';
-$sClientIp = 'client_ip';
-
-$iErrorKey = 1000;
-
-$oSeasLog = new SeasLog();
-
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT, $sDomainPort));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_URI, $sRequestUri));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD, $sRequestMethod));
-var_dump($oSeasLog->setRequestVariable(SEASLOG_REQUEST_VARIABLE_CLIENT_IP, $sClientIp));
-
-var_dump($oSeasLog->setRequestVariable($iErrorKey,NULL));
-
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_DOMAIN_PORT) == $sDomainPort);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_URI) == $sRequestUri);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_REQUEST_METHOD) == $sRequestMethod);
-var_dump($oSeasLog->getRequestVariable(SEASLOG_REQUEST_VARIABLE_CLIENT_IP) == $sClientIp);
-
-var_dump($oSeasLog->getRequestVariable($iErrorKey));
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SeasLog::getRequestVariable</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/seaslog/seaslog/warning.xml b/reference/seaslog/seaslog/warning.xml
deleted file mode 100644
index bbcdf598ae0d..000000000000
--- a/reference/seaslog/seaslog/warning.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.warning">
- <refnamediv>
-  <refname>SeasLog::warning</refname>
-  <refpurpose>Record warning log information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>SeasLog::warning</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>logger</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Record warning log information.
-    <note>
-      <simpara>
-        "WARNING" - Exceptional occurrences that are not errors.
-        Potentially aberrant information that needs attention and needs to be repaired.
-      </simpara>
-    </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-     <simpara>
-      The log message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <simpara>
-      The `message` contain placeholders which implementors replace with values from content array.
-      Sush as `message` is `log info  from {NAME}` and `content` is `array('NAME' =&gt; neeke)`,
-      the log information will `log info from neeke`.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>logger</parameter></term>
-    <listitem>
-     <simpara>
-      The `logger` cased by the third param would be used right this right now,
-      like a temp logger, when the function SeasLog::setLogger() called in pre content.
-      If `logger` NULL or "", SeasLog will use lastest logger setted by <methodname>SeasLog::setLogger</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return TRUE on record log information success, FALSE on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SeasLog::warning</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(SeasLog::warning('log message'));
-
-//with content
-var_dump(SeasLog::warning('log message from {NAME}',array('NAME' => 'neeke')));
-
-//with tmp logger
-var_dump(SeasLog::warning('log message from {NAME}',array('NAME' => 'neeke'),'tmp_logger'));
-
-var_dump(SeasLog::getBuffer());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-array(2) {
-  ["/var/log/www/default/20180707.log"]=>
-  array(2) {
-    [0]=>
-    string(81) "2018-07-07 11:45:49 | WARNING | 73263 | 5b40376d1067c | 1530935149.68 | log message
-"
-    [1]=>
-    string(92) "2018-07-07 11:45:49 | WARNING | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-  ["/var/log/www/tmp_logger/20180707.log"]=>
-  array(1) {
-    [0]=>
-    string(92) "2018-07-07 11:45:49 | WARNING | 73263 | 5b40376d1067c | 1530935149.68 | log message from neeke
-"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="ini.seaslog.default-template">seaslog.default_template</link></member>
-   <member><methodname>SeasLog::debug</methodname></member>
-   <member><methodname>SeasLog::info</methodname></member>
-   <member><methodname>SeasLog::notice</methodname></member>
-   <member><methodname>SeasLog::error</methodname></member>
-   <member><methodname>SeasLog::critical</methodname></member>
-   <member><methodname>SeasLog::alert</methodname></member>
-   <member><methodname>SeasLog::emergency</methodname></member>
-   <member><methodname>SeasLog::log</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/seaslog/setup.xml b/reference/seaslog/setup.xml
deleted file mode 100644
index 7f7a5cad2e13..000000000000
--- a/reference/seaslog/setup.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="seaslog.setup">
- &reftitle.setup;
-
- <section xml:id="seaslog.requirements">
-  &reftitle.required;
-  <simpara>
-
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- &reference.seaslog.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.seaslog.ini;
- <!-- }}} -->
-
- <section xml:id="seaslog.resources">
-  &reftitle.resources;
-  <simpara>
-
-  </simpara>
- </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/seaslog/versions.xml b/reference/seaslog/versions.xml
deleted file mode 100644
index 874dc5f96e57..000000000000
--- a/reference/seaslog/versions.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='seaslog_get_version' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog_get_author' from='PECL seaslog &gt;=1.0.0'/>
-
- <!-- Classes and Methods -->
- <function name='seaslog' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::__construct' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::__destruct' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::setbasepath' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::getbasepath' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::setlogger' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::closeloggerstream' from='PECL seaslog &gt;=1.8.6'/>
- <function name='seaslog::getlastlogger' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::setrequestid' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::getrequestid' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::setdatetimeformat' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::getdatetimeformat' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::setrequestvariable' from='PECL seaslog &gt;=1.9.0'/>
- <function name='seaslog::getrequestvariable' from='PECL seaslog &gt;=1.9.0'/>
- <function name='seaslog::analyzercount' from='PECL seaslog &gt;=1.1.6'/>
- <function name='seaslog::analyzerdetail' from='PECL seaslog &gt;=1.1.6'/>
- <function name='seaslog::getbuffer' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::getbufferenabled' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::flushbuffer' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::log' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::debug' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::info' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::notice' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::warning' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::error' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::critical' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::alert' from='PECL seaslog &gt;=1.0.0'/>
- <function name='seaslog::emergency' from='PECL seaslog &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/session/ini.xml b/reference/session/ini.xml
index bfbc3f691029..16da18dd6b7b 100644
--- a/reference/session/ini.xml
+++ b/reference/session/ini.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook">
+<section xml:id="session.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
  &reftitle.runtime;
  &extension.runtime;
  <para>
@@ -384,7 +384,7 @@
      internal formats (name <literal>php</literal> and
      <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
+     compiled with <link xlink:href="../extensions/ref.wddx.php">WDDX
      support</link>. <literal>php_serialize</literal> uses plain
      serialize/unserialize function internally and does not have
      limitations that <literal>php</literal>
diff --git a/reference/simdjson/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/simdjson/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/simdjson/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/simdjson/book.xml b/reference/simdjson/book.xml
deleted file mode 100644
index 2c0025954886..000000000000
--- a/reference/simdjson/book.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.simdjson">
- <?phpdoc extension-membership="pecl" ?>
- <title>Simdjson</title>
- <titleabbrev>Simdjson</titleabbrev>
-
- <preface xml:id="intro.simdjson">
-  &reftitle.intro;
-  <simpara>
-   Provides faster JSON decoding through simdjson bindings for PHP (Single Instruction, Multiple Data)
-  </simpara>
- </preface>
-
- &reference.simdjson.setup;
- &reference.simdjson.constants;
- &reference.simdjson.reference;
-
- &reference.simdjson.simdjsonexception;
- &reference.simdjson.simdjsonvalueerror;
-</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/simdjson/constants.xml b/reference/simdjson/constants.xml
deleted file mode 100644
index 3c85d56de586..000000000000
--- a/reference/simdjson/constants.xml
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="simdjson.constants">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.simdjson-err-capacity">
-   <term>
-    <constant>SIMDJSON_ERR_CAPACITY</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     This parser can't support a document that big.
-     Thrown when parsing a JSON string that is over 4GiB long.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-tape-error">
-   <term>
-    <constant>SIMDJSON_ERR_TAPE_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     The JSON document has an improper structure: missing or superfluous commas, braces, missing keys, etc.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-depth-error">
-   <term>
-    <constant>SIMDJSON_ERR_DEPTH_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     The JSON document was too deep (too many nested objects and arrays)
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-string-error">
-   <term>
-    <constant>SIMDJSON_ERR_STRING_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Problem while parsing a string
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-t-atom-error">
-   <term>
-    <constant>SIMDJSON_ERR_T_ATOM_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Problem while parsing an atom starting with the letter 't'
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-f-atom-error">
-   <term>
-    <constant>SIMDJSON_ERR_F_ATOM_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Problem while parsing an atom starting with the letter 'f'
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-n-atom-error">
-   <term>
-    <constant>SIMDJSON_ERR_N_ATOM_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Problem while parsing an atom starting with the letter 'n'
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-number-error">
-   <term>
-    <constant>SIMDJSON_ERR_NUMBER_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Problem while parsing a number
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-utf8-error">
-   <term>
-    <constant>SIMDJSON_ERR_UTF8_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     The input is not valid UTF-8
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-uninitialized">
-   <term>
-    <constant>SIMDJSON_ERR_UNINITIALIZED</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     The parser used by simdjson is uninitialized. Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-empty">
-   <term>
-    <constant>SIMDJSON_ERR_EMPTY</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Empty: no JSON found
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-unescaped-chars">
-   <term>
-    <constant>SIMDJSON_ERR_UNESCAPED_CHARS</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Within strings, some characters must be escaped, we found unescaped characters
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-unclosed-string">
-   <term>
-    <constant>SIMDJSON_ERR_UNCLOSED_STRING</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     A string is opened, but never closed.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-unsupported-architecture">
-   <term>
-    <constant>SIMDJSON_ERR_UNSUPPORTED_ARCHITECTURE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     simdjson does not have an implementation supported by this CPU architecture (perhaps it's a non-SIMD CPU?).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-incorrect-type">
-   <term>
-    <constant>SIMDJSON_ERR_INCORRECT_TYPE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-number-out-of-range">
-   <term>
-    <constant>SIMDJSON_ERR_NUMBER_OUT_OF_RANGE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     The JSON number is too large or too small to fit within the requested type.
-     Note that the C simdjson library is a fork and this error is ignored to match php's
-     handling of JSON numbers that are too large or too small.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-index-out-of-bounds">
-   <term>
-    <constant>SIMDJSON_ERR_INDEX_OUT_OF_BOUNDS</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-no-such-field">
-   <term>
-    <constant>SIMDJSON_ERR_NO_SUCH_FIELD</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-io-error">
-   <term>
-    <constant>SIMDJSON_ERR_IO_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-invalid-json-pointer">
-   <term>
-    <constant>SIMDJSON_ERR_INVALID_JSON_POINTER</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-     Invalid JSON pointer syntax in <function>simdjson_key_value</function>
-     and other functions accepting a JSON pointer <varname>$key</varname>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-invalid-uri-fragment">
-   <term>
-    <constant>SIMDJSON_ERR_INVALID_URI_FRAGMENT</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Invalid URI fragment syntax.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-unexpected-error">
-   <term>
-    <constant>SIMDJSON_ERR_UNEXPECTED_ERROR</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Unexpected error, consider reporting this problem as you may have found a bug in the simdjson PECL
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-parser-in-use">
-   <term>
-    <constant>SIMDJSON_ERR_PARSER_IN_USE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-out-of-order-iteration">
-   <term>
-    <constant>SIMDJSON_ERR_OUT_OF_ORDER_ITERATION</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-insufficient-padding">
-   <term>
-    <constant>SIMDJSON_ERR_INSUFFICIENT_PADDING</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-incomplete-array-or-object">
-   <term>
-    <constant>SIMDJSON_ERR_INCOMPLETE_ARRAY_OR_OBJECT</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>JSON document ended early in the middle of an object or array.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-scalar-document-as-value">
-   <term>
-    <constant>SIMDJSON_ERR_SCALAR_DOCUMENT_AS_VALUE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Should not happen.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-out-of-bounds">
-   <term>
-    <constant>SIMDJSON_ERR_OUT_OF_BOUNDS</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Attempted to access location outside of document.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-trailing-content">
-   <term>
-    <constant>SIMDJSON_ERR_TRAILING_CONTENT</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-key-count-not-countable">
-   <term>
-    <constant>SIMDJSON_ERR_KEY_COUNT_NOT_COUNTABLE</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.simdjson-err-invalid-property">
-   <term>
-    <constant>SIMDJSON_ERR_INVALID_PROPERTY</constant>
-    (&integer;)
-   </term>
-   <listitem>
-    <simpara>Invalid property name for an <classname>stdClass</classname> when decoding a value
-    with <function>simdjson_decode</function> or <function>simdjson_key_value</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/simdjson/functions/simdjson-decode.xml b/reference/simdjson/functions/simdjson-decode.xml
deleted file mode 100644
index 4c232a53a223..000000000000
--- a/reference/simdjson/functions/simdjson-decode.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.simdjson-decode">
- <refnamediv>
-  <refname>simdjson_decode</refname>
-  <refpurpose>Decodes a JSON string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>simdjson_decode</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>associative</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>depth</parameter><initializer>512</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Takes a JSON encoded string and converts it into a PHP value.
-   This uses a faster Simultaneous Instruction, Multiple Data implementation
-   than <function>json_decode</function> when it is supported by the computer architecture.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>json</parameter> <type>string</type> being decoded.
-     </simpara>
-     <simpara>
-      This function only works with UTF-8 encoded strings.
-     </simpara>
-     <simpara>
-      This function parses valid inputs which
-      <function>json_decode</function> can decode,
-      provided that they are less than 4 GiB long.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>associative</parameter></term>
-    <listitem>
-     <simpara>
-      When &true;, JSON objects will be returned as
-      associative &array;s; when &false;, JSON objects will be returned as &object;s.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum nesting depth of the structure being decoded.
-      The value must be greater than <literal>0</literal>,
-      and less than or equal to <literal>2147483647</literal>.
-
-      Callers should use reasonably small values,
-      because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value encoded in <parameter>json</parameter> in appropriate
-   PHP type. Values <literal>true</literal>, <literal>false</literal> and
-   <literal>null</literal> are returned as &true;, &false; and &null;
-   respectively.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If <parameter>json</parameter> is invalid, a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
-  </simpara>
-  <simpara>
-   If <parameter>depth</parameter> is outside the allowed range,
-   a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>simdjson_decode</function> examples</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$json = '{"a":1,"b":2,"c":3}';
-
-var_dump(simdjson_decode($json));
-var_dump(simdjson_decode($json, true));
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-object(stdClass)#1 (3) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-}
-array(3) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-}
-]]>
-    </screen>
-   </example>
-   <example>
-    <title>Accessing invalid object properties</title>
-    <simpara>
-     Accessing elements within an object that contain characters not
-     permitted under PHP's naming convention (e.g. the hyphen) can be
-     accomplished by encapsulating the element name within braces and the apostrophe.
-    </simpara>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$json = '{"foo-bar": 12345}';
-
-$obj = simdjson_decode($json);
-print $obj->{'foo-bar'}; // 12345
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>common mistakes using <function>simdjson_decode</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-// the following strings are valid JavaScript but not valid JSON
-
-// the name and value must be enclosed in double quotes
-// single quotes are not valid
-$bad_json = "{ 'bar': 'baz' }";
-simdjson_decode($bad_json); // Throws SimdJsonException
-
-// the name must be enclosed in double quotes
-$bad_json = '{ bar: "baz" }';
-simdjson_decode($bad_json); // Throws SimdJsonException
-
-// trailing commas are not allowed
-$bad_json = '{ bar: "baz", }';
-simdjson_decode($bad_json); // Throws SimdJsonException
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title><parameter>depth</parameter> errors</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Encode some data with a maximum depth of 4
-// (array -> array -> array -> string)
-$json = json_encode(
-    [
-        1 => [
-            'English' => [
-                'One',
-                'January'
-            ],
-            'French' => [
-                'Une',
-                'Janvier'
-            ]
-        ]
-    ]
-);
-
-// Show the errors for different depths.
-var_dump(simdjson_decode($json, true, 4));
-try {
-    var_dump(simdjson_decode($json, true, 3));
-} catch (SimdJsonException $e) {
-     echo "Caught: ", $e->getMessage(), "\n";
-}
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(1) {
-  [1]=>
-  array(2) {
-    ["English"]=>
-    array(2) {
-      [0]=>
-      string(3) "One"
-      [1]=>
-      string(7) "January"
-    }
-    ["French"]=>
-    array(2) {
-      [0]=>
-      string(3) "Une"
-      [1]=>
-      string(7) "Janvier"
-    }
-  }
-}
-Caught: The JSON document was too deep (too many nested objects and arrays)
-]]>
-    </screen>
-   </example>
-   <example>
-    <title><function>simdjson_decode</function> of large integers</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$json = '{"number": 12345678901234567890}';
-
-var_dump(simdjson_decode($json));
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-object(stdClass)#1 (1) {
-  ["number"]=>
-  float(1.2345678901235E+19)
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The JSON spec is not JavaScript, but a subset of JavaScript.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    In the event of a failure to decode,
-    a <classname>SimdJsonException</classname> is thrown
-    and <methodname>SimdJsonException::getCode</methodname> and
-    <methodname>SimdJsonException::getMessage</methodname> can be used
-    to determine the exact nature of the error.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</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/simdjson/functions/simdjson-is-valid.xml b/reference/simdjson/functions/simdjson-is-valid.xml
deleted file mode 100644
index e7eff39b35b2..000000000000
--- a/reference/simdjson/functions/simdjson-is-valid.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.simdjson-is-valid">
- <refnamediv>
-  <refname>simdjson_is_valid</refname>
-  <refpurpose>Check if a JSON string is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>simdjson_is_valid</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>depth</parameter><initializer>512</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Takes a JSON encoded string and returns true if it is valid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter></term>
-    <listitem>
-      <simpara>
-       The <parameter>json</parameter> <type>string</type> being validated.
-      </simpara>
-      <simpara>
-       This function only works with UTF-8 encoded strings.
-      </simpara>
-      <simpara>
-       This function validates inputs which
-       <function>json_decode</function> can decode,
-       provided that they are less than 4 GiB long.
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum nesting depth of the structure being validated.
-      The value must be greater than <literal>0</literal>,
-      and less than or equal to <literal>2147483647</literal>.
-
-      Callers should use reasonably small values,
-      because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if <parameter>json</parameter> is a valid JSON
-   string, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If <parameter>json</parameter> is longer than 4 GiB, a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
-  </simpara>
-  <simpara>
-   If <parameter>depth</parameter> is outside the allowed range,
-   a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>simdjson_decode</function> examples</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$json = '{"a":1,"b":2,"c":3}';
-$invalidJson = '{"a":1,"b":2,"c":';
-
-var_dump(simdjson_is_valid($json));
-var_dump(simdjson_is_valid($invalidJson));
-
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-    </screen>
-   </example>
-   <example>
-    <title><parameter>depth</parameter> errors</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-// Encode some data with a maximum depth of 4
-// (array -> array -> array -> string)
-$json = json_encode(
-    [
-        1 => [
-            'English' => [
-                'One',
-                'January'
-            ],
-            'French' => [
-                'Une',
-                'Janvier'
-            ]
-        ]
-    ]
-);
-
-// Show the errors for different depths.
-var_dump(simdjson_is_valid($json, 4));
-var_dump(simdjson_is_valid($json, 3));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The JSON spec is not JavaScript, but a subset of JavaScript.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    In the event of a failure to decode,
-    a <classname>SimdJsonException</classname> is thrown
-    and <methodname>SimdJsonException::getCode</methodname> and
-    <methodname>SimdJsonException::getMessage</methodname> can be used
-    to determine the exact nature of the error.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>json_encode</function></member>
-   <member><function>json_decode</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/simdjson/functions/simdjson-key-count.xml b/reference/simdjson/functions/simdjson-key-count.xml
deleted file mode 100644
index 997d77030031..000000000000
--- a/reference/simdjson/functions/simdjson-key-count.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.simdjson-key-count">
- <refnamediv>
-  <refname>simdjson_key_count</refname>
-  <refpurpose>Returns the value at a JSON pointer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>simdjson_key_count</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>depth</parameter><initializer>512</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>throw_if_uncountable</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Count the number of elements of the object/array found at the requested JSON pointer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>json</parameter> <type>string</type> being queried.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The JSON pointer <type>string</type>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum nesting depth of the structure being validated.
-      The value must be greater than <literal>0</literal>,
-      and less than or equal to <literal>2147483647</literal>.
-
-      Callers should use reasonably small values,
-      because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>throw_if_uncountable</parameter></term>
-    <listitem>
-     <simpara>
-      When true, a <classname>SimdJsonException</classname> will be thrown
-      instead of returning 0 when the value the JSON pointer points to
-      is neither an object nor an array.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an &integer; with the number of elements of the value at the given JSON pointer.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/simdjson/functions/simdjson-key-exists.xml b/reference/simdjson/functions/simdjson-key-exists.xml
deleted file mode 100644
index e46e1c227371..000000000000
--- a/reference/simdjson/functions/simdjson-key-exists.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.simdjson-key-exists">
- <refnamediv>
-  <refname>simdjson_key_exists</refname>
-  <refpurpose>Check if the JSON contains the value referred to by a JSON pointer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>simdjson_key_exists</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>depth</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Count the number of elements of the object/array found at the requested JSON pointer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>json</parameter> <type>string</type> being queried.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The JSON pointer <type>string</type>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum nesting depth of the structure being validated.
-      The value must be greater than <literal>0</literal>,
-      and less than or equal to <literal>2147483647</literal>.
-
-      Callers should use reasonably small values,
-      because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>throw_if_uncountable</parameter></term>
-    <listitem>
-     <simpara>
-      When true, a <classname>SimdJsonException</classname> will be thrown
-      instead of returning 0 when the value the JSON pointer points to
-      is neither an object nor an array.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the JSON pointer is valid and refers to a value found within a valid JSON string.
-   Returns &false; if the JSON is valid but does not contain the JSON pointer.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/simdjson/functions/simdjson-key-value.xml b/reference/simdjson/functions/simdjson-key-value.xml
deleted file mode 100644
index 7d736da450d0..000000000000
--- a/reference/simdjson/functions/simdjson-key-value.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.simdjson-key-value">
- <refnamediv>
-  <refname>simdjson_key_value</refname>
-  <refpurpose>Decodes the value of a JSON string located at the requested JSON pointer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>simdjson_key_value</methodname>
-   <methodparam><type>string</type><parameter>json</parameter></methodparam>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>associative</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>depth</parameter><initializer>512</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decodes and returns the value found at the requested JSON pointer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>json</parameter></term>
-    <listitem>
-     <simpara>
-      The <parameter>json</parameter> <type>string</type> being queried and decoded.
-     </simpara>
-      <simpara>
-       This function only works with UTF-8 encoded strings.
-      </simpara>
-      <simpara>
-       This function parses valid inputs which
-       <function>json_decode</function> can decode,
-       provided that they are less than 4 GiB long.
-      </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The JSON pointer <type>string</type>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>associative</parameter></term>
-    <listitem>
-     <simpara>
-      When &true;, JSON objects will be returned as
-      associative &array;s; when &false;, JSON objects will be returned as &object;s.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>depth</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum nesting depth of the structure being decoded.
-      The value must be greater than <literal>0</literal>,
-      and less than or equal to <literal>2147483647</literal>.
-
-      Callers should use reasonably small values,
-      because larger depths require more buffer space and will
-      increase the recursion depth, unlike the current <function>json_decode</function> implementation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the part of the value encoded in <parameter>json</parameter>
-   that <parameter>key</parameter> refers to in appropriate
-   PHP type. Values <literal>true</literal>, <literal>false</literal> and
-   <literal>null</literal> are returned as &true;, &false; and &null;
-   respectively.
-  </simpara>
- </refsect1>
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If <parameter>json</parameter> or <parameter>key</parameter> is invalid,
-   or <parameter>key</parameter> could not be found within <parameter>json</parameter>,
-   a <classname>SimdJsonException</classname> is thrown as of PECL simdjson 2.1.0,
-   while previously, a <classname>RuntimeException</classname> was thrown.
-  </simpara>
-  <simpara>
-   If <parameter>depth</parameter> is outside the allowed range,
-   a <classname>SimdJsonValueError</classname> is thrown as of PECL simdjson 3.0.0,
-   while previously, an error of level <constant>E_WARNING</constant> was raised.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>json_encode</function></member>
-   <member><function>simdjson_decode</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/simdjson/reference.xml b/reference/simdjson/reference.xml
deleted file mode 100644
index 65a6a5261552..000000000000
--- a/reference/simdjson/reference.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="ref.simdjson" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Simdjson &Functions;</title>
-
- &reference.simdjson.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/simdjson/setup.xml b/reference/simdjson/setup.xml
deleted file mode 100644
index ff85d8adffe9..000000000000
--- a/reference/simdjson/setup.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="simdjson.setup">
- &reftitle.setup;
-
- <section xml:id="simdjson.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;simdjson">&url.pecl.package;simdjson</link>.
-  </simpara>
-  <simpara>
-   &pecl.windows.download.avail;
-  </simpara>
- </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/simdjson/simdjsonexception.xml b/reference/simdjson/simdjsonexception.xml
deleted file mode 100644
index f182e85cff5c..000000000000
--- a/reference/simdjson/simdjsonexception.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.simdjsonexception" role="class">
- <title>The SimdJsonException class</title>
- <titleabbrev>SimdJsonException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SimdJsonException intro -->
-  <section xml:id="simdjsonexception.intro">
-   &reftitle.intro;
-   <simpara>
-    Exception thrown if <function>simdjson_decode</function>,
-    <function>simdjson_key_count</function>,
-    <function>simdjson_key_exists</function>,
-    or <function>simdjson_key_value</function>.
-
-    For possible values see the <link linkend="simdjson.constants">simdjson error codes</link> constants.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="simdjsonexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SimdJsonException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SimdJsonException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</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>
-</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/simdjson/simdjsonvalueerror.xml b/reference/simdjson/simdjsonvalueerror.xml
deleted file mode 100644
index 757e6696d4da..000000000000
--- a/reference/simdjson/simdjsonvalueerror.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.simdjsonvalueerror" role="class">
- <title>The SimdJsonValueError class</title>
- <titleabbrev>SimdJsonValueError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SimdJsonValueError intro -->
-  <section xml:id="simdjsonvalueerror.intro">
-   &reftitle.intro;
-   <simpara>
-    A <classname>SimdJsonValueError</classname> is thrown when the
-    type of an argument to a function from simdjson is correct but the value
-    of it is incorrect.
-    E.g. when the JSON decoding <varname>$depth</varname> is not positive or the <varname>$depth</varname> is too large.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="simdjsonvalueerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SimdJsonValueError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SimdJsonValueError</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ValueError</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('error.synopsis')/descendant::db:fieldsynopsis)"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section role="changelog">
-   &reftitle.changelog;
-   <informaltable>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>&Version;</entry>
-       <entry>&Description;</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>PHP 8.0.0</entry>
-       <entry>
-        <classname>SimdJsonValueError</classname> extends <classname>ValueError</classname>
-        now instead of <classname>Error</classname>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </section>
- </partintro>
-
-</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/simdjson/versions.xml b/reference/simdjson/versions.xml
deleted file mode 100644
index 99708937c54c..000000000000
--- a/reference/simdjson/versions.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='simdjson_is_valid' from='PECL simdjson &gt;= 2.0.0'/>
- <function name='simdjson_decode' from='PECL simdjson &gt;= 2.0.0'/>
- <function name='simdjson_key_value' from='PECL simdjson &gt;= 2.0.0'/>
- <function name='simdjson_key_exists' from='PECL simdjson &gt;= 2.0.0'/>
- <function name='simdjson_key_count' from='PECL simdjson &gt;= 2.0.0'/>
-
- <!-- Classes and Methods -->
- <function name='simdjsonexception' from='PECL simdjson &gt;= 2.1.0'/>
- <function name='simdjsonvalueerror' from='PECL simdjson &gt;= 3.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/solr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/solr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/solr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/solr/book.xml b/reference/solr/book.xml
deleted file mode 100644
index 27ff135b18e0..000000000000
--- a/reference/solr/book.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.solr">
-  &reftitle.intro;
-  <para>
-   The Solr extension allows you to communicate effectively with the Apache Solr Server in PHP.
-  </para>
-  
-  <para>The Solr extension is an extremely fast, light-weight, feature-rich library that allows PHP developers to communicate effectively with Solr server instances.</para>
-  <para>Versions 1.x of The PECL Extension supports Apache Solr Server 1.3-3.x</para>
-  <para>Versions 2.x of The PECL Extension supports Apache Solr Server 4.0+ </para>
-  <para>There are built-in tools to add documents and make updates to the solr server.</para>
-  <para>It also contains tools that allows you to build advanced queries to the server when searching for documents.</para>
- </preface>
-
- &reference.solr.setup;
- &reference.solr.constants;
- &reference.solr.reference;
- 
- &reference.solr.examples;
- 
- &reference.solr.solrutils;
- 
- &reference.solr.solrinputdocument;
- &reference.solr.solrdocument;
- &reference.solr.solrdocumentfield;
- 
- &reference.solr.solrobject;
- 
- &reference.solr.solrclient;
- 
- &reference.solr.solrresponse;
- &reference.solr.solrqueryresponse;
- &reference.solr.solrupdateresponse;
- &reference.solr.solrpingresponse;
- &reference.solr.solrgenericresponse;
- 
- &reference.solr.solrparams;
- &reference.solr.solrmodifiableparams;
- &reference.solr.solrquery;
- &reference.solr.solrdismaxquery;
- &reference.solr.solrcollapsefunction;
-  
- &reference.solr.solrexception;
- &reference.solr.solrclientexception;
- &reference.solr.solrserverexception;
- &reference.solr.solrillegalargumentexception;
- &reference.solr.solrillegaloperationexception;
- &reference.solr.solrmissingmandatoryparameterexception;
- 
- 
-</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/solr/constants.xml b/reference/solr/constants.xml
deleted file mode 100644
index 3892dba5ffef..000000000000
--- a/reference/solr/constants.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="solr.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.solr-major-version">
-    <term>
-     <constant>SOLR_MAJOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.solr-minor-version">
-    <term>
-     <constant>SOLR_MINOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.solr-patch-version">
-    <term>
-     <constant>SOLR_PATCH_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.solr-extension-version">
-    <term>
-     <constant>SOLR_EXTENSION_VERSION</constant>
-     (<type>string</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/solr/examples.xml b/reference/solr/examples.xml
deleted file mode 100644
index 364e1641c513..000000000000
--- a/reference/solr/examples.xml
+++ /dev/null
@@ -1,1280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="solr.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- 
-    <para>
-        Examples of how to use the Apache Solr extension in PHP
-    </para>
-    <example>
-        <title>Contents of the BootStrap file</title>
-        <programlisting role="php">
-<![CDATA[
-
-<?php
-
-/* Domain name of the Solr server */
-define('SOLR_SERVER_HOSTNAME', 'solr.example.com');
-
-/* Whether or not to run in secure mode */
-define('SOLR_SECURE', true);
-
-/* HTTP Port to connection */
-define('SOLR_SERVER_PORT', ((SOLR_SECURE) ? 8443 : 8983));
-
-/* HTTP Basic Authentication Username */
-define('SOLR_SERVER_USERNAME', 'admin');
-
-/* HTTP Basic Authentication password */
-define('SOLR_SERVER_PASSWORD', 'changeit');
-
-/* HTTP connection timeout */
-/* This is maximum time in seconds allowed for the http data transfer operation. Default value is 30 seconds */
-define('SOLR_SERVER_TIMEOUT', 10);
-
-/* File name to a PEM-formatted private key + private certificate (concatenated in that order) */
-define('SOLR_SSL_CERT', 'certs/combo.pem');
-
-/* File name to a PEM-formatted private certificate only */
-define('SOLR_SSL_CERT_ONLY', 'certs/solr.crt');
-
-/* File name to a PEM-formatted private key */
-define('SOLR_SSL_KEY', 'certs/solr.key');
-
-/* Password for PEM-formatted private key file */
-define('SOLR_SSL_KEYPASSWORD', 'StrongAndSecurePassword');
-
-/* Name of file holding one or more CA certificates to verify peer with*/
-define('SOLR_SSL_CAINFO', 'certs/cacert.crt');
-
-/* Name of directory holding multiple CA certificates to verify peer with */
-define('SOLR_SSL_CAPATH', 'certs/');
-
-?>
-
-]]>
-        </programlisting>
-
-    </example>
-
- <example>
-  <title>Adding a document to the index</title>
-  <programlisting role="php">
-<![CDATA[
-
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$doc = new SolrInputDocument();
-
-$doc->addField('id', 334455);
-$doc->addField('cat', 'Software');
-$doc->addField('cat', 'Lucene');
-
-$updateResponse = $client->addDocument($doc);
-
-print_r($updateResponse->getResponse());
-
-?>
-
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 446
-        )
-
-)
-]]>
-  </screen>
- </example>
- 
- <example>
-  <title>Merging one document into another document</title>
-  <programlisting role="php">
-   <![CDATA[
-
-<?php
-
-include "bootstrap.php";
-
-$doc = new SolrDocument();
-
-$second_doc = new SolrDocument();
-
-$doc->addField('id', 1123);
-
-$doc->features = "PHP Client Side";
-$doc->features = "Fast development cycles";
-
-$doc['cat'] = 'Software';
-$doc['cat'] = 'Custom Search';
-$doc->cat   = 'Information Technology';
-
-$second_doc->addField('cat', 'Lucene Search');
-
-$second_doc->merge($doc, true);
-
-print_r($second_doc->toArray());
-
-
-?>
-
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-   <![CDATA[
-Array
-(
-    [document_boost] => 0
-    [field_count] => 3
-    [fields] => Array
-        (
-            [0] => SolrDocumentField Object
-                (
-                    [name] => cat
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => Software
-                            [1] => Custom Search
-                            [2] => Information Technology
-                        )
-
-                )
-
-            [1] => SolrDocumentField Object
-                (
-                    [name] => id
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => 1123
-                        )
-
-                )
-
-            [2] => SolrDocumentField Object
-                (
-                    [name] => features
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => PHP Client Side
-                            [1] => Fast development cycles
-                        )
-
-                )
-
-        )
-
-)
-]]>
-  </screen>
- </example>
- 
- 
- <example>
-  <title>Searching for documents - SolrObject responses</title>
-  <programlisting role="php">
-<![CDATA[
-
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setQuery('lucene');
-
-$query->setStart(0);
-
-$query->setRows(50);
-
-$query->addField('cat')->addField('features')->addField('id')->addField('timestamp');
-
-$query_response = $client->query($query);
-
-$response = $query_response->getResponse();
-
-print_r($response);
-
-?>
-
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-            [params] => SolrObject Object
-                (
-                    [wt] => xml
-                    [rows] => 50
-                    [start] => 0
-                    [indent] => on
-                    [q] => lucene
-                    [fl] => cat,features,id,timestamp
-                    [version] => 2.2
-                )
-
-        )
-
-    [response] => SolrObject Object
-        (
-            [numFound] => 3
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrObject Object
-                        (
-                            [cat] => Array
-                                (
-                                    [0] => Software
-                                    [1] => Lucene
-                                )
-
-                            [id] => 334456
-                        )
-
-                    [1] => SolrObject Object
-                        (
-                            [cat] => Array
-                                (
-                                    [0] => Software
-                                    [1] => Lucene
-                                )
-
-                            [id] => 334455
-                        )
-
-                    [2] => SolrObject Object
-                        (
-                            [cat] => Array
-                                (
-                                    [0] => software
-                                    [1] => search
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => Advanced Full-Text Search Capabilities using Lucene
-                                    [1] => Optimized for High Volume Web Traffic
-                                    [2] => Standards Based Open Interfaces - XML and HTTP
-                                    [3] => Comprehensive HTML Administration Interfaces
-                                    [4] => Scalability - Efficient Replication to other Solr Search Servers
-                                    [5] => Flexible and Adaptable with XML configuration and Schema
-                                    [6] => Good unicode support: héllo (hello with an accent over the e)
-                                )
-
-                            [id] => SOLR1000
-                            [timestamp] => 2009-09-04T20:38:55.906
-                        )
-
-                )
-
-        )
-
-)
-]]>
-  </screen>
- </example>
- 
- <example>
-  <title>Searching for documents - SolrDocument responses</title>
-  <programlisting role="php">
-<![CDATA[
-
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setQuery('lucene');
-
-$query->setStart(0);
-
-$query->setRows(50);
-
-$query->addField('cat')->addField('features')->addField('id')->addField('timestamp');
-
-$query_response = $client->query($query);
-
-$query_response->setParseMode(SolrQueryResponse::PARSE_SOLR_DOC);
-
-$response = $query_response->getResponse();
-
-print_r($response);
-
-?>
-
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-   <![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-            [params] => SolrObject Object
-                (
-                    [wt] => xml
-                    [rows] => 50
-                    [start] => 0
-                    [indent] => on
-                    [q] => lucene
-                    [fl] => cat,features,id,timestamp
-                    [version] => 2.2
-                )
-
-        )
-
-    [response] => SolrObject Object
-        (
-            [numFound] => 3
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrDocument Object
-                        (
-                            [_hashtable_index:SolrDocument:private] => 19740
-                        )
-
-                    [1] => SolrDocument Object
-                        (
-                            [_hashtable_index:SolrDocument:private] => 25485
-                        )
-
-                    [2] => SolrDocument Object
-                        (
-                            [_hashtable_index:SolrDocument:private] => 25052
-                        )
-
-                )
-
-        )
-
-)
-]]>
-  </screen>
- </example>
-    
- <example>
-        <title>Simple TermsComponent example - basic</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setTerms(true);
-
-$query->setTermsField('cat');
-
-$updateResponse = $client->query($query);
-
-print_r($updateResponse->getResponse());
-
-?>
-]]>
-        </programlisting>
-        &example.outputs.similar;
-        <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 2
-        )
-
-    [terms] => SolrObject Object
-        (
-            [cat] => SolrObject Object
-                (
-                    [electronics] => 14
-                    [Lucene] => 4
-                    [Software] => 4
-                    [memory] => 3
-                    [card] => 2
-                    [connector] => 2
-                    [drive] => 2
-                    [graphics] => 2
-                    [hard] => 2
-                    [monitor] => 2
-                )
-
-        )
-
-)
-
-]]>
-        </screen>
- </example>
-    
-<example>
-    <title>Simple TermsComponent example - using a prefix</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setTerms(true);
-
-/* Return only terms starting with $prefix */
-$prefix = 'c';
-
-$query->setTermsField('cat')->setTermsPrefix($prefix);
-
-$updateResponse = $client->query($query);
-
-print_r($updateResponse->getResponse());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-        )
-
-    [terms] => SolrObject Object
-        (
-            [cat] => SolrObject Object
-                (
-                    [card] => 2
-                    [connector] => 2
-                    [camera] => 1
-                    [copier] => 1
-                )
-
-        )
-
-)
-]]>
-    </screen>
-</example>
-    
-<example>
-    <title>Simple TermsComponent example - specifying a minimum frequency</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setTerms(true);
-
-/* Return only terms starting with $prefix */
-$prefix = 'c';
-
-/* Return only terms with a frequency of 2 or greater */
-$min_frequency = 2;
-
-$query->setTermsField('cat')->setTermsPrefix($prefix)->setTermsMinCount($min_frequency);
-
-$updateResponse = $client->query($query);
-
-print_r($updateResponse->getResponse());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 0
-        )
-
-    [terms] => SolrObject Object
-        (
-            [cat] => SolrObject Object
-                (
-                    [card] => 2
-                    [connector] => 2
-                )
-
-        )
-
-)
-]]>
-    </screen>
-</example>
-    
-<example>
-<title>Simple Facet Example</title>
-<programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$query->setFacet(true);
-
-$query->addFacetField('cat')->addFacetField('name')->setFacetMinCount(2);
-
-$updateResponse = $client->query($query);
-
-$response_array = $updateResponse->getResponse();
-
-$facet_data = $response_array->facet_counts->facet_fields;
-
-print_r($facet_data);
-
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
-<![CDATA[
-SolrObject Object
-(
-    [cat] => SolrObject Object
-        (
-            [electronics] => 14
-            [memory] => 3
-            [Lucene] => 2
-            [Software] => 2
-            [card] => 2
-            [connector] => 2
-            [drive] => 2
-            [graphics] => 2
-            [hard] => 2
-            [monitor] => 2
-            [search] => 2
-            [software] => 2
-        )
-
-    [name] => SolrObject Object
-        (
-            [gb] => 6
-            [1] => 3
-            [184] => 3
-            [2] => 3
-            [3200] => 3
-            [400] => 3
-            [500] => 3
-            [ddr] => 3
-            [i] => 3
-            [ipod] => 3
-            [memori] => 3
-            [pc] => 3
-            [pin] => 3
-            [pod] => 3
-            [sdram] => 3
-            [system] => 3
-            [unbuff] => 3
-            [canon] => 2
-            [corsair] => 2
-            [drive] => 2
-            [hard] => 2
-            [mb] => 2
-            [n] => 2
-            [power] => 2
-            [retail] => 2
-            [video] => 2
-            [x] => 2
-        )
-
-)
-]]>
-</screen>
-</example>
-    
-<example>
-    <title>Simple Facet Example - with optional field override for mincount</title>
-    <programlisting role="php">
-        <![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$query->setFacet(true);
-
-$query->addFacetField('cat')->addFacetField('name')->setFacetMinCount(2)->setFacetMinCount(4, 'name');
-
-$updateResponse = $client->query($query);
-
-$response_array = $updateResponse->getResponse();
-
-$facet_data = $response_array->facet_counts->facet_fields;
-
-print_r($facet_data);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-        <![CDATA[
-SolrObject Object
-(
-    [cat] => SolrObject Object
-        (
-            [electronics] => 14
-            [memory] => 3
-            [Lucene] => 2
-            [Software] => 2
-            [card] => 2
-            [connector] => 2
-            [drive] => 2
-            [graphics] => 2
-            [hard] => 2
-            [monitor] => 2
-            [search] => 2
-            [software] => 2
-        )
-
-    [name] => SolrObject Object
-        (
-            [gb] => 6
-        )
-
-)
-]]>
-    </screen>
-</example>
-
-<example>
-<title>Facet Date Example</title>
-<programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-        'hostname' => SOLR_SERVER_HOSTNAME,
-        'login'    => SOLR_SERVER_USERNAME,
-        'password' => SOLR_SERVER_PASSWORD,
-        'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$query->setFacet(true);
-
-$query->addFacetDateField('manufacturedate_dt');
-
-$query->setFacetDateStart('2006-02-13T00:00:00Z');
-
-$query->setFacetDateEnd('2012-02-13T00:00:00Z');
-
-$query->setFacetDateGap('+1YEAR');
-
-$query->setFacetDateHardEnd(1);
-
-$query->addFacetDateOther('before');
-
-$updateResponse = $client->query($query);
-
-$response_array = $updateResponse->getResponse();
-
-$facet_data = $response_array->facet_counts->facet_dates;
-
-print_r($facet_data);
-
-?>
-]]>
-</programlisting>
-&example.outputs.similar;
-<screen>
-<![CDATA[
-SolrObject Object
-(
-    [manufacturedate_dt] => SolrObject Object
-        (
-            [2006-02-13T00:00:00Z] => 9
-            [2007-02-13T00:00:00Z] => 0
-            [2008-02-13T00:00:00Z] => 0
-            [2009-02-13T00:00:00Z] => 0
-            [2010-02-13T00:00:00Z] => 0
-            [2011-02-13T00:00:00Z] => 0
-            [gap] => +1YEAR
-            [start] => 2006-02-13T00:00:00Z
-            [end] => 2012-02-13T00:00:00Z
-            [before] => 2
-        )
-
-)
-]]>
-</screen>
-</example>
-
-<example>
-        <title>Connecting to SSL-Enabled Server</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'timeout'  => SOLR_SERVER_TIMEOUT,
-    'secure'   => SOLR_SECURE,
-    'ssl_cert' => SOLR_SSL_CERT_ONLY,
-    'ssl_key'  => SOLR_SSL_KEY,
-    'ssl_keypassword' => SOLR_SSL_KEYPASSWORD,
-    'ssl_cainfo' => SOLR_SSL_CAINFO,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$query->setFacet(true);
-
-$query->addFacetField('cat')->addFacetField('name')->setFacetMinCount(2)->setFacetMinCount(4, 'name');
-
-$updateResponse = $client->query($query);
-
-$response_array = $updateResponse->getResponse();
-
-$facet_data = $response_array->facet_counts->facet_fields;
-
-print_r($facet_data);
-
-?>
-]]>
-        </programlisting>
-        &example.outputs.similar;
-        <screen>
-            <![CDATA[
-SolrObject Object
-(
-    [cat] => SolrObject Object
-        (
-            [electronics] => 14
-            [memory] => 3
-            [Lucene] => 2
-            [Software] => 2
-            [card] => 2
-            [connector] => 2
-            [drive] => 2
-            [graphics] => 2
-            [hard] => 2
-            [monitor] => 2
-            [search] => 2
-            [software] => 2
-        )
-
-    [name] => SolrObject Object
-        (
-            [gb] => 6
-        )
-
-)
-]]>
-        </screen>
-    </example>
-    
-
-    <example>
-        <title>Collapsing a <type>SolrQuery</type></title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-include "bootstrap.php";
-
-$options = array
-(
-        'hostname' => SOLR_SERVER_HOSTNAME,
-        'login'    => SOLR_SERVER_USERNAME,
-        'password' => SOLR_SERVER_PASSWORD,
-        'port'     => SOLR_SERVER_PORT,
-        'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$collapseFunction = new SolrCollapseFunction('manu_id_s');
-
-$collapseFunction
-->setSize(2)
-->setNullPolicy(SolrCollapseFunction::NULLPOLICY_IGNORE);
-
-$query
-->collapse($collapseFunction)
-->setRows(4);
-
-$queryResponse = $client->query($query);
-
-$response = $queryResponse->getResponse();
-
-print_r($response);
-?>
-]]>
-        </programlisting>
-        &example.outputs.similar;
-        <screen>
-            <![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-            [params] => SolrObject Object
-                (
-                    [q] => *:*
-                    [indent] => on
-                    [fq] => {!collapse field=manu_id_s size=2 nullPolicy=ignore}
-                    [rows] => 4
-                    [version] => 2.2
-                    [wt] => xml
-                )
-
-        )
-
-    [response] => SolrObject Object
-        (
-            [numFound] => 14
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrObject Object
-                        (
-                            [id] => SP2514N
-                            [name] => Array
-                                (
-                                    [0] => Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Samsung Electronics Co. Ltd.
-                                )
-
-                            [manu_id_s] => samsung
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => hard drive
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => 7200RPM, 8MB cache, IDE Ultra ATA-133
-                                    [1] => NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 92
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 6
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [manufacturedate_dt] => 2006-02-13T15:26:37Z
-                            [store] => Array
-                                (
-                                    [0] => 35.0752,-97.032
-                                )
-
-                            [_version_] => 1510294336412057600
-                        )
-
-                    [1] => SolrObject Object
-                        (
-                            [id] => 6H500F0
-                            [name] => Array
-                                (
-                                    [0] => Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Maxtor Corp.
-                                )
-
-                            [manu_id_s] => maxtor
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => hard drive
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => SATA 3.0Gb/s, NCQ
-                                    [1] => 8.5ms seek
-                                    [2] => 16MB cache
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 350
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 6
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 45.17614,-93.87341
-                                )
-
-                            [manufacturedate_dt] => 2006-02-13T15:26:37Z
-                            [_version_] => 1510294336449806336
-                        )
-
-                    [2] => SolrObject Object
-                        (
-                            [id] => F8V7067-APL-KIT
-                            [name] => Array
-                                (
-                                    [0] => Belkin Mobile Power Cord for iPod w/ Dock
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Belkin
-                                )
-
-                            [manu_id_s] => belkin
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => connector
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => car power adapter, white
-                                )
-
-                            [weight] => Array
-                                (
-                                    [0] => 4
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 19.95
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 45.18014,-93.87741
-                                )
-
-                            [manufacturedate_dt] => 2005-08-01T16:30:25Z
-                            [_version_] => 1510294336458194944
-                        )
-
-                    [3] => SolrObject Object
-                        (
-                            [id] => MA147LL/A
-                            [name] => Array
-                                (
-                                    [0] => Apple 60 GB iPod with Video Playback Black
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Apple Computer Inc.
-                                )
-
-                            [manu_id_s] => apple
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => music
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => iTunes, Podcasts, Audiobooks
-                                    [1] => Stores up to 15,000 songs, 25,000 photos, or 150 hours of video
-                                    [2] => 2.5-inch, 320x240 color TFT LCD display with LED backlight
-                                    [3] => Up to 20 hours of battery life
-                                    [4] => Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video
-                                    [5] => Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication
-                                )
-
-                            [includes] => Array
-                                (
-                                    [0] => earbud headphones, USB cable
-                                )
-
-                            [weight] => Array
-                                (
-                                    [0] => 5.5
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 399
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 10
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 37.7752,-100.0232
-                                )
-
-                            [manufacturedate_dt] => 2005-10-12T08:00:00Z
-                            [_version_] => 1510294336562003968
-                        )
-
-                )
-
-        )
-
-)
-]]>
-        </screen>
-    </example>
-    
-      <example>
-   <title>Solr Real Time Get (RTG) example <function>SolrClient::getById</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-$response = $client->getById('GB18030TEST');
-print_r($response->getResponse());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-SolrObject Object
-(
-    [doc] => SolrObject Object
-        (
-            [id] => GB18030TEST
-            [name] => Array
-                (
-                    [0] => Test with some GB18030 encoded characters
-                )
-
-            [features] => Array
-                (
-                    [0] => No accents here
-                    [1] => 这是一个功能
-                    [2] => This is a feature (translated)
-                    [3] => 这份文件是很有光泽
-                    [4] => This document is very shiny (translated)
-                )
-
-            [price] => Array
-                (
-                    [0] => 0
-                )
-
-            [inStock] => Array
-                (
-                    [0] => 1
-                )
-
-            [_version_] => 1510294336239042560
-        )
-
-)
-]]>
-   </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/solr/functions/solr-get-version.xml b/reference/solr/functions/solr-get-version.xml
deleted file mode 100644
index abc02eaa4598..000000000000
--- a/reference/solr/functions/solr-get-version.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.solr-get-version" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>solr_get_version</refname>
-  <refpurpose>Returns the current version of the Apache Solr extension</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>solr_get_version</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   This function returns the current version of the extension as a string.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <!-- See also &return.success; -->
-  <para>
-   It returns a string on success and &false; on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This function throws no errors or exceptions.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>solr_get_version</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$solr_version = solr_get_version();
-
-print $solr_version;
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-0.9.6
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>SolrUtils::getSolrVersion</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/solr/reference.xml b/reference/solr/reference.xml
deleted file mode 100644
index b3ccec9481f1..000000000000
--- a/reference/solr/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.solr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Solr &Functions;</title>
-
- &reference.solr.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/solr/setup.xml b/reference/solr/setup.xml
deleted file mode 100644
index a4fc6854e101..000000000000
--- a/reference/solr/setup.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="solr.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="solr.requirements">
-  &reftitle.required;
-  <!-- Use &no.requirement; if there no requirement -->
-  <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>
-  <para>
-   The above library versions are required and attempting to
-   hack the code to make it compile is strongly discouraged.
-   It will fail, possibly with errors that could be hard to debug.
-  </para>
- </section>
-
- <!-- {{{ Installation -->
- <section xml:id="solr.installation">
-  &reftitle.install;
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;solr">&url.pecl.package;solr</link>.
-  </para>
-  <para>
-   For help and support, please visit the extension Google group
-   <link xlink:href="&url.solr.support;">Apache Solr PHP Extension</link>.
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </para>
-  <note>
-   <para>
-    The solr module can be compiled in debug mode by passing the <option>--enable-solr-debug</option> flag to configure.
-   </para>
-   <para>
-    When building manually, be sure to include curl and libxml support within the build.
-   </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/solr/solrclient.xml b/reference/solr/solrclient.xml
deleted file mode 100644
index 867f26cbc6e1..000000000000
--- a/reference/solr/solrclient.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrclient" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrClient class</title>
- <titleabbrev>SolrClient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrClient intro -->
-  <section xml:id="solrclient.intro">
-   &reftitle.intro;
-   <para>
-    Used to send requests to a Solr server. Currently, cloning and serialization of SolrClient instances is not supported.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrclient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrClient</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrClient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.search-servlet-type">SolrClient::SEARCH_SERVLET_TYPE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.update-servlet-type">SolrClient::UPDATE_SERVLET_TYPE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.threads-servlet-type">SolrClient::THREADS_SERVLET_TYPE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.ping-servlet-type">SolrClient::PING_SERVLET_TYPE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.terms-servlet-type">SolrClient::TERMS_SERVLET_TYPE</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrclient.constants.system-servlet-type">SolrClient::SYSTEM_SERVLET_TYPE</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-search-servlet">SolrClient::DEFAULT_SEARCH_SERVLET</varname>
-     <initializer>select</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-update-servlet">SolrClient::DEFAULT_UPDATE_SERVLET</varname>
-     <initializer>update</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-threads-servlet">SolrClient::DEFAULT_THREADS_SERVLET</varname>
-     <initializer>admin/threads</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-ping-servlet">SolrClient::DEFAULT_PING_SERVLET</varname>
-     <initializer>admin/ping</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-terms-servlet">SolrClient::DEFAULT_TERMS_SERVLET</varname>
-     <initializer>terms</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrclient.constants.default-system-servlet">SolrClient::DEFAULT_SYSTEM_SERVLET</varname>
-     <initializer>admin/system</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclient')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ SolrClient constants -->
-  <section xml:id="solrclient.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="solrclient.constants.search-servlet-type">
-     <term><constant>SolrClient::SEARCH_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when updating the search servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.update-servlet-type">
-     <term><constant>SolrClient::UPDATE_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when updating the update servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.threads-servlet-type">
-     <term><constant>SolrClient::THREADS_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when updating the threads servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.ping-servlet-type">
-     <term><constant>SolrClient::PING_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when updating the ping servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.terms-servlet-type">
-     <term><constant>SolrClient::TERMS_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when updating the terms servlet.</para>
-     </listitem>
-    </varlistentry>
-    
-    <varlistentry xml:id="solrclient.constants.system-servlet-type">
-     <term><constant>SolrClient::SYSTEM_SERVLET_TYPE</constant></term>
-     <listitem>
-      <para>Used when retrieving system information from the system servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.default-search-servlet">
-     <term><constant>SolrClient::DEFAULT_SEARCH_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the search servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.default-update-servlet">
-     <term><constant>SolrClient::DEFAULT_UPDATE_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the update servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.default-threads-servlet">
-     <term><constant>SolrClient::DEFAULT_THREADS_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the threads servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.default-ping-servlet">
-     <term><constant>SolrClient::DEFAULT_PING_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the ping servlet.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrclient.constants.default-terms-servlet">
-     <term><constant>SolrClient::DEFAULT_TERMS_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the terms servlet used for the TermsComponent</para>
-     </listitem>
-    </varlistentry>
-    
-    <varlistentry xml:id="solrclient.constants.default-system-servlet">
-     <term><constant>SolrClient::DEFAULT_SYSTEM_SERVLET</constant></term>
-     <listitem>
-      <para>This is the initial value for the system servlet used to obtain Solr Server information</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrclient;
-
-</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/solr/solrclient/adddocument.xml b/reference/solr/solrclient/adddocument.xml
deleted file mode 100644
index fad5cde278d2..000000000000
--- a/reference/solr/solrclient/adddocument.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.adddocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::addDocument</refname>
-  <refpurpose>Adds a document to the index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::addDocument</methodname>
-   <methodparam><type>SolrInputDocument</type><parameter>doc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a document to the index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>doc</parameter></term>
-     <listitem>
-      <para>
-       The SolrInputDocument instance.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-       Whether to overwrite existing document or not. If &false; there will be duplicates (several documents with the same ID).
-        
-      </para>
-        <warning>
-            <para>
-              PECL Solr &lt; 2.0 $allowDups was used instead of $overwrite, which does the same functionality with exact opposite bool flag.
-            </para>
-            <para>
-              $allowDups = false is the same as $overwrite = true
-            </para>
-        </warning>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>commitWithin</parameter></term>
-     <listitem>
-      <para>
-        Number of milliseconds within which to auto commit this document. Available since Solr 1.4 . Default (0) means disabled.
-      </para>
-      <para>
-        When this value specified, it leaves the control of when to do the commit
-        to Solr itself, optimizing number of commits to a minimum while still
-        fulfilling
-        the update latency requirements, and Solr will automatically do a commit
-        when the oldest add in the buffer is due.
-       </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrUpdateResponse</type> object or throws an Exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::addDocument</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$doc = new SolrInputDocument();
-
-$doc->addField('id', 334455);
-$doc->addField('cat', 'Software');
-$doc->addField('cat', 'Lucene');
-
-$updateResponse = $client->addDocument($doc);
-
-// you will have to commit changes to be written if you didn't use $commitWithin
-$client->commit();
-
-print_r($updateResponse->getResponse());
-
-?>
-
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-        )
-
-)
-
-]]>
-    </screen>
-   </example>
-   </para>
-   <para>
-   <example>
-    <title><methodname>SolrClient::addDocument</methodname> example 2</title>
-    <programlisting role="php">
-<![CDATA[
-
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$doc = new SolrInputDocument();
-
-$doc->addField('id', 334455);
-$doc->addField('cat', 'Software');
-$doc->addField('cat', 'Lucene');
-
-// No need to call commit() because $commitWithin is passed, so Solr Server will auto commit within 10 seconds
-$updateResponse = $client->addDocument($doc, false, 10000);
-
-print_r($updateResponse->getResponse());
-
-?>
-
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-        )
-
-)
-
-]]>
-    </screen>
-   </example>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::addDocuments</methodname></member>
-    <member><methodname>SolrClient::commit</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/solr/solrclient/adddocuments.xml b/reference/solr/solrclient/adddocuments.xml
deleted file mode 100644
index 49ea37a2e0df..000000000000
--- a/reference/solr/solrclient/adddocuments.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.adddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::addDocuments</refname>
-  <refpurpose>Adds a collection of SolrInputDocument instances to the index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrClient::addDocuments</methodname>
-   <methodparam><type>array</type><parameter>docs</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>commitWithin</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a collection of documents to the index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>docs</parameter></term>
-     <listitem>
-      <para>
-       An array containing the collection of SolrInputDocument instances. This array must be an actual variable.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-       Whether to overwrite existing documents or not. If &false; there will be duplicates (several documents with the same ID).
-        
-      </para>
-        <warning>
-            <para>
-              PECL Solr &lt; 2.0 $allowDups was used instead of $overwrite, which does the same functionality with exact opposite bool flag.
-            </para>
-            <para>
-              $allowDups = false is the same as $overwrite = true
-            </para>
-        </warning>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>commitWithin</parameter></term>
-     <listitem>
-      <para>
-        Number of milliseconds within which to auto commit this document. Available since Solr 1.4 . Default (0) means disabled.
-      </para>
-      <para>
-        When this value specified, it leaves the control of when to do the commit
-        to Solr itself, optimizing number of commits to a minimum while still
-        fulfilling
-        the update latency requirements, and Solr will automatically do a commit
-        when the oldest add in the buffer is due.
-       </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Returns a <type>SolrUpdateResponse</type> object or throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::addDocuments</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$doc = new SolrInputDocument();
-
-$doc->addField('id', 334455);
-$doc->addField('cat', 'Software');
-$doc->addField('cat', 'Lucene');
-
-$doc2 = clone $doc;
-
-$doc2->deleteField('id');
-$doc2->addField('id', 334456);
-
-$docs = array($doc, $doc2);
-
-$updateResponse = $client->addDocuments($docs);
-
-// no changes will be written to disk unless $commitWithin is passed or SolrClient::commit is called
-
-print_r($updateResponse->getResponse());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 2
-        )
-
-)
-
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::addDocument</methodname></member>
-    <member><methodname>SolrClient::commit</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/solr/solrclient/commit.xml b/reference/solr/solrclient/commit.xml
deleted file mode 100644
index b3943bed8f5f..000000000000
--- a/reference/solr/solrclient/commit.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.commit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::commit</refname>
-  <refpurpose>Finalizes all add/deletes made to the index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::commit</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>softCommit</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>expungeDeletes</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method finalizes all add/deletes made to the index.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>softCommit</parameter></term>
-     <listitem>
-      <para>
-       This will refresh the 'view' of the index in a more performant manner, but without "on-disk" guarantees. (Solr4.0+)
-      </para>
-      <para>
-          A soft commit is much faster since it only makes index changes visible and does not fsync index files or write a new index descriptor. 
-          If the JVM crashes or there is a loss of power, changes that occurred after the last hard commit will be lost. 
-          Search collections that have near-real-time requirements (that want index changes to be quickly visible to searches) will want to soft commit often but hard commit less frequently. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>waitSearcher</parameter></term>
-     <listitem>
-      <para>
-       block until a new searcher is opened and registered as the main query searcher, making the changes visible. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>expungeDeletes</parameter></term>
-     <listitem>
-      <para>
-       Merge segments with deletes away. (Solr1.4+)
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <classname>SolrUpdateResponse</classname> object on success or throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </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 solr 1.1.0, PECL solr 2.0.0</entry>
-       <entry>
-        $maxSegments removed
-       </entry>
-      </row>
-      <row>
-       <entry>PECL solr 2.0.0b</entry>
-       <entry>
-        API Changed: SolrClient::commit ([ int $maxSegments = 0 [, bool $softCommit = false [, bool $waitSearcher = true[, bool $expungeDeletes = false ]]] )
-       </entry>
-      </row>
-      
-      <row>
-       <entry>PECL solr 0.9.2</entry>
-       <entry>
-        Signature: SolrClient::commit ([ int $maxSegments = 1 [, bool $waitFlush = true [, bool $waitSearcher = true ]]] ). 
-        $waitFlush: Block until index changes are flushed to disk.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-        PECL Solr &gt;= 2.0 only supports Solr Server &gt;= 4.0 
-   </para>
-  </warning>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::optimize</methodname></member>
-    <member><methodname>SolrClient::rollback</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/solr/solrclient/construct.xml b/reference/solr/solrclient/construct.xml
deleted file mode 100644
index 882eb9ab6fd4..000000000000
--- a/reference/solr/solrclient/construct.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::__construct</refname>
-  <refpurpose>Constructor for the SolrClient object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrClient::__construct</methodname>
-   <methodparam><type>array</type><parameter>clientOptions</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructor for the SolrClient object
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>clientOptions</parameter></term>
-     <listitem>
-      <para>
-       This is an array containing one of the following keys :
-      </para>
-      <para>
-       
-<![CDATA[
- - secure          (Boolean value indicating whether or not to connect in secure mode)
- - hostname        (The hostname for the Solr server)
- - port            (The port number)
- - path            (The path to solr)
- - wt              (The name of the response writer e.g. xml, json)
- - login           (The username used for HTTP Authentication, if any)
- - password        (The HTTP Authentication password)
- - proxy_host      (The hostname for the proxy server, if any)
- - proxy_port      (The proxy port)
- - proxy_login     (The proxy username)
- - proxy_password  (The proxy password)
- - timeout         (This is maximum time in seconds allowed for the http data transfer operation. Default is 30 seconds)
- - ssl_cert        (File name to a PEM-formatted file containing the private key + private certificate (concatenated in that order) )
- - ssl_key         (File name to a PEM-formatted private key file only)
- - ssl_keypassword (Password for private key)
- - ssl_cainfo      (Name of file holding one or more CA certificates to verify peer with)
- - ssl_capath      (Name of directory holding multiple CA certificates to verify peer with )
- 
- Please note the if the ssl_cert file only contains the private certificate, you have to specify a separate ssl_key file
- 
- The ssl_keypassword option is required if the ssl_cert or ssl_key options are set.
- 
-]]>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrIllegalArgumentException</classname> on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::__construct</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_PATH_TO_SOLR,
-    'wt'       => 'xml',
-);
-
-$client = new SolrClient($options);
-
-$doc = new SolrInputDocument();
-
-$doc->addField('id', 334455);
-$doc->addField('cat', 'Software');
-$doc->addField('cat', 'Lucene');
-
-$updateResponse = $client->addDocument($doc);
-
-?>
-
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::getOptions</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/solr/solrclient/deletebyid.xml b/reference/solr/solrclient/deletebyid.xml
deleted file mode 100644
index 7deb676bbde7..000000000000
--- a/reference/solr/solrclient/deletebyid.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.deletebyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::deleteById</refname>
-  <refpurpose>Delete by Id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::deleteById</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes the document with the specified ID. Where ID is the value of the uniqueKey field declared in the schema
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The value of the uniqueKey field declared in the schema
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrUpdateResponse</type> on success and throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::deleteByIds</methodname></member>
-    <member><methodname>SolrClient::deleteByQuery</methodname></member>
-    <member><methodname>SolrClient::deleteByQueries</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/solr/solrclient/deletebyids.xml b/reference/solr/solrclient/deletebyids.xml
deleted file mode 100644
index 19f2cfc2ccd1..000000000000
--- a/reference/solr/solrclient/deletebyids.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.deletebyids" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::deleteByIds</refname>
-  <refpurpose>Deletes by Ids</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::deleteByIds</methodname>
-   <methodparam><type>array</type><parameter>ids</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes a collection of documents with the specified set of ids.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ids</parameter></term>
-     <listitem>
-      <para>
-       An array of IDs representing the uniqueKey field declared in the schema for each document to be deleted. This must be an actual php variable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrUpdateResponse</type> on success and throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::deleteById</methodname></member>
-    <member><methodname>SolrClient::deleteByQuery</methodname></member>
-    <member><methodname>SolrClient::deleteByQueries</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/solr/solrclient/deletebyqueries.xml b/reference/solr/solrclient/deletebyqueries.xml
deleted file mode 100644
index 92e0e96838c4..000000000000
--- a/reference/solr/solrclient/deletebyqueries.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.deletebyqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::deleteByQueries</refname>
-  <refpurpose>Removes all documents matching any of the queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::deleteByQueries</methodname>
-   <methodparam><type>array</type><parameter>queries</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes all documents matching any of the queries
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>queries</parameter></term>
-     <listitem>
-      <para>
-       The array of queries. This must be an actual php variable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrUpdateResponse on success and throws a SolrClientException on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::deleteById</methodname></member>
-    <member><methodname>SolrClient::deleteByIds</methodname></member>
-    <member><methodname>SolrClient::deleteByQuery</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/solr/solrclient/deletebyquery.xml b/reference/solr/solrclient/deletebyquery.xml
deleted file mode 100644
index 25d7631396de..000000000000
--- a/reference/solr/solrclient/deletebyquery.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.deletebyquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::deleteByQuery</refname>
-  <refpurpose>Deletes all documents matching the given query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::deleteByQuery</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes all documents matching the given query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrUpdateResponse</type> on success and throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrQuery::deleteByQuery</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-//This will erase the entire index
-$client->deleteByQuery("*:*");
-$client->commit();
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::deleteById</methodname></member>
-    <member><methodname>SolrClient::deleteByIds</methodname></member>
-    <member><methodname>SolrClient::deleteByQueries</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/solr/solrclient/destruct.xml b/reference/solr/solrclient/destruct.xml
deleted file mode 100644
index 977a7d3f28d5..000000000000
--- a/reference/solr/solrclient/destruct.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::__destruct</refname>
-  <refpurpose>Destructor for SolrClient</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrClient::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Destructor for SolrClient
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::__construct</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/solr/solrclient/getbyid.xml b/reference/solr/solrclient/getbyid.xml
deleted file mode 100644
index 1315538e55dc..000000000000
--- a/reference/solr/solrclient/getbyid.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.getbyid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::getById</refname>
-  <refpurpose>Get Document By Id. Utilizes Solr Realtime Get (RTG)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQueryResponse</type><methodname>SolrClient::getById</methodname>
-   <methodparam><type>string</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Get Document By Id. Utilizes Solr Realtime Get (RTG).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id</parameter></term>
-    <listitem>
-     <para>
-      Document ID
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQueryResponse</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrClient::getById</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-$response = $client->getById('GB18030TEST');
-print_r($response->getResponse());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-SolrObject Object
-(
-    [doc] => SolrObject Object
-        (
-            [id] => GB18030TEST
-            [name] => Array
-                (
-                    [0] => Test with some GB18030 encoded characters
-                )
-
-            [features] => Array
-                (
-                    [0] => No accents here
-                    [1] => 这是一个功能
-                    [2] => This is a feature (translated)
-                    [3] => 这份文件是很有光泽
-                    [4] => This document is very shiny (translated)
-                )
-
-            [price] => Array
-                (
-                    [0] => 0
-                )
-
-            [inStock] => Array
-                (
-                    [0] => 1
-                )
-
-            [_version_] => 1510294336239042560
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrClient::getByIds</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/solr/solrclient/getbyids.xml b/reference/solr/solrclient/getbyids.xml
deleted file mode 100644
index ac1aa821dbeb..000000000000
--- a/reference/solr/solrclient/getbyids.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.getbyids" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::getByIds</refname>
-  <refpurpose>Get Documents by their Ids. Utilizes Solr Realtime Get (RTG)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQueryResponse</type><methodname>SolrClient::getByIds</methodname>
-   <methodparam><type>array</type><parameter>ids</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Get Documents by their Ids. Utilizes Solr Realtime Get (RTG).
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ids</parameter></term>
-    <listitem>
-     <para>
-      Document ids
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQueryResponse</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrClient::getByIds</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-$response = $client->getByIds(['GB18030TEST', '6H500F0']);
-
-print_r($response->getResponse());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-SolrObject Object
-(
-    [response] => SolrObject Object
-        (
-            [numFound] => 2
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrObject Object
-                        (
-                            [id] => GB18030TEST
-                            [name] => Array
-                                (
-                                    [0] => Test with some GB18030 encoded characters
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => No accents here
-                                    [1] => 这是一个功能
-                                    [2] => This is a feature (translated)
-                                    [3] => 这份文件是很有光泽
-                                    [4] => This document is very shiny (translated)
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 0
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [_version_] => 1510294336239042560
-                        )
-
-                    [1] => SolrObject Object
-                        (
-                            [id] => 6H500F0
-                            [name] => Array
-                                (
-                                    [0] => Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Maxtor Corp.
-                                )
-
-                            [manu_id_s] => maxtor
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => hard drive
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => SATA 3.0Gb/s, NCQ
-                                    [1] => 8.5ms seek
-                                    [2] => 16MB cache
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 350
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 6
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 45.17614,-93.87341
-                                )
-
-                            [manufacturedate_dt] => 2006-02-13T15:26:37Z
-                            [_version_] => 1510294336449806336
-                        )
-
-                )
-
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrClient::getById</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/solr/solrclient/getdebug.xml b/reference/solr/solrclient/getdebug.xml
deleted file mode 100644
index 14a0ded4d127..000000000000
--- a/reference/solr/solrclient/getdebug.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.getdebug" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::getDebug</refname>
-  <refpurpose>Returns the debug data for the last connection attempt</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrClient::getDebug</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the debug data for the last connection attempt
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string on success and null if there is nothing to return.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrclient/getoptions.xml b/reference/solr/solrclient/getoptions.xml
deleted file mode 100644
index 811728eb9ad4..000000000000
--- a/reference/solr/solrclient/getoptions.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.getoptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::getOptions</refname>
-  <refpurpose>Returns the client options set internally</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrClient::getOptions</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the client options set internally. Very useful for debugging. The values returned are readonly and can only be set when the object is instantiated.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing all the options for the SolrClient object set internally.
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::__construct</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/solr/solrclient/optimize.xml b/reference/solr/solrclient/optimize.xml
deleted file mode 100644
index 1d73667f4dc4..000000000000
--- a/reference/solr/solrclient/optimize.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.optimize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::optimize</refname>
-  <refpurpose>Defragments the index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::optimize</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>maxSegments</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>softCommit</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>waitSearcher</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Defragments the index for faster search performance.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>maxSegments</parameter></term>
-     <listitem>
-      <para>
-       Optimizes down to at most this number of segments. Since Solr 1.3
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>softCommit</parameter></term>
-     <listitem>
-      <para>
-       This will refresh the 'view' of the index in a more performant manner, but without "on-disk" guarantees. (Solr4.0+)
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>waitSearcher</parameter></term>
-     <listitem>
-      <para>
-       Block until a new searcher is opened and registered as the main query searcher, making the changes visible. 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrUpdateResponse on success or throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to process the request.
-  </para>
- </refsect1>
- 
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    PECL Solr &gt;= 2.0 only supports Solr Server &gt;= 4.0 
-   </para>
-   <para>
-    Prior to PECL Solr 2.0 this method used to accept these arguments "int $maxSegments, bool $waitFlush, bool $waitSearcher".
-   </para>
-  </warning>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::commit</methodname></member>
-    <member><methodname>SolrClient::rollback</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/solr/solrclient/ping.xml b/reference/solr/solrclient/ping.xml
deleted file mode 100644
index 9e2c7652a219..000000000000
--- a/reference/solr/solrclient/ping.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.ping" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::ping</refname>
-  <refpurpose>Checks if Solr server is still up</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrPingResponse</type><methodname>SolrClient::ping</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the Solr server is still alive. Sends a HEAD request to the Apache Solr server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrPingResponse</type> object on success and throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-    Throws <classname>SolrServerException</classname> if the Solr Server had failed to satisfy the request.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::ping</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$pingresponse = $client->ping();
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-]]>
-    </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/solr/solrclient/query.xml b/reference/solr/solrclient/query.xml
deleted file mode 100644
index c37b70e6fc20..000000000000
--- a/reference/solr/solrclient/query.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::query</refname>
-  <refpurpose>Sends a query to the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQueryResponse</type><methodname>SolrClient::query</methodname>
-   <methodparam><type>SolrParams</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sends a query to the server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       A <type>SolrParams</type> object. It is recommended to use <type>SolrQuery</type> for advanced queries.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrQueryResponse</type> object on success and throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-    Throws <classname>SolrServerException</classname> if the Solr Server had failed to satisfy the query.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::query</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => 'localhost',
-    'login'    => 'username',
-    'password' => 'password',
-    'port'     => '8983',
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setQuery('lucene');
-
-$query->setStart(0);
-
-$query->setRows(50);
-
-$query->addField('cat')->addField('features')->addField('id')->addField('timestamp');
-
-$query_response = $client->query($query);
-
-$response = $query_response->getResponse();
-
-print_r($response);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 3
-            [params] => SolrObject Object
-                (
-                    [fl] => cat,features,id,timestamp
-                    [indent] => on
-                    [start] => 0
-                    [q] => lucene
-                    [wt] => xml
-                    [version] => 2.2
-                    [rows] => 50
-                )
-
-        )
-
-    [response] => SolrObject Object
-        (
-            [numFound] => 1
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrObject Object
-                        (
-                            [id] => SOLR1000
-                            [cat] => Array
-                                (
-                                    [0] => software
-                                    [1] => search
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => Advanced Full-Text Search Capabilities using Lucene
-                                    [1] => Optimized for High Volume Web Traffic
-                                    [2] => Standards Based Open Interfaces - XML and HTTP
-                                    [3] => Comprehensive HTML Administration Interfaces
-                                    [4] => Scalability - Efficient Replication to other Solr Search Servers
-                                    [5] => Flexible and Adaptable with XML configuration and Schema
-                                    [6] => Good unicode support: héllo (hello with an accent over the e)
-                                )
-
-                        )
-
-                )
-
-        )
-
-)
-]]>
-    </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/solr/solrclient/request.xml b/reference/solr/solrclient/request.xml
deleted file mode 100644
index 64991cefc3ff..000000000000
--- a/reference/solr/solrclient/request.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.request" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::request</refname>
-  <refpurpose>Sends a raw update request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::request</methodname>
-   <methodparam><type>string</type><parameter>raw_request</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sends a raw XML update request to the server
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>raw_request</parameter></term>
-     <listitem>
-      <para>
-       An XML string with the raw request to the server.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrUpdateResponse</type> on success. Throws an exception on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrIllegalArgumentException</classname> if <parameter>raw_request</parameter> was an empty string
-  </para>
-  <para>
-   Throws <classname>SolrClientException</classname> if the client had failed, or there was a connection issue.
-  </para>
-  <para>
-   Throws <classname>SolrServerException</classname> if the Solr Server had failed to satisfy the query.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::request</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$update_response = $client->request("<commit/>");
-
-$response = $update_response->getResponse();
-
-print_r($response);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-...
-]]>
-    </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/solr/solrclient/rollback.xml b/reference/solr/solrclient/rollback.xml
deleted file mode 100644
index 465e1e596ecf..000000000000
--- a/reference/solr/solrclient/rollback.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.rollback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::rollback</refname>
-  <refpurpose>Rollbacks all add/deletes made to the index since the last commit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrUpdateResponse</type><methodname>SolrClient::rollback</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Rollbacks all add/deletes made to the index since the last commit. It neither calls any event listeners nor creates a new searcher.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrUpdateResponse on success or throws a SolrClientException on failure.
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>SolrClient::commit</methodname></member>
-    <member><methodname>SolrClient::optimize</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/solr/solrclient/setresponsewriter.xml b/reference/solr/solrclient/setresponsewriter.xml
deleted file mode 100644
index f51e17a76a39..000000000000
--- a/reference/solr/solrclient/setresponsewriter.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.setresponsewriter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::setResponseWriter</refname>
-  <refpurpose>Sets the response writer used to prepare the response from Solr</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrClient::setResponseWriter</methodname>
-   <methodparam><type>string</type><parameter>responseWriter</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the response writer used to prepare the response from Solr
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>responseWriter</parameter></term>
-     <listitem>
-      <para>One of the following:</para>
-      <simplelist>
-       <member><literal>json</literal></member>
-       <member><literal>phps</literal></member>
-       <member><literal>xml</literal></member>
-      </simplelist>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  &return.void;
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrClient::setResponseWriter</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-
-<?php
-
-// This is my custom class for objects
-class SolrClass
-{
-   public $_properties = array();
-
-   public function __get($property_name) {
-      
-      if (property_exists($this, $property_name)) {
-      
-          return $this->$property_name;
-      
-      } else if (isset($_properties[$property_name])) {
-      
-          return $_properties[$property_name];
-      }
-      
-      return null;
-   }
-}
-
-$options = array
-(
-  'hostname' => 'localhost',
-  'port' => 8983,
-  'path' => '/solr/core1'
-);
-
-$client = new SolrClient($options);
-
-$client->setResponseWriter("json");
-
-//$response = $client->ping();
-
-$query = new SolrQuery();
-
-$query->setQuery("*:*");
-
-$query->set("objectClassName", "SolrClass");
-
-$query->set("objectPropertiesStorageMode", 1); // 0 for independent properties, 1 for combined
-
-try
-{
-
-$response = $client->query($query);
-
-$resp = $response->getResponse();
-
-print_r($response);
-
-print_r($resp);
-
-} catch (Exception $e) {
-
-print_r($e);
-
-}
-
-?>
-]]>
-    </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/solr/solrclient/setservlet.xml b/reference/solr/solrclient/setservlet.xml
deleted file mode 100644
index 22392cf62ee2..000000000000
--- a/reference/solr/solrclient/setservlet.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.setservlet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::setServlet</refname>
-  <refpurpose>Changes the specified servlet type to a new value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrClient::setServlet</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Changes the specified servlet type to a new value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>One of the following :</para>
-      <para>
-<![CDATA[
- - SolrClient::SEARCH_SERVLET_TYPE
- - SolrClient::UPDATE_SERVLET_TYPE
- - SolrClient::THREADS_SERVLET_TYPE
- - SolrClient::PING_SERVLET_TYPE
- - SolrClient::TERMS_SERVLET_TYPE
-]]>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      The new value for the servlet
-      </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/solr/solrclient/system.xml b/reference/solr/solrclient/system.xml
deleted file mode 100644
index cfb20dc86c78..000000000000
--- a/reference/solr/solrclient/system.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.system" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::system</refname>
-  <refpurpose>Retrieve Solr Server information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrClient::system</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve Solr Server information
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>SolrGenericResponse</type> object on success.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Emits <classname>SolrClientException</classname> if the client failed, or there was a connection issue.
-  </para>
-  <para>
-    Emits <classname>SolrServerException</classname> if the Solr Server failed to satisfy the query.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrclient/threads.xml b/reference/solr/solrclient/threads.xml
deleted file mode 100644
index e125c7df62c6..000000000000
--- a/reference/solr/solrclient/threads.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclient.threads" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClient::threads</refname>
-  <refpurpose>Checks the threads status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrClient::threads</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks the threads status
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrGenericResponse object.
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrClientException</classname> if the client failed, or there was a connection issue.
-  </para>
-  <para>
-    throws <classname>SolrServerException</classname> if the Solr Server failed to process the request.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrclientexception.xml b/reference/solr/solrclientexception.xml
deleted file mode 100644
index e6346efc5153..000000000000
--- a/reference/solr/solrclientexception.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrclientexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrClientException class</title>
- <titleabbrev>SolrClientException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrClientException intro -->
-  <section xml:id="solrclientexception.intro">
-   &reftitle.intro;
-   <para>
-    An exception thrown when there is an error while making a request to the server from the client.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrclientexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrClientException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrClientException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrException</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)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrclientexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
- &reference.solr.entities.solrclientexception;
-
-</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/solr/solrclientexception/getinternalinfo.xml b/reference/solr/solrclientexception/getinternalinfo.xml
deleted file mode 100644
index c18f2f4dcc4b..000000000000
--- a/reference/solr/solrclientexception/getinternalinfo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrclientexception.getinternalinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrClientException::getInternalInfo</refname>
-  <refpurpose>Returns internal information where the Exception was thrown</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrClientException::getInternalInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns internal information where the Exception was thrown.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing internal information where the error was thrown. Used only for debugging by extension developers.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrcollapsefunction.xml b/reference/solr/solrcollapsefunction.xml
deleted file mode 100644
index 17bd79f58813..000000000000
--- a/reference/solr/solrcollapsefunction.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrcollapsefunction" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrCollapseFunction class</title>
- <titleabbrev>SolrCollapseFunction</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrCollapseFunction intro -->
-  <section xml:id="solrcollapsefunction.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrcollapsefunction.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrCollapseFunction</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrCollapseFunction</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrcollapsefunction.constants.nullpolicy-ignore">SolrCollapseFunction::NULLPOLICY_IGNORE</varname>
-     <initializer>ignore</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrcollapsefunction.constants.nullpolicy-expand">SolrCollapseFunction::NULLPOLICY_EXPAND</varname>
-     <initializer>expand</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="solrcollapsefunction.constants.nullpolicy-collapse">SolrCollapseFunction::NULLPOLICY_COLLAPSE</varname>
-     <initializer>collapse</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrcollapsefunction')/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.solrcollapsefunction')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ SolrCollapseFunction constants -->
-  <section xml:id="solrcollapsefunction.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="solrcollapsefunction.constants.nullpolicy-ignore">
-     <term><constant>SolrCollapseFunction::NULLPOLICY_IGNORE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrcollapsefunction.constants.nullpolicy-expand">
-     <term><constant>SolrCollapseFunction::NULLPOLICY_EXPAND</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrcollapsefunction.constants.nullpolicy-collapse">
-     <term><constant>SolrCollapseFunction::NULLPOLICY_COLLAPSE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrcollapsefunction;
-
-</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/solr/solrcollapsefunction/construct.xml b/reference/solr/solrcollapsefunction/construct.xml
deleted file mode 100644
index 70f4d97f5f22..000000000000
--- a/reference/solr/solrcollapsefunction/construct.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrCollapseFunction::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Collapse Function constructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-        The field name to collapse on.
-     </para>
-     <para>
-        In order to collapse a result. The field type must be a single valued String, Int or Float.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrCollapseFunction::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$func = new SolrCollapseFunction('field_name');
-
-$func->setMax('sum(cscore(),field(some_other_field))');
-$func->setSize(100);
-$func->setNullPolicy(SolrCollapseFunction::NULLPOLICY_EXPAND);
-
-$query->collapse($func);
-
-$queryResponse = $client->query($query);
-
-$response = $queryResponse->getResponse();
-
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::collapse</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/solr/solrcollapsefunction/getfield.xml b/reference/solr/solrcollapsefunction/getfield.xml
deleted file mode 100644
index 864a8077baf2..000000000000
--- a/reference/solr/solrcollapsefunction/getfield.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.getfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getField</refname>
-  <refpurpose>Returns the field that is being collapsed on</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::getField</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the field that is being collapsed on.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setField</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/solr/solrcollapsefunction/gethint.xml b/reference/solr/solrcollapsefunction/gethint.xml
deleted file mode 100644
index bbbb2f952748..000000000000
--- a/reference/solr/solrcollapsefunction/gethint.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.gethint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getHint</refname>
-  <refpurpose>Returns collapse hint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::getHint</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns collapse hint
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setHint</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/solr/solrcollapsefunction/getmax.xml b/reference/solr/solrcollapsefunction/getmax.xml
deleted file mode 100644
index f4c40fe2549f..000000000000
--- a/reference/solr/solrcollapsefunction/getmax.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.getmax" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getMax</refname>
-  <refpurpose>Returns max parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::getMax</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns max parameter
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setMax</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/solr/solrcollapsefunction/getmin.xml b/reference/solr/solrcollapsefunction/getmin.xml
deleted file mode 100644
index 7e66925b53c7..000000000000
--- a/reference/solr/solrcollapsefunction/getmin.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.getmin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getMin</refname>
-  <refpurpose>Returns min parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::getMin</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns min parameter
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setMin</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/solr/solrcollapsefunction/getnullpolicy.xml b/reference/solr/solrcollapsefunction/getnullpolicy.xml
deleted file mode 100644
index a22b7d65d3f8..000000000000
--- a/reference/solr/solrcollapsefunction/getnullpolicy.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.getnullpolicy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getNullPolicy</refname>
-  <refpurpose>Returns null policy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::getNullPolicy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns null policy used or null
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setNullPolicy</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/solr/solrcollapsefunction/getsize.xml b/reference/solr/solrcollapsefunction/getsize.xml
deleted file mode 100644
index ae8a58d2481d..000000000000
--- a/reference/solr/solrcollapsefunction/getsize.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::getSize</refname>
-  <refpurpose>Returns size parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrCollapseFunction::getSize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Gets the initial size of the collapse data structures when collapsing on a numeric field only
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrCollapseFunction::setSize</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/solr/solrcollapsefunction/setfield.xml b/reference/solr/solrcollapsefunction/setfield.xml
deleted file mode 100644
index 80baf741890c..000000000000
--- a/reference/solr/solrcollapsefunction/setfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.setfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setField</refname>
-  <refpurpose>Sets the field to collapse on</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The field name to collapse on.
-      
-    In order to collapse a result. The field type must be a single valued String, Int or Float.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fieldName</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrcollapsefunction/sethint.xml b/reference/solr/solrcollapsefunction/sethint.xml
deleted file mode 100644
index 8fd999db364a..000000000000
--- a/reference/solr/solrcollapsefunction/sethint.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.sethint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setHint</refname>
-  <refpurpose>Sets collapse hint</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setHint</methodname>
-   <methodparam><type>string</type><parameter>hint</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets collapse hint
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hint</parameter></term>
-    <listitem>
-     <para>
-      Currently there is only one hint available "top_fc", which stands for top level FieldCache
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrCollapseFunction::setHint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* ... */
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-...
-]]>
-   </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/solr/solrcollapsefunction/setmax.xml b/reference/solr/solrcollapsefunction/setmax.xml
deleted file mode 100644
index 181bea054f31..000000000000
--- a/reference/solr/solrcollapsefunction/setmax.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.setmax" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setMax</refname>
-  <refpurpose>Selects the group heads by the max value of a numeric field or function query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setMax</methodname>
-   <methodparam><type>string</type><parameter>max</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Selects the group heads by the max value of a numeric field or function query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>max</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrCollapseFunction::setMax</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$func = new SolrCollapseFunction('field_name');
-
-$func->setMax('sum(cscore(),field(some_field))');
-
-$query = new SolrQuery('*:*');
-
-$query->collapse($func);
-
-?>
-]]>
-   </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/solr/solrcollapsefunction/setmin.xml b/reference/solr/solrcollapsefunction/setmin.xml
deleted file mode 100644
index 49b1049fff06..000000000000
--- a/reference/solr/solrcollapsefunction/setmin.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.setmin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setMin</refname>
-  <refpurpose>Sets the initial size of the collapse data structures when collapsing on a numeric field only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setMin</methodname>
-   <methodparam><type>string</type><parameter>min</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the initial size of the collapse data structures when collapsing on a numeric field only
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>min</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrcollapsefunction/setnullpolicy.xml b/reference/solr/solrcollapsefunction/setnullpolicy.xml
deleted file mode 100644
index 83fe76c063cf..000000000000
--- a/reference/solr/solrcollapsefunction/setnullpolicy.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.setnullpolicy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setNullPolicy</refname>
-  <refpurpose>Sets the NULL Policy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setNullPolicy</methodname>
-   <methodparam><type>string</type><parameter>nullPolicy</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the NULL Policy. One of the 3 policies defined as class constants shall be passed.
-    Accepts ignore, expand, or collapse policies.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nullPolicy</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrcollapsefunction/setsize.xml b/reference/solr/solrcollapsefunction/setsize.xml
deleted file mode 100644
index 85a89ec3c7a2..000000000000
--- a/reference/solr/solrcollapsefunction/setsize.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.setsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::setSize</refname>
-  <refpurpose>Sets the initial size of the collapse data structures when collapsing on a numeric field only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrCollapseFunction</type><methodname>SolrCollapseFunction::setSize</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the initial size of the collapse data structures when collapsing on a numeric field only.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrCollapseFunction</type>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrcollapsefunction/tostring.xml b/reference/solr/solrcollapsefunction/tostring.xml
deleted file mode 100644
index ae78287d94fe..000000000000
--- a/reference/solr/solrcollapsefunction/tostring.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrcollapsefunction.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrCollapseFunction::__toString</refname>
-  <refpurpose>Returns a string representing the constructed collapse function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrCollapseFunction::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns a string representing the constructed collapse function
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdismaxquery.xml b/reference/solr/solrdismaxquery.xml
deleted file mode 100644
index 1df92564c5fc..000000000000
--- a/reference/solr/solrdismaxquery.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrdismaxquery" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrDisMaxQuery class</title>
- <titleabbrev>SolrDisMaxQuery</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrDisMaxQuery intro -->
-  <section xml:id="solrdismaxquery.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrdismaxquery.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrDisMaxQuery</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrDisMaxQuery</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrQuery</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/descendant::db:fieldsynopsis)" />
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdismaxquery')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdismaxquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ SolrDisMaxQuery constants -->
-  <section xml:id="solrdismaxquery.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="solrdismaxquery.constants.order-asc">
-     <term><constant>SolrDisMaxQuery::ORDER_ASC</constant></term>
-     <listitem>
-      <para>Used to specify that the sorting should be in acending order (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdismaxquery.constants.order-desc">
-     <term><constant>SolrDisMaxQuery::ORDER_DESC</constant></term>
-     <listitem>
-      <para>Used to specify that the sorting should be in descending order (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdismaxquery.constants.facet-sort-index">
-     <term><constant>SolrDisMaxQuery::FACET_SORT_INDEX</constant></term>
-     <listitem>
-      <para>Used to specify that the facet should sort by index (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdismaxquery.constants.facet-sort-count">
-     <term><constant>SolrDisMaxQuery::FACET_SORT_COUNT</constant></term>
-     <listitem>
-      <para>Used to specify that the facet should sort by count (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdismaxquery.constants.terms-sort-index">
-     <term><constant>SolrDisMaxQuery::TERMS_SORT_INDEX</constant></term>
-     <listitem>
-      <para>Used in the TermsComponent (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdismaxquery.constants.terms-sort-count">
-     <term><constant>SolrDisMaxQuery::TERMS_SORT_COUNT</constant></term>
-     <listitem>
-      <para>Used in the TermsComponent (Duplicated for easier migration)</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrdismaxquery;
-
-</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/solr/solrdismaxquery/addbigramphrasefield.xml b/reference/solr/solrdismaxquery/addbigramphrasefield.xml
deleted file mode 100644
index 08c80ca0f362..000000000000
--- a/reference/solr/solrdismaxquery/addbigramphrasefield.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.addbigramphrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addBigramPhraseField</refname>
-  <refpurpose>Adds a Phrase Bigram Field (pf2 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addBigramPhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>boost</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a Phrase Bigram Field (pf2 parameter)
-    output format: field~slop^boost OR field^boost
-    Slop is optional
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>boost</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addBigramPhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addBigramPhraseField('cat', 2, 5.1)
-    ->addBigramPhraseField('feature', 4.5)
-;
-echo $dismaxQuery;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf2=cat~5.1^2 feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removeBigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBigramPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBigramPhraseSlop</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/solr/solrdismaxquery/addboostquery.xml b/reference/solr/solrdismaxquery/addboostquery.xml
deleted file mode 100644
index 865d14cc8a0a..000000000000
--- a/reference/solr/solrdismaxquery/addboostquery.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.addboostquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addBoostQuery</refname>
-  <refpurpose>Adds a boost query field with value and optional boost (bq parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addBoostQuery</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>boost</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a Boost Query field with value [and boost] (bq parameter) 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>boost</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addBoostQuery</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addBoostQuery('cat', 'clothing', 2)
-    ->addBoostQuery('cat', 'electronics', 5.1)
-;
-echo $dismaxQuery.PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&bq=cat:clothing^2 cat:electronics^5.1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removeBoostQuery</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBoostQuery</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/solr/solrdismaxquery/addphrasefield.xml b/reference/solr/solrdismaxquery/addphrasefield.xml
deleted file mode 100644
index be7ba0325bbd..000000000000
--- a/reference/solr/solrdismaxquery/addphrasefield.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.addphrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addPhraseField</refname>
-  <refpurpose>Adds a Phrase Field (pf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addPhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>boost</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a Phrase Field (pf parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      field name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>boost</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addPhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addPhraseField('cat', 3, 1)
-    ->addPhraseField('third', 4, 2)
-    ->addPhraseField('source', 55)
-;
-echo $dismaxQuery;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf=cat~1^3 third~2^4 source^55
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removePhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setPhraseFields</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/solr/solrdismaxquery/addqueryfield.xml b/reference/solr/solrdismaxquery/addqueryfield.xml
deleted file mode 100644
index a8bba9b2a039..000000000000
--- a/reference/solr/solrdismaxquery/addqueryfield.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.addqueryfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addQueryField</refname>
-  <refpurpose>Add a query field with optional boost (qf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addQueryField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>boost</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Add a query field with optional boost (qf parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      field name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>boost</parameter></term>
-    <listitem>
-     <para>
-      Boost value. Boosts documents with matching terms.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addQueryField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addQueryField("location", 4)
-    ->addQueryField("price")
-    ->addQueryField("sku")
-    ->addQueryField("title",3.4)
-;
-echo $dismaxQuery;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&qf=location^4 price sku title^3.4
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removeQueryField</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/solr/solrdismaxquery/addtrigramphrasefield.xml b/reference/solr/solrdismaxquery/addtrigramphrasefield.xml
deleted file mode 100644
index 9631a24df14c..000000000000
--- a/reference/solr/solrdismaxquery/addtrigramphrasefield.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.addtrigramphrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addTrigramPhraseField</refname>
-  <refpurpose>Adds a Trigram Phrase Field (pf3 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addTrigramPhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>string</type><parameter>boost</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a Trigram Phrase Field (pf3 parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>boost</parameter></term>
-    <listitem>
-     <para>
-      Field Boost
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      Field Slop
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addTrigramPhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-->addTrigramPhraseField('cat', 2, 5.1)
-->addTrigramPhraseField('feature', 4.5)
-;
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=%s&pf3=cat~5.1^2 feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removeTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseSlop</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/solr/solrdismaxquery/adduserfield.xml b/reference/solr/solrdismaxquery/adduserfield.xml
deleted file mode 100644
index 5c70f6163a86..000000000000
--- a/reference/solr/solrdismaxquery/adduserfield.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.adduserfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::addUserField</refname>
-  <refpurpose>Adds a field to User Fields Parameter (uf)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::addUserField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a field to The User Fields Parameter (uf)
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::addUserField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-->addUserField('cat')
-->addUserField('text')
-->addUserField('*_dt');
-
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&uf=cat text *_dt
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::removeUserField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setUserFields</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/solr/solrdismaxquery/construct.xml b/reference/solr/solrdismaxquery/construct.xml
deleted file mode 100644
index b1fc1cc44174..000000000000
--- a/reference/solr/solrdismaxquery/construct.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::__construct</refname>
-  <refpurpose>Class Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrDisMaxQuery::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>q</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Class constructor initializes the object and sets the q parameter if passed
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>q</parameter></term>
-    <listitem>
-     <para>
-      Search Query (q parameter)
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Emits <classname>SolrIllegalArgumentException</classname> in case of an invalid parameter was passed.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-echo $dismaxQuery;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax
-]]>
-   </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/solr/solrdismaxquery/removebigramphrasefield.xml b/reference/solr/solrdismaxquery/removebigramphrasefield.xml
deleted file mode 100644
index 431b60c7147f..000000000000
--- a/reference/solr/solrdismaxquery/removebigramphrasefield.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.removebigramphrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removeBigramPhraseField</refname>
-  <refpurpose>Removes phrase bigram field (pf2 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removeBigramPhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a Bigram Phrase Field (pf2 parameter) that was previously added using <methodname>SolrDisMaxQuery::addBigramPhraseField</methodname>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      The Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removeBigramPhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addBigramPhraseField('cat', 2, 5.1)
-    ->addBigramPhraseField('feature', 4.5)
-;
-echo $dismaxQuery.PHP_EOL;
-
-// remove cat from pf2
-$dismaxQuery
-    ->removeBigramPhraseField('cat');
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf2=cat~5.1^2 feature^4.5
-q=lucene&defType=edismax&pf2=feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addBigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBigramPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBigramPhraseSlop</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/solr/solrdismaxquery/removeboostquery.xml b/reference/solr/solrdismaxquery/removeboostquery.xml
deleted file mode 100644
index 546acf772f91..000000000000
--- a/reference/solr/solrdismaxquery/removeboostquery.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.removeboostquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removeBoostQuery</refname>
-  <refpurpose>Removes a boost query partial by field name (bq)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removeBoostQuery</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a boost query partial from the existing query, only if <methodname>SolrDisMaxQuery::addBoostQuery</methodname> was used.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removeBoostQuery</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery
-    ->addBoostQuery('cat', 'electronics', 5.1)
-    ->addBoostQuery('cat', 'hard drive')
-;
-echo $dismaxQuery.PHP_EOL;
-// now remove a query part with field 'cat'
-$dismaxQuery
-->removeBoostQuery('cat');
-echo $dismaxQuery . PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&bq=cat:electronics^5.1 cat:hard drive
-q=lucene&defType=edismax&bq=cat:hard drive
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addBoostQuery</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setBoostQuery</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/solr/solrdismaxquery/removephrasefield.xml b/reference/solr/solrdismaxquery/removephrasefield.xml
deleted file mode 100644
index a81aff2610e3..000000000000
--- a/reference/solr/solrdismaxquery/removephrasefield.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdismaxquery.removephrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removePhraseField</refname>
-  <refpurpose>Removes a Phrase Field (pf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removePhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a Phrase Field (pf parameter) that was previously added using SolrDisMaxQuery::addPhraseField
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removePhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-    ->addPhraseField('first', 3, 1)
-    ->addPhraseField('second', 4, 1)
-    ->addPhraseField('cat', 55);
-echo $dismaxQuery . PHP_EOL;
-echo $dismaxQuery->removePhraseField('second');
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf=first~1^3 second~1^4 cat^55
-q=lucene&defType=edismax&pf=first~1^3 cat^55
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setPhraseFields</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/solr/solrdismaxquery/removequeryfield.xml b/reference/solr/solrdismaxquery/removequeryfield.xml
deleted file mode 100644
index 860735486542..000000000000
--- a/reference/solr/solrdismaxquery/removequeryfield.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdismaxquery.removequeryfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removeQueryField</refname>
-  <refpurpose>Removes a Query Field (qf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removeQueryField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a Query Field (qf parameter) from the field list added by <methodname>SolrDisMaxQuery::addQueryField</methodname>
-  </para>
-  <para>
-    qf: When building DisjunctionMaxQueries from the user's query it specifies the fields to search in, and boosts for those fields.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removeQueryField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-    ->addQueryField('first', 3)
-    ->addQueryField('second', 0.2)
-    ->addQueryField('cat');
-echo $dismaxQuery . PHP_EOL;
-// remove field 'second'
-echo $dismaxQuery->removeQueryField('second');
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&qf=first^3 second^0.2 cat
-q=lucene&defType=edismax&qf=first^3 cat
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addQueryField</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/solr/solrdismaxquery/removetrigramphrasefield.xml b/reference/solr/solrdismaxquery/removetrigramphrasefield.xml
deleted file mode 100644
index 1885bc72e0a9..000000000000
--- a/reference/solr/solrdismaxquery/removetrigramphrasefield.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.removetrigramphrasefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removeTrigramPhraseField</refname>
-  <refpurpose>Removes a Trigram Phrase Field (pf3 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removeTrigramPhraseField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a Trigram Phrase Field (pf3 parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removeTrigramPhraseField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-->addTrigramPhraseField('cat', 2, 5.1)
-->addTrigramPhraseField('feature', 4.5)
-;
-echo $dismaxQuery.PHP_EOL;
-// reverse
-$dismaxQuery
-->removeTrigramPhraseField('cat');
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=%s&pf3=cat~5.1^2 feature^4.5
-q=lucene&defType=%s&pf3=feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseSlop</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/solr/solrdismaxquery/removeuserfield.xml b/reference/solr/solrdismaxquery/removeuserfield.xml
deleted file mode 100644
index 5a1005943028..000000000000
--- a/reference/solr/solrdismaxquery/removeuserfield.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdismaxquery.removeuserfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::removeUserField</refname>
-  <refpurpose>Removes a field from The User Fields Parameter (uf)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::removeUserField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes a field from The User Fields Parameter (uf)
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field Name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::removeUserField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery
-->addUserField('cat')
-->addUserField('text')
-->addUserField('*_dt')
-;
-echo $dismaxQuery.PHP_EOL;
-
-// remove field named 'text'
-$dismaxQuery
-->removeUserField('text');
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=%s&uf=cat text *_dt
-q=lucene&defType=%s&uf=cat *_dt
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addUserField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setUserFields</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/solr/solrdismaxquery/setbigramphrasefields.xml b/reference/solr/solrdismaxquery/setbigramphrasefields.xml
deleted file mode 100644
index b506674f2cfc..000000000000
--- a/reference/solr/solrdismaxquery/setbigramphrasefields.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setbigramphrasefields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setBigramPhraseFields</refname>
-  <refpurpose>Sets Bigram Phrase Fields and their boosts (and slops) using pf2 parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setBigramPhraseFields</methodname>
-   <methodparam><type>string</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Bigram Phrase Fields (pf2) and their boosts (and slops)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-      Fields boosts (slops)
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setBigramPhraseFields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery->setBigramPhraseFields("cat~5.1^2 feature^4.5");
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf2=cat~5.1^2 feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::setBigramPhraseSlop</methodname></member>
-   <member><methodname>SolrDisMaxQuery::addBigramPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removeBigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseFields</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/solr/solrdismaxquery/setbigramphraseslop.xml b/reference/solr/solrdismaxquery/setbigramphraseslop.xml
deleted file mode 100644
index 41e489a23cf6..000000000000
--- a/reference/solr/solrdismaxquery/setbigramphraseslop.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setbigramphraseslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setBigramPhraseSlop</refname>
-  <refpurpose>Sets Bigram Phrase Slop (ps2 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setBigramPhraseSlop</methodname>
-   <methodparam><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Bigram Phrase Slop (ps2 parameter). A default slop for Bigram phrase fields.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setBigramPhraseSlop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-
-$dismaxQuery->setBigramPhraseSlop(5);
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&ps2=5
-]]>
-   </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/solr/solrdismaxquery/setboostfunction.xml b/reference/solr/solrdismaxquery/setboostfunction.xml
deleted file mode 100644
index b5f9c9700972..000000000000
--- a/reference/solr/solrdismaxquery/setboostfunction.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setboostfunction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setBoostFunction</refname>
-  <refpurpose>Sets a Boost Function (bf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setBoostFunction</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Boost Function (bf parameter).
-  </para>
-  <para>
-    Functions (with optional boosts) that will be included in the
-    user's query to influence the score. Any function supported natively
-    by Solr can be used, along with a boost value. e.g.:
-  </para>
-  <para>
-    recip(rord(myfield),1,2,3)^1.5
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setBoostFunction</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-
-$boostRecentDocsFunction = "recip(ms(NOW,mydatefield),3.16e-11,1,1)";
-$dismaxQuery->setBoostFunction($boostRecentDocsFunction);
-
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&bf=recip(ms(NOW,mydatefield),3.16e-11,1,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/solr/solrdismaxquery/setboostquery.xml b/reference/solr/solrdismaxquery/setboostquery.xml
deleted file mode 100644
index df122f4c4979..000000000000
--- a/reference/solr/solrdismaxquery/setboostquery.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setboostquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setBoostQuery</refname>
-  <refpurpose>Directly Sets Boost Query Parameter (bq)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setBoostQuery</methodname>
-   <methodparam><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Boost Query Parameter (bq)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>q</parameter></term>
-    <listitem>
-     <para>
-       query
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setBoostQuery</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-
-$dismaxQuery->setBoostQuery('cat:electronics manu:local^2');
-echo $dismaxQuery.PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&bq=cat:electronics manu:local^2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addBoostQuery</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removeBoostQuery</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/solr/solrdismaxquery/setminimummatch.xml b/reference/solr/solrdismaxquery/setminimummatch.xml
deleted file mode 100644
index d01684a6c120..000000000000
--- a/reference/solr/solrdismaxquery/setminimummatch.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setminimummatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setMinimumMatch</refname>
-  <refpurpose>Set Minimum "Should" Match (mm)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setMinimumMatch</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set Minimum "Should" Match parameter (mm). If the default query operator is AND then mm=100%, if the default query operator (q.op) is OR, then mm=0%. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      Minimum match value/expression
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setMinimumMatch</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-// 75% of the query clauses must match
-$dismaxQuery->setMinimumMatch("75%");
-echo $dismaxQuery . PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&mm=75%
-]]>
-   </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/solr/solrdismaxquery/setphrasefields.xml b/reference/solr/solrdismaxquery/setphrasefields.xml
deleted file mode 100644
index 30783ad29142..000000000000
--- a/reference/solr/solrdismaxquery/setphrasefields.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setphrasefields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setPhraseFields</refname>
-  <refpurpose>Sets  Phrase Fields and their boosts (and slops) using pf2 parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setPhraseFields</methodname>
-   <methodparam><type>string</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets  Phrase Fields (pf) and their boosts (and slops)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-      Fields, boosts [, slops]
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setPhraseFields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$dismaxQuery = new SolrDisMaxQuery("lucene");
-$dismaxQuery->setPhraseFields("cat~5.1^2 feature^4.5");
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf=cat~5.1^2 feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addPhraseFields</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removePhraseField</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/solr/solrdismaxquery/setphraseslop.xml b/reference/solr/solrdismaxquery/setphraseslop.xml
deleted file mode 100644
index 639d97c09ac4..000000000000
--- a/reference/solr/solrdismaxquery/setphraseslop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setphraseslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setPhraseSlop</refname>
-  <refpurpose>Sets the default slop on phrase queries (ps parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setPhraseSlop</methodname>
-   <methodparam><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the default amount of slop on phrase queries built with "pf", "pf2" and/or "pf3" fields (affects boosting).
-    "ps" parameter 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setPhraseSlop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-
-$dismaxQuery->setPhraseSlop(4);
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&ps=4
-]]>
-   </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/solr/solrdismaxquery/setqueryalt.xml b/reference/solr/solrdismaxquery/setqueryalt.xml
deleted file mode 100644
index 3cd85b862958..000000000000
--- a/reference/solr/solrdismaxquery/setqueryalt.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setqueryalt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setQueryAlt</refname>
-  <refpurpose>Set Query Alternate (q.alt parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setQueryAlt</methodname>
-   <methodparam><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set Query Alternate (q.alt parameter)
-  </para>
-  <para>
-    When the main <emphasis>q</emphasis> parameter is not specified or is blank. The <emphasis>q.alt</emphasis> parameter is used
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>q</parameter></term>
-    <listitem>
-     <para>
-      Query String
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setQueryAlt</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery();
-$dismaxQuery->setQueryAlt('*:*');
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-defType=edismax&q.alt=*:*&q=
-]]>
-   </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/solr/solrdismaxquery/setqueryphraseslop.xml b/reference/solr/solrdismaxquery/setqueryphraseslop.xml
deleted file mode 100644
index eff66b9b2744..000000000000
--- a/reference/solr/solrdismaxquery/setqueryphraseslop.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setqueryphraseslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setQueryPhraseSlop</refname>
-  <refpurpose>Specifies the amount of slop permitted on phrase queries explicitly included in the user's query string (qf parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setQueryPhraseSlop</methodname>
-   <methodparam><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The Query Phrase Slop is the amount of slop permitted on phrase queries explicitly included in the user's query string with the <emphasis>qf</emphasis> parameter.
-  </para>
-  <para>
-    slop refers to the number of positions one token needs to be moved in relation to another token in order to match a phrase specified in a query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      Amount of slop
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setQueryPhraseSlop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery();
-$dismaxQuery->setQueryPhraseSlop(3);
-echo $dismaxQuery;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-defType=edismax&qs=3
-]]>
-   </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/solr/solrdismaxquery/settiebreaker.xml b/reference/solr/solrdismaxquery/settiebreaker.xml
deleted file mode 100644
index 75e4553f64d4..000000000000
--- a/reference/solr/solrdismaxquery/settiebreaker.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.settiebreaker" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setTieBreaker</refname>
-  <refpurpose>Sets Tie Breaker parameter (tie parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setTieBreaker</methodname>
-   <methodparam><type>string</type><parameter>tieBreaker</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Tie Breaker parameter (tie parameter)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tieBreaker</parameter></term>
-    <listitem>
-     <para>
-        The <emphasis>tie</emphasis> parameter specifies a float value (which should be something much less than 1) to use as tiebreaker in DisMax queries.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setTieBreaker</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery();
-$dismaxQuery->setTieBreaker(0.1);
-
-echo $dismaxQuery;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-defType=edismax&tie=0.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/solr/solrdismaxquery/settrigramphrasefields.xml b/reference/solr/solrdismaxquery/settrigramphrasefields.xml
deleted file mode 100644
index 7bed4ecf25a9..000000000000
--- a/reference/solr/solrdismaxquery/settrigramphrasefields.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.settrigramphrasefields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setTrigramPhraseFields</refname>
-  <refpurpose>Directly Sets Trigram Phrase Fields (pf3 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setTrigramPhraseFields</methodname>
-   <methodparam><type>string</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Directly Sets Trigram Phrase Fields (pf3 parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-      Trigram Phrase Fields
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setTrigramPhraseFields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery->setTrigramPhraseFields('cat~5.1^2 feature^4.5');
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&pf3=cat~5.1^2 feature^4.5
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removeTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseSlop</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/solr/solrdismaxquery/settrigramphraseslop.xml b/reference/solr/solrdismaxquery/settrigramphraseslop.xml
deleted file mode 100644
index 80ac656f664f..000000000000
--- a/reference/solr/solrdismaxquery/settrigramphraseslop.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.settrigramphraseslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setTrigramPhraseSlop</refname>
-  <refpurpose>Sets Trigram Phrase Slop (ps3 parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setTrigramPhraseSlop</methodname>
-   <methodparam><type>string</type><parameter>slop</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets Trigram Phrase Slop (ps3 parameter)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>slop</parameter></term>
-    <listitem>
-     <para>
-      Phrase slop
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setTrigramPhraseSlop</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery->setTrigramPhraseSlop(2);
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&ps3=2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removeTrigramPhraseField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::setTrigramPhraseFields</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/solr/solrdismaxquery/setuserfields.xml b/reference/solr/solrdismaxquery/setuserfields.xml
deleted file mode 100644
index d311b9d46ec8..000000000000
--- a/reference/solr/solrdismaxquery/setuserfields.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.setuserfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::setUserFields</refname>
-  <refpurpose>Sets User Fields parameter (uf)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::setUserFields</methodname>
-   <methodparam><type>string</type><parameter>fields</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets User Fields parameter (uf)
-  </para>
-  <para>
-    User Fields: Specifies which schema fields the end user shall be allowed to query. 
-    
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fields</parameter></term>
-    <listitem>
-     <para>
-        Fields names separated by space
-     </para>
-     <para>
-        This parameter supports wildcards. 
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::setUserFields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery('lucene');
-$dismaxQuery->setUserFields('field1 field2 *_txt');
-echo $dismaxQuery.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&defType=edismax&uf=field1 field2 *_txt
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::addUserField</methodname></member>
-   <member><methodname>SolrDisMaxQuery::removeUserField</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/solr/solrdismaxquery/usedismaxqueryparser.xml b/reference/solr/solrdismaxquery/usedismaxqueryparser.xml
deleted file mode 100644
index 8ed928dd63f9..000000000000
--- a/reference/solr/solrdismaxquery/usedismaxqueryparser.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.usedismaxqueryparser" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::useDisMaxQueryParser</refname>
-  <refpurpose>Switch QueryParser to be DisMax Query Parser</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::useDisMaxQueryParser</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Switch QueryParser to be DisMax Query Parser
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::useDisMaxQueryParser</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery();
-$dismaxQuery->useDisMaxQueryParser();
-echo $dismaxQuery;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-defType=dismax
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDisMaxQuery::useDisMaxQueryParser</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/solr/solrdismaxquery/useedismaxqueryparser.xml b/reference/solr/solrdismaxquery/useedismaxqueryparser.xml
deleted file mode 100644
index e67e469a2e84..000000000000
--- a/reference/solr/solrdismaxquery/useedismaxqueryparser.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<refentry xml:id="solrdismaxquery.useedismaxqueryparser" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDisMaxQuery::useEDisMaxQueryParser</refname>
-  <refpurpose>Switch QueryParser to be EDisMax</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDisMaxQuery</type><methodname>SolrDisMaxQuery::useEDisMaxQueryParser</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Switch QueryParser to be EDisMax. By default the query builder uses edismax, if it was switched using <methodname>SolrDisMaxQuery::useDisMaxQueryParser</methodname>, it can be switched back using this method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrDisMaxQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrDisMaxQuery::useEDisMaxQueryParser</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$dismaxQuery = new SolrDisMaxQuery();
-$dismaxQuery->useEDisMaxQueryParser();
-echo $dismaxQuery;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-defType=edismax
-]]>
-   </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/solr/solrdocument.xml b/reference/solr/solrdocument.xml
deleted file mode 100644
index 08ed06e8f8fa..000000000000
--- a/reference/solr/solrdocument.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrdocument" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrDocument class</title>
- <titleabbrev>SolrDocument</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrDocument intro -->
-  <section xml:id="solrdocument.intro">
-   &reftitle.intro;
-   <para>
-    Represents a Solr document retrieved from a query response.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrdocument.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrDocument</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrDocument</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-default">SolrDocument::SORT_DEFAULT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-asc">SolrDocument::SORT_ASC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-desc">SolrDocument::SORT_DESC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-field-name">SolrDocument::SORT_FIELD_NAME</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-field-value-count">SolrDocument::SORT_FIELD_VALUE_COUNT</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrdocument.constants.sort-field-boost-value">SolrDocument::SORT_FIELD_BOOST_VALUE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrDocument constants -->
-  <section xml:id="solrdocument.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="solrdocument.constants.sort-default">
-     <term><constant>SolrDocument::SORT_DEFAULT</constant></term>
-     <listitem>
-      <para>Default mode for sorting fields within the document.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdocument.constants.sort-asc">
-     <term><constant>SolrDocument::SORT_ASC</constant></term>
-     <listitem>
-      <para>Sorts the fields in ascending order</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdocument.constants.sort-desc">
-     <term><constant>SolrDocument::SORT_DESC</constant></term>
-     <listitem>
-      <para>Sorts the fields in descending order</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdocument.constants.sort-field-name">
-     <term><constant>SolrDocument::SORT_FIELD_NAME</constant></term>
-     <listitem>
-      <para>Sorts the fields by field name.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdocument.constants.sort-field-value-count">
-     <term><constant>SolrDocument::SORT_FIELD_VALUE_COUNT</constant></term>
-     <listitem>
-      <para>Sorts the fields by number of values in each field.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrdocument.constants.sort-field-boost-value">
-     <term><constant>SolrDocument::SORT_FIELD_BOOST_VALUE</constant></term>
-     <listitem>
-      <para>Sorts the fields by their boost values.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrdocument;
-
-</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/solr/solrdocument/addfield.xml b/reference/solr/solrdocument/addfield.xml
deleted file mode 100644
index dca46a778a55..000000000000
--- a/reference/solr/solrdocument/addfield.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.addfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::addField</refname>
-  <refpurpose>Adds a field to the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::addField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method adds a field to the SolrDocument instance.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldValue</parameter></term>
-     <listitem>
-      <para>
-      The value of the field.
-      </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/solr/solrdocument/clear.xml b/reference/solr/solrdocument/clear.xml
deleted file mode 100644
index 0b3c001a1d95..000000000000
--- a/reference/solr/solrdocument/clear.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::clear</refname>
-  <refpurpose>Drops all the fields in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Resets the current object. Discards all the fields and resets the document boost to zero.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/solr/solrdocument/clone.xml b/reference/solr/solrdocument/clone.xml
deleted file mode 100644
index ba03a02bca5f..000000000000
--- a/reference/solr/solrdocument/clone.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.clone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__clone</refname>
-  <refpurpose>Creates a copy of a SolrDocument object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::__clone</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Creates a copy of a SolrDocument object. Not to be called directly.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/construct.xml b/reference/solr/solrdocument/construct.xml
deleted file mode 100644
index 35b28f6432d5..000000000000
--- a/reference/solr/solrdocument/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrDocument::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor for SolrDocument
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/current.xml b/reference/solr/solrdocument/current.xml
deleted file mode 100644
index 534a76f7a6d7..000000000000
--- a/reference/solr/solrdocument/current.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::current</refname>
-  <refpurpose>Retrieves the current field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDocumentField</type><methodname>SolrDocument::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the current field
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the 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/solr/solrdocument/deletefield.xml b/reference/solr/solrdocument/deletefield.xml
deleted file mode 100644
index e91804563839..000000000000
--- a/reference/solr/solrdocument/deletefield.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.deletefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::deleteField</refname>
-  <refpurpose>Removes a field from the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::deleteField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a field from the document.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       Name of the field
-      </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/solr/solrdocument/destruct.xml b/reference/solr/solrdocument/destruct.xml
deleted file mode 100644
index 3ac50ed5d31c..000000000000
--- a/reference/solr/solrdocument/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrDocument::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor for SolrDocument.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/fieldexists.xml b/reference/solr/solrdocument/fieldexists.xml
deleted file mode 100644
index c69f1d151032..000000000000
--- a/reference/solr/solrdocument/fieldexists.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.fieldexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::fieldExists</refname>
-  <refpurpose>Checks if a field exists in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::fieldExists</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if the requested field as a valid fieldname in the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the field is present and &false; if it does not.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/get.xml b/reference/solr/solrdocument/get.xml
deleted file mode 100644
index ceb77016a7d9..000000000000
--- a/reference/solr/solrdocument/get.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__get</refname>
-  <refpurpose>Access the field as a property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDocumentField</type><methodname>SolrDocument::__get</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Magic method for accessing the field as a property.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrDocumentField instance.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/getchilddocuments.xml b/reference/solr/solrdocument/getchilddocuments.xml
deleted file mode 100644
index 355c7c41231f..000000000000
--- a/reference/solr/solrdocument/getchilddocuments.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getchilddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getChildDocuments</refname>
-  <refpurpose>Returns an array of child documents (SolrDocument)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrDocument::getChildDocuments</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns an array of child documents (SolrDocument)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDocument::hasChildDocuments</methodname></member>   
-   <member><methodname>SolrDocument::getChildDocumentsCount</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/solr/solrdocument/getchilddocumentscount.xml b/reference/solr/solrdocument/getchilddocumentscount.xml
deleted file mode 100644
index a7098305ca5f..000000000000
--- a/reference/solr/solrdocument/getchilddocumentscount.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getchilddocumentscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getChildDocumentsCount</refname>
-  <refpurpose>Returns the number of child documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrDocument::getChildDocumentsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the number of child documents
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDocument::hasChildDocuments</methodname></member>   
-   <member><methodname>SolrDocument::getChildDocuments</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/solr/solrdocument/getfield.xml b/reference/solr/solrdocument/getfield.xml
deleted file mode 100644
index a3b53d4db4e3..000000000000
--- a/reference/solr/solrdocument/getfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getField</refname>
-  <refpurpose>Retrieves a field by name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDocumentField</type><methodname>SolrDocument::getField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves a field by name.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       Name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrDocumentField on success and &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/solr/solrdocument/getfieldcount.xml b/reference/solr/solrdocument/getfieldcount.xml
deleted file mode 100644
index 5e5d539330d8..000000000000
--- a/reference/solr/solrdocument/getfieldcount.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getfieldcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getFieldCount</refname>
-  <refpurpose>Returns the number of fields in this document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrDocument::getFieldCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of fields in this document. Multi-value fields are only counted once.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer on success and &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/solr/solrdocument/getfieldnames.xml b/reference/solr/solrdocument/getfieldnames.xml
deleted file mode 100644
index ad00efc0938d..000000000000
--- a/reference/solr/solrdocument/getfieldnames.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getfieldnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getFieldNames</refname>
-  <refpurpose>Returns an array of fields names in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrDocument::getFieldNames</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of fields names in the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the names of the fields in this document.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/getinputdocument.xml b/reference/solr/solrdocument/getinputdocument.xml
deleted file mode 100644
index c5fdb472ec8f..000000000000
--- a/reference/solr/solrdocument/getinputdocument.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.getinputdocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::getInputDocument</refname>
-  <refpurpose>Returns a SolrInputDocument equivalent of the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrInputDocument</type><methodname>SolrDocument::getInputDocument</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a SolrInputDocument equivalent of the object. This is useful if one wishes to resubmit/update a document retrieved from a query.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrInputDocument on success and &null; 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/solr/solrdocument/haschilddocuments.xml b/reference/solr/solrdocument/haschilddocuments.xml
deleted file mode 100644
index d8eb79be99ab..000000000000
--- a/reference/solr/solrdocument/haschilddocuments.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.haschilddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::hasChildDocuments</refname>
-  <refpurpose>Checks whether the document has any child documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::hasChildDocuments</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Checks whether the document has any child documents
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrDocument::getChildDocuments</methodname></member>   
-   <member><methodname>SolrDocument::getChildDocumentsCount</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/solr/solrdocument/isset.xml b/reference/solr/solrdocument/isset.xml
deleted file mode 100644
index 48c2af060782..000000000000
--- a/reference/solr/solrdocument/isset.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__isset</refname>
-  <refpurpose>Checks if a field exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::__isset</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if a field exists
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       Name of the field.
-      </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/solr/solrdocument/key.xml b/reference/solr/solrdocument/key.xml
deleted file mode 100644
index 7a96640687c5..000000000000
--- a/reference/solr/solrdocument/key.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::key</refname>
-  <refpurpose>Retrieves the current key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrDocument::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the current key. 
-  </para>
-
-  </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current key.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/merge.xml b/reference/solr/solrdocument/merge.xml
deleted file mode 100644
index d8857d4d244a..000000000000
--- a/reference/solr/solrdocument/merge.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::merge</refname>
-  <refpurpose>Merges source to the current SolrDocument</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::merge</methodname>
-   <methodparam><type>SolrDocument</type><parameter>sourceDoc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges source to the current SolrDocument.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sourceDoc</parameter></term>
-     <listitem>
-      <para>
-       The source document.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-      If this is &true; then fields with the same name in the destination document will be overwritten.
-      </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/solr/solrdocument/next.xml b/reference/solr/solrdocument/next.xml
deleted file mode 100644
index 1a6dace9d62f..000000000000
--- a/reference/solr/solrdocument/next.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::next</refname>
-  <refpurpose>Moves the internal pointer to the next field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Moves the internal pointer to the next field.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  This method has no return value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/offsetexists.xml b/reference/solr/solrdocument/offsetexists.xml
deleted file mode 100644
index 82cf328a9376..000000000000
--- a/reference/solr/solrdocument/offsetexists.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::offsetExists</refname>
-  <refpurpose>Checks if a particular field exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::offsetExists</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if a particular field exists. This is used when the object is treated as an array.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </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/solr/solrdocument/offsetget.xml b/reference/solr/solrdocument/offsetget.xml
deleted file mode 100644
index d616c56da00f..000000000000
--- a/reference/solr/solrdocument/offsetget.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::offsetGet</refname>
-  <refpurpose>Retrieves a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDocumentField</type><methodname>SolrDocument::offsetGet</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is used to retrieve the field when the object is treated as an array.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrDocumentField 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/solr/solrdocument/offsetset.xml b/reference/solr/solrdocument/offsetset.xml
deleted file mode 100644
index 193121a175e9..000000000000
--- a/reference/solr/solrdocument/offsetset.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::offsetSet</refname>
-  <refpurpose>Adds a field to the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::offsetSet</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Used when the object is treated as an array to add a field to the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldValue</parameter></term>
-     <listitem>
-      <para>
-       The value for this field.
-      </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/solr/solrdocument/offsetunset.xml b/reference/solr/solrdocument/offsetunset.xml
deleted file mode 100644
index d8e167e38d07..000000000000
--- a/reference/solr/solrdocument/offsetunset.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::offsetUnset</refname>
-  <refpurpose>Removes a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::offsetUnset</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a field from the document.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   No return value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/reset.xml b/reference/solr/solrdocument/reset.xml
deleted file mode 100644
index 716c1a1897fa..000000000000
--- a/reference/solr/solrdocument/reset.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::reset</refname>
-  <refpurpose>&Alias; <methodname>SolrDocument::clear</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::reset</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   This is an alias to SolrDocument::clear()
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/solr/solrdocument/rewind.xml b/reference/solr/solrdocument/rewind.xml
deleted file mode 100644
index 2a798ca238e5..000000000000
--- a/reference/solr/solrdocument/rewind.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::rewind</refname>
-  <refpurpose>Resets the internal pointer to the beginning</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Resets the internal pointer to the beginning.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method has no return value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/serialize.xml b/reference/solr/solrdocument/serialize.xml
deleted file mode 100644
index 607a4ff8d4ff..000000000000
--- a/reference/solr/solrdocument/serialize.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.serialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::serialize</refname>
-  <refpurpose>Used for custom serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrDocument::serialize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Used for custom serialization.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string representing the serialized Solr document.
-  </para>
- </refsect1>
-
- </refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/set.xml b/reference/solr/solrdocument/set.xml
deleted file mode 100644
index cfc74ac2a752..000000000000
--- a/reference/solr/solrdocument/set.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__set</refname>
-  <refpurpose>Adds another field to the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::__set</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds another field to the document. Used to set the fields as new properties.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       Name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldValue</parameter></term>
-     <listitem>
-      <para>
-       Field 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/solr/solrdocument/sort.xml b/reference/solr/solrdocument/sort.xml
deleted file mode 100644
index 9a446f51cadb..000000000000
--- a/reference/solr/solrdocument/sort.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::sort</refname>
-  <refpurpose>Sorts the fields in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::sort</methodname>
-   <methodparam><type>int</type><parameter>sortOrderBy</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter><initializer>SolrDocument::SORT_ASC</initializer></methodparam>
-  </methodsynopsis>
-  <para>
- <![CDATA[
-   The fields are rearranged according to the specified criteria and sort direction
-   
-   Fields can be sorted by boost values, field names and number of values.
-   
-   The sortOrderBy parameter must be one of :
-   
-   * SolrDocument::SORT_FIELD_NAME
-   * SolrDocument::SORT_FIELD_BOOST_VALUE
-   * SolrDocument::SORT_FIELD_VALUE_COUNT
-   
-   The sortDirection can be one of :
-   
-   * SolrDocument::SORT_DEFAULT
-   * SolrDocument::SORT_ASC
-   * SolrDocument::SORT_DESC
-   
-   The default way is to sort in ascending order.
-]]>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sortOrderBy</parameter></term>
-     <listitem>
-      <para>
-       The sort criteria.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sortDirection</parameter></term>
-     <listitem>
-      <para>
-       The sort direction.
-      </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/solr/solrdocument/toarray.xml b/reference/solr/solrdocument/toarray.xml
deleted file mode 100644
index e0e7b3a4cb64..000000000000
--- a/reference/solr/solrdocument/toarray.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::toArray</refname>
-     <refpurpose>Returns an array representation of the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrDocument::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array representation of the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array representation of the document.
-  </para>
- </refsect1>
- 
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrDocument::toArray</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$doc = new SolrDocument();
-
-$doc->addField('id', 1123);
-
-$doc->features = "PHP Client Side";
-$doc->features = "Fast development cycles";
-
-$doc['cat'] = 'Software';
-$doc['cat'] = 'Custom Search';
-$doc->cat   = 'Information Technology';
-
-print_r($doc->toArray());
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Array
-(
-    [document_boost] => 0
-    [field_count] => 3
-    [fields] => Array
-        (
-            [0] => SolrDocumentField Object
-                (
-                    [name] => id
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => 1123
-                        )
-
-                )
-
-            [1] => SolrDocumentField Object
-                (
-                    [name] => features
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => PHP Client Side
-                            [1] => Fast development cycles
-                        )
-
-                )
-
-            [2] => SolrDocumentField Object
-                (
-                    [name] => cat
-                    [boost] => 0
-                    [values] => Array
-                        (
-                            [0] => Software
-                            [1] => Custom Search
-                            [2] => Information Technology
-                        )
-
-                )
-
-        )
-
-)
-]]>
-    </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/solr/solrdocument/unserialize.xml b/reference/solr/solrdocument/unserialize.xml
deleted file mode 100644
index a24d6f7109d2..000000000000
--- a/reference/solr/solrdocument/unserialize.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::unserialize</refname>
-  <refpurpose>Custom serialization of SolrDocument objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrDocument::unserialize</methodname>
-   <methodparam><type>string</type><parameter>serialized</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Custom serialization of SolrDocument objects
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>serialized</parameter></term>
-     <listitem>
-      <para>
-       An XML representation of the document.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocument/unset.xml b/reference/solr/solrdocument/unset.xml
deleted file mode 100644
index 4e59efcf3568..000000000000
--- a/reference/solr/solrdocument/unset.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.unset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::__unset</refname>
-  <refpurpose>Removes a field from the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::__unset</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a field from the document when the field is access as an object property.
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </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/solr/solrdocument/valid.xml b/reference/solr/solrdocument/valid.xml
deleted file mode 100644
index 16724130157b..000000000000
--- a/reference/solr/solrdocument/valid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocument.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocument::valid</refname>
-  <refpurpose>Checks if the current position internally is still valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrDocument::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Checks if the current position internally is still valid. It is used during foreach operations.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; on success and &false; if the current position is no longer valid.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocumentfield.xml b/reference/solr/solrdocumentfield.xml
deleted file mode 100644
index ccb8ab0e2868..000000000000
--- a/reference/solr/solrdocumentfield.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrdocumentfield" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrDocumentField class</title>
- <titleabbrev>SolrDocumentField</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrDocumentField intro -->
-  <section xml:id="solrdocumentfield.intro">
-   &reftitle.intro;
-   <para>
-    This represents a field in a Solr document. All its properties are read-only.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrdocumentfield.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrDocumentField</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrDocumentField</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>string</type>
-     <varname linkend="solrdocumentfield.props.name">name</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>float</type>
-     <varname linkend="solrdocumentfield.props.boost">boost</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>array</type>
-     <varname linkend="solrdocumentfield.props.values">values</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocumentfield')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrdocumentfield')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrDocumentField properties -->
-  <section xml:id="solrdocumentfield.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="solrdocumentfield.props.name">
-     <term><varname>name</varname></term>
-     <listitem>
-      <para>The name of the field.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrdocumentfield.props.boost">
-     <term><varname>boost</varname></term>
-     <listitem>
-      <para>The boost value for the field</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrdocumentfield.props.values">
-     <term><varname>values</varname></term>
-     <listitem>
-      <para>An array of values for this field</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrdocumentfield;
-
-</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/solr/solrdocumentfield/construct.xml b/reference/solr/solrdocumentfield/construct.xml
deleted file mode 100644
index 6def2fdca3ba..000000000000
--- a/reference/solr/solrdocumentfield/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocumentfield.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocumentField::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrDocumentField::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrdocumentfield/destruct.xml b/reference/solr/solrdocumentfield/destruct.xml
deleted file mode 100644
index 8dc732c399e6..000000000000
--- a/reference/solr/solrdocumentfield/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrdocumentfield.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrDocumentField::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrDocumentField::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrexception.xml b/reference/solr/solrexception.xml
deleted file mode 100644
index c2079d73b86e..000000000000
--- a/reference/solr/solrexception.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrException class</title>
- <titleabbrev>SolrException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrException intro -->
-  <section xml:id="solrexception.intro">
-   &reftitle.intro;
-   <para>
-    This is the base class for all exception thrown by the Solr extension classes.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrException</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="solrexception.props.sourceline">sourceline</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrexception.props.sourcefile">sourcefile</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrexception.props.zif-name">zif_name</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.solrexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrException properties -->
-  <section xml:id="solrexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="solrexception.props.sourceline">
-     <term><varname>sourceline</varname></term>
-     <listitem>
-      <para>The line in c-space source file where exception was generated</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrexception.props.sourcefile">
-     <term><varname>sourcefile</varname></term>
-     <listitem>
-      <para>The c-space source file where exception was generated</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrexception.props.zif-name">
-     <term><varname>zif_name</varname></term>
-     <listitem>
-      <para>The c-space function where exception was generated</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrexception;
-
-</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/solr/solrexception/getinternalinfo.xml b/reference/solr/solrexception/getinternalinfo.xml
deleted file mode 100644
index e05e2848865b..000000000000
--- a/reference/solr/solrexception/getinternalinfo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrexception.getinternalinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrException::getInternalInfo</refname>
-  <refpurpose>Returns internal information where the Exception was thrown</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrException::getInternalInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns internal information where the Exception was thrown.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing internal information where the error was thrown. Used only for debugging by extension developers.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrgenericresponse.xml b/reference/solr/solrgenericresponse.xml
deleted file mode 100644
index 9b8f5b2ddd75..000000000000
--- a/reference/solr/solrgenericresponse.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrgenericresponse" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrGenericResponse class</title>
- <titleabbrev>SolrGenericResponse</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrGenericResponse intro -->
-  <section xml:id="solrgenericresponse.intro">
-   &reftitle.intro;
-   <para>
-   Represents a response from the solr server.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrgenericresponse.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrGenericResponse</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrGenericResponse</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrResponse</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrgenericresponse.constants.parse-solr-obj">SolrGenericResponse::PARSE_SOLR_OBJ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrgenericresponse.constants.parse-solr-doc">SolrGenericResponse::PARSE_SOLR_DOC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrgenericresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrgenericresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrGenericResponse constants -->
-  <section xml:id="solrgenericresponse.constants">
-   &reftitle.constants;
-   <section xml:id="solrgenericresponse.constants.types">
-    <title>SolrGenericResponse Class constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrgenericresponse.constants.parse-solr-obj">
-      <term><constant>SolrGenericResponse::PARSE_SOLR_OBJ</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrObject instances</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrgenericresponse.constants.parse-solr-doc">
-      <term><constant>SolrGenericResponse::PARSE_SOLR_DOC</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrDocument instances.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrgenericresponse;
-
-</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/solr/solrgenericresponse/construct.xml b/reference/solr/solrgenericresponse/construct.xml
deleted file mode 100644
index 34f68909215b..000000000000
--- a/reference/solr/solrgenericresponse/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrgenericresponse.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrGenericResponse::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrGenericResponse::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor
-  </para> 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrgenericresponse/destruct.xml b/reference/solr/solrgenericresponse/destruct.xml
deleted file mode 100644
index b742e9124009..000000000000
--- a/reference/solr/solrgenericresponse/destruct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrgenericresponse.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrGenericResponse::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrGenericResponse::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrillegalargumentexception.xml b/reference/solr/solrillegalargumentexception.xml
deleted file mode 100644
index f674dac425f6..000000000000
--- a/reference/solr/solrillegalargumentexception.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrillegalargumentexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrIllegalArgumentException class</title>
- <titleabbrev>SolrIllegalArgumentException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrIllegalArgumentException intro -->
-  <section xml:id="solrillegalargumentexception.intro">
-   &reftitle.intro;
-   <para>
-   This object is thrown when an illegal or invalid argument is passed to a method.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrillegalargumentexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrIllegalArgumentException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrIllegalArgumentException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrException</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)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
-        
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrillegalargumentexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
- &reference.solr.entities.solrillegalargumentexception;
-
-</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/solr/solrillegalargumentexception/getinternalinfo.xml b/reference/solr/solrillegalargumentexception/getinternalinfo.xml
deleted file mode 100644
index b71bc780fa5c..000000000000
--- a/reference/solr/solrillegalargumentexception/getinternalinfo.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrillegalargumentexception.getinternalinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrIllegalArgumentException::getInternalInfo</refname>
-  <refpurpose>Returns internal information where the Exception was thrown</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrIllegalArgumentException::getInternalInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns internal information where the Exception was thrown.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing internal information where the error was thrown. Used only for debugging by extension developers.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrillegaloperationexception.xml b/reference/solr/solrillegaloperationexception.xml
deleted file mode 100644
index 68b0d6c703be..000000000000
--- a/reference/solr/solrillegaloperationexception.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrillegaloperationexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrIllegalOperationException class</title>
- <titleabbrev>SolrIllegalOperationException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrIllegalOperationException intro -->
-  <section xml:id="solrillegaloperationexception.intro">
-   &reftitle.intro;
-   <para>
-    This object is thrown when an illegal or unsupported operation is performed on an object.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrillegaloperationexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrIllegalOperationException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrIllegalOperationException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrException</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)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrillegaloperationexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
- &reference.solr.entities.solrillegaloperationexception;
-
-</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/solr/solrillegaloperationexception/getinternalinfo.xml b/reference/solr/solrillegaloperationexception/getinternalinfo.xml
deleted file mode 100644
index 03c0864550f9..000000000000
--- a/reference/solr/solrillegaloperationexception/getinternalinfo.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrillegaloperationexception.getinternalinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrIllegalOperationException::getInternalInfo</refname>
-  <refpurpose>Returns internal information where the Exception was thrown</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrIllegalOperationException::getInternalInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns internal information where the Exception was thrown.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing internal information where the error was thrown. Used only for debugging by extension developers.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument.xml b/reference/solr/solrinputdocument.xml
deleted file mode 100644
index 66cd286268ec..000000000000
--- a/reference/solr/solrinputdocument.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrinputdocument" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrInputDocument class</title>
- <titleabbrev>SolrInputDocument</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrInputDocument intro -->
-  <section xml:id="solrinputdocument.intro">
-   &reftitle.intro;
-   <para>
-    This class represents a Solr document that is about to be submitted to the Solr index.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrinputdocument.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrInputDocument</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrInputDocument</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-default">SolrInputDocument::SORT_DEFAULT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-asc">SolrInputDocument::SORT_ASC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-desc">SolrInputDocument::SORT_DESC</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-field-name">SolrInputDocument::SORT_FIELD_NAME</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-field-value-count">SolrInputDocument::SORT_FIELD_VALUE_COUNT</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrinputdocument.constants.sort-field-boost-value">SolrInputDocument::SORT_FIELD_BOOST_VALUE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrinputdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrinputdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrinputdocument')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-  
-<!-- {{{ SolrInputDocument constants -->
-  <section xml:id="solrinputdocument.constants">
-   &reftitle.constants;
-   <section xml:id="solrinputdocument.constants.types">
-    <title>SolrInputDocument Class Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-default">
-      <term><constant>SolrInputDocument::SORT_DEFAULT</constant></term>
-      <listitem>
-       <para>Sorts the fields in ascending order.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-asc">
-      <term><constant>SolrInputDocument::SORT_ASC</constant></term>
-      <listitem>
-       <para>Sorts the fields in ascending order.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-desc">
-      <term><constant>SolrInputDocument::SORT_DESC</constant></term>
-      <listitem>
-       <para>Sorts the fields in descending order.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-field-name">
-      <term><constant>SolrInputDocument::SORT_FIELD_NAME</constant></term>
-      <listitem>
-       <para>Sorts the fields by name</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-field-value-count">
-      <term><constant>SolrInputDocument::SORT_FIELD_VALUE_COUNT</constant></term>
-      <listitem>
-       <para>Sorts the fields by number of values.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrinputdocument.constants.sort-field-boost-value">
-      <term><constant>SolrInputDocument::SORT_FIELD_BOOST_VALUE</constant></term>
-      <listitem>
-       <para>Sorts the fields by boost value.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrinputdocument;
-
-</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/solr/solrinputdocument/addchilddocument.xml b/reference/solr/solrinputdocument/addchilddocument.xml
deleted file mode 100644
index 325314f5d56a..000000000000
--- a/reference/solr/solrinputdocument/addchilddocument.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.addchilddocument" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::addChildDocument</refname>
-  <refpurpose>Adds a child document for block indexing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrInputDocument::addChildDocument</methodname>
-   <methodparam><type>SolrInputDocument</type><parameter>child</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds a child document to construct a document block with nested documents.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>child</parameter></term>
-    <listitem>
-     <para>
-      A <type>SolrInputDocument</type> object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrIllegalArgumentException</classname> on failure.
-  </para>
-  <para>
-   Throws <classname>SolrException</classname> on internal failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrInputDocument::addChildDocument</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_STORE_PATH,
-);
-
-$client = new SolrClient($options);
-
-$product = new SolrInputDocument();
-
-$product->addField('id', 'P-BLACK');
-$product->addField('cat', 'tshirt');
-$product->addField('cat', 'polo');
-$product->addField('content_type', 'product');
-
-$small = new SolrInputDocument();
-$small->addField('id', 'TS-BLK-S');
-$small->addField('content_type', 'sku');
-$small->addField('size', 'S');
-$small->addField('inventory', 100);
-
-$medium = new SolrInputDocument();
-$medium->addField('id', 'TS-BLK-M');
-$medium->addField('content_type', 'sku');
-$medium->addField('size', 'M');
-$medium->addField('inventory', 200);
-
-$large = new SolrInputDocument();
-$large->addField('id', 'TS-BLK-L');
-$large->addField('content_type', 'sku');
-$large->addField('size', 'L');
-$large->addField('inventory', 300);
-
-// add child documents 
-$product->addChildDocument($small);
-$product->addChildDocument($medium);
-$product->addChildDocument($large);
-
-// add product document block to the index
-$updateResponse = $client->addDocument(
-        $product,
-        true, // overwrite if the document exists
-        10000 // commit within 10 seconds
-);
-
-print_r($updateResponse->getResponse());
-
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 5
-        )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrInputDocument::addChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::hasChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocumentsCount</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/solr/solrinputdocument/addchilddocuments.xml b/reference/solr/solrinputdocument/addchilddocuments.xml
deleted file mode 100644
index a2c56ae4cf76..000000000000
--- a/reference/solr/solrinputdocument/addchilddocuments.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.addchilddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::addChildDocuments</refname>
-  <refpurpose>Adds an array of child documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrInputDocument::addChildDocuments</methodname>
-   <methodparam><type>array</type><parameter role="reference">docs</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Adds an array of child documents to the current input document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>docs</parameter></term>
-    <listitem>
-     <para>
-      An <type>array</type> of <type>SolrInputDocument</type> objects.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Throws <classname>SolrIllegalArgumentException</classname> on failure.
-  </para>
-  <para>
-   Throws <classname>SolrException</classname> on internal failure.
-  </para>
- </refsect1>
-
-  <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrInputDocument::addChildDocuments</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-    'path'     => SOLR_SERVER_STORE_PATH,
-);
-
-$client = new SolrClient($options);
-
-$product = new SolrInputDocument();
-
-$product->addField('id', 'P-BLACK');
-$product->addField('cat', 'tshirt');
-$product->addField('cat', 'polo');
-$product->addField('content_type', 'product');
-
-$small = new SolrInputDocument();
-$small->addField('id', 'TS-BLK-S');
-$small->addField('content_type', 'sku');
-$small->addField('size', 'S');
-$small->addField('inventory', 100);
-
-$medium = new SolrInputDocument();
-$medium->addField('id', 'TS-BLK-M');
-$medium->addField('content_type', 'sku');
-$medium->addField('size', 'M');
-$medium->addField('inventory', 200);
-
-$large = new SolrInputDocument();
-$large->addField('id', 'TS-BLK-L');
-$large->addField('content_type', 'sku');
-$large->addField('size', 'L');
-$large->addField('inventory', 300);
-
-// add child documents 
-$skus = [$small, $medium, $large];
-$product->addChildDocuments($skus);
-
-// add the product document block to the index
-$updateResponse = $client->addDocument(
-        $product,
-        true, // overwrite if the document exists
-        10000 // commit within 10 seconds
-);
-
-print_r($updateResponse->getResponse());
-
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 5
-        )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrInputDocument::addChildDocument</methodname></member>
-   <member><methodname>SolrInputDocument::hasChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocumentsCount</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/solr/solrinputdocument/addfield.xml b/reference/solr/solrinputdocument/addfield.xml
deleted file mode 100644
index 5af9e4e65946..000000000000
--- a/reference/solr/solrinputdocument/addfield.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.addfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::addField</refname>
-  <refpurpose>Adds a field to the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::addField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-   <methodparam><type>string</type><parameter>fieldValue</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>fieldBoostValue</parameter><initializer>0.0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   For multi-value fields, if a valid boost value is specified, the specified value will be multiplied by the current boost value for this field.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldValue</parameter></term>
-     <listitem>
-      <para>
-       The value for the field.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldBoostValue</parameter></term>
-     <listitem>
-      <para>
-      The index time boost for the field. Though this cannot be negative, you can still pass values less than 1.0 but they must be greater than zero.
-      </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/solr/solrinputdocument/clear.xml b/reference/solr/solrinputdocument/clear.xml
deleted file mode 100644
index 2e9921d686e3..000000000000
--- a/reference/solr/solrinputdocument/clear.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::clear</refname>
-  <refpurpose>Resets the input document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Resets the document by dropping all the fields and resets the document boost to zero.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/solr/solrinputdocument/clone.xml b/reference/solr/solrinputdocument/clone.xml
deleted file mode 100644
index d372d6c617e0..000000000000
--- a/reference/solr/solrinputdocument/clone.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.clone" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::__clone</refname>
-  <refpurpose>Creates a copy of a SolrDocument</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrInputDocument::__clone</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Should not be called directly. It is used to create a deep copy of a SolrInputDocument.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Creates a new SolrInputDocument instance.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument/construct.xml b/reference/solr/solrinputdocument/construct.xml
deleted file mode 100644
index cd62c7b62cc0..000000000000
--- a/reference/solr/solrinputdocument/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrInputDocument::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument/deletefield.xml b/reference/solr/solrinputdocument/deletefield.xml
deleted file mode 100644
index 2aca3b9e6697..000000000000
--- a/reference/solr/solrinputdocument/deletefield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.deletefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::deleteField</refname>
-  <refpurpose>Removes a field from the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::deleteField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a field from the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </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/solr/solrinputdocument/destruct.xml b/reference/solr/solrinputdocument/destruct.xml
deleted file mode 100644
index 3e7649fe3f0a..000000000000
--- a/reference/solr/solrinputdocument/destruct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrInputDocument::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument/fieldexists.xml b/reference/solr/solrinputdocument/fieldexists.xml
deleted file mode 100644
index d5c7594f09ee..000000000000
--- a/reference/solr/solrinputdocument/fieldexists.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.fieldexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::fieldExists</refname>
-  <refpurpose>Checks if a field exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::fieldExists</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if a field exists
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       Name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the field was found and &false; if it was 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/solr/solrinputdocument/getboost.xml b/reference/solr/solrinputdocument/getboost.xml
deleted file mode 100644
index d607dd300ac2..000000000000
--- a/reference/solr/solrinputdocument/getboost.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getBoost</refname>
-  <refpurpose>Retrieves the current boost value for the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SolrInputDocument::getBoost</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the current boost value for the document.
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns the boost value on success and &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/solr/solrinputdocument/getchilddocuments.xml b/reference/solr/solrinputdocument/getchilddocuments.xml
deleted file mode 100644
index c9b7772764c9..000000000000
--- a/reference/solr/solrinputdocument/getchilddocuments.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getchilddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getChildDocuments</refname>
-  <refpurpose>Returns an array of child documents (SolrInputDocument)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrInputDocument::getChildDocuments</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns an array of child documents (SolrInputDocument)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrInputDocument::addChildDocument</methodname></member>   
-   <member><methodname>SolrInputDocument::addChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::hasChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocumentsCount</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/solr/solrinputdocument/getchilddocumentscount.xml b/reference/solr/solrinputdocument/getchilddocumentscount.xml
deleted file mode 100644
index cced021d0c94..000000000000
--- a/reference/solr/solrinputdocument/getchilddocumentscount.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getchilddocumentscount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getChildDocumentsCount</refname>
-  <refpurpose>Returns the number of child documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrInputDocument::getChildDocumentsCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the number of child documents
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrInputDocument::addChildDocument</methodname></member>   
-   <member><methodname>SolrInputDocument::addChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::hasChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocuments</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/solr/solrinputdocument/getfield.xml b/reference/solr/solrinputdocument/getfield.xml
deleted file mode 100644
index 07e4a918aaf8..000000000000
--- a/reference/solr/solrinputdocument/getfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getField</refname>
-  <refpurpose>Retrieves a field by name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrDocumentField</type><methodname>SolrInputDocument::getField</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves a field in the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrDocumentField object on success and &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/solr/solrinputdocument/getfieldboost.xml b/reference/solr/solrinputdocument/getfieldboost.xml
deleted file mode 100644
index 02562be4edfe..000000000000
--- a/reference/solr/solrinputdocument/getfieldboost.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getfieldboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getFieldBoost</refname>
-  <refpurpose>Retrieves the boost value for a particular field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SolrInputDocument::getFieldBoost</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves the boost value for a particular field.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the boost value for the field or &false; if there was an error.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument/getfieldcount.xml b/reference/solr/solrinputdocument/getfieldcount.xml
deleted file mode 100644
index eabfeb5abde7..000000000000
--- a/reference/solr/solrinputdocument/getfieldcount.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getfieldcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getFieldCount</refname>
-  <refpurpose>Returns the number of fields in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>SolrInputDocument::getFieldCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of fields in the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns an integer 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/solr/solrinputdocument/getfieldnames.xml b/reference/solr/solrinputdocument/getfieldnames.xml
deleted file mode 100644
index dda4b6368a0e..000000000000
--- a/reference/solr/solrinputdocument/getfieldnames.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.getfieldnames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::getFieldNames</refname>
-  <refpurpose>Returns an array containing all the fields in the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrInputDocument::getFieldNames</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array containing all the fields in the document.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array on success and &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/solr/solrinputdocument/haschilddocuments.xml b/reference/solr/solrinputdocument/haschilddocuments.xml
deleted file mode 100644
index aa25dce3ed3d..000000000000
--- a/reference/solr/solrinputdocument/haschilddocuments.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.haschilddocuments" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::hasChildDocuments</refname>
-  <refpurpose>Returns true if the document has any child documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::hasChildDocuments</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Checks whether the document has any child documents
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrInputDocument::addChildDocument</methodname></member>   
-   <member><methodname>SolrInputDocument::addChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocuments</methodname></member>
-   <member><methodname>SolrInputDocument::getChildDocumentsCount</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/solr/solrinputdocument/merge.xml b/reference/solr/solrinputdocument/merge.xml
deleted file mode 100644
index ef7b0607c6d6..000000000000
--- a/reference/solr/solrinputdocument/merge.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::merge</refname>
-  <refpurpose>Merges one input document into another</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::merge</methodname>
-   <methodparam><type>SolrInputDocument</type><parameter>sourceDoc</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges one input document into another.
-  </para> 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sourceDoc</parameter></term>
-     <listitem>
-      <para>
-       The source document.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>overwrite</parameter></term>
-     <listitem>
-      <para>
-       If this is &true; it will replace matching fields in the destination document.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success; In the future, this will be modified to return the number of fields in the new document.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrinputdocument/reset.xml b/reference/solr/solrinputdocument/reset.xml
deleted file mode 100644
index dab04e32050a..000000000000
--- a/reference/solr/solrinputdocument/reset.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::reset</refname>
-  <refpurpose>&Alias; <methodname>SolrInputDocument::clear</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::reset</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   This is an alias of SolrInputDocument::clear
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/solr/solrinputdocument/setboost.xml b/reference/solr/solrinputdocument/setboost.xml
deleted file mode 100644
index 4cfc81fa2df3..000000000000
--- a/reference/solr/solrinputdocument/setboost.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.setboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::setBoost</refname>
-  <refpurpose>Sets the boost value for this document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::setBoost</methodname>
-   <methodparam><type>float</type><parameter>documentBoostValue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the boost value for this document.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>documentBoostValue</parameter></term>
-     <listitem>
-      <para>
-       The index-time boost value for this document.
-      </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/solr/solrinputdocument/setfieldboost.xml b/reference/solr/solrinputdocument/setfieldboost.xml
deleted file mode 100644
index c6cd0e4a228c..000000000000
--- a/reference/solr/solrinputdocument/setfieldboost.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.setfieldboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::setFieldBoost</refname>
-  <refpurpose>Sets the index-time boost value for a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::setFieldBoost</methodname>
-   <methodparam><type>string</type><parameter>fieldName</parameter></methodparam>
-   <methodparam><type>float</type><parameter>fieldBoostValue</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the index-time boost value for a field. This replaces the current boost value for this field.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldName</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>fieldBoostValue</parameter></term>
-     <listitem>
-      <para>
-       The index time boost 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/solr/solrinputdocument/sort.xml b/reference/solr/solrinputdocument/sort.xml
deleted file mode 100644
index 4849f40cc499..000000000000
--- a/reference/solr/solrinputdocument/sort.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.sort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::sort</refname>
-  <refpurpose>Sorts the fields within the document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrInputDocument::sort</methodname>
-   <methodparam><type>int</type><parameter>sortOrderBy</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sortDirection</parameter><initializer>SolrInputDocument::SORT_ASC</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-<![CDATA[
- 
-   The fields are rearranged according to the specified criteria and sort direction
-   
-   Fields can be sorted by boost values, field names and number of values.
-   
-   The $order_by parameter must be one of :
-   
-   * SolrInputDocument::SORT_FIELD_NAME
-   * SolrInputDocument::SORT_FIELD_BOOST_VALUE
-   * SolrInputDocument::SORT_FIELD_VALUE_COUNT
-   
-   The sort direction can be one of :
-   
-   * SolrInputDocument::SORT_DEFAULT
-   * SolrInputDocument::SORT_ASC
-   * SolrInputDocument::SORT_DESC
-   
-]]>
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sortOrderBy</parameter></term>
-     <listitem>
-      <para>
-       The sort criteria
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sortDirection</parameter></term>
-     <listitem>
-      <para>
-       The sort direction
-      </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/solr/solrinputdocument/toarray.xml b/reference/solr/solrinputdocument/toarray.xml
deleted file mode 100644
index 43eda7dacdd7..000000000000
--- a/reference/solr/solrinputdocument/toarray.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrinputdocument.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrInputDocument::toArray</refname>
-  <refpurpose>Returns an array representation of the input document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrInputDocument::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array representation of the input document.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing the fields. It returns &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/solr/solrmissingmandatoryparameterexception.xml b/reference/solr/solrmissingmandatoryparameterexception.xml
deleted file mode 100644
index 725c676c3644..000000000000
--- a/reference/solr/solrmissingmandatoryparameterexception.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrmissingmandatoryparameterexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrMissingMandatoryParameterException class</title>
- <titleabbrev>SolrMissingMandatoryParameterException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrMissingMandatoryParameterException intro -->
-  <section xml:id="solrmissingmandatoryparameterexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrmissingmandatoryparameterexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrMissingMandatoryParameterException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrMissingMandatoryParameterException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrException</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)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <!-- 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmissingmandatoryparameterexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- <!--&reference.solr.entities.solrmissingmandatoryparameterexception;-->
-
-</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/solr/solrmodifiableparams.xml b/reference/solr/solrmodifiableparams.xml
deleted file mode 100644
index 4288151ba9f0..000000000000
--- a/reference/solr/solrmodifiableparams.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrmodifiableparams" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrModifiableParams class</title>
- <titleabbrev>SolrModifiableParams</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrModifiableParams intro -->
-  <section xml:id="solrmodifiableparams.intro">
-   &reftitle.intro;
-   <para>
-    Represents a collection of name-value pairs sent to the Solr server during a request.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrmodifiableparams.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrModifiableParams</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrModifiableParams</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrParams</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrparams')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.solr.entities.solrmodifiableparams;
-
-</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/solr/solrmodifiableparams/construct.xml b/reference/solr/solrmodifiableparams/construct.xml
deleted file mode 100644
index c4c1f164b454..000000000000
--- a/reference/solr/solrmodifiableparams/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrmodifiableparams.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrModifiableParams::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrModifiableParams::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrmodifiableparams/destruct.xml b/reference/solr/solrmodifiableparams/destruct.xml
deleted file mode 100644
index 60f318193228..000000000000
--- a/reference/solr/solrmodifiableparams/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrmodifiableparams.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrModifiableParams::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrModifiableParams::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrobject.xml b/reference/solr/solrobject.xml
deleted file mode 100644
index 1b348965c82e..000000000000
--- a/reference/solr/solrobject.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrobject" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrObject class</title>
- <titleabbrev>SolrObject</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrObject intro -->
-  <section xml:id="solrobject.intro">
-   &reftitle.intro;
-   <para>
-    This is an object whose properties can also by accessed using the array syntax. All its properties are read-only.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrobject.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrObject</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrObject</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrobject')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrobject')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrobject')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.solr.entities.solrobject;
-
-</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/solr/solrobject/construct.xml b/reference/solr/solrobject/construct.xml
deleted file mode 100644
index 19ddfd32e454..000000000000
--- a/reference/solr/solrobject/construct.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::__construct</refname>
-  <refpurpose>Creates Solr object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrObject::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Creates Solr object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrObject::__construct</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* ... */
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-...
-]]>
-    </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/solr/solrobject/destruct.xml b/reference/solr/solrobject/destruct.xml
deleted file mode 100644
index 2c9ac140187b..000000000000
--- a/reference/solr/solrobject/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrObject::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   The destructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrobject/getpropertynames.xml b/reference/solr/solrobject/getpropertynames.xml
deleted file mode 100644
index 0d165fd2691a..000000000000
--- a/reference/solr/solrobject/getpropertynames.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.getpropertynames" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::getPropertyNames</refname>
-  <refpurpose>Returns an array of all the names of the properties</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrObject::getPropertyNames</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of all the names of the properties
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrobject/offsetexists.xml b/reference/solr/solrobject/offsetexists.xml
deleted file mode 100644
index c33bfd1e383b..000000000000
--- a/reference/solr/solrobject/offsetexists.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::offsetExists</refname>
-  <refpurpose>Checks if the property exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrObject::offsetExists</methodname>
-   <methodparam><type>string</type><parameter>property_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if the property exists. This is used when the object is treated as an array.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>property_name</parameter></term>
-     <listitem>
-      <para>
-       The name of the property.
-      </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/solr/solrobject/offsetget.xml b/reference/solr/solrobject/offsetget.xml
deleted file mode 100644
index b33b07b753a2..000000000000
--- a/reference/solr/solrobject/offsetget.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::offsetGet</refname>
-  <refpurpose>Used to retrieve a property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>SolrObject::offsetGet</methodname>
-   <methodparam><type>string</type><parameter>property_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Used to get the value of a property. This is used when the object is treated as an array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>property_name</parameter></term>
-     <listitem>
-      <para>
-       Name of the property.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the property value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrobject/offsetset.xml b/reference/solr/solrobject/offsetset.xml
deleted file mode 100644
index afeecfbb8d95..000000000000
--- a/reference/solr/solrobject/offsetset.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::offsetSet</refname>
-  <refpurpose>Sets the value for a property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrObject::offsetSet</methodname>
-   <methodparam><type>string</type><parameter>property_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>property_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the value for a property. This is used when the object is treated as an array. This object is read-only. This should never be attempted.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>property_name</parameter></term>
-     <listitem>
-      <para>
-       The name of the property.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>property_value</parameter></term>
-     <listitem>
-      <para>
-       The new value.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrobject/offsetunset.xml b/reference/solr/solrobject/offsetunset.xml
deleted file mode 100644
index 7c842b867315..000000000000
--- a/reference/solr/solrobject/offsetunset.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrobject.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrObject::offsetUnset</refname>
-  <refpurpose>Unsets the value for the property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>SolrObject::offsetUnset</methodname>
-   <methodparam><type>string</type><parameter>property_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Unsets the value for the property. This is used when the object is treated as an array. This object is read-only. This should never be attempted.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>property_name</parameter></term>
-     <listitem>
-      <para>
-       The name of the property.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrObject::offsetUnset</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* ... */
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-...
-]]>
-    </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/solr/solrparams.xml b/reference/solr/solrparams.xml
deleted file mode 100644
index c8a84f1f6d4d..000000000000
--- a/reference/solr/solrparams.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrparams" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrParams class</title>
- <titleabbrev>SolrParams</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrParams intro -->
-  <section xml:id="solrparams.intro">
-   &reftitle.intro;
-   <para>
-    Represents a collection of name-value pairs sent to the Solr server during a request.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrparams.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrParams</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>SolrParams</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrparams')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.solr.entities.solrparams;
-
-</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/solr/solrparams/add.xml b/reference/solr/solrparams/add.xml
deleted file mode 100644
index da7cab6fb90c..000000000000
--- a/reference/solr/solrparams/add.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::add</refname>
-  <refpurpose>&Alias; <methodname>SolrParams::addParam</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>SolrParams</type><methodname>SolrParams::add</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is an alias for SolrParams::addParam
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The name of the parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      The value of the parameter 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a SolrParams instance 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/solr/solrparams/addparam.xml b/reference/solr/solrparams/addparam.xml
deleted file mode 100644
index 53d74b3fd7be..000000000000
--- a/reference/solr/solrparams/addparam.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.addparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::addParam</refname>
-  <refpurpose>Adds a parameter to the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrParams</type><methodname>SolrParams::addParam</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a parameter to the object. This is used for parameters that can be specified multiple times.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-      Value of parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrParam object on success and &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/solr/solrparams/get.xml b/reference/solr/solrparams/get.xml
deleted file mode 100644
index f7d12d45d196..000000000000
--- a/reference/solr/solrparams/get.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::get</refname>
-  <refpurpose>&Alias; <methodname>SolrParams::getParam</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>SolrParams::get</methodname>
-   <methodparam><type>string</type><parameter>param_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This is an alias for SolrParams::getParam
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>param_name</parameter></term>
-     <listitem>
-      <para>
-       Then name of the parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array or string depending on the type of parameter
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrparams/getparam.xml b/reference/solr/solrparams/getparam.xml
deleted file mode 100644
index d1ed755cbd7c..000000000000
--- a/reference/solr/solrparams/getparam.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.getparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::getParam</refname>
-  <refpurpose>Returns a parameter value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>mixed</type><methodname>SolrParams::getParam</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>param_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a parameter with name <parameter>param_name</parameter>.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>param_name</parameter></term>
-     <listitem>
-      <para>
-       The name of the parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &string; or an &array; depending on the type of the parameter.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrparams/getparams.xml b/reference/solr/solrparams/getparams.xml
deleted file mode 100644
index 1d2295e07c55..000000000000
--- a/reference/solr/solrparams/getparams.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.getparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::getParams</refname>
-  <refpurpose>Returns an array of non URL-encoded parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>SolrParams::getParams</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of non URL-encoded parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of non URL-encoded parameters
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrparams/getpreparedparams.xml b/reference/solr/solrparams/getpreparedparams.xml
deleted file mode 100644
index f38f9c8ead39..000000000000
--- a/reference/solr/solrparams/getpreparedparams.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.getpreparedparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::getPreparedParams</refname>
-  <refpurpose>Returns an array of URL-encoded parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type><methodname>SolrParams::getPreparedParams</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array on URL-encoded parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array on URL-encoded parameters
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrparams/serialize.xml b/reference/solr/solrparams/serialize.xml
deleted file mode 100644
index e6d193bd6ccc..000000000000
--- a/reference/solr/solrparams/serialize.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.serialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::serialize</refname>
-  <refpurpose>Used for custom serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>SolrParams::serialize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Used for custom serialization
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Used for custom serialization
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrparams/set.xml b/reference/solr/solrparams/set.xml
deleted file mode 100644
index ee22bd40cbc9..000000000000
--- a/reference/solr/solrparams/set.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::set</refname>
-  <refpurpose>&Alias; <methodname>SolrParams::setParam</methodname></refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>SolrParams::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   An alias of SolrParams::setParam
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Then name of the parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The parameter value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an instance of the SolrParams object 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/solr/solrparams/setparam.xml b/reference/solr/solrparams/setparam.xml
deleted file mode 100644
index 14ba4203f26d..000000000000
--- a/reference/solr/solrparams/setparam.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.setparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::setParam</refname>
-  <refpurpose>Sets the parameter to the specified value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrParams</type><methodname>SolrParams::setParam</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the query parameter to the specified value. This is used for parameters that can only be specified once. Subsequent calls with the same parameter name will override the existing value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       Name of the parameter
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value of the parameter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrParam object on success and &false; on value.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrParams::setParam</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$param = new SolrParams();
-
-$param->setParam('q', 'solr')->setParam('rows', 2);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-
-]]>
-    </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/solr/solrparams/tostring.xml b/reference/solr/solrparams/tostring.xml
deleted file mode 100644
index 6e7f2c9899b2..000000000000
--- a/reference/solr/solrparams/tostring.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::toString</refname>
-  <refpurpose>Returns all the name-value pair parameters in the object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>SolrParams::toString</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>url_encode</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns all the name-value pair parameters in the object
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>url_encode</parameter></term>
-     <listitem>
-      <para>
-       Whether to return URL-encoded values
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
- Returns a string on success and &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/solr/solrparams/unserialize.xml b/reference/solr/solrparams/unserialize.xml
deleted file mode 100644
index 62b5e6d20847..000000000000
--- a/reference/solr/solrparams/unserialize.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrparams.unserialize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrParams::unserialize</refname>
-  <refpurpose>Used for custom serialization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>void</type><methodname>SolrParams::unserialize</methodname>
-   <methodparam><type>string</type><parameter>serialized</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Used for custom serialization
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>serialized</parameter></term>
-     <listitem>
-      <para>
-      The serialized representation of the object
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrpingresponse.xml b/reference/solr/solrpingresponse.xml
deleted file mode 100644
index d6f277b275b8..000000000000
--- a/reference/solr/solrpingresponse.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrpingresponse" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrPingResponse class</title>
- <titleabbrev>SolrPingResponse</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrPingResponse intro -->
-  <section xml:id="solrpingresponse.intro">
-   &reftitle.intro;
-   <para>
-    Represents a response to a ping request to the server
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrpingresponse.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrPingResponse</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrPingResponse</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrResponse</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrpingresponse.constants.parse-solr-obj">SolrPingResponse::PARSE_SOLR_OBJ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrpingresponse.constants.parse-solr-doc">SolrPingResponse::PARSE_SOLR_DOC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrpingresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrpingresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrpingresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrPingResponse properties -->
-  <section xml:id="solrpingresponse.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="solrpingresponse.props.http-status">
-     <term><varname>http_status</varname></term>
-     <listitem>
-      <para>The http status of the response.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.parser-mode">
-     <term><varname>parser_mode</varname></term>
-     <listitem>
-      <para>Whether to parse the solr documents as SolrObject or SolrDocument instances.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.success">
-     <term><varname>success</varname></term>
-     <listitem>
-      <para>Was there an error during the request</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-status-message">
-     <term><varname>http_status_message</varname></term>
-     <listitem>
-      <para>Detailed message on http status</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-request-url">
-     <term><varname>http_request_url</varname></term>
-     <listitem>
-      <para>The request URL</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-raw-request-headers">
-     <term><varname>http_raw_request_headers</varname></term>
-     <listitem>
-      <para>A string of raw headers sent during the request</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-raw-request">
-     <term><varname>http_raw_request</varname></term>
-     <listitem>
-      <para>The raw request sent to the server</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-raw-response-headers">
-     <term><varname>http_raw_response_headers</varname></term>
-     <listitem>
-      <para>Response headers from the Solr server</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-raw-response">
-     <term><varname>http_raw_response</varname></term>
-     <listitem>
-      <para>The response message from the server</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrpingresponse.props.http-digested-response">
-     <term><varname>http_digested_response</varname></term>
-     <listitem>
-      <para>The response in PHP serialized format.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  
-<!-- {{{ SolrPingResponse constants -->
-  <section xml:id="solrpingresponse.constants">
-   &reftitle.constants;
-   <section xml:id="solrpingresponse.constants.types">
-    <title>SolrPingResponse Class Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrpingresponse.constants.parse-solr-obj">
-      <term><constant>SolrPingResponse::PARSE_SOLR_OBJ</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrObject instances</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrpingresponse.constants.parse-solr-doc">
-      <term><constant>SolrPingResponse::PARSE_SOLR_DOC</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrDocument instances.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrpingresponse;
-
-</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/solr/solrpingresponse/construct.xml b/reference/solr/solrpingresponse/construct.xml
deleted file mode 100644
index b675465ccaf4..000000000000
--- a/reference/solr/solrpingresponse/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrpingresponse.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrPingResponse::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrPingResponse::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrpingresponse/destruct.xml b/reference/solr/solrpingresponse/destruct.xml
deleted file mode 100644
index d52c0e201a64..000000000000
--- a/reference/solr/solrpingresponse/destruct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrpingresponse.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrPingResponse::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrPingResponse::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrpingresponse/getresponse.xml b/reference/solr/solrpingresponse/getresponse.xml
deleted file mode 100644
index 033dad2a00a9..000000000000
--- a/reference/solr/solrpingresponse/getresponse.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrpingresponse.getresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrPingResponse::getResponse</refname>
-  <refpurpose>Returns the response from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrPingResponse::getResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the response from the server. This should be empty because the request as a HEAD request.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns an empty 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/solr/solrquery.xml b/reference/solr/solrquery.xml
deleted file mode 100644
index 0e9c18ed6baf..000000000000
--- a/reference/solr/solrquery.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrquery" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrQuery class</title>
- <titleabbrev>SolrQuery</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrQuery intro -->
-  <section xml:id="solrquery.intro">
-   &reftitle.intro;
-   <para>
-    Represents a collection of name-value pairs sent to the Solr server during a request.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrquery.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrQuery</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrQuery</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrModifiableParams</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Serializable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.order-asc">SolrQuery::ORDER_ASC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.order-desc">SolrQuery::ORDER_DESC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.facet-sort-index">SolrQuery::FACET_SORT_INDEX</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.facet-sort-count">SolrQuery::FACET_SORT_COUNT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.terms-sort-index">SolrQuery::TERMS_SORT_INDEX</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrquery.constants.terms-sort-count">SolrQuery::TERMS_SORT_COUNT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrquery')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[1])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrmodifiableparams')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[1])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrQuery constants -->
-  <section xml:id="solrquery.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="solrquery.constants.order-asc">
-     <term><constant>SolrQuery::ORDER_ASC</constant></term>
-     <listitem>
-      <para>Used to specify that the sorting should be in acending order</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrquery.constants.order-desc">
-     <term><constant>SolrQuery::ORDER_DESC</constant></term>
-     <listitem>
-      <para>Used to specify that the sorting should be in descending order</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrquery.constants.facet-sort-index">
-     <term><constant>SolrQuery::FACET_SORT_INDEX</constant></term>
-     <listitem>
-      <para>Used to specify that the facet should sort by index</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrquery.constants.facet-sort-count">
-     <term><constant>SolrQuery::FACET_SORT_COUNT</constant></term>
-     <listitem>
-      <para>Used to specify that the facet should sort by count</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrquery.constants.terms-sort-index">
-     <term><constant>SolrQuery::TERMS_SORT_INDEX</constant></term>
-     <listitem>
-      <para>Used in the TermsComponent</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="solrquery.constants.terms-sort-count">
-     <term><constant>SolrQuery::TERMS_SORT_COUNT</constant></term>
-     <listitem>
-      <para>Used in the TermsComponent</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrquery;
-
-</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/solr/solrquery/addexpandfilterquery.xml b/reference/solr/solrquery/addexpandfilterquery.xml
deleted file mode 100644
index 59880b87644f..000000000000
--- a/reference/solr/solrquery/addexpandfilterquery.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addexpandfilterquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addExpandFilterQuery</refname>
-  <refpurpose>Overrides main filter query, determines which documents to include in the main group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addExpandFilterQuery</methodname>
-   <methodparam><type>string</type><parameter>fq</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Overrides main filter query, determines which documents to include in the main group.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fq</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/addexpandsortfield.xml b/reference/solr/solrquery/addexpandsortfield.xml
deleted file mode 100644
index 86d1326e3256..000000000000
--- a/reference/solr/solrquery/addexpandsortfield.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addexpandsortfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addExpandSortField</refname>
-  <refpurpose>Orders the documents within the expanded groups (expand.sort parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addExpandSortField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>order</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Orders the documents within the expanded groups (expand.sort parameter).
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      field name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>order</parameter></term>
-    <listitem>
-     <para>
-      Order ASC/DESC, utilizes SolrQuery::ORDER_* constants.
-     </para>
-     <para>
-         Default: <type>SolrQuery::ORDER_DESC</type>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/addfacetdatefield.xml b/reference/solr/solrquery/addfacetdatefield.xml
deleted file mode 100644
index b6a7a7d5d0b7..000000000000
--- a/reference/solr/solrquery/addfacetdatefield.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfacetdatefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addFacetDateField</refname>
-  <refpurpose>Maps to facet.date</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addFacetDateField</methodname>
-   <methodparam><type>string</type><parameter>dateField</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method allows you to specify a field which should be treated as a facet.
-  </para>
-  <para>It can be used multiple times with different field names to indicate multiple facet fields</para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dateField</parameter></term>
-     <listitem>
-      <para>
-       The name of the date field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrQuery 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/solr/solrquery/addfacetdateother.xml b/reference/solr/solrquery/addfacetdateother.xml
deleted file mode 100644
index 2084e96b5870..000000000000
--- a/reference/solr/solrquery/addfacetdateother.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfacetdateother" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addFacetDateOther</refname>
-  <refpurpose>Adds another facet.date.other parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addFacetDateOther</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the facet.date.other parameter. Accepts an optional field override
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value to use.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The field name for the override.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/addfacetfield.xml b/reference/solr/solrquery/addfacetfield.xml
deleted file mode 100644
index e5de8e4c47cb..000000000000
--- a/reference/solr/solrquery/addfacetfield.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfacetfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addFacetField</refname>
-  <refpurpose>Adds another field to the facet</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addFacetField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds another field to the facet
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrQuery::addFacetField</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setQuery($query);
-
-$query->addField('price')->addField('color');
-
-$query->setFacet(true);
-
-$query->addFacetField('price')->addFacetField('color');
-
-$query_response = $client->query($query);
-
-$response = $query_response->getResponse();
-
-print_r($response['facet_counts']['facet_fields']);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-SolrObject Object
-(
-    [color] => SolrObject Object
-        (
-            [blue] => 20
-            [green] => 100
-        )
-
-)
-]]>
-    </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/solr/solrquery/addfacetquery.xml b/reference/solr/solrquery/addfacetquery.xml
deleted file mode 100644
index 61a059c3ef18..000000000000
--- a/reference/solr/solrquery/addfacetquery.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfacetquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addFacetQuery</refname>
-  <refpurpose>Adds a facet query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addFacetQuery</methodname>
-   <methodparam><type>string</type><parameter>facetQuery</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a facet query
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>facetQuery</parameter></term>
-     <listitem>
-      <para>
-       The facet query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrQuery::addFacetField</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-        'hostname' => SOLR_SERVER_HOSTNAME,
-        'login'    => SOLR_SERVER_USERNAME,
-        'password' => SOLR_SERVER_PASSWORD,
-        'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$query->setFacet(true);
-
-$query->addFacetQuery('price:[* TO 500]')->addFacetQuery('price:[500 TO *]');
-
-$query_response = $client->query($query);
-
-$response = $query_response->getResponse();
-
-print_r($response->facet_counts->facet_queries);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-
-SolrObject Object
-(
-    [price:[* TO 500]] => 14
-    [price:[500 TO *]] => 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/solr/solrquery/addfield.xml b/reference/solr/solrquery/addfield.xml
deleted file mode 100644
index bad49529b988..000000000000
--- a/reference/solr/solrquery/addfield.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addField</refname>
-  <refpurpose>Specifies which fields to return in the result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This method is used to used to specify a set of fields to return, thereby restricting the amount of data returned in the response.
-  </para>
-  <para>It should be called multiple time, once for each field name.</para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery 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/solr/solrquery/addfilterquery.xml b/reference/solr/solrquery/addfilterquery.xml
deleted file mode 100644
index cb75940f87ce..000000000000
--- a/reference/solr/solrquery/addfilterquery.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addfilterquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addFilterQuery</refname>
-  <refpurpose>Specifies a filter query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addFilterQuery</methodname>
-   <methodparam><type>string</type><parameter>fq</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies a filter query
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fq</parameter></term>
-     <listitem>
-      <para>
-       The filter query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object.
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><methodname>SolrQuery::addFilterQuery</methodname> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$options = array
-(
-    'hostname' => SOLR_SERVER_HOSTNAME,
-    'login'    => SOLR_SERVER_USERNAME,
-    'password' => SOLR_SERVER_PASSWORD,
-    'port'     => SOLR_SERVER_PORT,
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery();
-
-$query->setQuery('*:*');
-
-$query->addFilterQuery('color:blue,green');
-
-$query_response = $client->query($query);
-
-$response = $query_response->getResponse();
-
-print_r($response['facet_counts']['facet_fields']);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
- &fq=color:blue,green
-]]>
-    </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/solr/solrquery/addgroupfield.xml b/reference/solr/solrquery/addgroupfield.xml
deleted file mode 100644
index f8f3269adb96..000000000000
--- a/reference/solr/solrquery/addgroupfield.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addgroupfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addGroupField</refname>
-  <refpurpose>Add a field to be used to group results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addGroupField</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The name of the field by which to group results. The field must be single-valued, and either be indexed
-    or a field type that has a value source and works in a function query,
-    such as ExternalFileField. It must also be a string-based field, such as StrField or TextField
-    Uses group.field parameter
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <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>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/addgroupfunction.xml b/reference/solr/solrquery/addgroupfunction.xml
deleted file mode 100644
index eeab5df0ec88..000000000000
--- a/reference/solr/solrquery/addgroupfunction.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addgroupfunction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addGroupFunction</refname>
-  <refpurpose>Allows grouping results based on the unique values of a function query (group.func parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addGroupFunction</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-     Adds a group function (group.func parameter)
-     Allows grouping results based on the unique values of a function query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/addgroupquery.xml b/reference/solr/solrquery/addgroupquery.xml
deleted file mode 100644
index b450079d77de..000000000000
--- a/reference/solr/solrquery/addgroupquery.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addgroupquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addGroupQuery</refname>
-  <refpurpose>Allows grouping of documents that match the given query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addGroupQuery</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Allows grouping of documents that match the given query.
-    Adds query to the group.query parameter
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/addgroupsortfield.xml b/reference/solr/solrquery/addgroupsortfield.xml
deleted file mode 100644
index 0403c4a2efca..000000000000
--- a/reference/solr/solrquery/addgroupsortfield.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addgroupsortfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addGroupSortField</refname>
-  <refpurpose>Add a group sort field (group.sort parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addGroupSortField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>order</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Allow sorting group documents, using group sort field (group.sort parameter).
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      Field name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>order</parameter></term>
-    <listitem>
-     <para>
-      Order ASC/DESC, utilizes SolrQuery::ORDER_* constants
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrQuery::addGroupSortField</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$solrQuery = new SolrQuery('*:*');
-$solrQuery
-    ->setGroup(true)
-    ->addGroupSortField('price', SolrQuery::ORDER_ASC);
-    
-echo $solrQuery; 
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=*:*&group=true&group.sort=price asc
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/addhighlightfield.xml b/reference/solr/solrquery/addhighlightfield.xml
deleted file mode 100644
index 4e5600396680..000000000000
--- a/reference/solr/solrquery/addhighlightfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addhighlightfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addHighlightField</refname>
-  <refpurpose>Maps to hl.fl</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addHighlightField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to hl.fl. This is used to specify that highlighted snippets should be generated for a particular field
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-        Name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/addmltfield.xml b/reference/solr/solrquery/addmltfield.xml
deleted file mode 100644
index 893d7a3e1998..000000000000
--- a/reference/solr/solrquery/addmltfield.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addmltfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addMltField</refname>
-  <refpurpose>Sets a field to use for similarity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addMltField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to mlt.fl. It specifies that a field should be used for similarity.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/addmltqueryfield.xml b/reference/solr/solrquery/addmltqueryfield.xml
deleted file mode 100644
index 2094c6178cf9..000000000000
--- a/reference/solr/solrquery/addmltqueryfield.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addmltqueryfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addMltQueryField</refname>
-  <refpurpose>Maps to mlt.qf</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addMltQueryField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam><type>float</type><parameter>boost</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to mlt.qf. It is used to specify query fields and their boosts
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>boost</parameter></term>
-     <listitem>
-      <para>
-       Its boost value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/addsortfield.xml b/reference/solr/solrquery/addsortfield.xml
deleted file mode 100644
index 098dc8fe27f4..000000000000
--- a/reference/solr/solrquery/addsortfield.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addsortfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addSortField</refname>
-  <refpurpose>Used to control how the results should be sorted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addSortField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>order</parameter><initializer>SolrQuery::ORDER_DESC</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Used to control how the results should be sorted.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>order</parameter></term>
-     <listitem>
-      <para>
-       The sort direction. This should be either SolrQuery::ORDER_ASC or SolrQuery::ORDER_DESC.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery 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/solr/solrquery/addstatsfacet.xml b/reference/solr/solrquery/addstatsfacet.xml
deleted file mode 100644
index ecafb2b91d88..000000000000
--- a/reference/solr/solrquery/addstatsfacet.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addstatsfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addStatsFacet</refname>
-  <refpurpose>Requests a return of sub results for values within the given facet</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addStatsFacet</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Requests a return of sub results for values within the given facet. Maps to the stats.facet field
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-      The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/addstatsfield.xml b/reference/solr/solrquery/addstatsfield.xml
deleted file mode 100644
index 96e0e54af37e..000000000000
--- a/reference/solr/solrquery/addstatsfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.addstatsfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::addStatsField</refname>
-  <refpurpose>Maps to stats.field parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::addStatsField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to stats.field parameter This methods adds another stats.field parameter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/collapse.xml b/reference/solr/solrquery/collapse.xml
deleted file mode 100644
index ddf300bbf304..000000000000
--- a/reference/solr/solrquery/collapse.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.collapse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::collapse</refname>
-  <refpurpose>Collapses the result set to a single document per group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::collapse</methodname>
-   <methodparam><type>SolrCollapseFunction</type><parameter>collapseFunction</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-     Collapses the result set to a single document per group before it forwards
-     the result set to the rest of the search components.
-  </para>
-  <para>
-     So all downstream components (faceting, highlighting, etc...) will work with
-     the collapsed result set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>collapseFunction</parameter></term>
-     <listitem>
-      <para>
-          
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current <type>SolrQuery</type> object
-  </para>
- </refsect1>
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>SolrQuery::collapse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-include "bootstrap.php";
-
-$options = array
-(
-        'hostname' => SOLR_SERVER_HOSTNAME,
-        'login'    => SOLR_SERVER_USERNAME,
-        'password' => SOLR_SERVER_PASSWORD,
-        'port'     => SOLR_SERVER_PORT,
-        'path'     => SOLR_SERVER_PATH
-);
-
-$client = new SolrClient($options);
-
-$query = new SolrQuery('*:*');
-
-$collapseFunction = new SolrCollapseFunction('manu_id_s');
-
-$collapseFunction
-->setSize(2)
-->setNullPolicy(SolrCollapseFunction::NULLPOLICY_IGNORE);
-
-$query
-->collapse($collapseFunction)
-->setRows(4);
-
-$queryResponse = $client->query($query);
-
-$response = $queryResponse->getResponse();
-
-print_r($response);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-        <screen>
-            <![CDATA[
-SolrObject Object
-(
-    [responseHeader] => SolrObject Object
-        (
-            [status] => 0
-            [QTime] => 1
-            [params] => SolrObject Object
-                (
-                    [q] => *:*
-                    [indent] => on
-                    [fq] => {!collapse field=manu_id_s size=2 nullPolicy=ignore}
-                    [rows] => 4
-                    [version] => 2.2
-                    [wt] => xml
-                )
-
-        )
-
-    [response] => SolrObject Object
-        (
-            [numFound] => 14
-            [start] => 0
-            [docs] => Array
-                (
-                    [0] => SolrObject Object
-                        (
-                            [id] => SP2514N
-                            [name] => Array
-                                (
-                                    [0] => Samsung SpinPoint P120 SP2514N - hard drive - 250 GB - ATA-133
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Samsung Electronics Co. Ltd.
-                                )
-
-                            [manu_id_s] => samsung
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => hard drive
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => 7200RPM, 8MB cache, IDE Ultra ATA-133
-                                    [1] => NoiseGuard, SilentSeek technology, Fluid Dynamic Bearing (FDB) motor
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 92
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 6
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [manufacturedate_dt] => 2006-02-13T15:26:37Z
-                            [store] => Array
-                                (
-                                    [0] => 35.0752,-97.032
-                                )
-
-                            [_version_] => 1510294336412057600
-                        )
-
-                    [1] => SolrObject Object
-                        (
-                            [id] => 6H500F0
-                            [name] => Array
-                                (
-                                    [0] => Maxtor DiamondMax 11 - hard drive - 500 GB - SATA-300
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Maxtor Corp.
-                                )
-
-                            [manu_id_s] => maxtor
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => hard drive
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => SATA 3.0Gb/s, NCQ
-                                    [1] => 8.5ms seek
-                                    [2] => 16MB cache
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 350
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 6
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 45.17614,-93.87341
-                                )
-
-                            [manufacturedate_dt] => 2006-02-13T15:26:37Z
-                            [_version_] => 1510294336449806336
-                        )
-
-                    [2] => SolrObject Object
-                        (
-                            [id] => F8V7067-APL-KIT
-                            [name] => Array
-                                (
-                                    [0] => Belkin Mobile Power Cord for iPod w/ Dock
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Belkin
-                                )
-
-                            [manu_id_s] => belkin
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => connector
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => car power adapter, white
-                                )
-
-                            [weight] => Array
-                                (
-                                    [0] => 4
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 19.95
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 45.18014,-93.87741
-                                )
-
-                            [manufacturedate_dt] => 2005-08-01T16:30:25Z
-                            [_version_] => 1510294336458194944
-                        )
-
-                    [3] => SolrObject Object
-                        (
-                            [id] => MA147LL/A
-                            [name] => Array
-                                (
-                                    [0] => Apple 60 GB iPod with Video Playback Black
-                                )
-
-                            [manu] => Array
-                                (
-                                    [0] => Apple Computer Inc.
-                                )
-
-                            [manu_id_s] => apple
-                            [cat] => Array
-                                (
-                                    [0] => electronics
-                                    [1] => music
-                                )
-
-                            [features] => Array
-                                (
-                                    [0] => iTunes, Podcasts, Audiobooks
-                                    [1] => Stores up to 15,000 songs, 25,000 photos, or 150 hours of video
-                                    [2] => 2.5-inch, 320x240 color TFT LCD display with LED backlight
-                                    [3] => Up to 20 hours of battery life
-                                    [4] => Plays AAC, MP3, WAV, AIFF, Audible, Apple Lossless, H.264 video
-                                    [5] => Notes, Calendar, Phone book, Hold button, Date display, Photo wallet, Built-in games, JPEG photo playback, Upgradeable firmware, USB 2.0 compatibility, Playback speed control, Rechargeable capability, Battery level indication
-                                )
-
-                            [includes] => Array
-                                (
-                                    [0] => earbud headphones, USB cable
-                                )
-
-                            [weight] => Array
-                                (
-                                    [0] => 5.5
-                                )
-
-                            [price] => Array
-                                (
-                                    [0] => 399
-                                )
-
-                            [popularity] => Array
-                                (
-                                    [0] => 10
-                                )
-
-                            [inStock] => Array
-                                (
-                                    [0] => 1
-                                )
-
-                            [store] => Array
-                                (
-                                    [0] => 37.7752,-100.0232
-                                )
-
-                            [manufacturedate_dt] => 2005-10-12T08:00:00Z
-                            [_version_] => 1510294336562003968
-                        )
-
-                )
-
-        )
-
-)
-]]>
-        </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/solr/solrquery/construct.xml b/reference/solr/solrquery/construct.xml
deleted file mode 100644
index 3df5bbbf265d..000000000000
--- a/reference/solr/solrquery/construct.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrQuery::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>q</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructor.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>q</parameter></term>
-     <listitem>
-      <para>
-       Optional search query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-<refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Emits <classname>SolrIllegalArgumentException</classname> in case of an invalid parameter was passed.
-  </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 solr 2.0.0</entry>
-       <entry>
-        If <parameter>q</parameter> was invalid, then a
-        <classname>SolrIllegalArgumentException</classname> is now thrown. Previously an error was emitted.
-       </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/solr/solrquery/destruct.xml b/reference/solr/solrquery/destruct.xml
deleted file mode 100644
index 8da07b545899..000000000000
--- a/reference/solr/solrquery/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrQuery::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getexpand.xml b/reference/solr/solrquery/getexpand.xml
deleted file mode 100644
index 483e4c359658..000000000000
--- a/reference/solr/solrquery/getexpand.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getexpand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getExpand</refname>
-  <refpurpose>Returns true if group expanding is enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getExpand</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns &true; if group expanding is enabled
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getexpandfilterqueries.xml b/reference/solr/solrquery/getexpandfilterqueries.xml
deleted file mode 100644
index 26f404db996b..000000000000
--- a/reference/solr/solrquery/getexpandfilterqueries.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getexpandfilterqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getExpandFilterQueries</refname>
-  <refpurpose>Returns the expand filter queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getExpandFilterQueries</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getexpandquery.xml b/reference/solr/solrquery/getexpandquery.xml
deleted file mode 100644
index 8860ee780142..000000000000
--- a/reference/solr/solrquery/getexpandquery.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getexpandquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getExpandQuery</refname>
-  <refpurpose>Returns the expand query expand.q parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getExpandQuery</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the expand query expand.q parameter
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getexpandrows.xml b/reference/solr/solrquery/getexpandrows.xml
deleted file mode 100644
index 9980b6ad2175..000000000000
--- a/reference/solr/solrquery/getexpandrows.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getexpandrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getExpandRows</refname>
-  <refpurpose>Returns The number of rows to display in each group (expand.rows)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getExpandRows</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns The number of rows to display in each group (expand.rows)
-  </para>
-
- </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getexpandsortfields.xml b/reference/solr/solrquery/getexpandsortfields.xml
deleted file mode 100644
index 1d339bb995d8..000000000000
--- a/reference/solr/solrquery/getexpandsortfields.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getexpandsortfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getExpandSortFields</refname>
-  <refpurpose>Returns an array of fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getExpandSortFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns an array of fields
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacet.xml b/reference/solr/solrquery/getfacet.xml
deleted file mode 100644
index f07e4db9cb9d..000000000000
--- a/reference/solr/solrquery/getfacet.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacet</refname>
-  <refpurpose>Returns the value of the facet parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getFacet</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the value of the facet parameter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdateend.xml b/reference/solr/solrquery/getfacetdateend.xml
deleted file mode 100644
index 9503e0aa58e3..000000000000
--- a/reference/solr/solrquery/getfacetdateend.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdateend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateEnd</refname>
-  <refpurpose>Returns the value for the facet.date.end parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetDateEnd</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value for the facet.date.end parameter. This method accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdatefields.xml b/reference/solr/solrquery/getfacetdatefields.xml
deleted file mode 100644
index cae00ffeb430..000000000000
--- a/reference/solr/solrquery/getfacetdatefields.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdatefields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateFields</refname>
-  <refpurpose>Returns all the facet.date fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFacetDateFields</methodname><void />
-  </methodsynopsis>
-  <para>
-   Returns all the facet.date fields
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns all the facet.date fields as an array or &null; if none was set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdategap.xml b/reference/solr/solrquery/getfacetdategap.xml
deleted file mode 100644
index 13cb22f9baf2..000000000000
--- a/reference/solr/solrquery/getfacetdategap.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdategap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateGap</refname>
-  <refpurpose>Returns the value of the facet.date.gap parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetDateGap</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of the facet.date.gap parameter. It accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdatehardend.xml b/reference/solr/solrquery/getfacetdatehardend.xml
deleted file mode 100644
index 8326758f9303..000000000000
--- a/reference/solr/solrquery/getfacetdatehardend.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdatehardend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateHardEnd</refname>
-  <refpurpose>Returns the value of the facet.date.hardend parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetDateHardEnd</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of the facet.date.hardend parameter. Accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdateother.xml b/reference/solr/solrquery/getfacetdateother.xml
deleted file mode 100644
index 55d250bc485b..000000000000
--- a/reference/solr/solrquery/getfacetdateother.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdateother" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateOther</refname>
-  <refpurpose>Returns the value for the facet.date.other parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFacetDateOther</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value for the facet.date.other parameter. This method accepts an optional field override.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an &array; on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetdatestart.xml b/reference/solr/solrquery/getfacetdatestart.xml
deleted file mode 100644
index d05c428c7f9d..000000000000
--- a/reference/solr/solrquery/getfacetdatestart.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetdatestart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetDateStart</refname>
-  <refpurpose>Returns the  lower bound for the first date range for all date faceting on this field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetDateStart</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the  lower bound for the first date range for all date faceting on this field. Accepts an optional field override
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetfields.xml b/reference/solr/solrquery/getfacetfields.xml
deleted file mode 100644
index d3100b14b575..000000000000
--- a/reference/solr/solrquery/getfacetfields.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetFields</refname>
-  <refpurpose>Returns all the facet fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFacetFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns all the facet fields
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array of all the fields and &null; if none was set
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetlimit.xml b/reference/solr/solrquery/getfacetlimit.xml
deleted file mode 100644
index a2cb3e497d72..000000000000
--- a/reference/solr/solrquery/getfacetlimit.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetlimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetLimit</refname>
-  <refpurpose>Returns the maximum number of constraint counts that should be returned for the facet fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getFacetLimit</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of constraint counts that should be returned for the facet fields. This method accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field to override for
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetmethod.xml b/reference/solr/solrquery/getfacetmethod.xml
deleted file mode 100644
index cc4c37ee66e0..000000000000
--- a/reference/solr/solrquery/getfacetmethod.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetMethod</refname>
-  <refpurpose>Returns the value of the facet.method parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetMethod</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of the facet.method parameter. This accepts an optional field override.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string on success and &null; if not set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetmincount.xml b/reference/solr/solrquery/getfacetmincount.xml
deleted file mode 100644
index e8c2a71df130..000000000000
--- a/reference/solr/solrquery/getfacetmincount.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetmincount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetMinCount</refname>
-  <refpurpose>Returns the minimum counts for facet fields should be included in the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getFacetMinCount</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the minimum counts for facet fields should be included in the response. It accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetmissing.xml b/reference/solr/solrquery/getfacetmissing.xml
deleted file mode 100644
index 4031b062bd41..000000000000
--- a/reference/solr/solrquery/getfacetmissing.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetmissing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetMissing</refname>
-  <refpurpose>Returns the current state of the facet.missing parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getFacetMissing</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the current state of the facet.missing parameter. This accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetoffset.xml b/reference/solr/solrquery/getfacetoffset.xml
deleted file mode 100644
index 6ef7536cb749..000000000000
--- a/reference/solr/solrquery/getfacetoffset.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetOffset</refname>
-  <refpurpose>Returns an offset into the list of constraints to be used for pagination</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getFacetOffset</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an offset into the list of constraints to be used for pagination. Accepts an optional field override
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field to override for.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetprefix.xml b/reference/solr/solrquery/getfacetprefix.xml
deleted file mode 100644
index 8663348eca68..000000000000
--- a/reference/solr/solrquery/getfacetprefix.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetprefix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetPrefix</refname>
-  <refpurpose>Returns the facet prefix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getFacetPrefix</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the facet prefix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetqueries.xml b/reference/solr/solrquery/getfacetqueries.xml
deleted file mode 100644
index 47920e11b202..000000000000
--- a/reference/solr/solrquery/getfacetqueries.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetQueries</refname>
-  <refpurpose>Returns all the facet queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFacetQueries</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-Returns all the facet queries
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfacetsort.xml b/reference/solr/solrquery/getfacetsort.xml
deleted file mode 100644
index 7161bc7e7e78..000000000000
--- a/reference/solr/solrquery/getfacetsort.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfacetsort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFacetSort</refname>
-  <refpurpose>Returns the facet sort type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getFacetSort</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an integer (SolrQuery::FACET_SORT_INDEX or SolrQuery::FACET_SORT_COUNT)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer (SolrQuery::FACET_SORT_INDEX or SolrQuery::FACET_SORT_COUNT) on success or &null; if not set. 
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfields.xml b/reference/solr/solrquery/getfields.xml
deleted file mode 100644
index 146b31cc58cc..000000000000
--- a/reference/solr/solrquery/getfields.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFields</refname>
-  <refpurpose>Returns the list of fields that will be returned in the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the list of fields that will be returned in the response
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getfilterqueries.xml b/reference/solr/solrquery/getfilterqueries.xml
deleted file mode 100644
index 2e9917a0e389..000000000000
--- a/reference/solr/solrquery/getfilterqueries.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getfilterqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getFilterQueries</refname>
-  <refpurpose>Returns an array of filter queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getFilterQueries</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of filter queries. These are queries that can be used to restrict the super set of documents that can be returned, without influencing score
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getgroup.xml b/reference/solr/solrquery/getgroup.xml
deleted file mode 100644
index ce71eed4ba8b..000000000000
--- a/reference/solr/solrquery/getgroup.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroup</refname>
-  <refpurpose>Returns true if grouping is enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getGroup</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns true if grouping is enabled
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</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/solr/solrquery/getgroupcachepercent.xml b/reference/solr/solrquery/getgroupcachepercent.xml
deleted file mode 100644
index 73fa45cfbdfd..000000000000
--- a/reference/solr/solrquery/getgroupcachepercent.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupcachepercent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupCachePercent</refname>
-  <refpurpose>Returns group cache percent value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getGroupCachePercent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns group cache percent value
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/getgroupfacet.xml b/reference/solr/solrquery/getgroupfacet.xml
deleted file mode 100644
index 3c2117730853..000000000000
--- a/reference/solr/solrquery/getgroupfacet.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupFacet</refname>
-  <refpurpose>Returns the group.facet parameter value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getGroupFacet</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.facet parameter value
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupFacet</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/solr/solrquery/getgroupfields.xml b/reference/solr/solrquery/getgroupfields.xml
deleted file mode 100644
index a670ef48fd13..000000000000
--- a/reference/solr/solrquery/getgroupfields.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupFields</refname>
-  <refpurpose>Returns group fields (group.field parameter values)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getGroupFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns group fields (group.field parameter values)
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::addGroupField</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/solr/solrquery/getgroupformat.xml b/reference/solr/solrquery/getgroupformat.xml
deleted file mode 100644
index c5adfab0343d..000000000000
--- a/reference/solr/solrquery/getgroupformat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupformat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupFormat</refname>
-  <refpurpose>Returns the group.format value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getGroupFormat</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.format value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupFormat</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/solr/solrquery/getgroupfunctions.xml b/reference/solr/solrquery/getgroupfunctions.xml
deleted file mode 100644
index 61bfb9364f73..000000000000
--- a/reference/solr/solrquery/getgroupfunctions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupfunctions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupFunctions</refname>
-  <refpurpose>Returns group functions (group.func parameter values)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getGroupFunctions</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns group functions (group.func parameter values)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::addGroupFunction</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/solr/solrquery/getgrouplimit.xml b/reference/solr/solrquery/getgrouplimit.xml
deleted file mode 100644
index 7445b2075b77..000000000000
--- a/reference/solr/solrquery/getgrouplimit.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgrouplimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupLimit</refname>
-  <refpurpose>Returns the group.limit value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getGroupLimit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.limit value
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupLimit</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/solr/solrquery/getgroupmain.xml b/reference/solr/solrquery/getgroupmain.xml
deleted file mode 100644
index 53bc7b636bba..000000000000
--- a/reference/solr/solrquery/getgroupmain.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupmain" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupMain</refname>
-  <refpurpose>Returns the group.main value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getGroupMain</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.main value
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupMain</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/solr/solrquery/getgroupngroups.xml b/reference/solr/solrquery/getgroupngroups.xml
deleted file mode 100644
index 0689d50d79d3..000000000000
--- a/reference/solr/solrquery/getgroupngroups.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupngroups" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupNGroups</refname>
-  <refpurpose>Returns the group.ngroups value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getGroupNGroups</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.ngroups value
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupNGroups</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/solr/solrquery/getgroupoffset.xml b/reference/solr/solrquery/getgroupoffset.xml
deleted file mode 100644
index 5d03478fc7c0..000000000000
--- a/reference/solr/solrquery/getgroupoffset.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupOffset</refname>
-  <refpurpose>Returns the group.offset value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getGroupOffset</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.offset value
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupOffset</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/solr/solrquery/getgroupqueries.xml b/reference/solr/solrquery/getgroupqueries.xml
deleted file mode 100644
index 9f0056bf21d8..000000000000
--- a/reference/solr/solrquery/getgroupqueries.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupqueries" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupQueries</refname>
-  <refpurpose>Returns all the group.query parameter values</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getGroupQueries</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns all the group.query parameter values
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>array</type>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::addGroupQuery</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/solr/solrquery/getgroupsortfields.xml b/reference/solr/solrquery/getgroupsortfields.xml
deleted file mode 100644
index bc5540807aef..000000000000
--- a/reference/solr/solrquery/getgroupsortfields.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgroupsortfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupSortFields</refname>
-  <refpurpose>Returns the group.sort value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getGroupSortFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.sort value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::addGroupSortField</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/solr/solrquery/getgrouptruncate.xml b/reference/solr/solrquery/getgrouptruncate.xml
deleted file mode 100644
index 8af0bfdd9d23..000000000000
--- a/reference/solr/solrquery/getgrouptruncate.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getgrouptruncate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getGroupTruncate</refname>
-  <refpurpose>Returns the group.truncate value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getGroupTruncate</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Returns the group.truncate value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroupTruncate</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/solr/solrquery/gethighlight.xml b/reference/solr/solrquery/gethighlight.xml
deleted file mode 100644
index 233e374394c0..000000000000
--- a/reference/solr/solrquery/gethighlight.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlight</refname>
-  <refpurpose>Returns the state of the hl parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getHighlight</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a boolean indicating whether to enable highlighted snippets to be generated in the query response.
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightalternatefield.xml b/reference/solr/solrquery/gethighlightalternatefield.xml
deleted file mode 100644
index 642971fe69d6..000000000000
--- a/reference/solr/solrquery/gethighlightalternatefield.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightalternatefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightAlternateField</refname>
-  <refpurpose>Returns the highlight field to use as backup or default</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightAlternateField</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the highlight field to use as backup or default. It accepts an optional override.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightfields.xml b/reference/solr/solrquery/gethighlightfields.xml
deleted file mode 100644
index 4205d21bf343..000000000000
--- a/reference/solr/solrquery/gethighlightfields.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightFields</refname>
-  <refpurpose>Returns all the fields that Solr should generate highlighted snippets for</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getHighlightFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns all the fields that Solr should generate highlighted snippets for
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightformatter.xml b/reference/solr/solrquery/gethighlightformatter.xml
deleted file mode 100644
index 40d99267abcf..000000000000
--- a/reference/solr/solrquery/gethighlightformatter.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightformatter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightFormatter</refname>
-  <refpurpose>Returns the formatter for the highlighted output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightFormatter</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the formatter for the highlighted output
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightfragmenter.xml b/reference/solr/solrquery/gethighlightfragmenter.xml
deleted file mode 100644
index bf18a70c1d30..000000000000
--- a/reference/solr/solrquery/gethighlightfragmenter.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightfragmenter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightFragmenter</refname>
-  <refpurpose>Returns the text snippet generator for highlighted text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightFragmenter</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the text snippet generator for highlighted text. Accepts an optional field override.
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightfragsize.xml b/reference/solr/solrquery/gethighlightfragsize.xml
deleted file mode 100644
index 5ba14990e849..000000000000
--- a/reference/solr/solrquery/gethighlightfragsize.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightfragsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightFragsize</refname>
-  <refpurpose>Returns the number of characters of fragments to consider for highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getHighlightFragsize</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the number of characters of fragments to consider for highlighting. Zero implies no fragmenting. The entire field should be used.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success or &null; if not set.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlighthighlightmultiterm.xml b/reference/solr/solrquery/gethighlighthighlightmultiterm.xml
deleted file mode 100644
index 2b8a9cd8775e..000000000000
--- a/reference/solr/solrquery/gethighlighthighlightmultiterm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlighthighlightmultiterm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightHighlightMultiTerm</refname>
-  <refpurpose>Returns whether or not to enable highlighting for range/wildcard/fuzzy/prefix queries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getHighlightHighlightMultiTerm</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not to enable highlighting for range/wildcard/fuzzy/prefix queries
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightmaxalternatefieldlength.xml b/reference/solr/solrquery/gethighlightmaxalternatefieldlength.xml
deleted file mode 100644
index 72eb40ae934a..000000000000
--- a/reference/solr/solrquery/gethighlightmaxalternatefieldlength.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightmaxalternatefieldlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightMaxAlternateFieldLength</refname>
-  <refpurpose>Returns the maximum number of characters of the field to return</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getHighlightMaxAlternateFieldLength</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of characters of the field to return
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightmaxanalyzedchars.xml b/reference/solr/solrquery/gethighlightmaxanalyzedchars.xml
deleted file mode 100644
index be62878ba60f..000000000000
--- a/reference/solr/solrquery/gethighlightmaxanalyzedchars.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightmaxanalyzedchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightMaxAnalyzedChars</refname>
-  <refpurpose>Returns the maximum number of characters into a document to look for suitable snippets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getHighlightMaxAnalyzedChars</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of characters into a document to look for suitable snippets
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightmergecontiguous.xml b/reference/solr/solrquery/gethighlightmergecontiguous.xml
deleted file mode 100644
index e67ec81e1895..000000000000
--- a/reference/solr/solrquery/gethighlightmergecontiguous.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightmergecontiguous" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightMergeContiguous</refname>
-  <refpurpose>Returns whether or not the collapse contiguous fragments into a single fragment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getHighlightMergeContiguous</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns whether or not the collapse contiguous fragments into a single fragment. Accepts an optional field override.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightquery.xml b/reference/solr/solrquery/gethighlightquery.xml
deleted file mode 100644
index 299b687c1f58..000000000000
--- a/reference/solr/solrquery/gethighlightquery.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="solrquery.gethighlightquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightQuery</refname>
-  <refpurpose>Return the highlight query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>SolrQuery::getHighlightQuery</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns previously set highlight query from the
-   <literal>hl.q</literal> parameter.
-   This parameter allows you to highlight different terms or fields than those being used to retrieve documents.
-   See the <link xlink:href="https://solr.apache.org/guide/solr/latest/query-guide/highlighting.html">Highlighting</link>
-   section for more details.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string that contains the highlight query of the current <classname>SolrQuery</classname>,
-   or &null; if highlight query is not set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setHighlightQuery</methodname></member>
-   <member><methodname>SolrQuery::getHighlightFields</methodname></member>
-   <member><methodname>SolrQuery::setHighlightFields</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/solr/solrquery/gethighlightregexmaxanalyzedchars.xml b/reference/solr/solrquery/gethighlightregexmaxanalyzedchars.xml
deleted file mode 100644
index e91217ba5f53..000000000000
--- a/reference/solr/solrquery/gethighlightregexmaxanalyzedchars.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightregexmaxanalyzedchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightRegexMaxAnalyzedChars</refname>
-  <refpurpose>Returns the maximum number of characters from a field when using the regex fragmenter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getHighlightRegexMaxAnalyzedChars</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of characters from a field when using the regex fragmenter
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightregexpattern.xml b/reference/solr/solrquery/gethighlightregexpattern.xml
deleted file mode 100644
index 1a6ba2e6365b..000000000000
--- a/reference/solr/solrquery/gethighlightregexpattern.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightregexpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightRegexPattern</refname>
-  <refpurpose>Returns the regular expression for fragmenting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightRegexPattern</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the regular expression used for fragmenting
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightregexslop.xml b/reference/solr/solrquery/gethighlightregexslop.xml
deleted file mode 100644
index 393bf7dbd142..000000000000
--- a/reference/solr/solrquery/gethighlightregexslop.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightregexslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightRegexSlop</refname>
-  <refpurpose>Returns the deviation factor from the ideal fragment size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SolrQuery::getHighlightRegexSlop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the factor by which the regex fragmenter can deviate from the ideal fragment size to accommodate the regular expression
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a <type>float</type> on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightrequirefieldmatch.xml b/reference/solr/solrquery/gethighlightrequirefieldmatch.xml
deleted file mode 100644
index 59d6fb66e6f7..000000000000
--- a/reference/solr/solrquery/gethighlightrequirefieldmatch.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightrequirefieldmatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightRequireFieldMatch</refname>
-  <refpurpose>Returns if a field will only be highlighted if the query matched in this particular field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getHighlightRequireFieldMatch</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns if a field will only be highlighted if the query matched in this particular field.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightsimplepost.xml b/reference/solr/solrquery/gethighlightsimplepost.xml
deleted file mode 100644
index 24071b5af3a9..000000000000
--- a/reference/solr/solrquery/gethighlightsimplepost.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightsimplepost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightSimplePost</refname>
-  <refpurpose>Returns the text which appears after a highlighted term</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightSimplePost</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the text which appears after a highlighted term. Accepts an optional field override
-  </para>
-</refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightsimplepre.xml b/reference/solr/solrquery/gethighlightsimplepre.xml
deleted file mode 100644
index 8654122fa3c6..000000000000
--- a/reference/solr/solrquery/gethighlightsimplepre.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightsimplepre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightSimplePre</refname>
-  <refpurpose>Returns the text which appears before a highlighted term</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getHighlightSimplePre</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the text which appears before a highlighted term. Accepts an optional field override
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightsnippets.xml b/reference/solr/solrquery/gethighlightsnippets.xml
deleted file mode 100644
index f404ce1026f8..000000000000
--- a/reference/solr/solrquery/gethighlightsnippets.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightsnippets" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightSnippets</refname>
-  <refpurpose>Returns the maximum number of highlighted snippets to generate per field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getHighlightSnippets</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of highlighted snippets to generate per field. Accepts an optional field override
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gethighlightusephrasehighlighter.xml b/reference/solr/solrquery/gethighlightusephrasehighlighter.xml
deleted file mode 100644
index 564d89119cbe..000000000000
--- a/reference/solr/solrquery/gethighlightusephrasehighlighter.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gethighlightusephrasehighlighter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getHighlightUsePhraseHighlighter</refname>
-  <refpurpose>Returns the state of the hl.usePhraseHighlighter parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getHighlightUsePhraseHighlighter</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not to use SpanScorer to highlight phrase terms only when they appear within the query phrase in the document.
-  </para>  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmlt.xml b/reference/solr/solrquery/getmlt.xml
deleted file mode 100644
index 79bdf4981734..000000000000
--- a/reference/solr/solrquery/getmlt.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmlt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMlt</refname>
-  <refpurpose>Returns whether or not MoreLikeThis results should be enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getMlt</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not MoreLikeThis results should be enabled
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltboost.xml b/reference/solr/solrquery/getmltboost.xml
deleted file mode 100644
index b410da87be56..000000000000
--- a/reference/solr/solrquery/getmltboost.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltBoost</refname>
-  <refpurpose>Returns whether or not the query will be boosted by the interesting term relevance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getMltBoost</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not the query will be boosted by the interesting term relevance
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltcount.xml b/reference/solr/solrquery/getmltcount.xml
deleted file mode 100644
index a258070d8751..000000000000
--- a/reference/solr/solrquery/getmltcount.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltCount</refname>
-  <refpurpose>Returns the number of similar documents to return for each result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the number of similar documents to return for each result
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltfields.xml b/reference/solr/solrquery/getmltfields.xml
deleted file mode 100644
index 9827a809dde1..000000000000
--- a/reference/solr/solrquery/getmltfields.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltFields</refname>
-  <refpurpose>Returns all the fields to use for similarity</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getMltFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-Returns all the fields to use for similarity
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltmaxnumqueryterms.xml b/reference/solr/solrquery/getmltmaxnumqueryterms.xml
deleted file mode 100644
index 7b288be596fc..000000000000
--- a/reference/solr/solrquery/getmltmaxnumqueryterms.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltmaxnumqueryterms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMaxNumQueryTerms</refname>
-  <refpurpose>Returns the maximum number of query terms that will be included in any generated query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMaxNumQueryTerms</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of query terms that will be included in any generated query
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltmaxnumtokens.xml b/reference/solr/solrquery/getmltmaxnumtokens.xml
deleted file mode 100644
index 92309b7dea75..000000000000
--- a/reference/solr/solrquery/getmltmaxnumtokens.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltmaxnumtokens" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMaxNumTokens</refname>
-  <refpurpose>Returns the maximum number of tokens to parse in each document field that is not stored with TermVector support</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMaxNumTokens</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of tokens to parse in each document field that is not stored with TermVector support
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltmaxwordlength.xml b/reference/solr/solrquery/getmltmaxwordlength.xml
deleted file mode 100644
index 88f4e68833b0..000000000000
--- a/reference/solr/solrquery/getmltmaxwordlength.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltmaxwordlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMaxWordLength</refname>
-  <refpurpose>Returns the maximum word length above which words will be ignored</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMaxWordLength</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum word length above which words will be ignored
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltmindocfrequency.xml b/reference/solr/solrquery/getmltmindocfrequency.xml
deleted file mode 100644
index ee584d9390b5..000000000000
--- a/reference/solr/solrquery/getmltmindocfrequency.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltmindocfrequency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMinDocFrequency</refname>
-  <refpurpose>Returns the treshold frequency at which words will be ignored which do not occur in at least this many docs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMinDocFrequency</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the treshold frequency at which words will be ignored which do not occur in at least this many docs
-  </para>
-
-</refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltmintermfrequency.xml b/reference/solr/solrquery/getmltmintermfrequency.xml
deleted file mode 100644
index a883b9f9f86e..000000000000
--- a/reference/solr/solrquery/getmltmintermfrequency.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltmintermfrequency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMinTermFrequency</refname>
-  <refpurpose>Returns the frequency below which terms will be ignored in the source document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMinTermFrequency</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the frequency below which terms will be ignored in the source document
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltminwordlength.xml b/reference/solr/solrquery/getmltminwordlength.xml
deleted file mode 100644
index 671bfb570e63..000000000000
--- a/reference/solr/solrquery/getmltminwordlength.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltminwordlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltMinWordLength</refname>
-  <refpurpose>Returns the minimum word length below which words will be ignored</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getMltMinWordLength</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the minimum word length below which words will be ignored
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getmltqueryfields.xml b/reference/solr/solrquery/getmltqueryfields.xml
deleted file mode 100644
index 429d53e8e543..000000000000
--- a/reference/solr/solrquery/getmltqueryfields.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getmltqueryfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getMltQueryFields</refname>
-  <refpurpose>Returns the query fields and their boosts</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getMltQueryFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the query fields and their boosts
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getquery.xml b/reference/solr/solrquery/getquery.xml
deleted file mode 100644
index d4ccafd8acd3..000000000000
--- a/reference/solr/solrquery/getquery.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getQuery</refname>
-  <refpurpose>Returns the main query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getQuery</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-Returns the main search query
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getrows.xml b/reference/solr/solrquery/getrows.xml
deleted file mode 100644
index 44e4e186faac..000000000000
--- a/reference/solr/solrquery/getrows.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getRows</refname>
-  <refpurpose>Returns the maximum number of documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getRows</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of documents from the complete result set to return to the client for every request
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getsortfields.xml b/reference/solr/solrquery/getsortfields.xml
deleted file mode 100644
index 55f977095817..000000000000
--- a/reference/solr/solrquery/getsortfields.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getsortfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getSortFields</refname>
-  <refpurpose>Returns all the sort fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getSortFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-Returns all the sort fields
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if none of the parameters was set.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getstart.xml b/reference/solr/solrquery/getstart.xml
deleted file mode 100644
index 7baca1ea0c08..000000000000
--- a/reference/solr/solrquery/getstart.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getStart</refname>
-  <refpurpose>Returns the offset in the complete result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getStart</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the offset in the complete result set for the queries where the set of returned documents should begin.
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getstats.xml b/reference/solr/solrquery/getstats.xml
deleted file mode 100644
index 39b2051bb734..000000000000
--- a/reference/solr/solrquery/getstats.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getstats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getStats</refname>
-  <refpurpose>Returns whether or not stats is enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getStats</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not stats is enabled
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getstatsfacets.xml b/reference/solr/solrquery/getstatsfacets.xml
deleted file mode 100644
index 19bd6653b70c..000000000000
--- a/reference/solr/solrquery/getstatsfacets.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getstatsfacets" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getStatsFacets</refname>
-  <refpurpose>Returns all the stats facets that were set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getStatsFacets</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns all the stats facets that were set
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getstatsfields.xml b/reference/solr/solrquery/getstatsfields.xml
deleted file mode 100644
index bc8a33ee7aa2..000000000000
--- a/reference/solr/solrquery/getstatsfields.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getstatsfields" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getStatsFields</refname>
-  <refpurpose>Returns all the statistics fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrQuery::getStatsFields</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns all the statistics fields
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an array on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/getterms.xml b/reference/solr/solrquery/getterms.xml
deleted file mode 100644
index 4dbdced45a08..000000000000
--- a/reference/solr/solrquery/getterms.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.getterms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTerms</refname>
-  <refpurpose>Returns whether or not the TermsComponent is enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getTerms</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not the TermsComponent is enabled
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsfield.xml b/reference/solr/solrquery/gettermsfield.xml
deleted file mode 100644
index 99c4ea654020..000000000000
--- a/reference/solr/solrquery/gettermsfield.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsField</refname>
-  <refpurpose>Returns the field from which the terms are retrieved</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getTermsField</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the field from which the terms are retrieved
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsincludelowerbound.xml b/reference/solr/solrquery/gettermsincludelowerbound.xml
deleted file mode 100644
index 2e012d0bc402..000000000000
--- a/reference/solr/solrquery/gettermsincludelowerbound.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsincludelowerbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsIncludeLowerBound</refname>
-  <refpurpose>Returns whether or not to include the lower bound in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getTermsIncludeLowerBound</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not to include the lower bound in the result set
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsincludeupperbound.xml b/reference/solr/solrquery/gettermsincludeupperbound.xml
deleted file mode 100644
index 78b1d87236fd..000000000000
--- a/reference/solr/solrquery/gettermsincludeupperbound.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsincludeupperbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsIncludeUpperBound</refname>
-  <refpurpose>Returns whether or not to include the upper bound term in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getTermsIncludeUpperBound</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns whether or not to include the upper bound term in the result set
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermslimit.xml b/reference/solr/solrquery/gettermslimit.xml
deleted file mode 100644
index 060de467d2d7..000000000000
--- a/reference/solr/solrquery/gettermslimit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermslimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsLimit</refname>
-  <refpurpose>Returns the maximum number of terms Solr should return</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getTermsLimit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum number of terms Solr should return
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermslowerbound.xml b/reference/solr/solrquery/gettermslowerbound.xml
deleted file mode 100644
index fdaa78e36a0b..000000000000
--- a/reference/solr/solrquery/gettermslowerbound.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermslowerbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsLowerBound</refname>
-  <refpurpose>Returns the term to start at</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getTermsLowerBound</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the term to start at
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsmaxcount.xml b/reference/solr/solrquery/gettermsmaxcount.xml
deleted file mode 100644
index ee0e14364231..000000000000
--- a/reference/solr/solrquery/gettermsmaxcount.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsmaxcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsMaxCount</refname>
-  <refpurpose>Returns the maximum document frequency</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getTermsMaxCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the maximum document frequency
-  </para>
-
-  
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsmincount.xml b/reference/solr/solrquery/gettermsmincount.xml
deleted file mode 100644
index 1fd87e7e8ff0..000000000000
--- a/reference/solr/solrquery/gettermsmincount.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsmincount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsMinCount</refname>
-  <refpurpose>Returns the minimum document frequency to return in order to be included</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getTermsMinCount</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the minimum document frequency to return in order to be included
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsprefix.xml b/reference/solr/solrquery/gettermsprefix.xml
deleted file mode 100644
index d631f7b08fbe..000000000000
--- a/reference/solr/solrquery/gettermsprefix.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsprefix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsPrefix</refname>
-  <refpurpose>Returns the term prefix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getTermsPrefix</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the prefix to which matching terms must be restricted. This will restrict matches to only terms that start with the prefix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsreturnraw.xml b/reference/solr/solrquery/gettermsreturnraw.xml
deleted file mode 100644
index 2e3a4f8236ab..000000000000
--- a/reference/solr/solrquery/gettermsreturnraw.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsreturnraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsReturnRaw</refname>
-  <refpurpose>Whether or not to return raw characters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrQuery::getTermsReturnRaw</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a boolean indicating whether or not to return the raw characters of the indexed term, regardless of if it is human readable
-  </para>
-
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a boolean on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermssort.xml b/reference/solr/solrquery/gettermssort.xml
deleted file mode 100644
index 8645e34fa198..000000000000
--- a/reference/solr/solrquery/gettermssort.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermssort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsSort</refname>
-  <refpurpose>Returns an integer indicating how terms are sorted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getTermsSort</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   SolrQuery::TERMS_SORT_INDEX indicates that the terms are returned by index order. SolrQuery::TERMS_SORT_COUNT implies that the terms are sorted by term frequency (highest count first)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns an integer on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettermsupperbound.xml b/reference/solr/solrquery/gettermsupperbound.xml
deleted file mode 100644
index 4b6e21708c07..000000000000
--- a/reference/solr/solrquery/gettermsupperbound.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettermsupperbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTermsUpperBound</refname>
-  <refpurpose>Returns the term to stop at</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrQuery::getTermsUpperBound</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the term to stop at
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns a string on success and &null; if not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/gettimeallowed.xml b/reference/solr/solrquery/gettimeallowed.xml
deleted file mode 100644
index 864b7b5928c9..000000000000
--- a/reference/solr/solrquery/gettimeallowed.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.gettimeallowed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::getTimeAllowed</refname>
-  <refpurpose>Returns the time in milliseconds allowed for the query to finish</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrQuery::getTimeAllowed</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-Returns the time in milliseconds allowed for the query to finish.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-Returns and integer on success and &null; if it is not set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removeexpandfilterquery.xml b/reference/solr/solrquery/removeexpandfilterquery.xml
deleted file mode 100644
index c4f6faf027fb..000000000000
--- a/reference/solr/solrquery/removeexpandfilterquery.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removeexpandfilterquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeExpandFilterQuery</refname>
-  <refpurpose>Removes an expand filter query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeExpandFilterQuery</methodname>
-   <methodparam><type>string</type><parameter>fq</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes an expand filter query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fq</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</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/solr/solrquery/removeexpandsortfield.xml b/reference/solr/solrquery/removeexpandsortfield.xml
deleted file mode 100644
index 39191f39c1e2..000000000000
--- a/reference/solr/solrquery/removeexpandsortfield.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removeexpandsortfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeExpandSortField</refname>
-  <refpurpose>Removes an expand sort field from the expand.sort parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeExpandSortField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Removes an expand sort field from the expand.sort parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      field name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/removefacetdatefield.xml b/reference/solr/solrquery/removefacetdatefield.xml
deleted file mode 100644
index 92570e91b625..000000000000
--- a/reference/solr/solrquery/removefacetdatefield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefacetdatefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeFacetDateField</refname>
-  <refpurpose>Removes one of the facet date fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeFacetDateField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The name of the field
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the date field to remove
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removefacetdateother.xml b/reference/solr/solrquery/removefacetdateother.xml
deleted file mode 100644
index 0f968cc1d6ba..000000000000
--- a/reference/solr/solrquery/removefacetdateother.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefacetdateother" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeFacetDateOther</refname>
-  <refpurpose>Removes one of the facet.date.other parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeFacetDateOther</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the facet.date.other parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removefacetfield.xml b/reference/solr/solrquery/removefacetfield.xml
deleted file mode 100644
index 261b5c29367b..000000000000
--- a/reference/solr/solrquery/removefacetfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefacetfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeFacetField</refname>
-  <refpurpose>Removes one of the facet.date parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeFacetField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the facet.date parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removefacetquery.xml b/reference/solr/solrquery/removefacetquery.xml
deleted file mode 100644
index c02d3353d68a..000000000000
--- a/reference/solr/solrquery/removefacetquery.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefacetquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeFacetQuery</refname>
-  <refpurpose>Removes one of the facet.query parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeFacetQuery</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the facet.query parameters.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removefield.xml b/reference/solr/solrquery/removefield.xml
deleted file mode 100644
index 870da3e31af3..000000000000
--- a/reference/solr/solrquery/removefield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeField</refname>
-  <refpurpose>Removes a field from the list of fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a field from the list of fields
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       Name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removefilterquery.xml b/reference/solr/solrquery/removefilterquery.xml
deleted file mode 100644
index b001b4c4d936..000000000000
--- a/reference/solr/solrquery/removefilterquery.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removefilterquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeFilterQuery</refname>
-  <refpurpose>Removes a filter query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeFilterQuery</methodname>
-   <methodparam><type>string</type><parameter>fq</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes a filter query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fq</parameter></term>
-     <listitem>
-      <para>
-       The filter query to remove
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removehighlightfield.xml b/reference/solr/solrquery/removehighlightfield.xml
deleted file mode 100644
index c621a390119e..000000000000
--- a/reference/solr/solrquery/removehighlightfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removehighlightfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeHighlightField</refname>
-  <refpurpose>Removes one of the fields used for highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeHighlightField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the fields used for highlighting.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removemltfield.xml b/reference/solr/solrquery/removemltfield.xml
deleted file mode 100644
index 753969d3d90e..000000000000
--- a/reference/solr/solrquery/removemltfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removemltfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeMltField</refname>
-  <refpurpose>Removes one of the moreLikeThis fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeMltField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the moreLikeThis fields.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       Name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removemltqueryfield.xml b/reference/solr/solrquery/removemltqueryfield.xml
deleted file mode 100644
index 7488c5bda2de..000000000000
--- a/reference/solr/solrquery/removemltqueryfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removemltqueryfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeMltQueryField</refname>
-  <refpurpose>Removes one of the moreLikeThis query fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeMltQueryField</methodname>
-   <methodparam><type>string</type><parameter>queryField</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the moreLikeThis query fields.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>queryField</parameter></term>
-     <listitem>
-      <para>
-       The query field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removesortfield.xml b/reference/solr/solrquery/removesortfield.xml
deleted file mode 100644
index 7a8f93cef716..000000000000
--- a/reference/solr/solrquery/removesortfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removesortfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeSortField</refname>
-  <refpurpose>Removes one of the sort fields</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeSortField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the sort fields
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removestatsfacet.xml b/reference/solr/solrquery/removestatsfacet.xml
deleted file mode 100644
index 35decee68369..000000000000
--- a/reference/solr/solrquery/removestatsfacet.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removestatsfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeStatsFacet</refname>
-  <refpurpose>Removes one of the stats.facet parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeStatsFacet</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the stats.facet parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/removestatsfield.xml b/reference/solr/solrquery/removestatsfield.xml
deleted file mode 100644
index 8e38ed24f057..000000000000
--- a/reference/solr/solrquery/removestatsfield.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.removestatsfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::removeStatsField</refname>
-  <refpurpose>Removes one of the stats.field parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::removeStatsField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes one of the stats.field parameters
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setechohandler.xml b/reference/solr/solrquery/setechohandler.xml
deleted file mode 100644
index abf314a457ab..000000000000
--- a/reference/solr/solrquery/setechohandler.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setechohandler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setEchoHandler</refname>
-  <refpurpose>Toggles the echoHandler parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setEchoHandler</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If set to true, Solr places the name of the handle used in the response to the client for debugging purposes.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setechoparams.xml b/reference/solr/solrquery/setechoparams.xml
deleted file mode 100644
index e9d580d8a978..000000000000
--- a/reference/solr/solrquery/setechoparams.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setechoparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setEchoParams</refname>
-  <refpurpose>Determines what kind of parameters to include in the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setEchoParams</methodname>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Instructs Solr what kinds of Request parameters should be included in the response for debugging purposes, legal values include: 
-  </para>
-
-<para>
- <![CDATA[
-- none - don't include any request parameters for debugging
-- explicit - include the parameters explicitly specified by the client in the request
-- all - include all parameters involved in this request, either specified explicitly by the client, or implicit because of the request handler configuration. 
-]]>
- 
-</para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-      The type of parameters to include
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setexpand.xml b/reference/solr/solrquery/setexpand.xml
deleted file mode 100644
index dae57122405c..000000000000
--- a/reference/solr/solrquery/setexpand.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setexpand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setExpand</refname>
-  <refpurpose>Enables/Disables the Expand Component</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setExpand</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Enables/Disables the Expand Component.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      Bool flag
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SolrQuery::setExpand</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$query = new SolrQuery('lucene');
-
-$query
-    ->setExpand(true)
-    ->setExpandRows(50)
-    ->setExpandQuery('text:product')
-    ->addExpandFilterQuery('manu:apple')
-    ->addExpandFilterQuery('inStock:true')
-    ->addExpandSortField('score', SolrQuery::ORDER_DESC)
-    ->addExpandSortField('title', SolrQuery::ORDER_ASC);
-
-echo $query.PHP_EOL;
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-q=lucene&expand=true&expand.rows=50&expand.q=text:product&expand.fq=manu:apple&expand.fq=inStock:true&expand.sort=score desc,title asc
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/setexpandquery.xml b/reference/solr/solrquery/setexpandquery.xml
deleted file mode 100644
index d46ad49d9c8e..000000000000
--- a/reference/solr/solrquery/setexpandquery.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setexpandquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setExpandQuery</refname>
-  <refpurpose>Sets the expand.q parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setExpandQuery</methodname>
-   <methodparam><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the expand.q parameter. 
-  </para>
-  <para>
-    Overrides the main q parameter, 
-    determines which documents to include in the main group.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>q</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandRows</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/setexpandrows.xml b/reference/solr/solrquery/setexpandrows.xml
deleted file mode 100644
index 2f6a1885d9e4..000000000000
--- a/reference/solr/solrquery/setexpandrows.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setexpandrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setExpandRows</refname>
-  <refpurpose>Sets the number of rows to display in each group (expand.rows). Server Default 5</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setExpandRows</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the number of rows to display in each group (expand.rows). Server Default 5
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <type>SolrQuery</type>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setExpand</methodname></member>
-   <member><methodname>SolrQuery::addExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::removeExpandSortField</methodname></member>
-   <member><methodname>SolrQuery::setExpandQuery</methodname></member>
-   <member><methodname>SolrQuery::addExpandFilterQuery</methodname></member>
-   <member><methodname>SolrQuery::removeExpandFilterQuery</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/solr/solrquery/setexplainother.xml b/reference/solr/solrquery/setexplainother.xml
deleted file mode 100644
index f5dcb11f0f6e..000000000000
--- a/reference/solr/solrquery/setexplainother.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setexplainother" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setExplainOther</refname>
-  <refpurpose>Sets the explainOther common query parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setExplainOther</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the explainOther common query parameter
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The Lucene query to identify a set of documents
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacet.xml b/reference/solr/solrquery/setfacet.xml
deleted file mode 100644
index 1ced961e4f52..000000000000
--- a/reference/solr/solrquery/setfacet.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacet</refname>
-  <refpurpose>Maps to the facet parameter. Enables or disables facetting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacet</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enables or disables faceting.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &true; enables faceting and &false; disables it.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetdateend.xml b/reference/solr/solrquery/setfacetdateend.xml
deleted file mode 100644
index 959ff942c5bd..000000000000
--- a/reference/solr/solrquery/setfacetdateend.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetdateend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetDateEnd</refname>
-  <refpurpose>Maps to facet.date.end</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetDateEnd</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to facet.date.end
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       See facet.date.end
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       Name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetdategap.xml b/reference/solr/solrquery/setfacetdategap.xml
deleted file mode 100644
index c3cdb73174ff..000000000000
--- a/reference/solr/solrquery/setfacetdategap.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetdategap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetDateGap</refname>
-  <refpurpose>Maps to facet.date.gap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetDateGap</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to facet.date.gap
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       See facet.date.gap
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetdatehardend.xml b/reference/solr/solrquery/setfacetdatehardend.xml
deleted file mode 100644
index 63d96bee1ecc..000000000000
--- a/reference/solr/solrquery/setfacetdatehardend.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetdatehardend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetDateHardEnd</refname>
-  <refpurpose>Maps to facet.date.hardend</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetDateHardEnd</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to facet.date.hardend
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       See facet.date.hardend
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetdatestart.xml b/reference/solr/solrquery/setfacetdatestart.xml
deleted file mode 100644
index 7383a83a136b..000000000000
--- a/reference/solr/solrquery/setfacetdatestart.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetdatestart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetDateStart</refname>
-  <refpurpose>Maps to facet.date.start</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetDateStart</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to facet.date.start
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       See facet.date.start
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetenumcachemindefaultfrequency.xml b/reference/solr/solrquery/setfacetenumcachemindefaultfrequency.xml
deleted file mode 100644
index e2e35f7ff824..000000000000
--- a/reference/solr/solrquery/setfacetenumcachemindefaultfrequency.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetenumcachemindefaultfrequency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetEnumCacheMinDefaultFrequency</refname>
-  <refpurpose>Sets the minimum document frequency used for determining term count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetEnumCacheMinDefaultFrequency</methodname>
-   <methodparam><type>int</type><parameter>frequency</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the minimum document frequency used for determining term count
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The minimum frequency
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetlimit.xml b/reference/solr/solrquery/setfacetlimit.xml
deleted file mode 100644
index 760af30efb67..000000000000
--- a/reference/solr/solrquery/setfacetlimit.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetlimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetLimit</refname>
-  <refpurpose>Maps to facet.limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetLimit</methodname>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Maps to facet.limit. Sets the maximum number of constraint counts that should be returned for the facet fields.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of constraint counts
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetmethod.xml b/reference/solr/solrquery/setfacetmethod.xml
deleted file mode 100644
index bb7b5f7d769e..000000000000
--- a/reference/solr/solrquery/setfacetmethod.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetMethod</refname>
-  <refpurpose>Specifies the type of algorithm to use when faceting a field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetMethod</methodname>
-   <methodparam><type>string</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the type of algorithm to use when faceting a field. This method accepts optional field override.
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-       The method to use.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetmincount.xml b/reference/solr/solrquery/setfacetmincount.xml
deleted file mode 100644
index e861baae500d..000000000000
--- a/reference/solr/solrquery/setfacetmincount.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetmincount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetMinCount</refname>
-  <refpurpose>Maps to facet.mincount</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetMinCount</methodname>
-   <methodparam><type>int</type><parameter>mincount</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the minimum counts for facet fields that should be included in the response
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mincount</parameter></term>
-     <listitem>
-      <para>
-       The minimum count
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetmissing.xml b/reference/solr/solrquery/setfacetmissing.xml
deleted file mode 100644
index 8ba5d2d76c95..000000000000
--- a/reference/solr/solrquery/setfacetmissing.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetmissing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetMissing</refname>
-  <refpurpose>Maps to facet.missing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetMissing</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Used to indicate that in addition to the Term-based constraints of a facet field, a count of all matching results which have no value for the field should be computed
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; turns this feature on. &false; disables it.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetoffset.xml b/reference/solr/solrquery/setfacetoffset.xml
deleted file mode 100644
index ea9e68f16814..000000000000
--- a/reference/solr/solrquery/setfacetoffset.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetOffset</refname>
-  <refpurpose>Sets the offset into the list of constraints to allow for pagination</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetOffset</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the offset into the list of constraints to allow for pagination.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>offset</parameter></term>
-     <listitem>
-      <para>
-       The offset
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetprefix.xml b/reference/solr/solrquery/setfacetprefix.xml
deleted file mode 100644
index eeb65e7481c8..000000000000
--- a/reference/solr/solrquery/setfacetprefix.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetprefix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetPrefix</refname>
-  <refpurpose>Specifies a string prefix with which to limits the terms on which to facet</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetPrefix</methodname>
-   <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies a string prefix with which to limits the terms on which to facet.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>prefix</parameter></term>
-     <listitem>
-      <para>
-       The prefix string
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setfacetsort.xml b/reference/solr/solrquery/setfacetsort.xml
deleted file mode 100644
index bfd508b6071d..000000000000
--- a/reference/solr/solrquery/setfacetsort.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setfacetsort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setFacetSort</refname>
-  <refpurpose>Determines the ordering of the facet field constraints</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setFacetSort</methodname>
-   <methodparam><type>int</type><parameter>facetSort</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Determines the ordering of the facet field constraints
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>facetSort</parameter></term>
-     <listitem>
-      <para>
-       Use SolrQuery::FACET_SORT_INDEX for sorting by index order or SolrQuery::FACET_SORT_COUNT for sorting by count.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setgroup.xml b/reference/solr/solrquery/setgroup.xml
deleted file mode 100644
index 1957dafc5895..000000000000
--- a/reference/solr/solrquery/setgroup.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroup</refname>
-  <refpurpose>Enable/Disable result grouping (group parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroup</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Enable/Disable result grouping (group parameter)
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::getGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgroupcachepercent.xml b/reference/solr/solrquery/setgroupcachepercent.xml
deleted file mode 100644
index 3264b5f27704..000000000000
--- a/reference/solr/solrquery/setgroupcachepercent.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupcachepercent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupCachePercent</refname>
-  <refpurpose>Enables caching for result grouping</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupCachePercent</methodname>
-   <methodparam><type>int</type><parameter>percent</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Setting this parameter to a number greater than 0 enables caching for result grouping.
-    Result Grouping executes two searches; this option caches the second search. The server default value is 0.
-    
-    Testing has shown that group caching only improves search time with Boolean, wildcard, and fuzzy queries. For simple queries like term or "match all" queries, group caching degrades performance.
-    group.cache.percent parameter
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>percent</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- 
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Emits <classname>SolrIllegalArgumentException</classname> in case of an invalid parameter was passed.
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</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/solr/solrquery/setgroupfacet.xml b/reference/solr/solrquery/setgroupfacet.xml
deleted file mode 100644
index ce7325904116..000000000000
--- a/reference/solr/solrquery/setgroupfacet.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupfacet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupFacet</refname>
-  <refpurpose>Sets group.facet parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupFacet</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Determines whether to compute grouped facets for the field facets specified in facet.field parameters.
-    Grouped facets are computed based on the first specified group.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgroupformat.xml b/reference/solr/solrquery/setgroupformat.xml
deleted file mode 100644
index 7e17dfe2f965..000000000000
--- a/reference/solr/solrquery/setgroupformat.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupformat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupFormat</refname>
-  <refpurpose>Sets the group format, result structure (group.format parameter)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupFormat</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the group.format parameter.
-    If this parameter is set to simple, the grouped documents are presented in a single flat list, and the start and rows parameters affect the numbers of documents instead of groups.
-    Accepts: grouped/simple
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgrouplimit.xml b/reference/solr/solrquery/setgrouplimit.xml
deleted file mode 100644
index d0f2908786c4..000000000000
--- a/reference/solr/solrquery/setgrouplimit.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgrouplimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupLimit</refname>
-  <refpurpose>Specifies the number of results to return for each group. The server default value is 1</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupLimit</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Specifies the number of results to return for each group. The server default value is 1.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgroupmain.xml b/reference/solr/solrquery/setgroupmain.xml
deleted file mode 100644
index 481cd28b12fe..000000000000
--- a/reference/solr/solrquery/setgroupmain.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupmain" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupMain</refname>
-  <refpurpose>If true, the result of the first field grouping command is used as the main result list in the response, using group.format=simple</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupMain</methodname>
-   <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 <literal>group.format=simple</literal>.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <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>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an instance of <classname>SolrQuery</classname>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgroupngroups.xml b/reference/solr/solrquery/setgroupngroups.xml
deleted file mode 100644
index f12e8d420435..000000000000
--- a/reference/solr/solrquery/setgroupngroups.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupngroups" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupNGroups</refname>
-  <refpurpose>If true, Solr includes the number of groups that have matched the query in the results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupNGroups</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    If true, Solr includes the number of groups that have matched the query in the results.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgroupoffset.xml b/reference/solr/solrquery/setgroupoffset.xml
deleted file mode 100644
index 2f787fe59cf5..000000000000
--- a/reference/solr/solrquery/setgroupoffset.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgroupoffset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupOffset</refname>
-  <refpurpose>Sets the group.offset parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupOffset</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Sets the group.offset parameter.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupTruncate</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/setgrouptruncate.xml b/reference/solr/solrquery/setgrouptruncate.xml
deleted file mode 100644
index c66262772d59..000000000000
--- a/reference/solr/solrquery/setgrouptruncate.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setgrouptruncate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setGroupTruncate</refname>
-  <refpurpose>If true, facet counts are based on the most relevant document of each group matching the query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setGroupTruncate</methodname>
-   <methodparam><type>bool</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    If true, facet counts are based on the most relevant document of each group matching the query.
-    The server default value is false.
-    group.truncate parameter
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::setGroup</methodname></member>
-   <member><methodname>SolrQuery::addGroupField</methodname></member>
-   <member><methodname>SolrQuery::addGroupFunction</methodname></member>
-   <member><methodname>SolrQuery::addGroupQuery</methodname></member>
-   <member><methodname>SolrQuery::addGroupSortField</methodname></member>
-   <member><methodname>SolrQuery::setGroupFacet</methodname></member>
-   <member><methodname>SolrQuery::setGroupOffset</methodname></member>
-   <member><methodname>SolrQuery::setGroupLimit</methodname></member>
-   <member><methodname>SolrQuery::setGroupMain</methodname></member>
-   <member><methodname>SolrQuery::setGroupNGroups</methodname></member>
-   <member><methodname>SolrQuery::setGroupFormat</methodname></member>
-   <member><methodname>SolrQuery::setGroupCachePercent</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/solr/solrquery/sethighlight.xml b/reference/solr/solrquery/sethighlight.xml
deleted file mode 100644
index 4c57cf244d56..000000000000
--- a/reference/solr/solrquery/sethighlight.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlight</refname>
-  <refpurpose>Enables or disables highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlight</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Setting it to &true; enables highlighted snippets to be generated in the query response.
-  </para>
-
-  <para>Setting it to &false; disables highlighting</para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       Enable or disable highlighting
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightalternatefield.xml b/reference/solr/solrquery/sethighlightalternatefield.xml
deleted file mode 100644
index a2c6eb2ee594..000000000000
--- a/reference/solr/solrquery/sethighlightalternatefield.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightalternatefield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightAlternateField</refname>
-  <refpurpose>Specifies the backup field to use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightAlternateField</methodname>
-   <methodparam><type>string</type><parameter>field</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If a snippet cannot be generated because there were no matching terms, one can specify a field to use as the backup or default summary
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>field</parameter></term>
-     <listitem>
-      <para>
-       The name of the backup field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field we are overriding this setting for.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightformatter.xml b/reference/solr/solrquery/sethighlightformatter.xml
deleted file mode 100644
index 5b4c297ff1c2..000000000000
--- a/reference/solr/solrquery/sethighlightformatter.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightformatter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightFormatter</refname>
-  <refpurpose>Specify a formatter for the highlight output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightFormatter</methodname>
-   <methodparam><type>string</type><parameter>formatter</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specify a formatter for the highlight output.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>formatter</parameter></term>
-     <listitem>
-      <para>
-       Currently the only legal value is "simple"
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightfragmenter.xml b/reference/solr/solrquery/sethighlightfragmenter.xml
deleted file mode 100644
index f755ed08e0bd..000000000000
--- a/reference/solr/solrquery/sethighlightfragmenter.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightfragmenter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightFragmenter</refname>
-  <refpurpose>Sets a text snippet generator for highlighted text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightFragmenter</methodname>
-   <methodparam><type>string</type><parameter>fragmenter</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specify a text snippet generator for highlighted text. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fragmenter</parameter></term>
-     <listitem>
-      <para>
-       The standard fragmenter is gap. Another option is regex, which tries to create fragments that resembles a certain regular expression
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightfragsize.xml b/reference/solr/solrquery/sethighlightfragsize.xml
deleted file mode 100644
index cd2187641209..000000000000
--- a/reference/solr/solrquery/sethighlightfragsize.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightfragsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightFragsize</refname>
-  <refpurpose>The size of fragments to consider for highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightFragsize</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the size, in characters, of fragments to consider for highlighting. "0" indicates that the whole field value should be used (no fragmenting).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>size</parameter></term>
-     <listitem>
-      <para>
-       The size, in characters, of fragments to consider for highlighting
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlighthighlightmultiterm.xml b/reference/solr/solrquery/sethighlighthighlightmultiterm.xml
deleted file mode 100644
index 5b0f3e0a09ee..000000000000
--- a/reference/solr/solrquery/sethighlighthighlightmultiterm.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlighthighlightmultiterm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightHighlightMultiTerm</refname>
-  <refpurpose>Use SpanScorer to highlight phrase terms</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightHighlightMultiTerm</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Use SpanScorer to highlight phrase terms only when they appear within the query phrase in the document.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       Whether or not to use SpanScorer to highlight phrase terms only when they appear within the query phrase in the document.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightmaxalternatefieldlength.xml b/reference/solr/solrquery/sethighlightmaxalternatefieldlength.xml
deleted file mode 100644
index 1a6bb0603282..000000000000
--- a/reference/solr/solrquery/sethighlightmaxalternatefieldlength.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightmaxalternatefieldlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightMaxAlternateFieldLength</refname>
-  <refpurpose>Sets the maximum number of characters of the field to return</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightMaxAlternateFieldLength</methodname>
-   <methodparam><type>int</type><parameter>fieldLength</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If SolrQuery::setHighlightAlternateField() was passed the value &true;, this parameter specifies the maximum number of characters of the field to return
-  </para>
- <para>
-  Any value less than or equal to 0 means unlimited. 
- </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldLength</parameter></term>
-     <listitem>
-      <para>
-       The length of the field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightmaxanalyzedchars.xml b/reference/solr/solrquery/sethighlightmaxanalyzedchars.xml
deleted file mode 100644
index 53afa4c33804..000000000000
--- a/reference/solr/solrquery/sethighlightmaxanalyzedchars.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightmaxanalyzedchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightMaxAnalyzedChars</refname>
-  <refpurpose>Specifies the number of characters into a document to look for suitable snippets</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightMaxAnalyzedChars</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the number of characters into a document to look for suitable snippets
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The number of characters into a document to look for suitable snippets
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightmergecontiguous.xml b/reference/solr/solrquery/sethighlightmergecontiguous.xml
deleted file mode 100644
index 801bc49a11a7..000000000000
--- a/reference/solr/solrquery/sethighlightmergecontiguous.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightmergecontiguous" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightMergeContiguous</refname>
-  <refpurpose>Whether or not to collapse contiguous fragments into a single fragment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightMergeContiguous</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Whether or not to collapse contiguous fragments into a single fragment
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Whether or not to collapse contiguous fragments into a single fragment
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightquery.xml b/reference/solr/solrquery/sethighlightquery.xml
deleted file mode 100644
index 19ee9a77be92..000000000000
--- a/reference/solr/solrquery/sethighlightquery.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="solrquery.sethighlightquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightQuery</refname>
-  <refpurpose>A query designated for highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightQuery</methodname>
-   <methodparam><type>string</type><parameter>q</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   A query to use for highlighting and which will be set as the value of the Solr <literal>hl.q</literal> parameter.
-   This parameter allows one to highlight different terms or fields than those being used to retrieve documents.
-  </simpara>
-
-  <simpara>
-   Default value when not set: the value of the request's <literal>q</literal> parameter.
-  </simpara>
-
-  <simpara>
-   See the <link xlink:href="https://solr.apache.org/guide/solr/latest/query-guide/highlighting.html">Highlighting</link>
-   section for more details about the Solr <literal>hl.q</literal> parameter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>q</parameter></term>
-     <listitem>
-      <simpara>
-       Highlight Query.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the current <classname>SolrQuery</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SolrQuery::getHighlightQuery</methodname></member>
-   <member><methodname>SolrQuery::setHighlightFields</methodname></member>
-   <member><methodname>SolrQuery::getHighlightFields</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/solr/solrquery/sethighlightregexmaxanalyzedchars.xml b/reference/solr/solrquery/sethighlightregexmaxanalyzedchars.xml
deleted file mode 100644
index dd941d24f836..000000000000
--- a/reference/solr/solrquery/sethighlightregexmaxanalyzedchars.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightregexmaxanalyzedchars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightRegexMaxAnalyzedChars</refname>
-  <refpurpose>Specify the maximum number of characters to analyze</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightRegexMaxAnalyzedChars</methodname>
-   <methodparam><type>int</type><parameter>maxAnalyzedChars</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specify the maximum number of characters to analyze from a field when using the regex fragmenter
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>maxAnalyzedChars</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of characters to analyze from a field when using the regex fragmenter
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightregexpattern.xml b/reference/solr/solrquery/sethighlightregexpattern.xml
deleted file mode 100644
index a1a3d818ffda..000000000000
--- a/reference/solr/solrquery/sethighlightregexpattern.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightregexpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightRegexPattern</refname>
-  <refpurpose>Specify the regular expression for fragmenting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightRegexPattern</methodname>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the regular expression for fragmenting. This could be used to extract sentences
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The regular expression for fragmenting. This could be used to extract sentences
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightregexslop.xml b/reference/solr/solrquery/sethighlightregexslop.xml
deleted file mode 100644
index 859be71d52ca..000000000000
--- a/reference/solr/solrquery/sethighlightregexslop.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightregexslop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightRegexSlop</refname>
-  <refpurpose>Sets the factor by which the regex fragmenter can stray from the ideal fragment size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightRegexSlop</methodname>
-   <methodparam><type>float</type><parameter>factor</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The factor by which the regex fragmenter can stray from the ideal fragment size ( specfied by SolrQuery::setHighlightFragsize )to accommodate the regular expression
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>factor</parameter></term>
-     <listitem>
-      <para>
-       The factor by which the regex fragmenter can stray from the ideal fragment size
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightrequirefieldmatch.xml b/reference/solr/solrquery/sethighlightrequirefieldmatch.xml
deleted file mode 100644
index 49ca28881d07..000000000000
--- a/reference/solr/solrquery/sethighlightrequirefieldmatch.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightrequirefieldmatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightRequireFieldMatch</refname>
-  <refpurpose>Require field matching during highlighting</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightRequireFieldMatch</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If &true;, then a field will only be highlighted if the query matched in this particular field.
-  </para>
-
-  <para>This will only work if SolrQuery::setHighlightUsePhraseHighlighter() was set to &true;</para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightsimplepost.xml b/reference/solr/solrquery/sethighlightsimplepost.xml
deleted file mode 100644
index 48f316366d52..000000000000
--- a/reference/solr/solrquery/sethighlightsimplepost.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightsimplepost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightSimplePost</refname>
-  <refpurpose>Sets the text which appears after a highlighted term</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightSimplePost</methodname>
-   <methodparam><type>string</type><parameter>simplePost</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the text which appears before a highlighted term
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>simplePost</parameter></term>
-     <listitem>
-      <para>
-       Sets the text which appears after a highlighted term
-      </para>
-      <para><![CDATA[ The default is </em> ]]></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightsimplepre.xml b/reference/solr/solrquery/sethighlightsimplepre.xml
deleted file mode 100644
index f64ad1805880..000000000000
--- a/reference/solr/solrquery/sethighlightsimplepre.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightsimplepre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightSimplePre</refname>
-  <refpurpose>Sets the text which appears before a highlighted term</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightSimplePre</methodname>
-   <methodparam><type>string</type><parameter>simplePre</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the text which appears before a highlighted term
-  </para>
-  <para><![CDATA[ The default is <em> ]]></para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>simplePre</parameter></term>
-     <listitem>
-      <para>
-       The text which appears before a highlighted term
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightsnippets.xml b/reference/solr/solrquery/sethighlightsnippets.xml
deleted file mode 100644
index c33169fb2e16..000000000000
--- a/reference/solr/solrquery/sethighlightsnippets.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightsnippets" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightSnippets</refname>
-  <refpurpose>Sets the maximum number of highlighted snippets to generate per field</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightSnippets</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field_override</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of highlighted snippets to generate per field
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of highlighted snippets to generate per field
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>field_override</parameter></term>
-     <listitem>
-      <para>
-       The name of the field.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/sethighlightusephrasehighlighter.xml b/reference/solr/solrquery/sethighlightusephrasehighlighter.xml
deleted file mode 100644
index 9cab4840f70d..000000000000
--- a/reference/solr/solrquery/sethighlightusephrasehighlighter.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.sethighlightusephrasehighlighter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setHighlightUsePhraseHighlighter</refname>
-  <refpurpose>Whether to highlight phrase terms only when they appear within the query phrase</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setHighlightUsePhraseHighlighter</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets whether or not to use SpanScorer to highlight phrase terms only when they appear within the query phrase in the document
-  </para>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Whether or not to use SpanScorer to highlight phrase terms only when they appear within the query phrase in the document
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmlt.xml b/reference/solr/solrquery/setmlt.xml
deleted file mode 100644
index edb494a89269..000000000000
--- a/reference/solr/solrquery/setmlt.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmlt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMlt</refname>
-  <refpurpose>Enables or disables moreLikeThis</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMlt</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enables or disables moreLikeThis
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; enables it and &false; turns it off.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltboost.xml b/reference/solr/solrquery/setmltboost.xml
deleted file mode 100644
index 5732a51b45ff..000000000000
--- a/reference/solr/solrquery/setmltboost.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltboost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltBoost</refname>
-  <refpurpose>Set if the query will be boosted by the interesting term relevance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltBoost</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set if the query will be boosted by the interesting term relevance
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Sets to &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltcount.xml b/reference/solr/solrquery/setmltcount.xml
deleted file mode 100644
index 6874281d236c..000000000000
--- a/reference/solr/solrquery/setmltcount.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltCount</refname>
-  <refpurpose>Set the number of similar documents to return for each result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltCount</methodname>
-   <methodparam><type>int</type><parameter>count</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the number of similar documents to return for each result
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>count</parameter></term>
-     <listitem>
-      <para>
-       The number of similar documents to return for each result
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltmaxnumqueryterms.xml b/reference/solr/solrquery/setmltmaxnumqueryterms.xml
deleted file mode 100644
index 2ada1de56ff8..000000000000
--- a/reference/solr/solrquery/setmltmaxnumqueryterms.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltmaxnumqueryterms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMaxNumQueryTerms</refname>
-  <refpurpose>Sets the maximum number of query terms included</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMaxNumQueryTerms</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of query terms that will be included in any generated query. 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of query terms that will be included in any generated query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltmaxnumtokens.xml b/reference/solr/solrquery/setmltmaxnumtokens.xml
deleted file mode 100644
index 2c5447318c9f..000000000000
--- a/reference/solr/solrquery/setmltmaxnumtokens.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltmaxnumtokens" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMaxNumTokens</refname>
-  <refpurpose>Specifies the maximum number of tokens to parse</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMaxNumTokens</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the maximum number of tokens to parse in each example doc field that is not stored with TermVector support. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of tokens to parse
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltmaxwordlength.xml b/reference/solr/solrquery/setmltmaxwordlength.xml
deleted file mode 100644
index bfcfba0e8ae9..000000000000
--- a/reference/solr/solrquery/setmltmaxwordlength.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltmaxwordlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMaxWordLength</refname>
-  <refpurpose>Sets the maximum word length</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMaxWordLength</methodname>
-   <methodparam><type>int</type><parameter>maxWordLength</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum word length above which words will be ignored. 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>maxWordLength</parameter></term>
-     <listitem>
-      <para>
-       The maximum word length above which words will be ignored
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltmindocfrequency.xml b/reference/solr/solrquery/setmltmindocfrequency.xml
deleted file mode 100644
index 5dd94dd5f33f..000000000000
--- a/reference/solr/solrquery/setmltmindocfrequency.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltmindocfrequency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMinDocFrequency</refname>
-  <refpurpose>Sets the mltMinDoc frequency</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMinDocFrequency</methodname>
-   <methodparam><type>int</type><parameter>minDocFrequency</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The frequency at which words will be ignored which do not occur in at least this many docs.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>minDocFrequency</parameter></term>
-     <listitem>
-      <para>
-       Sets the frequency at which words will be ignored which do not occur in at least this many docs.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltmintermfrequency.xml b/reference/solr/solrquery/setmltmintermfrequency.xml
deleted file mode 100644
index 7afba4a8a2da..000000000000
--- a/reference/solr/solrquery/setmltmintermfrequency.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltmintermfrequency" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMinTermFrequency</refname>
-  <refpurpose>Sets the frequency below which terms will be ignored in the source docs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMinTermFrequency</methodname>
-   <methodparam><type>int</type><parameter>minTermFrequency</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the frequency below which terms will be ignored in the source docs
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>minTermFrequency</parameter></term>
-     <listitem>
-      <para>
-       The frequency below which terms will be ignored in the source docs
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setmltminwordlength.xml b/reference/solr/solrquery/setmltminwordlength.xml
deleted file mode 100644
index 04892cece88a..000000000000
--- a/reference/solr/solrquery/setmltminwordlength.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setmltminwordlength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setMltMinWordLength</refname>
-  <refpurpose>Sets the minimum word length</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setMltMinWordLength</methodname>
-   <methodparam><type>int</type><parameter>minWordLength</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the minimum word length below which words will be ignored. 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>minWordLength</parameter></term>
-     <listitem>
-      <para>
-       The minimum word length below which words will be ignored
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setomitheader.xml b/reference/solr/solrquery/setomitheader.xml
deleted file mode 100644
index 5c8e2bb65f9c..000000000000
--- a/reference/solr/solrquery/setomitheader.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setomitheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setOmitHeader</refname>
-  <refpurpose>Exclude the header from the returned results</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setOmitHeader</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Exclude the header from the returned results.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; excludes the header from the result.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setquery.xml b/reference/solr/solrquery/setquery.xml
deleted file mode 100644
index 4ee583833e0e..000000000000
--- a/reference/solr/solrquery/setquery.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setQuery</refname>
-  <refpurpose>Sets the search query</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setQuery</methodname>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the search query.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The search query
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery 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/solr/solrquery/setrows.xml b/reference/solr/solrquery/setrows.xml
deleted file mode 100644
index 9298ce7e35bd..000000000000
--- a/reference/solr/solrquery/setrows.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setRows</refname>
-  <refpurpose>Specifies the maximum number of rows to return in the result</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setRows</methodname>
-   <methodparam><type>int</type><parameter>rows</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the maximum number of rows to return in the result
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>rows</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of rows to return
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery 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/solr/solrquery/setshowdebuginfo.xml b/reference/solr/solrquery/setshowdebuginfo.xml
deleted file mode 100644
index c45ef9a9c3e8..000000000000
--- a/reference/solr/solrquery/setshowdebuginfo.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setshowdebuginfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setShowDebugInfo</refname>
-  <refpurpose>Flag to show debug information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setShowDebugInfo</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Whether to show debug info
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       Whether to show debug info. &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setstart.xml b/reference/solr/solrquery/setstart.xml
deleted file mode 100644
index 96ebdbd13b1e..000000000000
--- a/reference/solr/solrquery/setstart.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setstart" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setStart</refname>
-  <refpurpose>Specifies the number of rows to skip</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setStart</methodname>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the number of rows to skip. Useful in pagination of results.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>start</parameter></term>
-     <listitem>
-      <para>
-       The number of rows to skip.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns the current SolrQuery 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/solr/solrquery/setstats.xml b/reference/solr/solrquery/setstats.xml
deleted file mode 100644
index d096ac0af5af..000000000000
--- a/reference/solr/solrquery/setstats.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setstats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setStats</refname>
-  <refpurpose>Enables or disables the Stats component</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setStats</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enables or disables the Stats component.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-      &true; turns on the stats component and &false; disables it.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/setterms.xml b/reference/solr/solrquery/setterms.xml
deleted file mode 100644
index 3a07b5567ab4..000000000000
--- a/reference/solr/solrquery/setterms.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.setterms" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTerms</refname>
-  <refpurpose>Enables or disables the TermsComponent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTerms</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Enables or disables the TermsComponent
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       &true; enables it. &false; turns it off
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsfield.xml b/reference/solr/solrquery/settermsfield.xml
deleted file mode 100644
index 148970eda8c9..000000000000
--- a/reference/solr/solrquery/settermsfield.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsfield" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsField</refname>
-  <refpurpose>Sets the name of the field to get the Terms from</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsField</methodname>
-   <methodparam><type>string</type><parameter>fieldname</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the name of the field to get the terms from
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>fieldname</parameter></term>
-     <listitem>
-      <para>
-       The field name
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsincludelowerbound.xml b/reference/solr/solrquery/settermsincludelowerbound.xml
deleted file mode 100644
index 023d982e384f..000000000000
--- a/reference/solr/solrquery/settermsincludelowerbound.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsincludelowerbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsIncludeLowerBound</refname>
-  <refpurpose>Include the lower bound term in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsIncludeLowerBound</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Include the lower bound term in the result set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-       Include the lower bound term in the result set
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsincludeupperbound.xml b/reference/solr/solrquery/settermsincludeupperbound.xml
deleted file mode 100644
index d5068b701996..000000000000
--- a/reference/solr/solrquery/settermsincludeupperbound.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsincludeupperbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsIncludeUpperBound</refname>
-  <refpurpose>Include the upper bound term in the result set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsIncludeUpperBound</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Include the upper bound term in the result set.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flag</parameter></term>
-     <listitem>
-      <para>
-      &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermslimit.xml b/reference/solr/solrquery/settermslimit.xml
deleted file mode 100644
index f946316245e2..000000000000
--- a/reference/solr/solrquery/settermslimit.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermslimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsLimit</refname>
-  <refpurpose>Sets the maximum number of terms to return</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsLimit</methodname>
-   <methodparam><type>int</type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum number of terms to return
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>limit</parameter></term>
-     <listitem>
-      <para>
-       The maximum number of terms to return. All the terms will be returned if the limit is negative.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermslowerbound.xml b/reference/solr/solrquery/settermslowerbound.xml
deleted file mode 100644
index 3b2a571819f2..000000000000
--- a/reference/solr/solrquery/settermslowerbound.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermslowerbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsLowerBound</refname>
-  <refpurpose>Specifies the Term to start from</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsLowerBound</methodname>
-   <methodparam><type>string</type><parameter>lowerBound</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies the Term to start from
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>lowerBound</parameter></term>
-     <listitem>
-      <para>
-       The lower bound Term
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsmaxcount.xml b/reference/solr/solrquery/settermsmaxcount.xml
deleted file mode 100644
index 33ffce03ec6b..000000000000
--- a/reference/solr/solrquery/settermsmaxcount.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsmaxcount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsMaxCount</refname>
-  <refpurpose>Sets the maximum document frequency</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsMaxCount</methodname>
-   <methodparam><type>int</type><parameter>frequency</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the maximum document frequency.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>frequency</parameter></term>
-     <listitem>
-      <para>
-      The maximum document frequency.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
- 
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsmincount.xml b/reference/solr/solrquery/settermsmincount.xml
deleted file mode 100644
index 84775b1d2d9c..000000000000
--- a/reference/solr/solrquery/settermsmincount.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsmincount" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsMinCount</refname>
-  <refpurpose>Sets the minimum document frequency</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsMinCount</methodname>
-   <methodparam><type>int</type><parameter>frequency</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the minimum doc frequency to return in order to be included
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>frequency</parameter></term>
-     <listitem>
-      <para>
-       The minimum frequency
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsprefix.xml b/reference/solr/solrquery/settermsprefix.xml
deleted file mode 100644
index f846d8dc1fc7..000000000000
--- a/reference/solr/solrquery/settermsprefix.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsprefix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsPrefix</refname>
-  <refpurpose>Restrict matches to terms that start with the prefix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsPrefix</methodname>
-   <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Restrict matches to terms that start with the prefix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>prefix</parameter></term>
-     <listitem>
-      <para>
-       Restrict matches to terms that start with the prefix
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsreturnraw.xml b/reference/solr/solrquery/settermsreturnraw.xml
deleted file mode 100644
index 51b37acb5b58..000000000000
--- a/reference/solr/solrquery/settermsreturnraw.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsreturnraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsReturnRaw</refname>
-  <refpurpose>Return the raw characters of the indexed term</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsReturnRaw</methodname>
-   <methodparam><type>bool</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If true, return the raw characters of the indexed term, regardless of if it is human readable
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       &true; or &false;
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermssort.xml b/reference/solr/solrquery/settermssort.xml
deleted file mode 100644
index 948ac9d2dc5d..000000000000
--- a/reference/solr/solrquery/settermssort.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermssort" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsSort</refname>
-  <refpurpose>Specifies how to sort the returned terms</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsSort</methodname>
-   <methodparam><type>int</type><parameter>sortType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If SolrQuery::TERMS_SORT_COUNT, sorts the terms by the term frequency (highest count first). If SolrQuery::TERMS_SORT_INDEX, returns the terms in index order
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>sortType</parameter></term>
-     <listitem>
-      <para>
-       SolrQuery::TERMS_SORT_INDEX or SolrQuery::TERMS_SORT_COUNT
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settermsupperbound.xml b/reference/solr/solrquery/settermsupperbound.xml
deleted file mode 100644
index 660a07b53e85..000000000000
--- a/reference/solr/solrquery/settermsupperbound.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settermsupperbound" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTermsUpperBound</refname>
-  <refpurpose>Sets the term to stop at</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTermsUpperBound</methodname>
-   <methodparam><type>string</type><parameter>upperBound</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the term to stop at
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>upperBound</parameter></term>
-     <listitem>
-      <para>
-       The term to stop at
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrquery/settimeallowed.xml b/reference/solr/solrquery/settimeallowed.xml
deleted file mode 100644
index 42b43e55c643..000000000000
--- a/reference/solr/solrquery/settimeallowed.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrquery.settimeallowed" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQuery::setTimeAllowed</refname>
-  <refpurpose>The time allowed for search to finish</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrQuery</type><methodname>SolrQuery::setTimeAllowed</methodname>
-   <methodparam><type>int</type><parameter>timeAllowed</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The time allowed for a search to finish. This value only applies to the search and not to requests in general. Time is in milliseconds. Values less than or equal to zero implies no time restriction. Partial results may be returned, if there are any.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>timeAllowed</parameter></term>
-     <listitem>
-      <para>
-       The time allowed for a search to finish.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current SolrQuery object, if the return value is used.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrqueryresponse.xml b/reference/solr/solrqueryresponse.xml
deleted file mode 100644
index 7a549875be4b..000000000000
--- a/reference/solr/solrqueryresponse.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrqueryresponse" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrQueryResponse class</title>
- <titleabbrev>SolrQueryResponse</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrQueryResponse intro -->
-  <section xml:id="solrqueryresponse.intro">
-   &reftitle.intro;
-   <para>
-    Represents a response to a query request.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrqueryresponse.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrQueryResponse</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrQueryResponse</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrResponse</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrqueryresponse.constants.parse-solr-obj">SolrQueryResponse::PARSE_SOLR_OBJ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrqueryresponse.constants.parse-solr-doc">SolrQueryResponse::PARSE_SOLR_DOC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrqueryresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrqueryresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrQueryResponse constants -->
-  <section xml:id="solrqueryresponse.constants">
-   &reftitle.constants;
-   <section xml:id="solrqueryresponse.constants.types">
-    <title>SolrQueryResponse Class constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrqueryresponse.constants.parse-solr-obj">
-      <term><constant>SolrQueryResponse::PARSE_SOLR_OBJ</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrObject instances</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrqueryresponse.constants.parse-solr-doc">
-      <term><constant>SolrQueryResponse::PARSE_SOLR_DOC</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrDocument instances.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrqueryresponse;
-
-</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/solr/solrqueryresponse/construct.xml b/reference/solr/solrqueryresponse/construct.xml
deleted file mode 100644
index ff97d7a5d92e..000000000000
--- a/reference/solr/solrqueryresponse/construct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrqueryresponse.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQueryResponse::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrQueryResponse::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrqueryresponse/destruct.xml b/reference/solr/solrqueryresponse/destruct.xml
deleted file mode 100644
index e0e0509fd03c..000000000000
--- a/reference/solr/solrqueryresponse/destruct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrqueryresponse.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrQueryResponse::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrQueryResponse::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse.xml b/reference/solr/solrresponse.xml
deleted file mode 100644
index 6fe3b8acd19f..000000000000
--- a/reference/solr/solrresponse.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrresponse" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrResponse class</title>
- <titleabbrev>SolrResponse</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrResponse intro -->
-  <section xml:id="solrresponse.intro">
-   &reftitle.intro;
-   <para>
-    Represents a response from the Solr server.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrresponse.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrResponse</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>SolrResponse</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrresponse.constants.parse-solr-obj">SolrResponse::PARSE_SOLR_OBJ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrresponse.constants.parse-solr-doc">SolrResponse::PARSE_SOLR_DOC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>int</type>
-     <varname linkend="solrresponse.props.http-status">http_status</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>int</type>
-     <varname linkend="solrresponse.props.parser-mode">parser_mode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>bool</type>
-     <varname linkend="solrresponse.props.success">success</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-status-message">http_status_message</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-request-url">http_request_url</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-raw-request-headers">http_raw_request_headers</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-raw-request">http_raw_request</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-raw-response-headers">http_raw_response_headers</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-raw-response">http_raw_response</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="solrresponse.props.http-digested-response">http_digested_response</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrResponse properties -->
-  <section xml:id="solrresponse.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="solrresponse.props.http-status">
-     <term><varname>http_status</varname></term>
-     <listitem>
-      <para>The http status of the response.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.parser-mode">
-     <term><varname>parser_mode</varname></term>
-     <listitem>
-      <para>Whether to parse the solr documents as SolrObject or SolrDocument instances.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.success">
-     <term><varname>success</varname></term>
-     <listitem>
-      <para>Was there an error during the request</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-status-message">
-     <term><varname>http_status_message</varname></term>
-     <listitem>
-      <para>Detailed message on http status</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-request-url">
-     <term><varname>http_request_url</varname></term>
-     <listitem>
-      <para>The request URL</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-raw-request-headers">
-     <term><varname>http_raw_request_headers</varname></term>
-     <listitem>
-      <para>A string of raw headers sent during the request.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-raw-request">
-     <term><varname>http_raw_request</varname></term>
-     <listitem>
-      <para>The raw request sent to the server</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-raw-response-headers">
-     <term><varname>http_raw_response_headers</varname></term>
-     <listitem>
-      <para>Response headers from the Solr server.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-raw-response">
-     <term><varname>http_raw_response</varname></term>
-     <listitem>
-      <para>The response message from the server.</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="solrresponse.props.http-digested-response">
-     <term><varname>http_digested_response</varname></term>
-     <listitem>
-      <para>The response in PHP serialized format.</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  
-<!-- {{{ SolrResponse constants -->
-  <section xml:id="solrresponse.constants">
-   &reftitle.constants;
-   <section xml:id="solrresponse.constants.types">
-    <title>SolrResponse Class Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrresponse.constants.parse-solr-obj">
-      <term><constant>SolrResponse::PARSE_SOLR_OBJ</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrObject instances</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrresponse.constants.parse-solr-doc">
-      <term><constant>SolrResponse::PARSE_SOLR_DOC</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrDocument instances.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrresponse;
-
-</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/solr/solrresponse/getdigestedresponse.xml b/reference/solr/solrresponse/getdigestedresponse.xml
deleted file mode 100644
index 841b3ea60ca6..000000000000
--- a/reference/solr/solrresponse/getdigestedresponse.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getdigestedresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getDigestedResponse</refname>
-  <refpurpose>Returns the XML response as serialized PHP data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getDigestedResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the XML response as serialized PHP data
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the XML response as serialized PHP data
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/gethttpstatus.xml b/reference/solr/solrresponse/gethttpstatus.xml
deleted file mode 100644
index beb79495e98c..000000000000
--- a/reference/solr/solrresponse/gethttpstatus.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.gethttpstatus" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getHttpStatus</refname>
-  <refpurpose>Returns the HTTP status of the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SolrResponse::getHttpStatus</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the HTTP status of the response.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the HTTP status of the 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/gethttpstatusmessage.xml b/reference/solr/solrresponse/gethttpstatusmessage.xml
deleted file mode 100644
index 0df1f0c36939..000000000000
--- a/reference/solr/solrresponse/gethttpstatusmessage.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.gethttpstatusmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getHttpStatusMessage</refname>
-  <refpurpose>Returns more details on the HTTP status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getHttpStatusMessage</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns more details on the HTTP status.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns more details on the HTTP status
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getrawrequest.xml b/reference/solr/solrresponse/getrawrequest.xml
deleted file mode 100644
index 81d46b240ecc..000000000000
--- a/reference/solr/solrresponse/getrawrequest.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getrawrequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getRawRequest</refname>
-  <refpurpose>Returns the raw request sent to the Solr server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getRawRequest</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the raw request sent to the Solr server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the raw request sent to the Solr server
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getrawrequestheaders.xml b/reference/solr/solrresponse/getrawrequestheaders.xml
deleted file mode 100644
index 68c820d04ff2..000000000000
--- a/reference/solr/solrresponse/getrawrequestheaders.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getrawrequestheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getRawRequestHeaders</refname>
-  <refpurpose>Returns the raw request headers sent to the Solr server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getRawRequestHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the raw request headers sent to the Solr server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the raw request headers sent to the Solr server
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getrawresponse.xml b/reference/solr/solrresponse/getrawresponse.xml
deleted file mode 100644
index 9ab10de29dd7..000000000000
--- a/reference/solr/solrresponse/getrawresponse.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getrawresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getRawResponse</refname>
-  <refpurpose>Returns the raw response from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getRawResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the raw response from the server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the raw response from the server.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getrawresponseheaders.xml b/reference/solr/solrresponse/getrawresponseheaders.xml
deleted file mode 100644
index 59a59d11a8a6..000000000000
--- a/reference/solr/solrresponse/getrawresponseheaders.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getrawresponseheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getRawResponseHeaders</refname>
-  <refpurpose>Returns the raw response headers from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getRawResponseHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the raw response headers from the server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the raw response headers from the server.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getrequesturl.xml b/reference/solr/solrresponse/getrequesturl.xml
deleted file mode 100644
index 7d4973697fd9..000000000000
--- a/reference/solr/solrresponse/getrequesturl.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getrequesturl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getRequestUrl</refname>
-  <refpurpose>Returns the full URL the request was sent to</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>SolrResponse::getRequestUrl</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the full URL the request was sent to.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the full URL the request was sent to
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/getresponse.xml b/reference/solr/solrresponse/getresponse.xml
deleted file mode 100644
index d5b634d98b5e..000000000000
--- a/reference/solr/solrresponse/getresponse.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.getresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::getResponse</refname>
-  <refpurpose>Returns a SolrObject representing the XML response from the server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SolrObject</type><methodname>SolrResponse::getResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a SolrObject representing the XML response from the server.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a SolrObject representing the XML response from the server
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrresponse/setparsemode.xml b/reference/solr/solrresponse/setparsemode.xml
deleted file mode 100644
index 7f512a768a23..000000000000
--- a/reference/solr/solrresponse/setparsemode.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.setparsemode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::setParseMode</refname>
-  <refpurpose>Sets the parse mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrResponse::setParseMode</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>parser_mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the parse mode.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>parser_mode</parameter></term>
-     <listitem>
-      <para>
-       SolrResponse::PARSE_SOLR_DOC parses documents in SolrDocument instances. SolrResponse::PARSE_SOLR_OBJ parses document into SolrObjects.
-      </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/solr/solrresponse/success.xml b/reference/solr/solrresponse/success.xml
deleted file mode 100644
index 729d71e327d2..000000000000
--- a/reference/solr/solrresponse/success.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrresponse.success" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrResponse::success</refname>
-  <refpurpose>Was the request a success</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SolrResponse::success</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Used to check if the request to the server was successful.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if it was successful and &false; if it was not.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrserverexception.xml b/reference/solr/solrserverexception.xml
deleted file mode 100644
index d587393e9da6..000000000000
--- a/reference/solr/solrserverexception.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrserverexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrServerException class</title>
- <titleabbrev>SolrServerException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrClientException intro -->
-  <section xml:id="solrserverexception.intro">
-   &reftitle.intro;
-   <para>
-    An exception thrown when there is an error produced by the Solr Server itself.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrserverexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrServerException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SolrServerException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrException</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)" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrexception.synopsis')/descendant::db:fieldsynopsis)" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrserverexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
- &reference.solr.entities.solrserverexception;
-
-</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/solr/solrserverexception/getinternalinfo.xml b/reference/solr/solrserverexception/getinternalinfo.xml
deleted file mode 100644
index e6e4130da72e..000000000000
--- a/reference/solr/solrserverexception/getinternalinfo.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrserverexception.getinternalinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrServerException::getInternalInfo</refname>
-  <refpurpose>Returns internal information where the Exception was thrown</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SolrServerException::getInternalInfo</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns internal information where the Exception was thrown.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing internal information where the error was thrown. Used only for debugging by extension developers.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrupdateresponse.xml b/reference/solr/solrupdateresponse.xml
deleted file mode 100644
index 5611caa995af..000000000000
--- a/reference/solr/solrupdateresponse.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrupdateresponse" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrUpdateResponse class</title>
- <titleabbrev>SolrUpdateResponse</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrUpdateResponse intro -->
-  <section xml:id="solrupdateresponse.intro">
-   &reftitle.intro;
-   <para>
-    Represents a response to an update request.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrupdateresponse.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrUpdateResponse</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>SolrUpdateResponse</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>SolrResponse</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrupdateresponse.constants.parse-solr-obj">SolrUpdateResponse::PARSE_SOLR_OBJ</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="solrupdateresponse.constants.parse-solr-doc">SolrUpdateResponse::PARSE_SOLR_DOC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('solrresponse.synopsis')/descendant::db:fieldsynopsis)" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrupdateresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrupdateresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrresponse')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ SolrUpdateResponse constants -->
-  <section xml:id="solrupdateresponse.constants">
-   &reftitle.constants;
-   <section xml:id="solrupdateresponse.constants.types">
-    <title>SolrUpdateResponse Class Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="solrupdateresponse.constants.parse-solr-obj">
-      <term><constant>SolrUpdateResponse::PARSE_SOLR_OBJ</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrObject instances</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="solrupdateresponse.constants.parse-solr-doc">
-      <term><constant>SolrUpdateResponse::PARSE_SOLR_DOC</constant></term>
-      <listitem>
-       <para>Documents should be parsed as SolrDocument instances.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.solr.entities.solrupdateresponse;
-
-</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/solr/solrupdateresponse/construct.xml b/reference/solr/solrupdateresponse/construct.xml
deleted file mode 100644
index 9a148cad3637..000000000000
--- a/reference/solr/solrupdateresponse/construct.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrupdateresponse.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUpdateResponse::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrUpdateResponse::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-   Constructor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrupdateresponse/destruct.xml b/reference/solr/solrupdateresponse/destruct.xml
deleted file mode 100644
index a0bf1ce4a223..000000000000
--- a/reference/solr/solrupdateresponse/destruct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrupdateresponse.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUpdateResponse::__destruct</refname>
-  <refpurpose>Destructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <destructorsynopsis>
-   <modifier>public</modifier> <methodname>SolrUpdateResponse::__destruct</methodname>
-   <void />
-  </destructorsynopsis>
-  <para>
-   Destructor
-  </para>
-
- 
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  None
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrutils.xml b/reference/solr/solrutils.xml
deleted file mode 100644
index 7e08be2de500..000000000000
--- a/reference/solr/solrutils.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.solrutils" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The SolrUtils class</title>
- <titleabbrev>SolrUtils</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SolrUtils intro -->
-  <section xml:id="solrutils.intro">
-   &reftitle.intro;
-   <para>
-    Contains utility methods for retrieving the current extension version and preparing query phrases.
-   </para>
-   <para>Also contains method for escaping query strings and parsing XML responses.</para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="solrutils.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SolrUtils</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>SolrUtils</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.solrutils')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.solr.entities.solrutils;
-
-</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/solr/solrutils/digestxmlresponse.xml b/reference/solr/solrutils/digestxmlresponse.xml
deleted file mode 100644
index 3c0e797d8959..000000000000
--- a/reference/solr/solrutils/digestxmlresponse.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrutils.digestxmlresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUtils::digestXmlResponse</refname>
-  <refpurpose>Parses an response XML string into a SolrObject</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>SolrObject</type><methodname>SolrUtils::digestXmlResponse</methodname>
-   <methodparam><type>string</type><parameter>xmlresponse</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>parse_mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method parses an response XML string from the Apache Solr server into a SolrObject. It throws a SolrException if there was an error.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>xmlresponse</parameter></term>
-     <listitem>
-      <para>
-       The XML response string from the Solr server.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>parse_mode</parameter></term>
-     <listitem>
-      <para>
-       Use SolrResponse::PARSE_SOLR_OBJ or SolrResponse::PARSE_SOLR_DOC
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the SolrObject representing the XML response.
-  </para>
-  
-  <para>If the parse_mode parameter is set to SolrResponse::PARSE_SOLR_OBJ Solr documents will be parses as SolrObject instances.</para>
- 
-  <para>If it is set to SolrResponse::PARSE_SOLR_DOC, they will be parsed as SolrDocument instances.</para>
-  
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrutils/escapequerychars.xml b/reference/solr/solrutils/escapequerychars.xml
deleted file mode 100644
index 854c93ad6b12..000000000000
--- a/reference/solr/solrutils/escapequerychars.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrutils.escapequerychars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUtils::escapeQueryChars</refname>
-  <refpurpose>Escapes a lucene query string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>SolrUtils::escapeQueryChars</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Lucene supports escaping special characters that are part of the query syntax.
-  </para>
-
-  <para>The current list special characters are:</para>
-  <para>
-<![CDATA[
-
-   + - && || ! ( ) { } [ ] ^ " ~ * ? : \ /
-   
-]]></para>
-  <para>These characters are part of the query syntax and must be escaped</para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       This is the query string to be escaped.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns the escaped 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/solr/solrutils/getsolrversion.xml b/reference/solr/solrutils/getsolrversion.xml
deleted file mode 100644
index 56295f2a168d..000000000000
--- a/reference/solr/solrutils/getsolrversion.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrutils.getsolrversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUtils::getSolrVersion</refname>
-  <refpurpose>Returns the current version of the Solr extension</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>SolrUtils::getSolrVersion</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the current Solr version.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current version of the Apache Solr extension.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/solrutils/queryphrase.xml b/reference/solr/solrutils/queryphrase.xml
deleted file mode 100644
index ae8715e1a9e2..000000000000
--- a/reference/solr/solrutils/queryphrase.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="solrutils.queryphrase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>SolrUtils::queryPhrase</refname>
-  <refpurpose>Prepares a phrase from an unescaped lucene string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>SolrUtils::queryPhrase</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Prepares a phrase from an unescaped lucene string.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       The lucene phrase.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the phrase contained in double quotes.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/solr/versions.xml b/reference/solr/versions.xml
deleted file mode 100644
index fa704b31ae76..000000000000
--- a/reference/solr/versions.xml
+++ /dev/null
@@ -1,528 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='solr_get_version' from='PECL solr &gt;= 0.9.1'/>
-
- <!-- Methods -->
- <function name='solrobject' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::offsetset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::offsetget' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::offsetexists' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::offsetunset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrobject::getpropertynames' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrdocument' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__set' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__get' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__isset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::__unset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::offsetset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::offsetget' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::offsetexists' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::offsetunset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::current' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::key' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::next' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::rewind' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::valid' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::serialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::unserialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::clear' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::reset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::addfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::getfieldnames' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::getfieldcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::getfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::toarray' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::fieldexists' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::deletefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::sort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::merge' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocument::getinputdocument' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getchilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::haschilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::getchilddocumentscount' from='PECL solr &gt;= 2.3.0'/>
-
- <function name='solrdocument::getchilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrdocument::haschilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrdocument::getchilddocumentscount' from='PECL solr &gt;= 2.3.0'/>
-
-
- <function name='solrdocumentfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocumentfield::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrdocumentfield::__destruct' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrinputdocument' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::__sleep' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::__wakeup' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::setboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::clear' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::reset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::addfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getfieldboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::setfieldboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getfieldnames' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getfieldcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::getfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::toarray' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::fieldexists' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::deletefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::sort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::merge' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrinputdocument::addchilddocument' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::addchilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::getchilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::haschilddocuments' from='PECL solr &gt;= 2.3.0'/>
- <function name='solrinputdocument::getchilddocumentscount' from='PECL solr &gt;= 2.3.0'/>
-
- <function name='solrclient' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::__sleep' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::__wakeup' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::setservlet' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::setresponsewriter' from='PECL solr &gt;= 0.9.11'/>
- <function name='solrclient::getoptions' from='PECL solr &gt;= 0.9.6'/>
- <function name='solrclient::getdebug' from='PECL solr &gt;= 0.9.7'/>
- <function name='solrclient::query' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::adddocument' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::adddocuments' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::request' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::deletebyid' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::deletebyids' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::deletebyquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::deletebyqueries' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::commit' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::optimize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::rollback' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::ping' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::threads' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclient::system' from='PECL solr &gt;= 2.0.0'/>
- <function name='solrclient::getbyid' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrclient::getbyids' from='PECL solr &gt;= 2.2.0'/>
-
- <function name='solrparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::setparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::addparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::__tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::getparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::getparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::getpreparedparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::serialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::unserialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::add' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::set' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrparams::get' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrmodifiableparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::setparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::addparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::__tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::getparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::getparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::getpreparedparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::serialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::unserialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::add' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::set' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrmodifiableparams::get' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setstart' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getstart' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setrows' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getrows' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addsortfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removesortfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getsortfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfilterquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefilterquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfilterqueries' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setshowdebuginfo' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setexplainother' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settimeallowed' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettimeallowed' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setomitheader' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setechohandler' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setechoparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacet' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacet' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfacetfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefacetfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfacetquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefacetquery' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetqueries' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetprefix' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetprefix' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetsort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetsort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetlimit' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetlimit' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetoffset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetoffset' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetmincount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetmincount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetmissing' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetmissing' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetmethod' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetmethod' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetenumcachemindefaultfrequency' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfacetdatefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefacetdatefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdatefields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetdatestart' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdatestart' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetdateend' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdateend' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetdategap' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdategap' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setfacetdatehardend' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdatehardend' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addfacetdateother' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removefacetdateother' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getfacetdateother' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightquery' from='PECL solr &gt;= 2.7.0'/>
- <function name='solrquery::gethighlightquery' from='PECL solr &gt;= 2.7.0'/>
- <function name='solrquery::sethighlight' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlight' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addhighlightfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removehighlightfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightsnippets' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightsnippets' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightfragsize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightfragsize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightmergecontiguous' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightmergecontiguous' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightrequirefieldmatch' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightrequirefieldmatch' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightmaxanalyzedchars' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightmaxanalyzedchars' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightalternatefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightalternatefield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightmaxalternatefieldlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightmaxalternatefieldlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightformatter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightformatter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightsimplepre' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightsimplepre' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightsimplepost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightsimplepost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightfragmenter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightfragmenter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightusephrasehighlighter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightusephrasehighlighter' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlighthighlightmultiterm' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlighthighlightmultiterm' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightregexslop' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightregexslop' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightregexpattern' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightregexpattern' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::sethighlightregexmaxanalyzedchars' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gethighlightregexmaxanalyzedchars' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setstats' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getstats' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addstatsfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removestatsfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getstatsfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addstatsfacet' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removestatsfacet' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getstatsfacets' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmlt' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmlt' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addmltfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removemltfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addmltqueryfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::removemltqueryfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltqueryfields' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltmintermfrequency' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltmintermfrequency' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltmindocfrequency' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltmindocfrequency' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltminwordlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltminwordlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltmaxwordlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltmaxwordlength' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltmaxnumtokens' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltmaxnumtokens' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltmaxnumqueryterms' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltmaxnumqueryterms' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setmltboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getmltboost' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setterms' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getterms' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsfield' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermslowerbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermslowerbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsupperbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsupperbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsincludelowerbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsincludelowerbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsincludeupperbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsincludeupperbound' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsmincount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsmincount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsmaxcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsmaxcount' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsprefix' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsprefix' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermslimit' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermslimit' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermsreturnraw' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermsreturnraw' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::settermssort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::gettermssort' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::setparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::addparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::__tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::tostring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getparam' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::getpreparedparams' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::serialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::unserialize' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::add' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::set' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrquery::get' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::gethttpstatus' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::gethttpstatusmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::success' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getrequesturl' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getrawrequestheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getrawrequest' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getrawresponseheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getrawresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getdigestedresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::setparsemode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrresponse::getresponse' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrqueryresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::gethttpstatus' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::gethttpstatusmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::success' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getrequesturl' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getrawrequestheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getrawrequest' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getrawresponseheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getrawresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getdigestedresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::setparsemode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrqueryresponse::getresponse' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrupdateresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::gethttpstatus' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::gethttpstatusmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::success' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getrequesturl' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getrawrequestheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getrawrequest' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getrawresponseheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getrawresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getdigestedresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::setparsemode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrupdateresponse::getresponse' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrpingresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::gethttpstatus' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::gethttpstatusmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::success' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getrequesturl' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getrawrequestheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getrawrequest' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getrawresponseheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getrawresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::getdigestedresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrpingresponse::setparsemode' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrgenericresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::__destruct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::gethttpstatus' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::gethttpstatusmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::success' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getrequesturl' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getrawrequestheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getrawrequest' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getrawresponseheaders' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getrawresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getdigestedresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::setparsemode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrgenericresponse::getresponse' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrutils' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrutils::escapequerychars' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrutils::queryphrase' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrutils::digestxmlresponse' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrutils::getsolrversion' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrexception' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getinternalinfo' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getcode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getfile' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getline' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::gettrace' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::getprevious' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::gettraceasstring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrexception::__tostring' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrserverexception' from='PECL Solr &gt;= 1.1.0, &gt;=2.0.0'/>
- <function name='solrserverexception::getinternalinfo' from='PECL solr &gt;= 1.1.0, &gt;=2.0.0'/>
-
- <function name='solrillegaloperationexception' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getinternalinfo' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getcode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getfile' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getline' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::gettrace' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::getprevious' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::gettraceasstring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegaloperationexception::__tostring' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrillegalargumentexception' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getinternalinfo' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getcode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getfile' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getline' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::gettrace' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::getprevious' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::gettraceasstring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrillegalargumentexception::__tostring' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrclientexception' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getinternalinfo' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::__clone' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::__construct' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getmessage' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getcode' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getfile' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getline' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::gettrace' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::getprevious' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::gettraceasstring' from='PECL solr &gt;= 0.9.2'/>
- <function name='solrclientexception::__tostring' from='PECL solr &gt;= 0.9.2'/>
-
- <function name='solrcollapsefunction' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::__construct' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::setfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::getfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::setmax' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::getmax' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::setmin' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::getmin' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::sethint' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::gethint' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::setsize' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::getsize' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::setnullpolicy' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::getnullpolicy' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrcollapsefunction::__tostring' from='PECL solr &gt;= 2.2.0'/>
-
- <function name='solrquery::addgroupfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::addgroupfunction' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::addgroupquery' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::addgroupsortfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupcachepercent' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupfacet' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupfields' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupformat' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupfunctions' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgrouplimit' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupmain' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupngroups' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupoffset' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupqueries' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroupsortfields' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgrouptruncate' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getgroup' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupcachepercent' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupfacet' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupformat' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgrouplimit' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupmain' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupngroups' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroupoffset' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgrouptruncate' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setgroup' from='PECL solr &gt;= 2.2.0'/>
-
-
- <function name='solrquery::setexpand' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getexpand' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::addexpandfilterquery' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::addexpandsortfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getexpandfilterqueries' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getexpandquery' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getexpandrows' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::getexpandsortfields' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::removeexpandfilterquery' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::removeexpandsortfield' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setexpandquery' from='PECL solr &gt;= 2.2.0'/>
- <function name='solrquery::setexpandrows' from='PECL solr &gt;= 2.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/sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/sqlsrv/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/sqlsrv/book.xml b/reference/sqlsrv/book.xml
deleted file mode 100644
index e21045332212..000000000000
--- a/reference/sqlsrv/book.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.sqlsrv">
- <?phpdoc extension-membership="pecl" ?>
- <title>Microsoft SQL Server Driver for PHP</title>
- <titleabbrev>SQLSRV</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.sqlsrv">
-  &reftitle.intro;
-  <simpara>
-   The SQLSRV extension allows you to access Microsoft SQL Server and SQL Azure
-   databases. The 3.0 release of the driver supports
-   SQL Server, beginning with SQL Server 2005, including SQL Server 2012 and SQL
-   Server 2012 LocalDB. (For more information about LocalDB, see
-   <link xlink:href="&url.sqlsrv.localdb;">PHP Driver for SQL Server Support for LocalDB</link>
-   and <link xlink:href="&url.sqlsrv.localdbinfo;">SQL Server 2012 Express LocalDB</link>.)
-  </simpara>
-  <simpara>
-   The SQLSRV extension is supported by Microsoft and available for download here:
-   <link xlink:href="&url.sqlsrv;">&url.sqlsrv;</link>. SQL Server 2012 LocalDB can be
-   downloaded here: <link xlink:href="&url.sqlsrv.localdbdownload;">&url.sqlsrv.localdbdownload;</link>.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.sqlsrv.setup;
- &reference.sqlsrv.constants;
- &reference.sqlsrv.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/sqlsrv/configure.xml b/reference/sqlsrv/configure.xml
deleted file mode 100644
index 3b2910e485a6..000000000000
--- a/reference/sqlsrv/configure.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sqlsrv.installation">
- &reftitle.install;
- <simpara>
-  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 with 8 driver files, four of which are for PDO support.
- </simpara>
- <simpara>
-  The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>.
- </simpara>
- <simpara>
-  For more information about SQLSRV requirements, see
-  <link xlink:href="&url.sqlsrv.system.requirements;">SQLSRV System Requirements</link>.
- </simpara>
- <simpara>
-  Since version 4.0 the SQLSRV extension is compatible only with PHP 7.0 running on Linux or Windows.
- </simpara>
-</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/sqlsrv/constants.xml b/reference/sqlsrv/constants.xml
deleted file mode 100644
index 3587788af8ee..000000000000
--- a/reference/sqlsrv/constants.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="sqlsrv.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.sqlsrv-fetch-assoc">
-   <term>
-    <constant>SQLSRV_FETCH_ASSOC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_fetch_array</function> to return an associative
-    array when passed as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-fetch-numeric">
-   <term>
-    <constant>SQLSRV_FETCH_NUMERIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_fetch_array</function> to return an array with
-    numeric when passed as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-fetch-both">
-   <term>
-    <constant>SQLSRV_FETCH_BOTH</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_fetch_array</function> to return an array with both
-    associative and numeric keys when passed as a parameter (the default behavior).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-err-all">
-   <term>
-    <constant>SQLSRV_ERR_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_errors</function> to return both errors and warnings
-    when passed as a parameter (the default behavior).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-err-errors">
-   <term>
-    <constant>SQLSRV_ERR_ERRORS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_errors</function> to return errors only (no warnings)
-    when passed as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-err-warnings">
-   <term>
-    <constant>SQLSRV_ERR_WARNINGS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Forces <function>sqlsrv_errors</function> to return warnings only (no errors)
-    when passed as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-all">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns on logging of all subsystems when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-conn">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_CONN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns on logging of connection activity when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-init">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_INIT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns on logging of initialization activity when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-off">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_OFF</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns off logging of all subsystems when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-stmt">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_STMT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns on logging of statement activity when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-system-util">
-   <term>
-    <constant>SQLSRV_LOG_SYSTEM_UTIL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Turns on logging of error function activity when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-severity-all">
-   <term>
-    <constant>SQLSRV_LOG_SEVERITY_ALL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies that errors, warnings, and notices will be logged
-    when passed to <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-severity-error">
-   <term>
-    <constant>SQLSRV_LOG_SEVERITY_ERROR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies that errors will be logged when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-severity-notice">
-   <term>
-    <constant>SQLSRV_LOG_SEVERITY_NOTICE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies that notices will be logged when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-log-severity-warning">
-   <term>
-    <constant>SQLSRV_LOG_SEVERITY_WARNING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies that warnings will be logged when passed to
-    <function>sqlsrv_configure</function> as a parameter.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-nullable-yes">
-   <term>
-    <constant>SQLSRV_NULLABLE_YES</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates that a column is nullable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-nullable-no">
-   <term>
-    <constant>SQLSRV_NULLABLE_NO</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates that a column is not nullable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-nullable-unknown">
-   <term>
-    <constant>SQLSRV_NULLABLE_UNKNOWN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates that it is not known if a column is nullable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-param-in">
-   <term>
-    <constant>SQLSRV_PARAM_IN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates an input parameter when passed to <function>sqlsrv_query</function>
-    or <function>sqlsrv_prepare</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-param-inout">
-   <term>
-    <constant>SQLSRV_PARAM_INOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a bidirectional parameter when passed to <function>sqlsrv_query</function>
-    or <function>sqlsrv_prepare</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-param-out">
-   <term>
-    <constant>SQLSRV_PARAM_OUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates an output parameter when passed to <function>sqlsrv_query</function> or
-    <function>sqlsrv_prepare</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-phptype-int">
-   <term>
-    <constant>SQLSRV_PHPTYPE_INT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies an integer PHP data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-phptype-datetime">
-   <term>
-    <constant>SQLSRV_PHPTYPE_DATETIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies a datetime PHP data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-phptype-float">
-   <term>
-    <constant>SQLSRV_PHPTYPE_FLOAT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies a float PHP data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-phptype-stream">
-   <term>
-    <constant>SQLSRV_PHPTYPE_STREAM</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies a PHP stream. This constant works like a function and accepts an
-    encoding constant. See the SQLSRV_ENC_* constants. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-phptype-string">
-   <term>
-    <constant>SQLSRV_PHPTYPE_STRING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies a string PHP data type. This constant works like a function and
-    accepts an encoding constant. See the SQLSRV_ENC_* constants. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-enc-binary">
-   <term>
-    <constant>SQLSRV_ENC_BINARY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies that data is returned as a raw byte stream from the server without
-    performing encoding or translation. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-enc-char">
-   <term>
-    <constant>SQLSRV_ENC_CHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Data is returned in 8-bit characters as specified in the code page of the
-    Windows locale that is set on the system. Any multi-byte characters or characters
-    that do not map into this code page are substituted with a single byte question
-    mark (?) character. This is the default encoding. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.phptype;">How to: Specify PHP Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-bigint">
-   <term>
-    <constant>SQLSRV_SQLTYPE_BIGINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the bigint SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-binary">
-   <term>
-    <constant>SQLSRV_SQLTYPE_BINARY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the binary SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-bit">
-   <term>
-    <constant>SQLSRV_SQLTYPE_BIT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the bit SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-char">
-   <term>
-    <constant>SQLSRV_SQLTYPE_CHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the char SQL Server data type. This constant works like a function
-    and accepts a parameter indicating the number characters. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-date">
-   <term>
-    <constant>SQLSRV_SQLTYPE_DATE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the date SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-datetime">
-   <term>
-    <constant>SQLSRV_SQLTYPE_DATETIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the datetime SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-datetime2">
-   <term>
-    <constant>SQLSRV_SQLTYPE_DATETIME2</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the datetime2 SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-datetimeoffset">
-   <term>
-    <constant>SQLSRV_SQLTYPE_DATETIMEOFFSET</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the datetimeoffset SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-decimal">
-   <term>
-    <constant>SQLSRV_SQLTYPE_DECIMAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the decimal SQL Server data type. This constant works like a function
-    and accepts two parameters indicating (in order) precision and scale. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-float">
-   <term>
-    <constant>SQLSRV_SQLTYPE_FLOAT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the float SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-image">
-   <term>
-    <constant>SQLSRV_SQLTYPE_IMAGE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the image SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-int">
-   <term>
-    <constant>SQLSRV_SQLTYPE_INT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the int SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-money">
-   <term>
-    <constant>SQLSRV_SQLTYPE_MONEY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the money SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-nchar">
-   <term>
-    <constant>SQLSRV_SQLTYPE_NCHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the nchar SQL Server data type. This constant works like a function
-    and accepts a single parameter indicating the character count. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-numeric">
-   <term>
-    <constant>SQLSRV_SQLTYPE_NUMERIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the numeric SQL Server data type. This constant works like a function
-    and accepts two parameter indicating (in order) precision and scale. For usage
-    information, see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-nvarchar">
-   <term>
-    <constant>SQLSRV_SQLTYPE_NVARCHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the nvarchar SQL Server data type. This constant works like a function
-    and accepts a single parameter indicating the character count. For usage
-    information, see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <constant>SQLSRV_SQLTYPE_NVARCHAR</constant>('max')
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the nvarchar(MAX) SQL Server data type. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-ntext">
-   <term>
-    <constant>SQLSRV_SQLTYPE_NTEXT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the ntext SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-real">
-   <term>
-    <constant>SQLSRV_SQLTYPE_REAL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the real SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-smalldatetime">
-   <term>
-    <constant>SQLSRV_SQLTYPE_SMALLDATETIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the smalldatetime SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-smallint">
-   <term>
-    <constant>SQLSRV_SQLTYPE_SMALLINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the smallint SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-smallmoney">
-   <term>
-    <constant>SQLSRV_SQLTYPE_SMALLMONEY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the smallmoney SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-text">
-   <term>
-    <constant>SQLSRV_SQLTYPE_TEXT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the text SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-time">
-   <term>
-    <constant>SQLSRV_SQLTYPE_TIME</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the time SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-timestamp">
-   <term>
-    <constant>SQLSRV_SQLTYPE_TIMESTAMP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the timestamp SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-tinyint">
-   <term>
-    <constant>SQLSRV_SQLTYPE_TINYINT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the tinyint SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-uniqueidentifier">
-   <term>
-    <constant>SQLSRV_SQLTYPE_UNIQUEIDENTIFIER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the uniqueidentifier SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-udt">
-   <term>
-    <constant>SQLSRV_SQLTYPE_UDT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the UDT SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-varbinary">
-   <term>
-    <constant>SQLSRV_SQLTYPE_VARBINARY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the varbinary SQL Server data type. This constant works like a function
-    and accepts a single parameter indicating the byte count. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <constant>SQLSRV_SQLTYPE_VARBINARY</constant>('max')
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the varbinary(MAX) SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-varchar">
-   <term>
-    <constant>SQLSRV_SQLTYPE_VARCHAR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the varchar SQL Server data type. This constant works like a function
-    and accepts a single parameter indicating the character count. For usage information,
-    see <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry>
-   <term>
-    <constant>SQLSRV_SQLTYPE_VARCHAR</constant>('max')
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the varchar(MAX) SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-sqltype-xml">
-   <term>
-    <constant>SQLSRV_SQLTYPE_XML</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Describes the XML SQL Server data type. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.sqltype;">How to: Specify SQL Types</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-txn-read-uncommitted">
-   <term>
-    <constant>SQLSRV_TXN_READ_UNCOMMITTED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a transaction isolation level of READ UNCOMMITTED. This value is
-    used to set the TransactionIsolation level in the $connectionOptions array
-    passed to <function>sqlsrv_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-txn-read-committed">
-   <term>
-    <constant>SQLSRV_TXN_READ_COMMITTED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a transaction isolation level of READ COMMITTED. This value is
-    used to set the TransactionIsolation level in the $connectionOptions array
-    passed to <function>sqlsrv_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-txn-repeatable-read">
-   <term>
-    <constant>SQLSRV_TXN_REPEATABLE_READ</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a transaction isolation level of REPEATABLE READ. This value is
-    used to set the TransactionIsolation level in the $connectionOptions array
-    passed to <function>sqlsrv_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-txn-snapshot">
-   <term>
-    <constant>SQLSRV_TXN_SNAPSHOT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a transaction isolation level of SNAPSHOT. This value is used to
-    set the TransactionIsolation level in the $connectionOptions array passed
-    to <function>sqlsrv_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-txn-read-serializable">
-   <term>
-    <constant>SQLSRV_TXN_READ_SERIALIZABLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a transaction isolation level of SERIALIZABLE. This value is used
-    to set the TransactionIsolation level in the $connectionOptions array passed
-    to <function>sqlsrv_connect</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-cursor-forward">
-   <term>
-    <constant>SQLSRV_CURSOR_FORWARD</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a forward-only cursor. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-cursor-static">
-   <term>
-    <constant>SQLSRV_CURSOR_STATIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a static cursor. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-dynamic">
-   <term>
-    <constant>SQLSRV_CURSOR_DYNAMIC</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a dynamic cursor. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-cursor-keyset">
-   <term>
-    <constant>SQLSRV_CURSOR_KEYSET</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Indicates a keyset cursor. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-cursor-buffered">
-   <term>
-    <constant>SQLSRV_CURSOR_BUFFERED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Creates a client-side cursor query. Lets you access rows in any order. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-next">
-   <term>
-    <constant>SQLSRV_SCROLL_NEXT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-prior">
-   <term>
-    <constant>SQLSRV_SCROLL_PRIOR</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-first">
-   <term>
-    <constant>SQLSRV_SCROLL_FIRST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-last">
-   <term>
-    <constant>SQLSRV_SCROLL_LAST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-absolute">
-   <term>
-    <constant>SQLSRV_SCROLL_ABSOLUTE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.sqlsrv-scroll-relative">
-   <term>
-    <constant>SQLSRV_SCROLL_RELATIVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    Specifies which row to select in a result set. For usage information, see
-    <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>.
-    </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/sqlsrv/functions/sqlsrv-begin-transaction.xml b/reference/sqlsrv/functions/sqlsrv-begin-transaction.xml
deleted file mode 100644
index 93a458acca9a..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-begin-transaction.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-begin-transaction">
- <refnamediv>
-  <refname>sqlsrv_begin_transaction</refname>
-  <refpurpose>Begins a database transaction</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_begin_transaction</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   The transaction begun by <function>sqlsrv_begin_transaction</function> includes
-   all statements that were executed after the call to
-   <function>sqlsrv_begin_transaction</function> and before calls to
-   <function>sqlsrv_rollback</function> or <function>sqlsrv_commit</function>.
-   Explicit transactions should be started and committed or rolled back using
-   these functions instead of executing SQL statements that begin and commit/roll
-   back transactions. For more information, see
-   <link xlink:href="&url.sqlsrv.transaction.handling;">SQLSRV Transactions</link>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection resource returned by a call to <function>sqlsrv_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_begin_transaction</function> example</title>
-   <simpara>
-   The following example demonstrates how to use
-   <function>sqlsrv_begin_transaction</function> together with
-   <function>sqlsrv_commit</function> and <function>sqlsrv_rollback</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Begin the transaction. */
-if ( sqlsrv_begin_transaction( $conn ) === false ) {
-     die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Initialize parameter values. */
-$orderId = 1; $qty = 10; $productId = 100;
-
-/* Set up and execute the first query. */
-$sql1 = "INSERT INTO OrdersTable (ID, Quantity, ProductID)
-          VALUES (?, ?, ?)";
-$params1 = array( $orderId, $qty, $productId );
-$stmt1 = sqlsrv_query( $conn, $sql1, $params1 );
-
-/* Set up and execute the second query. */
-$sql2 = "UPDATE InventoryTable
-          SET Quantity = (Quantity - ?)
-          WHERE ProductID = ?";
-$params2 = array($qty, $productId);
-$stmt2 = sqlsrv_query( $conn, $sql2, $params2 );
-
-/* If both queries were successful, commit the transaction. */
-/* Otherwise, rollback the transaction. */
-if( $stmt1 && $stmt2 ) {
-     sqlsrv_commit( $conn );
-     echo "Transaction committed.<br />";
-} else {
-     sqlsrv_rollback( $conn );
-     echo "Transaction rolled back.<br />";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_commit</function></member>
-   <member><function>sqlsrv_rollback</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/sqlsrv/functions/sqlsrv-cancel.xml b/reference/sqlsrv/functions/sqlsrv-cancel.xml
deleted file mode 100644
index b7552aae2cd8..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-cancel.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-cancel">
- <refnamediv>
-  <refname>sqlsrv_cancel</refname>
-  <refpurpose>Cancels a statement</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_cancel</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Cancels a statement. Any results associated with the statement that have not
-   been consumed are deleted. After <function>sqlsrv_cancel</function> has been
-   called, the specified statement can be re-executed if it was created with
-   <function>sqlsrv_prepare</function>. Calling <function>sqlsrv_cancel</function>
-   is not necessary if all the results associated with the statement have been
-   consumed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement resource to be cancelled.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_cancel</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT Sales FROM Table_1";
-
-$stmt = sqlsrv_prepare( $conn, $sql);
-
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-if( sqlsrv_execute( $stmt ) === false) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$salesTotal = 0;
-$count = 0;
-
-while( ($row = sqlsrv_fetch_array( $stmt)) && $salesTotal <=100000)
-{
-     $qty = $row[0];
-     $price = $row[1];
-     $salesTotal += ( $price * $qty);
-     $count++;
-}
-
-echo "$count sales accounted for the first $$salesTotal in revenue.<br />";
-
-// Cancel the pending results. The statement can be reused.
-sqlsrv_cancel( $stmt);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   The main difference between <function>sqlsrv_cancel</function> and
-   <function>sqlsrv_free_stmt</function> is that a statement resource cancelled with
-   <function>sqlsrv_cancel</function> can be re-executed if it was created with
-   <function>sqlsrv_prepare</function>. A statement resource cancelled with
-   <function>sqlsrv_free_statement</function> cannot be re-executed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_free_stmt</function></member>
-   <member><function>sqlsrv_prepare</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/sqlsrv/functions/sqlsrv-client-info.xml b/reference/sqlsrv/functions/sqlsrv-client-info.xml
deleted file mode 100644
index de8d0403759b..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-client-info.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-client-info">
- <refnamediv>
-  <refname>sqlsrv_client_info</refname>
-  <refpurpose>Returns information about the client and specified connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>sqlsrv_client_info</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns information about the client and specified connection
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection about which information is returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative array with keys described in the table below.
-   Returns &false; otherwise.
-   <table>
-   <title>Array returned by sqlsrv_client_info</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>DriverDllName</entry>
-      <entry>SQLNCLI10.DLL</entry>
-     </row>
-     <row>
-      <entry>DriverODBCVer</entry>
-      <entry>ODBC version (xx.yy)</entry>
-     </row>
-     <row>
-      <entry>DriverVer</entry>
-      <entry>SQL Server Native Client DLL version (10.5.xxx)</entry>
-     </row>
-     <row>
-      <entry>ExtensionVer</entry>
-      <entry>php_sqlsrv.dll version (2.0.xxx.x)</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_client_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connOptions = array("UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connOptions );
-
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-if( $client_info = sqlsrv_client_info( $conn)) {
-    foreach( $client_info as $key => $value) {
-        echo $key.": ".$value."<br />";
-    }
-} else {
-    echo "Error in retrieving client info.<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_server_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sqlsrv/functions/sqlsrv-close.xml b/reference/sqlsrv/functions/sqlsrv-close.xml
deleted file mode 100644
index 869b01674d3b..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-close.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.sqlsrv-close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>sqlsrv_close</refname>
-  <refpurpose>Closes an open connection and releases resources associated with the connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_close</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Closes an open connection and releases resources associated with the connection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection to be closed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_close</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpres";
-$connOptions = array("UID"=>"username", "PWD"=>"password", "Database"=>"dbname");
-$conn = sqlsrv_connect( $serverName, $connOptions );
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-//-------------------------------------
-// Perform database operations here.
-//-------------------------------------
-
-// Close the connection.
-sqlsrv_close( $conn );
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_connect</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/sqlsrv/functions/sqlsrv-commit.xml b/reference/sqlsrv/functions/sqlsrv-commit.xml
deleted file mode 100644
index 2d79896aaa74..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-commit.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-commit">
- <refnamediv>
-  <refname>sqlsrv_commit</refname>
-  <refpurpose>Commits a transaction that was begun with <function>sqlsrv_begin_transaction</function></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_commit</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits a transaction that was begun with <function>sqlsrv_begin_transaction</function>.
-   The connection is returned to auto-commit mode after <function>sqlsrv_commit</function>
-   is called. The transaction that is committed includes all statements that were
-   executed after the call to <function>sqlsrv_begin_transaction</function>.
-   Explicit transactions should be started and committed or rolled back using these
-   functions instead of executing SQL statements that begin and commit/roll back
-   transactions. For more information, see
-   <link xlink:href="&url.sqlsrv.transaction.handling;">SQLSRV Transactions</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection on which the transaction is to be committed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_commit</function> example</title>
-   <simpara>
-   The following example demonstrates how to use <function>sqlsrv_commit</function>
-   together with <function>sqlsrv_begin_transaction</function> and
-   <function>sqlsrv_rollback</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Begin the transaction. */
-if ( sqlsrv_begin_transaction( $conn ) === false ) {
-     die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Initialize parameter values. */
-$orderId = 1; $qty = 10; $productId = 100;
-
-/* Set up and execute the first query. */
-$sql1 = "INSERT INTO OrdersTable (ID, Quantity, ProductID)
-         VALUES (?, ?, ?)";
-$params1 = array( $orderId, $qty, $productId );
-$stmt1 = sqlsrv_query( $conn, $sql1, $params1 );
-
-/* Set up and execute the second query. */
-$sql2 = "UPDATE InventoryTable
-         SET Quantity = (Quantity - ?)
-         WHERE ProductID = ?";
-$params2 = array($qty, $productId);
-$stmt2 = sqlsrv_query( $conn, $sql2, $params2 );
-
-/* If both queries were successful, commit the transaction. */
-/* Otherwise, rollback the transaction. */
-if( $stmt1 && $stmt2 ) {
-     sqlsrv_commit( $conn );
-     echo "Transaction committed.<br />";
-} else {
-     sqlsrv_rollback( $conn );
-     echo "Transaction rolled back.<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_begin_transaction</function></member>
-   <member><function>sqlsrv_rollback</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/sqlsrv/functions/sqlsrv-configure.xml b/reference/sqlsrv/functions/sqlsrv-configure.xml
deleted file mode 100644
index d6ae7acf7810..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-configure.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-configure">
- <refnamediv>
-  <refname>sqlsrv_configure</refname>
-  <refpurpose>Changes the driver error handling and logging configurations</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_configure</methodname>
-   <methodparam><type>string</type><parameter>setting</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Changes the driver error handling and logging configurations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>setting</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the setting to set. The possible values are
-      "WarningsReturnAsErrors", "LogSubsystems", and "LogSeverity".
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The value of the specified setting. The following table shows possible values:
-         <table>
-  <title>Error and Logging Setting Options</title>
-  <tgroup cols="2">
-   <thead>
-    <row>
-     <entry>Setting</entry>
-     <entry>Options</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>WarningsReturnAsErrors</entry>
-     <entry>1 (&true;) or 0 (&false;)</entry>
-    </row>
-    <row>
-     <entry>LogSubsystems</entry>
-     <entry>SQLSRV_LOG_SYSTEM_ALL (-1)
-     SQLSRV_LOG_SYSTEM_CONN (2)
-     SQLSRV_LOG_SYSTEM_INIT (1)
-     SQLSRV_LOG_SYSTEM_OFF (0)
-     SQLSRV_LOG_SYSTEM_STMT (4)
-     SQLSRV_LOG_SYSTEM_UTIL (8)</entry>
-    </row>
-    <row>
-     <entry>LogSeverity</entry>
-     <entry>SQLSRV_LOG_SEVERITY_ALL (-1)
-     SQLSRV_LOG_SEVERITY_ERROR (1)
-     SQLSRV_LOG_SEVERITY_NOTICE (4)
-     SQLSRV_LOG_SEVERITY_WARNING (2)</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.sqlsrv.error.handling;">SQLSRV Error Handling</link>.</member>
-   <member><link xlink:href="&url.sqlsrv.logging.activity;">Logging SQLSRV Activity</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/sqlsrv/functions/sqlsrv-connect.xml b/reference/sqlsrv/functions/sqlsrv-connect.xml
deleted file mode 100644
index f0cb13fc7b7e..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-connect.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-connect">
- <refnamediv>
-  <refname>sqlsrv_connect</refname>
-  <refpurpose>Opens a connection to a Microsoft SQL Server database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>sqlsrv_connect</methodname>
-   <methodparam><type>string</type><parameter>serverName</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>connectionInfo</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Opens a connection to a Microsoft SQL Server database. By default, the connection
-   is attempted using Windows Authentication. To connect using SQL Server
-   Authentication, include "UID" and "PWD" in the connection options array.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>serverName</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the server to which a connection is established. To connect
-      to a specific instance, follow the server name with a backward slash
-      and the instance name (e.g. serverName\sqlexpress).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>connectionInfo</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array that specifies options for connecting to the server.
-      If values for the UID and PWD keys are not specified, the connection
-      will be attempted using Windows Authentication. For a complete list of supported
-      keys, see <link xlink:href="&url.sqlsrv.connection.options;">SQLSRV Connection Options</link>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A connection resource. If a connection cannot be successfully opened, &false; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Connect using Windows Authentication.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\\sqlexpress"; //serverName\instanceName
-
-// Since UID and PWD are not specified in the $connectionInfo array,
-// The connection will be attempted using Windows Authentication.
-$connectionInfo = array( "Database"=>"dbName");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-
-if( $conn ) {
-     echo "Connection established.<br />";
-}else{
-     echo "Connection could not be established.<br />";
-     die( print_r( sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Connect by specifying a user name and password.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\\sqlexpress"; //serverName\instanceName
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-
-if( $conn ) {
-     echo "Connection established.<br />";
-}else{
-     echo "Connection could not be established.<br />";
-     die( print_r( sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Connect on a specified port.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\\sqlexpress, 1542"; //serverName\instanceName, portNumber (default is 1433)
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-
-if( $conn ) {
-     echo "Connection established.<br />";
-}else{
-     echo "Connection could not be established.<br />";
-     die( print_r( sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   By default, the <function>sqlsrv_connect</function> uses connection pooling to
-   improve connection performance. To turn off connection pooling (i.e. force a
-   new connection on each call), set the "ConnectionPooling" option in the
-   $connectionOptions array to 0 (or &false;). For more information, see
-   <link xlink:href="&url.sqlsrv.connection.pooling;">SQLSRV Connection Pooling</link>.
-  </simpara>
-  <simpara>
-  The SQLSRV extension does not have a dedicated function for changing which
-  database is connected to. The target database is specified in the
-  $connectionOptions array that is passed to sqlsrv_connect. To change the
-  database on an open connection, execute the following query "USE dbName"
-  (e.g. sqlsrv_query($conn, "USE dbName")).
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_close</function></member>
-   <member><function>sqlsrv_errors</function></member>
-   <member><function>sqlsrv_query</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/sqlsrv/functions/sqlsrv-errors.xml b/reference/sqlsrv/functions/sqlsrv-errors.xml
deleted file mode 100644
index f3a5b390be2f..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-errors.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-errors">
- <refnamediv>
-  <refname>sqlsrv_errors</refname>
-  <refpurpose>Returns error and warning information about the last SQLSRV operation performed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <!-- Example: All functions have this -->
-   <type>mixed</type><methodname>sqlsrv_errors</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>errorsOrWarnings</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns error and warning information about the last SQLSRV operation performed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errorsOrWarnings</parameter></term>
-    <listitem>
-     <simpara>
-      Determines whether error information, warning information, or both are
-      returned. If this parameter is not supplied, both error information and
-      warning information are returned. The following are the supported values
-      for this parameter: SQLSRV_ERR_ALL, SQLSRV_ERR_ERRORS, SQLSRV_ERR_WARNINGS.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If errors and/or warnings occurred on the last sqlsrv operation, an array of
-   arrays containing error information is returned. If no errors and/or warnings
-   occurred on the last sqlsrv operation, &null; is returned. The following table
-   describes the structure of the returned arrays:
-   <table>
-   <title>Array returned by sqlsrv_errors</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>SQLSTATE</entry>
-      <entry>For errors that originate from the ODBC driver, the SQLSTATE returned
-      by ODBC. For errors that originate from the Microsoft Drivers for PHP for
-      SQL Server, a SQLSTATE of IMSSP. For warnings that originate from the
-      Microsoft Drivers for PHP for SQL Server, a SQLSTATE of 01SSP.
-      </entry>
-     </row>
-     <row>
-      <entry>code</entry>
-      <entry>For errors that originate from SQL Server, the native SQL Server
-      error code. For errors that originate from the ODBC driver, the error
-      code returned by ODBC. For errors that originate from the Microsoft Drivers
-      for PHP for SQL Server, the Microsoft Drivers for PHP for SQL Server error code.
-      </entry>
-     </row>
-     <row>
-      <entry>message</entry>
-      <entry>A description of the error.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>functionname</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName/sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-/* Set up a query to select an invalid column name. */
-$sql = "SELECT BadColumnName FROM Table_1";
-
-/* Execution of the query will fail because of the bad column name. */
-$stmt = sqlsrv_query( $conn, $sql );
-if( $stmt === false ) {
-    if( ($errors = sqlsrv_errors() ) != null) {
-        foreach( $errors as $error ) {
-            echo "SQLSTATE: ".$error[ 'SQLSTATE']."<br />";
-            echo "code: ".$error[ 'code']."<br />";
-            echo "message: ".$error[ 'message']."<br />";
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   By default, warnings generated on a call to any SQLSRV function are treated
-   as errors. This means that if a warning occurs on a call to a SQLSRV function,
-   the function returns &false;. However, warnings that correspond to SQLSTATE
-   values 01000, 01001, 01003, and 01S02 are never treated as errors. For
-   information about changing this behavior, see <function>sqlsrv_configure</function>
-   and the WarningsReturnAsErrors setting.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_configure</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/sqlsrv/functions/sqlsrv-execute.xml b/reference/sqlsrv/functions/sqlsrv-execute.xml
deleted file mode 100644
index 18e33dc8bfbf..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-execute.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-execute">
- <refnamediv>
-  <refname>sqlsrv_execute</refname>
-  <refpurpose>Executes a statement prepared with <function>sqlsrv_prepare</function></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_execute</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Executes a statement prepared with <function>sqlsrv_prepare</function>. This
-   function is ideal for executing a prepared statement multiple times with
-   different parameter values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource returned by <function>sqlsrv_prepare</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_execute</function> example</title>
-   <simpara>
-   This example demonstrates how to prepare a statement with
-   <function>sqlsrv_prepare</function> and re-execute it multiple times (with
-   different parameter values) using <function>sqlsrv_execute</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "UPDATE Table_1
-        SET OrderQty = ?
-        WHERE SalesOrderID = ?";
-
-// Initialize parameters and prepare the statement.
-// Variables $qty and $id are bound to the statement, $stmt.
-$qty = 0; $id = 0;
-$stmt = sqlsrv_prepare( $conn, $sql, array( &$qty, &$id));
-if( !$stmt ) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-// Set up the SalesOrderDetailID and OrderQty information.
-// This array maps the order ID to order quantity in key=>value pairs.
-$orders = array( 1=>10, 2=>20, 3=>30);
-
-// Execute the statement for each order.
-foreach( $orders as $id => $qty) {
-    // Because $id and $qty are bound to $stmt1, their updated
-    // values are used with each execution of the statement.
-    if( sqlsrv_execute( $stmt ) === false ) {
-          die( print_r( sqlsrv_errors(), true));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   When you prepare a statement that uses variables as parameters, the variables
-   are bound to the statement. This means that if you update the values of the
-   variables, the next time you execute the statement it will run with updated
-   parameter values. For statements that you plan to execute only once, use
-   <function>sqlsrv_query</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_prepare</function></member>
-   <member><function>sqlsrv_query</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/sqlsrv/functions/sqlsrv-fetch-array.xml b/reference/sqlsrv/functions/sqlsrv-fetch-array.xml
deleted file mode 100644
index b727a40f4962..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-fetch-array.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-fetch-array">
- <refnamediv>
-  <refname>sqlsrv_fetch_array</refname>
-  <refpurpose>Returns a row as an array</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>sqlsrv_fetch_array</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fetchType</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the next available row of data as an associative array, a numeric
-   array, or both (the default).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource returned by sqlsrv_query or sqlsrv_prepare.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fetchType</parameter></term>
-    <listitem>
-     <simpara>
-      A predefined constant specifying the type of array to return. Possible
-      values are <constant>SQLSRV_FETCH_ASSOC</constant>,
-      <constant>SQLSRV_FETCH_NUMERIC</constant>, and
-      <constant>SQLSRV_FETCH_BOTH</constant> (the default).
-     </simpara>
-     <simpara>
-     A fetch type of SQLSRV_FETCH_ASSOC should not be used when consuming a
-     result set with multiple columns of the same name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the row to access in a result set that uses a scrollable cursor.
-      Possible values are <constant>SQLSRV_SCROLL_NEXT</constant>,
-      <constant>SQLSRV_SCROLL_PRIOR</constant>, <constant>SQLSRV_SCROLL_FIRST</constant>,
-      <constant>SQLSRV_SCROLL_LAST</constant>, <constant>SQLSRV_SCROLL_ABSOLUTE</constant> and,
-      <constant>SQLSRV_SCROLL_RELATIVE</constant> (the default). When this parameter
-      is specified, the <parameter>fetchType</parameter> must be explicitly defined.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the row to be accessed if the row parameter is set to
-      <constant>SQLSRV_SCROLL_ABSOLUTE</constant> or
-      <constant>SQLSRV_SCROLL_RELATIVE</constant>. Note that the first row in
-      a result set has index 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array on success, &null; if there are no more rows to return, and
-   &false; if an error occurs.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving an associative array.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\instanceName";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo );
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT FirstName, LastName FROM SomeTable";
-$stmt = sqlsrv_query( $conn, $sql );
-if( $stmt === false) {
-    die( print_r( sqlsrv_errors(), true) );
-}
-
-while( $row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC) ) {
-      echo $row['LastName'].", ".$row['FirstName']."<br />";
-}
-
-sqlsrv_free_stmt( $stmt);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Retrieving a numeric array.</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\instanceName";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo );
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT FirstName, LastName FROM SomeTable";
-$stmt = sqlsrv_query( $conn, $sql );
-if( $stmt === false) {
-    die( print_r( sqlsrv_errors(), true) );
-}
-
-while( $row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_NUMERIC) ) {
-      echo $row[0].", ".$row[1]."<br />";
-}
-
-sqlsrv_free_stmt( $stmt);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   Not specifying the <parameter>fetchType</parameter> or explicitly using the
-   <constant>SQLSRV_FETCH_TYPE</constant> constant in the examples above will
-   return an array that has both associative and numeric keys.
-  </simpara>
-  <simpara>
-   If more than one column is returned with the same name, the last column will
-   take precedence. To avoid field name collisions, use aliases.
-  </simpara>
-  <simpara>
-  If a column with no name is returned, the associative key for the array element
-  will be an empty string ("").
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_connect</function></member>
-   <member><function>sqlsrv_query</function></member>
-   <member><function>sqlsrv_errors</function></member>
-   <member><function>sqlsrv_fetch</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/sqlsrv/functions/sqlsrv-fetch-object.xml b/reference/sqlsrv/functions/sqlsrv-fetch-object.xml
deleted file mode 100644
index 6d9e375a0b64..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-fetch-object.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-fetch-object">
- <refnamediv>
-  <refname>sqlsrv_fetch_object</refname>
-  <refpurpose>Retrieves the next row of data in a result set as an object</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_fetch_object</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>className</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>ctorParams</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the next row of data in a result set as an instance of the specified
-   class with properties that match the row field names and values that correspond
-   to the row field values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource created by <function>sqlsrv_query</function> or
-      <function>sqlsrv_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>className</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the class to instantiate. If no class name is specified,
-      stdClass is instantiated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ctorParams</parameter></term>
-    <listitem>
-     <simpara>
-      Values passed to the constructor of the specified class. If the constructor
-      of the specified class takes parameters, the ctorParams array must be
-      supplied.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <para>
-      The row to be accessed. This parameter can only be used if the specified
-      statement was prepared with a scrollable cursor. In that case, this parameter
-      can take on one of the following values:
-      <simplelist>
-       <member>SQLSRV_SCROLL_NEXT</member>
-       <member>SQLSRV_SCROLL_PRIOR</member>
-       <member>SQLSRV_SCROLL_FIRST</member>
-       <member>SQLSRV_SCROLL_LAST</member>
-       <member>SQLSRV_SCROLL_ABSOLUTE</member>
-       <member>SQLSRV_SCROLL_RELATIVE</member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the row to be accessed if the row parameter is set to
-      <constant>SQLSRV_SCROLL_ABSOLUTE</constant> or
-      <constant>SQLSRV_SCROLL_RELATIVE</constant>. Note that the first row in
-      a result set has index 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an object on success, &null; if there are no more rows to return,
-   and &false; if an error occurs or if the specified class does not exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_fetch_object</function> example</title>
-   <simpara>
-   The following example demonstrates how to retrieve a row as a stdClass object.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT fName, lName FROM Table_1";
-$stmt = sqlsrv_query( $conn, $sql);
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-// Retrieve each row as an object.
-// Because no class is specified, each row will be retrieved as a stdClass object.
-// Property names correspond to field names.
-while( $obj = sqlsrv_fetch_object( $stmt)) {
-      echo $obj->fName.", ".$obj->lName."<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <para>
-   If a class name is specified with the optional $className parameter and the
-   class has properties whose names match the result set field names, the corresponding
-   result set values are applied to the properties. If a result set field name
-   does not match a class property, a property with the result set field name is added
-   to the object and the result set value is applied to the property. The following
-   rules apply when using the $className parameter:
-   <simplelist>
-      <member>Field-property name matching is case-sensitive.</member>
-      <member>Field-property matching occurs regardless of access modifiers.</member>
-      <member>Class property data types are ignored when applying a field value to a property.</member>
-      <member>If the class does not exist, the function returns &false; and adds an error to the error collection.</member>
-   </simplelist>
-   Regardless of whether the $className parameter is supplied, if a field with no
-   name is returned, the field value will be ignored and a warning will be added
-   to the error collection.
-  </para>
-  <simpara>
-   When consuming a result set that has multiple columns with the same name, it may
-   be better to use <function>sqlsrv_fetch_array</function> or the combination of
-   <function>sqlsrv_fetch</function> and <function>sqlsrv_get_field</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_fetch</function></member>
-   <member><function>sqlsrv_fetch_array</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/sqlsrv/functions/sqlsrv-fetch.xml b/reference/sqlsrv/functions/sqlsrv-fetch.xml
deleted file mode 100644
index 14a9c3610dc1..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-fetch.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-fetch">
- <refnamediv>
-  <refname>sqlsrv_fetch</refname>
-  <refpurpose>Makes the next row in a result set available for reading</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <!-- Example: All functions have this -->
-   <type>mixed</type><methodname>sqlsrv_fetch</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Makes the next row in a result set available for reading. Use
-   <function>sqlsrv_get_field</function> to read the fields of the row.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource created by executing <function>sqlsrv_query</function>
-      or <function>sqlsrv_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <para>
-      The row to be accessed. This parameter can only be used if the specified
-      statement was prepared with a scrollable cursor. In that case, this parameter
-      can take on one of the following values:
-      <simplelist>
-       <member>SQLSRV_SCROLL_NEXT</member>
-       <member>SQLSRV_SCROLL_PRIOR</member>
-       <member>SQLSRV_SCROLL_FIRST</member>
-       <member>SQLSRV_SCROLL_LAST</member>
-       <member>SQLSRV_SCROLL_ABSOLUTE</member>
-       <member>SQLSRV_SCROLL_RELATIVE</member>
-      </simplelist>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies the row to be accessed if the row parameter is set to
-      <constant>SQLSRV_SCROLL_ABSOLUTE</constant> or
-      <constant>SQLSRV_SCROLL_RELATIVE</constant>. Note that the first row in
-      a result set has index 0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the next row of a result set was successfully retrieved,
-   &false; if an error occurs, and &null; if there are no more rows in the result set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_fetch</function> example</title>
-   <simpara>
-   The following example demonstrates how to retrieve a row with
-   <function>sqlsrv_fetch</function> and get the row fields with
-   <function>sqlsrv_get_field</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT Name, Comment
-        FROM Table_1
-        WHERE ReviewID=1";
-$stmt = sqlsrv_query( $conn, $sql);
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-// Make the first (and in this case, only) row of the result set available for reading.
-if( sqlsrv_fetch( $stmt ) === false) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-// Get the row fields. Field indices start at 0 and must be retrieved in order.
-// Retrieving row fields by name is not supported by sqlsrv_get_field.
-$name = sqlsrv_get_field( $stmt, 0);
-echo "$name: ";
-
-$comment = sqlsrv_get_field( $stmt, 1);
-echo $comment;
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_get_field</function></member>
-   <member><function>sqlsrv_fetch_array</function></member>
-   <member><function>sqlsrv_fetch_object</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/sqlsrv/functions/sqlsrv-field-metadata.xml b/reference/sqlsrv/functions/sqlsrv-field-metadata.xml
deleted file mode 100644
index 8b3d7c06c31f..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-field-metadata.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-field-metadata">
- <refnamediv>
-  <refname>sqlsrv_field_metadata</refname>
-  <refpurpose>Retrieves metadata for the fields of a statement prepared by
-  <function>sqlsrv_prepare</function> or <function>sqlsrv_query</function>
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_field_metadata</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves metadata for the fields of a statement prepared by
-   <function>sqlsrv_prepare</function> or <function>sqlsrv_query</function>.
-   <function>sqlsrv_field_metadata</function> can be called on a statement before
-   or after statement execution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement resource for which metadata is returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of arrays on success. Otherwise, &false; is returned.
-   Each returned array is described by the following table:
-   <table>
-   <title>Array returned by sqlsrv_field_metadata</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Key</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>Name</entry>
-      <entry>The name of the field.</entry>
-     </row>
-     <row>
-      <entry>Type</entry>
-      <entry>The numeric value for the SQL type.</entry>
-     </row>
-     <row>
-      <entry>Size</entry>
-      <entry>The number of characters for fields of character type, the number of
-      bytes for fields of binary type, or &null; for other types.</entry>
-     </row>
-     <row>
-      <entry>Precision</entry>
-      <entry>The precision for types of variable precision, &null; for other types.</entry>
-     </row>
-     <row>
-      <entry>Scale</entry>
-      <entry>The scale for types of variable scale, &null; for other types.</entry>
-     </row>
-     <row>
-      <entry>Nullable</entry>
-      <entry>An enumeration indicating whether the column is nullable, not nullable,
-      or if it is not known.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  For more information, see <link xlink:href="&url.sqlsrv.field.metadata;">sqlsrv_field_metadata</link>
-  in the Microsoft SQLSRV documentation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_field_metadata</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"AdventureWorks", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-   die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT * FROM Table_1";
-$stmt = sqlsrv_prepare( $conn, $sql );
-
-foreach( sqlsrv_field_metadata( $stmt ) as $fieldMetadata ) {
-    foreach( $fieldMetadata as $name => $value) {
-       echo "$name: $value<br />";
-    }
-      echo "<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_client_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sqlsrv/functions/sqlsrv-free-stmt.xml b/reference/sqlsrv/functions/sqlsrv-free-stmt.xml
deleted file mode 100644
index a4232d0ee7b3..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-free-stmt.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-free-stmt">
- <refnamediv>
-  <refname>sqlsrv_free_stmt</refname>
-  <refpurpose>Frees all resources for the specified statement</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_free_stmt</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Frees all resources for the specified statement. The statement cannot be used
-   after <function>sqlsrv_free_stmt</function> has been called on it. If
-   <function>sqlsrv_free_stmt</function> is called on an in-progress statement
-   that alters server state, statement execution is terminated and the statement
-   is rolled back.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement for which resources are freed.
-      Note that &null; is a valid parameter value. This allows the function to be
-      called multiple times in a script.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_free_stmt</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$stmt = sqlsrv_query( $conn, "SELECT * FROM Table_1");
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-/*-------------------------------
-     Process query results here.
--------------------------------*/
-
-/* Free the statement resources. */
-sqlsrv_free_stmt( $stmt);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
-  <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   The main difference between <function>sqlsrv_free_stmt</function> and
-   <function>sqlsrv_cancel</function> is that a statement resource cancelled with
-   <function>sqlsrv_cancel</function> can be re-executed if it was created with
-   <function>sqlsrv_prepare</function>. A statement resource cancelled with
-   <function>sqlsrv_free_statement</function> cannot be re-executed.
-  </simpara>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_cancel</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/sqlsrv/functions/sqlsrv-get-config.xml b/reference/sqlsrv/functions/sqlsrv-get-config.xml
deleted file mode 100644
index 674922673a91..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-get-config.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-get-config">
- <refnamediv>
-  <refname>sqlsrv_get_config</refname>
-  <refpurpose>Returns the value of the specified configuration setting</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_get_config</methodname>
-   <methodparam><type>string</type><parameter>setting</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the value of the specified configuration setting.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>setting</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the setting for which the value is returned. For a list of
-      configurable settings, see <function>sqlsrv_configure</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value of the specified setting. If an invalid setting is specified,
-   &false; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_configure</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/sqlsrv/functions/sqlsrv-get-field.xml b/reference/sqlsrv/functions/sqlsrv-get-field.xml
deleted file mode 100644
index 031f24c526d6..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-get-field.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-get-field">
- <refnamediv>
-  <refname>sqlsrv_get_field</refname>
-  <refpurpose>Gets field data from the currently selected row</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_get_field</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-   <methodparam><type>int</type><parameter>fieldIndex</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>getAsType</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets field data from the currently selected row. Fields must be accessed in
-   order. Field indices start at 0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource returned by <function>sqlsrv_query</function> or
-      <function>sqlsrv_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fieldIndex</parameter></term>
-    <listitem>
-     <simpara>
-      The index of the field to be retrieved. Field indices start at 0. Fields
-      must be accessed in order. i.e. If you access field index 1, then field
-      index 0 will not be available.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>getAsType</parameter></term>
-    <listitem>
-     <simpara>
-      The PHP data type for the returned field data. If this parameter is not
-      set, the field data will be returned as its default PHP data type.
-      For information about default PHP data types, see
-      <link xlink:href="&url.sqlsrv.default.phptypes;">Default PHP Data Types</link>
-      in the Microsoft SQLSRV documentation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns data from the specified field on success. Returns &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_get_field</function> example</title>
-   <simpara>
-   The following example demonstrates how to retrieve a row with
-   <function>sqlsrv_fetch</function> and get the row fields with
-   <function>sqlsrv_get_field</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT Name, Comment
-        FROM Table_1
-        WHERE ReviewID=1";
-$stmt = sqlsrv_query( $conn, $sql);
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-// Make the first (and in this case, only) row of the result set available for reading.
-if( sqlsrv_fetch( $stmt ) === false) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-// Get the row fields. Field indices start at 0 and must be retrieved in order.
-// Retrieving row fields by name is not supported by sqlsrv_get_field.
-$name = sqlsrv_get_field( $stmt, 0);
-echo "$name: ";
-
-$comment = sqlsrv_get_field( $stmt, 1);
-echo $comment;
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_fetch</function></member>
-   <member><function>sqlsrv_fetch_array</function></member>
-   <member><function>sqlsrv_fetch_object</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/sqlsrv/functions/sqlsrv-has-rows.xml b/reference/sqlsrv/functions/sqlsrv-has-rows.xml
deleted file mode 100644
index 8d70d0b6efb7..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-has-rows.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-has-rows">
- <refnamediv>
-  <refname>sqlsrv_has_rows</refname>
-  <refpurpose>Indicates whether the specified statement has rows</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_has_rows</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Indicates whether the specified statement has rows.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource returned by <function>sqlsrv_query</function> or
-      <function>sqlsrv_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the specified statement has rows and &false; if the statement
-   does not have rows or if an error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_has_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$server = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password" );
-$conn = sqlsrv_connect( $server, $connectionInfo );
-
-$stmt = sqlsrv_query( $conn, "SELECT * FROM Table_1");
-
-if ($stmt) {
-   $rows = sqlsrv_has_rows( $stmt );
-   if ($rows === true)
-      echo "There are rows. <br />";
-   else
-      echo "There are no rows. <br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_num_rows</function></member>
-   <member><function>sqlsrv_query</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/sqlsrv/functions/sqlsrv-next-result.xml b/reference/sqlsrv/functions/sqlsrv-next-result.xml
deleted file mode 100644
index 8964f6194ba3..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-next-result.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-next-result">
- <refnamediv>
-  <refname>sqlsrv_next_result</refname>
-  <refpurpose>Makes the next result of the specified statement active</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_next_result</methodname>
-   <!-- Example: Required parameter -->
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Makes the next result of the specified statement active. Results include result
-   sets, row counts, and output parameters.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement on which the next result is being called.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the next result was successfully retrieved, &false; if an error
-   occurred, and &null; if there are no more results to retrieve.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_next_result</function> example</title>
-   <simpara>
-   The following example executes a batch query that inserts into a table and
-   then selects from the table. This produces two results on the statement:
-   one for the rows affected by the INSERT and one for the rows returned by
-   the SELECT. To get to the rows returned by the SELECT,
-   <function>sqlsrv_next_result</function> must be called to move past the first result.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array("Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-
-$query = "INSERT INTO Table_1 (id, data) VALUES (?,?); SELECT * FROM TABLE_1;";
-$params = array(1, "some data");
-$stmt = sqlsrv_query($conn, $query, $params);
-
-// Consume the first result (rows affected by INSERT) without calling sqlsrv_next_result.
-echo "Rows affected: ".sqlsrv_rows_affected($stmt)."<br />";
-
-// Move to the next result and display results.
-$next_result = sqlsrv_next_result($stmt);
-if( $next_result ) {
-   while( $row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC)){
-      echo $row['id'].": ".$row['data']."<br />";
-   }
-} elseif( is_null($next_result)) {
-     echo "No more results.<br />";
-} else {
-     die(print_r(sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_query</function></member>
-   <member><function>sqlsrv_fetch_array</function></member>
-   <member><function>sqlsrv_rows_affected</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/sqlsrv/functions/sqlsrv-num-fields.xml b/reference/sqlsrv/functions/sqlsrv-num-fields.xml
deleted file mode 100644
index e66ce80436b7..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-num-fields.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-num-fields">
- <refnamediv>
-  <refname>sqlsrv_num_fields</refname>
-  <refpurpose>Retrieves the number of fields (columns) on a statement</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_num_fields</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the number of fields (columns) on a statement.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement for which the number of fields is returned.
-      <function>sqlsrv_num_fields</function> can be called on a statement before
-      or after statement execution.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of fields on success. Returns &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_num_fields</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-   die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "SELECT * FROM Table_1";
-$stmt = sqlsrv_query($conn, $sql);
-if( $stmt === false) {
-   die( print_r( sqlsrv_errors(), true));
-}
-
-$numFields = sqlsrv_num_fields( $stmt );
-
-while( sqlsrv_fetch( $stmt )) {
-   // Iterate through the fields of each row.
-   for($i = 0; $i < $numFields; $i++) {
-      echo sqlsrv_get_field($stmt, $i)." ";
-   }
-   echo "<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_field_metadata</function></member>
-   <member><function>sqlsrv_fetch</function></member>
-   <member><function>sqlsrv_get_field</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/sqlsrv/functions/sqlsrv-num-rows.xml b/reference/sqlsrv/functions/sqlsrv-num-rows.xml
deleted file mode 100644
index 9a46895028e2..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-num-rows.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.sqlsrv-num-rows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>sqlsrv_num_rows</refname>
-  <refpurpose>Retrieves the number of rows in a result set</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_num_rows</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the number of rows in a result set. This function requires that the
-   statement resource be created with a static or keyset cursor. For more information,
-   see <function>sqlsrv_query</function>, <function>sqlsrv_prepare</function>,
-   or <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>
-   in the Microsoft SQLSRV documentation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The statement for which the row count is returned. The statement resource
-      must be created with a static or keyset cursor. For more information, see
-      <function>sqlsrv_query</function>, <function>sqlsrv_prepare</function>, or
-      <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>
-      in the Microsoft SQLSRV documentation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of rows retrieved on success and &false; if an error occurred.
-   If a forward cursor (the default) or dynamic cursor is used, &false; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_num_rows</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$server = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password" );
-$conn = sqlsrv_connect( $server, $connectionInfo );
-
-$sql = "SELECT * FROM Table_1";
-$params = array();
-$options =  array( "Scrollable" => SQLSRV_CURSOR_KEYSET );
-$stmt = sqlsrv_query( $conn, $sql , $params, $options );
-
-$row_count = sqlsrv_num_rows( $stmt );
-
-if ($row_count === false)
-   echo "Error in retrieving row count.";
-else
-   echo $row_count;
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_has_rows</function></member>
-   <member><function>sqlsrv_rows_affected</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/sqlsrv/functions/sqlsrv-prepare.xml b/reference/sqlsrv/functions/sqlsrv-prepare.xml
deleted file mode 100644
index d42cd8f47d39..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-prepare.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-prepare">
- <refnamediv>
-  <refname>sqlsrv_prepare</refname>
-  <refpurpose>Prepares a query for execution</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_prepare</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Prepares a query for execution. This function is ideal for preparing a query
-   that will be executed multiple times with different parameter values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      A connection resource returned by <function>sqlsrv_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sql</parameter></term>
-    <listitem>
-     <simpara>
-      The string that defines the query to be prepared and executed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-    <listitem>
-     <para>
-      An array specifying parameter information when executing a parameterized
-      query. Array elements can be any of the following:
-      <simplelist>
-       <member>A literal value</member>
-       <member>A PHP variable</member>
-       <member>An array with this structure:
-       array($value [, $direction [, $phpType [, $sqlType]]])</member>
-      </simplelist>
-      The following table describes the elements in the array structure above:
-      </para>
-      <table>
-      <title>Array structure</title>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Element</entry>
-         <entry>Description</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>$value</entry>
-         <entry>A literal value, a PHP variable, or a PHP by-reference variable.</entry>
-        </row>
-        <row>
-         <entry>$direction (optional)</entry>
-         <entry>One of the following SQLSRV constants used to indicate the
-         parameter direction: SQLSRV_PARAM_IN, SQLSRV_PARAM_OUT, SQLSRV_PARAM_INOUT.
-         The default value is SQLSRV_PARAM_IN.         </entry>
-        </row>
-        <row>
-         <entry>$phpType (optional)</entry>
-         <entry>A SQLSRV_PHPTYPE_* constant that specifies PHP data type of the
-         returned value.</entry>
-        </row>
-        <row>
-         <entry>$sqlType (optional)</entry>
-         <entry>A SQLSRV_SQLTYPE_* constant that specifies the SQL Server data
-         type of the input value.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An array specifying query property options. The supported keys are described
-      in the following table:
-     </simpara>
-     <table>
-      <title>Query Options</title>
-      <tgroup cols="3">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Values</entry>
-         <entry>Description</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>QueryTimeout</entry>
-         <entry>A positive integer value.</entry>
-         <entry>Sets the query timeout in seconds. By default, the driver will
-         wait indefinitely for results.</entry>
-        </row>
-        <row>
-         <entry>SendStreamParamsAtExec</entry>
-         <entry>&true; or &false; (the default is &true;)</entry>
-         <entry>Configures the driver to send all stream data at execution (&true;),
-         or to send stream data in chunks (&false;). By default, the value is set to &true;.
-         For more information, see <function>sqlsrv_send_stream_data</function>.</entry>
-        </row>
-        <row>
-         <entry>Scrollable</entry>
-         <entry>SQLSRV_CURSOR_FORWARD, SQLSRV_CURSOR_STATIC, SQLSRV_CURSOR_DYNAMIC,
-         or SQLSRV_CURSOR_KEYSET</entry>
-         <entry>See <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying a Cursor Type and Selecting Rows</link>
-         in the Microsoft SQLSRV documentation.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a statement resource on success and &false; if an error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_prepare</function> example</title>
-   <simpara>
-   This example demonstrates how to prepare a statement with <function>sqlsrv_prepare</function>
-   and re-execute it multiple times (with different parameter values) using <function>sqlsrv_execute</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "UPDATE Table_1
-        SET OrderQty = ?
-        WHERE SalesOrderID = ?";
-
-// Initialize parameters and prepare the statement.
-// Variables $qty and $id are bound to the statement, $stmt.
-$qty = 0; $id = 0;
-$stmt = sqlsrv_prepare( $conn, $sql, array( &$qty, &$id));
-if( !$stmt ) {
-    die( print_r( sqlsrv_errors(), true));
-}
-
-// Set up the SalesOrderDetailID and OrderQty information.
-// This array maps the order ID to order quantity in key=>value pairs.
-$orders = array( 1=>10, 2=>20, 3=>30);
-
-// Execute the statement for each order.
-foreach( $orders as $id => $qty) {
-    // Because $id and $qty are bound to $stmt1, their updated
-    // values are used with each execution of the statement.
-    if( sqlsrv_execute( $stmt ) === false ) {
-          die( print_r( sqlsrv_errors(), true));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   When you prepare a statement that uses variables as parameters, the variables
-   are bound to the statement. This means that if you update the values of the
-   variables, the next time you execute the statement it will run with updated
-   parameter values. For statements that you plan to execute only once, use
-   <function>sqlsrv_query</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_execute</function></member>
-   <member><function>sqlsrv_query</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/sqlsrv/functions/sqlsrv-query.xml b/reference/sqlsrv/functions/sqlsrv-query.xml
deleted file mode 100644
index 113e740df963..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-query.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-query">
- <refnamediv>
-  <refname>sqlsrv_query</refname>
-  <refpurpose>Prepares and executes a query</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>sqlsrv_query</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Prepares and executes a query.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      A connection resource returned by <function>sqlsrv_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sql</parameter></term>
-    <listitem>
-     <simpara>
-      The string that defines the query to be prepared and executed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-    <listitem>
-     <para>
-      An array specifying parameter information when executing a parameterized query.
-      Array elements can be any of the following:
-      <simplelist>
-       <member>A literal value</member>
-       <member>A PHP variable</member>
-       <member>An array with this structure:
-       array($value [, $direction [, $phpType [, $sqlType]]])</member>
-      </simplelist>
-      The following table describes the elements in the array structure above:
-      </para>
-      <table>
-      <title>Array structure</title>
-      <tgroup cols="2">
-       <thead>
-        <row>
-         <entry>Element</entry>
-         <entry>Description</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>$value</entry>
-         <entry>A literal value, a PHP variable, or a PHP by-reference variable.</entry>
-        </row>
-        <row>
-         <entry>$direction (optional)</entry>
-         <entry>One of the following SQLSRV constants used to indicate the
-         parameter direction: SQLSRV_PARAM_IN, SQLSRV_PARAM_OUT, SQLSRV_PARAM_INOUT.
-         The default value is SQLSRV_PARAM_IN.</entry>
-        </row>
-        <row>
-         <entry>$phpType (optional)</entry>
-         <entry>A SQLSRV_PHPTYPE_* constant that specifies PHP data type of the
-         returned value.</entry>
-        </row>
-        <row>
-         <entry>$sqlType (optional)</entry>
-         <entry>A SQLSRV_SQLTYPE_* constant that specifies the SQL Server data
-         type of the input value.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An array specifying query property options. The supported keys are described
-      in the following table:
-     </simpara>
-     <table>
-      <title>Query Options</title>
-      <tgroup cols="3">
-       <thead>
-        <row>
-         <entry>Key</entry>
-         <entry>Values</entry>
-         <entry>Description</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>QueryTimeout</entry>
-         <entry>A positive integer value.</entry>
-         <entry>Sets the query timeout in seconds. By default, the driver will
-         wait indefinitely for results.</entry>
-        </row>
-        <row>
-         <entry>SendStreamParamsAtExec</entry>
-         <entry>&true; or &false; (the default is &true;)</entry>
-         <entry>Configures the driver to send all stream data at execution (&true;),
-         or to send stream data in chunks (&false;). By default, the value is set
-         to &true;. For more information, see <function>sqlsrv_send_stream_data</function>.</entry>
-        </row>
-        <row>
-         <entry>Scrollable</entry>
-         <entry>SQLSRV_CURSOR_FORWARD, SQLSRV_CURSOR_STATIC, SQLSRV_CURSOR_DYNAMIC,
-         or SQLSRV_CURSOR_KEYSET</entry>
-         <entry>See <link xlink:href="&url.sqlsrv.specify.cursortype;">Specifying
-         a Cursor Type and Selecting Rows</link> in the Microsoft SQLSRV documentation.</entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a statement resource on success and &false; if an error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_query</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password" );
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "INSERT INTO Table_1 (id, data) VALUES (?, ?)";
-$params = array(1, "some data");
-
-$stmt = sqlsrv_query( $conn, $sql, $params);
-if( $stmt === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <simpara>
-   For statements that you plan to execute only once, use <function>sqlsrv_query</function>.
-   If you intend to re-execute a statement with different parameter values, use
-   the combination of <function>sqlsrv_prepare</function> and <function>sqlsrv_execute</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_prepare</function></member>
-   <member><function>sqlsrv_execute</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/sqlsrv/functions/sqlsrv-rollback.xml b/reference/sqlsrv/functions/sqlsrv-rollback.xml
deleted file mode 100644
index 1bcf2fd0b1ad..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-rollback.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-rollback">
- <refnamediv>
-  <refname>sqlsrv_rollback</refname>
-  <refpurpose>Rolls back a transaction that was begun with
-  <function>sqlsrv_begin_transaction</function></refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_rollback</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rolls back a transaction that was begun with <function>sqlsrv_begin_transaction</function>
-   and returns the connection to auto-commit mode.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection resource returned by a call to <function>sqlsrv_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_rollback</function> example</title>
-   <simpara>
-   The following example demonstrates how to use <function>sqlsrv_begin_transaction</function>
-   together with <function>sqlsrv_commit</function> and <function>sqlsrv_rollback</function>.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"userName", "PWD"=>"password");
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-    die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Begin the transaction. */
-if ( sqlsrv_begin_transaction( $conn ) === false ) {
-     die( print_r( sqlsrv_errors(), true ));
-}
-
-/* Initialize parameter values. */
-$orderId = 1; $qty = 10; $productId = 100;
-
-/* Set up and execute the first query. */
-$sql1 = "INSERT INTO OrdersTable (ID, Quantity, ProductID)
-         VALUES (?, ?, ?)";
-$params1 = array( $orderId, $qty, $productId );
-$stmt1 = sqlsrv_query( $conn, $sql1, $params1 );
-
-/* Set up and execute the second query. */
-$sql2 = "UPDATE InventoryTable
-         SET Quantity = (Quantity - ?)
-         WHERE ProductID = ?";
-$params2 = array($qty, $productId);
-$stmt2 = sqlsrv_query( $conn, $sql2, $params2 );
-
-/* If both queries were successful, commit the transaction. */
-/* Otherwise, rollback the transaction. */
-if( $stmt1 && $stmt2 ) {
-     sqlsrv_commit( $conn );
-     echo "Transaction committed.<br />";
-} else {
-     sqlsrv_rollback( $conn );
-     echo "Transaction rolled back.<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_begin_transaction</function></member>
-   <member><function>sqlsrv_commit</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/sqlsrv/functions/sqlsrv-rows-affected.xml b/reference/sqlsrv/functions/sqlsrv-rows-affected.xml
deleted file mode 100644
index fd42ec1fea31..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-rows-affected.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-rows-affected">
- <refnamediv>
-  <refname>sqlsrv_rows_affected</refname>
-  <refpurpose>Returns the number of rows modified by the last INSERT, UPDATE, or
-  DELETE query executed</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>sqlsrv_rows_affected</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the number of rows modified by the last INSERT, UPDATE, or DELETE
-   query executed. For information about the number of rows returned by a SELECT
-   query, see <function>sqlsrv_num_rows</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      The executed statement resource for which the number of affected rows is returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of rows affected by the last INSERT, UPDATE, or DELETE query.
-   If no rows were affected, 0 is returned. If the number of affected rows cannot
-   be determined, -1 is returned. If an error occurred, &false; is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_rows_affected</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password" );
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "UPDATE Table_1 SET data = ? WHERE id = ?";
-
-$params = array("updated data", 1);
-
-$stmt = sqlsrv_query( $conn, $sql, $params);
-
-$rows_affected = sqlsrv_rows_affected( $stmt);
-if( $rows_affected === false) {
-     die( print_r( sqlsrv_errors(), true));
-} elseif( $rows_affected == -1) {
-      echo "No information available.<br />";
-} else {
-      echo $rows_affected." rows were updated.<br />";
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_num_rows</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/sqlsrv/functions/sqlsrv-send-stream-data.xml b/reference/sqlsrv/functions/sqlsrv-send-stream-data.xml
deleted file mode 100644
index 19b78c7d1548..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-send-stream-data.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-send-stream-data">
- <refnamediv>
-  <refname>sqlsrv_send_stream_data</refname>
-  <refpurpose>Sends data from parameter streams to the server</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>sqlsrv_send_stream_data</methodname>
-   <methodparam><type>resource</type><parameter>stmt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Send data from parameter streams to the server. Up to 8 KB of data is sent
-   with each call.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stmt</parameter></term>
-    <listitem>
-     <simpara>
-      A statement resource returned by <function>sqlsrv_query</function> or
-      <function>sqlsrv_execute</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if there is more data to send and &false; if there is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_send_stream_data</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$connectionInfo = array( "Database"=>"dbName", "UID"=>"username", "PWD"=>"password" );
-$conn = sqlsrv_connect( $serverName, $connectionInfo);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$sql = "UPDATE Table_1 SET data = ( ?) WHERE id = 100";
-
-// Open parameter data as a stream and put it in the $params array.
-$data = fopen( "data://text/plain,[ Lengthy content here. ]", "r");
-$params = array( &$data);
-
-// Prepare the statement. Use the $options array to turn off the
-// default behavior, which is to send all stream data at the time of query
-// execution.
-$options = array("SendStreamParamsAtExec"=>0);
-$stmt = sqlsrv_prepare( $conn, $sql, $params, $options);
-
-sqlsrv_execute( $stmt);
-
-// Send up to 8K of parameter data to the server
-// with each call to sqlsrv_send_stream_data.
-$i = 1;
-while( sqlsrv_send_stream_data( $stmt)) {
-      $i++;
-}
-echo "$i calls were made.";
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_prepare</function></member>
-   <member><function>sqlsrv_query</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/sqlsrv/functions/sqlsrv-server-info.xml b/reference/sqlsrv/functions/sqlsrv-server-info.xml
deleted file mode 100644
index 3cded37ca7a6..000000000000
--- a/reference/sqlsrv/functions/sqlsrv-server-info.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.sqlsrv-server-info">
- <refnamediv>
-  <refname>sqlsrv_server_info</refname>
-  <refpurpose>Returns information about the server</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>sqlsrv_server_info</methodname>
-   <methodparam><type>resource</type><parameter>conn</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns information about the server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>conn</parameter></term>
-    <listitem>
-     <simpara>
-      The connection resource that connects the client and the server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array as described in the following table:
-  <table>
-  <title>Returned Array</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>CurrentDatabase</entry>
-      <entry>The connected-to database.</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>SQLServerVersion</entry>
-      <entry>The SQL Server version.</entry>
-     </row>
-     <row>
-      <entry>SQLServerName</entry>
-      <entry>The name of the server.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-</para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>sqlsrv_server_info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$serverName = "serverName\sqlexpress";
-$conn = sqlsrv_connect( $serverName);
-if( $conn === false ) {
-     die( print_r( sqlsrv_errors(), true));
-}
-
-$server_info = sqlsrv_server_info( $conn);
-if( $server_info )
-{
-    foreach( $server_info as $key => $value) {
-       echo $key.": ".$value."<br />";
-    }
-} else {
-      die( print_r( sqlsrv_errors(), true));
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>sqlsrv_client_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/sqlsrv/ini.xml b/reference/sqlsrv/ini.xml
deleted file mode 100644
index d1399f268fc5..000000000000
--- a/reference/sqlsrv/ini.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sqlsrv.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <simpara>The following table lists the configuration options available in the SQLSRV
- extension. For more information about these options, see
- <link xlink:href="&url.sqlsrv.error.handling;">Handling SQLSRV Warnings and Errors</link>.</simpara>
- <table>
-  <title>SQLSRV &ConfigureOptions;</title>
-  <tgroup cols="4">
-   <thead>
-    <row>
-     <entry>&Name;</entry>
-     <entry>&Default;</entry>
-     <entry>&Changeable;</entry>
-     <entry>&Changelog;</entry>
-    </row>
-   </thead>
-   <tbody>
-    <row>
-     <entry>sqlsrv.WarningsReturnAsErrors</entry>
-     <entry>1 (&true;)</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry>Available since SQLSRV 1.0</entry>
-    </row>
-    <row>
-     <entry>sqlsrv.LogSubsystems</entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry>Available since SQLSRV 1.0</entry>
-    </row>
-    <row>
-     <entry>sqlsrv.LogSeverity</entry>
-     <entry>1</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry>Available since SQLSRV 1.0</entry>
-    </row>
-   </tbody>
-  </tgroup>
- </table>
-
- <!--&ini.descriptions.title;
-
-  <para>
-  <variablelist>
-   <varlistentry xml:id="ini.extname.theini-option">
-    <term>
-     <parameter>theini_option</parameter>
-     <type>thetype</type>
-    </term>
-    <listitem>
-     <para>
-
-     </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/sqlsrv/reference.xml b/reference/sqlsrv/reference.xml
deleted file mode 100644
index d95e3a6f9ff0..000000000000
--- a/reference/sqlsrv/reference.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.sqlsrv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>SQLSRV &Functions;</title>
-
-<!--<partintro>
-  <section xml:id="sqlsrv.refintro">
-   &reftitle.intro;
-  </section>
- </partintro>-->
-
-&reference.sqlsrv.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
--->
\ No newline at end of file
diff --git a/reference/sqlsrv/setup.xml b/reference/sqlsrv/setup.xml
deleted file mode 100644
index 802a26873a9e..000000000000
--- a/reference/sqlsrv/setup.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sqlsrv.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="sqlsrv.requirements">
-  &reftitle.required;
-  <para>
-   The SQLSRV extension can be used on the following operating systems:
-   <simplelist>
-    <member>Windows Vista Service Pack 2 or later</member>
-    <member>Windows Server 2008 Service Pack 2 or later</member>
-    <member>Windows Server 2008 R2</member>
-    <member>Windows 7</member>
-   </simplelist>
-  </para>
-  <para>
-   The SQLSRV extension requires that the Microsoft SQL Server 2012 Native
-   Client be installed on the same computer that is running PHP. If the Microsoft
-   SQL Server 2012 Native Client is not already installed, click the appropriate link below
-   to download it:
-  <simplelist>
-    <member><link xlink:href="&url.sqlsrv.snac.x86download;">Download the x86 package</link></member>
-    <member><link xlink:href="&url.sqlsrv.snac.x64download;">Download the x64 package</link></member>
-   </simplelist>
-  </para>
-  <simpara>
-   The SQLSRV download comes 8 driver files, four of which are for PDO support.
-  </simpara>
-  <simpara>
-  The most recent version of the driver is available for download here:
-  <link xlink:href="&url.sqlsrv;">SQLSRV download</link>.
-  </simpara>
-   <simpara>
-   For more information about SQLSRV requirements, see
-   <link xlink:href="&url.sqlsrv.system.requirements;">SQLSRV System Requirements</link>.
-   </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.sqlsrv.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.sqlsrv.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="sqlsrv.resources">
-  &reftitle.resources;
-  <section xml:id="sqlsrv.resources.link">
-   <title>Connection resource</title>
-   <simpara>
-    A connection resource returned by <function>sqlsrv_connect</function>.
-   </simpara>
-  </section>
-  <section xml:id="sqlsrv.resources.statement">
-   <title>Statement resource</title>
-   <simpara>
-    A statement resource returned by <function>sqlsrv_query</function> or by
-    <function>sqlsrv_prepare</function>.
-   </simpara>
-  </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/ssdeep/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ssdeep/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ssdeep/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ssdeep/book.xml b/reference/ssdeep/book.xml
deleted file mode 100644
index 198cd3fe3913..000000000000
--- a/reference/ssdeep/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ssdeep">
- <?phpdoc extension-membership="pecl" ?>
- <title>ssdeep Fuzzy Hashing</title>
- <titleabbrev>ssdeep</titleabbrev>
-
- <preface xml:id="intro.ssdeep">
-  &reftitle.intro;
-  <simpara>
-   ssdeep is a utility for creating and comparing fuzzy hashes or
-   <link xlink:href="&url.ssdeep.ctph;">context-triggered piecewise
-   hashing</link>.
-  </simpara>
-  <simpara>
-   Fuzzy hashing can match signatures which have "...sequences of identical
-   bytes in the same order, although bytes in between these sequences
-   may be different in both content and length" (<link xlink:href="&url.ssdeep.libssdeep;">
-   ssdeep project page</link>).
-  </simpara>
-  <simpara>
-   This extension provides functions for creating and comparing fuzzy hashes.
-  </simpara>
- </preface>
-
- &reference.ssdeep.setup;
- <!-- &reference.ssdeep.examples; -->
- &reference.ssdeep.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/ssdeep/configure.xml b/reference/ssdeep/configure.xml
deleted file mode 100644
index 3dd67e0c645a..000000000000
--- a/reference/ssdeep/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ssdeep.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;ssdeep">&url.pecl.package;ssdeep</link>
- </simpara>
-
-</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/ssdeep/functions/ssdeep-fuzzy-compare.xml b/reference/ssdeep/functions/ssdeep-fuzzy-compare.xml
deleted file mode 100644
index 797b2bcac424..000000000000
--- a/reference/ssdeep/functions/ssdeep-fuzzy-compare.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssdeep-fuzzy-compare">
- <refnamediv>
-  <refname>ssdeep_fuzzy_compare</refname>
-  <refpurpose>Calculates the match score between two fuzzy hash signatures</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ssdeep_fuzzy_compare</methodname>
-   <methodparam><type>string</type><parameter>signature1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signature2</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Calculates the match score between <parameter>signature1</parameter>
-   and <parameter>signature2</parameter> using <link xlink:href="&url.ssdeep.ctph;">
-   context-triggered piecewise hashing</link>, and returns the match
-   score.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>signature1</parameter></term>
-    <listitem>
-     <simpara>
-      The first fuzzy hash signature string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signature2</parameter></term>
-    <listitem>
-     <simpara>
-      The second fuzzy hash signature string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an integer from 0 to 100 on success, &false; otherwise.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ssdeep/functions/ssdeep-fuzzy-hash-filename.xml b/reference/ssdeep/functions/ssdeep-fuzzy-hash-filename.xml
deleted file mode 100644
index 7de46bd82be7..000000000000
--- a/reference/ssdeep/functions/ssdeep-fuzzy-hash-filename.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssdeep-fuzzy-hash-filename">
- <refnamediv>
-  <refname>ssdeep_fuzzy_hash_filename</refname>
-  <refpurpose>Create a fuzzy hash from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ssdeep_fuzzy_hash_filename</methodname>
-   <methodparam><type>string</type><parameter>file_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>ssdeep_fuzzy_hash_filename</function> calculates the hash
-   of the file specified by <parameter>file_name</parameter> using
-   <link xlink:href="&url.ssdeep.ctph;">context-triggered piecewise
-   hashing</link>, and returns that hash.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file_name</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the file to hash.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string on success, &false; otherwise.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ssdeep/functions/ssdeep-fuzzy-hash.xml b/reference/ssdeep/functions/ssdeep-fuzzy-hash.xml
deleted file mode 100644
index 4c2aced18bb0..000000000000
--- a/reference/ssdeep/functions/ssdeep-fuzzy-hash.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssdeep-fuzzy-hash">
- <refnamediv>
-  <refname>ssdeep_fuzzy_hash</refname>
-  <refpurpose>Create a fuzzy hash from a string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ssdeep_fuzzy_hash</methodname>
-   <methodparam><type>string</type><parameter>to_hash</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>ssdeep_fuzzy_hash</function> calculates the hash of
-   <parameter>to_hash</parameter> using <link xlink:href="&url.ssdeep.ctph;">
-   context-triggered piecewise hashing</link>, and returns that hash.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>to_hash</parameter></term>
-    <listitem>
-     <simpara>
-      The input string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string on success, &false; otherwise.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ssdeep/reference.xml b/reference/ssdeep/reference.xml
deleted file mode 100644
index 2f676bbcd5e4..000000000000
--- a/reference/ssdeep/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ssdeep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>ssdeep &Functions;</title>
-
- &reference.ssdeep.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/ssdeep/setup.xml b/reference/ssdeep/setup.xml
deleted file mode 100644
index f1e004cb902b..000000000000
--- a/reference/ssdeep/setup.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ssdeep.setup">
- &reftitle.setup;
-
- <section xml:id="ssdeep.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires the <link xlink:href="&url.ssdeep.libssdeep;">ssdeep</link> library.
-  </simpara>
- </section>
-
- <section xml:id="ssdeep.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;ssdeep">&url.pecl.package;ssdeep</link>.
-  </simpara>
- </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/ssdeep/versions.xml b/reference/ssdeep/versions.xml
deleted file mode 100644
index 50afdc4514b8..000000000000
--- a/reference/ssdeep/versions.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='ssdeep_fuzzy_hash' from='PECL ssdeep &gt;= 1.0.0'/>
- <function name='ssdeep_fuzzy_hash_filename' from='PECL ssdeep &gt;= 1.0.0'/>
- <function name='ssdeep_fuzzy_compare' from='PECL ssdeep &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/ssh2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ssh2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ssh2/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ssh2/book.xml b/reference/ssh2/book.xml
deleted file mode 100644
index dea838953a16..000000000000
--- a/reference/ssh2/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.ssh2">
- <?phpdoc extension-membership="pecl" ?>
- <title>Secure Shell2</title>
- <titleabbrev>SSH2</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.ssh2">
-  &reftitle.intro;
-  <simpara>
-   Bindings to the <link xlink:href="&url.libssh2;">libssh2</link> library which
-   provide access to resources (shell, remote exec, tunneling, file transfer)
-   on a remote machine using a secure cryptographic transport.
-  </simpara>
- </preface>
- <!-- }}} -->
-
- &reference.ssh2.setup;
- &reference.ssh2.constants;
- &reference.ssh2.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/ssh2/constants.xml b/reference/ssh2/constants.xml
deleted file mode 100644
index 922a949df1bb..000000000000
--- a/reference/ssh2/constants.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="ssh2.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.ssh2-fingerprint-md5">
-   <term>
-    <constant>SSH2_FINGERPRINT_MD5</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fingerprint</function> requesting hostkey
-     fingerprint as an MD5 hash.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-fingerprint-sha1">
-   <term>
-    <constant>SSH2_FINGERPRINT_SHA1</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fingerprint</function> requesting hostkey
-     fingerprint as an SHA1 hash.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-fingerprint-hex">
-   <term>
-    <constant>SSH2_FINGERPRINT_HEX</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fingerprint</function> requesting hostkey
-     fingerprint as a string of hexits.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-fingerprint-raw">
-   <term>
-    <constant>SSH2_FINGERPRINT_RAW</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fingerprint</function> requesting hostkey
-     fingerprint as a raw string of 8-bit characters.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-term-unit-chars">
-   <term>
-    <constant>SSH2_TERM_UNIT_CHARS</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_shell</function> specifying that
-     <parameter>width</parameter> and <parameter>height</parameter>
-     are provided as character sizes.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-term-unit-pixels">
-   <term>
-    <constant>SSH2_TERM_UNIT_PIXELS</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_shell</function> specifying that
-     <parameter>width</parameter> and <parameter>height</parameter>
-     are provided in pixel units.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-default-term-width">
-   <term>
-    <constant>SSH2_DEFAULT_TERM_WIDTH</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Default terminal width requested by <function>ssh2_shell</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-default-term-height">
-   <term>
-    <constant>SSH2_DEFAULT_TERM_HEIGHT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Default terminal height requested by <function>ssh2_shell</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-default-term-unit">
-   <term>
-    <constant>SSH2_DEFAULT_TERM_UNIT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Default terminal units requested by <function>ssh2_shell</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-stream-stdio">
-   <term>
-    <constant>SSH2_STREAM_STDIO</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fetch_stream</function> requesting STDIO subchannel.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-stream-stderr">
-   <term>
-    <constant>SSH2_STREAM_STDERR</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Flag to <function>ssh2_fetch_stream</function> requesting STDERR subchannel.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-default-terminal">
-   <term>
-    <constant>SSH2_DEFAULT_TERMINAL</constant>
-     (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Default terminal type (e.g. vt102, ansi, xterm, vanilla) requested
-     by <function>ssh2_shell</function>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollin">
-   <term>
-    <constant>SSH2_POLLIN</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollext">
-   <term>
-    <constant>SSH2_POLLEXT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollout">
-   <term>
-    <constant>SSH2_POLLOUT</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollerr">
-   <term>
-    <constant>SSH2_POLLERR</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollhup">
-   <term>
-    <constant>SSH2_POLLHUP</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-pollnval">
-   <term>
-    <constant>SSH2_POLLNVAL</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-poll-session-closed">
-   <term>
-    <constant>SSH2_POLL_SESSION_CLOSED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-poll-channel-closed">
-   <term>
-    <constant>SSH2_POLL_CHANNEL_CLOSED</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.ssh2-poll-listener-closed">
-   <term>
-    <constant>SSH2_POLL_LISTENER_CLOSED</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/ssh2/functions/ssh2-auth-agent.xml b/reference/ssh2/functions/ssh2-auth-agent.xml
deleted file mode 100644
index fa8e7c166c19..000000000000
--- a/reference/ssh2/functions/ssh2-auth-agent.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-auth-agent">
- <refnamediv>
-  <refname>ssh2_auth_agent</refname>
-  <refpurpose>Authenticate over SSH using the ssh agent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_auth_agent</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Authenticate over SSH using the ssh agent
-  </simpara>
-  <note>
-    <simpara>
-     The <function>ssh2_auth_agent</function> function will only be available
-     when the ssh2 extension is compiled with libssh2 &gt;= 1.2.3.
-    </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      Remote user name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Authenticating with a ssh agent</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-
-if (ssh2_auth_agent($connection, 'username')) {
-  echo "Authentication Successful!\n";
-} else {
-  die('Authentication Failed...');
-}
-?>
-]]>
-   </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/ssh2/functions/ssh2-auth-hostbased-file.xml b/reference/ssh2/functions/ssh2-auth-hostbased-file.xml
deleted file mode 100644
index c567433019a9..000000000000
--- a/reference/ssh2/functions/ssh2-auth-hostbased-file.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-auth-hostbased-file">
- <refnamediv>
-  <refname>ssh2_auth_hostbased_file</refname>
-  <refpurpose>Authenticate using a public hostkey</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_auth_hostbased_file</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pubkeyfile</parameter></methodparam>
-   <methodparam><type>string</type><parameter>privkeyfile</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passphrase</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>local_username</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Authenticate using a public hostkey read from a file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pubkeyfile</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>privkeyfile</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passphrase</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>privkeyfile</parameter> is encrypted (which it should
-      be), the passphrase must be provided.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>local_username</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>local_username</parameter> is omitted, then the value
-      for <parameter>username</parameter> will be used for it.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Authentication using a public hostkey</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22, array('hostkey'=>'ssh-rsa'));
-
-if (ssh2_auth_hostbased_file($connection, 'remoteusername', 'myhost.example.com',
-                             '/usr/local/etc/hostkey_rsa.pub',
-                             '/usr/local/etc/hostkey_rsa', 'secret',
-                             'localusername')) {
-  echo "Public Key Hostbased Authentication Successful\n";
-} else {
-  die('Public Key Hostbased Authentication Failed');
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    <function>ssh2_auth_hostbased_file</function> requires libssh2 &gt;= 0.7 and
-    PHP/SSH2 &gt;= 0.7
-   </simpara>
-  </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/ssh2/functions/ssh2-auth-none.xml b/reference/ssh2/functions/ssh2-auth-none.xml
deleted file mode 100644
index 153f99c66221..000000000000
--- a/reference/ssh2/functions/ssh2-auth-none.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-auth-none">
- <refnamediv>
-  <refname>ssh2_auth_none</refname>
-  <refpurpose>Authenticate as "none"</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>ssh2_auth_none</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attempt "none" authentication which usually will (and should) fail.
-   As part of the failure, this function will return an array of accepted
-   authentication methods.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      Remote user name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the server does accept "none" as an authentication
-   method, or an array of accepted authentication methods on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Retrieving a list of authentication methods</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-
-$auth_methods = ssh2_auth_none($connection, 'user');
-
-if (in_array('password', $auth_methods)) {
-  echo "Server supports password based authentication\n";
-}
-?>
-]]>
-   </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/ssh2/functions/ssh2-auth-password.xml b/reference/ssh2/functions/ssh2-auth-password.xml
deleted file mode 100644
index 8710f9c907bc..000000000000
--- a/reference/ssh2/functions/ssh2-auth-password.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-auth-password">
- <refnamediv>
-  <refname>ssh2_auth_password</refname>
-  <refpurpose>Authenticate over SSH using a plain password</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_auth_password</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>password</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Authenticate over SSH using a plain password. Since version 0.12 this function
-   also supports keyboard_interactive method.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      Remote user name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      Password for <parameter>username</parameter>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Authenticating with a password</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-
-if (ssh2_auth_password($connection, 'username', 'secret')) {
-  echo "Authentication Successful!\n";
-} else {
-  die('Authentication Failed...');
-}
-?>
-]]>
-   </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/ssh2/functions/ssh2-auth-pubkey-file.xml b/reference/ssh2/functions/ssh2-auth-pubkey-file.xml
deleted file mode 100644
index 8519a945c14b..000000000000
--- a/reference/ssh2/functions/ssh2-auth-pubkey-file.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.ssh2-auth-pubkey-file">
- <refnamediv>
-  <refname>ssh2_auth_pubkey_file</refname>
-  <refpurpose>Authenticate using a public key read from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_auth_pubkey_file</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pubkeyfile</parameter></methodparam>
-   <methodparam><type>string</type><parameter>privkeyfile</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Authenticate using a public key read from a file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the user to authenticate as on the remote server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pubkeyfile</parameter></term>
-    <listitem>
-     <simpara>
-      The public key file needs to be in OpenSSH's format. It should look something like:
-     </simpara>
-     <simpara>
-      ssh-rsa AAAAB3NzaC1yc2EAAA....NX6sqSnHA8= rsa-key-20121110
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>privkeyfile</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passphrase</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>privkeyfile</parameter> is encrypted (which it should
-      be), the <parameter>passphrase</parameter> must be provided.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Authentication using a public key</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22, array('hostkey'=>'ssh-rsa'));
-
-if (ssh2_auth_pubkey_file($connection, 'username',
-                          '/home/username/.ssh/id_rsa.pub',
-                          '/home/username/.ssh/id_rsa', 'secret')) {
-  echo "Public Key Authentication Successful\n";
-} else {
-  die('Public Key Authentication Failed');
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The underlying libssh2 library doesn't support partial auths very cleanly.
-    That is, if you need to supply both a public key and a password it will
-    appear as if this function has failed. In this particular case a failure
-    from this call may just mean that auth hasn't been completed yet. You
-    would need to ignore this failure and continue on and call
-    <function>ssh2_auth_password</function> in order to complete
-    authentication.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_auth_pubkey</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/ssh2/functions/ssh2-auth-pubkey.xml b/reference/ssh2/functions/ssh2-auth-pubkey.xml
deleted file mode 100644
index a8661f8e3954..000000000000
--- a/reference/ssh2/functions/ssh2-auth-pubkey.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-auth-pubkey">
- <refnamediv>
-  <refname>ssh2_auth_pubkey</refname>
-  <refpurpose>Authenticate using a public key in a variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_auth_pubkey</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>string</type><parameter>pubkey</parameter></methodparam>
-   <methodparam><type>string</type><parameter>privkey</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>passphrase</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Authenticate using a public key in a variable.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-       Name of the user to authenticate as on the remote server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pubkey</parameter></term>
-    <listitem>
-     <simpara>
-      Public key in OpenSSH's format. It should look something like:
-      <literal>ssh-rsa AAAAB3NzaC1yc2EAAA....NX6sqSnHA8= rsa-key-20121110</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>privkey</parameter></term>
-    <listitem>
-     <simpara>
-      Private OpenSSH key. It should begin with:
-      <literal>-----BEGIN RSA PRIVATE KEY-----</literal>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>passphrase</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>privkey</parameter> is encrypted (which it should
-      be), the <parameter>passphrase</parameter> must be provided.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Authentication using a public key</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22, array('hostkey'=>'ssh-rsa'));
-$publicKey = file_get_contents('/home/username/.ssh/id_rsa.pub');
-$privateKey = file_get_contents('/home/username/.ssh/id_rsa');
-
-if (ssh2_auth_pubkey($connection, 'username',
-                     $publicKey,
-                     $privateKey, 'secret')) {
-  echo "Public Key Authentication Successful\n";
-} else {
-  die('Public Key Authentication Failed');
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    The underlying libssh2 library doesn't support partial auths very cleanly.
-    That is, if you need to supply both a public key and a password it will
-    appear as if this function has failed. In this particular case a failure
-    from this call may just mean that auth hasn't been completed yet. You
-    would need to ignore this failure and continue on and call
-    <function>ssh2_auth_password</function> in order to complete
-    authentication.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_auth_pubkey_file</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/ssh2/functions/ssh2-connect.xml b/reference/ssh2/functions/ssh2-connect.xml
deleted file mode 100644
index 5a6ce331655b..000000000000
--- a/reference/ssh2/functions/ssh2-connect.xml
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-connect">
- <refnamediv>
-  <refname>ssh2_connect</refname>
-  <refpurpose>Connect to an SSH server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter><initializer>22</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>methods</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Establish a connection to a remote SSH server.
-  </simpara>
-  <simpara>
-   Once connected, the client should verify the server's hostkey using
-   <function>ssh2_fingerprint</function>, then authenticate using either
-   password or public key.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>methods</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>methods</parameter> may be an associative array with up to four parameters
-      as described below.
-     </simpara>
-     <table>
-      <title><parameter>methods</parameter> may be an associative array
-             with any or all of the following parameters.</title>
-      <tgroup cols="3">
-       <thead>
-        <row>
-         <entry>Index</entry>
-         <entry>Meaning</entry>
-         <entry>Supported Values*</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>kex</entry>
-         <entry>
-          List of key exchange methods to advertise, comma separated
-          in order of preference.
-         </entry>
-         <entry>
-          <literal>diffie-hellman-group1-sha1</literal>,
-          <literal>diffie-hellman-group14-sha1</literal>, and
-          <literal>diffie-hellman-group-exchange-sha1</literal>
-         </entry>
-        </row>
-        <row>
-         <entry>hostkey</entry>
-         <entry>
-          List of hostkey methods to advertise, comma separated
-          in order of preference.
-         </entry>
-         <entry>
-          <literal>ssh-rsa</literal> and
-          <literal>ssh-dss</literal>
-         </entry>
-        </row>
-        <row>
-         <entry>client_to_server</entry>
-         <entry>
-          Associative array containing crypt, compression, and
-          message authentication code (MAC) method preferences
-          for messages sent from client to server.
-         </entry>
-         <entry/>
-        </row>
-        <row>
-         <entry>server_to_client</entry>
-         <entry>
-          Associative array containing crypt, compression, and
-          message authentication code (MAC) method preferences
-          for messages sent from server to client.
-         </entry>
-         <entry/>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-     <simpara>
-      * - Supported Values are dependent on methods supported by underlying library.
-      See <link xlink:href="&url.libssh2;">libssh2</link> documentation for additional
-      information.
-     </simpara>
-     <table>
-      <title>
-       <parameter>client_to_server</parameter> and
-       <parameter>server_to_client</parameter> may be an associative array
-       with any or all of the following parameters.
-      </title>
-      <tgroup cols="3">
-       <thead>
-        <row>
-         <entry>Index</entry>
-         <entry>Meaning</entry>
-         <entry>Supported Values*</entry>
-        </row>
-       </thead>
-       <tbody>
-        <row>
-         <entry>crypt</entry>
-         <entry>List of crypto methods to advertise, comma separated
-          in order of preference.</entry>
-         <entry>
-          <literal>rijndael-cbc@lysator.liu.se</literal>,
-          <literal>aes256-cbc</literal>,
-          <literal>aes192-cbc</literal>,
-          <literal>aes128-cbc</literal>,
-          <literal>3des-cbc</literal>,
-          <literal>blowfish-cbc</literal>,
-          <literal>cast128-cbc</literal>,
-          <literal>arcfour</literal>, and
-          <literal>none**</literal>
-         </entry>
-        </row>
-        <row>
-         <entry>comp</entry>
-         <entry>List of compression methods to advertise, comma separated
-          in order of preference.</entry>
-         <entry>
-          <literal>zlib</literal> and
-          <literal>none</literal>
-         </entry>
-        </row>
-        <row>
-         <entry>mac</entry>
-         <entry>List of MAC methods to advertise, comma separated
-          in order of preference.</entry>
-         <entry>
-          <literal>hmac-sha1</literal>,
-          <literal>hmac-sha1-96</literal>,
-          <literal>hmac-ripemd160</literal>,
-          <literal>hmac-ripemd160@openssh.com</literal>, and
-          <literal>none**</literal>
-         </entry>
-        </row>
-       </tbody>
-      </tgroup>
-     </table>
-     <note>
-      <title>Crypt and MAC method "<literal>none</literal>"</title>
-      <simpara>
-       For security reasons, <literal>none</literal> is disabled by the underlying
-       <link xlink:href="&url.libssh2;">libssh2</link> library unless explicitly enabled
-       during build time by using the appropriate ./configure options.  See documentation
-       for the underlying library for more information.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callbacks</parameter></term>
-    <listitem>
-     <para>
-      <parameter>callbacks</parameter> may be an associative array with any
-      or all of the following parameters.
-      <table>
-       <title>
-        Callbacks parameters
-       </title>
-       <tgroup cols="3">
-        <thead>
-         <row>
-          <entry>Index</entry>
-          <entry>Meaning</entry>
-          <entry>Prototype</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>ignore</entry>
-          <entry>
-           Name of function to call when an
-           <constant>SSH2_MSG_IGNORE</constant> packet is received
-          </entry>
-          <entry>void ignore_cb($message)</entry>
-         </row>
-         <row>
-          <entry>debug</entry>
-          <entry>
-           Name of function to call when an
-           <constant>SSH2_MSG_DEBUG</constant> packet is received
-          </entry>
-          <entry>void debug_cb($message, $language, $always_display)</entry>
-         </row>
-         <row>
-          <entry>macerror</entry>
-          <entry>
-           Name of function to call when a packet is received but the
-           message authentication code failed.  If the callback returns
-           &true;, the mismatch will be ignored, otherwise the connection
-           will be terminated.
-          </entry>
-          <entry>bool macerror_cb($packet)</entry>
-         </row>
-         <row>
-          <entry>disconnect</entry>
-          <entry>
-           Name of function to call when an
-           <constant>SSH2_MSG_DISCONNECT</constant> packet is received
-          </entry>
-          <entry>void disconnect_cb($reason, $message, $language)</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a resource on success, or &false; on error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>ssh2_connect</function> example</title>
-   <simpara>
-    Open a connection forcing 3des-cbc when sending packets, any strength
-    aes cipher when receiving packets, no compression in either direction,
-    and Group1 key exchange.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Notify the user if the server terminates the connection */
-function my_ssh_disconnect($reason, $message, $language) {
-  printf("Server disconnected with reason code [%d] and message: %s\n",
-         $reason, $message);
-}
-
-$methods = array(
-  'kex' => 'diffie-hellman-group1-sha1',
-  'client_to_server' => array(
-    'crypt' => '3des-cbc',
-    'comp' => 'none'),
-  'server_to_client' => array(
-    'crypt' => 'aes256-cbc,aes192-cbc,aes128-cbc',
-    'comp' => 'none'));
-
-$callbacks = array('disconnect' => 'my_ssh_disconnect');
-
-$connection = ssh2_connect('shell.example.com', 22, $methods, $callbacks);
-if (!$connection) die('Connection failed');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_fingerprint</function></member>
-   <member><function>ssh2_auth_none</function></member>
-   <member><function>ssh2_auth_password</function></member>
-   <member><function>ssh2_auth_pubkey</function></member>
-   <member><function>ssh2_auth_pubkey_file</function></member>
-   <member><function>ssh2_disconnect</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/ssh2/functions/ssh2-disconnect.xml b/reference/ssh2/functions/ssh2-disconnect.xml
deleted file mode 100644
index 71ca2cfcd979..000000000000
--- a/reference/ssh2/functions/ssh2-disconnect.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-disconnect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_disconnect</refname>
-  <refpurpose>Close a connection to a remote SSH server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>ssh2_disconnect</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Close a connection to a remote SSH server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-       An SSH connection link identifier, obtained from a call to
-       <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-exec.xml b/reference/ssh2/functions/ssh2-exec.xml
deleted file mode 100644
index 10068837fa8a..000000000000
--- a/reference/ssh2/functions/ssh2-exec.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-exec">
- <refnamediv>
-  <refname>ssh2_exec</refname>
-  <refpurpose>Execute a command on a remote server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_exec</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>pty</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>env</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width</parameter><initializer>80</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>height</parameter><initializer>25</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width_height_type</parameter><initializer>SSH2_TERM_UNIT_CHARS</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Execute a command at the remote end and allocate a channel for it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pty</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>env</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>env</parameter> may be passed as an associative array of
-      name/value pairs to set in the target environment.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Width of the virtual terminal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Height of the virtual terminal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width_height_type</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>width_height_type</parameter> should be one of
-      <constant>SSH2_TERM_UNIT_CHARS</constant> or
-      <constant>SSH2_TERM_UNIT_PIXELS</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a stream on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Executing a command</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$stream = ssh2_exec($connection, '/usr/local/bin/php -i');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_connect</function></member>
-   <member><function>ssh2_shell</function></member>
-   <member><function>ssh2_tunnel</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/ssh2/functions/ssh2-fetch-stream.xml b/reference/ssh2/functions/ssh2-fetch-stream.xml
deleted file mode 100644
index 0a7f07fb5b91..000000000000
--- a/reference/ssh2/functions/ssh2-fetch-stream.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-fetch-stream">
- <refnamediv>
-  <refname>ssh2_fetch_stream</refname>
-  <refpurpose>Fetch an extended data stream</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ssh2_fetch_stream</methodname>
-   <methodparam><type>resource</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>streamid</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Fetches an alternate substream associated with an SSH2 channel stream.
-   The SSH2 protocol currently defines only one substream, STDERR, which has
-   a substream ID of <constant>SSH2_STREAM_STDERR</constant> (defined as 1).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>streamid</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 channel stream.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the requested stream resource.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Opening a shell and retrieving the stderr stream associated with it</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$stdio_stream = ssh2_shell($connection);
-$stderr_stream = ssh2_fetch_stream($stdio_stream, SSH2_STREAM_STDERR);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_shell</function></member>
-   <member><function>ssh2_exec</function></member>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-fingerprint.xml b/reference/ssh2/functions/ssh2-fingerprint.xml
deleted file mode 100644
index 09f0f3c9ed8d..000000000000
--- a/reference/ssh2/functions/ssh2-fingerprint.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-fingerprint">
- <refnamediv>
-  <refname>ssh2_fingerprint</refname>
-  <refpurpose>Retrieve fingerprint of remote server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>ssh2_fingerprint</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>SSH2_FINGERPRINT_MD5 | SSH2_FINGERPRINT_HEX</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a server hostkey hash from an active session.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>flags</parameter> may be either of
-      <constant>SSH2_FINGERPRINT_MD5</constant> or
-      <constant>SSH2_FINGERPRINT_SHA1</constant> logically ORed with
-      <constant>SSH2_FINGERPRINT_HEX</constant> or
-      <constant>SSH2_FINGERPRINT_RAW</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the hostkey hash as a string.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Checking the fingerprint against a known value</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$known_host = '6F89C2F0A719B30CC38ABDF90755F2E4';
-
-$connection = ssh2_connect('shell.example.com', 22);
-
-$fingerprint = ssh2_fingerprint($connection,
-               SSH2_FINGERPRINT_MD5 | SSH2_FINGERPRINT_HEX);
-
-if ($fingerprint != $known_host) {
-  die("HOSTKEY MISMATCH!\n" .
-      "Possible Man-In-The-Middle Attack?");
-}
-?>
-]]>
-   </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/ssh2/functions/ssh2-forward-accept.xml b/reference/ssh2/functions/ssh2-forward-accept.xml
deleted file mode 100644
index ad1fa84c802d..000000000000
--- a/reference/ssh2/functions/ssh2-forward-accept.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-forward-accept">
- <refnamediv>
-  <refname>ssh2_forward_accept</refname>
-  <refpurpose>Accept a connection created by a listener</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_forward_accept</methodname>
-   <methodparam><type>resource</type><parameter>listener</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Accepts a connection created by a listener.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>desc</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 Listener resource, obtained from a call to <function>ssh2_forward_listen</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a stream resource, &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ssh2/functions/ssh2-forward-listen.xml b/reference/ssh2/functions/ssh2-forward-listen.xml
deleted file mode 100644
index 17eca78e274d..000000000000
--- a/reference/ssh2/functions/ssh2-forward-listen.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-forward-listen">
- <refnamediv>
-  <refname>ssh2_forward_listen</refname>
-  <refpurpose>Bind a port on the remote server and listen for connections</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_forward_listen</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>max_connections</parameter><initializer>16</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Binds a port on the remote server and listen for connections.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH Session resource, obtained from a call to <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-      The port of the remote server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_connections</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an SSH2 Listener, &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_forward_accept</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/ssh2/functions/ssh2-keepalive-config.xml b/reference/ssh2/functions/ssh2-keepalive-config.xml
deleted file mode 100644
index 62bce7d002ce..000000000000
--- a/reference/ssh2/functions/ssh2-keepalive-config.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-keepalive-config" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_keepalive_config</refname>
-  <refpurpose>Configure how often keepalive messages should be sent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ssh2_keepalive_config</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>want_reply</parameter></methodparam>
-   <methodparam><type>int</type><parameter>interval</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Configures how often keepalive messages are sent on the given
-   <parameter>session</parameter>, and whether the server is asked to reply to
-   them.
-  </simpara>
-  <simpara>
-   Keepalive messages are not sent automatically. Once configured,
-   <function>ssh2_keepalive_send</function> must be called to actually send a
-   keepalive message.
-  </simpara>
-  <note>
-   <simpara>
-    This function is only available when the extension is built against a
-    libssh2 version providing keepalive support.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>want_reply</parameter></term>
-    <listitem>
-     <simpara>
-      Whether the server is requested to reply to keepalive messages.
-      Requesting a reply makes an unresponsive server detectable, at the cost
-      of some extra traffic.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>interval</parameter></term>
-    <listitem>
-     <simpara>
-      The number of seconds that may pass without any traffic before a
-      keepalive message should be sent. A value of <literal>0</literal>
-      disables keepalive messages, and a value of <literal>1</literal> is
-      treated as <literal>2</literal> by the underlying library.
-     </simpara>
-     <simpara>
-      Accepted values range from <literal>0</literal> to
-      <literal>4294967295</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An <constant>E_WARNING</constant> is emitted when
-   <parameter>interval</parameter> is outside the accepted range, in which
-   case the keepalive configuration is left unchanged.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Sending keepalive messages</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-// Ask the server to reply, after 30 seconds without any traffic
-ssh2_keepalive_config($connection, true, 30);
-
-// Keepalive messages are only sent when this function is called
-ssh2_keepalive_send($connection);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_keepalive_send</function></member>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-keepalive-send.xml b/reference/ssh2/functions/ssh2-keepalive-send.xml
deleted file mode 100644
index 1d33d312b31b..000000000000
--- a/reference/ssh2/functions/ssh2-keepalive-send.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-keepalive-send" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_keepalive_send</refname>
-  <refpurpose>Send a keepalive message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>int</type><type>false</type></type><methodname>ssh2_keepalive_send</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends a keepalive message on the given <parameter>session</parameter>,
-   according to the configuration set with
-   <function>ssh2_keepalive_config</function>.
-  </simpara>
-  <note>
-   <simpara>
-    This function is only available when the extension is built against a
-    libssh2 version providing keepalive support.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of seconds that may pass before another keepalive message
-   must be sent, or &false; on failure. <literal>0</literal> is returned when
-   keepalive messages are disabled.
-  </simpara>
-  <simpara>
-   Since <literal>0</literal> and &false; are both falsy, the
-   <literal>===</literal> operator has to be used to tell them apart.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Sending a keepalive message</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-ssh2_keepalive_config($connection, true, 30);
-
-$seconds = ssh2_keepalive_send($connection);
-
-if ($seconds === false) {
-    echo "The keepalive message could not be sent", PHP_EOL;
-} elseif ($seconds === 0) {
-    echo "Keepalive messages are disabled", PHP_EOL;
-} else {
-    echo "Next keepalive message due in $seconds seconds", PHP_EOL;
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_keepalive_config</function></member>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-methods-negotiated.xml b/reference/ssh2/functions/ssh2-methods-negotiated.xml
deleted file mode 100644
index ffa7cb10dafc..000000000000
--- a/reference/ssh2/functions/ssh2-methods-negotiated.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-methods-negotiated">
- <refnamediv>
-  <refname>ssh2_methods_negotiated</refname>
-  <refpurpose>Return list of negotiated methods</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ssh2_methods_negotiated</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns list of negotiated methods.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Determining what methods were negotiated</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-$methods = ssh2_methods_negotiated($connection);
-
-echo "Encryption keys were negotiated using: {$methods['kex']}\n";
-echo "Server identified using an {$methods['hostkey']} with ";
-echo "fingerprint: " . ssh2_fingerprint($connection) . "\n";
-
-echo "Client to Server packets will use methods:\n";
-echo "\tCrypt: {$methods['client_to_server']['crypt']}\n";
-echo "\tComp: {$methods['client_to_server']['comp']}\n";
-echo "\tMAC: {$methods['client_to_server']['mac']}\n";
-
-echo "Server to Client packets will use methods:\n";
-echo "\tCrypt: {$methods['server_to_client']['crypt']}\n";
-echo "\tComp: {$methods['server_to_client']['comp']}\n";
-echo "\tMAC: {$methods['server_to_client']['mac']}\n";
-
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-poll.xml b/reference/ssh2/functions/ssh2-poll.xml
deleted file mode 100644
index 16a3ee8b161c..000000000000
--- a/reference/ssh2/functions/ssh2-poll.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.ssh2-poll">
- <refnamediv>
-  <refname>ssh2_poll</refname>
-  <refpurpose>Poll the channels/listeners/streams for events</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>ssh2_poll</methodname>
-   <methodparam><type>array</type><parameter role="reference">desc</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>30</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Polls the channels/listeners/streams for events,
-   and returns the number of descriptors which returned non-zero revents.
-  </simpara>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>desc</parameter></term>
-    <listitem>
-     <simpara>
-      An indexed array of subarrays with the keys
-      <literal>'resource'</literal> and <literal>'events'</literal>.
-      The value of the resource is a (channel) stream or an SSH2 Listener resource.
-      The value of the event are SSH2_POLL* flags bitwise ORed together.
-      Each subarray will be populated with an <literal>'revents'</literal> element on return,
-      whose values are SSH2_POLL* flags bitwise ORed together of the events that occurred.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      The timeout in seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the number of descriptors which returned non-zero revents.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ssh2/functions/ssh2-publickey-add.xml b/reference/ssh2/functions/ssh2-publickey-add.xml
deleted file mode 100644
index 0b279afcef70..000000000000
--- a/reference/ssh2/functions/ssh2-publickey-add.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-publickey-add">
- <refnamediv>
-  <refname>ssh2_publickey_add</refname>
-  <refpurpose>
-   Add an authorized publickey
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_publickey_add</methodname>
-   <methodparam><type>resource</type><parameter>pkey</parameter></methodparam>
-   <methodparam><type>string</type><parameter>algoname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blob</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>overwrite</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>attributes</parameter></methodparam>
-  </methodsynopsis>
-
-  &note.ssh2.subsystem.publickey;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pkey</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey Subsystem resource created by <function>ssh2_publickey_init</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>algoname</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey algorithm (e.g.): ssh-dss, ssh-rsa
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blob</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey blob as raw binary data
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>overwrite</parameter></term>
-    <listitem>
-     <simpara>
-      If the specified key already exists, should it be overwritten?
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>attributes</parameter></term>
-    <listitem>
-     <simpara>
-      Associative array of attributes to assign to this public key.
-      Refer to ietf-secsh-publickey-subsystem for a list of supported attributes.
-      To mark an attribute as mandatory, precede its name with an asterisk.
-      If the server is unable to support an attribute marked mandatory,
-      it will abort the add process.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Adding a publickey with <function>ssh2_publickey_add</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ssh2 = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($ssh2, 'jdoe', 'password');
-$pkey = ssh2_publickey_init($ssh2);
-
-$keyblob = base64_decode('
-AAAAB3NzaC1yc2EAAAABIwAAAIEA5HVt6VqSGd5PTrLRdjNONxXH1tVFGn0
-Bd26BF0aCP9qyJRlvdJ3j4WBeX4ZmrveGrjMgkseSYc4xZ26sDHwfL351xj
-zaLpipu\BGRrw17mWVBhuCExo476ri5tQFzbTc54VEHYckxQ16CjSTibI5X
-69GmnYC9PNqEYq/1TP+HF10=');
-
-ssh2_publickey_add($pkey, 'ssh-rsa', $keyblob, false, array('comment'=>"John's Key"));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_publickey_init</function></member>
-   <member><function>ssh2_publickey_remove</function></member>
-   <member><function>ssh2_publickey_list</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/ssh2/functions/ssh2-publickey-init.xml b/reference/ssh2/functions/ssh2-publickey-init.xml
deleted file mode 100644
index 88add4ed5f1b..000000000000
--- a/reference/ssh2/functions/ssh2-publickey-init.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-publickey-init">
- <refnamediv>
-  <refname>ssh2_publickey_init</refname>
-  <refpurpose>
-   Initialize Publickey subsystem
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_publickey_init</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Request the Publickey subsystem from an already connected SSH2 server.
-  </simpara>
-  <simpara>
-   The publickey subsystem allows an already connected and authenticated
-   client to manage the list of authorized public keys stored on the
-   target server in an implementation agnostic manner.
-   If the remote server does not support the publickey subsystem,
-   the <function>ssh2_publickey_init</function> function will return &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <literal>SSH2 Publickey Subsystem</literal> resource for use
-   with all other ssh2_publickey_*() methods&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.ssh2.subsystem.publickey;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_publickey_add</function></member>
-   <member><function>ssh2_publickey_remove</function></member>
-   <member><function>ssh2_publickey_list</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/ssh2/functions/ssh2-publickey-list.xml b/reference/ssh2/functions/ssh2-publickey-list.xml
deleted file mode 100644
index d2bf0f985b55..000000000000
--- a/reference/ssh2/functions/ssh2-publickey-list.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-publickey-list">
- <refnamediv>
-  <refname>ssh2_publickey_list</refname>
-  <refpurpose>
-   List currently authorized publickeys
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>ssh2_publickey_list</methodname>
-   <methodparam><type>resource</type><parameter>pkey</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   List currently authorized publickeys.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pkey</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey Subsystem resource
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a numerically indexed array of keys,
-   each of which is an associative array containing:
-   name, blob, and attrs elements.
-  </simpara>
-  <table>
-   <title>Publickey elements</title>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>Array Key</entry>
-      <entry>Meaning</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>name</entry>
-      <entry>Name of algorithm used by this publickey, for example:
-      <literal>ssh-dss</literal> or <literal>ssh-rsa</literal>.</entry>
-     </row>
-     <row>
-      <entry>blob</entry>
-      <entry>Publickey blob as raw binary data.</entry>
-     </row>
-     <row>
-      <entry>attrs</entry>
-      <entry>Attributes assigned to this publickey. The most common
-      attribute, and the only one supported by publickey version 1
-      servers, is <literal>comment</literal>, which may be any freeform
-      string.</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Listing authorized keys with <function>ssh2_publickey_list</function></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ssh2 = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($ssh2, 'jdoe', 'secret');
-$pkey = ssh2_publickey_init($ssh2);
-
-$list = ssh2_publickey_list($pkey);
-
-foreach($list as $key) {
-  echo "Key: {$key['name']}\n";
-  echo "Blob: " . chunk_split(base64_encode($key['blob']), 40, "\n") . "\n";
-  echo "Comment: {$key['attrs']['comment']}\n\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Key: ssh-rsa
-Blob: AAAAB3NzaC1yc2EAAAABIwAAAIEA5HVt6VqSGd5P
-TrLRdjNONxXH1tVFGn0Bd26BF0aCP9qyJRlvdJ3j
-4WBeX4ZmrveGrjMgkseSYc4xZ26sDHwfL351xjza
-Lpipu\BGRrw17mWVBhuCExo476ri5tQFzbTc54VE
-HYckxQ16CjSTibI5X69GmnYC9PNqEYq/1TP+HF10
-Comment: John's Key
-
-Key: ssh-rsa
-Blob: AAAAB3NzaHVt6VqSGd5C1yc2EAAAABIwA232dnJA
-AIEA5HVt6VqSGd5PTrLRdjNONxX/1TP+HF1HVt6V
-qSGd50H1tVFGn0BB3NzaC1yc2EAd26BF0aCP9qyJ
-RlvdJ3j4WBeX4ZmrveGrjMgkseSYc4xZ26HVt6Vq
-SGd5sDHwfL351xjzaLpipu\BGB3NzaC1yc2EA/1T
-Comment: Alice's Key
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.ssh2.subsystem.publickey;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_publickey_init</function></member>
-   <member><function>ssh2_publickey_add</function></member>
-   <member><function>ssh2_publickey_remove</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/ssh2/functions/ssh2-publickey-remove.xml b/reference/ssh2/functions/ssh2-publickey-remove.xml
deleted file mode 100644
index 317083d28595..000000000000
--- a/reference/ssh2/functions/ssh2-publickey-remove.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-publickey-remove">
- <refnamediv>
-  <refname>ssh2_publickey_remove</refname>
-  <refpurpose>
-   Remove an authorized publickey
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_publickey_remove</methodname>
-   <methodparam><type>resource</type><parameter>pkey</parameter></methodparam>
-   <methodparam><type>string</type><parameter>algoname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>blob</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes an authorized publickey.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pkey</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey Subsystem Resource
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>algoname</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey algorithm (e.g.): ssh-dss, ssh-rsa
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>blob</parameter></term>
-    <listitem>
-     <simpara>
-      Publickey blob as raw binary data
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &note.ssh2.subsystem.publickey;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_publickey_init</function></member>
-   <member><function>ssh2_publickey_add</function></member>
-   <member><function>ssh2_publickey_list</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/ssh2/functions/ssh2-scp-recv.xml b/reference/ssh2/functions/ssh2-scp-recv.xml
deleted file mode 100644
index eb42d23f0127..000000000000
--- a/reference/ssh2/functions/ssh2-scp-recv.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-scp-recv">
- <refnamediv>
-  <refname>ssh2_scp_recv</refname>
-  <refpurpose>Request a file via SCP</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_scp_recv</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Copy a file from the remote server to the local filesystem using the SCP protocol.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>remote_file</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the remote file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>local_file</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the local file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Downloading a file via SCP</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-ssh2_scp_recv($connection, '/remote/filename', '/local/filename');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_scp_send</function></member>
-   <member><function>copy</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/ssh2/functions/ssh2-scp-send.xml b/reference/ssh2/functions/ssh2-scp-send.xml
deleted file mode 100644
index 210294f1a1db..000000000000
--- a/reference/ssh2/functions/ssh2-scp-send.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-scp-send">
- <refnamediv>
-  <refname>ssh2_scp_send</refname>
-  <refpurpose>Send a file via SCP</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_scp_send</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>local_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>remote_file</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>create_mode</parameter><initializer>0644</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Copy a file from the local filesystem to the remote server using the SCP protocol.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>local_file</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the local file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>remote_file</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the remote file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>create_mode</parameter></term>
-    <listitem>
-     <simpara>
-      The file will be created with the mode specified by
-      <parameter>create_mode</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Uploading a file via SCP</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-ssh2_scp_send($connection, '/local/filename', '/remote/filename', 0644);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_scp_recv</function></member>
-   <member><function>copy</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/ssh2/functions/ssh2-send-eof.xml b/reference/ssh2/functions/ssh2-send-eof.xml
deleted file mode 100644
index 3cdff6f60dea..000000000000
--- a/reference/ssh2/functions/ssh2-send-eof.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-send-eof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_send_eof</refname>
-  <refpurpose>Send EOF to stream</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>ssh2_send_eof</methodname>
-   <methodparam><type>resource</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends an EOF to the stream; this is typically used to close standard input,
-   while keeping output and error alive. For example, one can send a remote
-   process some data over standard input, close it to start processing, and
-   still be able to read out the results without creating additional files.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH stream; can be acquired through functions like <function>ssh2_fetch_stream</function>
-      or <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_fetch_stream</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/ssh2/functions/ssh2-send-signal.xml b/reference/ssh2/functions/ssh2-send-signal.xml
deleted file mode 100644
index d907bbc072a1..000000000000
--- a/reference/ssh2/functions/ssh2-send-signal.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-send-signal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_send_signal</refname>
-  <refpurpose>Send a signal to a remote process</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_send_signal</methodname>
-   <methodparam><type>resource</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>string</type><parameter>signal</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends a signal to the process running at the remote end of the given
-   <parameter>channel</parameter>.
-  </simpara>
-  <note>
-   <simpara>
-    This function is only available when the extension is built against
-    libssh2 &gt;= 1.9.0.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH channel stream, as returned by <function>ssh2_exec</function> or
-      <function>ssh2_shell</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signal</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the signal to send, without the <literal>SIG</literal>
-      prefix, as defined by the SSH connection protocol
-      (<link xlink:href="&url.rfc;4254">RFC 4254</link>); for
-      example <literal>TERM</literal>, <literal>KILL</literal> or
-      <literal>INT</literal>.
-     </simpara>
-     <simpara>
-      The value is forwarded to the server as is; it is not validated
-      against the names listed by the protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An <constant>E_WARNING</constant> is emitted when
-   <parameter>channel</parameter> is not an SSH channel stream, and when the
-   signal could not be sent.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Interrupting a remote command</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$stream = ssh2_exec($connection, 'trap "echo interrupted" INT; sleep 60');
-
-ssh2_send_signal($stream, 'INT');
-
-stream_set_blocking($stream, true);
-echo stream_get_contents($stream);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_exec</function></member>
-   <member><function>ssh2_shell</function></member>
-   <member><function>ssh2_send_eof</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/ssh2/functions/ssh2-set-timeout.xml b/reference/ssh2/functions/ssh2-set-timeout.xml
deleted file mode 100644
index b90e8ec905d0..000000000000
--- a/reference/ssh2/functions/ssh2-set-timeout.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-set-timeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_set_timeout</refname>
-  <refpurpose>Set the timeout for blocking operations on a session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>ssh2_set_timeout</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets how long a blocking operation on the given
-   <parameter>session</parameter> may wait before it is considered to have
-   timed out.
-  </simpara>
-  <simpara>
-   When the resulting timeout is <literal>0</literal>, which is the default,
-   no timeout is applied and blocking operations may wait indefinitely.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>seconds</parameter></term>
-    <listitem>
-     <simpara>
-      The timeout, in seconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>microseconds</parameter></term>
-    <listitem>
-     <simpara>
-      An additional number of microseconds added to the timeout. The
-      underlying library only supports millisecond precision, so this value
-      is rounded up to the next whole millisecond.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Limiting how long blocking operations may wait</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-
-// Give up on blocking operations after 5.5 seconds
-ssh2_set_timeout($connection, 5, 500000);
-
-ssh2_auth_password($connection, 'username', 'password');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_connect</function></member>
-   <member><function>ssh2_keepalive_config</function></member>
-   <member><function>stream_set_timeout</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/ssh2/functions/ssh2-sftp-chmod.xml b/reference/ssh2/functions/ssh2-sftp-chmod.xml
deleted file mode 100644
index 2c4c01644b4d..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-chmod.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-chmod">
- <refnamediv>
-  <refname>ssh2_sftp_chmod</refname>
-  <refpurpose>Changes file mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_chmod</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Attempts to change the mode of the specified file to that given in
-   <parameter>mode</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-      Permissions on the file. See the <function>chmod</function> for more details on this parameter.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Changing the mode of a file on a remote server</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_chmod($sftp, '/somedir/somefile', 0755);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>chmod</function></member>
-   <member><function>ssh2_sftp</function></member>
-   <member><function>ssh2_connect</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/ssh2/functions/ssh2-sftp-lstat.xml b/reference/ssh2/functions/ssh2-sftp-lstat.xml
deleted file mode 100644
index c4543a9ad51f..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-lstat.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-lstat" xmlns="http://docbook.org/ns/docbook" >
- <refnamediv>
-  <refname>ssh2_sftp_lstat</refname>
-  <refpurpose>Stat a symbolic link</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>ssh2_sftp_lstat</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stats a symbolic link on the remote filesystem <emphasis>without</emphasis>
-   following the link.
-  </simpara>
-  <simpara>
-   This function is similar to using the <function>lstat</function> function
-   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper
-   and returns the same values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path to the remote symbolic link.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of statistics for the given symbolic link on success&return.falseforfailure;.
-   See the documentation for <function>stat</function> for details on the
-   values which may be returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Stating a symbolic link via SFTP</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$sftp = ssh2_sftp($connection);
-$statinfo = ssh2_sftp_lstat($sftp, '/path/to/symlink');
-
-$filesize = $statinfo['size'];
-$group = $statinfo['gid'];
-$owner = $statinfo['uid'];
-$atime = $statinfo['atime'];
-$mtime = $statinfo['mtime'];
-$mode = $statinfo['mode'];
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_sftp_stat</function></member>
-   <member><function>lstat</function></member>
-   <member><function>stat</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/ssh2/functions/ssh2-sftp-mkdir.xml b/reference/ssh2/functions/ssh2-sftp-mkdir.xml
deleted file mode 100644
index 403c19e0951d..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-mkdir.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-mkdir">
- <refnamediv>
-  <refname>ssh2_sftp_mkdir</refname>
-  <refpurpose>Create a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_mkdir</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dirname</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0777</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a directory on the remote file server with permissions set to
-   <parameter>mode</parameter>.
-  </simpara>
-  <simpara>
-   This function is similar to using <function>mkdir</function> with the
-   <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dirname</parameter></term>
-    <listitem>
-     <simpara>
-      Path of the new directory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <simpara>
-      Permissions on the new directory.
-      The actual mode is affected by the current umask.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recursive</parameter></term>
-    <listitem>
-     <simpara>
-      If <parameter>recursive</parameter> is &true; any parent directories
-      required for <parameter>dirname</parameter> will be automatically created as well.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Creating a directory on a remote server</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_mkdir($sftp, '/home/username/newdir');
-/* Or:  mkdir("ssh2.sftp://$sftp/home/username/newdir"); */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>mkdir</function></member>
-   <member><function>ssh2_sftp_rmdir</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/ssh2/functions/ssh2-sftp-readlink.xml b/reference/ssh2/functions/ssh2-sftp-readlink.xml
deleted file mode 100644
index 6f66e16929a4..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-readlink.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-readlink" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ssh2_sftp_readlink</refname>
-  <refpurpose>Return the target of a symbolic link</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>ssh2_sftp_readlink</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the target of a symbolic link.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>link</parameter></term>
-    <listitem>
-     <simpara>
-      Path of the symbolic link.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the target of the symbolic <parameter>link</parameter>&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Reading a symbolic link</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-$target = ssh2_sftp_readlink($sftp, '/tmp/mysql.sock');
-/* $target is now (e.g.): '/var/run/mysql.sock' */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>readlink</function></member>
-   <member><function>ssh2_sftp_symlink</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/ssh2/functions/ssh2-sftp-realpath.xml b/reference/ssh2/functions/ssh2-sftp-realpath.xml
deleted file mode 100644
index cf75d3b0041b..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-realpath.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-realpath" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ssh2_sftp_realpath</refname>
-  <refpurpose>Resolve the realpath of a provided path string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>ssh2_sftp_realpath</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Translates <parameter>filename</parameter> into the effective real path
-   on the remote filesystem.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the real path as a string&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Resolving a pathname</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-$realpath = ssh2_sftp_realpath($sftp, '/home/username/../../../..//./usr/../etc/passwd');
-/* $realpath is now: '/etc/passwd' */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>realpath</function></member>
-   <member><function>ssh2_sftp_symlink</function></member>
-   <member><function>ssh2_sftp_readlink</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/ssh2/functions/ssh2-sftp-rename.xml b/reference/ssh2/functions/ssh2-sftp-rename.xml
deleted file mode 100644
index e0b4f4109777..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-rename.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.ssh2-sftp-rename">
- <refnamediv>
-  <refname>ssh2_sftp_rename</refname>
-  <refpurpose>Rename a remote file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_rename</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>from</parameter></methodparam>
-   <methodparam><type>string</type><parameter>to</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Renames a file on the remote filesystem.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <simpara>
-      The current file that is being renamed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to</parameter></term>
-    <listitem>
-     <simpara>
-      The new file name that replaces <parameter>from</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Renaming a file via sftp</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_rename($sftp, '/home/username/oldname', '/home/username/newname');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rename</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/ssh2/functions/ssh2-sftp-rmdir.xml b/reference/ssh2/functions/ssh2-sftp-rmdir.xml
deleted file mode 100644
index efb33884bbe6..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-rmdir.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-rmdir">
- <refnamediv>
-  <refname>ssh2_sftp_rmdir</refname>
-  <refpurpose>Remove a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_rmdir</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dirname</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes a directory from the remote file server.
-  </simpara>
-  <simpara>
-   This function is similar to using <function>rmdir</function> with the
-   <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dirname</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Removing a directory on a remote server</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_rmdir($sftp, '/home/username/deltodel');
-/* Or:  rmdir("ssh2.sftp://$sftp/home/username/dirtodel"); */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>rmdir</function></member>
-   <member><function>ssh2_sftp_mkdir</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/ssh2/functions/ssh2-sftp-stat.xml b/reference/ssh2/functions/ssh2-sftp-stat.xml
deleted file mode 100644
index 7c42d5c41028..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-stat.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-sftp-stat" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>ssh2_sftp_stat</refname>
-  <refpurpose>Stat a file on a remote filesystem</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>ssh2_sftp_stat</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stats a file on the remote filesystem following any symbolic links.
-  </simpara>
-  <simpara>
-   This function is similar to using the <function>stat</function> function
-   with the <link linkend="wrappers.ssh2">ssh2.sftp://</link> wrapper
-   and returns the same values.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-      <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of statistics for the given file on success&return.falseforfailure;.
-   See the documentation for <function>stat</function> for details on the
-   values which may be returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Stating a file via SFTP</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$sftp = ssh2_sftp($connection);
-$statinfo = ssh2_sftp_stat($sftp, '/path/to/file');
-
-$filesize = $statinfo['size'];
-$group = $statinfo['gid'];
-$owner = $statinfo['uid'];
-$atime = $statinfo['atime'];
-$mtime = $statinfo['mtime'];
-$mode = $statinfo['mode'];
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_sftp_lstat</function></member>
-   <member><function>lstat</function></member>
-   <member><function>stat</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/ssh2/functions/ssh2-sftp-symlink.xml b/reference/ssh2/functions/ssh2-sftp-symlink.xml
deleted file mode 100644
index 347381b91925..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-symlink.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-symlink">
- <refnamediv>
-  <refname>ssh2_sftp_symlink</refname>
-  <refpurpose>Create a symlink</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_symlink</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>target</parameter></methodparam>
-   <methodparam><type>string</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a symbolic link named <parameter>link</parameter> on the remote
-   filesystem pointing to <parameter>target</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>target</parameter></term>
-    <listitem>
-     <simpara>
-      Target of the symbolic link.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>link</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Creating a symbolic link</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_symlink($sftp, '/var/run/mysql.sock', '/tmp/mysql.sock');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_sftp_readlink</function></member>
-   <member><function>symlink</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/ssh2/functions/ssh2-sftp-unlink.xml b/reference/ssh2/functions/ssh2-sftp-unlink.xml
deleted file mode 100644
index 18db544888dd..000000000000
--- a/reference/ssh2/functions/ssh2-sftp-unlink.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp-unlink">
- <refnamediv>
-  <refname>ssh2_sftp_unlink</refname>
-  <refpurpose>Delete a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_sftp_unlink</methodname>
-   <methodparam><type>resource</type><parameter>sftp</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Deletes a file on the remote filesystem.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sftp</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH2 SFTP resource opened by <function>ssh2_sftp</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Deleting a file</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-$sftp = ssh2_sftp($connection);
-
-ssh2_sftp_unlink($sftp, '/home/username/stale_file');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>unlink</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/ssh2/functions/ssh2-sftp.xml b/reference/ssh2/functions/ssh2-sftp.xml
deleted file mode 100644
index c985b63754c0..000000000000
--- a/reference/ssh2/functions/ssh2-sftp.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-sftp">
- <refnamediv>
-  <refname>ssh2_sftp</refname>
-  <refpurpose>Initialize SFTP subsystem</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_sftp</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Request the SFTP subsystem from an already connected SSH2 server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   This method returns an <literal>SSH2 SFTP</literal> resource for use with
-   all other ssh2_sftp_*() methods and the
-   <link linkend="wrappers.ssh2">ssh2.sftp://</link> fopen wrapper,
-   &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Opening a file via SFTP</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$sftp = ssh2_sftp($connection);
-
-$stream = fopen('ssh2.sftp://' . intval($sftp) . '/path/to/file', 'r');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_scp_recv</function></member>
-   <member><function>ssh2_scp_send</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/ssh2/functions/ssh2-shell-resize.xml b/reference/ssh2/functions/ssh2-shell-resize.xml
deleted file mode 100644
index f130a02a3ac4..000000000000
--- a/reference/ssh2/functions/ssh2-shell-resize.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.ssh2-shell-resize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ssh2_shell_resize</refname>
-  <refpurpose>Change the dimensions of a channel's pseudo-terminal</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>ssh2_shell_resize</methodname>
-   <methodparam><type>resource</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>int</type><parameter>width</parameter></methodparam>
-   <methodparam><type>int</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width_px</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>height_px</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Requests that the pseudo-terminal (PTY) attached to the given
-   <parameter>channel</parameter> be resized to the given dimensions.
-  </simpara>
-  <note>
-   <simpara>
-    The extension declares only the first three parameters, under the name
-    <literal>session</literal> for <parameter>channel</parameter>. As a
-    result, <parameter>width_px</parameter> and
-    <parameter>height_px</parameter> can only be passed positionally.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH channel stream, as returned by <function>ssh2_exec</function> or
-      <function>ssh2_shell</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      The width of the terminal, in characters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      The height of the terminal, in characters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width_px</parameter></term>
-    <listitem>
-     <simpara>
-      The width of the terminal in pixels, or <literal>0</literal> to leave
-      the pixel dimensions unspecified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height_px</parameter></term>
-    <listitem>
-     <simpara>
-      The height of the terminal in pixels, or <literal>0</literal> to leave
-      the pixel dimensions unspecified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true;, or &false; when <parameter>channel</parameter> is not an
-   SSH channel stream.
-  </simpara>
-  <simpara>
-   The outcome of the resize request itself is not reported: &true; is
-   returned even when the remote end does not honour it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An <constant>E_WARNING</constant> is emitted when
-   <parameter>channel</parameter> is not an SSH channel stream.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Resizing the pseudo-terminal of a shell</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$shell = ssh2_shell($connection, 'xterm', null, 80, 24);
-
-// Tell the remote end the terminal is now 132 columns by 43 rows
-ssh2_shell_resize($shell, 132, 43);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_shell</function></member>
-   <member><function>ssh2_exec</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/ssh2/functions/ssh2-shell.xml b/reference/ssh2/functions/ssh2-shell.xml
deleted file mode 100644
index 69368509243f..000000000000
--- a/reference/ssh2/functions/ssh2-shell.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.ssh2-shell">
- <refnamediv>
-  <refname>ssh2_shell</refname>
-  <refpurpose>Request an interactive shell</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>resource</type><type>false</type></type><methodname>ssh2_shell</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>termtype</parameter><initializer>"vanilla"</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>env</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width</parameter><initializer>80</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>height</parameter><initializer>25</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>width_height_type</parameter><initializer>SSH2_TERM_UNIT_CHARS</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Open a shell at the remote end and allocate a stream for it.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>termtype</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>termtype</parameter> should correspond to one of the
-      entries in the target system's <literal>/etc/termcap</literal> file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>env</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>env</parameter> may be passed as an associative array of
-      name/value pairs to set in the target environment.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <simpara>
-      Width of the virtual terminal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <simpara>
-      Height of the virtual terminal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width_height_type</parameter></term>
-    <listitem>
-     <simpara>
-      <parameter>width_height_type</parameter> should be one of
-      <constant>SSH2_TERM_UNIT_CHARS</constant> or
-      <constant>SSH2_TERM_UNIT_PIXELS</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a stream &resource; on success, &return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Requesting an interactive shell</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_password($connection, 'username', 'password');
-
-$stream = ssh2_shell($connection, 'vt102', null, 80, 24, SSH2_TERM_UNIT_CHARS);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_exec</function></member>
-   <member><function>ssh2_tunnel</function></member>
-   <member><function>ssh2_fetch_stream</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/ssh2/functions/ssh2-tunnel.xml b/reference/ssh2/functions/ssh2-tunnel.xml
deleted file mode 100644
index bf0b38ecaf6d..000000000000
--- a/reference/ssh2/functions/ssh2-tunnel.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.ssh2-tunnel">
- <refnamediv>
-  <refname>ssh2_tunnel</refname>
-  <refpurpose>Open a tunnel through a remote server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>ssh2_tunnel</methodname>
-   <methodparam><type>resource</type><parameter>session</parameter></methodparam>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Open a socket stream to an arbitrary host/port by way of the currently
-   connected SSH server.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>session</parameter></term>
-    <listitem>
-     <simpara>
-      An SSH connection link identifier, obtained from a call to
-      <function>ssh2_connect</function>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Opening a tunnel to an arbitrary host</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$connection = ssh2_connect('shell.example.com', 22);
-ssh2_auth_pubkey_file($connection, 'username', 'id_dsa.pub', 'id_dsa');
-
-$tunnel = ssh2_tunnel($connection, '10.0.0.101', 12345);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>ssh2_connect</function></member>
-   <member><function>fsockopen</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/ssh2/installation.xml b/reference/ssh2/installation.xml
deleted file mode 100644
index 6378e43909f3..000000000000
--- a/reference/ssh2/installation.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ssh2.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;ssh2">&url.pecl.package;ssh2</link>.
- </simpara>
- <simpara>
-  &pecl.windows.download.avail;
- </simpara>
-
-</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/ssh2/reference.xml b/reference/ssh2/reference.xml
deleted file mode 100644
index bf0ea33debe9..000000000000
--- a/reference/ssh2/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ssh2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>SSH2 &Functions;</title>
-
- &reference.ssh2.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/ssh2/setup.xml b/reference/ssh2/setup.xml
deleted file mode 100644
index d1c341fd2074..000000000000
--- a/reference/ssh2/setup.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="ssh2.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="ssh2.requirements">
-  &reftitle.required;
-  <simpara>
-   The
-   <link xlink:href="&url.openssl;">OpenSSL</link> and
-   <link xlink:href="&url.libssh2;">libssh2</link> libraries
-   are required. Ensure that the development libraries are installed,
-   where a typical package name might be <literal>openssl-dev</literal>.
-  </simpara>
-  <simpara>
-   Version 1.2 or newer of the libssh2 library is required, although
-   it's possible newer releases of pecl/ssh2 may require newer
-   versions (see the release notes).
-  </simpara>
-  <simpara>
-   The <function>ssh2_auth_agent</function> function will only be available
-   with libssh2 &gt;= 1.2.3.
-  </simpara>
-  <simpara>
-   support for <function>stream_set_timeout</function> to channel streams
-   will only be available with libssh2 &gt;= 1.2.9.
-  </simpara>
-  <simpara>
-   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.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.ssh2.installation;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="ssh2.resources">
-  &reftitle.resources;
-  <para>
-   This extension defines the following resource types:
-   <simplelist>
-    <member>SSH2 Session</member>
-    <member>SSH2 Listener</member>
-    <member>SSH2 SFTP</member>
-    <member>SSH2 Publickey Subsystem (as of ssh2 0.10)</member>
-   </simplelist>
-  </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/ssh2/versions.xml b/reference/ssh2/versions.xml
deleted file mode 100644
index 9b2f3da8119a..000000000000
--- a/reference/ssh2/versions.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='ssh2_auth_agent' from='PECL ssh2 &gt;= 0.12'/>
- <function name='ssh2_auth_hostbased_file' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_auth_none' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_auth_password' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_auth_pubkey' from='PECL ssh2 &gt;= 1.4'/>
- <function name='ssh2_auth_pubkey_file' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_connect' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_disconnect' from='PECL ssh2 &gt;= 1.0'/>
- <function name='ssh2_exec' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_fetch_stream' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_fingerprint' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_forward_accept' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_forward_listen' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_keepalive_config' from='PECL ssh2 &gt;= 1.5.0'/>
- <function name='ssh2_keepalive_send' from='PECL ssh2 &gt;= 1.5.0'/>
- <function name='ssh2_methods_negotiated' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_poll' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_publickey_add' from='PECL ssh2 &gt;= 0.10'/>
- <function name='ssh2_publickey_init' from='PECL ssh2 &gt;= 0.10'/>
- <function name='ssh2_publickey_list' from='PECL ssh2 &gt;= 0.10'/>
- <function name='ssh2_publickey_remove' from='PECL ssh2 &gt;= 0.10'/>
- <function name='ssh2_scp_recv' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_scp_send' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_send_eof' from='PECL ssh2 &gt;= 1.3'/>
- <function name='ssh2_send_signal' from='PECL ssh2 &gt;= 1.5.0'/>
- <function name='ssh2_set_timeout' from='PECL ssh2 &gt;= 1.5.0'/>
- <function name='ssh2_sftp' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_chmod' from='PECL ssh2 &gt;= 0.12'/>
- <function name='ssh2_sftp_lstat' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_mkdir' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_readlink' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_realpath' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_rename' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_rmdir' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_stat' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_symlink' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_sftp_unlink' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_shell' from='PECL ssh2 &gt;= 0.9.0'/>
- <function name='ssh2_shell_resize' from='PECL ssh2 &gt;= 1.4'/>
- <function name='ssh2_tunnel' from='PECL ssh2 &gt;= 0.9.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/stats/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/stats/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/stats/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/stats/book.xml b/reference/stats/book.xml
deleted file mode 100644
index f22c762ac6eb..000000000000
--- a/reference/stats/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: deprecated -->
-
-<book xml:id="book.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>Statistics</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.stats">
-  &reftitle.intro;
-  <para>
-   &warn.pecl.unmaintained;
-   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.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/functions/stats-absolute-deviation.xml b/reference/stats/functions/stats-absolute-deviation.xml
deleted file mode 100644
index eeec79e12a97..000000000000
--- a/reference/stats/functions/stats-absolute-deviation.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns the absolute deviation of the values in <parameter>a</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the absolute deviation of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d8164345a93d..000000000000
--- a/reference/stats/functions/stats-cdf-beta.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, alpha, or beta, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 161e2093ce3d..000000000000
--- a/reference/stats/functions/stats-cdf-binomial.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, n, or p, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 e585733dc874..000000000000
--- a/reference/stats/functions/stats-cdf-cauchy.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, x0, or gamma, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c12ad1db914d..000000000000
--- a/reference/stats/functions/stats-cdf-chisquare.xml
+++ /dev/null
@@ -1,121 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, or k, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 66845e535d07..000000000000
--- a/reference/stats/functions/stats-cdf-exponential.xml
+++ /dev/null
@@ -1,121 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, or lambda, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d407db7a21cb..000000000000
--- a/reference/stats/functions/stats-cdf-f.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, d1, or d2, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 fb397ef905d6..000000000000
--- a/reference/stats/functions/stats-cdf-gamma.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, k, or theta, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 6c3efc8c6c96..000000000000
--- a/reference/stats/functions/stats-cdf-laplace.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, mu, or b, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 852d541c5ffd..000000000000
--- a/reference/stats/functions/stats-cdf-logistic.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, mu, or s, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 9a62d856ef51..000000000000
--- a/reference/stats/functions/stats-cdf-negative-binomial.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, r, or p, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 4a72dd2fdc08..000000000000
--- a/reference/stats/functions/stats-cdf-noncentral-chisquare.xml
+++ /dev/null
@@ -1,142 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, k, or lambda, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 aa84e0c58f83..000000000000
--- a/reference/stats/functions/stats-cdf-noncentral-f.xml
+++ /dev/null
@@ -1,164 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par4</parameter></term>
-     <listitem>
-      <simpara>
-       The fourth parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, nu1, nu2, or lambda, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 b3bed1118011..000000000000
--- a/reference/stats/functions/stats-cdf-noncentral-t.xml
+++ /dev/null
@@ -1,145 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, nu, or mu, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 f60844a8f9a2..000000000000
--- a/reference/stats/functions/stats-cdf-normal.xml
+++ /dev/null
@@ -1,144 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, mu, or sigma, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 38d29fb1e75d..000000000000
--- a/reference/stats/functions/stats-cdf-poisson.xml
+++ /dev/null
@@ -1,120 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, or lambda, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 ac192706d532..000000000000
--- a/reference/stats/functions/stats-cdf-t.xml
+++ /dev/null
@@ -1,121 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, or nu, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 edbd102c4c85..000000000000
--- a/reference/stats/functions/stats-cdf-uniform.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, a, or b, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 8affe9ae8332..000000000000
--- a/reference/stats/functions/stats-cdf-weibull.xml
+++ /dev/null
@@ -1,141 +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>
-  <simpara>
-   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>.
-  </simpara>
-  <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>
-      <simpara>
-       The first parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par2</parameter></term>
-     <listitem>
-      <simpara>
-       The second parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>par3</parameter></term>
-     <listitem>
-      <simpara>
-       The third parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>which</parameter></term>
-     <listitem>
-      <simpara>
-       The flag to determine what to be calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns CDF, x, k, or lambda, determined by <parameter>which</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d3c1004c01bb..000000000000
--- a/reference/stats/functions/stats-covariance.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns the covariance of <parameter>a</parameter> and <parameter>b</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The first array
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <simpara>
-       The second array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the covariance of <parameter>a</parameter> and <parameter>b</parameter>,
-   or &false; on failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 2bf9d9282e0c..000000000000
--- a/reference/stats/functions/stats-dens-beta.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 5ef297c17e42..000000000000
--- a/reference/stats/functions/stats-dens-cauchy.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <simpara>
-       The location parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <simpara>
-       The scale parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 64f22ebee2ec..000000000000
--- a/reference/stats/functions/stats-dens-chisquare.xml
+++ /dev/null
@@ -1,73 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr</parameter></term>
-     <listitem>
-      <simpara>
-       The degree of freedom of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 2fa105f17640..000000000000
--- a/reference/stats/functions/stats-dens-exponential.xml
+++ /dev/null
@@ -1,73 +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>
-  <simpara>
-   Returns the probability density at <parameter>x</parameter>, where the
-   random variable follows the exponential distribution of which the scale is
-   <parameter>scale</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <simpara>
-       The scale of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 3ebdb39326e2..000000000000
--- a/reference/stats/functions/stats-dens-f.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr1</parameter></term>
-     <listitem>
-      <simpara>
-       The degree of freedom of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr2</parameter></term>
-     <listitem>
-      <simpara>
-       The degree of freedom of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d717d1f1c34c..000000000000
--- a/reference/stats/functions/stats-dens-gamma.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>shape</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>scale</parameter></term>
-     <listitem>
-      <simpara>
-       The scale parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 4e1f202dc2e7..000000000000
--- a/reference/stats/functions/stats-dens-laplace.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <simpara>
-       The location parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 ebad13484923..000000000000
--- a/reference/stats/functions/stats-dens-logistic.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <simpara>
-       The location parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 1f4b17eace1e..000000000000
--- a/reference/stats/functions/stats-dens-normal.xml
+++ /dev/null
@@ -1,83 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ave</parameter></term>
-     <listitem>
-      <simpara>
-       The mean of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>stdev</parameter></term>
-     <listitem>
-      <simpara>
-       The standard deviation of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 3dfb01c8fb9c..000000000000
--- a/reference/stats/functions/stats-dens-pmf-binomial.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability mass is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <simpara>
-       The number of trials of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pi</parameter></term>
-     <listitem>
-      <simpara>
-       The success rate of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 44277e635bdc..000000000000
--- a/reference/stats/functions/stats-dens-pmf-hypergeometric.xml
+++ /dev/null
@@ -1,92 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n1</parameter></term>
-     <listitem>
-      <simpara>
-       The number of success, at which the probability mass is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n2</parameter></term>
-     <listitem>
-      <simpara>
-       The number of failure of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>N1</parameter></term>
-     <listitem>
-      <simpara>
-       The number of success samples of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>N2</parameter></term>
-     <listitem>
-      <simpara>
-       The number of failure samples of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability mass at <parameter>n1</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 06a0203e19d3..000000000000
--- a/reference/stats/functions/stats-dens-pmf-negative-binomial.xml
+++ /dev/null
@@ -1,86 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability mass is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <simpara>
-       The number of the success of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pi</parameter></term>
-     <listitem>
-      <simpara>
-       The success rate of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 edd15cf62c40..000000000000
--- a/reference/stats/functions/stats-dens-pmf-poisson.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns the probability mass at <parameter>x</parameter>, where the random variable
-   follows the Poisson distribution whose parameter is <parameter>lb</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability mass is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>lb</parameter></term>
-     <listitem>
-      <simpara>
-       The parameter of the Poisson distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability mass at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 edba7c80c5bc..000000000000
--- a/reference/stats/functions/stats-dens-t.xml
+++ /dev/null
@@ -1,73 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfr</parameter></term>
-     <listitem>
-      <simpara>
-       The degree of freedom of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 aa8c144ebb39..000000000000
--- a/reference/stats/functions/stats-dens-uniform.xml
+++ /dev/null
@@ -1,85 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The lower bound of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <simpara>
-       The upper bound of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 54077e2c10f9..000000000000
--- a/reference/stats/functions/stats-dens-weibull.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The value at which the probability density is calculated
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <simpara>
-       The scale parameter of the distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The probability density at <parameter>x</parameter> or &false; for failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 8a10d56dd2cc..000000000000
--- a/reference/stats/functions/stats-harmonic-mean.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns the harmonic mean of the values in <parameter>a</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the harmonic mean of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 d7c43760d30f..000000000000
--- a/reference/stats/functions/stats-kurtosis.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns the kurtosis of the values in <parameter>a</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the kurtosis of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 09de6e26ea32..000000000000
--- a/reference/stats/functions/stats-rand-gen-beta.xml
+++ /dev/null
@@ -1,74 +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>
-  <simpara>
-   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.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the beta distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>b</parameter></term>
-     <listitem>
-      <simpara>
-       The shape parameter of the beta distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 6d6645e0a922..000000000000
--- a/reference/stats/functions/stats-rand-gen-chisquare.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns a random deviate from the chi-square distribution where the degrees of
-   freedom is  <parameter>df</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c86e6fdc2c3a..000000000000
--- a/reference/stats/functions/stats-rand-gen-exponential.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns a random deviate from the exponential distribution of which the scale is
-   <parameter>av</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>av</parameter></term>
-     <listitem>
-      <simpara>
-       The scale parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 e55ba3e1fcce..000000000000
--- a/reference/stats/functions/stats-rand-gen-f.xml
+++ /dev/null
@@ -1,73 +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>
-  <simpara>
-   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.
-  </simpara>
- </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>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 44fcb84163ec..000000000000
--- a/reference/stats/functions/stats-rand-gen-funiform.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns a random deviate from the uniform distribution from
-   <parameter>low</parameter> to <parameter>high</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>low</parameter></term>
-     <listitem>
-      <simpara>
-       The lower bound (exclusive)
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>high</parameter></term>
-     <listitem>
-      <simpara>
-       The upper bound (exclusive)
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 e7dd1f1a3f42..000000000000
--- a/reference/stats/functions/stats-rand-gen-gamma.xml
+++ /dev/null
@@ -1,75 +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>
-  <simpara>
-   Generates a random deviate from the gamma distribution whose density is
-   (A**R)/Gamma(R) * X**(R-1) * Exp(-A*X).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       location parameter of Gamma distribution (<parameter>a</parameter>
-       &gt; 0).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>r</parameter></term>
-     <listitem>
-      <simpara>
-       shape parameter of Gamma distribution (<parameter>r</parameter> &gt;
-       0).
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 37ab921ffaca..000000000000
--- a/reference/stats/functions/stats-rand-gen-ibinomial-negative.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <simpara>
-       The number of success
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>p</parameter></term>
-     <listitem>
-      <simpara>
-       The success rate
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate, which is the number of failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 434d1900f704..000000000000
--- a/reference/stats/functions/stats-rand-gen-ibinomial.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <simpara>
-       The number of trials
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pp</parameter></term>
-     <listitem>
-      <simpara>
-       The probability of an event in each trial
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 5988ce16caa7..000000000000
--- a/reference/stats/functions/stats-rand-gen-int.xml
+++ /dev/null
@@ -1,52 +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>
-  <simpara>
-   Returns a random integer between 1 and 2147483562
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random integer
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 04d9c35237f6..000000000000
--- a/reference/stats/functions/stats-rand-gen-ipoisson.xml
+++ /dev/null
@@ -1,62 +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>
-  <simpara>
-   Returns a random deviate from the Poisson distribution with parameter <parameter>mu</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mu</parameter></term>
-     <listitem>
-      <simpara>
-       The parameter of the Poisson distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 3c62d01446b6..000000000000
--- a/reference/stats/functions/stats-rand-gen-iuniform.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns a random integer from the discrete uniform distribution between <parameter>low</parameter> (inclusive)
-   and <parameter>high</parameter> (inclusive).
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>low</parameter></term>
-     <listitem>
-      <simpara>
-       The lower bound
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>high</parameter></term>
-     <listitem>
-      <simpara>
-       The upper bound
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random integer
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 f48e065b1263..000000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-chisquare.xml
+++ /dev/null
@@ -1,75 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <simpara>
-       The non-centrality parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 effe10ef6ff9..000000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-f.xml
+++ /dev/null
@@ -1,82 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dfn</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom of the numerator
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dfd</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom of the denominator
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <simpara>
-       The non-centrality parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 e70ca0edf707..000000000000
--- a/reference/stats/functions/stats-rand-gen-noncentral-t.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   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>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>xnonc</parameter></term>
-     <listitem>
-      <simpara>
-       The non-centrality parameter
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 1ea6d90fd44c..000000000000
--- a/reference/stats/functions/stats-rand-gen-normal.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns a random deviate from the normal distribution with mean, <parameter>av</parameter>, and standard deviation,
-   <parameter>sd</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>av</parameter></term>
-     <listitem>
-      <simpara>
-       The mean of the normal distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sd</parameter></term>
-     <listitem>
-      <simpara>
-       The standard deviation of the normal distribution
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 490239342e01..000000000000
--- a/reference/stats/functions/stats-rand-gen-t.xml
+++ /dev/null
@@ -1,62 +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>
-  <simpara>
-   Returns a random deviate from the t-distribution with the degrees of freedom, <parameter>df</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>df</parameter></term>
-     <listitem>
-      <simpara>
-       The degrees of freedom
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random deviate
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 414e4568f99e..000000000000
--- a/reference/stats/functions/stats-rand-get-seeds.xml
+++ /dev/null
@@ -1,52 +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>
-  <simpara>
-   Returns the current seed values of the random number generator
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of two integers.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 7ed41f5698bb..000000000000
--- a/reference/stats/functions/stats-rand-phrase-to-seeds.xml
+++ /dev/null
@@ -1,62 +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>
-  <simpara>
-   Generate two seeds for the random number generator from a <parameter>phrase</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>phrase</parameter></term>
-     <listitem>
-      <simpara>
-       The input phrase
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of two integers.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 c59eb209b73e..000000000000
--- a/reference/stats/functions/stats-rand-ranf.xml
+++ /dev/null
@@ -1,52 +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>
-  <simpara>
-   Returns a random floating point number from a uniform distribution between 0 (exclusive) and  1 (exclusive).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A random floating point number
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 6fd439237a5d..000000000000
--- a/reference/stats/functions/stats-rand-setall.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Set <parameter>iseed1</parameter> and <parameter>iseed2</parameter> as seed values to the random generator
-   used in statistic functions.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>iseed1</parameter></term>
-     <listitem>
-      <simpara>
-       The value which is used as the random seed
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>iseed2</parameter></term>
-     <listitem>
-      <simpara>
-       The value which is used as the random seed
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No values are returned.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 dea1100bef6a..000000000000
--- a/reference/stats/functions/stats-skew.xml
+++ /dev/null
@@ -1,64 +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>
-  <simpara>
-   Returns the skewness of the values in <parameter>a</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>a</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the skewness of the values in <parameter>a</parameter>,
-   or &false; if <parameter>a</parameter> is empty or is not an array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 3ffa3ad8c6a9..000000000000
--- a/reference/stats/functions/stats-standard-deviation.xml
+++ /dev/null
@@ -1,81 +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>
-      <simpara>
-       The array of data to find the standard deviation for. Note that all
-       values of the array will be cast to <type>float</type>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sample</parameter></term>
-     <listitem>
-      <simpara>
-       Indicates if <parameter>a</parameter> represents a sample of the
-       population; defaults to &false;.
-      </simpara>
-     </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;
-  <simpara>
-   Raises an <constant>E_WARNING</constant> when there are fewer than 2
-   values in <parameter>a</parameter>.
-  </simpara>
- </refsect1><!-- }}} -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 bf499b8e3395..000000000000
--- a/reference/stats/functions/stats-stat-binomial-coef.xml
+++ /dev/null
@@ -1,71 +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>
-  <simpara>
-   Returns the binomial coefficient of <parameter>n</parameter> choose <parameter>x</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>x</parameter></term>
-     <listitem>
-      <simpara>
-       The number of chooses from the set
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>n</parameter></term>
-     <listitem>
-      <simpara>
-       The number of elements in the set
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the binomial coefficient
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 3fa8c140624b..000000000000
--- a/reference/stats/functions/stats-stat-correlation.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns the Pearson correlation coefficient between <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <simpara>
-       The first array
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <simpara>
-       The second array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the Pearson correlation coefficient between <parameter>arr1</parameter> and <parameter>arr2</parameter>,
-   or &false; on failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 27b5ded36329..000000000000
--- a/reference/stats/functions/stats-stat-factorial.xml
+++ /dev/null
@@ -1,63 +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>
-  <simpara>
-   Returns the factorial of an integer, <parameter>n</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>n</parameter></term>
-    <listitem>
-     <simpara>
-      An integer
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The factorial of <parameter>n</parameter>.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 30a86c44eb5b..000000000000
--- a/reference/stats/functions/stats-stat-independent-t.xml
+++ /dev/null
@@ -1,75 +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>
-  <simpara>
-   Returns the t-value of the independent two-sample t-test between
-   <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </simpara>
-  &warn.undocumented.func;
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <simpara>
-       The first set of values
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <simpara>
-       The second set of values
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the t-value, or &false; if failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 14c4323a0d1a..000000000000
--- a/reference/stats/functions/stats-stat-innerproduct.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns the inner product of <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <simpara>
-       The first array
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <simpara>
-       The second array
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the inner product of <parameter>arr1</parameter> and <parameter>arr2</parameter>,
-   or &false; on failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 f8b6c597c924..000000000000
--- a/reference/stats/functions/stats-stat-paired-t.xml
+++ /dev/null
@@ -1,72 +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>
-  <simpara>
-   Returns the t-value of the dependent t-test for paired samples
-   <parameter>arr1</parameter> and <parameter>arr2</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr1</parameter></term>
-     <listitem>
-      <simpara>
-       The first samples
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>arr2</parameter></term>
-     <listitem>
-      <simpara>
-       The second samples
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the t-value, or &false; if failure.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 b44d7774e2da..000000000000
--- a/reference/stats/functions/stats-stat-percentile.xml
+++ /dev/null
@@ -1,71 +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>
-  <simpara>
-   Returns the <parameter>perc</parameter>-th percentile value of the array <parameter>arr</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>perc</parameter></term>
-     <listitem>
-      <simpara>
-       The percentile
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the percentile values of the input array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 60cd6e3582e4..000000000000
--- a/reference/stats/functions/stats-stat-powersum.xml
+++ /dev/null
@@ -1,71 +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>
-  <simpara>
-   Returns the sum of the <parameter>power</parameter>-th power of a vector represented as an array <parameter>arr</parameter>.
-  </simpara>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arr</parameter></term>
-     <listitem>
-      <simpara>
-       The input array
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>power</parameter></term>
-     <listitem>
-      <simpara>
-       The power
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the power sum of the input array.
-  </simpara>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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 0b711ae389fa..000000000000
--- a/reference/stats/functions/stats-variance.xml
+++ /dev/null
@@ -1,73 +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>
-      <simpara>
-       The array of data to find the standard deviation for. Note that all
-       values of the array will be cast to <type>float</type>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>sample</parameter></term>
-     <listitem>
-      <simpara>
-       Indicates if <parameter>a</parameter> represents a sample of the
-       population; defaults to &false;.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the variance on success; &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/stats/reference.xml b/reference/stats/reference.xml
deleted file mode 100644
index 03288799321d..000000000000
--- 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 38de124f586e..000000000000
--- a/reference/stats/setup.xml
+++ /dev/null
@@ -1,54 +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.dead;
-    <link xlink:href="&url.pecl.package;stats">&url.pecl.package;stats</link>.
-   </para>
-   <para>
-    &pecl.windows.download.avail;
-   </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/stats/versions.xml b/reference/stats/versions.xml
deleted file mode 100644
index 47aa966291fb..000000000000
--- a/reference/stats/versions.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<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/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/stomp/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/stomp/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/stomp/book.xml b/reference/stomp/book.xml
deleted file mode 100644
index 00ea816c28ac..000000000000
--- a/reference/stomp/book.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.stomp">
- <?phpdoc extension-membership="pecl" ?>
- <title>Stomp Client</title>
- <titleabbrev>Stomp</titleabbrev>
-
- <preface xml:id="intro.stomp">
-  &reftitle.intro;
-  <simpara>
-This extension allows php applications to communicate with any Stomp compliant Message Brokers through easy object-oriented and procedural interfaces. <link xlink:href="&url.stomp;">Stomp official site</link>
-  </simpara>
- </preface>
-
- &reference.stomp.setup;
- &reference.stomp.examples;
- &reference.stomp.reference;
- &reference.stomp.stomp;
- &reference.stomp.stompframe;
- &reference.stomp.stompexception;
-</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/stomp/examples.xml b/reference/stomp/examples.xml
deleted file mode 100644
index d093b0572efd..000000000000
--- a/reference/stomp/examples.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.examples">
- &reftitle.examples;
- <!-- section xml:id="stomp.examples-overview" -->
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$queue  = '/queue/foo';
-$msg    = 'bar';
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* send a message to the queue 'foo' */
-$stomp->send($queue, $msg);
-
-/* subscribe to messages from the queue 'foo' */
-$stomp->subscribe($queue);
-
-/* read a frame */
-$frame = $stomp->readFrame();
-
-if ($frame->body === $msg) {
-    var_dump($frame);
-
-    /* acknowledge that the frame was received */
-    $stomp->ack($frame);
-}
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(StompFrame)#2 (3) {
-  ["command"]=>
-  string(7) "MESSAGE"
-  ["headers"]=>
-  array(5) {
-    ["message-id"]=>
-    string(41) "ID:php.net-55293-1257226743606-4:2:-1:1:1"
-    ["destination"]=>
-    string(10) "/queue/foo"
-    ["timestamp"]=>
-    string(13) "1257226805828"
-    ["expires"]=>
-    string(1) "0"
-    ["priority"]=>
-    string(1) "0"
-  }
-  ["body"]=>
-  string(3) "bar"
-}
-]]>
-   </screen>
-  </example>
-  <example>
-  <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$queue  = '/queue/foo';
-$msg    = 'bar';
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* begin a transaction */
-stomp_begin($link, 't1');
-
-/* send a message to the queue 'foo' */
-stomp_send($link, $queue, $msg, array('transaction' => 't1'));
-
-/* commit a transaction */
-stomp_commit($link, 't1');
-
-/* subscribe to messages from the queue 'foo' */
-stomp_subscribe($link, $queue);
-
-/* read a frame */
-$frame = stomp_read_frame($link);
-
-if ($frame['body'] === $msg) {
-    var_dump($frame);
-
-    /* acknowledge that the frame was received */
-    stomp_ack($link, $frame['headers']['message-id']);
-}
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["command"]=>
-  string(7) "MESSAGE"
-  ["body"]=>
-  string(3) "bar"
-  ["headers"]=>
-  array(6) {
-    ["transaction"]=>
-    string(2) "t1"
-    ["message-id"]=>
-    string(41) "ID:php.net-55293-1257226743606-4:3:-1:1:1"
-    ["destination"]=>
-    string(10) "/queue/foo"
-    ["timestamp"]=>
-    string(13) "1257227037059"
-    ["expires"]=>
-    string(1) "0"
-    ["priority"]=>
-    string(1) "0"
-  }
-}
-]]>
-   </screen>
-  </example>
- <!-- /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/stomp/functions/stomp-connect-error.xml b/reference/stomp/functions/stomp-connect-error.xml
deleted file mode 100644
index e63c64f90200..000000000000
--- a/reference/stomp/functions/stomp-connect-error.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.stomp-connect-error">
- <refnamediv>
-  <refname>stomp_connect_error</refname>
-  <refpurpose>Returns a string description of the last connect error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>stomp_connect_error</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns a string description of the last connect error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string that describes the error, or &null; if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>stomp_connect_error</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$link = stomp_connect('http://localhost:61613');
-
-if(!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Connection failed: Invalid Broker URI scheme
-]]>
-   </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/stomp/functions/stomp-version.xml b/reference/stomp/functions/stomp-version.xml
deleted file mode 100644
index 79146bdb4011..000000000000
--- a/reference/stomp/functions/stomp-version.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.stomp-version">
- <refnamediv>
-  <refname>stomp_version</refname>
-  <refpurpose>Gets the current stomp extension version</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>stomp_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns a string containing the version of the current stomp extension.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    It returns the current stomp extension version
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>stomp_version</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-var_dump(stomp_version());
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "0.2.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/stomp/ini.xml b/reference/stomp/ini.xml
deleted file mode 100644
index 8e0cb0685fcf..000000000000
--- a/reference/stomp/ini.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xml:id="stomp.configuration">
- &reftitle.runtime;
- &extension.runtime;
- <table>
-  <title>Stomp &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.stomp.default-broker">stomp.default_broker</link></entry>
-     <entry>tcp://localhost:61613</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.stomp.default-connection-timeout-sec">stomp.default_connection_timeout_sec</link></entry>
-     <entry>2</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.stomp.default-connection-timeout-usec">stomp.default_connection_timeout_usec</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-
-    <row>
-     <entry><link linkend="ini.stomp.default-read-timeout-sec">stomp.default_read_timeout_sec</link></entry>
-     <entry>2</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-    <row>
-     <entry><link linkend="ini.stomp.default-read-timeout-usec">stomp.default_read_timeout_usec</link></entry>
-     <entry>0</entry>
-     <entry><constant>INI_ALL</constant></entry>
-     <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-    </row>
-</tbody>
-  </tgroup>
- </table>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.stomp.default-broker">
-    <term>
-     <parameter>stomp.default_broker</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      The default broker URI to use when connecting to the message broker if no other URI is specified.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.stomp.default-connection-timeout-sec">
-    <term>
-     <parameter>stomp.default_connection_timeout_sec</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      The seconds part of the default connection timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.stomp.default-connection-timeout-usec">
-    <term>
-     <parameter>stomp.default_connection_timeout_usec</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      The microseconds part of the default connection timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.stomp.default-read-timeout-sec">
-    <term>
-     <parameter>stomp.default_read_timeout_sec</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      The seconds part of the default reading timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.stomp.default-read-timeout-usec">
-    <term>
-     <parameter>stomp.default_read_timeout_usec</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      The microseconds part of the default reading timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-
- </variablelist>
-</section>
diff --git a/reference/stomp/reference.xml b/reference/stomp/reference.xml
deleted file mode 100644
index ed24d112c184..000000000000
--- a/reference/stomp/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.stomp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Stomp &Functions;</title>
-
- &reference.stomp.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/stomp/setup.xml b/reference/stomp/setup.xml
deleted file mode 100644
index 9814f0307ab9..000000000000
--- a/reference/stomp/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.setup">
- &reftitle.setup;
-
- <section xml:id="stomp.requirements">
-  &reftitle.required;
-  <simpara>The <link xlink:href="&url.openssl;">OpenSSL</link> package &gt;= 0.9.6 and the <link linkend="book.openssl">openssl</link> extension may also be required to use stomp over SSL.</simpara>
- </section>
-
- <section xml:id="stomp.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;stomp">&url.pecl.package;stomp</link>
-  </simpara>
- </section>
-
- <!-- {{{ Configuration -->
- &reference.stomp.ini;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="stomp.resources">
-  &reftitle.resources;
-  <simpara>
-    There is only one resource type used in the stomp extension - it's
-    the link identifier for a stomp connection.
-  </simpara>
- </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/stomp/stomp.xml b/reference/stomp/stomp.xml
deleted file mode 100644
index 5298b7c30be1..000000000000
--- a/reference/stomp/stomp.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.stomp" role="class">
-
- <title>The Stomp class</title>
- <titleabbrev>Stomp</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Stomp intro -->
-  <section xml:id="stomp.intro">
-   &reftitle.intro;
-   <simpara>
-Represents a connection between PHP and a Stomp compliant Message Broker.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="stomp.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Stomp</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Stomp</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stomp')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stomp')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stomp')/db:refentry/db:refsect1[@role='description']/descendant::db:destructorsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.stomp.entities.stomp;
-
-</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/stomp/stomp/abort.xml b/reference/stomp/stomp/abort.xml
deleted file mode 100644
index ae1f25c7a37b..000000000000
--- a/reference/stomp/stomp/abort.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.abort">
- <refnamediv>
-  <refname>Stomp::abort</refname>
-  <refname>stomp_abort</refname>
-  <refpurpose>Rolls back a transaction in progress</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::abort</methodname>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_abort</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Rolls back a transaction in progress.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>transaction_id</parameter></term>
-    <listitem>
-     <simpara>
-      The transaction to abort.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* begin a transaction */
-$stomp->begin('t1');
-
-/* send a message to the queue */
-$stomp->send('/queue/foo', 'bar', array('transaction' => 't1'));
-
-/* rollback */
-$stomp->abort('t1');
-
-/* close connection */
-unset($stomp);
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('tcp://localhost:61613');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* begin a transaction */
-stomp_begin($link, 't1');
-
-/* send a message to the queue 'foo' */
-stomp_send($link, '/queue/foo', 'bar', array('transaction' => 't1'));
-
-/* rollback */
-stomp_abort($link, 't1');
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/ack.xml b/reference/stomp/stomp/ack.xml
deleted file mode 100644
index 745eebbf14ab..000000000000
--- a/reference/stomp/stomp/ack.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.ack">
- <refnamediv>
-  <refname>Stomp::ack</refname>
-  <refname>stomp_ack</refname>
-  <refpurpose>Acknowledges consumption of a message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::ack</methodname>
-   <methodparam><type>mixed</type><parameter>msg</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_ack</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>msg</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Acknowledges consumption of a message from a subscription using client acknowledgment.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>msg</parameter></term>
-    <listitem>
-     <simpara>
-      The message/messageId to be acknowledged.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$queue  = '/queue/foo';
-$msg    = 'bar';
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* send a message to the queue 'foo' */
-$stomp->send($queue, $msg);
-
-/* subscribe to messages from the queue 'foo' */
-$stomp->subscribe($queue);
-
-/* read a frame */
-$frame = $stomp->readFrame();
-
-if ($frame->body === $msg) {
-    /* acknowledge that the frame was received */
-    $stomp->ack($frame);
-}
-
-/* remove the subscription */
-$stomp->unsubscribe($queue);
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$queue  = '/queue/foo';
-$msg    = 'bar';
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* begin a transaction */
-stomp_begin($link, 't1');
-
-/* send a message to the queue 'foo' */
-stomp_send($link, $queue, $msg, array('transaction' => 't1'));
-
-/* commit a transaction */
-stomp_commit($link, 't1');
-
-/* subscribe to messages from the queue 'foo' */
-stomp_subscribe($link, $queue);
-
-/* read a frame */
-$frame = stomp_read_frame($link);
-
-if ($frame['body'] === $msg) {
-    /* acknowledge that the frame was received */
-    stomp_ack($link, $frame['headers']['message-id']);
-}
-
-/* remove the subscription */
-stomp_unsubscribe($link, $queue);
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.transaction;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/begin.xml b/reference/stomp/stomp/begin.xml
deleted file mode 100644
index c206436f950d..000000000000
--- a/reference/stomp/stomp/begin.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.begin">
- <refnamediv>
-  <refname>Stomp::begin</refname>
-  <refname>stomp_begin</refname>
-  <refpurpose>Starts a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::begin</methodname>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_begin</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Starts a transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>transaction_id</parameter></term>
-    <listitem>
-     <simpara>
-      The transaction id.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   See <function>stomp_commit</function> or <function>stomp_abort</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/commit.xml b/reference/stomp/stomp/commit.xml
deleted file mode 100644
index c27aa4f47bf1..000000000000
--- a/reference/stomp/stomp/commit.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.commit">
- <refnamediv>
-  <refname>Stomp::commit</refname>
-  <refname>stomp_commit</refname>
-  <refpurpose>Commits a transaction in progress</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::commit</methodname>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_commit</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>transaction_id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits a transaction in progress.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>transaction_id</parameter></term>
-    <listitem>
-     <simpara>
-      The transaction id.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* begin a transaction */
-$stomp->begin('t1');
-
-/* send a message to the queue */
-$stomp->send('/queue/foo', 'bar', array('transaction' => 't1'));
-
-/* commit */
-$stomp->commit('t1');
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('tcp://localhost:61613');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* begin a transaction */
-stomp_begin($link, 't1');
-
-/* send a message to the queue 'foo' */
-stomp_send($link, '/queue/foo', 'bar', array('transaction' => 't1'));
-
-/* commit */
-stomp_commit($link, 't1');
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/construct.xml b/reference/stomp/stomp/construct.xml
deleted file mode 100644
index 93b5d191a6e8..000000000000
--- a/reference/stomp/stomp/construct.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.construct">
- <refnamediv>
-  <refname>Stomp::__construct</refname>
-  <refname>stomp_connect</refname>
-  <refpurpose>Opens a connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (constructor):</simpara>
-   <constructorsynopsis>
-    <modifier>public</modifier> <methodname>Stomp::__construct</methodname>
-    <methodparam choice="opt"><type>string</type><parameter>broker</parameter><initializer>ini_get("stomp.default_broker_uri")</initializer></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
-    <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </constructorsynopsis>
-  <simpara>&style.procedural;:</simpara>
-   <methodsynopsis>
-    <type>resource</type><methodname>stomp_connect</methodname>
-    <methodparam choice="opt"><type>string</type><parameter>broker</parameter><initializer>ini_get("stomp.default_broker_uri")</initializer></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>username</parameter></methodparam>
-    <methodparam choice="opt"><type>string</type><parameter>password</parameter></methodparam>
-    <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>
-   Opens a connection to a stomp compliant Message Broker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>broker</parameter></term>
-    <listitem>
-     <simpara>
-      The broker URI
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>username</parameter></term>
-    <listitem>
-     <simpara>
-      The username.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>password</parameter></term>
-    <listitem>
-     <simpara>
-      The password.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &stomp.note.transaction;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL stomp 1.0.1</entry>
-      <entry>
-       The <parameter>headers</parameter> parameter was added
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </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/stomp/stomp/destruct.xml b/reference/stomp/stomp/destruct.xml
deleted file mode 100644
index 0aa8e8b7cf4e..000000000000
--- a/reference/stomp/stomp/destruct.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.destruct">
- <refnamediv>
-  <refname>Stomp::__destruct</refname>
-  <refname>stomp_close</refname>
-  <refpurpose>Closes stomp connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (destructor):</simpara>
-   <destructorsynopsis>
-   <modifier>public</modifier> <methodname>Stomp::__destruct</methodname>
-   <void/>
-   </destructorsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_close</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Closes a previously opened connection.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   See <function>stomp_connect</function>.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/error.xml b/reference/stomp/stomp/error.xml
deleted file mode 100644
index 0ee9e66c7903..000000000000
--- a/reference/stomp/stomp/error.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.error">
- <refnamediv>
-  <refname>Stomp::error</refname>
-  <refname>stomp_error</refname>
-  <refpurpose>Gets the last stomp error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Stomp::error</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>string</type><methodname>stomp_error</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the last stomp error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-    &stomp.param.link;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an error string or &false; if no error occurred.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-var_dump($stomp->error());
-
-if (!$stomp->abort('unknown-transaction', array('receipt' => 'foo'))) {
-    var_dump($stomp->error());
-}
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-string(43) "Invalid transaction id: unknown-transaction"
-]]>
-    </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-var_dump(stomp_error($link));
-
-if (!stomp_abort($link, 'unknown-transaction', array('receipt' => 'foo'))) {
-    var_dump(stomp_error($link));
-}
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-bool(false)
-string(43) "Invalid transaction id: unknown-transaction"
-]]>
-    </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/stomp/stomp/getreadtimeout.xml b/reference/stomp/stomp/getreadtimeout.xml
deleted file mode 100644
index aa2464e7f733..000000000000
--- a/reference/stomp/stomp/getreadtimeout.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.getreadtimeout">
- <refnamediv>
-  <refname>Stomp::getReadTimeout</refname>
-  <refname>stomp_get_read_timeout</refname>
-  <refpurpose>Gets read timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Stomp::getReadTimeout</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>array</type><methodname>stomp_get_read_timeout</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets read timeout
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with 2 elements: sec and usec.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-var_dump($stomp->getReadTimeout());
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["sec"]=>
-  int(2)
-  ["usec"]=>
-  int(0)
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-var_dump(stomp_get_read_timeout($link));
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(2) {
-  ["sec"]=>
-  int(2)
-  ["usec"]=>
-  int(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/stomp/stomp/getsessionid.xml b/reference/stomp/stomp/getsessionid.xml
deleted file mode 100644
index 976d685fe7f6..000000000000
--- a/reference/stomp/stomp/getsessionid.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.getsessionid">
- <refnamediv>
-  <refname>Stomp::getSessionId</refname>
-  <refname>stomp_get_session_id</refname>
-  <refpurpose>Gets the current stomp session ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>false</type></type><methodname>Stomp::getSessionId</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>stomp_get_session_id</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Gets the current stomp session ID.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &string; session id on success&return.falseforfailure;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-var_dump($stomp->getSessionId());
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-string(35) "ID:php.net-52873-1257291895530-4:14"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-var_dump(stomp_get_session_id($link));
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-string(35) "ID:php.net-52873-1257291895530-4:14"
-]]>
-   </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/stomp/stomp/hasframe.xml b/reference/stomp/stomp/hasframe.xml
deleted file mode 100644
index 8934e9c583cd..000000000000
--- a/reference/stomp/stomp/hasframe.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.hasframe">
- <refnamediv>
-  <refname>Stomp::hasFrame</refname>
-  <refname>stomp_has_frame</refname>
-  <refpurpose>Indicates whether or not there is a frame ready to read</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::hasFrame</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_has_frame</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Indicates whether or not there is a frame ready to read.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if a frame is ready to read, or &false; otherwise.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/readframe.xml b/reference/stomp/stomp/readframe.xml
deleted file mode 100644
index 77e0362ea7f7..000000000000
--- a/reference/stomp/stomp/readframe.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.readframe">
- <refnamediv>
-  <refname>Stomp::readFrame</refname>
-  <refname>stomp_read_frame</refname>
-  <refpurpose>Reads the next frame</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>stompframe</type><methodname>Stomp::readFrame</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>class_name</parameter><initializer>"stompFrame"</initializer></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>array</type><methodname>stomp_read_frame</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Reads the next frame. It is possible to instantiate an object of a specific class, and pass parameters to that class's constructor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-     <simpara>
-       The name of the class to instantiate. If not specified, a stompFrame object is returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  &stomp.note.transaction;
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL stomp 0.4.0</entry>
-      <entry>
-       <parameter>class_name</parameter> parameter was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-/* subscribe to messages from the queue 'foo' */
-$stomp->subscribe('/queue/foo');
-
-/* read a frame */
-var_dump($stomp->readFrame());
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-object(StompFrame)#2 (3) {
-  ["command"]=>
-  string(7) "MESSAGE"
-  ["headers"]=>
-  array(5) {
-    ["message-id"]=>
-    string(41) "ID:php.net-55293-1257226743606-4:2:-1:1:1"
-    ["destination"]=>
-    string(10) "/queue/foo"
-    ["timestamp"]=>
-    string(13) "1257226805828"
-    ["expires"]=>
-    string(1) "0"
-    ["priority"]=>
-    string(1) "0"
-  }
-  ["body"]=>
-  string(3) "bar"
-}
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-/* subscribe to messages from the queue 'foo' */
-stomp_subscribe($link, '/queue/foo');
-
-/* read a frame */
-$frame = stomp_read_frame($link);
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(3) {
-  ["command"]=>
-  string(7) "MESSAGE"
-  ["body"]=>
-  string(3) "bar"
-  ["headers"]=>
-  array(6) {
-    ["transaction"]=>
-    string(2) "t1"
-    ["message-id"]=>
-    string(41) "ID:php.net-55293-1257226743606-4:3:-1:1:1"
-    ["destination"]=>
-    string(10) "/queue/foo"
-    ["timestamp"]=>
-    string(13) "1257227037059"
-    ["expires"]=>
-    string(1) "0"
-    ["priority"]=>
-    string(1) "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/stomp/stomp/send.xml b/reference/stomp/stomp/send.xml
deleted file mode 100644
index 503b712e6b41..000000000000
--- a/reference/stomp/stomp/send.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.send">
- <refnamediv>
-  <refname>Stomp::send</refname>
-  <refname>stomp_send</refname>
-  <refpurpose>Sends a message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::send</methodname>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>msg</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_send</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>msg</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sends a message to the Message Broker.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>destination</parameter></term>
-    <listitem>
-     <simpara>
-      Where to send the message
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>msg</parameter></term>
-    <listitem>
-     <simpara>
-      Message to send.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   See <function>stomp_ack</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.transaction;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/setreadtimeout.xml b/reference/stomp/stomp/setreadtimeout.xml
deleted file mode 100644
index 77dcf81f88ec..000000000000
--- a/reference/stomp/stomp/setreadtimeout.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.setreadtimeout">
- <refnamediv>
-  <refname>Stomp::setReadTimeout</refname>
-  <refname>stomp_set_read_timeout</refname>
-  <refpurpose>Sets read timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Stomp::setReadTimeout</methodname>
-   <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>void</type><methodname>stomp_set_read_timeout</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>microseconds</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets read timeout.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>seconds</parameter></term>
-    <listitem>
-     <simpara>
-      The seconds part of the timeout to be set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>microseconds</parameter></term>
-    <listitem>
-     <simpara>
-      The microseconds part of the timeout to be set.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>&style.oop;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-try {
-    $stomp = new Stomp('tcp://localhost:61613');
-} catch(StompException $e) {
-    die('Connection failed: ' . $e->getMessage());
-}
-
-$stomp->setReadTimeout(10);
-
-/* close connection */
-unset($stomp);
-
-?>
-]]>
-    </programlisting>
-  </example>
-  <example>
-   <title>&style.procedural;</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/* connection */
-$link = stomp_connect('ssl://localhost:61612');
-
-/* check connection */
-if (!$link) {
-    die('Connection failed: ' . stomp_connect_error());
-}
-
-stomp_set_read_timeout($link, 10);
-
-/* close connection */
-stomp_close($link);
-
-?>
-]]>
-    </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/stomp/stomp/subscribe.xml b/reference/stomp/stomp/subscribe.xml
deleted file mode 100644
index cf07173ca95f..000000000000
--- a/reference/stomp/stomp/subscribe.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.subscribe">
- <refnamediv>
-  <refname>Stomp::subscribe</refname>
-  <refname>stomp_subscribe</refname>
-  <refpurpose>Registers to listen to a given destination</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::subscribe</methodname>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_subscribe</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Registers to listen to a given destination.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>destination</parameter></term>
-    <listitem>
-     <simpara>
-      Destination to subscribe to.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   See <function>stomp_ack</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stomp/unsubscribe.xml b/reference/stomp/stomp/unsubscribe.xml
deleted file mode 100644
index faa20fafb8d5..000000000000
--- a/reference/stomp/stomp/unsubscribe.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.unsubscribe">
- <refnamediv>
-  <refname>Stomp::unsubscribe</refname>
-  <refname>stomp_unsubscribe</refname>
-  <refpurpose>Removes an existing subscription</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <simpara>&style.oop; (method):</simpara>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Stomp::unsubscribe</methodname>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   </methodsynopsis>
-  <simpara>&style.procedural;:</simpara>
-  <methodsynopsis>
-   <type>bool</type><methodname>stomp_unsubscribe</methodname>
-   <methodparam><type>resource</type><parameter>link</parameter></methodparam>
-   <methodparam><type>string</type><parameter>destination</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes an existing subscription.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   &stomp.param.link;
-   <varlistentry>
-    <term><parameter>destination</parameter></term>
-    <listitem>
-     <simpara>
-      Subscription to remove.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   &stomp.param.headers;
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   See <function>stomp_ack</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &stomp.note.sync;
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stompexception.xml b/reference/stomp/stompexception.xml
deleted file mode 100644
index b2fb456efbc3..000000000000
--- a/reference/stomp/stompexception.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.stompexception" role="class">
-
- <title>The StompException class</title>
- <titleabbrev>StompException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ StompException intro -->
-  <section xml:id="stompexception.intro">
-   &reftitle.intro;
-   <simpara>
-Represents an error raised by the stomp extension. See <link linkend="language.exceptions">Exceptions</link> for more information about Exceptions in PHP.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="stompexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>StompException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>StompException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <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])"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stompexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
- </partintro>
-
- &reference.stomp.entities.stompexception;
-
-</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/stomp/stompexception/getdetails.xml b/reference/stomp/stompexception/getdetails.xml
deleted file mode 100644
index d098dc8d9ab9..000000000000
--- a/reference/stomp/stompexception/getdetails.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stomp.getdetails">
- <refnamediv>
-  <refname>StompException::getDetails</refname>
-  <refpurpose>Get exception details</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-   <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>StompException::getDetails</methodname>
-   <void/>
-   </methodsynopsis>
-  <simpara>
-   Get exception details.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-    &string; containing the error details.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/stomp/stompframe.xml b/reference/stomp/stompframe.xml
deleted file mode 100644
index 161ddc476b89..000000000000
--- a/reference/stomp/stompframe.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.stompframe" role="class">
-
- <title>The StompFrame class</title>
- <titleabbrev>StompFrame</titleabbrev>
-
- <partintro>
-
-<!-- {{{ StompFrame intro -->
-  <section xml:id="stompframe.intro">
-   &reftitle.intro;
-   <simpara>
-    Represents a message which was sent or received from a Stomp compliant Message Broker.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="stompframe.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>StompFrame</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>StompFrame</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="stompframe.props.command">command</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="stompframe.props.headers">headers</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="stompframe.props.body">body</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.stompframe')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ StompFrame properties -->
-  <section xml:id="stompframe.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="stompframe.props.command">
-     <term><varname>command</varname></term>
-     <listitem>
-      <simpara>Frame command.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="stompframe.props.headers">
-     <term><varname>headers</varname></term>
-     <listitem>
-      <simpara>Frame headers (&array;).</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="stompframe.props.body">
-     <term><varname>body</varname></term>
-     <listitem>
-      <simpara>Frame body.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.stomp.entities.stompframe;
-
-</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/stomp/stompframe/construct.xml b/reference/stomp/stompframe/construct.xml
deleted file mode 100644
index 6da14748e64d..000000000000
--- a/reference/stomp/stompframe/construct.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="stompframe.construct">
- <refnamediv>
-  <refname>StompFrame::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <methodname>StompFrame::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>command</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>headers</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>body</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <simpara>
-      Frame command
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>headers</parameter></term>
-    <listitem>
-     <simpara>
-      Frame headers (&array;).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>body</parameter></term>
-    <listitem>
-     <simpara>
-      Frame body.
-     </simpara>
-    </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/stomp/versions.xml b/reference/stomp/versions.xml
deleted file mode 100644
index 0d4b023832d1..000000000000
--- a/reference/stomp/versions.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='stomp_version' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp_connect_error' from='PECL stomp &gt;= 0.3.0'/>
-
- <!-- Methods -->
- <function name='stomp' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::__construct' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::getsessionid' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::__destruct' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::send' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::subscribe' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::hasframe' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::readframe' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::unsubscribe' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::begin' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::commit' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::abort' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::ack' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::error' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stomp::setreadtimeout' from='PECL stomp &gt;= 0.3.0'/>
- <function name='stomp::getreadtimeout' from='PECL stomp &gt;= 0.3.0'/>
-
- <function name='stompexception' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stompexception::getdetails' from='PECL stomp &gt;= 0.1.0'/>
-
- <function name='stompframe' from='PECL stomp &gt;= 0.1.0'/>
- <function name='stompframe::__construct' from='PECL stomp &gt;= 0.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/svm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/svm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/svm/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/svm/book.xml b/reference/svm/book.xml
deleted file mode 100644
index a0118a2ccc20..000000000000
--- a/reference/svm/book.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.svm">
- <?phpdoc extension-membership="pecl" ?>
- <title>Support Vector Machine</title>
- <titleabbrev>SVM</titleabbrev>
-
- <preface xml:id="intro.svm">
-  &reftitle.intro;
-  &warn.experimental;
-  <simpara>
-   LibSVM is an efficient solver for SVM classification and regression problems.
-   The svm extension wraps this in a PHP interface for easy use in PHP scripts.
-  </simpara>
- </preface>
-
- &reference.svm.setup;
- &reference.svm.examples;
-
- &reference.svm.svm;
- &reference.svm.svmmodel;
- &reference.svm.svmexception;
-
-</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/svm/configure.xml b/reference/svm/configure.xml
deleted file mode 100644
index d37c7fb2969a..000000000000
--- a/reference/svm/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;svm">&url.pecl.package;svm</link>
- </simpara>
-
-</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/svm/examples.xml b/reference/svm/examples.xml
deleted file mode 100644
index a9ae39d00108..000000000000
--- a/reference/svm/examples.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.examples">
- &reftitle.examples;
-
- <simpara>
-  The basic process is to define parameters, supply training data to generate a
-  model on, then make predictions based on the model. There are a default set
-  of parameters that should get some results with most any input, so we'll start
-  by looking at the data.
- </simpara>
- <simpara>
-  Data is supplied in either a file, a stream, or as an array. If supplied in
-  a file or a stream, it must contain one line per training example, which must
-  be formatted as an integer class (usually 1 and -1) followed by a series of
-  feature/value pairs, in increasing feature order. The features are integers,
-  the values floats, usually scaled 0-1. For example:
- </simpara>
- <simpara>
-  -1 1:0.43 3:0.12 9284:0.2
- </simpara>
- <simpara>
-  In a document classification problem, say a spam checker, each line would
-  represent a document. There would be two classes, -1 for spam, 1 for ham.
-  Each feature would represent some word, and the value would represent that
-  importance of that word to the document (perhaps the frequency count, with
-  the total scaled to unit length). Features that were 0 (e.g. the word did
-  not appear in the document at all) would simply not be included.
- </simpara>
- <simpara>
-  In array mode, the data must be passed as an array of arrays. Each sub-array
-  must have the class as the first element, then key =&gt; value sets for the
-  feature values pairs.
- </simpara>
- <simpara>
-  This data is passed to the SVM class's train function, which will return an
-  SVM model is successful.
- </simpara>
- <simpara>
-  Once a model has been generated, it can be used to make predictions about
-  previously unseen data. This can be passed as an array to the model's
-  predict function, in the same format as before, but without the label.
-  The response will be the class.
- </simpara>
- <simpara>
-  Models can be saved and restored as required, using the save and load
-  functions, which both take a file location.
- </simpara>
- <para>
-  <example>
-   <title>Train from array</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$data = array(
-    array(-1, 1 => 0.43, 3 => 0.12, 9284 => 0.2),
-    array(1, 1 => 0.22, 5 => 0.01, 94 => 0.11),
-);
-
-$svm = new SVM();
-$model = $svm->train($data);
-
-$data = array(1 => 0.43, 3 => 0.12, 9284 => 0.2);
-$result = $model->predict($data);
-var_dump($result);
-$model->save('model.svm');
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(-1)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Train from a file</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$svm = new SVM();
-$model = $svm->train("traindata.txt");
-?>
-]]>
-   </programlisting>
-  </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/svm/setup.xml b/reference/svm/setup.xml
deleted file mode 100644
index 37b68cee60b1..000000000000
--- a/reference/svm/setup.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.setup">
- &reftitle.setup;
-
- <section xml:id="svm.requirements">
-  &reftitle.required;
-  <simpara>
-   Libsvm itself is required, and is available through some package
-   management - libsvm-devel for RPM based system or libsvm-dev for
-   Debian based ones. Alternatively it is available direct from the website.
-   If installing from the <link xlink:href="&url.svm;">official website</link>
-   then some steps will need to be taken as the package does not install
-   automatically. For example, assuming the latest version is 3.1:
-  </simpara>
-  <screen>
-<![CDATA[
-wget http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/libsvm+tar.gz
-tar xvzf libsvm-3.1.tar.gz
-cd libsvm-3.1
-make lib
-cp libsvm.so.1 /usr/lib
-ln -s libsvm.so.1 libsvm.so
-ldconfig
-ldconfig --print | grep libsvm
-]]>
-  </screen>
-
-  <simpara>
-   This last step should show libsvm is installed.
-  </simpara>
- </section>
-
- <section xml:id="svm.installation">
-   &reftitle.install;
-   <simpara>
-    &pecl.info;
-    <link xlink:href="&url.pecl.package;svm">&url.pecl.package;svm</link>
-   </simpara>
-  </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/svm/svm.xml b/reference/svm/svm.xml
deleted file mode 100644
index 913588775b96..000000000000
--- a/reference/svm/svm.xml
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.svm" role="class">
-
- <title>The SVM class</title>
- <titleabbrev>SVM</titleabbrev>
-
- <partintro>
-
-<!-- {{{ svm intro -->
-  <section xml:id="svm.intro">
-   &reftitle.intro;
-   <simpara>
-
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="svm.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SVM</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SVM</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.c-svc">SVM::C_SVC</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.nu-svc">SVM::NU_SVC</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.one-class">SVM::ONE_CLASS</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.epsilon-svr">SVM::EPSILON_SVR</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.nu-svr">SVM::NU_SVR</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.kernel-linear">SVM::KERNEL_LINEAR</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.kernel-poly">SVM::KERNEL_POLY</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.kernel-rbf">SVM::KERNEL_RBF</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.kernel-sigmoid">SVM::KERNEL_SIGMOID</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.kernel-precomputed">SVM::KERNEL_PRECOMPUTED</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-type">SVM::OPT_TYPE</varname>
-     <initializer>101</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-kernel-type">SVM::OPT_KERNEL_TYPE</varname>
-     <initializer>102</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-degree">SVM::OPT_DEGREE</varname>
-     <initializer>103</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-shrinking">SVM::OPT_SHRINKING</varname>
-     <initializer>104</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-probability">SVM::OPT_PROBABILITY</varname>
-     <initializer>105</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-gamma">SVM::OPT_GAMMA</varname>
-     <initializer>201</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-nu">SVM::OPT_NU</varname>
-     <initializer>202</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-eps">SVM::OPT_EPS</varname>
-     <initializer>203</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-p">SVM::OPT_P</varname>
-     <initializer>204</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-coef-zero">SVM::OPT_COEF_ZERO</varname>
-     <initializer>205</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-c">SVM::OPT_C</varname>
-     <initializer>206</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="svm.constants.opt-cache-size">SVM::OPT_CACHE_SIZE</varname>
-     <initializer>207</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svm')/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.svm')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ svm constants -->
-  <section xml:id="svm.constants">
-   &reftitle.constants;
-   <section xml:id="svm.constants.types">
-    <title>SVM Constants</title>
-    <variablelist>
-
-     <varlistentry xml:id="svm.constants.c-svc">
-      <term><constant>SVM::C_SVC</constant></term>
-      <listitem>
-       <simpara>The basic C_SVC SVM type. The default, and a good starting point</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.nu-svc">
-      <term><constant>SVM::NU_SVC</constant></term>
-      <listitem>
-       <simpara>The NU_SVC type uses a different, more flexible, error weighting</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.one-class">
-      <term><constant>SVM::ONE_CLASS</constant></term>
-      <listitem>
-       <simpara>One class SVM type. Train just on a single class, using outliers as negative examples</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.epsilon-svr">
-      <term><constant>SVM::EPSILON_SVR</constant></term>
-      <listitem>
-       <simpara>A SVM type for regression (predicting a value rather than just a class)</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.nu-svr">
-      <term><constant>SVM::NU_SVR</constant></term>
-      <listitem>
-       <simpara>A NU style SVM regression type</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.kernel-linear">
-      <term><constant>SVM::KERNEL_LINEAR</constant></term>
-      <listitem>
-       <simpara>A very simple kernel, can work well on large document classification problems</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.kernel-poly">
-      <term><constant>SVM::KERNEL_POLY</constant></term>
-      <listitem>
-       <simpara>A polynomial kernel</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.kernel-rbf">
-      <term><constant>SVM::KERNEL_RBF</constant></term>
-      <listitem>
-       <simpara>The common Gaussian RBD kernel. Handles non-linear problems well and is a good default for classification</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.kernel-sigmoid">
-      <term><constant>SVM::KERNEL_SIGMOID</constant></term>
-      <listitem>
-       <simpara>A kernel based on the sigmoid function. Using this makes the SVM very similar to a two layer sigmoid based neural network</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.kernel-precomputed">
-      <term><constant>SVM::KERNEL_PRECOMPUTED</constant></term>
-      <listitem>
-       <simpara>A precomputed kernel - currently unsupported.</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-type">
-      <term><constant>SVM::OPT_TYPE</constant></term>
-      <listitem>
-       <simpara>The options key for the SVM type</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-kernel-type">
-      <term><constant>SVM::OPT_KERNEL_TYPE</constant></term>
-      <listitem>
-       <simpara>The options key for the kernel type</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-degree">
-      <term><constant>SVM::OPT_DEGREE</constant></term>
-      <listitem>
-       <simpara/>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-shrinking">
-      <term><constant>SVM::OPT_SHRINKING</constant></term>
-      <listitem>
-       <simpara>Training parameter, boolean, for whether to use the shrinking heuristics</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-probability">
-      <term><constant>SVM::OPT_PROBABILITY</constant></term>
-      <listitem>
-       <simpara>Training parameter, boolean, for whether to collect and use probability estimates</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-gamma">
-      <term><constant>SVM::OPT_GAMMA</constant></term>
-      <listitem>
-       <simpara>Algorithm parameter for Poly, RBF and Sigmoid kernel types.</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-nu">
-      <term><constant>SVM::OPT_NU</constant></term>
-      <listitem>
-       <simpara>The option key for the nu parameter, only used in the NU_ SVM types</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-eps">
-      <term><constant>SVM::OPT_EPS</constant></term>
-      <listitem>
-       <simpara>The option key for the Epsilon parameter, used in epsilon regression</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-p">
-      <term><constant>SVM::OPT_P</constant></term>
-      <listitem>
-       <simpara>Training parameter used by Episilon SVR regression</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-coef-zero">
-      <term><constant>SVM::OPT_COEF_ZERO</constant></term>
-      <listitem>
-       <simpara>Algorithm parameter for poly and sigmoid kernels</simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-c">
-      <term><constant>SVM::OPT_C</constant></term>
-      <listitem>
-       <simpara>The option for the cost parameter that controls tradeoff between errors and generality - effectively the penalty for misclassifying training examples. </simpara>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="svm.constants.opt-cache-size">
-      <term><constant>SVM::OPT_CACHE_SIZE</constant></term>
-      <listitem>
-       <simpara>Memory cache size, in MB</simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.svm.entities.svm;
-
-</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/svm/svm/construct.xml b/reference/svm/svm/construct.xml
deleted file mode 100644
index 20791b6ab455..000000000000
--- a/reference/svm/svm/construct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.construct">
- <refnamediv>
-  <refname>SVM::__construct</refname>
-  <refpurpose>Construct a new SVM object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SVM::__construct</methodname>
-   <void/>
-  </constructorsynopsis>
-  <simpara>
-   Constructs a new SVM object ready to accept training data.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Throws a <classname>SVMException</classname> if the libsvm
-   library could not be loaded.
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svm/crossvalidate.xml b/reference/svm/svm/crossvalidate.xml
deleted file mode 100644
index 032ecc15f199..000000000000
--- a/reference/svm/svm/crossvalidate.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.crossvalidate">
- <refnamediv>
-  <refname>SVM::crossvalidate</refname>
-  <refpurpose>Test training params on subsets of the training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>svm::crossvalidate</methodname>
-   <methodparam><type>array</type><parameter>problem</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number_of_folds</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Crossvalidate can be used to test the effectiveness of the current
-   parameter set on a subset of the training data. Given a problem set
-   and a n "folds", it separates the problem set into n subsets, and the
-   repeatedly trains on one subset and tests on another. While the accuracy
-   will generally be lower than a SVM trained on the entire data set, the
-   accuracy score returned should be relatively useful, so it can be used to
-   test different training parameters.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>problem</parameter></term>
-    <listitem>
-     <simpara>
-     The problem data. This can either be in the form of an array, the URL
-     of an SVMLight formatted file, or a stream to an opened SVMLight
-     formatted datasource.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>number_of_folds</parameter></term>
-    <listitem>
-     <simpara>
-      The number of sets the data should be divided into and cross tested.
-      A higher number means smaller training sets and less reliability. 5 is
-      a good number to start with.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The correct percentage, expressed as a floating point number from 0-1.
-   In the case of NU_SVC or EPSILON_SVR kernels the mean squared error will
-   returned instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVM::train</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/svm/svm/getoptions.xml b/reference/svm/svm/getoptions.xml
deleted file mode 100644
index 51c8a188a372..000000000000
--- a/reference/svm/svm/getoptions.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.getoptions">
- <refnamediv>
-  <refname>SVM::getOptions</refname>
-  <refpurpose>Return the current training parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SVM::getOptions</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Retrieve an array containing the training parameters.
-   The parameters will be keyed on the predefined SVM constants.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array of configuration settings.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svm/setoptions.xml b/reference/svm/svm/setoptions.xml
deleted file mode 100644
index fde81fd0ac29..000000000000
--- a/reference/svm/svm/setoptions.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.setoptions">
- <refnamediv>
-  <refname>SVM::setOptions</refname>
-  <refpurpose>Set training parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SVM::setOptions</methodname>
-   <methodparam><type>array</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set one or more training parameters.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-    <listitem>
-     <simpara>
-      An array of training parameters, keyed on the SVM constants.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return true on success, throws SVMException on error.
-  </simpara>
- </refsect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svm/train.xml b/reference/svm/svm/train.xml
deleted file mode 100644
index 6d7e378e1c42..000000000000
--- a/reference/svm/svm/train.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svm.train">
- <refnamediv>
-  <refname>SVM::train</refname>
-  <refpurpose>Create a SVMModel based on training data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>SVMModel</type><methodname>svm::train</methodname>
-   <methodparam><type>array</type><parameter>problem</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>weights</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Train a support vector machine based on the supplied training data.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>problem</parameter></term>
-    <listitem>
-     <simpara>
-      The problem can be provided in three different ways.
-      An array, where the data should start with the class label
-      (usually 1 or -1) then followed by a sparse data set of
-      dimension =&gt; data pairs.
-      A URL to a file containing a SVM Light formatted problem, with the
-      each line being a new training example, the start of each line
-      containing the class (1, -1) then a series of tab separated data
-      values shows as key:value.
-      A opened stream pointing to a data source formatted as in the file above.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>weights</parameter></term>
-    <listitem>
-     <simpara>
-      Weights are an optional set of weighting parameters for the different
-      classes, to help account for unbalanced training sets. For example,
-      if the classes were 1 and -1, and -1 had significantly more example
-      than one, the weight for -1 could be 0.5. Weights should be in the range 0-1.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an SVMModel that can be used to classify previously unseen data.
-   Throws SVMException on error
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svmexception.xml b/reference/svm/svmexception.xml
deleted file mode 100644
index 7ee17a5dab65..000000000000
--- a/reference/svm/svmexception.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.svmexception" role="class">
-
- <title>The SVMException class</title>
- <titleabbrev>SVMException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ svmexception intro -->
-  <section xml:id="svmexception.intro">
-   &reftitle.intro;
-   <simpara>
-    The exception object thrown on errors from the SVM and SVMModel classes.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="svmexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SVMException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SVMException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])"/>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
- </partintro>
-
-</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/svm/svmmodel.xml b/reference/svm/svmmodel.xml
deleted file mode 100644
index af151a7cd786..000000000000
--- a/reference/svm/svmmodel.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.svmmodel" role="class">
-
- <title>The SVMModel class</title>
- <titleabbrev>SVMModel</titleabbrev>
-
- <partintro>
-
-<!-- {{{ svmmodel intro -->
-  <section xml:id="svmmodel.intro">
-   &reftitle.intro;
-   <simpara>
-    The SVMModel is the end result of the training process.
-    It can be used to classify previously unseen data.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="svmmodel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SVMModel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SVMModel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.svmmodel')/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.svmmodel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.svm.entities.svmmodel;
-
-</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/svm/svmmodel/checkprobabilitymodel.xml b/reference/svm/svmmodel/checkprobabilitymodel.xml
deleted file mode 100644
index d0c8eb96a308..000000000000
--- a/reference/svm/svmmodel/checkprobabilitymodel.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.checkprobabilitymodel">
- <refnamediv>
-  <refname>SVMModel::checkProbabilityModel</refname>
-  <refpurpose>Returns true if the model has probability information</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SVMModel::checkProbabilityModel</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns true if the model contains probability information.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return a boolean value
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svmmodel/construct.xml b/reference/svm/svmmodel/construct.xml
deleted file mode 100644
index 473228eba4d7..000000000000
--- a/reference/svm/svmmodel/construct.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.construct">
- <refnamediv>
-  <refname>SVMModel::__construct</refname>
-  <refpurpose>Construct a new SVMModel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>SVMModel::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Build a new SVMModel. Models will usually be created from the
-   SVM::train function, but then saved models may be restored directly.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename for the saved model file this model should load.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Throws a <classname>SVMException</classname> on error
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVMModel::load</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/svm/svmmodel/getlabels.xml b/reference/svm/svmmodel/getlabels.xml
deleted file mode 100644
index 81ca072d20b8..000000000000
--- a/reference/svm/svmmodel/getlabels.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.getlabels">
- <refnamediv>
-  <refname>SVMModel::getLabels</refname>
-  <refpurpose>Get the labels the model was trained on</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>SVMModel::getLabels</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Return an array of labels that the model was trained on. For regression and one class
-   models an empty array is returned.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return an array of labels
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVMModel::getNrClass</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/svm/svmmodel/getnrclass.xml b/reference/svm/svmmodel/getnrclass.xml
deleted file mode 100644
index 2c8e7bb87144..000000000000
--- a/reference/svm/svmmodel/getnrclass.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.getnrclass">
- <refnamediv>
-  <refname>SVMModel::getNrClass</refname>
-  <refpurpose>Returns the number of classes the model was trained with</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SVMModel::getNrClass</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the number of classes the model was trained with, will return 2 for one class and regression models.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return an integer number of classes
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svmmodel/getsvmtype.xml b/reference/svm/svmmodel/getsvmtype.xml
deleted file mode 100644
index 941d4b707a40..000000000000
--- a/reference/svm/svmmodel/getsvmtype.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.getsvmtype">
- <refnamediv>
-  <refname>SVMModel::getSvmType</refname>
-  <refpurpose>Get the SVM type the model was trained with</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SVMModel::getSvmType</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-    Returns an integer value representing the type of the SVM model used, e.g SVM::C_SVC.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Return an integer SVM type
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svmmodel/getsvrprobability.xml b/reference/svm/svmmodel/getsvrprobability.xml
deleted file mode 100644
index d63a040e2436..000000000000
--- a/reference/svm/svmmodel/getsvrprobability.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.getsvrprobability">
- <refnamediv>
-  <refname>SVMModel::getSvrProbability</refname>
-  <refpurpose>Get the sigma value for regression types</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SVMModel::getSvrProbability</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   For regression models, returns a sigma value. If there is no probability
-   information or the model is not SVR, 0 is returned.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a sigma value
-  </simpara>
- </refsect1>
-
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/svmmodel/load.xml b/reference/svm/svmmodel/load.xml
deleted file mode 100644
index 185b8c6c37dc..000000000000
--- a/reference/svm/svmmodel/load.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.load">
- <refnamediv>
-  <refname>SVMModel::load</refname>
-  <refpurpose>Load a saved SVM Model</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SVMModel::load</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Load a model file ready for classification or regression.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The filename of the model.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Throws SVMException on error.
-   Returns true on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVMModel::save</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/svm/svmmodel/predict-probability.xml b/reference/svm/svmmodel/predict-probability.xml
deleted file mode 100644
index 4d570082ad70..000000000000
--- a/reference/svm/svmmodel/predict-probability.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.predict-probability">
- <refnamediv>
-  <refname>SVMModel::predict_probability</refname>
-  <refpurpose>Return class probabilities for previous unseen data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SVMModel::predict_probability</methodname>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function accepts an array of data and attempts to predict the class, as with the predict function.
-   Additionally, however, this function returns an array of probabilities, one per class in the model, which
-   represent the estimated chance of the data supplied being a member of that class. Requires that the model
-   to be used has been trained with the probability parameter set to true.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The array to be classified. This should be a series of key =&gt; value
-      pairs in increasing key order, but not necessarily continuous.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>probabilities</parameter></term>
-    <listitem>
-     <simpara>
-      The supplied value will be filled with the probabilities. This will be either null, in the case
-      of a model without probability information, or an array where the index is the class name and the value
-      the predicted probability.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Float the predicted value. This will be a class label in the case of
-   classification, a real value in the case of regression.
-   Throws SVMException on error
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVM::predict</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/svm/svmmodel/predict.xml b/reference/svm/svmmodel/predict.xml
deleted file mode 100644
index ff8b26f7831b..000000000000
--- a/reference/svm/svmmodel/predict.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.predict">
- <refnamediv>
-  <refname>SVMModel::predict</refname>
-  <refpurpose>Predict a value for previously unseen data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>SVMModel::predict</methodname>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function accepts an array of data and attempts to predict the class
-   or regression value based on the model extracted from previously trained data.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      The array to be classified. This should be a series of key =&gt; value
-      pairs in increasing key order, but not necessarily continuous.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Float the predicted value. This will be a class label in the case of
-   classification, a real value in the case of regression.
-   Throws SVMException on error
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVM::train</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/svm/svmmodel/save.xml b/reference/svm/svmmodel/save.xml
deleted file mode 100644
index 3b0d35d1e02e..000000000000
--- a/reference/svm/svmmodel/save.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svmmodel.save">
- <refnamediv>
-  <refname>SVMModel::save</refname>
-  <refpurpose>Save a model to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SVMModel::save</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Save the model data to a file, for later use.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <simpara>
-      The file to save the model to.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Throws SVMException on error.
-   Returns true on success.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SVMModel::load</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/svm/versions.xml b/reference/svm/versions.xml
deleted file mode 100644
index b0be5064d778..000000000000
--- a/reference/svm/versions.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
-
- <function name='svm' from='PECL svm &gt;= 0.1.0'/>
- <function name='svm::__construct' from='PECL svm &gt;= 0.1.0'/>
- <function name='svm::getoptions' from='PECL svm &gt;= 0.1.0'/>
- <function name='svm::setoptions' from='PECL svm &gt;= 0.1.0'/>
- <function name='svm::train' from='PECL svm &gt;= 0.1.0'/>
- <function name='svm::crossvalidate' from='PECL svm &gt;= 0.1.0'/>
-
- <function name='svmmodel' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmmodel::__construct' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmmodel::save' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmmodel::load' from='PECL svm &gt;= 0.1.00.1.0'/>
- <function name='svmmodel::predict' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmmodel::predict_probability' from='PECL svm &gt;= 0.1.4'/>
- <function name='svmmodel::getlabels' from='PECL svm &gt;= 0.1.5'/>
- <function name='svmmodel::getnrclass' from='PECL svm &gt;= 0.1.5'/>
- <function name='svmmodel::getsvmtype' from='PECL svm &gt;= 0.1.5'/>
- <function name='svmmodel::getsvrprobability' from='PECL svm &gt;= 0.1.5'/>
- <function name='svmmodel::checkprobabilitymodel' from='PECL svm &gt;= 0.1.5'/>
-
- <function name='svmexception' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::__clone' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::__construct' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::getmessage' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::getcode' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::getfile' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::getline' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::gettrace' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::gettraceasstring' from='PECL svm &gt;= 0.1.0'/>
- <function name='svmexception::__tostring' from='PECL svm &gt;= 0.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/svn/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/svn/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/svn/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/svn/book.xml b/reference/svn/book.xml
deleted file mode 100644
index c753ead26125..000000000000
--- a/reference/svn/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.svn">
- <?phpdoc extension-membership="pecl" ?>
- <title>Subversion</title>
- <titleabbrev>SVN</titleabbrev>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.svn">
-  &reftitle.intro;
-  <simpara>
-   This extension implements PHP bindings for
-   <link xlink:href="&url.svn;">Subversion</link> (SVN), a version
-   control system, allowing PHP scripts to communicate with SVN repositories
-   and working copies without direct command line calls to the
-   <filename>svn</filename>
-   executable.
-  </simpara>
-  &warn.experimental;
- </preface>
- <!-- }}} -->
-
- &reference.svn.setup;
- &reference.svn.constants;
- &reference.svn.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/svn/configure.xml b/reference/svn/configure.xml
deleted file mode 100644
index f77dc938a6dc..000000000000
--- a/reference/svn/configure.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svn.installation">
- &reftitle.install;
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;svn"/>
- </simpara>
- <simpara>
-   If <filename>./configure</filename> is having trouble finding the
-   SVN files (for example, Subversion was installed with a
-   different prefix directory), use
-   <userinput>./configure --with-svn=$USR_PATH</userinput>
-   to specify the directory where the
-   <filename>include/subversion-1/</filename> folder is located.
- </simpara>
- <simpara>
-  &pecl.windows.download;
- </simpara>
- <warning>
-  <simpara>
-   If the extension is compiled against libsvn 1.3,
-   functions that work with working copies will fail
-   when used on working copies created by Subversion 1.4.
-  </simpara>
- </warning>
-</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/svn/constants.xml b/reference/svn/constants.xml
deleted file mode 100644
index dfd7c2da00e2..000000000000
--- a/reference/svn/constants.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="svn.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.svn-revision-head">
-   <term>
-    <constant>SVN_REVISION_HEAD</constant>
-     (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Magic number (-1) specifying the HEAD revision
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="svn.constants.auth">
-  <title>Constants usable with <function>svn_auth_set_parameter</function></title>
-  <varlistentry xml:id="constant.svn-auth-param-default-username">
-   <term>
-    <constant>SVN_AUTH_PARAM_DEFAULT_USERNAME</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Property for default username to use when performing basic authentication
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-default-password">
-   <term>
-    <constant>SVN_AUTH_PARAM_DEFAULT_PASSWORD</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Property for default password to use when performing basic authentication
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-non-interactive">
-   <term>
-    <constant>SVN_AUTH_PARAM_NON_INTERACTIVE</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-dont-store-passwords">
-   <term>
-    <constant>SVN_AUTH_PARAM_DONT_STORE_PASSWORDS</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-no-auth-cache">
-   <term>
-    <constant>SVN_AUTH_PARAM_NO_AUTH_CACHE</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-ssl-server-failures">
-   <term>
-    <constant>SVN_AUTH_PARAM_SSL_SERVER_FAILURES</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-ssl-server-cert-info">
-   <term>
-    <constant>SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-config">
-   <term>
-    <constant>SVN_AUTH_PARAM_CONFIG</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-server-group">
-   <term>
-    <constant>SVN_AUTH_PARAM_SERVER_GROUP</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-auth-param-config-dir">
-   <term>
-    <constant>SVN_AUTH_PARAM_CONFIG_DIR</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem><simpara /></listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.php-svn-auth-param-ignore-ssl-verify-errors">
-   <term>
-    <constant>PHP_SVN_AUTH_PARAM_IGNORE_SSL_VERIFY_ERRORS</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-      Custom property for ignoring SSL cert verification errors
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist>
-  <title>Filesystem constants</title>
-  <varlistentry xml:id="constant.svn-fs-config-fs-type">
-   <term>
-    <constant>SVN_FS_CONFIG_FS_TYPE</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Configuration key that determines filesystem type
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-fs-type-bdb">
-   <term>
-    <constant>SVN_FS_TYPE_BDB</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Filesystem is Berkeley-DB implementation
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-fs-type-fsfs">
-   <term>
-    <constant>SVN_FS_TYPE_FSFS</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Filesystem is native-filesystem implementation
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist>
-  <title>Reserved property constants</title>
-  <varlistentry xml:id="constant.svn-prop-revision-date">
-   <term>
-    <constant>SVN_PROP_REVISION_DATE</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     svn:date
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-prop-revision-orig-date">
-   <term>
-    <constant>SVN_PROP_REVISION_ORIG_DATE</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     svn:original-date
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-prop-revision-author">
-   <term>
-    <constant>SVN_PROP_REVISION_AUTHOR</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     svn:author
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-prop-revision-log">
-   <term>
-    <constant>SVN_PROP_REVISION_LOG</constant> 
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     svn:log
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="svn.constants.status">
-  <title>Working copy status constants</title>
-  <varlistentry xml:id="constant.svn-wc-status-none">
-   <term>
-    <constant>SVN_WC_STATUS_NONE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Status does not exist
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-unversioned">
-   <term>
-    <constant>SVN_WC_STATUS_UNVERSIONED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item is not versioned in working copy
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-normal">
-   <term>
-    <constant>SVN_WC_STATUS_NORMAL</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item exists, nothing else is happening
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-added">
-   <term>
-    <constant>SVN_WC_STATUS_ADDED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item is scheduled for addition
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-missing">
-   <term>
-    <constant>SVN_WC_STATUS_MISSING</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item is versioned but missing from the working copy
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-deleted">
-   <term>
-    <constant>SVN_WC_STATUS_DELETED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item is scheduled for deletion
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-replaced">
-   <term>
-    <constant>SVN_WC_STATUS_REPLACED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item was deleted and then re-added
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-modified">
-   <term>
-    <constant>SVN_WC_STATUS_MODIFIED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item (text or properties) was modified
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-merged">
-   <term>
-    <constant>SVN_WC_STATUS_MERGED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item's local modifications were merged with repository modifications
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-conflicted">
-   <term>
-    <constant>SVN_WC_STATUS_CONFLICTED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item's local modifications conflicted with repository modifications
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-ignored">
-   <term>
-    <constant>SVN_WC_STATUS_IGNORED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Item is unversioned but configured to be ignored
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-obstructed">
-   <term>
-    <constant>SVN_WC_STATUS_OBSTRUCTED</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Unversioned item is in the way of a versioned resource
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-external">
-   <term>
-    <constant>SVN_WC_STATUS_EXTERNAL</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Unversioned path that is populated using svn:externals
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-wc-status-incomplete">
-   <term>
-    <constant>SVN_WC_STATUS_INCOMPLETE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Directory does not contain complete entries list
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
- <variablelist xml:id="svn.constants.type">
-  <title>Node type constants</title>
-  <varlistentry xml:id="constant.svn-node-none">
-   <term>
-    <constant>SVN_NODE_NONE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Absent
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-node-file">
-   <term>
-    <constant>SVN_NODE_FILE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     File
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-node-dir">
-   <term>
-    <constant>SVN_NODE_DIR</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Directory
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.svn-node-unknown">
-   <term>
-    <constant>SVN_NODE_UNKNOWN</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Something Subversion cannot identify
-    </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/svn/functions/svn-add.xml b/reference/svn/functions/svn-add.xml
deleted file mode 100644
index 99a6b4b5e51b..000000000000
--- a/reference/svn/functions/svn-add.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_add</refname>
-  <refpurpose>Schedules the addition of an item in a working directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_add</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>force</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds the file, directory or symbolic link at <parameter>path</parameter>
-   to the working directory. The item will be added to the repository
-   the next time you call <function>svn_commit</function> on the working
-   copy.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path of item to add.
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recursive</parameter></term>
-    <listitem>
-     <simpara>
-      If item is directory, whether or not to recursively add
-      all of its contents. Default is &true;
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>force</parameter></term>
-    <listitem>
-     <simpara>
-      If true, Subversion will recurse into already versioned directories
-      in order to add unversioned files that may be hiding in those
-      directories. Default is &false;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>svn_add</function> example</title>
-   <simpara>
-    In a working directory where <userinput>svn status</userinput>
-    returns:
-   </simpara>
-   <screen>
-<![CDATA[
-$ svn status
-?      foobar.txt
-]]>
-   </screen>
-   <simpara>...this code:</simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_add('foobar.txt');
-?>
-]]>
-   </programlisting>
-   <simpara>
-    ...will schedule <filename>foobar.txt</filename> for addition into
-    the repository.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.svn.manual.add;">SVN documentation on svn add</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/svn/functions/svn-auth-get-parameter.xml b/reference/svn/functions/svn-auth-get-parameter.xml
deleted file mode 100644
index 61eeef93613b..000000000000
--- a/reference/svn/functions/svn-auth-get-parameter.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-auth-get-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_auth_get_parameter</refname>
-  <refpurpose>Retrieves authentication parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>svn_auth_get_parameter</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves authentication parameter at <parameter>key</parameter>.
-   For a list of valid keys and their meanings, consult the
-   <link linkend="svn.constants.auth">authentication constants list</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      String key name. Use the <link linkend="svn.constants.auth">authentication constants</link>
-      defined by this extension to specify a key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string value of the parameter at <parameter>key</parameter>;
-   returns &null; if parameter does not exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_auth_set_parameter</function></member>
-   <member><link linkend="svn.constants.auth">Authentication constants</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/svn/functions/svn-auth-set-parameter.xml b/reference/svn/functions/svn-auth-set-parameter.xml
deleted file mode 100644
index 17146f20bcb3..000000000000
--- a/reference/svn/functions/svn-auth-set-parameter.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-auth-set-parameter" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_auth_set_parameter</refname>
-  <refpurpose>Sets an authentication parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>svn_auth_set_parameter</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets authentication parameter at <parameter>key</parameter> to <parameter>value</parameter>.
-   For a list of valid keys and their meanings, consult the
-   <link linkend="svn.constants.auth">authentication constants list</link>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      String key name. Use the <link linkend="svn.constants.auth">authentication constants</link>
-      defined by this extension to specify a key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      String value to set to parameter at key. Format of value varies
-      with the parameter.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Default authentication example</title>
-   <simpara>
-    This example configures SVN so that the default username to use
-    is 'Bob' and the default password is 'abc123':
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_auth_set_parameter(SVN_AUTH_PARAM_DEFAULT_USERNAME, 'Bob');
-svn_auth_set_parameter(SVN_AUTH_PARAM_DEFAULT_PASSWORD, 'abc123');
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_auth_get_parameter</function></member>
-   <member><link linkend="svn.constants.auth">Authentication constants</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/svn/functions/svn-blame.xml b/reference/svn/functions/svn-blame.xml
deleted file mode 100644
index 5f84cc354c84..000000000000
--- a/reference/svn/functions/svn-blame.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.svn-blame">
- <refnamediv>
-  <refname>svn_blame</refname>
-  <refpurpose>Get the SVN blame for a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_blame</methodname>
-   <methodparam><type>string</type><parameter>repository_url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revision_no</parameter><initializer>SVN_REVISION_HEAD</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get the SVN blame of a file from a repository URL.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>repository_url</parameter></term>
-    <listitem>
-     <simpara>
-      The repository URL.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>revision_no</parameter></term>
-    <listitem>
-     <simpara>
-      The revision number.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> of SVN blame information separated by line
-   which includes the revision number, line number, line of code,
-   author, and date.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>svn_blame</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$svnurl = 'http://svn.example.org/svnroot/foo/trunk/index.php';
-
-print_r( svn_blame($svnurl) );
-
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] = Array
-          (
-           [rev] = 1
-           [line_no] = 1
-           [line] = Hello World
-           [author] = joesmith
-           [date] = 2007-07-02T05:51:26.628396Z
-          )
-    [1] = Array
-          ...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_diff</function></member>
-   <member><function>svn_logs</function></member>
-   <member><function>svn_status</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/svn/functions/svn-cat.xml b/reference/svn/functions/svn-cat.xml
deleted file mode 100644
index 8233a1f2a0af..000000000000
--- a/reference/svn/functions/svn-cat.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-cat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_cat</refname>
-  <refpurpose>Returns the contents of a file in a repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>svn_cat</methodname>
-   <methodparam><type>string</type><parameter>repos_url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revision_no</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the contents of the URL <parameter>repos_url</parameter> to
-   a file in the repository, optionally at revision number
-   <parameter>revision_no</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>repos_url</parameter></term>
-    <listitem>
-     <simpara>
-      String URL path to item in a repository.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>revision_no</parameter></term>
-    <listitem>
-     <simpara>
-      Integer revision number of item to retrieve, default is the HEAD
-      revision.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the string contents of the item from the repository on
-   success, and &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example retrieves the contents of a file at revision 28:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$contents = svn_cat('http://www.example.com/svnroot/calc/gui.c', 28)
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_list</function></member>
-   <member><link xlink:href="&url.svn.manual.cat;">SVN documentation on svn cat</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/svn/functions/svn-checkout.xml b/reference/svn/functions/svn-checkout.xml
deleted file mode 100644
index 0344e74149e8..000000000000
--- a/reference/svn/functions/svn-checkout.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-checkout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_checkout</refname>
-  <refpurpose>Checks out a working copy from the repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_checkout</methodname>
-   <methodparam><type>string</type><parameter>repos</parameter></methodparam>
-   <methodparam><type>string</type><parameter>targetpath</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revision</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks out a working copy from the repository at <parameter>repos</parameter>
-   to <parameter>targetpath</parameter> at revision <parameter>revision</parameter>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>repos</parameter></term>
-    <listitem>
-     <simpara>
-      String URL path to directory in repository to check out.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>targetpath</parameter></term>
-    <listitem>
-     <simpara>
-      String local path to directory to check out in to
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>revision</parameter></term>
-    <listitem>
-     <simpara>
-      Integer revision number of repository to check out. Default is
-      HEAD, the most recent revision.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Any combination of <constant>SVN_NON_RECURSIVE</constant> and
-      <constant>SVN_IGNORE_EXTERNALS</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates how to check out a directory from
-    a repository to a directory named calc:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_checkout('http://www.example.com/svnroot/calc/trunk', dirname(__FILE__) . '/calc');
-?>
-]]>
-   </programlisting>
-   <simpara>
-    The <literal>dirname(__FILE__)</literal> call is necessary in order
-    to convert the calc relative path into an absolute one. If calc
-    exists, you can also use <function>realpath</function> to retrieve
-    an absolute path.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_add</function></member>
-   <member><function>svn_commit</function></member>
-   <member><function>svn_status</function></member>
-   <member><function>svn_update</function></member>
-   <member><link xlink:href="&url.svn.manual.checkout;">SVN documentation on svn checkout</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/svn/functions/svn-cleanup.xml b/reference/svn/functions/svn-cleanup.xml
deleted file mode 100644
index 914a1d52917f..000000000000
--- a/reference/svn/functions/svn-cleanup.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-cleanup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_cleanup</refname>
-  <refpurpose>Recursively cleanup a working copy directory, finishing incomplete operations and removing locks</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_cleanup</methodname>
-   <methodparam><type>string</type><parameter>workingdir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Recursively cleanup working copy directory <parameter>workingdir</parameter>,
-   finishing any incomplete operations and removing working copy locks. Use
-   when a working copy is in limbo and needs to be usable again.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>workingdir</parameter></term>
-    <listitem>
-     <simpara>
-      String path to local working directory to cleanup
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates clean up of a working copy in a
-    directory named help-me:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_cleanup(realpath('help-me'));
-?>
-]]>
-   </programlisting>
-   <simpara>
-    The <function>realpath</function> call is necessary due to
-    SVN's quirky handling of relative paths.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>update</function></member>
-   <member><link xlink:href="&url.svn.manual.cleanup;">SVN documentation on svn cleanup</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/svn/functions/svn-client-version.xml b/reference/svn/functions/svn-client-version.xml
deleted file mode 100644
index 3e7067324d23..000000000000
--- a/reference/svn/functions/svn-client-version.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-client-version" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_client_version</refname>
-  <refpurpose>Returns the version of the SVN client libraries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>svn_client_version</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns the version of the SVN client libraries
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   String version number, usually in form of x.y.z.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo svn_client_version();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1.3.1
-]]>
-   </screen>
-  </example>
- </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/svn/functions/svn-commit.xml b/reference/svn/functions/svn-commit.xml
deleted file mode 100644
index 2a6872332c63..000000000000
--- a/reference/svn/functions/svn-commit.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-commit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_commit</refname>
-  <refpurpose>Sends changes from the local working copy to the repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_commit</methodname>
-   <methodparam><type>string</type><parameter>log</parameter></methodparam>
-   <methodparam><type>array</type><parameter>targets</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits changes made in the local working copy files enumerated in
-   the <parameter>targets</parameter> array to the repository, with the
-   log message <parameter>log</parameter>. Directories in the <parameter>targets</parameter>
-   array will be recursively committed unless <parameter>recursive</parameter>
-   is set to &false;.
-  </simpara>
-  <note>
-   <simpara>
-    This function does not have any parameters for specifying authentication,
-    so a username and password must be set using <function>svn_auth_set_parameter</function>
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>log</parameter></term>
-    <listitem>
-     <simpara>
-      String log text to commit
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>targets</parameter></term>
-    <listitem>
-     <simpara>
-      Array of local paths of files to be committed
-     </simpara>
-     <warning>
-      <simpara>
-       This parameter must be an array, a string for a single
-       target is not acceptable.
-      </simpara>
-     </warning>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recursive</parameter></term>
-    <listitem>
-     <simpara>
-      Boolean flag to disable recursive committing of
-      directories in the <parameter>targets</parameter> array.
-      Default is &true;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns array in form of:
-  </simpara>
-    <screen>
-<![CDATA[
-array(
-    0 => integer revision number of commit
-    1 => string ISO 8601 date and time of commit
-    2 => name of committer
-)
-]]>
-    </screen>
-  <simpara>
-   Returns &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example commits the calculator directory to a repository, using
-    the username Bob and the password abc123 (hopefully, his password is
-    stronger):
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_auth_set_parameter(SVN_AUTH_PARAM_DEFAULT_USERNAME, 'Bob');
-svn_auth_set_parameter(SVN_AUTH_PARAM_DEFAULT_PASSWORD, 'abc123');
-var_dump(svn_commit('Log message of Bob\'s commit', array(realpath('calculator'))));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(
-  0 => 1415,
-  1 => '2007-05-26T01:44:28.453125Z',
-  2 => 'Bob'
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_auth_set_parameter</function></member>
-   <member><link xlink:href="&url.svn.manual.commit;">SVN documentation on svn commit</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/svn/functions/svn-delete.xml b/reference/svn/functions/svn-delete.xml
deleted file mode 100644
index e162c25aa268..000000000000
--- a/reference/svn/functions/svn-delete.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.svn-delete">
- <refnamediv>
-  <refname>svn_delete</refname>
-  <refpurpose>Delete items from a working copy or repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_delete</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>force</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Deletes the file, directory or symbolic link at <parameter>path</parameter>
-   from the working directory. The item will be deleted from the repository
-   the next time you call <function>svn_commit</function> on the working
-   copy.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path of item to delete.
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>force</parameter></term>
-    <listitem>
-     <simpara>
-      If &true;, the file will be deleted even if it has local modifications.
-      Otherwise, local modifications will result in a failure. Default is
-      &false;
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.svn.manual.delete;">SVN documentation on svn
-   delete</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/svn/functions/svn-diff.xml b/reference/svn/functions/svn-diff.xml
deleted file mode 100644
index bdb3d2513c2e..000000000000
--- a/reference/svn/functions/svn-diff.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_diff</refname>
-  <refpurpose>Recursively diffs two paths</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_diff</methodname>
-   <methodparam><type>string</type><parameter>path1</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rev1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path2</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rev2</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Recursively diffs two paths, <parameter>path1</parameter> and
-   <parameter>path2</parameter>.
-  </simpara>
-  <note>
-   <simpara>
-    This is not a general-purpose diff utility. Only local files
-    that are versioned may be diffed: other files will fail.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path1</parameter></term>
-    <listitem>
-     <simpara>
-      First path to diff. This can be a URL to a file/directory in an SVN
-      repository or a local file/directory path.
-     </simpara>
-     &svn.relativepath;
-     <warning>
-      <simpara>
-       If a local file path has only backslashes and no forward slashes,
-       this extension will fail to find the path. Always
-       replace all backslashes with forward slashes when using this
-       function.
-      </simpara>
-     </warning>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rev1</parameter></term>
-    <listitem>
-     <simpara>
-      First path's revision number. Use <constant>SVN_REVISION_HEAD</constant>
-      to specify the most recent revision.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path2</parameter></term>
-    <listitem>
-     <simpara>
-      Second path to diff. See <parameter>path1</parameter> for description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rev2</parameter></term>
-    <listitem>
-     <simpara>
-      Second path's revision number. See <parameter>rev1</parameter>
-      for description.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array-list consisting of two streams: the first is the diff output
-   and the second contains error stream output. The streams can be
-   read using <function>fread</function>. Returns &false; or &null; on
-   error.
-  </simpara>
-  <simpara>
-   The diff output will, by default, be in the form of Subversion's
-   custom unified diff format, but an
-   <link xlink:href="&url.svn.manual.externaldifftools;">external
-   diff engine</link> may be
-   used depending on Subversion's configuration.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates the basic usage of this function, and
-    the retrieval of contents from the stream:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-list($diff, $errors) = svn_diff(
-    'http://www.example.com/svnroot/trunk/foo', SVN_REVISION_HEAD,
-    'http://www.example.com/svnroot/branches/dev/foo', SVN_REVISION_HEAD
-);
-if (!$diff) exit;
-$contents = '';
-while (!feof($diff)) {
-  $contents .= fread($diff, 8192);
-}
-fclose($diff);
-fclose($errors);
-var_dump($contents);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Index: http://www.example.com/svnroot/trunk/foo
-===================================================================
---- http://www.example.com/svnroot/trunk/foo        (.../foo) (revision 23)
-+++ http://www.example.com/svnroot/branches/dev/foo (.../foo) (revision 27)
- // further diff output
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Diffing two revisions of a repository path</title>
-   <simpara>
-    This example implements a wrapper function that allows a user
-    to easily diff two revisions of the same item using an external
-    repository path (the default syntax is somewhat verbose):
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function svn_diff_same_item($path, $rev1, $rev2) {
-    return svn_diff($path, $rev1, $path, $rev2);
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Portably diffing two local files</title>
-   <simpara>
-    This example implements a wrapper function that portably
-    diffs two local files, compensating for the <function>realpath</function>
-    fix and the backslashes bug:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function svn_diff_local($path1, $rev1, $path2, $rev2) {
-    $path1 = str_replace('\\', '/', realpath($path1));
-    $path2 = str_replace('\\', '/', realpath($path2));
-    return svn_diff($path1, $rev1, $path2, $rev2);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link xlink:href="&url.svn.manual.diff;">SVN documentation on svn diff</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/svn/functions/svn-export.xml b/reference/svn/functions/svn-export.xml
deleted file mode 100644
index b596b56681aa..000000000000
--- a/reference/svn/functions/svn-export.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.svn-export">
- <refnamediv>
-  <refname>svn_export</refname>
-  <refpurpose>Export the contents of a SVN directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_export</methodname>
-   <methodparam><type>string</type><parameter>frompath</parameter></methodparam>
-   <methodparam><type>string</type><parameter>topath</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>working_copy</parameter><initializer>&true;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revision_no</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Export the contents of either a working copy or repository into a
-   'clean' directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>frompath</parameter></term>
-    <listitem>
-     <simpara>
-      The path to the current repository.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>topath</parameter></term>
-    <listitem>
-     <simpara>
-      The path to the new repository.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>working_copy</parameter></term>
-    <listitem>
-     <simpara>
-      If &true;, it will export uncommitted files from the working copy.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>svn_export</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$working_dir     = '../';
-$new_working_dir = '/home/user/devel/foo/trunk';
-
-svn_export($working_dir, $new_working_dir);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_import</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/svn/functions/svn-fs-abort-txn.xml b/reference/svn/functions/svn-fs-abort-txn.xml
deleted file mode 100644
index caf7cc3747ab..000000000000
--- a/reference/svn/functions/svn-fs-abort-txn.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-abort-txn" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_abort_txn</refname>
-  <refpurpose>Aborts a transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_abort_txn</methodname>
-   <methodparam><type>resource</type><parameter>txn</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Aborts a transaction.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>txn</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </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/svn/functions/svn-fs-apply-text.xml b/reference/svn/functions/svn-fs-apply-text.xml
deleted file mode 100644
index d2c4fd9c550f..000000000000
--- a/reference/svn/functions/svn-fs-apply-text.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-apply-text" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_apply_text</refname>
-  <refpurpose>Creates and returns a stream that will be used to replace the contents of a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_fs_apply_text</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Creates and returns a stream that will be used to replace the contents of a file.
-  </simpara>
- </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/svn/functions/svn-fs-begin-txn2.xml b/reference/svn/functions/svn-fs-begin-txn2.xml
deleted file mode 100644
index 69654ec99b1a..000000000000
--- a/reference/svn/functions/svn-fs-begin-txn2.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-begin-txn2" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_begin_txn2</refname>
-  <refpurpose>Create a new transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_fs_begin_txn2</methodname>
-   <methodparam><type>resource</type><parameter>repos</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rev</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Create a new transaction
-  </simpara>
- </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/svn/functions/svn-fs-change-node-prop.xml b/reference/svn/functions/svn-fs-change-node-prop.xml
deleted file mode 100644
index 4e9e4d30a537..000000000000
--- a/reference/svn/functions/svn-fs-change-node-prop.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-change-node-prop" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_change_node_prop</refname>
-  <refpurpose>Return true if everything is ok, false otherwise</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_change_node_prop</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Return true if everything is ok, false otherwise
-  </simpara>
- </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/svn/functions/svn-fs-check-path.xml b/reference/svn/functions/svn-fs-check-path.xml
deleted file mode 100644
index b366ecad5378..000000000000
--- a/reference/svn/functions/svn-fs-check-path.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-check-path" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_check_path</refname>
-  <refpurpose>Determines what kind of item lives at path in a given repository fsroot</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_fs_check_path</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Determines what kind of item lives at path in a given repository fsroot
-  </simpara>
- </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/svn/functions/svn-fs-contents-changed.xml b/reference/svn/functions/svn-fs-contents-changed.xml
deleted file mode 100644
index f71ad3f02de7..000000000000
--- a/reference/svn/functions/svn-fs-contents-changed.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-contents-changed" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_contents_changed</refname>
-  <refpurpose>Return true if content is different, false otherwise</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_contents_changed</methodname>
-   <methodparam><type>resource</type><parameter>root1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path1</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>root2</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path2</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Return true if content is different, false otherwise
-  </simpara>
- </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/svn/functions/svn-fs-copy.xml b/reference/svn/functions/svn-fs-copy.xml
deleted file mode 100644
index 8d04a85251a0..000000000000
--- a/reference/svn/functions/svn-fs-copy.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-copy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_copy</refname>
-  <refpurpose>Copies a file or a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_copy</methodname>
-   <methodparam><type>resource</type><parameter>from_root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>from_path</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>to_root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>to_path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Copies a file or a directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from_root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>from_path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to_root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to_path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </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/svn/functions/svn-fs-delete.xml b/reference/svn/functions/svn-fs-delete.xml
deleted file mode 100644
index 5aca845da904..000000000000
--- a/reference/svn/functions/svn-fs-delete.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-delete" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_delete</refname>
-  <refpurpose>Deletes a file or a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_delete</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Deletes a file or a directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </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/svn/functions/svn-fs-dir-entries.xml b/reference/svn/functions/svn-fs-dir-entries.xml
deleted file mode 100644
index aab48816f64c..000000000000
--- a/reference/svn/functions/svn-fs-dir-entries.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-dir-entries" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_dir_entries</refname>
-  <refpurpose>Enumerates the directory entries under path; returns a hash of dir names to file type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_fs_dir_entries</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Enumerates the directory entries under path; returns a hash of dir names to file type
-  </simpara>
- </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/svn/functions/svn-fs-file-contents.xml b/reference/svn/functions/svn-fs-file-contents.xml
deleted file mode 100644
index 288212338b83..000000000000
--- a/reference/svn/functions/svn-fs-file-contents.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-file-contents" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_file_contents</refname>
-  <refpurpose>Returns a stream to access the contents of a file from a given version of the fs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_fs_file_contents</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Returns a stream to access the contents of a file from a given version of the fs
-  </simpara>
- </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/svn/functions/svn-fs-file-length.xml b/reference/svn/functions/svn-fs-file-length.xml
deleted file mode 100644
index 16f70702d160..000000000000
--- a/reference/svn/functions/svn-fs-file-length.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-file-length" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_file_length</refname>
-  <refpurpose>Returns the length of a file from a given version of the fs</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_fs_file_length</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Returns the length of a file from a given version of the fs
-  </simpara>
- </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/svn/functions/svn-fs-is-dir.xml b/reference/svn/functions/svn-fs-is-dir.xml
deleted file mode 100644
index 0be03c261cc5..000000000000
--- a/reference/svn/functions/svn-fs-is-dir.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-is-dir" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_is_dir</refname>
-  <refpurpose>Determines if a path points to a directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_is_dir</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Determines if the given path points to a directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the path points to a directory, &false; otherwise.
-  </simpara>
- </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/svn/functions/svn-fs-is-file.xml b/reference/svn/functions/svn-fs-is-file.xml
deleted file mode 100644
index 4280ee508c60..000000000000
--- a/reference/svn/functions/svn-fs-is-file.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-is-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_is_file</refname>
-  <refpurpose>Determines if a path points to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_is_file</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Determines if the given path points to a file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the path points to a file, &false; otherwise.
-  </simpara>
- </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/svn/functions/svn-fs-make-dir.xml b/reference/svn/functions/svn-fs-make-dir.xml
deleted file mode 100644
index c42cabe803e2..000000000000
--- a/reference/svn/functions/svn-fs-make-dir.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-make-dir" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_make_dir</refname>
-  <refpurpose>Creates a new empty directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_make_dir</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Creates a new empty directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </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/svn/functions/svn-fs-make-file.xml b/reference/svn/functions/svn-fs-make-file.xml
deleted file mode 100644
index 2ec68b1ea643..000000000000
--- a/reference/svn/functions/svn-fs-make-file.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-make-file" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_make_file</refname>
-  <refpurpose>Creates a new empty file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_make_file</methodname>
-   <methodparam><type>resource</type><parameter>root</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Creates a new empty file.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>root</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </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/svn/functions/svn-fs-node-created-rev.xml b/reference/svn/functions/svn-fs-node-created-rev.xml
deleted file mode 100644
index ab23c9db5a50..000000000000
--- a/reference/svn/functions/svn-fs-node-created-rev.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-node-created-rev" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_node_created_rev</refname>
-  <refpurpose>Returns the revision in which path under fsroot was created</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_fs_node_created_rev</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Returns the revision in which path under fsroot was created
-  </simpara>
- </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/svn/functions/svn-fs-node-prop.xml b/reference/svn/functions/svn-fs-node-prop.xml
deleted file mode 100644
index b64e8086012f..000000000000
--- a/reference/svn/functions/svn-fs-node-prop.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-node-prop" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_node_prop</refname>
-  <refpurpose>Returns the value of a property for a node</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>svn_fs_node_prop</methodname>
-   <methodparam><type>resource</type><parameter>fsroot</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>propname</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Returns the value of a property for a node
-  </simpara>
- </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/svn/functions/svn-fs-props-changed.xml b/reference/svn/functions/svn-fs-props-changed.xml
deleted file mode 100644
index c2ee54334ea8..000000000000
--- a/reference/svn/functions/svn-fs-props-changed.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-props-changed" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_props_changed</refname>
-  <refpurpose>Return true if props are different, false otherwise</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_fs_props_changed</methodname>
-   <methodparam><type>resource</type><parameter>root1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path1</parameter></methodparam>
-   <methodparam><type>resource</type><parameter>root2</parameter></methodparam>
-   <methodparam><type>string</type><parameter>path2</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Return true if props are different, false otherwise
-  </simpara>
- </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/svn/functions/svn-fs-revision-prop.xml b/reference/svn/functions/svn-fs-revision-prop.xml
deleted file mode 100644
index 77a8b3af9f15..000000000000
--- a/reference/svn/functions/svn-fs-revision-prop.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-revision-prop" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_revision_prop</refname>
-  <refpurpose>Fetches the value of a named property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>svn_fs_revision_prop</methodname>
-   <methodparam><type>resource</type><parameter>fs</parameter></methodparam>
-   <methodparam><type>int</type><parameter>revnum</parameter></methodparam>
-   <methodparam><type>string</type><parameter>propname</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Fetches the value of a named property
-  </simpara>
- </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/svn/functions/svn-fs-revision-root.xml b/reference/svn/functions/svn-fs-revision-root.xml
deleted file mode 100644
index 03f9bb0d5412..000000000000
--- a/reference/svn/functions/svn-fs-revision-root.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-revision-root" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_revision_root</refname>
-  <refpurpose>Get a handle on a specific version of the repository root</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_fs_revision_root</methodname>
-   <methodparam><type>resource</type><parameter>fs</parameter></methodparam>
-   <methodparam><type>int</type><parameter>revnum</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Get a handle on a specific version of the repository root
-  </simpara>
- </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/svn/functions/svn-fs-txn-root.xml b/reference/svn/functions/svn-fs-txn-root.xml
deleted file mode 100644
index 76567a04449b..000000000000
--- a/reference/svn/functions/svn-fs-txn-root.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-txn-root" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_txn_root</refname>
-  <refpurpose>Creates and returns a transaction root</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_fs_txn_root</methodname>
-   <methodparam><type>resource</type><parameter>txn</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Creates and returns a transaction root
-  </simpara>
- </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/svn/functions/svn-fs-youngest-rev.xml b/reference/svn/functions/svn-fs-youngest-rev.xml
deleted file mode 100644
index c44a4cd57315..000000000000
--- a/reference/svn/functions/svn-fs-youngest-rev.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-fs-youngest-rev" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_fs_youngest_rev</refname>
-  <refpurpose>Returns the number of the youngest revision in the filesystem</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_fs_youngest_rev</methodname>
-   <methodparam><type>resource</type><parameter>fs</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Returns the number of the youngest revision in the filesystem
-  </simpara>
- </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/svn/functions/svn-import.xml b/reference/svn/functions/svn-import.xml
deleted file mode 100644
index 0fb23b6cc7b0..000000000000
--- a/reference/svn/functions/svn-import.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-import" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_import</refname>
-  <refpurpose>Imports an unversioned path into a repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_import</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>nonrecursive</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Commits unversioned <parameter>path</parameter> into repository at
-   <parameter>url</parameter>. If <parameter>path</parameter> is a
-   directory and <parameter>nonrecursive</parameter> is &false;,
-   the directory will be imported recursively.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path of file or directory to import.
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      Repository URL to import into.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nonrecursive</parameter></term>
-    <listitem>
-     <simpara>
-      Whether or not to refrain from recursively processing directories.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates a basic use-case of this function. To import
-    a directory named new-files into the repository at
-    http://www.example.com/svnroot/incoming/abc, use:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-svn_import(realpath('new-files'), 'http://www.example.com/svnroot/incoming/abc', false);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_add</function></member>
-   <member><link xlink:href="&url.svn.manual.import;">SVN documentation for svn import</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/svn/functions/svn-log.xml b/reference/svn/functions/svn-log.xml
deleted file mode 100644
index 6c4787e0980e..000000000000
--- a/reference/svn/functions/svn-log.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_log</refname>
-  <refpurpose>Returns the commit log messages of a repository URL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_log</methodname>
-   <methodparam><type>string</type><parameter>repos_url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start_revision</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>end_revision</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>SVN_DISCOVER_CHANGED_PATHS | SVN_STOP_ON_COPY</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>svn_log</function> returns the complete history of the item at the repository URL
-   <parameter>repos_url</parameter>, or the history of a specific revision
-   if <parameter>start_revision</parameter> is set. This function is equivalent
-   to <userinput>svn log --verbose -r $start_revision $repos_url</userinput>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>repos_url</parameter></term>
-    <listitem>
-     <simpara>
-      Repository URL of the item to retrieve log history from.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start_revision</parameter></term>
-    <listitem>
-     <simpara>
-      Revision number of the first log to retrieve. Use
-      <constant>SVN_REVISION_HEAD</constant> to retrieve the log from
-      the most recent revision.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>end_revision</parameter></term>
-    <listitem>
-     <simpara>
-      Revision number of the last log to retrieve. Defaults to
-      <parameter>start_revision</parameter> if specified or to
-      <constant>SVN_REVISION_INITIAL</constant> otherwise.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Number of logs to retrieve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Any combination of <constant>SVN_OMIT_MESSAGES</constant>,
-      <constant>SVN_DISCOVER_CHANGED_PATHS</constant> and
-      <constant>SVN_STOP_ON_COPY</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success, this function returns an array file listing in the format
-   of:
-   <screen>
-<![CDATA[
-[0] => Array, ordered most recent (highest) revision first
-(
-    [rev] => integer revision number
-    [author] => string author name
-    [msg] => string log message
-    [date] => string date formatted per ISO 8601, i.e. date('c')
-    [paths] => Array, describing changed files
-        (
-            [0] => Array
-                (
-                    [action] => string letter signifying change
-                    [path] =>  absolute repository path of changed file
-                )
-            [1] => ...
-        )
-)
-[1] => ...
-]]>
-    </screen>
-  </para>
-  <note>
-   <simpara>
-    The output will always be a numerically indexed array of arrays,
-    even when there are none or only one log message(s).
-   </simpara>
-  </note>
-  <simpara>
-   The value of <varname>action</varname> is a subset of the
-   <link xlink:href="&url.svn.manual.status;">status output
-   in the first column</link>, where possible values are:
-  </simpara>
-  <table>
-   <title>Actions</title>
-   <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Letter</entry>
-       <entry>Description</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>M</entry>
-       <entry>Item/props was modified</entry>
-      </row>
-      <row>
-       <entry>A</entry>
-       <entry>Item was added</entry>
-      </row>
-      <row>
-       <entry>D</entry>
-       <entry>Item was deleted</entry>
-      </row>
-      <row>
-       <entry>R</entry>
-       <entry>Item was replaced</entry>
-      </row>
-     </tbody>
-    </tgroup>
-  </table>
-  <simpara>
-   If no changes were made to the item, an empty array is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>svn_log</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print_r( svn_log('http://www.example.com/', 23) );
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-    (
-        [rev] => 23
-        [author] => 'joe'
-        [msg] => 'Add cheese and salami to our sandwich.'
-        [date] => '2007-04-06T16:00:27-04:00'
-        [paths] => Array
-            (
-                [0] => Array
-                    (
-                        [action] => 'M'
-                        [path] =>  '/sandwich.txt'
-                    )
-            )
-    )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link xlink:href="&url.svn.manual.log;">
-     SVN documentation on svn log
-    </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/svn/functions/svn-ls.xml b/reference/svn/functions/svn-ls.xml
deleted file mode 100644
index 2b19e991ff65..000000000000
--- a/reference/svn/functions/svn-ls.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="function.svn-ls">
- <refnamediv>
-  <refname>svn_ls</refname>
-  <refpurpose>Returns list of directory contents in repository URL, optionally at revision number</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_ls</methodname>
-   <methodparam><type>string</type><parameter>repos_url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revision_no</parameter><initializer>SVN_REVISION_HEAD</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recurse</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>peg</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function queries the repository URL and returns a list of
-   files and directories, optionally from a specific revision. This
-   is equivalent to <userinput>svn list $repos_url[@$revision_no]</userinput>
-  </simpara>
-  <note>
-   <simpara>
-    This function does not work with working copies. <parameter>repos_url</parameter>
-    <emphasis>must</emphasis> be a repository URL.
-   </simpara>
-  </note>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      URL of the repository, eg. <userinput>http://www.example.com/svnroot</userinput>.
-      To access a local Subversion repository via filesystem, use the
-      file URI scheme, eg. <userinput>file:///home/user/svn-repos</userinput>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>revision</parameter></term>
-    <listitem>
-     <simpara>
-      Integer revision number to retrieve listing of. When omitted,
-      the HEAD revision is used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recurse</parameter></term>
-    <listitem>
-     <simpara>
-      Enables recursion.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success, this function returns an array file listing in the format
-   of:
-   <screen>
-<![CDATA[
-[0] => Array
-    (
-        [created_rev] => integer revision number of last edit
-        [last_author] => string author name of last edit
-        [size] => integer byte file size of file
-        [time] => string date of last edit in form 'M d H:i'
-                  or 'M d Y', depending on how old the file is
-        [time_t] => integer unix timestamp of last edit
-        [name] => name of file/directory
-        [type] => type, can be 'file' or 'dir'
-    )
-[1] => ...
-]]>
-    </screen>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>svn_ls</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print_r( svn_ls('http://www.example.com/svnroot/') );
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [created_rev] => 20
-            [last_author] => Joe
-            [size] => 0
-            [time] => Apr 02 09:28
-            [time_t] => 1175520529
-            [name] => tags
-            [type] => dir
-        )
-    [1] => Array
-        (
-            [created_rev] => 23
-            [last_author] => Bob
-            [size] => 0
-            [time] => Apr 02 15:15
-            [time_t] => 1175541322
-            [name] => trunk
-            [type] => dir
-        )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member>
-    <link xlink:href="&url.svn.manual.list;">SVN documentation on svn list</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/svn/functions/svn-mkdir.xml b/reference/svn/functions/svn-mkdir.xml
deleted file mode 100644
index 3d004d11395c..000000000000
--- a/reference/svn/functions/svn-mkdir.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.svn-mkdir">
- <refnamediv>
-  <refname>svn_mkdir</refname>
-  <refpurpose>Creates a directory in a working copy or repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_mkdir</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>log_message</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a directory in a working copy or repository.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      The path to the working copy or repository.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_add</function></member>
-   <member><function>svn_copy</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/svn/functions/svn-repos-create.xml b/reference/svn/functions/svn-repos-create.xml
deleted file mode 100644
index e348d9ee7f85..000000000000
--- a/reference/svn/functions/svn-repos-create.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-create" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_create</refname>
-  <refpurpose>Create a new subversion repository at path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_repos_create</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>fsconfig</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Create a new subversion repository at path
-  </simpara>
- </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/svn/functions/svn-repos-fs-begin-txn-for-commit.xml b/reference/svn/functions/svn-repos-fs-begin-txn-for-commit.xml
deleted file mode 100644
index 1234c50c763b..000000000000
--- a/reference/svn/functions/svn-repos-fs-begin-txn-for-commit.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-fs-begin-txn-for-commit" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_fs_begin_txn_for_commit</refname>
-  <refpurpose>Create a new transaction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_repos_fs_begin_txn_for_commit</methodname>
-   <methodparam><type>resource</type><parameter>repos</parameter></methodparam>
-   <methodparam><type>int</type><parameter>rev</parameter></methodparam>
-   <methodparam><type>string</type><parameter>author</parameter></methodparam>
-   <methodparam><type>string</type><parameter>log_msg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Create a new transaction
-  </simpara>
- </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/svn/functions/svn-repos-fs-commit-txn.xml b/reference/svn/functions/svn-repos-fs-commit-txn.xml
deleted file mode 100644
index 3d3df55b33e6..000000000000
--- a/reference/svn/functions/svn-repos-fs-commit-txn.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-fs-commit-txn" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_fs_commit_txn</refname>
-  <refpurpose>Commits a transaction and returns the new revision</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_repos_fs_commit_txn</methodname>
-   <methodparam><type>resource</type><parameter>txn</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Commits a transaction and returns the new revision
-  </simpara>
- </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/svn/functions/svn-repos-fs.xml b/reference/svn/functions/svn-repos-fs.xml
deleted file mode 100644
index 59a9b40bc094..000000000000
--- a/reference/svn/functions/svn-repos-fs.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-fs" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_fs</refname>
-  <refpurpose>Gets a handle on the filesystem for a repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_repos_fs</methodname>
-   <methodparam><type>resource</type><parameter>repos</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Gets a handle on the filesystem for a repository
-  </simpara>
- </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/svn/functions/svn-repos-hotcopy.xml b/reference/svn/functions/svn-repos-hotcopy.xml
deleted file mode 100644
index 9426030bd6ee..000000000000
--- a/reference/svn/functions/svn-repos-hotcopy.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-hotcopy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_hotcopy</refname>
-  <refpurpose>Make a hot-copy of the repos at repospath; copy it to destpath</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_repos_hotcopy</methodname>
-   <methodparam><type>string</type><parameter>repospath</parameter></methodparam>
-   <methodparam><type>string</type><parameter>destpath</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>cleanlogs</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Make a hot-copy of the repos at repospath; copy it to destpath
-  </simpara>
- </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/svn/functions/svn-repos-open.xml b/reference/svn/functions/svn-repos-open.xml
deleted file mode 100644
index 243830307a02..000000000000
--- a/reference/svn/functions/svn-repos-open.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-open" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_open</refname>
-  <refpurpose>Open a shared lock on a repository</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>svn_repos_open</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Open a shared lock on a repository.
-  </simpara>
- </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/svn/functions/svn-repos-recover.xml b/reference/svn/functions/svn-repos-recover.xml
deleted file mode 100644
index 4bfd9d94e902..000000000000
--- a/reference/svn/functions/svn-repos-recover.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-repos-recover" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>svn_repos_recover</refname>
-  <refpurpose>Run recovery procedures on the repository located at path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_repos_recover</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  &warn.undocumented.func;
-  <simpara>
-   Run recovery procedures on the repository located at path.
-  </simpara>
- </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/svn/functions/svn-revert.xml b/reference/svn/functions/svn-revert.xml
deleted file mode 100644
index 1c21077c3241..000000000000
--- a/reference/svn/functions/svn-revert.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.svn-revert">
- <refnamediv>
-  <refname>svn_revert</refname>
-  <refpurpose>Revert changes to the working copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>svn_revert</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recursive</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Revert any local changes to the path in a working copy.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      The path to the working repository.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recursive</parameter></term>
-    <listitem>
-     <simpara>
-      Optionally make recursive changes.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_delete</function></member>
-   <member><function>svn_export</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/svn/functions/svn-status.xml b/reference/svn/functions/svn-status.xml
deleted file mode 100644
index 7b9363cdd439..000000000000
--- a/reference/svn/functions/svn-status.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_status</refname>
-  <refpurpose>Returns the status of working copy files and directories</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>svn_status</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the status of working copy files and directories, giving modifications,
-   additions, deletions and other changes to items in the working copy.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Local path to file or directory to retrieve status of.
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Any combination of <constant>Svn::NON_RECURSIVE</constant>,
-      <constant>Svn::ALL</constant> (regardless of modification status),
-      <constant>Svn::SHOW_UPDATES</constant> (entries will be added for items
-      that are out-of-date), <constant>Svn::NO_IGNORE</constant> (disregard
-      <literal>svn:ignore</literal> properties when scanning for new files)
-      and <constant>Svn::IGNORE_EXTERNALS</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a numerically indexed array of associative arrays detailing
-   the status of items in the repository:
-  </simpara>
-  <screen>
-<![CDATA[
-Array (
-    [0] => Array (
-        // information on item
-    )
-    [1] => ...
-)
-]]>
-  </screen>
-  <simpara>
-   The information on the item is an associative array that can contain
-   the following keys:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><varname>path</varname></term>
-     <listitem>
-      <simpara>
-       String path to file/directory of this entry on local filesystem.
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>text_status</varname></term>
-     <listitem>
-      <simpara>
-       Status of item's text. &svn.referto.status;
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>repos_text_status</varname></term>
-     <listitem>
-      <simpara>
-       Status of item's text in repository. Only accurate if
-       <parameter>update</parameter> was set to &true;.
-       &svn.referto.status;
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>prop_status</varname></term>
-     <listitem>
-      <simpara>
-       Status of item's properties. &svn.referto.status;
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>repos_prop_status</varname></term>
-     <listitem>
-      <simpara>
-       Status of item's property in repository. Only accurate if
-       <parameter>update</parameter> was set to &true;. &svn.referto.status;
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>locked</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the item is locked. (Only set if &true;.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>copied</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the item was copied (scheduled for addition with
-       history). (Only set if &true;.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>switched</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the item was switched using the switch command.
-       (Only set if &true;)
-      </simpara>
-     </listitem>
-   </varlistentry>
-  </variablelist>
-  <simpara>
-   These keys are only set if the item is versioned:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><varname>name</varname></term>
-     <listitem>
-      <simpara>
-       Base name of item in repository.
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>url</varname></term>
-     <listitem>
-      <simpara>
-       URL of item in repository.
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>repos</varname></term>
-     <listitem>
-      <simpara>
-       Base URL of repository.
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>revision</varname></term>
-     <listitem>
-      <simpara>
-       Integer revision of item in working copy.
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>kind</varname></term>
-     <listitem>
-      <simpara>
-       Type of item, i.e. file or directory. &svn.referto.type;
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>schedule</varname></term>
-     <listitem>
-      <simpara>
-       Scheduled action for item, i.e. addition or deletion. Constants
-       for these magic numbers are not available, they can
-       be emulated by using:
-      </simpara>
-       <programlisting role="php">
-<![CDATA[
-<?php
-if (!defined('svn_wc_schedule_normal')) {
-    define('svn_wc_schedule_normal',  0); // nothing special
-    define('svn_wc_schedule_add',     1); // item will be added
-    define('svn_wc_schedule_delete',  2); // item will be deleted
-    define('svn_wc_schedule_replace', 3); // item will be added and deleted
-}
-?>
-]]>
-      </programlisting>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>deleted</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the item was deleted, but parent revision lags
-       behind. (Only set if &true;.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>absent</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the item is absent, that is, Subversion knows that
-       there should be something there but there isn't. (Only set if
-       &true;.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>incomplete</varname></term>
-     <listitem>
-      <simpara>
-       Whether or not the entries file for a directory is incomplete.
-       (Only set if &true;.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>cmt_date</varname></term>
-     <listitem>
-      <simpara>
-       Integer Unix timestamp of last commit date. (Unaffected by <parameter>update</parameter>.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>cmt_rev</varname></term>
-     <listitem>
-      <simpara>
-       Integer revision of last commit. (Unaffected by <parameter>update</parameter>.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>cmt_author</varname></term>
-     <listitem>
-      <simpara>
-       String author of last commit. (Unaffected by <parameter>update</parameter>.)
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>prop_time</varname></term>
-     <listitem>
-      <simpara>
-       Integer Unix timestamp of last up-to-date time for properties
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><varname>text_time</varname></term>
-     <listitem>
-      <simpara>
-       Integer Unix timestamp of last up-to-date time for text
-      </simpara>
-     </listitem>
-   </varlistentry>
-   <!--
-   <varlistentry>
-    <term><varname></varname></term>
-     <listitem>
-      <simpara>
-
-      </simpara>
-     </listitem>
-   </varlistentry>
-   -->
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates a basic, theoretical usage of this function.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-print_r(svn_status(realpath('wc')));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array (
-    [0] => Array (
-        [path] => /home/bob/wc/sandwich.txt
-        [text_status] => 8 // item was modified
-        [repos_text_status] => 1 // no information available, use update
-        [prop_status] => 3 // no changes
-        [repos_prop_status] => 1 // no information available, use update
-        [name] => sandwich.txt
-        [url] => http://www.example.com/svnroot/deli/trunk/sandwich.txt
-        [repos] => http://www.example.com/svnroot/
-        [revision] => 123
-        [kind] => 1 // file
-        [schedule] => 0 // no special actions scheduled
-        [cmt_date] => 1165543135
-        [cmt_rev] => 120
-        [cmt_author] => Alice
-        [prop_time] => 1180201728
-        [text_time] => 1180201729
-    )
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_update</function></member>
-   <member><function>svn_log</function></member>
-   <member><link xlink:href="&url.svn.manual.status;">SVN documentation for svn status</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/svn/functions/svn-update.xml b/reference/svn/functions/svn-update.xml
deleted file mode 100644
index a99a586bc9b3..000000000000
--- a/reference/svn/functions/svn-update.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.svn-update" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>svn_update</refname>
-  <refpurpose>Update working copy</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>svn_update</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>revno</parameter><initializer>SVN_REVISION_HEAD</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>recurse</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Update working copy at <parameter>path</parameter> to revision
-   <parameter>revno</parameter>. If <parameter>recurse</parameter> is true,
-   directories will be recursively updated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <simpara>
-      Path to local working copy.
-     </simpara>
-     &svn.relativepath;
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>revno</parameter></term>
-    <listitem>
-     <simpara>
-      Revision number to update to, default is <constant>SVN_REVISION_HEAD</constant>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recurse</parameter></term>
-    <listitem>
-     <simpara>
-      Whether or not to recursively update directories.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
-
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns new revision number on success, returns &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Basic example</title>
-   <simpara>
-    This example demonstrates basic usage of this function:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo svn_update(realpath('working-copy'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-234
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>svn_checkout</function></member>
-   <member><function>svn_commit</function></member>
-   <member><link xlink:href="&url.svn.manual.update;">SVN documentation for svn update</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/svn/reference.xml b/reference/svn/reference.xml
deleted file mode 100644
index 4fc56f02000b..000000000000
--- a/reference/svn/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.svn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>SVN &Functions;</title>
-
- &reference.svn.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/svn/setup.xml b/reference/svn/setup.xml
deleted file mode 100644
index 531ca92fe9f6..000000000000
--- a/reference/svn/setup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="svn.setup">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="svn.requirements">
-  &reftitle.required;
-  <simpara>
-   The Subversion binaries are not necessary to use this
-   extension. However, when compiling the extension, libsvn
-   (the Subversion headers) must be available.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.svn.configure;
- <!-- }}} -->
-
-</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/svn/versions.xml b/reference/svn/versions.xml
deleted file mode 100644
index 66f22ea5ff8c..000000000000
--- a/reference/svn/versions.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='svn_add' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_auth_get_parameter' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_auth_set_parameter' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_blame' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_cat' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_checkout' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_cleanup' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_client_version' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_commit' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_config_ensure' from='PECL svn &gt;= 0.5.0'/>
- <function name='svn_copy' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_delete' from='PECL svn &gt;= 0.4.0'/>
- <function name='svn_diff' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_export' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_fs_abort_txn' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_apply_text' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_begin_txn2' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_change_node_prop' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_check_path' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_contents_changed' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_copy' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_delete' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_dir_entries' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_file_contents' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_file_length' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_is_dir' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_is_file' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_make_dir' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_make_file' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_node_created_rev' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_node_prop' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_props_changed' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_revision_prop' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_revision_root' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_fs_txn_root' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_fs_youngest_rev' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_import' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_info' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_lock' from='PECL svn &gt;= 0.5.0'/>
- <function name='svn_log' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_ls' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_mkdir' from='PECL svn &gt;= 0.4.0'/>
- <function name='svn_move' from='PECL svn &gt;= 0.4.0'/>
- <function name='svn_proplist' from='PECL svn &gt;= 0.4.0'/>
- <function name='svn_propget' from='PECL svn &gt;= 0.4.0'/>
- <function name='svn_repos_create' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_repos_fs' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_repos_fs_begin_txn_for_commit' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_repos_fs_commit_txn' from='PECL svn &gt;= 0.2.0'/>
- <function name='svn_repos_hotcopy' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_repos_open' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_repos_recover' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_revert' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_status' from='PECL svn &gt;= 0.1.0'/>
- <function name='svn_switch' from='PECL svn &gt;= 0.3.0'/>
- <function name='svn_unlock' from='PECL svn &gt;= 0.5.0'/>
- <function name='svn_update' from='PECL svn &gt;= 0.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
--->
\ No newline at end of file
diff --git a/reference/swoole/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/swoole/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/swoole/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/swoole/book.xml b/reference/swoole/book.xml
deleted file mode 100644
index 88e2cea060f1..000000000000
--- a/reference/swoole/book.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
- <titleabbrev>Swoole</titleabbrev>
- 
- <!-- {{{ preface -->
- <preface xml:id="intro.swoole">
-  &reftitle.intro;
-  <para>
-   Swoole is a parallel network communication engine based on asynchronous event-driven and coroutine,
-   written in C++, providing coroutine and high-performance network programming support for PHP.
-   It provides various network server and client modules for multiple communication protocols, making it easy to
-   quickly implement TCP/UDP services, high-performance Web, WebSocket services, IoT, real-time communication, games,
-   microservices, etc., breaking the limits of PHP in traditional web domains.
-
-   To get started, please check the <link
-    xlink:href="&url.swoole.docs;">Swoole Docs</link>.
-  </para>
-  &note.no-windows.extension;
- </preface>
- <!-- }}} -->
- 
- &reference.swoole.setup;
- &reference.swoole.constants;
- &reference.swoole.reference;
-
- &reference.swoole.swoole.async;
- &reference.swoole.swoole.atomic;
- &reference.swoole.swoole.buffer;
- &reference.swoole.swoole.channel;
- &reference.swoole.swoole.client;
- &reference.swoole.swoole.connection.iterator;
- &reference.swoole.swoole.coroutine;
- &reference.swoole.swoole.coroutine.lock;
- <!-- &reference.swoole.swoole.coroutine.client; -->
- <!-- &reference.swoole.swoole.coroutine.http.client; -->
- <!-- &reference.swoole.swoole.coroutine.mysql; -->
- <!-- &reference.swoole.swoole.coroutine.mysql.exception; -->
- &reference.swoole.swoole.event;
- &reference.swoole.swoole.exception;
- &reference.swoole.swoole.http.client;
- &reference.swoole.swoole.http.request;
- &reference.swoole.swoole.http.response;
- &reference.swoole.swoole.http.server;
- &reference.swoole.swoole.lock;
- &reference.swoole.swoole.mmap;
- &reference.swoole.swoole.module;
- &reference.swoole.swoole.mysql;
- &reference.swoole.swoole.mysql.exception;
- &reference.swoole.swoole.process;
- &reference.swoole.swoole.redis.server;
- &reference.swoole.swoole.runtime;
- &reference.swoole.swoole.serialize;
- &reference.swoole.swoole.server;
- <!-- &reference.swoole.swoole.server.port; -->
- &reference.swoole.swoole.table;
- &reference.swoole.swoole.timer;
- &reference.swoole.swoole.websocket.frame;
- &reference.swoole.swoole.websocket.server;
-
-</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/swoole/configure.xml b/reference/swoole/configure.xml
deleted file mode 100644
index a6b3947e5d66..000000000000
--- a/reference/swoole/configure.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="swoole.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Use <option role="configure">--with-swoole[=DIR]</option> when compiling PHP.
- </para>
- 
- <para>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;swoole">&url.pecl.package;swoole</link>
- </para>
-</section>
\ No newline at end of file
diff --git a/reference/swoole/constants.xml b/reference/swoole/constants.xml
deleted file mode 100644
index c35c06e59d26..000000000000
--- a/reference/swoole/constants.xml
+++ /dev/null
@@ -1,3874 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="swoole.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.swoole-version">
-    <term>
-     <constant>SWOOLE_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-version-id">
-    <term>
-     <constant>SWOOLE_VERSION_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-major-version">
-    <term>
-     <constant>SWOOLE_MAJOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole major version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-minor-version">
-    <term>
-     <constant>SWOOLE_MINOR_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole minor version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-release-version">
-    <term>
-     <constant>SWOOLE_RELEASE_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole release version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-extra-version">
-    <term>
-     <constant>SWOOLE_EXTRA_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole extra version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-debug">
-    <term>
-     <constant>SWOOLE_DEBUG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Debug mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-have-compression">
-    <term>
-     <constant>SWOOLE_HAVE_COMPRESSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Enable HTTP response compression mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-have-zlib">
-    <term>
-     <constant>SWOOLE_HAVE_ZLIB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Have zlib compression tool.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-have-brotli">
-    <term>
-     <constant>SWOOLE_HAVE_BROTLI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Have brotli compression tool.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-use-http2">
-    <term>
-     <constant>SWOOLE_USE_HTTP2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Support http2 server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-use-shortname">
-    <term>
-     <constant>SWOOLE_USE_SHORTNAME</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Enable/disable short aliases.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-tcp">
-    <term>
-     <constant>SWOOLE_SOCK_TCP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TCP ipv4 socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-tcp6">
-    <term>
-     <constant>SWOOLE_SOCK_TCP6</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TCP ipv6 socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-udp">
-    <term>
-     <constant>SWOOLE_SOCK_UDP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      UDP ipv4 socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-udp6">
-    <term>
-     <constant>SWOOLE_SOCK_UDP6</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      UDP ipv6 socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-unix-dgram">
-    <term>
-     <constant>SWOOLE_SOCK_UNIX_DGRAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      UNIX socket dgram.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-unix-stream">
-    <term>
-     <constant>SWOOLE_SOCK_UNIX_STREAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      UNIX socket stream.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-sync">
-    <term>
-     <constant>SWOOLE_SOCK_SYNC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Synchronous client mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sock-async">
-    <term>
-     <constant>SWOOLE_SOCK_ASYNC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Asynchronous client mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-keep">
-    <term>
-     <constant>SWOOLE_KEEP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole\Client supports creating a TCP long connection to the server in PHP-FPM/Apache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl">
-    <term>
-     <constant>SWOOLE_SSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Enable SSL tunnel encryption.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv3-method">
-    <term>
-     <constant>SWOOLE_SSLv3_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv3 method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv3-server-method">
-    <term>
-     <constant>SWOOLE_SSLv3_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv3 server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv3-client-method">
-    <term>
-     <constant>SWOOLE_SSLv3_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv3 client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-method">
-    <term>
-     <constant>SWOOLE_TLSv1_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1 method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-server-method">
-    <term>
-     <constant>SWOOLE_TLSv1_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1 server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-client-method">
-    <term>
-     <constant>SWOOLE_TLSv1_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1 client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-1-method">
-    <term>
-     <constant>SWOOLE_TLSv1_1_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_1 method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-1-server-method">
-    <term>
-     <constant>SWOOLE_TLSv1_1_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_1 server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-1-client-method">
-    <term>
-     <constant>SWOOLE_TLSv1_1_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_1 client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-2-method">
-    <term>
-     <constant>SWOOLE_TLSv1_2_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_2 method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-2-server-method">
-    <term>
-     <constant>SWOOLE_TLSv1_2_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_2 server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tlsv1-2-client-method">
-    <term>
-     <constant>SWOOLE_TLSv1_2_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_2 client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dtls-server-method">
-    <term>
-     <constant>SWOOLE_DTLS_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DTLS server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dtls-client-method">
-    <term>
-     <constant>SWOOLE_DTLS_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DTLS client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv23-method">
-    <term>
-     <constant>SWOOLE_SSLv23_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv23 method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv23-server-method">
-    <term>
-     <constant>SWOOLE_SSLv23_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv23 server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-sslv23-client-method">
-    <term>
-     <constant>SWOOLE_SSLv23_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv23 client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tls-method">
-    <term>
-     <constant>SWOOLE_TLS_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLS method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tls-server-method">
-    <term>
-     <constant>SWOOLE_TLS_SERVER_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLS server method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-tls-client-method">
-    <term>
-     <constant>SWOOLE_TLS_CLIENT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLS client method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-sslv3">
-    <term>
-     <constant>SWOOLE_SSL_SSLv3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv3 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-tlsv1">
-    <term>
-     <constant>SWOOLE_SSL_TLSv1</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-tlsv1-1">
-    <term>
-     <constant>SWOOLE_SSL_TLSv1_1</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_1 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-tlsv1-2">
-    <term>
-     <constant>SWOOLE_SSL_TLSv1_2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_2 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-tlsv1-3">
-    <term>
-     <constant>SWOOLE_SSL_TLSv1_3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLSv1_3 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-dtls">
-    <term>
-     <constant>SWOOLE_SSL_DTLS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DTLS protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ssl-sslv2">
-    <term>
-     <constant>SWOOLE_SSL_SSLv2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSLv2 protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-event-read">
-    <term>
-     <constant>SWOOLE_EVENT_READ</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Whether to listen for readable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-event-write">
-    <term>
-     <constant>SWOOLE_EVENT_WRITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Whether to listen for writable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-strerror-system">
-    <term>
-     <constant>SWOOLE_STRERROR_SYSTEM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Convert the system errno no into error messages.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-strerror-gai">
-    <term>
-     <constant>SWOOLE_STRERROR_GAI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Convert the addr info errno no into error messages.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-strerror-dns">
-    <term>
-     <constant>SWOOLE_STRERROR_DNS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Convert the DNS errno no into error messages.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-strerror-swoole">
-    <term>
-     <constant>SWOOLE_STRERROR_SWOOLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Convert the swoole errno no into error messages.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-malloc-fail">
-    <term>
-     <constant>SWOOLE_ERROR_MALLOC_FAIL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Malloc memory fail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-system-call-fail">
-    <term>
-     <constant>SWOOLE_ERROR_SYSTEM_CALL_FAIL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      System call fail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-php-fatal-error">
-    <term>
-     <constant>SWOOLE_ERROR_PHP_FATAL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      PHP fatal error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-name-too-long">
-    <term>
-     <constant>SWOOLE_ERROR_NAME_TOO_LONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Name too long.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-invalid-params">
-    <term>
-     <constant>SWOOLE_ERROR_INVALID_PARAMS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invalid params.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-queue-full">
-    <term>
-     <constant>SWOOLE_ERROR_QUEUE_FULL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Queue full.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-operation-not-support">
-    <term>
-     <constant>SWOOLE_ERROR_OPERATION_NOT_SUPPORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Operation not support.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-protocol-error">
-    <term>
-     <constant>SWOOLE_ERROR_PROTOCOL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Protocol error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-wrong-operation">
-    <term>
-     <constant>SWOOLE_ERROR_WRONG_OPERATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Wrong operation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-php-runtime-notice">
-    <term>
-     <constant>SWOOLE_ERROR_PHP_RUNTIME_NOTICE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      PHP runtime notice.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-for-test">
-    <term>
-     <constant>SWOOLE_ERROR_FOR_TEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      For test.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-no-payload">
-    <term>
-     <constant>SWOOLE_ERROR_NO_PAYLOAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No payload.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-undefined-behavior">
-    <term>
-     <constant>SWOOLE_ERROR_UNDEFINED_BEHAVIOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Undefined behavior.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-not-thread-safety">
-    <term>
-     <constant>SWOOLE_ERROR_NOT_THREAD_SAFETY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Not thread safety.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-file-not-exist">
-    <term>
-     <constant>SWOOLE_ERROR_FILE_NOT_EXIST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File not exist.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-file-too-large">
-    <term>
-     <constant>SWOOLE_ERROR_FILE_TOO_LARGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File too large.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-file-empty">
-    <term>
-     <constant>SWOOLE_ERROR_FILE_EMPTY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      File empty.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-dnslookup-duplicate-request">
-    <term>
-     <constant>SWOOLE_ERROR_DNSLOOKUP_DUPLICATE_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DNS Lookup duplicate request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-dnslookup-resolve-failed">
-    <term>
-     <constant>SWOOLE_ERROR_DNSLOOKUP_RESOLVE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DNS Lookup resolve failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-dnslookup-resolve-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_DNSLOOKUP_RESOLVE_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DNS Lookup resolve timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-dnslookup-unsupported">
-    <term>
-     <constant>SWOOLE_ERROR_DNSLOOKUP_UNSUPPORTED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DNS Lookup unsupported.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-dnslookup-no-server">
-    <term>
-     <constant>SWOOLE_ERROR_DNSLOOKUP_NO_SERVER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      DNS Lookup no server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-bad-ipv6-address">
-    <term>
-     <constant>SWOOLE_ERROR_BAD_IPV6_ADDRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Bad ipv6 address.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-unregistered-signal">
-    <term>
-     <constant>SWOOLE_ERROR_UNREGISTERED_SIGNAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Unregistered signal.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-bad-host-addr">
-    <term>
-     <constant>SWOOLE_ERROR_BAD_HOST_ADDR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Bad host addr.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-event-socket-removed">
-    <term>
-     <constant>SWOOLE_ERROR_EVENT_SOCKET_REMOVED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Event socket removed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-closed-by-server">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_CLOSED_BY_SERVER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session closed by server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-closed-by-client">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_CLOSED_BY_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session closed by client.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-closing">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_CLOSING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session closing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-closed">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_CLOSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session closed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-not-exist">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_NOT_EXIST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session not exist.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-invalid-id">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_INVALID_ID</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session invalid id.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-discard-timeout-data">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_DISCARD_TIMEOUT_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session discard timeout data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-session-discard-data">
-    <term>
-     <constant>SWOOLE_ERROR_SESSION_DISCARD_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Session discard data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-output-buffer-overflow">
-    <term>
-     <constant>SWOOLE_ERROR_OUTPUT_BUFFER_OVERFLOW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Output buffer overflow.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-output-send-yield">
-    <term>
-     <constant>SWOOLE_ERROR_OUTPUT_SEND_YIELD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Output send yield
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-not-ready">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_NOT_READY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL not ready
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-cannot-use-senfile">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_CANNOT_USE_SENFILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL cannot use sendfile
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-empty-peer-certificate">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_EMPTY_PEER_CERTIFICATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL empty peer certificate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-verify-failed">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_VERIFY_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL verify failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-bad-client">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_BAD_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL bad client.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-bad-protocol">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_BAD_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL bad protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-reset">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_RESET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL reset.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-ssl-handshake-failed">
-    <term>
-     <constant>SWOOLE_ERROR_SSL_HANDSHAKE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      SSL handshake failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-package-length-too-large">
-    <term>
-     <constant>SWOOLE_ERROR_PACKAGE_LENGTH_TOO_LARGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Package length too large.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-package-length-not-found">
-    <term>
-     <constant>SWOOLE_ERROR_PACKAGE_LENGTH_NOT_FOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Package length not found.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-data-length-too-large">
-    <term>
-     <constant>SWOOLE_ERROR_DATA_LENGTH_TOO_LARGE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Data length too large.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-package-malformed-data">
-    <term>
-     <constant>SWOOLE_ERROR_PACKAGE_MALFORMED_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Package malformed error data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-task-package-too-big">
-    <term>
-     <constant>SWOOLE_ERROR_TASK_PACKAGE_TOO_BIG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Task package too big.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-task-dispatch-fail">
-    <term>
-     <constant>SWOOLE_ERROR_TASK_DISPATCH_FAIL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Task dispatch fail.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-task-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_TASK_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Task timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http2-stream-id-too-big">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP2_STREAM_ID_TOO_BIG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http2 stream id too big.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http2-stream-no-header">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP2_STREAM_NO_HEADER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http2 stream no header.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http2-stream-not-found">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP2_STREAM_NOT_FOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http2 stream not found.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http2-stream-ignore">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP2_STREAM_IGNORE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http2 stream ignore.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http2-send-control-frame-failed">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP2_SEND_CONTROL_FRAME_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http2 send control frame failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-aio-bad-request">
-    <term>
-     <constant>SWOOLE_ERROR_AIO_BAD_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Aio bad request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-aio-canceled">
-    <term>
-     <constant>SWOOLE_ERROR_AIO_CANCELED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Aio canceled.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-aio-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_AIO_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Aio timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-client-no-connection">
-    <term>
-     <constant>SWOOLE_ERROR_CLIENT_NO_CONNECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Client no connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socket-closed">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKET_CLOSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socket closed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socket-poll-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKET_POLL_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socket poll timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socks5-unsupport-version">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKS5_UNSUPPORT_VERSION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socks5 unsupported version.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socks5-unsupport-method">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKS5_UNSUPPORT_METHOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socks5 unsupported method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socks5-auth-failed">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKS5_AUTH_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socks5 auth failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socks5-server-error">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKS5_SERVER_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socks5 server error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-socks5-handshake-error">
-    <term>
-     <constant>SWOOLE_ERROR_SOCKS5_HANDSHAKE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socks5 handshake failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-proxy-handshake-error">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_PROXY_HANDSHAKE_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http proxy handshake error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-invalid-protocol">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_INVALID_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http invalid protocol.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-proxy-handshake-failed">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_PROXY_HANDSHAKE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http proxy handshake failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-proxy-bad-response">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_PROXY_BAD_RESPONSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http proxy bad response.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-conflict-header">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_CONFLICT_HEADER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http conflict header.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-context-unavailable">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_CONTEXT_UNAVAILABLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http context unavailable.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-http-cookie-unavailable">
-    <term>
-     <constant>SWOOLE_ERROR_HTTP_COOKIE_UNAVAILABLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Http cookie unavailable.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-bad-client">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_BAD_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket bad client.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-bad-opcode">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_BAD_OPCODE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket bad opcode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-unconnected">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_UNCONNECTED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket unconnected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-handshake-failed">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_HANDSHAKE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket handshake failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-pack-failed">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_PACK_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket pack failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-unpack-failed">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_UNPACK_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket unpack failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-websocket-incomplete-packet">
-    <term>
-     <constant>SWOOLE_ERROR_WEBSOCKET_INCOMPLETE_PACKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket incomplete packet.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-must-created-before-client">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_MUST_CREATED_BEFORE_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server must be created before client.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-too-many-socket">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_TOO_MANY_SOCKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server too many socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-worker-terminated">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_WORKER_TERMINATED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server worker terminated.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-invalid-listen-port">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_INVALID_LISTEN_PORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server invalid listen port.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-too-many-listen-port">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_TOO_MANY_LISTEN_PORT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server too many listen port.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-pipe-buffer-full">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_PIPE_BUFFER_FULL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server pipe buffer full.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-no-idle-worker">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_NO_IDLE_WORKER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server no idle worker.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-only-start-one">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_ONLY_START_ONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server only start one.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-send-in-master">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_SEND_IN_MASTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server send in master.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-invalid-request">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_INVALID_REQUEST</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server invalid request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-connect-fail">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_CONNECT_FAIL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server connect failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-invalid-command">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_INVALID_COMMAND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server invalid command.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-is-not-regular-file">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_IS_NOT_REGULAR_FILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server is not regular file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-send-to-woker-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_SEND_TO_WOKER_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server send to woker timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-invalid-callback">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_INVALID_CALLBACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server invalid callback.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-unrelated-thread">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_UNRELATED_THREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server unrelated thread.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-worker-exit-timeout">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_WORKER_EXIT_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server worker exit timeout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-worker-abnormal-pipe-data">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server worker abnormal pipe data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-server-worker-unprocessed-data">
-    <term>
-     <constant>SWOOLE_ERROR_SERVER_WORKER_UNPROCESSED_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server worker unprocessed data.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-out-of-coroutine">
-    <term>
-     <constant>SWOOLE_ERROR_CO_OUT_OF_COROUTINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine out of coroutine.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-has-been-bound">
-    <term>
-     <constant>SWOOLE_ERROR_CO_HAS_BEEN_BOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine has been bound.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-has-been-discarded">
-    <term>
-     <constant>SWOOLE_ERROR_CO_HAS_BEEN_DISCARDED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine has been discarded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-mutex-double-unlock">
-    <term>
-     <constant>SWOOLE_ERROR_CO_MUTEX_DOUBLE_UNLOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine mutex double unlock.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-block-object-locked">
-    <term>
-     <constant>SWOOLE_ERROR_CO_BLOCK_OBJECT_LOCKED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine block object locked.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-block-object-waiting">
-    <term>
-     <constant>SWOOLE_ERROR_CO_BLOCK_OBJECT_WAITING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine block object waiting.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-yield-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_YIELD_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine yield failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-getcontext-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_GETCONTEXT_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine getcontext failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-swapcontext-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_SWAPCONTEXT_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine swapcontext failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-makecontext-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_MAKECONTEXT_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine makecontext failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-iocpinit-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_IOCPINIT_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine iocpinit failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-protect-stack-failed">
-    <term>
-     <constant>SWOOLE_ERROR_CO_PROTECT_STACK_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine protect stack failed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-std-thread-link-error">
-    <term>
-     <constant>SWOOLE_ERROR_CO_STD_THREAD_LINK_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine std thread link error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-disabled-multi-thread">
-    <term>
-     <constant>SWOOLE_ERROR_CO_DISABLED_MULTI_THREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine disabled multi thread.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-cannot-cancel">
-    <term>
-     <constant>SWOOLE_ERROR_CO_CANNOT_CANCEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine cannot cancel.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-not-exists">
-    <term>
-     <constant>SWOOLE_ERROR_CO_NOT_EXISTS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine not exists.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-canceled">
-    <term>
-     <constant>SWOOLE_ERROR_CO_CANCELED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine canceled.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-timedout">
-    <term>
-     <constant>SWOOLE_ERROR_CO_TIMEDOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine timedout.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-error-co-socket-close-wait">
-    <term>
-     <constant>SWOOLE_ERROR_CO_SOCKET_CLOSE_WAIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine socket close wait.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-server">
-    <term>
-     <constant>SWOOLE_TRACE_SERVER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record server log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-client">
-    <term>
-     <constant>SWOOLE_TRACE_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record client log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-buffer">
-    <term>
-     <constant>SWOOLE_TRACE_BUFFER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record buffer log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-conn">
-    <term>
-     <constant>SWOOLE_TRACE_CONN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record connect log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-event">
-    <term>
-     <constant>SWOOLE_TRACE_EVENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record event log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-worker">
-    <term>
-     <constant>SWOOLE_TRACE_WORKER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record worker log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-memory">
-    <term>
-     <constant>SWOOLE_TRACE_MEMORY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record memory log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-reactor">
-    <term>
-     <constant>SWOOLE_TRACE_REACTOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record reactor log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-php">
-    <term>
-     <constant>SWOOLE_TRACE_PHP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record php log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-http">
-    <term>
-     <constant>SWOOLE_TRACE_HTTP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record http log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-http2">
-    <term>
-     <constant>SWOOLE_TRACE_HTTP2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record http2 log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-eof-protocol">
-    <term>
-     <constant>SWOOLE_TRACE_EOF_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record eof protocol log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-length-protocol">
-    <term>
-     <constant>SWOOLE_TRACE_LENGTH_PROTOCOL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record length protocol log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-close">
-    <term>
-     <constant>SWOOLE_TRACE_CLOSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record close event log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-websocket">
-    <term>
-     <constant>SWOOLE_TRACE_WEBSOCKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record websocket log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-redis-client">
-    <term>
-     <constant>SWOOLE_TRACE_REDIS_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record redis client log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-mysql-client">
-    <term>
-     <constant>SWOOLE_TRACE_MYSQL_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record mysql client log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-http-client">
-    <term>
-     <constant>SWOOLE_TRACE_HTTP_CLIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record http client log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-aio">
-    <term>
-     <constant>SWOOLE_TRACE_AIO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record AIO log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-ssl">
-    <term>
-     <constant>SWOOLE_TRACE_SSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record SSL log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-normal">
-    <term>
-     <constant>SWOOLE_TRACE_NORMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record normal log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-channel">
-    <term>
-     <constant>SWOOLE_TRACE_CHANNEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record channel log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-timer">
-    <term>
-     <constant>SWOOLE_TRACE_TIMER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record timer log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-socket">
-    <term>
-     <constant>SWOOLE_TRACE_SOCKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record socket log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-coroutine">
-    <term>
-     <constant>SWOOLE_TRACE_COROUTINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record coroutine log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-context">
-    <term>
-     <constant>SWOOLE_TRACE_CONTEXT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record context log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-http-server">
-    <term>
-     <constant>SWOOLE_TRACE_CO_HTTP_SERVER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record coroutine http server log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-table">
-    <term>
-     <constant>SWOOLE_TRACE_TABLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record table log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-curl">
-    <term>
-     <constant>SWOOLE_TRACE_CO_CURL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record coroutine curl log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-cares">
-    <term>
-     <constant>SWOOLE_TRACE_CARES</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record cares log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-zlib">
-    <term>
-     <constant>SWOOLE_TRACE_ZLIB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record zlib log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-pgsql">
-    <term>
-     <constant>SWOOLE_TRACE_CO_PGSQL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record pgsql coroutine log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-odbc">
-    <term>
-     <constant>SWOOLE_TRACE_CO_ODBC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record odbc coroutine log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-oracle">
-    <term>
-     <constant>SWOOLE_TRACE_CO_ORACLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record oracle coroutine log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-co-sqlite">
-    <term>
-     <constant>SWOOLE_TRACE_CO_SQLITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record sqlite coroutine log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-trace-all">
-    <term>
-     <constant>SWOOLE_TRACE_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record all level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-debug">
-    <term>
-     <constant>SWOOLE_LOG_DEBUG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record debug level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-trace">
-    <term>
-     <constant>SWOOLE_LOG_TRACE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record trace level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-info">
-    <term>
-     <constant>SWOOLE_LOG_INFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record info level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-notice">
-    <term>
-     <constant>SWOOLE_LOG_NOTICE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record notice level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-warning">
-    <term>
-     <constant>SWOOLE_LOG_WARNING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record warning level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-error">
-    <term>
-     <constant>SWOOLE_LOG_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Record error level log flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-none">
-    <term>
-     <constant>SWOOLE_LOG_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Equivalent to turning off log information, log information will not be thrown.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-rotation-single">
-    <term>
-     <constant>SWOOLE_LOG_ROTATION_SINGLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      disable log rotation.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-rotation-monthly">
-    <term>
-     <constant>SWOOLE_LOG_ROTATION_MONTHLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Rotate logs monthly.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-rotation-daily">
-    <term>
-     <constant>SWOOLE_LOG_ROTATION_DAILY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Rotate logs daily.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-rotation-hourly">
-    <term>
-     <constant>SWOOLE_LOG_ROTATION_HOURLY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Rotate logs hourly.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-log-rotation-every-minute">
-    <term>
-     <constant>SWOOLE_LOG_ROTATION_EVERY_MINUTE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Rotate logs every minute.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-none">
-    <term>
-     <constant>SWOOLE_IPC_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Do not use any inter-process communication (IPC) features.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-unixsock">
-    <term>
-     <constant>SWOOLE_IPC_UNIXSOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      For inter-process communication (IPC), using Unix domain sockets (UnixSocket) in coroutine mode
-      is highly recommended.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-socket">
-    <term>
-     <constant>SWOOLE_IPC_SOCKET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      To use sockets for inter-process communication (IPC),
-      the listen method must be called to specify the address and port to monitor.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-iov-max">
-    <term>
-     <constant>SWOOLE_IOV_MAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      MAX iov limit.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-iouring-default">
-    <term>
-     <constant>SWOOLE_IOURING_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      In interrupt-driven mode, I/O requests can be submitted via the io_uring_enter syscall,
-      and completion is determined by directly checking the completion queue status.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-iouring-sqpoll">
-    <term>
-     <constant>SWOOLE_IOURING_SQPOLL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      In kernel polling mode, the kernel creates dedicated threads to submit and reap I/O requests,
-      nearly eliminating user-kernel context switches.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-base">
-    <term>
-     <constant>SWOOLE_BASE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Basic mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-process">
-    <term>
-     <constant>SWOOLE_PROCESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Multi-process mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-thread">
-    <term>
-     <constant>SWOOLE_THREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Multi-thread mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-unsock">
-    <term>
-     <constant>SWOOLE_IPC_UNSOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The task process communicates with the worker process using a Unix Socket.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-msgqueue">
-    <term>
-     <constant>SWOOLE_IPC_MSGQUEUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The task process communicates with the worker process using a sysvmsg queue.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-ipc-preemptive">
-    <term>
-     <constant>SWOOLE_IPC_PREEMPTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The task process communicates with the worker process using a preemptive mode over a sysvmsg queue.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-server-command-master">
-    <term>
-     <constant>SWOOLE_SERVER_COMMAND_MASTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Master process accept requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-server-command-manager">
-    <term>
-     <constant>SWOOLE_SERVER_COMMAND_MANAGER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Manager process accept requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-server-command-reactor-thread">
-    <term>
-     <constant>SWOOLE_SERVER_COMMAND_REACTOR_THREAD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Reactor thread accept requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-server-command-event-worker">
-    <term>
-     <constant>SWOOLE_SERVER_COMMAND_EVENT_WORKER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Event worker thread process accept requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-server-command-task-worker">
-    <term>
-     <constant>SWOOLE_SERVER_COMMAND_TASK_WORKER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Task worker thread process accept requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-round">
-    <term>
-     <constant>SWOOLE_DISPATCH_ROUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Round robin mode, each Worker process will be allocated sequentially for every received connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-fdmod">
-    <term>
-     <constant>SWOOLE_DISPATCH_FDMOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Allocate Worker based on the connection's file descriptor. This ensures that data from the same connection
-      will be processed by the same Worker only.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-idle-worker">
-    <term>
-     <constant>SWOOLE_DISPATCH_IDLE_WORKER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The main process will choose delivery based on the workload status of the Worker, delivering only to idle Workers.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-ipmod">
-    <term>
-     <constant>SWOOLE_DISPATCH_IPMOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Allocate based on client IP using modulo hash, assigning to a specific Worker process.
-      This ensures that data from the same source IP connection will always be assigned to
-      the same Worker process. Algorithm: inet_addr_mod(ClientIP, worker_num).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-uidmod">
-    <term>
-     <constant>SWOOLE_DISPATCH_UIDMOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Requires binding a connection to a unique uid by calling Server->bind() in the user code.
-      Then, the underlying system allocates to different Worker processes based on the value of UID.
-      Algorithm: UID % worker_num. To use strings as UID, you can use crc32(UID_STRING).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-userfunc">
-    <term>
-     <constant>SWOOLE_DISPATCH_USERFUNC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Set a dispatch_func callback function, where its return value determines
-      which process handles the request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-co-conn-lb">
-    <term>
-     <constant>SWOOLE_DISPATCH_CO_CONN_LB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Determine which process handles the request based on the number of connections.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-co-req-lb">
-    <term>
-     <constant>SWOOLE_DISPATCH_CO_REQ_LB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Determine which process handles the request based on the number of requests.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-dispatch-concurrent-lb">
-    <term>
-     <constant>SWOOLE_DISPATCH_CONCURRENT_LB</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Determine which process handles the request based on concurrency count.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-worker-busy">
-    <term>
-     <constant>SWOOLE_WORKER_BUSY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Process is busy.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-worker-idle">
-    <term>
-     <constant>SWOOLE_WORKER_IDLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Process is idle.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-worker-exit">
-    <term>
-     <constant>SWOOLE_WORKER_EXIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Process exited.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-mutex">
-    <term>
-     <constant>SWOOLE_MUTEX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mutex lock.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-rwlock">
-    <term>
-     <constant>SWOOLE_RWLOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      RW lock.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-spinlock">
-    <term>
-     <constant>SWOOLE_SPINLOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Spin lock.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-coro-max-num-limit">
-    <term>
-     <constant>SWOOLE_CORO_MAX_NUM_LIMIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum number of coroutines created(PHP_INT_MAX).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-coro-init">
-    <term>
-     <constant>SWOOLE_CORO_INIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine initializing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-coro-waiting">
-    <term>
-     <constant>SWOOLE_CORO_WAITING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine yield.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-coro-running">
-    <term>
-     <constant>SWOOLE_CORO_RUNNING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine completed
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-coro-end">
-    <term>
-     <constant>SWOOLE_CORO_END</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine completed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-exit-in-coroutine">
-    <term>
-     <constant>SWOOLE_EXIT_IN_COROUTINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Executing exit() function in coroutine.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-exit-in-server">
-    <term>
-     <constant>SWOOLE_EXIT_IN_SERVER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Executing exit() function in server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-data">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_DATA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 data frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-headers">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_HEADERS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 headers frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-priority">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_PRIORITY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 priority frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-rst-stream">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_RST_STREAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 rst stream frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-settings">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_SETTINGS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 settings frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-push-promise">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_PUSH_PROMISE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 push promise frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-ping">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_PING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 ping frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-goaway">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_GOAWAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 goaway frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-window-update">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_WINDOW_UPDATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 window update frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-type-continuation">
-    <term>
-     <constant>SWOOLE_HTTP2_TYPE_CONTINUATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 continuation frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-no-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_NO_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 no error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-protocol-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_PROTOCOL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 protocol error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-internal-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_INTERNAL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 internal error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-flow-control-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_FLOW_CONTROL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 flow control error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-settings-timeout">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_SETTINGS_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 setting timeout error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-stream-closed">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_STREAM_CLOSED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 stream closed error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-frame-size-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_FRAME_SIZE_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 frame size error error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-refused-stream">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_REFUSED_STREAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 refused stream error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-cancel">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_CANCEL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 cancel error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-compression-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_COMPRESSION_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 compression error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-connect-error">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_CONNECT_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 connect error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-enhance-your-calm">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_ENHANCE_YOUR_CALM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 enhance your calm error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-inadequate-security">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_INADEQUATE_SECURITY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 inadequate security error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http2-error-http-1-1-required">
-    <term>
-     <constant>SWOOLE_HTTP2_ERROR_HTTP_1_1_REQUIRED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      HTTP2 require http1.1 error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http-client-estatus-connect-failed">
-    <term>
-     <constant>SWOOLE_HTTP_CLIENT_ESTATUS_CONNECT_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Connection timeout, the server is not listening on the port or there is a network failure,
-      you can read $errCode to get the specific network error code.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http-client-estatus-request-timeout">
-    <term>
-     <constant>SWOOLE_HTTP_CLIENT_ESTATUS_REQUEST_TIMEOUT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Request timeout, the server did not return a response within the specified timeout time.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http-client-estatus-server-reset">
-    <term>
-     <constant>SWOOLE_HTTP_CLIENT_ESTATUS_SERVER_RESET</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      After the client's request is sent, the server forcefully disconnects the connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-http-client-estatus-send-failed">
-    <term>
-     <constant>SWOOLE_HTTP_CLIENT_ESTATUS_SEND_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Client send failed (this constant is available in Swoole version >= v4.5.9,
-      for versions less than this, please use the status code).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-msgqueue-orient">
-    <term>
-     <constant>SWOOLE_MSGQUEUE_ORIENT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole\Process::pop() will return specific data in the queue with the message type as process id + 1,
-      Swoole\Process::push() will add the type process id + 1 to the message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-msgqueue-balance">
-    <term>
-     <constant>SWOOLE_MSGQUEUE_BALANCE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Swoole\Process::pop() will return the first message in the queue,
-      Swoole\Process::push() will not add a specific type to the message.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-tcp">
-    <term>
-     <constant>SWOOLE_HOOK_TCP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream of TCP Socket type, including the most common ones like Redis, PDO, Mysqli.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-udp">
-    <term>
-     <constant>SWOOLE_HOOK_UDP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream of UDP Socket type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-unix">
-    <term>
-     <constant>SWOOLE_HOOK_UNIX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream for Unix Stream Socket type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-udg">
-    <term>
-     <constant>SWOOLE_HOOK_UDG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream for UDG Stream Socket type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-ssl">
-    <term>
-     <constant>SWOOLE_HOOK_SSL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream for SSL Stream Socket type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-tls">
-    <term>
-     <constant>SWOOLE_HOOK_TLS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream for TLS Stream Socket type.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-stream-function">
-    <term>
-     <constant>SWOOLE_HOOK_STREAM_FUNCTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based stream_*() function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-file">
-    <term>
-     <constant>SWOOLE_HOOK_FILE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based file operations.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-stdio">
-    <term>
-     <constant>SWOOLE_HOOK_STDIO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based STDIO operations.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-sleep">
-    <term>
-     <constant>SWOOLE_HOOK_SLEEP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based sleep operations, including sleep, usleep, time_nanosleep, time_sleep_until.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-proc">
-    <term>
-     <constant>SWOOLE_HOOK_PROC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based proc* functions, including: proc_open, proc_close, proc_get_status, proc_terminate.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-curl">
-    <term>
-     <constant>SWOOLE_HOOK_CURL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for curl extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-native-curl">
-    <term>
-     <constant>SWOOLE_HOOK_NATIVE_CURL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for native curl extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-blocking-function">
-    <term>
-     <constant>SWOOLE_HOOK_BLOCKING_FUNCTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for blocking function, include gethostbyname, exec, shell_exec.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-sockets">
-    <term>
-     <constant>SWOOLE_HOOK_SOCKETS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for the sockets extension
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-pdo-pgsql">
-    <term>
-     <constant>SWOOLE_HOOK_PDO_PGSQL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for pdo_pgsql extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-pdo-odbc">
-    <term>
-     <constant>SWOOLE_HOOK_PDO_ODBC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for pdo_odbc extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-pdo-oracle">
-    <term>
-     <constant>SWOOLE_HOOK_PDO_ORACLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for pdo_oci extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-pdo-sqlite">
-    <term>
-     <constant>SWOOLE_HOOK_PDO_SQLITE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for pdo_sqlite extension.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-hook-all">
-    <term>
-     <constant>SWOOLE_HOOK_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Coroutine-based for all block functions and extensions.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.socket-ecanceled">
-    <term>
-     <constant>SOCKET_ECANCELED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Socket ecanceled error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.tcp-info">
-    <term>
-     <constant>TCP_INFO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TCP_INFO.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-timer-min-ms">
-    <term>
-     <constant>SWOOLE_TIMER_MIN_MS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Minimum supported timer interval (in milliseconds).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-timer-min-sec">
-    <term>
-     <constant>SWOOLE_TIMER_MIN_SEC</constant>
-     (<type>double</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Minimum supported timer interval (in seconds).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-timer-max-ms">
-    <term>
-     <constant>SWOOLE_TIMER_MAX_MS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum supported timer interval (in milliseconds).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-timer-max-sec">
-    <term>
-     <constant>SWOOLE_TIMER_MAX_SEC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum supported timer interval (in seconds).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-status-connection">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_STATUS_CONNECTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      WebSocket is establishing a connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-status-handshake">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_STATUS_HANDSHAKE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The WebSocket is in the handshake phase.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-status-active">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_STATUS_ACTIVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Active WebSocket connection.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-status-closing">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_STATUS_CLOSING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      WebSocket connection is closed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-continuation">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_CONTINUATION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket continuation frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-text">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_TEXT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket text frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-binary">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_BINARY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket binary frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-close">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_CLOSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket close frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-ping">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_PING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket ping frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-opcode-pong">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_OPCODE_PONG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket pong frame.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-fin">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_FIN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket FIN flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-rsv1">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_RSV1</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket RSV1 flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-rsv2">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_RSV2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket RSV2 flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-rsv3">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_RSV3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket RSV3 flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-mask">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_MASK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket MASK flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-flag-compress">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_FLAG_COMPRESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Websocket COMPRESS flag.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-normal">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_NORMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Normal closure (connection completed successfully).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-going-away">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_GOING_AWAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Endpoint is going away (e.g., browser tab closed).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-protocol-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_PROTOCOL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Protocol error (malformed data frame).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-data-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_DATA_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Received unsupported data (e.g., binary when expecting text).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-status-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_STATUS_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      No status code provided (sent as a placeholder).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-abnormal">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_ABNORMAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Abnormal closure (no close frame received, e.g., TCP reset).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-message-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_MESSAGE_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invalid data (e.g., non-UTF-8 text in a text frame).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-policy-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_POLICY_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Policy violation (e.g., unauthorized action).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-message-too-big">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_MESSAGE_TOO_BIG</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Message too large (exceeds server’s max size).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-extension-missing">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_EXTENSION_MISSING</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Client didn’t negotiate required extensions.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-server-error">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_SERVER_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server encountered an error.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-close-service-restart">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_CLOSE_SERVICE_RESTART</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Server is restarting (temporary condition).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-try-again-later">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_TRY_AGAIN_LATER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Temporary server overload (client should retry).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-bad-gateway">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_BAD_GATEWAY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invalid response from upstream server.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.swoole-websocket-close-tls">
-    <term>
-     <constant>SWOOLE_WEBSOCKET_CLOSE_TLS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      TLS handshake failed (used when HTTPS fails).
-     </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/swoole/functions/swoole-async-dns-lookup.xml b/reference/swoole/functions/swoole-async-dns-lookup.xml
deleted file mode 100644
index 0fc4097f9951..000000000000
--- a/reference/swoole/functions/swoole-async-dns-lookup.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-dns-lookup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_dns_lookup</refname>
-  <refpurpose>Async and non-blocking hostname to IP lookup</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_async_dns_lookup</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <para>
-        The host name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-       <methodparam><type>string</type><parameter>ip</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>hostname</parameter></term>
-        <listitem>
-         <para>
-          The host name.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>IP</parameter></term>
-        <listitem>
-         <para>
-          The IP address.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-async-read.xml b/reference/swoole/functions/swoole-async-read.xml
deleted file mode 100644
index 2fae5fd37c27..000000000000
--- a/reference/swoole/functions/swoole-async-read.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_read</refname>
-  <refpurpose>Read file stream asynchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_async_read</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>chunk_size</parameter><initializer>65536</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename of the file being read.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-       <methodparam><type>string</type><parameter>content</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>filename</parameter></term>
-        <listitem>
-         <para>
-          The name of the file.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>content</parameter></term>
-        <listitem>
-         <simpara>
-          The content read from the file stream.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>chunk_size</parameter></term>
-    <listitem>
-     <para>
-      The chunk length.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Whether the read is succeed.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-async-readfile.xml b/reference/swoole/functions/swoole-async-readfile.xml
deleted file mode 100644
index 410f9f3e0c48..000000000000
--- a/reference/swoole/functions/swoole-async-readfile.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-readfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_readfile</refname>
-  <refpurpose>Read a file asynchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_async_readfile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename of the file being read.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-       <methodparam><type>string</type><parameter>content</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>filename</parameter></term>
-        <listitem>
-         <para>
-          The name of the file.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>content</parameter></term>
-        <listitem>
-         <para>
-          The content read from the file.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-async-set.xml b/reference/swoole/functions/swoole-async-set.xml
deleted file mode 100644
index 6b7f22b6b9d7..000000000000
--- a/reference/swoole/functions/swoole-async-set.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_set</refname>
-  <refpurpose>Update the async I/O options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>swoole_async_set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-async-write.xml b/reference/swoole/functions/swoole-async-write.xml
deleted file mode 100644
index d401c309047e..000000000000
--- a/reference/swoole/functions/swoole-async-write.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_write</refname>
-  <refpurpose>Write data to a file stream asynchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_async_write</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename being written.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      The content writing to the file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-async-writefile.xml b/reference/swoole/functions/swoole-async-writefile.xml
deleted file mode 100644
index d644b847a20b..000000000000
--- a/reference/swoole/functions/swoole-async-writefile.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-async-writefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_async_writefile</refname>
-  <refpurpose>Write data to a file asynchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_async_writefile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename being written.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      The content writing to the file.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</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>
-   &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/swoole/functions/swoole-clear-error.xml b/reference/swoole/functions/swoole-clear-error.xml
deleted file mode 100644
index 59262127d362..000000000000
--- a/reference/swoole/functions/swoole-clear-error.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-clear-error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <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>
-   <type>void</type><methodname>swoole_clear_error</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Clear errors in the socket or on the last error code.
-  </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/swoole/functions/swoole-client-select.xml b/reference/swoole/functions/swoole-client-select.xml
deleted file mode 100644
index 783031aae896..000000000000
--- a/reference/swoole/functions/swoole-client-select.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-client-select" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_client_select</refname>
-  <refpurpose>Get the file description which are ready to read/write or error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_client_select</methodname>
-   <methodparam><type>array</type><parameter role="reference">read_array</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">write_array</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">error_array</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>timeout</parameter><initializer>0.5</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>read_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-cpu-num.xml b/reference/swoole/functions/swoole-cpu-num.xml
deleted file mode 100644
index f76426910e6f..000000000000
--- a/reference/swoole/functions/swoole-cpu-num.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-cpu-num" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_cpu_num</refname>
-  <refpurpose>Get the number of CPU</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_cpu_num</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The number of CPU.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-errno.xml b/reference/swoole/functions/swoole-errno.xml
deleted file mode 100644
index 5bea35a4d8e9..000000000000
--- a/reference/swoole/functions/swoole-errno.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-errno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_errno</refname>
-  <refpurpose>Get the error code of the latest system call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_errno</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-error-log.xml b/reference/swoole/functions/swoole-error-log.xml
deleted file mode 100644
index ec99fb9adf12..000000000000
--- a/reference/swoole/functions/swoole-error-log.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-error-log" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_error_log</refname>
-  <refpurpose>Output error messages to the log</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <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>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <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>msg</parameter></term>
-    <listitem>
-     <para>
-      Message content to be written to the log.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-event-add.xml b/reference/swoole/functions/swoole-event-add.xml
deleted file mode 100644
index d2591f6e5a13..000000000000
--- a/reference/swoole/functions/swoole-event-add.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_add</refname>
-  <refpurpose>Add new callback functions of a socket into the EventLoop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_event_add</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>read_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>write_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>events</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>read_callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>events</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-event-defer.xml b/reference/swoole/functions/swoole-event-defer.xml
deleted file mode 100644
index e44692ef25dd..000000000000
--- a/reference/swoole/functions/swoole-event-defer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-defer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_defer</refname>
-  <refpurpose>Add callback function to the next event loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_event_defer</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-event-del.xml b/reference/swoole/functions/swoole-event-del.xml
deleted file mode 100644
index 89a108e135f6..000000000000
--- a/reference/swoole/functions/swoole-event-del.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_del</refname>
-  <refpurpose>Remove all event callback functions of a socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_event_del</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-event-exit.xml b/reference/swoole/functions/swoole-event-exit.xml
deleted file mode 100644
index 4b1fcceed79a..000000000000
--- a/reference/swoole/functions/swoole-event-exit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-exit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_exit</refname>
-  <refpurpose>Exit the eventloop, only available at the client side</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>swoole_event_exit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-event-set.xml b/reference/swoole/functions/swoole-event-set.xml
deleted file mode 100644
index 049ab15c8101..000000000000
--- a/reference/swoole/functions/swoole-event-set.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_set</refname>
-  <refpurpose>Update the event callback functions of a socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_event_set</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>read_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>write_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>events</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>read_callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>events</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-event-wait.xml b/reference/swoole/functions/swoole-event-wait.xml
deleted file mode 100644
index 86d454cbb790..000000000000
--- a/reference/swoole/functions/swoole-event-wait.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-wait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_wait</refname>
-  <refpurpose>Start the event loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>swoole_event_wait</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-event-write.xml b/reference/swoole/functions/swoole-event-write.xml
deleted file mode 100644
index 87a84eeadba7..000000000000
--- a/reference/swoole/functions/swoole-event-write.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-event-write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_event_write</refname>
-  <refpurpose>Write data to a socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_event_write</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/functions/swoole-get-local-ip.xml b/reference/swoole/functions/swoole-get-local-ip.xml
deleted file mode 100644
index 97856c840e1e..000000000000
--- a/reference/swoole/functions/swoole-get-local-ip.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-get-local-ip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_get_local_ip</refname>
-  <refpurpose>Get the IPv4 IP addresses of each NIC on the machine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>swoole_get_local_ip</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-last-error.xml b/reference/swoole/functions/swoole-last-error.xml
deleted file mode 100644
index eb2814b84b62..000000000000
--- a/reference/swoole/functions/swoole-last-error.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-last-error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_last_error</refname>
-  <refpurpose>Get the latest error message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_last_error</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-load-module.xml b/reference/swoole/functions/swoole-load-module.xml
deleted file mode 100644
index 88f8f37d4ea7..000000000000
--- a/reference/swoole/functions/swoole-load-module.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-load-module" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_load_module</refname>
-  <refpurpose>Load a swoole extension</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>swoole_load_module</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-select.xml b/reference/swoole/functions/swoole-select.xml
deleted file mode 100644
index 9b575039e314..000000000000
--- a/reference/swoole/functions/swoole-select.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-select" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_select</refname>
-  <refpurpose>Select the file descriptions which are ready to read/write or error in the eventloop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_select</methodname>
-   <methodparam><type>array</type><parameter role="reference">read_array</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">write_array</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">error_array</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>read_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_array</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-set-process-name.xml b/reference/swoole/functions/swoole-set-process-name.xml
deleted file mode 100644
index ca62f2f54849..000000000000
--- a/reference/swoole/functions/swoole-set-process-name.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-set-process-name" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_set_process_name</refname>
-  <refpurpose>Set the process name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>swoole_set_process_name</methodname>
-   <methodparam><type>string</type><parameter>process_name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter><initializer>128</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>process_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-strerror.xml b/reference/swoole/functions/swoole-strerror.xml
deleted file mode 100644
index d4807931ae72..000000000000
--- a/reference/swoole/functions/swoole-strerror.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-strerror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_strerror</refname>
-  <refpurpose>Convert the Errno into error messages</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>swoole_strerror</methodname>
-   <methodparam><type>int</type><parameter>errno</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>error_type</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>errno</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-timer-after.xml b/reference/swoole/functions/swoole-timer-after.xml
deleted file mode 100644
index 53c30ff90047..000000000000
--- a/reference/swoole/functions/swoole-timer-after.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-timer-after" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_timer_after</refname>
-  <refpurpose>Trigger a one time callback function in the future</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_timer_after</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>param</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ms</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>param</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-timer-exists.xml b/reference/swoole/functions/swoole-timer-exists.xml
deleted file mode 100644
index 44c8de59ef56..000000000000
--- a/reference/swoole/functions/swoole-timer-exists.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-timer-exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_timer_exists</refname>
-  <refpurpose>Check if a timer callback function is existed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>swoole_timer_exists</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timer_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-timer-tick.xml b/reference/swoole/functions/swoole-timer-tick.xml
deleted file mode 100644
index b70a9dc308e2..000000000000
--- a/reference/swoole/functions/swoole-timer-tick.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-timer-tick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_timer_tick</refname>
-  <refpurpose>Trigger a timer tick callback function by time interval</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>swoole_timer_tick</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>param</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ms</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/functions/swoole-version.xml b/reference/swoole/functions/swoole-version.xml
deleted file mode 100644
index 9f5dadfe4f14..000000000000
--- a/reference/swoole/functions/swoole-version.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.swoole-version" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>swoole_version</refname>
-  <refpurpose>Get the version of Swoole</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>swoole_version</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The version of Swoole.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/ini.xml b/reference/swoole/ini.xml
deleted file mode 100644
index 545f63cde143..000000000000
--- a/reference/swoole/ini.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="swoole.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Swoole &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.swoole.enable-library">swoole.enable_library</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.swoole.enable-fiber-mock">swoole.enable_fiber_mock</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.swoole.enable-preemptive-scheduler">swoole.enable_preemptive_scheduler</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.swoole.display-errors">swoole.display_errors</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.swoole.use-shortname">swoole.use_shortname</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.swoole.unixsock-buffer-size">swoole.unixsock_buffer_size</link></entry>
-      <entry>8388608</entry>
-      <entry><constant>INI_ALL</constant></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.swoole.enable-library">
-    <term>
-     <parameter>swoole.enable_library</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Enable/disable the extension's built-in library.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.swoole.enable-fiber-mock">
-    <term>
-     <parameter>swoole.enable_fiber_mock</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Enable/disable use the xdebug extension to debug Swoole programs.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.swoole.enable-preemptive-scheduler">
-    <term>
-     <parameter>swoole.enable_preemptive_scheduler</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Prevent some coroutines from consuming CPU time for too long in a tight loop (10ms of CPU time), preventing other coroutines from getting scheduled.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.swoole.display-errors">
-    <term>
-     <parameter>swoole.display_errors</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Enable/disable displaying Swoole error messages.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.swoole.use-shortname">
-    <term>
-     <parameter>swoole.use_shortname</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Enable/disable short aliases.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.swoole.unixsock-buffer-size">
-    <term>
-     <parameter>swoole.unixsock_buffer_size</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Set the size of the Socket buffer for inter-process communication.
-     </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/swoole/reference.xml b/reference/swoole/reference.xml
deleted file mode 100644
index 66e9d3b310be..000000000000
--- a/reference/swoole/reference.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.swoole-funcs" xmlns="http://docbook.org/ns/docbook">
- <title>Swoole &Functions;</title>
-
-  &reference.swoole.entities.functions;
-
-</reference>
\ No newline at end of file
diff --git a/reference/swoole/setup.xml b/reference/swoole/setup.xml
deleted file mode 100644
index 78b1e18d8196..000000000000
--- a/reference/swoole/setup.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="swoole.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="swoole.requirements">
-  &reftitle.required;
-  <para>
-   Swoole requires the libbrotli library.
-  </para>
-  <para>
-   Enabling --enable-swoole-curl option requires the libcurl library, and both PHP and Swoole must link to the
-   same libcurl shared library and headers to avoid undefined behavior.
-  </para>
-  <para>
-   Enabling --enable-iouring option requires liburing library (version >= 2.0) and Linux kernel (version >= 5.12).
-  </para>
-  <para>
-   Enabling --enable-swoole-thread option requires PHP to be in ZTS (Zend Thread Safety) mode.
-  </para>
-  <para>
-   Enabling the --enable-cares option requires the libc-ares library.
-  </para>
-  <para>
-   Enabling the --enable-zstd option requires the libzstd library (version >= 1.4.0).
-  </para>
-  <para>
-   Enabling the --enable-swoole-sqlite option requires the libsqlite library.
-  </para>
-  <para>
-   Enabling the --enable-swoole-pgsql option requires the libpq library.
-  </para>
-  <para>
-   Enabling the --with-swoole-odbc option requires the unixodbc-dev library.
-  </para>
-  <para>
-   Enabling the --with-swoole-oracle option requires the Oracle Instant Client libraries.
-  </para>
- </section>
-
- <!-- {{{ Installation -->
- &reference.swoole.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.swoole.ini;
- <!-- }}} -->
-
-</chapter>
diff --git a/reference/swoole/swoole.async.xml b/reference/swoole/swoole.async.xml
deleted file mode 100644
index cd574e085857..000000000000
--- a/reference/swoole/swoole.async.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-async" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Async class</title>
- <titleabbrev>Swoole\Async</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Async intro -->
-  <section xml:id="swoole-async.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-async.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Async</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Async</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-async')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.async;
-
-</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/swoole/swoole.atomic.xml b/reference/swoole/swoole.atomic.xml
deleted file mode 100644
index ecc7cdef9c1c..000000000000
--- a/reference/swoole/swoole.atomic.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-atomic" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Atomic class</title>
- <titleabbrev>Swoole\Atomic</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Atomic intro -->
-  <section xml:id="swoole-atomic.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-atomic.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Atomic</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Atomic</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-atomic')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.atomic;
-
-</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/swoole/swoole.buffer.xml b/reference/swoole/swoole.buffer.xml
deleted file mode 100644
index dc91b9c24b1c..000000000000
--- a/reference/swoole/swoole.buffer.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-buffer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Buffer class</title>
- <titleabbrev>Swoole\Buffer</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Buffer intro -->
-  <section xml:id="swoole-buffer.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-buffer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Buffer</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Buffer</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-buffer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.buffer;
-
-</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/swoole/swoole.channel.xml b/reference/swoole/swoole.channel.xml
deleted file mode 100644
index 069131cf99c1..000000000000
--- a/reference/swoole/swoole.channel.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-channel" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Channel class</title>
- <titleabbrev>Swoole\Channel</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Channel intro -->
-  <section xml:id="swoole-channel.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-channel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Channel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Channel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-channel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.channel;
-
-</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/swoole/swoole.client.xml b/reference/swoole/swoole.client.xml
deleted file mode 100644
index edfd68947c96..000000000000
--- a/reference/swoole/swoole.client.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Client class</title>
- <titleabbrev>Swoole\Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Client intro -->
-  <section xml:id="swoole-client.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Client</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Client</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-client.constants.msg-oob">Swoole\Client::MSG_OOB</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-client.constants.msg-peek">Swoole\Client::MSG_PEEK</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-client.constants.msg-dontwait">Swoole\Client::MSG_DONTWAIT</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-client.constants.msg-waitall">Swoole\Client::MSG_WAITALL</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-client.props.errcode">errCode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-client.props.sock">sock</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-client.props.reuse">reuse</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-client.props.reusecount">reuseCount</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Swoole\Client properties -->
-  <section xml:id="swoole-client.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="swoole-client.props.errcode">
-     <term><varname>errCode</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-client.props.sock">
-     <term><varname>sock</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-client.props.reuse">
-     <term><varname>reuse</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-client.props.reusecount">
-     <term><varname>reuseCount</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ Swoole\Client constants -->
-  <section xml:id="swoole-client.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="swoole-client.constants.msg-oob">
-     <term><constant>Swoole\Client::MSG_OOB</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-client.constants.msg-peek">
-     <term><constant>Swoole\Client::MSG_PEEK</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-client.constants.msg-dontwait">
-     <term><constant>Swoole\Client::MSG_DONTWAIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-client.constants.msg-waitall">
-     <term><constant>Swoole\Client::MSG_WAITALL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.entities.client;
-
-</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/swoole/swoole.connection.iterator.xml b/reference/swoole/swoole.connection.iterator.xml
deleted file mode 100644
index 606297721037..000000000000
--- a/reference/swoole/swoole.connection.iterator.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-connection-iterator" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Connection\Iterator class</title>
- <titleabbrev>Swoole\Connection\Iterator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Connection\Iterator intro -->
-  <section xml:id="swoole-connection-iterator.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-connection-iterator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Connection\Iterator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Connection\Iterator</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-connection-iterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.connection.entities.iterator;
-
-</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/swoole/swoole.coroutine.client.xml b/reference/swoole/swoole.coroutine.client.xml
deleted file mode 100644
index bd732fadf248..000000000000
--- a/reference/swoole/swoole.coroutine.client.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine\Client class</title>
- <titleabbrev>Swoole\Coroutine\Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine\Client intro -->
-  <section xml:id="swoole-coroutine-client.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine\Client</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine\Client</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-coroutine-client.constants.msg-oob">Swoole\Coroutine\Client::MSG_OOB</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-coroutine-client.constants.msg-peek">Swoole\Coroutine\Client::MSG_PEEK</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-coroutine-client.constants.msg-dontwait">Swoole\Coroutine\Client::MSG_DONTWAIT</varname>
-     <initializer>128</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-coroutine-client.constants.msg-waitall">Swoole\Coroutine\Client::MSG_WAITALL</varname>
-     <initializer>64</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-client.props.errcode">errCode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-client.props.sock">sock</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Swoole\Coroutine\Client properties -->
-  <section xml:id="swoole-coroutine-client.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="swoole-coroutine-client.props.errcode">
-     <term><varname>errCode</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-client.props.sock">
-     <term><varname>sock</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ Swoole\Coroutine\Client constants -->
-  <section xml:id="swoole-coroutine-client.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="swoole-coroutine-client.constants.msg-oob">
-     <term><constant>Swoole\Coroutine\Client::MSG_OOB</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-coroutine-client.constants.msg-peek">
-     <term><constant>Swoole\Coroutine\Client::MSG_PEEK</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-coroutine-client.constants.msg-dontwait">
-     <term><constant>Swoole\Coroutine\Client::MSG_DONTWAIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-coroutine-client.constants.msg-waitall">
-     <term><constant>Swoole\Coroutine\Client::MSG_WAITALL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.coroutine.entities.client;
-
-</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/swoole/swoole.coroutine.http.client.xml b/reference/swoole/swoole.coroutine.http.client.xml
deleted file mode 100644
index df629fdeb46b..000000000000
--- a/reference/swoole/swoole.coroutine.http.client.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine-http-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine\Http\Client class</title>
- <titleabbrev>Swoole\Coroutine\Http\Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine\Http\Client intro -->
-  <section xml:id="swoole-coroutine-http-client.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine-http-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine\Http\Client</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine\Http\Client</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-http-client.props.errcode">errCode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-http-client.props.sock">sock</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-coroutine-http-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Swoole\Coroutine\Http\Client properties -->
-  <section xml:id="swoole-coroutine-http-client.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="swoole-coroutine-http-client.props.errcode">
-     <term><varname>errCode</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-http-client.props.sock">
-     <term><varname>sock</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.coroutine.http.entities.client;
-
-</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/swoole/swoole.coroutine.lock.xml b/reference/swoole/swoole.coroutine.lock.xml
deleted file mode 100644
index d536aeca854f..000000000000
--- a/reference/swoole/swoole.coroutine.lock.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine-lock" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine\Lock class</title>
- <titleabbrev>Swoole\Coroutine\Lock</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine\Lock intro -->
-  <section xml:id="swoole-coroutine-lock.intro">
-   &reftitle.intro;
-   <para>
-    Swoole 6.0.1 introduced a coroutine lock that supports inter-process and inter-thread sharing.
-    This lock is designed with non-blocking behavior and enables efficient coroutine synchronization
-    in multi-process and multi-thread environments.
-   </para>
-   <para>
-    When compiled with the <literal>--enable-iouring</literal> option and the Linux kernel supports
-    the <literal>io_uring futex</literal> feature, Swoole's coroutine lock implements synchronization
-    using <literal>io_uring futex</literal>. In this case, coroutines wait for lock wakeups using
-    an efficient queuing mechanism, significantly improving performance.
-   </para>
-   <para>
-    Without <literal>io_uring futex</literal>, the coroutine lock falls back to an exponential backoff
-    sleep mechanism, where the wait time increases by 2^n milliseconds (n being the number of failures)
-    after each failed attempt to acquire the lock. While this approach avoids busy waiting, it introduces
-    additional CPU scheduling overhead and latency.
-   </para>
-   <para>
-    The coroutine lock is reentrant, allowing the currently holding coroutine to safely perform
-    multiple lock operations.
-   </para>
-   <warning>
-    <para>
-     Do not create locks in callback functions like <literal>onReceive</literal>, as this will cause
-     continuous memory growth and lead to memory leaks.
-    </para>
-   </warning>
-   <warning>
-    <para>
-     Locking and unlocking must be performed in the same coroutine, otherwise it will break
-     static conditions.
-    </para>
-   </warning>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine-lock.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine\Lock</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine\Lock</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-coroutine-lock')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <section xml:id="swoole-coroutine-lock.examples">
-   &reftitle.examples;
-   <example xml:id="swoole-coroutine-lock.example.basic">
-    <title>Basic usage</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-use Swoole\Coroutine\Lock;
-use Swoole\Coroutine\WaitGroup;
-use function Swoole\Coroutine\go;
-use function Swoole\Coroutine\run;
-
-$lock = new Lock();
-$waitGroup = new WaitGroup();
-
-run(function() use ($lock, $waitGroup) {
-    go(function() use ($lock, $waitGroup) {
-        $waitGroup->add();
-        $lock->lock();
-        sleep(1);
-        $lock->unlock();
-        $waitGroup->done();
-    });
-
-    go(function() use ($lock, $waitGroup) {
-        $waitGroup->add();
-        $lock->lock(); // Wait for the holding coroutine to unlock
-        sleep(1);
-        $lock->unlock();
-        $waitGroup->done();
-    });
-
-    echo 'Lock does not block the process';
-    $waitGroup->wait();
-});
-]]>
-    </programlisting>
-   </example>
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.coroutine.entities.lock;
-</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/swoole/swoole.coroutine.mysql.exception.xml b/reference/swoole/swoole.coroutine.mysql.exception.xml
deleted file mode 100644
index 5bcff61f264c..000000000000
--- a/reference/swoole/swoole.coroutine.mysql.exception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine-mysql-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine\MySQL\Exception class</title>
- <titleabbrev>Swoole\Coroutine\MySQL\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine\MySQL\Exception intro -->
-  <section xml:id="swoole-coroutine-mysql-exception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine-mysql-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine\MySQL\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine\MySQL\Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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>
-
-</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/swoole/swoole.coroutine.mysql.xml b/reference/swoole/swoole.coroutine.mysql.xml
deleted file mode 100644
index c1cecd30a6eb..000000000000
--- a/reference/swoole/swoole.coroutine.mysql.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine-mysql" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine\MySQL class</title>
- <titleabbrev>Swoole\Coroutine\MySQL</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine\MySQL intro -->
-  <section xml:id="swoole-coroutine-mysql.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine-mysql.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine\MySQL</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine\MySQL</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.sock">sock</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.connected">connected</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.connect-error">connect_error</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.connect-errno">connect_errno</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.affected-rows">affected_rows</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.insert-id">insert_id</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.error">error</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-coroutine-mysql.props.errno">errno</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-coroutine-mysql')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Swoole\Coroutine\MySQL properties -->
-  <section xml:id="swoole-coroutine-mysql.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.sock">
-     <term><varname>sock</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.connected">
-     <term><varname>connected</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.connect-error">
-     <term><varname>connect_error</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.connect-errno">
-     <term><varname>connect_errno</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.affected-rows">
-     <term><varname>affected_rows</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.insert-id">
-     <term><varname>insert_id</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.error">
-     <term><varname>error</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-coroutine-mysql.props.errno">
-     <term><varname>errno</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.coroutine.entities.mysql;
-
-</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/swoole/swoole.coroutine.xml b/reference/swoole/swoole.coroutine.xml
deleted file mode 100644
index 3a3fa69bfbc2..000000000000
--- a/reference/swoole/swoole.coroutine.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-coroutine" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Coroutine class</title>
- <titleabbrev>Swoole\Coroutine</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Coroutine intro -->
-  <section xml:id="swoole-coroutine.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-coroutine.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Coroutine</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Coroutine</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-coroutine')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.coroutine;
-
-</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/swoole/swoole.event.xml b/reference/swoole/swoole.event.xml
deleted file mode 100644
index d4cb09ec805d..000000000000
--- a/reference/swoole/swoole.event.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-event" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Event class</title>
- <titleabbrev>Swoole\Event</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Event intro -->
-  <section xml:id="swoole-event.intro">
-   &reftitle.intro;
-   <simpara>
-    The Swoole extension provides low-level interfaces to directly manipulate the underlying epoll/kqueue/poll/select event loop.
-    It allows adding sockets created by other extensions or PHP's stream/socket extensions to Swoole's EventLoop.
-   </simpara>
-   <note>
-    <simpara>
-     The Event module is low-level, being a basic encapsulation of epoll. Users should have experience with IO multiplexing programming.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-event.event-priority">
-   <title>Event Priority</title>
-   <orderedlist>
-    <listitem><simpara>Signal handler callback functions set via Process::signal</simpara></listitem>
-    <listitem><simpara>Timer callback functions set via Timer::tick and Timer::after</simpara></listitem>
-    <listitem><simpara>Deferred execution functions set via Event::defer</simpara></listitem>
-    <listitem><simpara>Periodic callback functions set via Event::cycle</simpara></listitem>
-   </orderedlist>
-  </section>
-
-  <section xml:id="swoole-event.event-socket">
-   <title>Swoole Event Socket Type</title>
-   <para>
-    <variablelist>
-     <varlistentry xml:id="swoole-event.int">
-      <term>
-       <parameter>fd</parameter>
-       <type>int</type>
-      </term>
-      <listitem>
-       <simpara>
-        File descriptors, including Swoole\Client->$sock, Swoole\Process->$pipe, or any other file descriptor (fd).
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="swoole-event.stream">
-      <term>
-       <parameter>stream resource</parameter>
-       <type>resource</type>
-      </term>
-      <listitem>
-       <simpara>
-        Resources created by stream_socket_client/fsockopen.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="swoole-event.socket">
-      <term>
-       <parameter>socket resource</parameter>
-       <type>resource</type>
-      </term>
-      <listitem>
-       <simpara>
-        Resources created by socket_create from the sockets extension require
-        the --enable-sockets flag during Swoole compilation.
-       </simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="swoole-event.object">
-      <term>
-       <parameter>object</parameter>
-       <type>object</type>
-      </term>
-      <listitem>
-       <simpara>
-        Swoole automatically converts Swoole\Process into UnixSocket and Swoole\Client
-        into connected client sockets at the underlying level.
-       </simpara>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </para>
-  </section>
-
-  <section xml:id="swoole-event.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Event</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Event</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-event')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.event;
-
-</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/swoole/swoole.exception.xml b/reference/swoole/swoole.exception.xml
deleted file mode 100644
index 38bf56259dd7..000000000000
--- a/reference/swoole/swoole.exception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Exception class</title>
- <titleabbrev>Swoole\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Exception intro -->
-  <section xml:id="swoole-exception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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>
-
-</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/swoole/swoole.http.client.xml b/reference/swoole/swoole.http.client.xml
deleted file mode 100644
index 82f6c335ccad..000000000000
--- a/reference/swoole/swoole.http.client.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-http-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Http\Client class</title>
- <titleabbrev>Swoole\Http\Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Http\Client intro -->
-  <section xml:id="swoole-http-client.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-http-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Http\Client</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Http\Client</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-http-client.props.errcode">errCode</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="swoole-http-client.props.sock">sock</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-http-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Swoole\Http\Client properties -->
-  <section xml:id="swoole-http-client.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="swoole-http-client.props.errcode">
-     <term><varname>errCode</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="swoole-http-client.props.sock">
-     <term><varname>sock</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.http.entities.client;
-
-</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/swoole/swoole.http.request.xml b/reference/swoole/swoole.http.request.xml
deleted file mode 100644
index ac696c7e335e..000000000000
--- a/reference/swoole/swoole.http.request.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-http-request" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Http\Request class</title>
- <titleabbrev>Swoole\Http\Request</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Http\Request intro -->
-  <section xml:id="swoole-http-request.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-http-request.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Http\Request</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Http\Request</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-http-request')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.http.entities.request;
-
-</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/swoole/swoole.http.response.xml b/reference/swoole/swoole.http.response.xml
deleted file mode 100644
index 202af8911b44..000000000000
--- a/reference/swoole/swoole.http.response.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-http-response" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Http\Response class</title>
- <titleabbrev>Swoole\Http\Response</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Http\Response intro -->
-  <section xml:id="swoole-http-response.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-http-response.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Http\Response</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Http\Response</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-http-response')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.http.entities.response;
-
-</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/swoole/swoole.http.server.xml b/reference/swoole/swoole.http.server.xml
deleted file mode 100644
index 81ad542fa11e..000000000000
--- a/reference/swoole/swoole.http.server.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-http-server" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Http\Server class</title>
- <titleabbrev>Swoole\Http\Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Http\Server intro -->
-  <section xml:id="swoole-http-server.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-http-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Http\Server</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Http\Server</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Swoole\Server</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-http-server')/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.swoole-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.http.entities.server;
-
-</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/swoole/swoole.lock.xml b/reference/swoole/swoole.lock.xml
deleted file mode 100644
index 534f732ffe94..000000000000
--- a/reference/swoole/swoole.lock.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-lock" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Lock class</title>
- <titleabbrev>Swoole\Lock</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Lock intro -->
-  <section xml:id="swoole-lock.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-lock.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Lock</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Lock</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-lock')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.lock;
-
-</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/swoole/swoole.mmap.xml b/reference/swoole/swoole.mmap.xml
deleted file mode 100644
index 559f6ccac02d..000000000000
--- a/reference/swoole/swoole.mmap.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-mmap" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Mmap class</title>
- <titleabbrev>Swoole\Mmap</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Mmap intro -->
-  <section xml:id="swoole-mmap.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-mmap.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Mmap</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Mmap</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-mmap')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.mmap;
-
-</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/swoole/swoole.module.xml b/reference/swoole/swoole.module.xml
deleted file mode 100644
index 3378860b965c..000000000000
--- a/reference/swoole/swoole.module.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-module" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Module class</title>
- <titleabbrev>Swoole\Module</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Module intro -->
-  <section xml:id="swoole-module.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-module.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Module</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Module</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/swoole/swoole.mysql.exception.xml b/reference/swoole/swoole.mysql.exception.xml
deleted file mode 100644
index d28af0064ad4..000000000000
--- a/reference/swoole/swoole.mysql.exception.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-mysql-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\MySQL\Exception class</title>
- <titleabbrev>Swoole\MySQL\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\MySQL\Exception intro -->
-  <section xml:id="swoole-mysql-exception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-mysql-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\MySQL\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\MySQL\Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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>
-
-</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/swoole/swoole.mysql.xml b/reference/swoole/swoole.mysql.xml
deleted file mode 100644
index 1a5faa42a4dd..000000000000
--- a/reference/swoole/swoole.mysql.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-mysql" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\MySQL class</title>
- <titleabbrev>Swoole\MySQL</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\MySQL intro -->
-  <section xml:id="swoole-mysql.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-mysql.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\MySQL</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\MySQL</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-mysql')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.mysql;
-
-</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/swoole/swoole.process.xml b/reference/swoole/swoole.process.xml
deleted file mode 100644
index cdcd85849db4..000000000000
--- a/reference/swoole/swoole.process.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-process" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Process class</title>
- <titleabbrev>Swoole\Process</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Process intro -->
-  <section xml:id="swoole-process.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-process.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Process</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Process</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-process.constants.ipc-nowait">Swoole\Process::IPC_NOWAIT</varname>
-     <initializer>256</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-process')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Swoole\Process constants -->
-  <section xml:id="swoole-process.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="swoole-process.constants.ipc-nowait">
-     <term><constant>Swoole\Process::IPC_NOWAIT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.entities.process;
-
-</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/swoole/swoole.redis.server.xml b/reference/swoole/swoole.redis.server.xml
deleted file mode 100644
index 3c7d5f64e043..000000000000
--- a/reference/swoole/swoole.redis.server.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-redis-server" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Redis\Server class</title>
- <titleabbrev>Swoole\Redis\Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Redis\Server intro -->
-  <section xml:id="swoole-redis-server.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-redis-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Redis\Server</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Redis\Server</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Swoole\Server</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.nil">Swoole\Redis\Server::NIL</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.error">Swoole\Redis\Server::ERROR</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.status">Swoole\Redis\Server::STATUS</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.int">Swoole\Redis\Server::INT</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.string">Swoole\Redis\Server::STRING</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.set">Swoole\Redis\Server::SET</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-redis-server.constants.map">Swoole\Redis\Server::MAP</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-redis-server')/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.swoole-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Swoole\Redis\Server constants -->
-  <section xml:id="swoole-redis-server.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="swoole-redis-server.constants.nil">
-     <term><constant>Swoole\Redis\Server::NIL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.error">
-     <term><constant>Swoole\Redis\Server::ERROR</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.status">
-     <term><constant>Swoole\Redis\Server::STATUS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.int">
-     <term><constant>Swoole\Redis\Server::INT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.string">
-     <term><constant>Swoole\Redis\Server::STRING</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.set">
-     <term><constant>Swoole\Redis\Server::SET</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-redis-server.constants.map">
-     <term><constant>Swoole\Redis\Server::MAP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.redis.entities.server;
-
-</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/swoole/swoole.runtime.xml b/reference/swoole/swoole.runtime.xml
deleted file mode 100644
index d96fd45b94e6..000000000000
--- a/reference/swoole/swoole.runtime.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-runtime" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Runtime class</title>
- <titleabbrev>Swoole\Runtime</titleabbrev>
-
- <partintro>
-
-  <!-- {{{ Swoole\Runtime intro -->
-  <section xml:id="swoole-runtime.intro">
-   &reftitle.intro;
-   <para>
-    Swoole\Runtime provides coroutine support for various PHP functions through hook mechanism,
-    allowing synchronous code to work asynchronously in coroutine environment.
-   </para>
-  </section>
-  <!-- }}} -->
-
-  <section xml:id="swoole-runtime.synopsis">
-   &reftitle.classsynopsis;
-
-   <!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Runtime</classname></ooclass>
-
-    <!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Runtime</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-runtime')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-   <!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.runtime;
-
-</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/swoole/swoole.serialize.xml b/reference/swoole/swoole.serialize.xml
deleted file mode 100644
index 1cab8e2d9b31..000000000000
--- a/reference/swoole/swoole.serialize.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-serialize" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Serialize class</title>
- <titleabbrev>Swoole\Serialize</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Serialize intro -->
-  <section xml:id="swoole-serialize.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-serialize.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Serialize</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Serialize</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-serialize')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.serialize;
-
-</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/swoole/swoole.server.port.xml b/reference/swoole/swoole.server.port.xml
deleted file mode 100644
index 58ce58da59e3..000000000000
--- a/reference/swoole/swoole.server.port.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-server-port" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Server\Port class</title>
- <titleabbrev>Swoole\Server\Port</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Server\Port intro -->
-  <section xml:id="swoole-server-port.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-server-port.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Server\Port</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Server\Port</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-server-port')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.server.entities.port;
-
-</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/swoole/swoole.server.xml b/reference/swoole/swoole.server.xml
deleted file mode 100644
index a46137f00b61..000000000000
--- a/reference/swoole/swoole.server.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-server" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Server class</title>
- <titleabbrev>Swoole\Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Server intro -->
-  <section xml:id="swoole-server.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Server</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Server</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.server;
-
-</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/swoole/swoole.table.xml b/reference/swoole/swoole.table.xml
deleted file mode 100644
index 28d54f8bdc97..000000000000
--- a/reference/swoole/swoole.table.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-table" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Table class</title>
- <titleabbrev>Swoole\Table</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Table intro -->
-  <section xml:id="swoole-table.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-table.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Table</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Table</classname>
-     </ooclass>
-
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-table.constants.type-int">Swoole\Table::TYPE_INT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-table.constants.type-string">Swoole\Table::TYPE_STRING</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="swoole-table.constants.type-float">Swoole\Table::TYPE_FLOAT</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-table')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Swoole\Table constants -->
-  <section xml:id="swoole-table.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="swoole-table.constants.type-int">
-     <term><constant>Swoole\Table::TYPE_INT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-table.constants.type-string">
-     <term><constant>Swoole\Table::TYPE_STRING</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="swoole-table.constants.type-float">
-     <term><constant>Swoole\Table::TYPE_FLOAT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.swoole.swoole.entities.table;
-
-</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/swoole/swoole.timer.xml b/reference/swoole/swoole.timer.xml
deleted file mode 100644
index d39a63a9bda6..000000000000
--- a/reference/swoole/swoole.timer.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-timer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\Timer class</title>
- <titleabbrev>Swoole\Timer</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\Timer intro -->
-  <section xml:id="swoole-timer.intro">
-   &reftitle.intro;
-   <simpara>
-    Millisecond precision timer. The underlying implementation is based on epoll_wait and setitimer,
-    using a min-heap data structure that supports adding a large number of timers.
-   </simpara>
-   <simpara>
-    In synchronous I/O processes, such as the Manager and TaskWorker processes, it is
-    implemented using setitimer and signals.
-   </simpara>
-   <simpara>
-    In asynchronous I/O processes, it is implemented using the timeout of
-    epoll_wait/kevent/poll/select.
-   </simpara>
-   <para>
-    The underlying system does not support timers with a delay of <literal>0</literal>;
-    values below <literal>1</literal> millisecond emit an
-    <constant>E_WARNING</constant> and the call fails. This differs from
-    languages such as Node.js.
-    <methodname linkend="swoole-event.defer">Swoole\Event::defer</methodname>
-    may be used to achieve similar functionality.
-    <programlisting role="php">
-<![CDATA[
-<?php
-Swoole\Event::defer(function () {
-  echo "hello\n";
-});
-?>
-]]>
-    </programlisting>
-   </para>
-   <simpara>
-    Timer Correction: The execution time of the timer callback function does not affect the timing of the
-    next timer execution. For example, setting a tick timer of 10ms after 0.002s, the first callback will
-    be executed at 0.012s, if the callback function takes 5ms to execute, the next timer will still trigger
-    at 0.022s, not at 0.027s.
-   </simpara>
-   <simpara>
-    However, if the execution time of the timer callback function is too long, even covering the time of the
-    next timer execution, the underlying system will perform time correction, discarding the expired behavior
-    and triggering the timer callback at the next available time. For example, if the callback function
-    at 0.012s takes 15ms to execute, causing the timer at 0.022s to be delayed, the timer callback
-    will be triggered again at 0.032s.
-   </simpara>
-   <simpara>
-    By default, when a timer is triggered, a coroutine is automatically created
-    to execute the callback function. This can be disabled with
-    <function>swoole_async_set</function>.
-   </simpara>
-   <warning>
-    <simpara>
-     Timer only works within the current process space.
-    </simpara>
-   </warning>
-   <warning>
-    <simpara>
-     Timer is purely asynchronous and incompatible with synchronous I/O functions.
-    </simpara>
-   </warning>
-   <warning>
-    <simpara>
-     Timer execution may experience minor timing deviations.
-    </simpara>
-   </warning>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-timer.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\Timer</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\Timer</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-timer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.entities.timer;
-
-</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/swoole/swoole.websocket.frame.xml b/reference/swoole/swoole.websocket.frame.xml
deleted file mode 100644
index 6717a14ae485..000000000000
--- a/reference/swoole/swoole.websocket.frame.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-websocket-frame" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\WebSocket\Frame class</title>
- <titleabbrev>Swoole\WebSocket\Frame</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\WebSocket\Frame intro -->
-  <section xml:id="swoole-websocket-frame.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-websocket-frame.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\WebSocket\Frame</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\WebSocket\Frame</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/swoole/swoole.websocket.server.xml b/reference/swoole/swoole.websocket.server.xml
deleted file mode 100644
index 63c2a1732087..000000000000
--- a/reference/swoole/swoole.websocket.server.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.swoole-websocket-server" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Swoole\WebSocket\Server class</title>
- <titleabbrev>Swoole\WebSocket\Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Swoole\WebSocket\Server intro -->
-  <section xml:id="swoole-websocket-server.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="swoole-websocket-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Swoole\WebSocket\Server</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Swoole\WebSocket\Server</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Swoole\Http\Server</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.swoole-websocket-server')/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.swoole-http-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.swoole.swoole.websocket.entities.server;
-
-</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/swoole/swoole/async/dnslookup.xml b/reference/swoole/swoole/async/dnslookup.xml
deleted file mode 100644
index 321231bc7633..000000000000
--- a/reference/swoole/swoole/async/dnslookup.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.dnslookup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::dnsLookup</refname>
-  <refpurpose>Async and non-blocking hostname to IP lookup.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Async::dnsLookup</methodname>
-   <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>hostname</parameter></term>
-    <listitem>
-     <para>
-      The host name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-      <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>hostname</parameter></methodparam>
-       <methodparam><type>string</type><parameter>ip</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>hostname</parameter></term>
-        <listitem>
-         <para>
-          The host name.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>IP</parameter></term>
-        <listitem>
-         <para>
-          The IP address.
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </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/swoole/swoole/async/read.xml b/reference/swoole/swoole/async/read.xml
deleted file mode 100644
index 9082f7408ad1..000000000000
--- a/reference/swoole/swoole/async/read.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::read</refname>
-  <refpurpose>Read file stream asynchronously.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Async::read</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>chunk_size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The name of the file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-       <methodparam><type>string</type><parameter>content</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>filename</parameter></term>
-        <listitem>
-         <para>
-          The name of the file.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>content</parameter></term>
-        <listitem>
-         <simpara>
-          The content read from the file stream.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>chunk_size</parameter></term>
-    <listitem>
-     <para>
-      The chunk length.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Whether the read is succeed.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/async/readfile.xml b/reference/swoole/swoole/async/readfile.xml
deleted file mode 100644
index 1533c8542f9a..000000000000
--- a/reference/swoole/swoole/async/readfile.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.readfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::readFile</refname>
-  <refpurpose>Read a file asynchronously.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Async::readFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename of the file being read.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <methodsynopsis>
-       <type>mixed</type><methodname><replaceable>callback</replaceable></methodname>
-       <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-       <methodparam><type>string</type><parameter>content</parameter></methodparam>
-      </methodsynopsis>
-      <variablelist>
-       <varlistentry>
-        <term><parameter>filename</parameter></term>
-        <listitem>
-         <para>
-          The name of the file.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><parameter>content</parameter></term>
-        <listitem>
-         <simpara>
-          The content read from the file.
-         </simpara>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-    </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/swoole/swoole/async/set.xml b/reference/swoole/swoole/async/set.xml
deleted file mode 100644
index a957827c811f..000000000000
--- a/reference/swoole/swoole/async/set.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::set</refname>
-  <refpurpose>Update the async I/O options.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Async::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/swoole/swoole/async/write.xml b/reference/swoole/swoole/async/write.xml
deleted file mode 100644
index 55fe480445e8..000000000000
--- a/reference/swoole/swoole/async/write.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::write</refname>
-  <refpurpose>Write data to a file stream asynchronously.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Async::write</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename being written.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      The content writing to the file.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/swoole/swoole/async/writefile.xml b/reference/swoole/swoole/async/writefile.xml
deleted file mode 100644
index a6ffa74a2742..000000000000
--- a/reference/swoole/swoole/async/writefile.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-async.writefile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Async::writeFile</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Async::writeFile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      The filename being written.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      The content writing to the file.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/swoole/swoole/atomic/add.xml b/reference/swoole/swoole/atomic/add.xml
deleted file mode 100644
index d43df187d19e..000000000000
--- a/reference/swoole/swoole/atomic/add.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::add</refname>
-  <refpurpose>Add a number to the value to the atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Atomic::add</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>add_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Add a number to the value to the atomic object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>add_value</parameter></term>
-    <listitem>
-     <para>
-      The value which will be added to the current value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new value of the atomic 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/swoole/swoole/atomic/cmpset.xml b/reference/swoole/swoole/atomic/cmpset.xml
deleted file mode 100644
index 6c049d5d6c1d..000000000000
--- a/reference/swoole/swoole/atomic/cmpset.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.cmpset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::cmpset</refname>
-  <refpurpose>Compare and set the value of the atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Atomic::cmpset</methodname>
-   <methodparam><type>int</type><parameter>cmp_value</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cmp_value</parameter></term>
-    <listitem>
-     <para>
-      The value to compare with the current value of the atomic object.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>new_value</parameter></term>
-    <listitem>
-     <para>
-      The value to set to the atomic object if the cmp_value is the same as the current value of
-      the atomic object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new value of the atomic 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/swoole/swoole/atomic/construct.xml b/reference/swoole/swoole/atomic/construct.xml
deleted file mode 100644
index 17e912223985..000000000000
--- a/reference/swoole/swoole/atomic/construct.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::__construct</refname>
-  <refpurpose>Construct a swoole atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Atomic::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>value</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Swoole atomic object is an integer variable allows any processor to atomically test and modify.
-    It is implemented based on CPU atomic instructions. The Swoole atomic variables have to 
-    defined before swoole_server->start.
-  </para>
-
-  <para>
-    Compare-and-swap (CAS) is an atomic instruction used in multithreading to achieve synchronization. 
-    It compares the content of a memory location with a given value and, only if they are the same, 
-    modifies the content of that memory location to a new given value.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The value of the atomic object.
-     </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/swoole/swoole/atomic/get.xml b/reference/swoole/swoole/atomic/get.xml
deleted file mode 100644
index 35296bb50e1d..000000000000
--- a/reference/swoole/swoole/atomic/get.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::get</refname>
-  <refpurpose>Get the current value of the atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Atomic::get</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Get the current value of the atomic object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current value of the atomic 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/swoole/swoole/atomic/set.xml b/reference/swoole/swoole/atomic/set.xml
deleted file mode 100644
index fd382748f7d2..000000000000
--- a/reference/swoole/swoole/atomic/set.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::set</refname>
-  <refpurpose>Set a new value to the atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Atomic::set</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set a new value to the atomic object.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The value to set to the atomic object. 
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current value of the atomic 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/swoole/swoole/atomic/sub.xml b/reference/swoole/swoole/atomic/sub.xml
deleted file mode 100644
index 9010dc66a28a..000000000000
--- a/reference/swoole/swoole/atomic/sub.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-atomic.sub" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Atomic::sub</refname>
-  <refpurpose>Subtract a number to the value of the atomic object.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Atomic::sub</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>sub_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Subtract a number to the value of the atomic object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sub_value</parameter></term>
-    <listitem>
-     <para>
-      The value which will be subtracted to the current value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    The current value of the atomic 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/swoole/swoole/buffer/append.xml b/reference/swoole/swoole/buffer/append.xml
deleted file mode 100644
index c988d2d3a155..000000000000
--- a/reference/swoole/swoole/buffer/append.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::append</refname>
-  <refpurpose>Append the string or binary data at the end of the memory buffer and return the new size of memory allocated.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Buffer::append</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      The string or binary data to append at the end of the memory buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new size of the memory buffer.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/clear.xml b/reference/swoole/swoole/buffer/clear.xml
deleted file mode 100644
index 1916bbbd242e..000000000000
--- a/reference/swoole/swoole/buffer/clear.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::clear</refname>
-  <refpurpose>Reset the memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Buffer::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/swoole/swoole/buffer/construct.xml b/reference/swoole/swoole/buffer/construct.xml
deleted file mode 100644
index 4be5c5acc3a8..000000000000
--- a/reference/swoole/swoole/buffer/construct.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::__construct</refname>
-  <refpurpose>Fixed size memory blocks allocation.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Buffer::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The size of the memory to allocate.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/destruct.xml b/reference/swoole/swoole/buffer/destruct.xml
deleted file mode 100644
index 20ff824859ae..000000000000
--- a/reference/swoole/swoole/buffer/destruct.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::__destruct</refname>
-  <refpurpose>Destruct the Swoole memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Buffer::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </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/swoole/swoole/buffer/expand.xml b/reference/swoole/swoole/buffer/expand.xml
deleted file mode 100644
index eaf519321c80..000000000000
--- a/reference/swoole/swoole/buffer/expand.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.expand" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::expand</refname>
-  <refpurpose>Expand the size of memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Buffer::expand</methodname>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The new size of the memory buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new size of the memory buffer.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/read.xml b/reference/swoole/swoole/buffer/read.xml
deleted file mode 100644
index e71a1c4a4e3c..000000000000
--- a/reference/swoole/swoole/buffer/read.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::read</refname>
-  <refpurpose>Read data from the memory buffer based on offset and length.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Buffer::read</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-      The length.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The data read from the memory buffer.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/recycle.xml b/reference/swoole/swoole/buffer/recycle.xml
deleted file mode 100644
index adea583fe513..000000000000
--- a/reference/swoole/swoole/buffer/recycle.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.recycle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::recycle</refname>
-  <refpurpose>Release the memory to OS which is not used by the memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Buffer::recycle</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/swoole/swoole/buffer/substr.xml b/reference/swoole/swoole/buffer/substr.xml
deleted file mode 100644
index 9ee5d794eeed..000000000000
--- a/reference/swoole/swoole/buffer/substr.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.substr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::substr</refname>
-  <refpurpose>Read data from the memory buffer based on offset and length. Or remove data from the memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Buffer::substr</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>remove</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    If $remove is set to be true and $offset is set to be 0, the data will be removed from the buffer. 
-    The memory for storing the data will be released when the buffer object is deconstructed.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <para>
-      The length.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>remove</parameter></term>
-    <listitem>
-     <para>
-      Whether to remove the data from the memory buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The data or string read from the memory buffer.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/tostring.xml b/reference/swoole/swoole/buffer/tostring.xml
deleted file mode 100644
index 5446fa179c66..000000000000
--- a/reference/swoole/swoole/buffer/tostring.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::__toString</refname>
-  <refpurpose>Get the string value of the memory buffer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Buffer::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The string value of the memory buffer.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/buffer/write.xml b/reference/swoole/swoole/buffer/write.xml
deleted file mode 100644
index 079b956fb8f8..000000000000
--- a/reference/swoole/swoole/buffer/write.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-buffer.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Buffer::write</refname>
-  <refpurpose>Write data to the memory buffer. The memory allocated for the buffer will not be changed.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Buffer::write</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      The data to write to the memory buffer.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/channel/construct.xml b/reference/swoole/swoole/channel/construct.xml
deleted file mode 100644
index ba499f24cfea..000000000000
--- a/reference/swoole/swoole/channel/construct.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-channel.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Channel::__construct</refname>
-  <refpurpose>Construct a Swoole Channel</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Channel::__construct</methodname>
-   <methodparam><type>string</type><parameter>size</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    Swoole channel is memory data structure works like Chan in Golang, implemented based on 
-    shared memory and mutex locks. It can be used as high performance message queue in memory.
-    Construct a swoole channel with a fixed size. The minimum size of a swoole channel is 64KB.
-    Exceptions will be thrown if there is not enough memory.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The size of the Swoole channel.
-     </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/swoole/swoole/channel/destruct.xml b/reference/swoole/swoole/channel/destruct.xml
deleted file mode 100644
index 21f4a160e612..000000000000
--- a/reference/swoole/swoole/channel/destruct.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-channel.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Channel::__destruct</refname>
-  <refpurpose>Destruct a Swoole channel.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Channel::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/swoole/swoole/channel/pop.xml b/reference/swoole/swoole/channel/pop.xml
deleted file mode 100644
index c03fc5f75f67..000000000000
--- a/reference/swoole/swoole/channel/pop.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-channel.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Channel::pop</refname>
-  <refpurpose>Read and pop data from swoole channel.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Channel::pop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    If the channel is empty, the function will return false, or return the unserialized data.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/channel/push.xml b/reference/swoole/swoole/channel/push.xml
deleted file mode 100644
index 9c138f0d2282..000000000000
--- a/reference/swoole/swoole/channel/push.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-channel.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Channel::push</refname>
-  <refpurpose>Write and push data into Swoole channel.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Channel::push</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Data can be any non-empty PHP variable, the variable will be serialized if it is not string type.
-  </para>
-  <para>
-    If size of the data is more than 8KB, swoole channel will use temp files storage.
-  </para>
-  <para>
-    The function will return true if the write operation is succeeded, or return false if there is not enough space.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      The data to push into the Swoole channel.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Whether the data is pushed into the Swoole channel.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/channel/stats.xml b/reference/swoole/swoole/channel/stats.xml
deleted file mode 100644
index 54dd7f4a2b25..000000000000
--- a/reference/swoole/swoole/channel/stats.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-channel.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Channel::stats</refname>
-  <refpurpose>Get stats of swoole channel.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Channel::stats</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Get the numbers of queued elements and total size of the memory used by the queue.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The stats of the Swoole channel.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/close.xml b/reference/swoole/swoole/client/close.xml
deleted file mode 100644
index 5f891d4fe572..000000000000
--- a/reference/swoole/swoole/client/close.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::close</refname>
-  <refpurpose>Close the connection established.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Client::close</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>force</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>force</parameter></term>
-    <listitem>
-     <para>
-      Whether force to close the connection.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Whether the connection is closed.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/connect.xml b/reference/swoole/swoole/client/connect.xml
deleted file mode 100644
index 8314fb134c56..000000000000
--- a/reference/swoole/swoole/client/connect.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::connect</refname>
-  <refpurpose>Connect to the remote TCP or UDP port.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Client::connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      The host name of the remote address.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      The port number of the remote address.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      The timeout(second) of connect/send/recv, the default value is 0.1s
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <para>
-      If the type of client is UDP, the $flag means if to enable the configuration udp_connect. 
-      If the configuration udp_connect is enabled, the client will only receive the data from specified ip:port.
-      If the type of client is TCP and the $flag is set to 1, it must use swoole_client_select to check the connection status before send/recv.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Whether the connection is established.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/construct.xml b/reference/swoole/swoole/client/construct.xml
deleted file mode 100644
index b0e0e488ae34..000000000000
--- a/reference/swoole/swoole/client/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::__construct</refname>
-  <refpurpose>Create Swoole sync or async TCP/UDP client, with or without SSL.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Client::__construct</methodname>
-   <methodparam><type>int</type><parameter>sock_type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>is_async</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sock_type</parameter></term>
-    <listitem>
-     <para>
-      The type of socket: SWOOLE_TCP, SWOOLE_UDP, SWOOLE_ASYNC, SWOOLE_SSL, SWOOLE_KEEP.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_async</parameter></term>
-    <listitem>
-     <para>
-      Synchronous or asynchronous client.
-     </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/swoole/swoole/client/destruct.xml b/reference/swoole/swoole/client/destruct.xml
deleted file mode 100644
index 2600d6685b8b..000000000000
--- a/reference/swoole/swoole/client/destruct.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::__destruct</refname>
-  <refpurpose>Destruct the Swoole client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </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/swoole/swoole/client/getpeername.xml b/reference/swoole/swoole/client/getpeername.xml
deleted file mode 100644
index 6847cbbfd4e7..000000000000
--- a/reference/swoole/swoole/client/getpeername.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.getpeername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::getpeername</refname>
-  <refpurpose>Get the remote socket name of the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Client::getpeername</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The host and port of the remote socket.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/getsockname.xml b/reference/swoole/swoole/client/getsockname.xml
deleted file mode 100644
index f355b5c6f3af..000000000000
--- a/reference/swoole/swoole/client/getsockname.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.getsockname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::getsockname</refname>
-  <refpurpose>Get the local socket name of the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Client::getsockname</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The host and port of the local socket.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/isconnected.xml b/reference/swoole/swoole/client/isconnected.xml
deleted file mode 100644
index 4b540f64709d..000000000000
--- a/reference/swoole/swoole/client/isconnected.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.isconnected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::isConnected</refname>
-  <refpurpose>Check if the connection is established.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Client::isConnected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    This method returns the connection status of application layer.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Whether the connection is established.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/on.xml b/reference/swoole/swoole/client/on.xml
deleted file mode 100644
index 3f4ab783fd67..000000000000
--- a/reference/swoole/swoole/client/on.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::on</refname>
-  <refpurpose>Add callback functions triggered by events.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::on</methodname>
-   <methodparam><type>string</type><parameter>event</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/swoole/swoole/client/pause.xml b/reference/swoole/swoole/client/pause.xml
deleted file mode 100644
index f8dc96cc4adb..000000000000
--- a/reference/swoole/swoole/client/pause.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.pause" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::pause</refname>
-  <refpurpose>Pause receiving data.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::pause</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/swoole/swoole/client/pipe.xml b/reference/swoole/swoole/client/pipe.xml
deleted file mode 100644
index fbac59e5d5ca..000000000000
--- a/reference/swoole/swoole/client/pipe.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.pipe" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::pipe</refname>
-  <refpurpose>Redirect the data to another file descriptor.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::pipe</methodname>
-   <methodparam><type>string</type><parameter>socket</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>socket</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/swoole/swoole/client/recv.xml b/reference/swoole/swoole/client/recv.xml
deleted file mode 100644
index eb50f9fe4d79..000000000000
--- a/reference/swoole/swoole/client/recv.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.recv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::recv</refname>
-  <refpurpose>Receive data from the remote socket.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::recv</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/resume.xml b/reference/swoole/swoole/client/resume.xml
deleted file mode 100644
index 754603ced1da..000000000000
--- a/reference/swoole/swoole/client/resume.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.resume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::resume</refname>
-  <refpurpose>Resume receiving data.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::resume</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </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/swoole/swoole/client/send.xml b/reference/swoole/swoole/client/send.xml
deleted file mode 100644
index 23f8ff965b4f..000000000000
--- a/reference/swoole/swoole/client/send.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.send" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::send</refname>
-  <refpurpose>Send data to the remote TCP socket.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Client::send</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>flag</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      The data to send which can be string or binary
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If the client sends data successfully, it returns the length of data sent. 
-   Or it returns false and sets $swoole_client->errCode. For sync client, 
-   there is no limit for the data to send. For async client, The limit 
-   for the data to send is socket_buffer_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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/sendfile.xml b/reference/swoole/swoole/client/sendfile.xml
deleted file mode 100644
index 443e92a1d30b..000000000000
--- a/reference/swoole/swoole/client/sendfile.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.sendfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::sendfile</refname>
-  <refpurpose>Send file to the remote TCP socket.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Client::sendfile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    This is a wrapper of the Linux sendfile system call.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      File path of the file to send.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      Offset of the file to send
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/sendto.xml b/reference/swoole/swoole/client/sendto.xml
deleted file mode 100644
index bdae8d809803..000000000000
--- a/reference/swoole/swoole/client/sendto.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.sendto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::sendto</refname>
-  <refpurpose>Send data to the remote UDP address.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Client::sendto</methodname>
-   <methodparam><type>string</type><parameter>ip</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The swoole client should be type of SWOOLE_SOCK_UDP or SWOOLE_SOCK_UDP6.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ip</parameter></term>
-    <listitem>
-     <para>
-      The IP address of remote host, IPv4 or IPv6.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      The port number of remote host.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      The data to send which should be less-than 64K.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/set.xml b/reference/swoole/swoole/client/set.xml
deleted file mode 100644
index a29f79589034..000000000000
--- a/reference/swoole/swoole/client/set.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::set</refname>
-  <refpurpose>Set the Swoole client parameters before the connection is established.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/sleep.xml b/reference/swoole/swoole/client/sleep.xml
deleted file mode 100644
index 7293c366215f..000000000000
--- a/reference/swoole/swoole/client/sleep.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.sleep" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::sleep</refname>
-  <refpurpose>Remove the TCP client from system event loop.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::sleep</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Remove the TCP client from system event loop.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/client/wakeup.xml b/reference/swoole/swoole/client/wakeup.xml
deleted file mode 100644
index 0f91227b5ad4..000000000000
--- a/reference/swoole/swoole/client/wakeup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-client.wakeup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Client::wakeup</refname>
-  <refpurpose>Add the TCP client back into the system event loop.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Client::wakeup</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/count.xml b/reference/swoole/swoole/connection/iterator/count.xml
deleted file mode 100644
index ffe6f1d44889..000000000000
--- a/reference/swoole/swoole/connection/iterator/count.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::count</refname>
-  <refpurpose>Count connections.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Connection\Iterator::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Gets the number of connections.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of connections.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/current.xml b/reference/swoole/swoole/connection/iterator/current.xml
deleted file mode 100644
index 52666a6c741c..000000000000
--- a/reference/swoole/swoole/connection/iterator/current.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::current</refname>
-  <refpurpose>Return current connection entry.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Connection</type><methodname>Swoole\Connection\Iterator::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Get current connection entry.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current connection entry.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/key.xml b/reference/swoole/swoole/connection/iterator/key.xml
deleted file mode 100644
index bbda357d4621..000000000000
--- a/reference/swoole/swoole/connection/iterator/key.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::key</refname>
-  <refpurpose>Return key of the current connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Connection\Iterator::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    This function returns key of the current connection.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Key of the current 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/next.xml b/reference/swoole/swoole/connection/iterator/next.xml
deleted file mode 100644
index 3a03ed7469dc..000000000000
--- a/reference/swoole/swoole/connection/iterator/next.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::next</refname>
-  <refpurpose>Move to the next connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Connection</type><methodname>Swoole\Connection\Iterator::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    The iterator to the next connection.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/offsetexists.xml b/reference/swoole/swoole/connection/iterator/offsetexists.xml
deleted file mode 100644
index 8694305dc3a0..000000000000
--- a/reference/swoole/swoole/connection/iterator/offsetexists.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::offsetExists</refname>
-  <refpurpose>Check if offset exists.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Connection\Iterator::offsetExists</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Check if offset exists.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The offset being checked.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns TRUE if the offset exists, 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/swoole/swoole/connection/iterator/offsetget.xml b/reference/swoole/swoole/connection/iterator/offsetget.xml
deleted file mode 100644
index c9e0e775adb5..000000000000
--- a/reference/swoole/swoole/connection/iterator/offsetget.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::offsetGet</refname>
-  <refpurpose>Offset to retrieve.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Connection</type><methodname>Swoole\Connection\Iterator::offsetGet</methodname>
-   <methodparam><type>string</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Return the connection at specified offset.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The offset to retrieve.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/offsetset.xml b/reference/swoole/swoole/connection/iterator/offsetset.xml
deleted file mode 100644
index 2360a0210aa6..000000000000
--- a/reference/swoole/swoole/connection/iterator/offsetset.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::offsetSet</refname>
-  <refpurpose>Assign a Connection to the specified offset.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Connection\Iterator::offsetSet</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Assign a Connection to the specified offset.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset to assign the Connection to.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>connection</parameter></term>
-    <listitem>
-     <para>
-      The connection to set.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/offsetunset.xml b/reference/swoole/swoole/connection/iterator/offsetunset.xml
deleted file mode 100644
index 5044c639fd8e..000000000000
--- a/reference/swoole/swoole/connection/iterator/offsetunset.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::offsetUnset</refname>
-  <refpurpose>Unset an offset.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Connection\Iterator::offsetUnset</methodname>
-   <methodparam><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Unsets an offset.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      The offset to unset.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/rewind.xml b/reference/swoole/swoole/connection/iterator/rewind.xml
deleted file mode 100644
index da56660d4e29..000000000000
--- a/reference/swoole/swoole/connection/iterator/rewind.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::rewind</refname>
-  <refpurpose>Rewinds iterator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Connection\Iterator::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/connection/iterator/valid.xml b/reference/swoole/swoole/connection/iterator/valid.xml
deleted file mode 100644
index f4214f05fe8b..000000000000
--- a/reference/swoole/swoole/connection/iterator/valid.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-connection-iterator.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Connection\Iterator::valid</refname>
-  <refpurpose>Check if current position is valid.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Connection\Iterator::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Checks if the current position is valid.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns TRUE if the current iterator position is valid, 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/swoole/swoole/coroutine/call-user-func-array.xml b/reference/swoole/swoole/coroutine/call-user-func-array.xml
deleted file mode 100644
index 1dc446bd7c3d..000000000000
--- a/reference/swoole/swoole/coroutine/call-user-func-array.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.call-user-func-array" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::call_user_func_array</refname>
-  <refpurpose>Call a callback with an array of parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>Swoole\Coroutine::call_user_func_array</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam><type>array</type><parameter>param_array</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Calls the callback given by the first parameter with the parameters in param_array.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-    <variablelist>
-      <varlistentry>
-        <term><parameter>callback</parameter></term>
-        <listitem>
-        <para>
-          The <type>callable</type> to be called.
-        </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-     <term><parameter>param_array</parameter></term>
-     <listitem>
-      <para>
-       Zero or more parameters in the array to be passed to the callback.
-      </para>
-     </listitem>
-    </varlistentry>
-    </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/call-user-func.xml b/reference/swoole/swoole/coroutine/call-user-func.xml
deleted file mode 100644
index 5f08c1e166c6..000000000000
--- a/reference/swoole/swoole/coroutine/call-user-func.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.call-user-func" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::call_user_func</refname>
-  <refpurpose>Call a callback given by the first parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>Swoole\Coroutine::call_user_func</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Calls the <parameter>callback</parameter> given by the first parameter and passes the remaining parameters as arguments.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-    <variablelist>
-      <varlistentry>
-        <term><parameter>callback</parameter></term>
-        <listitem>
-        <para>
-          The <type>callable</type> to be called.
-        </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       Zero or more parameters to be passed to the callback.
-      </para>
-     </listitem>
-    </varlistentry>
-    </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/cli-wait.xml b/reference/swoole/swoole/coroutine/cli-wait.xml
deleted file mode 100644
index 8cb6bcfbe876..000000000000
--- a/reference/swoole/swoole/coroutine/cli-wait.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.cli-wait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::cli_wait</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine::cli_wait</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/close.xml b/reference/swoole/swoole/coroutine/client/close.xml
deleted file mode 100644
index 5a1ada9486fe..000000000000
--- a/reference/swoole/swoole/coroutine/client/close.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::close</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/connect.xml b/reference/swoole/swoole/coroutine/client/connect.xml
deleted file mode 100644
index deafe772fc64..000000000000
--- a/reference/swoole/swoole/coroutine/client/connect.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::connect</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::connect</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/construct.xml b/reference/swoole/swoole/coroutine/client/construct.xml
deleted file mode 100644
index 59ed5922d09c..000000000000
--- a/reference/swoole/swoole/coroutine/client/construct.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Coroutine\Client::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/destruct.xml b/reference/swoole/swoole/coroutine/client/destruct.xml
deleted file mode 100644
index 4aacebd98f43..000000000000
--- a/reference/swoole/swoole/coroutine/client/destruct.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::__destruct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/getpeername.xml b/reference/swoole/swoole/coroutine/client/getpeername.xml
deleted file mode 100644
index 7323a07275fa..000000000000
--- a/reference/swoole/swoole/coroutine/client/getpeername.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.getpeername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::getpeername</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::getpeername</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/getsockname.xml b/reference/swoole/swoole/coroutine/client/getsockname.xml
deleted file mode 100644
index f43a0f862c34..000000000000
--- a/reference/swoole/swoole/coroutine/client/getsockname.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.getsockname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::getsockname</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::getsockname</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/isconnected.xml b/reference/swoole/swoole/coroutine/client/isconnected.xml
deleted file mode 100644
index 87ec1bbeb3e6..000000000000
--- a/reference/swoole/swoole/coroutine/client/isconnected.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.isconnected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::isConnected</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::isConnected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/recv.xml b/reference/swoole/swoole/coroutine/client/recv.xml
deleted file mode 100644
index f16510b1635b..000000000000
--- a/reference/swoole/swoole/coroutine/client/recv.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.recv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::recv</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::recv</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/send.xml b/reference/swoole/swoole/coroutine/client/send.xml
deleted file mode 100644
index 96399466d323..000000000000
--- a/reference/swoole/swoole/coroutine/client/send.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.send" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::send</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::send</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/sendfile.xml b/reference/swoole/swoole/coroutine/client/sendfile.xml
deleted file mode 100644
index c710f6b7b100..000000000000
--- a/reference/swoole/swoole/coroutine/client/sendfile.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.sendfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::sendfile</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::sendfile</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/sendto.xml b/reference/swoole/swoole/coroutine/client/sendto.xml
deleted file mode 100644
index 64e054053123..000000000000
--- a/reference/swoole/swoole/coroutine/client/sendto.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.sendto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::sendto</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::sendto</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/client/set.xml b/reference/swoole/swoole/coroutine/client/set.xml
deleted file mode 100644
index 004612698e26..000000000000
--- a/reference/swoole/swoole/coroutine/client/set.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-client.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Client::set</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Client::set</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/create.xml b/reference/swoole/swoole/coroutine/create.xml
deleted file mode 100644
index 6f75d390b4a1..000000000000
--- a/reference/swoole/swoole/coroutine/create.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::create</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine::create</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/getuid.xml b/reference/swoole/swoole/coroutine/getuid.xml
deleted file mode 100644
index 8a9df0c530a6..000000000000
--- a/reference/swoole/swoole/coroutine/getuid.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.getuid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::getuid</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine::getuid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/addfile.xml b/reference/swoole/swoole/coroutine/http/client/addfile.xml
deleted file mode 100644
index f34131bc4196..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/addfile.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.addfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::addFile</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::addFile</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/close.xml b/reference/swoole/swoole/coroutine/http/client/close.xml
deleted file mode 100644
index 479b7a96b738..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/close.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::close</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/construct.xml b/reference/swoole/swoole/coroutine/http/client/construct.xml
deleted file mode 100644
index aa2562144e0a..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/construct.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Coroutine\Http\Client::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/destruct.xml b/reference/swoole/swoole/coroutine/http/client/destruct.xml
deleted file mode 100644
index 12642ae666f8..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/destruct.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::__destruct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/execute.xml b/reference/swoole/swoole/coroutine/http/client/execute.xml
deleted file mode 100644
index 8d087ff76dd7..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/execute.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::execute</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::execute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/get.xml b/reference/swoole/swoole/coroutine/http/client/get.xml
deleted file mode 100644
index 9ad386027b53..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/get.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::get</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::get</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/getdefer.xml b/reference/swoole/swoole/coroutine/http/client/getdefer.xml
deleted file mode 100644
index 3747a68cd713..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/getdefer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.getdefer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::getDefer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::getDefer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/isconnected.xml b/reference/swoole/swoole/coroutine/http/client/isconnected.xml
deleted file mode 100644
index aa1ae0ea4ea6..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/isconnected.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.isconnected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::isConnected</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::isConnected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/post.xml b/reference/swoole/swoole/coroutine/http/client/post.xml
deleted file mode 100644
index 299361c848e3..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/post.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.post" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::post</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::post</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/recv.xml b/reference/swoole/swoole/coroutine/http/client/recv.xml
deleted file mode 100644
index 2f12fda196bb..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/recv.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.recv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::recv</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::recv</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/set.xml b/reference/swoole/swoole/coroutine/http/client/set.xml
deleted file mode 100644
index 5c9008b1e410..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/set.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::set</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::set</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/setcookies.xml b/reference/swoole/swoole/coroutine/http/client/setcookies.xml
deleted file mode 100644
index e9bb618d3342..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/setcookies.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.setcookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::setCookies</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::setCookies</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/setdata.xml b/reference/swoole/swoole/coroutine/http/client/setdata.xml
deleted file mode 100644
index 8abf1e581593..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/setdata.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.setdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::setData</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::setData</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/setdefer.xml b/reference/swoole/swoole/coroutine/http/client/setdefer.xml
deleted file mode 100644
index 2bdf5e4fed24..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/setdefer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.setdefer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::setDefer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::setDefer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/setheaders.xml b/reference/swoole/swoole/coroutine/http/client/setheaders.xml
deleted file mode 100644
index cf9a464abe0d..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/setheaders.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.setheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::setHeaders</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::setHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/http/client/setmethod.xml b/reference/swoole/swoole/coroutine/http/client/setmethod.xml
deleted file mode 100644
index fa63f7497da8..000000000000
--- a/reference/swoole/swoole/coroutine/http/client/setmethod.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-http-client.setmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Http\Client::setMethod</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\Http\Client::setMethod</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/lock/construct.xml b/reference/swoole/swoole/coroutine/lock/construct.xml
deleted file mode 100644
index 384163b7afc8..000000000000
--- a/reference/swoole/swoole/coroutine/lock/construct.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-lock.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Lock::__construct</refname>
-  <refpurpose>Construct a new coroutine lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Coroutine\Lock::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Create a new coroutine lock instance.
-  </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/swoole/swoole/coroutine/lock/lock.xml b/reference/swoole/swoole/coroutine/lock/lock.xml
deleted file mode 100644
index 8983fb79ccb8..000000000000
--- a/reference/swoole/swoole/coroutine/lock/lock.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-lock.lock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Lock::lock</refname>
-  <refpurpose>Acquire the lock, blocking if necessary</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Coroutine\Lock::lock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   When executing the lock operation, if the lock is already held by another coroutine,
-   the current coroutine will actively yield CPU control and enter a suspended state.
-   When the coroutine holding the lock calls unlock(), the waiting coroutine will be
-   awakened and try to acquire the lock again.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the lock was acquired successfully,
-   &false; otherwise.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/lock/trylock.xml b/reference/swoole/swoole/coroutine/lock/trylock.xml
deleted file mode 100644
index f9faa0deb5ec..000000000000
--- a/reference/swoole/swoole/coroutine/lock/trylock.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-lock.trylock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Lock::trylock</refname>
-  <refpurpose>Attempt to acquire the lock without blocking</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Coroutine\Lock::trylock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   When calling the lock operation, if the lock is already held by another coroutine,
-   the function will immediately return false without suspending the current coroutine
-   or yielding CPU control. This non-blocking design allows the caller to flexibly
-   handle contention situations, such as retrying, giving up, or executing other logic.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the lock was acquired successfully,
-   &false; if the lock is not available.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/lock/unlock.xml b/reference/swoole/swoole/coroutine/lock/unlock.xml
deleted file mode 100644
index ce1d7530a520..000000000000
--- a/reference/swoole/swoole/coroutine/lock/unlock.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-lock.unlock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\Lock::unlock</refname>
-  <refpurpose>Release the lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Coroutine\Lock::unlock</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="behavior">
-  <title>Unlock Behavior</title>
-  <orderedlist>
-   <listitem>
-    <para>
-     <emphasis>With io_uring futex:</emphasis> the system will precisely wake up one coroutine in the waiting queue.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <emphasis>Without io_uring futex:</emphasis> waiting coroutines need to wait for their backoff time to end
-     and compete to reacquire the lock.
-    </para>
-   </listitem>
-  </orderedlist>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the lock was released successfully,
-   &false; otherwise.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/close.xml b/reference/swoole/swoole/coroutine/mysql/close.xml
deleted file mode 100644
index 9b8438a1c693..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/close.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::close</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/connect.xml b/reference/swoole/swoole/coroutine/mysql/connect.xml
deleted file mode 100644
index 58af4b813696..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/connect.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::connect</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::connect</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/construct.xml b/reference/swoole/swoole/coroutine/mysql/construct.xml
deleted file mode 100644
index 3a71cc450244..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/construct.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::__construct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Coroutine\MySQL::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/destruct.xml b/reference/swoole/swoole/coroutine/mysql/destruct.xml
deleted file mode 100644
index c4163014f7f5..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/destruct.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::__destruct</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/getdefer.xml b/reference/swoole/swoole/coroutine/mysql/getdefer.xml
deleted file mode 100644
index 718bdee2175b..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/getdefer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.getdefer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::getDefer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::getDefer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/query.xml b/reference/swoole/swoole/coroutine/mysql/query.xml
deleted file mode 100644
index f834252b7d41..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/query.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::query</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::query</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/recv.xml b/reference/swoole/swoole/coroutine/mysql/recv.xml
deleted file mode 100644
index 5e866f42c653..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/recv.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.recv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::recv</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::recv</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/mysql/setdefer.xml b/reference/swoole/swoole/coroutine/mysql/setdefer.xml
deleted file mode 100644
index 0b78b8342d72..000000000000
--- a/reference/swoole/swoole/coroutine/mysql/setdefer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine-mysql.setdefer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine\MySQL::setDefer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine\MySQL::setDefer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/resume.xml b/reference/swoole/swoole/coroutine/resume.xml
deleted file mode 100644
index f2ef935c6fff..000000000000
--- a/reference/swoole/swoole/coroutine/resume.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.resume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::resume</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine::resume</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/coroutine/suspend.xml b/reference/swoole/swoole/coroutine/suspend.xml
deleted file mode 100644
index 2bb1b3d1de69..000000000000
--- a/reference/swoole/swoole/coroutine/suspend.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-coroutine.suspend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Coroutine::suspend</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Coroutine::suspend</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/event/add.xml b/reference/swoole/swoole/event/add.xml
deleted file mode 100644
index 83266378730e..000000000000
--- a/reference/swoole/swoole/event/add.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::add</refname>
-  <refpurpose>Add a socket to the underlying reactor event listener</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::add</methodname>
-   <methodparam><type>mixed</type><parameter>sock</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>read_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>write_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Adds a socket to the underlying reactor event listener. This function can be used in both Server and Client modes.
-  </simpara>
-  <warning>
-   <simpara>
-    A socket that has already been added cannot be added again. Use swoole_event_set to
-    modify the corresponding callback functions and event types for the socket.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sock</parameter></term>
-    <listitem>
-     <simpara>
-      File descriptor, stream resource, sockets resource, or object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>read_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function for readable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function for writable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Event type mask (e.g. <constant>SWOOLE_EVENT_READ</constant>, <constant>SWOOLE_EVENT_WRITE</constant>
-      or <constant>SWOOLE_EVENT_READ</constant> | <constant>SWOOLE_EVENT_WRITE</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Swoole\Event::add</function> example</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$fp = stream_socket_client("tcp://www.qq.com:80", $errno, $errstr, 30);
-fwrite($fp,"GET / HTTP/1.1\r\nHost: www.qq.com\r\n\r\n");
-
-Swoole\Event::add($fp, function($fp) {
-    $resp = fread($fp, 8192);
-    Swoole\Event::del($fp);
-    fclose($fp);
-});
-echo "Finish\n";
-?>
-]]>
-    </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/swoole/swoole/event/cycle.xml b/reference/swoole/swoole/event/cycle.xml
deleted file mode 100644
index ca4f2ab3c917..000000000000
--- a/reference/swoole/swoole/event/cycle.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.cycle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::cycle</refname>
-  <refpurpose>Define a function to execute at the end of each event loop iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::cycle</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>before</parameter><initializer>false</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Defines a callback function to execute at the end (or beginning, if <parameter>before</parameter> is true) of each event loop iteration.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      The function to execute. Set to <literal>null</literal> to clear a previously set cycle function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>before</parameter></term>
-    <listitem>
-     <simpara>
-      If <literal>true</literal>, the callback executes before the event loop; if <literal>false</literal>, after.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Basic usage</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-Swoole\Timer::tick(2000, function ($id) {
-    var_dump($id);
-});
-
-Swoole\Event::cycle(function () {
-    echo "hello [1]\n";
-    Swoole\Event::cycle(function () {
-        echo "hello [2]\n";
-        Swoole\Event::cycle(null);
-    });
-});
-
-Swoole\Event::wait();
-]]>
-    </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/swoole/swoole/event/defer.xml b/reference/swoole/swoole/event/defer.xml
deleted file mode 100644
index 0ab5beadaf98..000000000000
--- a/reference/swoole/swoole/event/defer.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.defer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::defer</refname>
-  <refpurpose>Execute a function at the start of the next event loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Event::defer</methodname>
-   <methodparam><type>callable</type><parameter>callback_function</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Schedules a function to run at the start of the next event loop iteration.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback_function</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function to execute (no parameters allowed; use <literal>use</literal> for closure variables).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Swoole\Event::defer</function> example</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-Swoole\Event::defer(function(){
-    echo "After EventLoop\n";
-});
-?>
-]]>
-    </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/swoole/swoole/event/del.xml b/reference/swoole/swoole/event/del.xml
deleted file mode 100644
index b28270bc6a41..000000000000
--- a/reference/swoole/swoole/event/del.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::del</refname>
-  <refpurpose>Remove a socket from reactor event listener</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::del</methodname>
-   <methodparam><type>mixed</type><parameter>sock</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes a socket from the reactor event listener.
-  </simpara>
-  <warning>
-   <simpara>
-    Always call Event::del to unregister event monitoring prior to closing the socket.
-    Failure to do so can result in memory leaks.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sock</parameter></term>
-    <listitem>
-     <simpara>
-      Socket file descriptor to remove.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/event/dispatch.xml b/reference/swoole/swoole/event/dispatch.xml
deleted file mode 100644
index 522473db2977..000000000000
--- a/reference/swoole/swoole/event/dispatch.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.dispatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::dispatch</refname>
-  <refpurpose>Perform a single event loop iteration</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Event::dispatch</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   The purpose of this function is to maintain compatibility with some frameworks.
-   When a framework internally manages its own reactor loop, using Event::wait would allow
-   Swoole's underlying layer to retain control, preventing the framework from taking over execution.
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Manual event loop control</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-while (true) {
-    Swoole\Event::dispatch();
-}
-]]>
-    </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/swoole/swoole/event/isset.xml b/reference/swoole/swoole/event/isset.xml
deleted file mode 100644
index b7faf3f4d573..000000000000
--- a/reference/swoole/swoole/event/isset.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::isset</refname>
-  <refpurpose>Check if a socket is being monitored in the event loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier>  <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::isset</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>events</parameter>
-    <initializer>
-     SWOOLE_EVENT_READ | SWOOLE_EVENT_WRITE
-    </initializer>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks whether the specified file descriptor is being monitored for the given event types in the event loop.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-      File descriptor (stream/socket resource, integer, or object).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>events</parameter></term>
-    <listitem>
-     <simpara>
-      Event types to check (bitmask of <constant>SWOOLE_EVENT_READ</constant> and/or <constant>SWOOLE_EVENT_WRITE</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Checking event monitoring status</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$fp = stream_socket_client("tcp://www.qq.com:80");
-Swoole\Event::add($fp, function ($fp) {
-    echo fread($fp, 8192);
-}, null, SWOOLE_EVENT_READ);
-
-var_dump(Swoole\Event::isset($fp, SWOOLE_EVENT_READ)); // Output: true
-var_dump(Swoole\Event::isset($fp, SWOOLE_EVENT_WRITE)); // Output: false
-]]>
-    </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/swoole/swoole/event/set.xml b/reference/swoole/swoole/event/set.xml
deleted file mode 100644
index abd5e344ba82..000000000000
--- a/reference/swoole/swoole/event/set.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::set</refname>
-  <refpurpose>Modify event listener callbacks and mask</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::set</methodname>
-   <methodparam><type>mixed</type><parameter>sock</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>read_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>write_callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Modifies the event listener callbacks and mask for the given file descriptor.
-  </simpara>
-  <note>
-   <simpara>
-    When $read_callback is not null, the readable event callback function will be modified to the specified function.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    When $write_callback is not null, the writable event callback function will be updated to the specified function.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    Setting SWOOLE_EVENT_READ alone disables write event listening,
-    while setting SWOOLE_EVENT_WRITE alone disables read event listening.
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    Swoole\Event::set replaces callbacks but does not free them.
-    Specifying null for callbacks (e.g., read_callback/write_callback)
-    preserves the existing callbacks instead of clearing them.
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Listening for SWOOLE_EVENT_READ without a read_callback (or SWOOLE_EVENT_WRITE without a write_callback)
-    will cause the operation to fail and return false.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sock</parameter></term>
-    <listitem>
-     <simpara>
-      File descriptor, stream resource, sockets resource, or object.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>read_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function for readable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>write_callback</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function for writable events.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <simpara>
-      Event type mask (e.g. <constant>SWOOLE_EVENT_READ</constant>, <constant>SWOOLE_EVENT_WRITE</constant>
-      or <constant>SWOOLE_EVENT_READ</constant> | <constant>SWOOLE_EVENT_WRITE</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/event/wait.xml b/reference/swoole/swoole/event/wait.xml
deleted file mode 100644
index 4993e0b088c4..000000000000
--- a/reference/swoole/swoole/event/wait.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.wait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::wait</refname>
-  <refpurpose>Start event loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Event::wait</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Starts the event loop. Place this at the end of your PHP program.
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No return value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Swoole\Event::wait</function> example</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-Swoole\Timer::tick(1000, function () {
-    echo "hello\n";
-});
-
-Swoole\Event::wait();
-?>
-]]>
-    </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/swoole/swoole/event/write.xml b/reference/swoole/swoole/event/write.xml
deleted file mode 100644
index 2bb01443cbf0..000000000000
--- a/reference/swoole/swoole/event/write.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="swoole-event.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Event::write</refname>
-  <refpurpose>Write data to socket asynchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Event::write</methodname>
-   <methodparam><type>mixed</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Makes data sending asynchronous for stream/sockets resources.
-  </simpara>
-  <note>
-   <simpara>
-    If data is continuously written to a socket but the peer cannot read fast enough, the socket buffer
-    will eventually fill up. In this case, the Swoole underlying layer will store the excess data
-    in an in-memory buffer and wait for the writable event to trigger before attempting to write
-    to the socket again. However, if the in-memory buffer also becomes full, Swoole will throw a
-    "pipe buffer overflow, reactor will block" error and switch to blocking mode, pausing further
-    writes until space becomes available.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    The buffer-full return of false is an atomic operation—it guarantees
-    either complete success (all data written) or total failure (nothing written).
-   </simpara>
-  </note>
-  <warning>
-   <simpara>
-    Event::write cannot be used with SSL/TLS-encrypted streams or sockets (tunneled connections).
-   </simpara>
-  </warning>
-  <warning>
-   <simpara>
-    Upon successful execution, Event::write will automatically switch the $socket to non-blocking mode.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <simpara>
-      File descriptor (stream/socket resource, integer, or object).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <simpara>
-      Data to send (length must not exceed socket buffer size).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>Swoole\Event::write</function> example</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-use Swoole\Event;
-
-$fp = stream_socket_client('tcp://127.0.0.1:9501');
-$data = str_repeat('A', 1024 * 1024*2);
-Event::add($fp, function($fp) {
-     echo fread($fp);
-});
-Event::write($fp, $data);
-?>
-]]>
-    </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/swoole/swoole/http/client/addfile.xml b/reference/swoole/swoole/http/client/addfile.xml
deleted file mode 100644
index 91646f38bc83..000000000000
--- a/reference/swoole/swoole/http/client/addfile.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.addfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::addFile</refname>
-  <refpurpose>Add a file to the post form.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::addFile</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/close.xml b/reference/swoole/swoole/http/client/close.xml
deleted file mode 100644
index 65ef14a7aac0..000000000000
--- a/reference/swoole/swoole/http/client/close.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::close</refname>
-  <refpurpose>Close the http connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/construct.xml b/reference/swoole/swoole/http/client/construct.xml
deleted file mode 100644
index 0678852f22ca..000000000000
--- a/reference/swoole/swoole/http/client/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::__construct</refname>
-  <refpurpose>Construct the async HTTP client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Http\Client::__construct</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>ssl</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      The hostname of the remote host.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      The port number of the remote host.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ssl</parameter></term>
-    <listitem>
-     <para>
-      Whether to enable SSL.
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/destruct.xml b/reference/swoole/swoole/http/client/destruct.xml
deleted file mode 100644
index a4a8646e1255..000000000000
--- a/reference/swoole/swoole/http/client/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::__destruct</refname>
-  <refpurpose>Destruct the HTTP client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/download.xml b/reference/swoole/swoole/http/client/download.xml
deleted file mode 100644
index 6bc213c3cabd..000000000000
--- a/reference/swoole/swoole/http/client/download.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.download" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::download</refname>
-  <refpurpose>Download a file from the remote server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::download</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/execute.xml b/reference/swoole/swoole/http/client/execute.xml
deleted file mode 100644
index 5ea201cb550f..000000000000
--- a/reference/swoole/swoole/http/client/execute.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::execute</refname>
-  <refpurpose>Send the HTTP request after setting the parameters.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::execute</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/get.xml b/reference/swoole/swoole/http/client/get.xml
deleted file mode 100644
index af6fb7c7e23c..000000000000
--- a/reference/swoole/swoole/http/client/get.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::get</refname>
-  <refpurpose>Send GET http request to the remote server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::get</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/isconnected.xml b/reference/swoole/swoole/http/client/isconnected.xml
deleted file mode 100644
index d66fe7ca1431..000000000000
--- a/reference/swoole/swoole/http/client/isconnected.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.isconnected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::isConnected</refname>
-  <refpurpose>Check if the HTTP connection is connected.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Http\Client::isConnected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/on.xml b/reference/swoole/swoole/http/client/on.xml
deleted file mode 100644
index fa4ce8363a9b..000000000000
--- a/reference/swoole/swoole/http/client/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::on</refname>
-  <refpurpose>Register callback function by event name.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/post.xml b/reference/swoole/swoole/http/client/post.xml
deleted file mode 100644
index c2941fc0d0c4..000000000000
--- a/reference/swoole/swoole/http/client/post.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.post" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::post</refname>
-  <refpurpose>Send POST http request to the remote server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::post</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/push.xml b/reference/swoole/swoole/http/client/push.xml
deleted file mode 100644
index 4b937c16af23..000000000000
--- a/reference/swoole/swoole/http/client/push.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::push</refname>
-  <refpurpose>Push data to websocket client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::push</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>opcode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>finish</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>opcode</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>finish</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/set.xml b/reference/swoole/swoole/http/client/set.xml
deleted file mode 100644
index 54802c9e1a3e..000000000000
--- a/reference/swoole/swoole/http/client/set.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::set</refname>
-  <refpurpose>Update the HTTP client parameters.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/setcookies.xml b/reference/swoole/swoole/http/client/setcookies.xml
deleted file mode 100644
index 15f344c01595..000000000000
--- a/reference/swoole/swoole/http/client/setcookies.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.setcookies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::setCookies</refname>
-  <refpurpose>Set the http request cookies.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::setCookies</methodname>
-   <methodparam><type>array</type><parameter>cookies</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cookies</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/setdata.xml b/reference/swoole/swoole/http/client/setdata.xml
deleted file mode 100644
index f9b4d0789f14..000000000000
--- a/reference/swoole/swoole/http/client/setdata.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.setdata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::setData</refname>
-  <refpurpose>Set the HTTP request body data.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Client::setData</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The HTTP method will be changed to be POST.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/setheaders.xml b/reference/swoole/swoole/http/client/setheaders.xml
deleted file mode 100644
index 8fa5b87546fa..000000000000
--- a/reference/swoole/swoole/http/client/setheaders.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.setheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::setHeaders</refname>
-  <refpurpose>Set the HTTP request headers.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::setHeaders</methodname>
-   <methodparam><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>headers</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/setmethod.xml b/reference/swoole/swoole/http/client/setmethod.xml
deleted file mode 100644
index 5beb4992715b..000000000000
--- a/reference/swoole/swoole/http/client/setmethod.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.setmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::setMethod</refname>
-  <refpurpose>Set the HTTP request method.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::setMethod</methodname>
-   <methodparam><type>string</type><parameter>method</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>method</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/client/upgrade.xml b/reference/swoole/swoole/http/client/upgrade.xml
deleted file mode 100644
index e398a91109b4..000000000000
--- a/reference/swoole/swoole/http/client/upgrade.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-client.upgrade" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Client::upgrade</refname>
-  <refpurpose>Upgrade to websocket protocol.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Client::upgrade</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/request/destruct.xml b/reference/swoole/swoole/http/request/destruct.xml
deleted file mode 100644
index a8aa516d82a3..000000000000
--- a/reference/swoole/swoole/http/request/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-request.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Request::__destruct</refname>
-  <refpurpose>Destruct the HTTP request.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Request::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/request/rawcontent.xml b/reference/swoole/swoole/http/request/rawcontent.xml
deleted file mode 100644
index c1ff6bea7335..000000000000
--- a/reference/swoole/swoole/http/request/rawcontent.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-request.rawcontent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Request::rawcontent</refname>
-  <refpurpose>Get the raw HTTP POST body.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Http\Request::rawcontent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    This method is used for the POST data which isn't in the form of `application/x-www-form-urlencoded`.
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/cookie.xml b/reference/swoole/swoole/http/response/cookie.xml
deleted file mode 100644
index b52185e5370a..000000000000
--- a/reference/swoole/swoole/http/response/cookie.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.cookie" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::cookie</refname>
-  <refpurpose>Set the cookies of the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Http\Response::cookie</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>expires</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>domain</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>secure</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>httponly</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expires</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>domain</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>secure</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>httponly</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/destruct.xml b/reference/swoole/swoole/http/response/destruct.xml
deleted file mode 100644
index 6f37f08749c2..000000000000
--- a/reference/swoole/swoole/http/response/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::__destruct</refname>
-  <refpurpose>Destruct the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Response::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/end.xml b/reference/swoole/swoole/http/response/end.xml
deleted file mode 100644
index 7b15e190abd6..000000000000
--- a/reference/swoole/swoole/http/response/end.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.end" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::end</refname>
-  <refpurpose>Send data for the HTTP request and finish the response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Response::end</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>content</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/gzip.xml b/reference/swoole/swoole/http/response/gzip.xml
deleted file mode 100644
index 7fc61bbee175..000000000000
--- a/reference/swoole/swoole/http/response/gzip.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.gzip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::gzip</refname>
-  <refpurpose>Enable the gzip of response content.
-</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Response::gzip</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>compress_level</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The header about Content-Encoding will be added automatically.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>compress_level</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/header.xml b/reference/swoole/swoole/http/response/header.xml
deleted file mode 100644
index d270f738eac3..000000000000
--- a/reference/swoole/swoole/http/response/header.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.header" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::header</refname>
-  <refpurpose>Set the HTTP response headers.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Response::header</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>ucwords</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ucwords</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/initheader.xml b/reference/swoole/swoole/http/response/initheader.xml
deleted file mode 100644
index 7ed0efb559de..000000000000
--- a/reference/swoole/swoole/http/response/initheader.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.initheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::initHeader</refname>
-  <refpurpose>Init the HTTP response header.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Response::initHeader</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Init the HTTP response header.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/rawcookie.xml b/reference/swoole/swoole/http/response/rawcookie.xml
deleted file mode 100644
index a1ee163ac4fd..000000000000
--- a/reference/swoole/swoole/http/response/rawcookie.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.rawcookie" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::rawcookie</refname>
-  <refpurpose>Set the raw cookies to the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Response::rawcookie</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>expires</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>domain</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>secure</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>httponly</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>expires</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>domain</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>secure</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>httponly</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/sendfile.xml b/reference/swoole/swoole/http/response/sendfile.xml
deleted file mode 100644
index d867a3cfef27..000000000000
--- a/reference/swoole/swoole/http/response/sendfile.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.sendfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::sendfile</refname>
-  <refpurpose>Send file through the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Response::sendfile</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Send file through the HTTP response.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/status.xml b/reference/swoole/swoole/http/response/status.xml
deleted file mode 100644
index e14e4f5ecd93..000000000000
--- a/reference/swoole/swoole/http/response/status.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::status</refname>
-  <refpurpose>Set the status code of the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Http\Response::status</methodname>
-   <methodparam><type>string</type><parameter>http_code</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set the status code of the HTTP response.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>http_code</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/response/write.xml b/reference/swoole/swoole/http/response/write.xml
deleted file mode 100644
index 839b63b80c3d..000000000000
--- a/reference/swoole/swoole/http/response/write.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-response.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Response::write</refname>
-  <refpurpose>Append HTTP body content to the HTTP response.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Response::write</methodname>
-   <methodparam><type>string</type><parameter>content</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Append HTTP body content to the HTTP response.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>content</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/server/on.xml b/reference/swoole/swoole/http/server/on.xml
deleted file mode 100644
index 10b47e203fee..000000000000
--- a/reference/swoole/swoole/http/server/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-server.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Server::on</refname>
-  <refpurpose>Bind callback function to HTTP server by event name.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Server::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Bind callback function to HTTP server by event name.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/http/server/start.xml b/reference/swoole/swoole/http/server/start.xml
deleted file mode 100644
index 29f2dce65a01..000000000000
--- a/reference/swoole/swoole/http/server/start.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-http-server.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Http\Server::start</refname>
-  <refpurpose>Start the swoole http server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Http\Server::start</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Start the swoole http server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/construct.xml b/reference/swoole/swoole/lock/construct.xml
deleted file mode 100644
index 5d638c1c2fa8..000000000000
--- a/reference/swoole/swoole/lock/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::__construct</refname>
-  <refpurpose>Construct a memory lock.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Lock::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>file_lock_location</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-    Swoole lock is used for data synchronization between multiple threads or processes.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>file_lock_location</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/destruct.xml b/reference/swoole/swoole/lock/destruct.xml
deleted file mode 100644
index 12c7e7ca3423..000000000000
--- a/reference/swoole/swoole/lock/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::__destruct</refname>
-  <refpurpose>Destroy a Swoole memory lock.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/lock-read.xml b/reference/swoole/swoole/lock/lock-read.xml
deleted file mode 100644
index 88e82a8c3f49..000000000000
--- a/reference/swoole/swoole/lock/lock-read.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.lock-read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::lock_read</refname>
-  <refpurpose>Lock a read-write lock for reading.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::lock_read</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Lock a read-write lock for reading.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/lock.xml b/reference/swoole/swoole/lock/lock.xml
deleted file mode 100644
index 2ed2659d6602..000000000000
--- a/reference/swoole/swoole/lock/lock.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.lock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::lock</refname>
-  <refpurpose>Try to acquire the lock. It will block if the lock is not available.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::lock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/trylock-read.xml b/reference/swoole/swoole/lock/trylock-read.xml
deleted file mode 100644
index 0537d717f3a0..000000000000
--- a/reference/swoole/swoole/lock/trylock-read.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.trylock-read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::trylock_read</refname>
-  <refpurpose>Try to lock a read-write lock for reading and return straight away even the lock is not available.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::trylock_read</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/trylock.xml b/reference/swoole/swoole/lock/trylock.xml
deleted file mode 100644
index 413a5c203278..000000000000
--- a/reference/swoole/swoole/lock/trylock.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.trylock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::trylock</refname>
-  <refpurpose>Try to acquire the lock and return straight away even the lock is not available.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::trylock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/lock/unlock.xml b/reference/swoole/swoole/lock/unlock.xml
deleted file mode 100644
index 12e8f1159bfc..000000000000
--- a/reference/swoole/swoole/lock/unlock.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-lock.unlock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Lock::unlock</refname>
-  <refpurpose>Release the lock.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Lock::unlock</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mmap/open.xml b/reference/swoole/swoole/mmap/open.xml
deleted file mode 100644
index f588c008a4d9..000000000000
--- a/reference/swoole/swoole/mmap/open.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mmap.open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Mmap::open</refname>
-  <refpurpose>Map a file into memory and return the stream resource which can be used by PHP stream operations.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Mmap::open</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/close.xml b/reference/swoole/swoole/mysql/close.xml
deleted file mode 100644
index bdc7acd9c395..000000000000
--- a/reference/swoole/swoole/mysql/close.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::close</refname>
-  <refpurpose>Close the async MySQL connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\MySQL::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/connect.xml b/reference/swoole/swoole/mysql/connect.xml
deleted file mode 100644
index 750b95ba2701..000000000000
--- a/reference/swoole/swoole/mysql/connect.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::connect</refname>
-  <refpurpose>Connect to the remote MySQL server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\MySQL::connect</methodname>
-   <methodparam><type>array</type><parameter>server_config</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Connect to the remote MySQL server.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>server_config</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/construct.xml b/reference/swoole/swoole/mysql/construct.xml
deleted file mode 100644
index f31453d7ee82..000000000000
--- a/reference/swoole/swoole/mysql/construct.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::__construct</refname>
-  <refpurpose>Construct an async MySQL client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\MySQL::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-    Construct an async MySQL client.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/destruct.xml b/reference/swoole/swoole/mysql/destruct.xml
deleted file mode 100644
index 8b942a668a97..000000000000
--- a/reference/swoole/swoole/mysql/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::__destruct</refname>
-  <refpurpose>Destroy the async MySQL client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\MySQL::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/getbuffer.xml b/reference/swoole/swoole/mysql/getbuffer.xml
deleted file mode 100644
index 615d3d1ceafb..000000000000
--- a/reference/swoole/swoole/mysql/getbuffer.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.getbuffer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::getBuffer</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\MySQL::getBuffer</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/on.xml b/reference/swoole/swoole/mysql/on.xml
deleted file mode 100644
index da7dd1987ca8..000000000000
--- a/reference/swoole/swoole/mysql/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::on</refname>
-  <refpurpose>Register callback function based on event name.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\MySQL::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Register callback function based on event name, current only 'close' event is supported.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/mysql/query.xml b/reference/swoole/swoole/mysql/query.xml
deleted file mode 100644
index 21013dfd22a2..000000000000
--- a/reference/swoole/swoole/mysql/query.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-mysql.query" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\MySQL::query</refname>
-  <refpurpose>Run the SQL query.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\MySQL::query</methodname>
-   <methodparam><type>string</type><parameter>sql</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sql</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/alarm.xml b/reference/swoole/swoole/process/alarm.xml
deleted file mode 100644
index e38eeda36dc7..000000000000
--- a/reference/swoole/swoole/process/alarm.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.alarm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::alarm</refname>
-  <refpurpose>High precision timer which triggers signal with fixed interval.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Process::alarm</methodname>
-   <methodparam><type>int</type><parameter>interval_usec</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>interval_usec</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/close.xml b/reference/swoole/swoole/process/close.xml
deleted file mode 100644
index fc4d27d25e3c..000000000000
--- a/reference/swoole/swoole/process/close.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::close</refname>
-  <refpurpose>Close the pipe to the child process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::close</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Close the pipe to the child process.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/construct.xml b/reference/swoole/swoole/process/construct.xml
deleted file mode 100644
index 0f490a3ec582..000000000000
--- a/reference/swoole/swoole/process/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::__construct</refname>
-  <refpurpose>Construct a process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Process::__construct</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>redirect_stdin_and_stdout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pipe_type</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>redirect_stdin_and_stdout</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pipe_type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/daemon.xml b/reference/swoole/swoole/process/daemon.xml
deleted file mode 100644
index 8256fb3969fa..000000000000
--- a/reference/swoole/swoole/process/daemon.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.daemon" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::daemon</refname>
-  <refpurpose>Change the process to be a daemon process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Process::daemon</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>nochdir</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>noclose</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nochdir</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>noclose</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/destruct.xml b/reference/swoole/swoole/process/destruct.xml
deleted file mode 100644
index 3d0c35c25dbf..000000000000
--- a/reference/swoole/swoole/process/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::__destruct</refname>
-  <refpurpose>Destroy the process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/exec.xml b/reference/swoole/swoole/process/exec.xml
deleted file mode 100644
index 11fc8e60b9d1..000000000000
--- a/reference/swoole/swoole/process/exec.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.exec" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::exec</refname>
-  <refpurpose>Execute system commands.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Process::exec</methodname>
-   <methodparam><type>string</type><parameter>exec_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    The process will be replaced to be the system command process, but the pipe to the parent process will be kept.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>exec_file</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/exit.xml b/reference/swoole/swoole/process/exit.xml
deleted file mode 100644
index 23bab12a9fb4..000000000000
--- a/reference/swoole/swoole/process/exit.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.exit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::exit</refname>
-  <refpurpose>Stop the child processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::exit</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>exit_code</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>exit_code</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/freequeue.xml b/reference/swoole/swoole/process/freequeue.xml
deleted file mode 100644
index e73a99195757..000000000000
--- a/reference/swoole/swoole/process/freequeue.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.freequeue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::freeQueue</refname>
-  <refpurpose>Destroy the message queue created by swoole_process::useQueue.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::freeQueue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/kill.xml b/reference/swoole/swoole/process/kill.xml
deleted file mode 100644
index dd080a592852..000000000000
--- a/reference/swoole/swoole/process/kill.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.kill" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::kill</refname>
-  <refpurpose>Send signal to the child process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <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>int</type><parameter>signal_no</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Send signal to the child process.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pid</parameter></term>
-    <listitem>
-     <para>
-      Process pid
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signal_no</parameter></term>
-    <listitem>
-     <para>
-      Signal to be sent
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/swoole/process/name.xml b/reference/swoole/swoole/process/name.xml
deleted file mode 100644
index bdd61064d15c..000000000000
--- a/reference/swoole/swoole/process/name.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.name" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::name</refname>
-  <refpurpose>Set name of the process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Process::name</methodname>
-   <methodparam><type>string</type><parameter>process_name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>process_name</parameter></term>
-    <listitem>
-     <para>
-      Set name of the process.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/swoole/process/pop.xml b/reference/swoole/swoole/process/pop.xml
deleted file mode 100644
index abbde4076728..000000000000
--- a/reference/swoole/swoole/process/pop.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.pop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::pop</refname>
-  <refpurpose>Read and pop data from the message queue.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Process::pop</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>maxsize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>maxsize</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/push.xml b/reference/swoole/swoole/process/push.xml
deleted file mode 100644
index 197d01e8da55..000000000000
--- a/reference/swoole/swoole/process/push.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::push</refname>
-  <refpurpose>Write and push data into the message queue.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Process::push</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/read.xml b/reference/swoole/swoole/process/read.xml
deleted file mode 100644
index 356408753a96..000000000000
--- a/reference/swoole/swoole/process/read.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.read" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::read</refname>
-  <refpurpose>Read data sending to the process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Swoole\Process::read</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>maxsize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>maxsize</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/signal.xml b/reference/swoole/swoole/process/signal.xml
deleted file mode 100644
index b82b967c21dd..000000000000
--- a/reference/swoole/swoole/process/signal.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.signal" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::signal</refname>
-  <refpurpose>Send signal to the child processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Process::signal</methodname>
-   <methodparam><type>string</type><parameter>signal_no</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>signal_no</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If signal sent successfully, it returns TRUE, otherwise it returns 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/swoole/swoole/process/start.xml b/reference/swoole/swoole/process/start.xml
deleted file mode 100644
index 837226db7b6e..000000000000
--- a/reference/swoole/swoole/process/start.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::start</refname>
-  <refpurpose>Start the process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Process::start</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/statqueue.xml b/reference/swoole/swoole/process/statqueue.xml
deleted file mode 100644
index 60629707eb16..000000000000
--- a/reference/swoole/swoole/process/statqueue.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.statqueue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::statQueue</refname>
-  <refpurpose>Get the stats of the message queue used as the communication method between processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Process::statQueue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The array of status of the message queue.
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/usequeue.xml b/reference/swoole/swoole/process/usequeue.xml
deleted file mode 100644
index 589fc42180dd..000000000000
--- a/reference/swoole/swoole/process/usequeue.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.usequeue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::useQueue</refname>
-  <refpurpose>Create a message queue as the communication method between the parent process and child processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Process::useQueue</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/wait.xml b/reference/swoole/swoole/process/wait.xml
deleted file mode 100644
index bc5ba88b2e48..000000000000
--- a/reference/swoole/swoole/process/wait.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.wait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::wait</refname>
-  <refpurpose>Wait for the events of child processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Swoole\Process::wait</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>blocking</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>blocking</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/process/write.xml b/reference/swoole/swoole/process/write.xml
deleted file mode 100644
index 7097e05fd93c..000000000000
--- a/reference/swoole/swoole/process/write.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-process.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Process::write</refname>
-  <refpurpose>Write data into the pipe and communicate with the parent process or child processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Process::write</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/redis/server/format.xml b/reference/swoole/swoole/redis/server/format.xml
deleted file mode 100644
index 427cb85f3909..000000000000
--- a/reference/swoole/swoole/redis/server/format.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-redis-server.format" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Redis\Server::format</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Redis\Server::format</methodname>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/redis/server/sethandler.xml b/reference/swoole/swoole/redis/server/sethandler.xml
deleted file mode 100644
index 61dc8e195fd0..000000000000
--- a/reference/swoole/swoole/redis/server/sethandler.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-redis-server.sethandler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Redis\Server::setHandler</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Redis\Server::setHandler</methodname>
-   <methodparam><type>string</type><parameter>command</parameter></methodparam>
-   <methodparam><type>string</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>number_of_string_param</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type_of_array_param</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>command</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>number_of_string_param</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type_of_array_param</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/redis/server/start.xml b/reference/swoole/swoole/redis/server/start.xml
deleted file mode 100644
index 788cf9de9740..000000000000
--- a/reference/swoole/swoole/redis/server/start.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-redis-server.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Redis\Server::start</refname>
-  <refpurpose>Description</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Redis\Server::start</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/runtime/enableCoroutine.xml b/reference/swoole/swoole/runtime/enableCoroutine.xml
deleted file mode 100644
index 79e6dc613153..000000000000
--- a/reference/swoole/swoole/runtime/enableCoroutine.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-runtime.enable-coroutine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Runtime::enableCoroutine</refname>
-  <refpurpose>Enable coroutine for specified functions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Runtime::enableCoroutine</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>SWOOLE_HOOK_ALL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method enables coroutine support for specified PHP functions based on the given flags.
-   It should be called once at the beginning of the application.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Bitmask of flags specifying which functions to hook. Can be combined using | operator.
-      Available flags:
-      <constant>SWOOLE_HOOK_TCP</constant>,
-      <constant>SWOOLE_HOOK_UDP</constant>,
-      <constant>SWOOLE_HOOK_UNIX</constant>,
-      <constant>SWOOLE_HOOK_UDG</constant>,
-      <constant>SWOOLE_HOOK_SSL</constant>,
-      <constant>SWOOLE_HOOK_TLS</constant>,
-      <constant>SWOOLE_HOOK_SLEEP</constant>,
-      <constant>SWOOLE_HOOK_FILE</constant>,
-      <constant>SWOOLE_HOOK_STREAM_FUNCTION</constant>,
-      <constant>SWOOLE_HOOK_BLOCKING_FUNCTION</constant>,
-      <constant>SWOOLE_HOOK_PROC</constant>,
-      <constant>SWOOLE_HOOK_CURL</constant>,
-      <constant>SWOOLE_HOOK_NATIVE_CURL</constant>,
-      <constant>SWOOLE_HOOK_SOCKETS</constant>,
-      <constant>SWOOLE_HOOK_STDIO</constant>,
-      <constant>SWOOLE_HOOK_PDO_PGSQL</constant>,
-      <constant>SWOOLE_HOOK_PDO_ODBC</constant>,
-      <constant>SWOOLE_HOOK_PDO_ORACLE</constant>,
-      <constant>SWOOLE_HOOK_PDO_SQLITE</constant>,
-      or <constant>SWOOLE_HOOK_ALL</constant> for all flags.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/swoole/runtime/getHookFlags.xml b/reference/swoole/swoole/runtime/getHookFlags.xml
deleted file mode 100644
index 93b37eb271fb..000000000000
--- a/reference/swoole/swoole/runtime/getHookFlags.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-runtime.get-hook-flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Runtime::getHookFlags</refname>
-  <refpurpose>Get current hook flags</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>int</type><methodname>Swoole\Runtime::getHookFlags</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the current hook flags.
-   Note that the returned flags might differ from what was set if some hooks failed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   This function has no parameters.
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current hook flags as a 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/swoole/swoole/runtime/setHookFlags.xml b/reference/swoole/swoole/runtime/setHookFlags.xml
deleted file mode 100644
index 6f9052c3d651..000000000000
--- a/reference/swoole/swoole/runtime/setHookFlags.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-runtime.set-hook-flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Runtime::setHookFlags</refname>
-  <refpurpose>Set hook flags for coroutine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Runtime::setHookFlags</methodname>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the hook flags for coroutine support.
-   This dynamically changes the hook flags at runtime.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Bitmask of flags specifying which functions to hook. Same flags as enableCoroutine.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/swoole/swoole/serialize/pack.xml b/reference/swoole/swoole/serialize/pack.xml
deleted file mode 100644
index 0bfa9f632886..000000000000
--- a/reference/swoole/swoole/serialize/pack.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-serialize.pack" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Serialize::pack</refname>
-  <refpurpose>Serialize the data.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Serialize::pack</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>is_fast</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Swoole provides a fast and high performance serialization module.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_fast</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/serialize/unpack.xml b/reference/swoole/swoole/serialize/unpack.xml
deleted file mode 100644
index ee40981d519e..000000000000
--- a/reference/swoole/swoole/serialize/unpack.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-serialize.unpack" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Serialize::unpack</refname>
-  <refpurpose>Unserialize the data.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>ReturnType</type><methodname>Swoole\Serialize::unpack</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Unserialize the data.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/addlistener.xml b/reference/swoole/swoole/server/addlistener.xml
deleted file mode 100644
index 895c7521a238..000000000000
--- a/reference/swoole/swoole/server/addlistener.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.addlistener" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::addlistener</refname>
-  <refpurpose>Add a new listener to the server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::addlistener</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>socket_type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>socket_type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/addprocess.xml b/reference/swoole/swoole/server/addprocess.xml
deleted file mode 100644
index 87d745343b8a..000000000000
--- a/reference/swoole/swoole/server/addprocess.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.addprocess" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::addProcess</refname>
-  <refpurpose>Add a user defined swoole_process to the server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::addProcess</methodname>
-   <methodparam><type>swoole_process</type><parameter>process</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>process</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/after.xml b/reference/swoole/swoole/server/after.xml
deleted file mode 100644
index e01cc09d3308..000000000000
--- a/reference/swoole/swoole/server/after.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.after" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::after</refname>
-  <refpurpose>Trigger a callback function after a period of time.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Server::after</methodname>
-   <methodparam><type>int</type><parameter>after_time_ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>param</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>after_time_ms</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>param</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/bind.xml b/reference/swoole/swoole/server/bind.xml
deleted file mode 100644
index 94ab2db5f339..000000000000
--- a/reference/swoole/swoole/server/bind.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::bind</refname>
-  <refpurpose>Bind the connection to a user defined user ID.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::bind</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>int</type><parameter>uid</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>uid</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/cleartimer.xml b/reference/swoole/swoole/server/cleartimer.xml
deleted file mode 100644
index 662c38a4c121..000000000000
--- a/reference/swoole/swoole/server/cleartimer.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.cleartimer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::clearTimer</refname>
-  <refname>swoole_timer_clear</refname>
-  <refpurpose>Stop and destroy a timer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <para>&style.oop; (method):</para>
-   <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::clearTimer</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-   </methodsynopsis>
-  <para>&style.procedural;:</para>
-  <methodsynopsis>
-   <type>void</type><methodname>swoole_timer_clear</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Stop and destroy a timer
-  </para>
-   
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>timer_id</parameter></term>
-     <listitem>
-      <para>
-       
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/close.xml b/reference/swoole/swoole/server/close.xml
deleted file mode 100644
index 6fe86d77f9fc..000000000000
--- a/reference/swoole/swoole/server/close.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::close</refname>
-  <refpurpose>Close a connection to the client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::close</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>reset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>reset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/confirm.xml b/reference/swoole/swoole/server/confirm.xml
deleted file mode 100644
index b0a078a3355b..000000000000
--- a/reference/swoole/swoole/server/confirm.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.confirm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::confirm</refname>
-  <refpurpose>Check status of the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::confirm</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/connection-info.xml b/reference/swoole/swoole/server/connection-info.xml
deleted file mode 100644
index b3debe462abb..000000000000
--- a/reference/swoole/swoole/server/connection-info.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.connection-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::connection_info</refname>
-  <refpurpose>Get the connection info by file description.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Server::connection_info</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>reactor_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>reactor_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/connection-list.xml b/reference/swoole/swoole/server/connection-list.xml
deleted file mode 100644
index 0d39969aefae..000000000000
--- a/reference/swoole/swoole/server/connection-list.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.connection-list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::connection_list</refname>
-  <refpurpose>Get all of the established connections.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Server::connection_list</methodname>
-   <methodparam><type>int</type><parameter>start_fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pagesize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>start_fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pagesize</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/construct.xml b/reference/swoole/swoole/server/construct.xml
deleted file mode 100644
index 0d670ed3d6bf..000000000000
--- a/reference/swoole/swoole/server/construct.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::__construct</refname>
-  <refpurpose>Construct a Swoole server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Server::__construct</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>sock_type</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sock_type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/defer.xml b/reference/swoole/swoole/server/defer.xml
deleted file mode 100644
index c0988ce5d1f0..000000000000
--- a/reference/swoole/swoole/server/defer.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.defer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::defer</refname>
-  <refpurpose>Delay execution of the callback function at the end of current EventLoop.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::defer</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/exist.xml b/reference/swoole/swoole/server/exist.xml
deleted file mode 100644
index f51cae45020f..000000000000
--- a/reference/swoole/swoole/server/exist.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.exist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::exist</refname>
-  <refpurpose>Check if the connection is existed.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::exist</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/finish.xml b/reference/swoole/swoole/server/finish.xml
deleted file mode 100644
index 06dc3a1b14a1..000000000000
--- a/reference/swoole/swoole/server/finish.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.finish" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::finish</refname>
-  <refpurpose>Used in task process for sending result to the worker process when the task is finished.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::finish</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/getclientinfo.xml b/reference/swoole/swoole/server/getclientinfo.xml
deleted file mode 100644
index 39a3729e2686..000000000000
--- a/reference/swoole/swoole/server/getclientinfo.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.getclientinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::getClientInfo</refname>
-  <refpurpose>Get the connection info by file description.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <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>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      File descriptors.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <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>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns information about the client 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/getclientlist.xml b/reference/swoole/swoole/server/getclientlist.xml
deleted file mode 100644
index b532ea60fb5a..000000000000
--- a/reference/swoole/swoole/server/getclientlist.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.getclientlist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::getClientList</refname>
-  <refpurpose>Get all of the established connections.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Server::getClientList</methodname>
-   <methodparam><type>int</type><parameter>start_fd</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pagesize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>start_fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>pagesize</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/getlasterror.xml b/reference/swoole/swoole/server/getlasterror.xml
deleted file mode 100644
index fe19e30996b8..000000000000
--- a/reference/swoole/swoole/server/getlasterror.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.getlasterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::getLastError</refname>
-  <refpurpose>Get the error code of the most recent error.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Server::getLastError</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/heartbeat.xml b/reference/swoole/swoole/server/heartbeat.xml
deleted file mode 100644
index 0d55aa36734d..000000000000
--- a/reference/swoole/swoole/server/heartbeat.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.heartbeat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::heartbeat</refname>
-  <refpurpose>Check all the connections on the server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Server::heartbeat</methodname>
-   <methodparam><type>bool</type><parameter>if_close_connection</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>if_close_connection</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/listen.xml b/reference/swoole/swoole/server/listen.xml
deleted file mode 100644
index cb3dfaf33506..000000000000
--- a/reference/swoole/swoole/server/listen.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.listen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::listen</refname>
-  <refpurpose>Listen on the given IP and port, socket type.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::listen</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>socket_type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>socket_type</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/on.xml b/reference/swoole/swoole/server/on.xml
deleted file mode 100644
index 0100e4088676..000000000000
--- a/reference/swoole/swoole/server/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::on</refname>
-  <refpurpose>Register a callback function by event name.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/pause.xml b/reference/swoole/swoole/server/pause.xml
deleted file mode 100644
index da7e3b2cbfe9..000000000000
--- a/reference/swoole/swoole/server/pause.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.pause" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::pause</refname>
-  <refpurpose>Stop receiving data from the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::pause</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/port/construct.xml b/reference/swoole/swoole/server/port/construct.xml
deleted file mode 100644
index 1d2afc2a3902..000000000000
--- a/reference/swoole/swoole/server/port/construct.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server-port.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server\Port::__construct</refname>
-  <refpurpose>Construct a server port</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>Swoole\Server\Port::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/port/destruct.xml b/reference/swoole/swoole/server/port/destruct.xml
deleted file mode 100644
index a2d572f395b0..000000000000
--- a/reference/swoole/swoole/server/port/destruct.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server-port.destruct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server\Port::__destruct</refname>
-  <refpurpose>Destroy server port</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server\Port::__destruct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/port/on.xml b/reference/swoole/swoole/server/port/on.xml
deleted file mode 100644
index 9db4e2da7b77..000000000000
--- a/reference/swoole/swoole/server/port/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server-port.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server\Port::on</refname>
-  <refpurpose>Register callback functions by event.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Server\Port::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/port/set.xml b/reference/swoole/swoole/server/port/set.xml
deleted file mode 100644
index b374466bce29..000000000000
--- a/reference/swoole/swoole/server/port/set.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server-port.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server\Port::set</refname>
-  <refpurpose>Set protocol of the server port.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server\Port::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/protect.xml b/reference/swoole/swoole/server/protect.xml
deleted file mode 100644
index 1766199554a5..000000000000
--- a/reference/swoole/swoole/server/protect.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.protect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::protect</refname>
-  <refpurpose>Set the connection to be protected mode.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::protect</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_protected</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_protected</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/reload.xml b/reference/swoole/swoole/server/reload.xml
deleted file mode 100644
index 797a5b7b3c3e..000000000000
--- a/reference/swoole/swoole/server/reload.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.reload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::reload</refname>
-  <refpurpose>Restart all the worker process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::reload</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/resume.xml b/reference/swoole/swoole/server/resume.xml
deleted file mode 100644
index cb6d7f69577a..000000000000
--- a/reference/swoole/swoole/server/resume.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.resume" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::resume</refname>
-  <refpurpose>Start receiving data from the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::resume</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/send.xml b/reference/swoole/swoole/server/send.xml
deleted file mode 100644
index fc61c9405ae9..000000000000
--- a/reference/swoole/swoole/server/send.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.send" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::send</refname>
-  <refpurpose>Send data to the client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::send</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>reactor_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>reactor_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/sendfile.xml b/reference/swoole/swoole/server/sendfile.xml
deleted file mode 100644
index e783fd5464a0..000000000000
--- a/reference/swoole/swoole/server/sendfile.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.sendfile" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::sendfile</refname>
-  <refpurpose>Send file to the connection.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::sendfile</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>filename</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/sendmessage.xml b/reference/swoole/swoole/server/sendmessage.xml
deleted file mode 100644
index 0e9f602ab3a6..000000000000
--- a/reference/swoole/swoole/server/sendmessage.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.sendmessage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::sendMessage</refname>
-  <refpurpose>Send message to worker processes by ID.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::sendMessage</methodname>
-   <methodparam><type>int</type><parameter>worker_id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>dst_worker_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/sendto.xml b/reference/swoole/swoole/server/sendto.xml
deleted file mode 100644
index 9f9a0126db16..000000000000
--- a/reference/swoole/swoole/server/sendto.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.sendto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::sendto</refname>
-  <refpurpose>Send data to the remote UDP address.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::sendto</methodname>
-   <methodparam><type>string</type><parameter>ip</parameter></methodparam>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>server_socket</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ip</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>port</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>server_socket</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/sendwait.xml b/reference/swoole/swoole/server/sendwait.xml
deleted file mode 100644
index f51e5ec80e89..000000000000
--- a/reference/swoole/swoole/server/sendwait.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.sendwait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::sendwait</refname>
-  <refpurpose>Send data to the remote socket in the blocking way.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::sendwait</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/set.xml b/reference/swoole/swoole/server/set.xml
deleted file mode 100644
index b115c883edf7..000000000000
--- a/reference/swoole/swoole/server/set.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::set</refname>
-  <refpurpose>Set the runtime settings of the swoole server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\Server::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set the runtime settings of the swoole server. The settings can be accessed by $server->setting when the swoole server has started.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/shutdown.xml b/reference/swoole/swoole/server/shutdown.xml
deleted file mode 100644
index 47bcbc410288..000000000000
--- a/reference/swoole/swoole/server/shutdown.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.shutdown" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::shutdown</refname>
-  <refpurpose>Shutdown the master server process, this function can be called in worker processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::shutdown</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/start.xml b/reference/swoole/swoole/server/start.xml
deleted file mode 100644
index 835113cf75f9..000000000000
--- a/reference/swoole/swoole/server/start.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::start</refname>
-  <refpurpose>Start the Swoole server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::start</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/stats.xml b/reference/swoole/swoole/server/stats.xml
deleted file mode 100644
index e936618a34d6..000000000000
--- a/reference/swoole/swoole/server/stats.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::stats</refname>
-  <refpurpose>Get the stats of the Swoole server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Server::stats</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/stop.xml b/reference/swoole/swoole/server/stop.xml
deleted file mode 100644
index c32095252958..000000000000
--- a/reference/swoole/swoole/server/stop.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.stop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::stop</refname>
-  <refpurpose>Stop the Swoole server.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Server::stop</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>worker_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>worker_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/task.xml b/reference/swoole/swoole/server/task.xml
deleted file mode 100644
index 74e0005a7731..000000000000
--- a/reference/swoole/swoole/server/task.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.task" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::task</refname>
-  <refpurpose>Send data to the task worker processes.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Server::task</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>dst_worker_id</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dst_worker_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/taskwait.xml b/reference/swoole/swoole/server/taskwait.xml
deleted file mode 100644
index 80f4361a6a80..000000000000
--- a/reference/swoole/swoole/server/taskwait.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.taskwait" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::taskwait</refname>
-  <refpurpose>Send data to the task worker processes in blocking way.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::taskwait</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>worker_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>worker_id</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/taskwaitmulti.xml b/reference/swoole/swoole/server/taskwaitmulti.xml
deleted file mode 100644
index a3d05de568a6..000000000000
--- a/reference/swoole/swoole/server/taskwaitmulti.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.taskwaitmulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::taskWaitMulti</refname>
-  <refpurpose>Execute multiple tasks concurrently.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::taskWaitMulti</methodname>
-   <methodparam><type>array</type><parameter>tasks</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>timeout_ms</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tasks</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout_ms</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/server/tick.xml b/reference/swoole/swoole/server/tick.xml
deleted file mode 100644
index 8baac591a234..000000000000
--- a/reference/swoole/swoole/server/tick.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-server.tick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Server::tick</refname>
-  <refpurpose>Repeats a given function at every given time-interval.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Server::tick</methodname>
-   <methodparam><type>int</type><parameter>interval_ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>interval_ms</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/column.xml b/reference/swoole/swoole/table/column.xml
deleted file mode 100644
index ab138d57c087..000000000000
--- a/reference/swoole/swoole/table/column.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.column" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::column</refname>
-  <refpurpose>Set the data type and size of the columns.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::column</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      Specify the name of the field.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      Specify the field type.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      Specify the maximum length of the string field.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/construct.xml b/reference/swoole/swoole/table/construct.xml
deleted file mode 100644
index 67a515d5556f..000000000000
--- a/reference/swoole/swoole/table/construct.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::__construct</refname>
-  <refpurpose>Construct a Swoole memory table with fixed size.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Swoole\Table::__construct</methodname>
-   <methodparam><type>int</type><parameter>table_size</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>table_size</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/count.xml b/reference/swoole/swoole/table/count.xml
deleted file mode 100644
index 3fc6fe35a35e..000000000000
--- a/reference/swoole/swoole/table/count.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::count</refname>
-  <refpurpose>Count the rows in the table, or count all the elements in the table if $mode = 1.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Table::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/create.xml b/reference/swoole/swoole/table/create.xml
deleted file mode 100644
index ceed5590167a..000000000000
--- a/reference/swoole/swoole/table/create.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::create</refname>
-  <refpurpose>Create the swoole memory table.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::create</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/current.xml b/reference/swoole/swoole/table/current.xml
deleted file mode 100644
index 40728de83fc2..000000000000
--- a/reference/swoole/swoole/table/current.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::current</refname>
-  <refpurpose>Get the current row.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Swoole\Table::current</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/decr.xml b/reference/swoole/swoole/table/decr.xml
deleted file mode 100644
index fa1f343f67a9..000000000000
--- a/reference/swoole/swoole/table/decr.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.decr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::decr</refname>
-  <refpurpose>Decrement the value in the Swoole table by $key and $column</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Table::decr</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>column</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>decrby</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      Key of the data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-    <listitem>
-     <para>
-      Specify the column name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>decrby</parameter></term>
-    <listitem>
-     <para>
-      Decrement value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/del.xml b/reference/swoole/swoole/table/del.xml
deleted file mode 100644
index e51b9eb37d5d..000000000000
--- a/reference/swoole/swoole/table/del.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::del</refname>
-  <refpurpose>Delete a row in the Swoole table by $key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::del</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/destroy.xml b/reference/swoole/swoole/table/destroy.xml
deleted file mode 100644
index 305919efe850..000000000000
--- a/reference/swoole/swoole/table/destroy.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.destroy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::destroy</refname>
-  <refpurpose>Destroy the Swoole table.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::destroy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/exist.xml b/reference/swoole/swoole/table/exist.xml
deleted file mode 100644
index e23a42804918..000000000000
--- a/reference/swoole/swoole/table/exist.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.exist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::exist</refname>
-  <refpurpose>Check if a row is existed by $row_key.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::exist</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/get.xml b/reference/swoole/swoole/table/get.xml
deleted file mode 100644
index 6fc25128a22d..000000000000
--- a/reference/swoole/swoole/table/get.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::get</refname>
-  <refpurpose>Get the value in the Swoole table by $key and $field.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Table::get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>field</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>field</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/incr.xml b/reference/swoole/swoole/table/incr.xml
deleted file mode 100644
index e22376d5bebb..000000000000
--- a/reference/swoole/swoole/table/incr.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.incr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::incr</refname>
-  <refpurpose>Increment the value by $key and $column</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Swoole\Table::incr</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>string</type><parameter>column</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>incrby</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      Key for the data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-    <listitem>
-     <para>
-      Specify the column name.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>incrby</parameter></term>
-    <listitem>
-     <para>
-      Increment value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/key.xml b/reference/swoole/swoole/table/key.xml
deleted file mode 100644
index 73548faec0c0..000000000000
--- a/reference/swoole/swoole/table/key.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::key</refname>
-  <refpurpose>Get the key of current row.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Swoole\Table::key</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/next.xml b/reference/swoole/swoole/table/next.xml
deleted file mode 100644
index 1979c2235095..000000000000
--- a/reference/swoole/swoole/table/next.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::next</refname>
-  <refpurpose>Advance the iterator to the next row</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Table::next</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/rewind.xml b/reference/swoole/swoole/table/rewind.xml
deleted file mode 100644
index ab988f6481f4..000000000000
--- a/reference/swoole/swoole/table/rewind.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::rewind</refname>
-  <refpurpose>Rewind the iterator.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\Table::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/set.xml b/reference/swoole/swoole/table/set.xml
deleted file mode 100644
index 6c4c2656c572..000000000000
--- a/reference/swoole/swoole/table/set.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::set</refname>
-  <refpurpose>Update a row of the table by $key.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::set</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>array</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      Key of the data.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      Value of the data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/table/valid.xml b/reference/swoole/swoole/table/valid.xml
deleted file mode 100644
index afbb030446f8..000000000000
--- a/reference/swoole/swoole/table/valid.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-table.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Table::valid</refname>
-  <refpurpose>Check if the current row is valid.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\Table::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/timer/after.xml b/reference/swoole/swoole/timer/after.xml
deleted file mode 100644
index 7cb5d35b9a53..000000000000
--- a/reference/swoole/swoole/timer/after.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.after" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::after</refname>
-  <refpurpose>Execute a function after a specified time</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Swoole\Timer::after</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Creates a one-shot timer, which is destroyed once its callback has run.
-   Unlike <function>sleep</function>, it does not block the current process.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ms</parameter></term>
-    <listitem>
-     <simpara>
-      The delay in milliseconds. Must be greater than or equal to
-      <literal>1</literal>; a lower value emits an <constant>E_WARNING</constant>
-      and the call fails.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      The function to execute once the delay has elapsed. It is called as
-      <literal>callback(mixed ...$params)</literal>. Unlike
-      <methodname>Swoole\Timer::tick</methodname>, the timer ID is not passed
-      to the callback.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-    <listitem>
-     <simpara>
-      Additional values passed to <parameter>callback</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timer ID, which can be passed to
-   <methodname>Swoole\Timer::clear</methodname> to cancel the timer before it
-   fires. Returns &false; if the timer could not be created, in particular when
-   <parameter>ms</parameter> is less than <literal>1</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::after</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-Swoole\Timer::after(1000, function (string $name) {
-    echo "Hello, $name\n";
-}, "Swoole");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Hello, Swoole
-]]>
-   </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/swoole/swoole/timer/clear.xml b/reference/swoole/swoole/timer/clear.xml
deleted file mode 100644
index 6ab179db4093..000000000000
--- a/reference/swoole/swoole/timer/clear.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::clear</refname>
-  <refpurpose>Delete a timer by ID</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Timer::clear</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Deletes the timer with the given ID. Only timers created by the current
-   process can be removed; timers belonging to other processes are not visible
-   here.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timer_id</parameter></term>
-    <listitem>
-     <simpara>
-      The timer ID returned by <methodname>Swoole\Timer::tick</methodname> or
-      <methodname>Swoole\Timer::after</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-   &false; is returned when no timer with this ID exists in the current
-   process, or when the ID refers to an internal timer.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::clear</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$timer_id = Swoole\Timer::after(1000, function () {
-    echo "never printed\n";
-});
-var_dump(Swoole\Timer::clear($timer_id));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/swoole/swoole/timer/clearAll.xml b/reference/swoole/swoole/timer/clearAll.xml
deleted file mode 100644
index 72a72ed81618..000000000000
--- a/reference/swoole/swoole/timer/clearAll.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.clearall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::clearAll</refname>
-  <refpurpose>Clear all timers in the current process.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Timer::clearAll</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Clear all timers in the current process. As of Swoole 4.4.0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-   &false; is returned when no timer has been created in this process yet.
-   Only timers created from PHP are removed; internal timers are left in place.
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/timer/exists.xml b/reference/swoole/swoole/timer/exists.xml
deleted file mode 100644
index 9513c8192772..000000000000
--- a/reference/swoole/swoole/timer/exists.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::exists</refname>
-  <refpurpose>Check if a timer is existed.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Swoole\Timer::exists</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks whether a timer with the given ID exists in the current process.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timer_id</parameter></term>
-    <listitem>
-     <simpara>
-      The timer ID returned by <methodname>Swoole\Timer::tick</methodname> or
-      <methodname>Swoole\Timer::after</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if a timer with this ID exists in the current process,
-   &false; otherwise.
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/timer/info.xml b/reference/swoole/swoole/timer/info.xml
deleted file mode 100644
index 35e785a1299c..000000000000
--- a/reference/swoole/swoole/timer/info.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::info</refname>
-  <refpurpose>Get information about a timer.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>Swoole\Timer::info</methodname>
-   <methodparam><type>int</type><parameter>timer_id</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Get information about a timer. As of Swoole 4.4.0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timer_id</parameter></term>
-    <listitem>
-     <simpara>
-      The timer ID returned by <methodname>Swoole\Timer::tick</methodname> or
-      <methodname>Swoole\Timer::after</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array describing the timer, or &null; if no timer with this ID
-   exists in the current process. The array contains the following keys:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><literal>exec_msec</literal></term>
-    <listitem>
-     <simpara>
-      The time of the next execution, in milliseconds, counted from the moment
-      the timer subsystem was started. It is not a duration.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>exec_count</literal></term>
-    <listitem>
-     <simpara>
-      The number of times the callback has been executed.
-      Available as of Swoole 4.8.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>interval</literal></term>
-    <listitem>
-     <simpara>
-      The interval of the timer, in milliseconds.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>round</literal></term>
-    <listitem>
-     <simpara>
-      The number of the timer loop round in which the timer was created.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>removed</literal></term>
-    <listitem>
-     <simpara>
-      Whether the timer has been removed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::info</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$timer_id = Swoole\Timer::tick(1000, function () {});
-var_dump(Swoole\Timer::info($timer_id));
-Swoole\Timer::clear($timer_id);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(5) {
-  ["exec_msec"]=>
-  int(1000)
-  ["exec_count"]=>
-  int(0)
-  ["interval"]=>
-  int(1000)
-  ["round"]=>
-  int(0)
-  ["removed"]=>
-  bool(false)
-}
-]]>
-   </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/swoole/swoole/timer/list.xml b/reference/swoole/swoole/timer/list.xml
deleted file mode 100644
index fce061baf553..000000000000
--- a/reference/swoole/swoole/timer/list.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.list" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::list</refname>
-  <refpurpose>Get an iterator over the timers of the current process</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>Swoole\Timer\Iterator</type><methodname>Swoole\Timer::list</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Returns an iterator over the IDs of the timers created from PHP in the
-   current process. Timers created internally by Swoole are not listed.
-   As of Swoole 4.4.0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a <classname>Swoole\Timer\Iterator</classname> object, which
-   extends <classname>ArrayIterator</classname> and yields the timer IDs as
-   <type>int</type> values. The iterator is a snapshot taken when the method is
-   called; it is empty when no timer exists.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::list</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-Swoole\Timer::tick(1000, function () {});
-Swoole\Timer::after(5000, function () {});
-
-foreach (Swoole\Timer::list() as $timer_id) {
-    echo $timer_id, "\n";
-    Swoole\Timer::clear($timer_id);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1
-2
-]]>
-   </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/swoole/swoole/timer/set.xml b/reference/swoole/swoole/timer/set.xml
deleted file mode 100644
index 78cca7975243..000000000000
--- a/reference/swoole/swoole/timer/set.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::set</refname>
-  <refpurpose>Set timer-related parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>void</type><methodname>Swoole\Timer::set</methodname>
-   <methodparam><type>array</type><parameter>settings</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the options used by the timers of the current process.
-  </simpara>
-
-  <warning>
-   <simpara>
-    This method was deprecated in Swoole 4.6.0 and removed in Swoole 6.0.0.
-    Use <function>swoole_async_set</function> instead.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array of options. Only <literal>enable_coroutine</literal>
-      is recognised: when set to &false;, the timer callbacks are executed
-      directly instead of inside a newly created coroutine.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/timer/stats.xml b/reference/swoole/swoole/timer/stats.xml
deleted file mode 100644
index e7424e481e55..000000000000
--- a/reference/swoole/swoole/timer/stats.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.stats" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::stats</refname>
-  <refpurpose>Get timer statistics.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>Swoole\Timer::stats</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get timer statistics. As of Swoole 4.4.0.
-  </simpara>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an array with the following keys:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><literal>initialized</literal></term>
-    <listitem>
-     <simpara>
-      Whether the timer subsystem has been started. It is &false; until the
-      first timer is created.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>num</literal></term>
-    <listitem>
-     <simpara>
-      The number of timers currently registered in the process.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>round</literal></term>
-    <listitem>
-     <simpara>
-      The current round of the timer loop.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::stats</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$timer_id = Swoole\Timer::tick(1000, function () {});
-var_dump(Swoole\Timer::stats());
-Swoole\Timer::clear($timer_id);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  ["initialized"]=>
-  bool(true)
-  ["num"]=>
-  int(1)
-  ["round"]=>
-  int(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/swoole/swoole/timer/tick.xml b/reference/swoole/swoole/timer/tick.xml
deleted file mode 100644
index 5c8a20bca9d1..000000000000
--- a/reference/swoole/swoole/timer/tick.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-timer.tick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\Timer::tick</refname>
-  <refpurpose>Set a repeating interval timer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>int</type><type>false</type></type><methodname>Swoole\Timer::tick</methodname>
-   <methodparam><type>int</type><parameter>ms</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>params</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets a timer that triggers every <parameter>ms</parameter> milliseconds.
-   Unlike a timer created with <methodname>Swoole\Timer::after</methodname>,
-   it keeps triggering until it is removed with
-   <methodname>Swoole\Timer::clear</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>ms</parameter></term>
-    <listitem>
-     <simpara>
-      The interval in milliseconds. Must be greater than or equal to
-      <literal>1</literal>; a lower value emits an <constant>E_WARNING</constant>
-      and the call fails.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      The function to execute on every tick. It is called as
-      <literal>callback(int $timer_id, mixed ...$params)</literal>: the ID of
-      the timer is passed as the first argument, followed by the values given
-      in <parameter>params</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>params</parameter></term>
-    <listitem>
-     <simpara>
-      Additional values passed to <parameter>callback</parameter> after the
-      timer ID.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the timer ID, which can be passed to
-   <methodname>Swoole\Timer::clear</methodname>. Returns &false; if the timer
-   could not be created, in particular when <parameter>ms</parameter> is less
-   than <literal>1</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Swoole\Timer::tick</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ticks = 0;
-Swoole\Timer::tick(1000, function (int $timer_id, string $label) use (&$ticks) {
-    echo "tick #", ++$ticks, " ($label)\n";
-    if ($ticks === 3) {
-        Swoole\Timer::clear($timer_id);
-    }
-}, "job");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-tick #1 (job)
-tick #2 (job)
-tick #3 (job)
-]]>
-   </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/swoole/swoole/websocket/server/exist.xml b/reference/swoole/swoole/websocket/server/exist.xml
deleted file mode 100644
index 5f1ed84e3d2e..000000000000
--- a/reference/swoole/swoole/websocket/server/exist.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-websocket-server.exist" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\WebSocket\Server::exist</refname>
-  <refpurpose>Check if the file descriptor exists.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Swoole\WebSocket\Server::exist</methodname>
-   <methodparam><type>int</type><parameter>fd</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/websocket/server/on.xml b/reference/swoole/swoole/websocket/server/on.xml
deleted file mode 100644
index 4aa7063d05d2..000000000000
--- a/reference/swoole/swoole/websocket/server/on.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-websocket-server.on" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\WebSocket\Server::on</refname>
-  <refpurpose>Register event callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ReturnType</type><methodname>Swoole\WebSocket\Server::on</methodname>
-   <methodparam><type>string</type><parameter>event_name</parameter></methodparam>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Register event callback function
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>event_name</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/websocket/server/pack.xml b/reference/swoole/swoole/websocket/server/pack.xml
deleted file mode 100644
index fd3ab7481744..000000000000
--- a/reference/swoole/swoole/websocket/server/pack.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-websocket-server.pack" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\WebSocket\Server::pack</refname>
-  <refpurpose>Get a pack of binary data to send in a single frame.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>binary</type><methodname>Swoole\WebSocket\Server::pack</methodname>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>opcode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>finish</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>mask</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>opcode</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>finish</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mask</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/websocket/server/push.xml b/reference/swoole/swoole/websocket/server/push.xml
deleted file mode 100644
index a174649c8810..000000000000
--- a/reference/swoole/swoole/websocket/server/push.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-websocket-server.push" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\WebSocket\Server::push</refname>
-  <refpurpose>Push data to the remote client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Swoole\WebSocket\Server::push</methodname>
-   <methodparam><type>string</type><parameter>fd</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>opcode</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>finish</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fd</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>opcode</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>finish</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/swoole/websocket/server/unpack.xml b/reference/swoole/swoole/websocket/server/unpack.xml
deleted file mode 100644
index 4f36a78723f6..000000000000
--- a/reference/swoole/swoole/websocket/server/unpack.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="swoole-websocket-server.unpack" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Swoole\WebSocket\Server::unpack</refname>
-  <refpurpose>Unpack the binary data received from the client.</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>Swoole\WebSocket\Server::unpack</methodname>
-   <methodparam><type>binary</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/swoole/versions.xml b/reference/swoole/versions.xml
deleted file mode 100644
index 257c2e756658..000000000000
--- a/reference/swoole/versions.xml
+++ /dev/null
@@ -1,918 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='swoole_version' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_cpu_num' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_last_error' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_add' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_del' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_exit' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_wait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_event_defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_timer_after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_timer_tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_timer_exists' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_timer_clear' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_readfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_writefile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_async_dns_lookup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_client_select' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_select' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_set_process_name' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole_get_local_ip' from='PECL swoole &gt;= 1.9.0'/>
- <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'/>
- <function name='swoole\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\timer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::exists' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::clear' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\timer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::exists' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\timer::clear' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\event' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::add' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::del' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::exit' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::wait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::defer' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\event' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::add' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::del' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::exit' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::wait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\event::defer' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\async' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::readfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::writefile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::dnslookup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::set' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\async' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::readfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::writefile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::dnslookup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\async::set' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\connection\iterator' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::rewind' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::next' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::current' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::key' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::valid' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::count' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetexists' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetget' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetset' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetunset' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\connection\iterator' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::rewind' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::next' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::current' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::key' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::valid' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::count' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetexists' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetget' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetset' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\connection\iterator::offsetunset' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\exception' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__clone' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getcode' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getline' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::gettrace' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getprevious' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::gettraceasstring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__tostring' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\exception' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__clone' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getcode' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getline' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::gettrace' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::getprevious' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::gettraceasstring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\exception::__tostring' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\server\port' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\server\port' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\server\port::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\client' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::connect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::recv' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::pipe' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sleep' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::isconnected' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::getsockname' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::getpeername' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\client' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::connect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::recv' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::pipe' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::sleep' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::isconnected' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::getsockname' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::getpeername' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\client::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\coroutine\client' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::__destruct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::set' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::connect' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::recv' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::send' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::sendfile' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::sendto' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::isconnected' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::getsockname' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::getpeername' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::close' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine\client' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::__destruct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::set' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::connect' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::recv' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::send' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::sendfile' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::sendto' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::isconnected' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::getsockname' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::getpeername' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\client::close' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine\mysql' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::__destruct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::connect' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::query' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::recv' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::setdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::getdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql::close' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine\mysql\exception' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::__clone' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::__wakeup' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::getmessage' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::getcode' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::getfile' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::getline' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::gettrace' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::getprevious' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::gettraceasstring' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\mysql\exception::__tostring' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine\http\client' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::__destruct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::set' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setmethod' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setheaders' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setcookies' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setdata' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::execute' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::get' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::post' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::addfile' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::isconnected' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::close' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::getdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::recv' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine\http\client' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::__construct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::__destruct' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::set' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setmethod' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setheaders' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setcookies' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setdata' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::execute' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::get' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::post' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::addfile' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::isconnected' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::close' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::setdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::getdefer' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine\http\client::recv' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::create' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::cli_wait' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::suspend' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::resume' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::getuid' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::call_user_func' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::call_user_func_array' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\coroutine' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::create' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::cli_wait' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::suspend' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::resume' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::getuid' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::call_user_func' from='PECL swoole &gt;= 2.0.0'/>
- <function name='swoole\coroutine::call_user_func_array' from='PECL swoole &gt;= 2.0.0'/>
-
- <function name='swoole\http\client' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setmethod' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setheaders' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setcookies' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setdata' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::addfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::execute' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::post' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::upgrade' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::download' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::isconnected' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\client' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setmethod' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setheaders' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setcookies' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::setdata' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::addfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::execute' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::post' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::upgrade' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::download' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::isconnected' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\client::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\process' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::wait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::signal' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::alarm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::kill' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::daemon' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::usequeue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::statqueue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::freequeue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::pop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::exit' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::exec' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::name' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\process' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::wait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::signal' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::alarm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::kill' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::daemon' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::usequeue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::statqueue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::freequeue' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::pop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::exit' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::exec' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\process::name' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\table' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::column' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::create' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::destroy' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::count' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::del' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::incr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::decr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::rewind' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::next' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::current' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::key' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::valid' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\table' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::column' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::create' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::destroy' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::count' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::del' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::incr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::decr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::rewind' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::next' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::current' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::key' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\table::valid' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\lock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::lock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::trylock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::lock_read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::trylock_read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::unlock' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\lock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::lock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::trylock' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::lock_read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::trylock_read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\lock::unlock' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\atomic' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::add' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::sub' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::cmpset' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\atomic' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::add' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::sub' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::get' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\atomic::cmpset' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\response' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::initheader' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::cookie' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::rawcookie' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::status' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::gzip' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::header' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::end' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::__destruct' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\response' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::initheader' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::cookie' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::rawcookie' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::status' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::gzip' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::header' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::end' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\response::__destruct' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\request' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\request::rawcontent' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\request::__destruct' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\http\request' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\request::rawcontent' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\http\request::__destruct' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\buffer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__tostring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::substr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::append' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::expand' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::recycle' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::clear' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\buffer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::__tostring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::substr' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::write' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::read' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::append' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::expand' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::recycle' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\buffer::clear' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\websocket\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::pack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::unpack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\websocket\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::pack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::unpack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\websocket\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\websocket\frame' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\websocket\frame' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mysql' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::connect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::query' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::getbuffer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mysql' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::connect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::query' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::getbuffer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql::on' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mysql\exception' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__clone' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getcode' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getline' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::gettrace' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getprevious' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::gettraceasstring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__tostring' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mysql\exception' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__clone' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__wakeup' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getcode' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getline' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::gettrace' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::getprevious' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::gettraceasstring' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mysql\exception::__tostring' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\module' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\module' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mmap' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mmap::open' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\mmap' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\mmap::open' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\channel' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::pop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::stats' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\channel' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::__destruct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::push' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::pop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\channel::stats' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\serialize' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\serialize::pack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\serialize::unpack' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\serialize' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\serialize::pack' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\serialize::unpack' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\redis\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sethandler' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::format' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::bind' from='PECL swoole &gt;= 1.9.0'/>
-
- <function name='swoole\redis\server' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::start' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sethandler' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::format' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::__construct' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::listen' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::addlistener' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::on' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::set' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::send' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendto' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::exist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::protect' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendfile' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::close' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::confirm' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::pause' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::resume' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::task' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::taskwait' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::taskwaitmulti' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::finish' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::reload' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::shutdown' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::stop' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getlasterror' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::heartbeat' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::connection_info' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::connection_list' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getclientinfo' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::getclientlist' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::after' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::tick' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::cleartimer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::defer' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::sendmessage' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::addprocess' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::stats' from='PECL swoole &gt;= 1.9.0'/>
- <function name='swoole\redis\server::bind' from='PECL swoole &gt;= 1.9.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/sync/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/sync/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/sync/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/sync/book.xml b/reference/sync/book.xml
deleted file mode 100644
index 8b8f7109609c..000000000000
--- a/reference/sync/book.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="book.sync">
- <?phpdoc extension-membership="pecl" ?>
- <title>Sync</title>
- <titleabbrev>Sync</titleabbrev>
-
- <preface xml:id="intro.sync">
-  &reftitle.intro;
-  <simpara>
-   The <literal>sync</literal> extension introduces cross-platform synchronization objects into PHP.
-   Named and unnamed Mutex, Semaphore, Event, Reader-Writer, and named Shared Memory
-   objects provide OS-level synchronization on both POSIX (e.g. Linux) and Windows
-   platforms.
-  </simpara>
-  <simpara>
-   Automatic cleanup of acquired synchronization objects takes place during extension
-   teardown. This means that if PHP prematurely terminates a script (e.g. script
-   execution time is exceeded), objects will not be left in an unknown state.  The
-   only exception to this is if PHP itself crashes (e.g. an internal buffer overflow).
-  </simpara>
-  <simpara>
-   Unnamed synchronization objects don't have a lot of use outside of a multithreaded
-   scenario. Unnamed objects are more useful in conjunction with the pthreads PECL
-   extension.
-  </simpara>
-  <note>
-   <simpara>
-    Named objects require additional care to be used on all systems.
-    If an object is instantiated with a specific set of parameters, it must always
-    be instantiated with those parameters or the object will probably end up in an
-    inconsistent state until the next reboot or a system administrator cleans up
-    the mess.
-   </simpara>
-  </note>
- </preface>
-
- &reference.sync.setup;
- &reference.sync.syncmutex;
- &reference.sync.syncsemaphore;
- &reference.sync.syncevent;
- &reference.sync.syncreaderwriter;
- &reference.sync.syncsharedmemory;
-
-</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/sync/configure.xml b/reference/sync/configure.xml
deleted file mode 100644
index d41e6a028c00..000000000000
--- a/reference/sync/configure.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sync.installation">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;sync">&url.pecl.package;sync</link>
- </simpara>
-
-</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/sync/setup.xml b/reference/sync/setup.xml
deleted file mode 100644
index 095fcbba7060..000000000000
--- a/reference/sync/setup.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sync.setup">
- &reftitle.setup;
-
- <section xml:id="sync.requirements">
-  &reftitle.required;
-  <simpara>
-   A system with support for POSIX shared memory (shm_open()) or running Windows.
-  </simpara>
- </section>
-
- <section xml:id="sync.installation">
-  &reftitle.install;
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;sync">&url.pecl.package;sync</link>.
-  </simpara>
- </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/sync/syncevent.xml b/reference/sync/syncevent.xml
deleted file mode 100644
index 919efec427b3..000000000000
--- a/reference/sync/syncevent.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.syncevent" role="class">
-
- <title>The SyncEvent class</title>
- <titleabbrev>SyncEvent</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SyncEvent intro -->
-  <section xml:id="syncevent.intro">
-   &reftitle.intro;
-   <simpara>
-    A cross-platform, native implementation of named and unnamed event objects.
-    Both automatic and manual event objects are supported.
-   </simpara>
-   <simpara>
-    An event object waits, without polling, for the object to be fired/set.
-    One instance waits on the event object while another instance fires/sets
-    the event. Event objects are useful wherever a long-running process would
-    otherwise poll a resource (e.g. checking to see if uploaded data needs to
-    be processed).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="syncevent.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SyncEvent</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SyncEvent</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.syncevent')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sync.entities.syncevent;
-
-</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/sync/syncevent/construct.xml b/reference/sync/syncevent/construct.xml
deleted file mode 100644
index 666e91319c0a..000000000000
--- a/reference/sync/syncevent/construct.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncevent.construct">
- <refnamediv>
-  <refname>SyncEvent::__construct</refname>
-  <refpurpose>Constructs a new SyncEvent object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncEvent::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>manual</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>prefire</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a named or unnamed event object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the event if this is a named event object.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>manual</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies whether or not the event object must be reset manually.
-     </simpara>
-     <note>
-      <simpara>
-       Manual reset event objects allow all waiting processes through until the
-       object is reset.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>prefire</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies whether or not to prefire (signal) the event object.
-     </simpara>
-     <note>
-      <simpara>
-       Only has impact if the calling process/thread is the first to create the object.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new <classname>SyncEvent</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An exception is thrown if the event object cannot be created or opened.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncEvent::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// In a web application:
-$event = new SyncEvent("GetAppReport");
-$event->fire();
-
-// In a cron job:
-$event = new SyncEvent("GetAppReport");
-$event->wait();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL sync 1.1.0</entry>
-      <entry>
-       <simpara>
-        Added <parameter>prefire</parameter>.
-       </simpara>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncEvent::fire</methodname></member>
-   <member><methodname>SyncEvent::reset</methodname></member>
-   <member><methodname>SyncEvent::wait</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/sync/syncevent/fire.xml b/reference/sync/syncevent/fire.xml
deleted file mode 100644
index 21b487be125f..000000000000
--- a/reference/sync/syncevent/fire.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncevent.fire">
- <refnamediv>
-  <refname>SyncEvent::fire</refname>
-  <refpurpose>Fires/sets the event</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncEvent::fire</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   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;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncEvent::fire</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// In a web application:
-$event = new SyncEvent("GetAppReport");
-$event->fire();
-
-// In a cron job:
-$event = new SyncEvent("GetAppReport");
-$event->wait();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncEvent::reset</methodname></member>
-   <member><methodname>SyncEvent::wait</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/sync/syncevent/reset.xml b/reference/sync/syncevent/reset.xml
deleted file mode 100644
index 83cf874bca17..000000000000
--- a/reference/sync/syncevent/reset.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncevent.reset">
- <refnamediv>
-  <refname>SyncEvent::reset</refname>
-  <refpurpose>Resets a manual event</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncEvent::reset</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Resets a <classname>SyncEvent</classname> object that has been fired/set. Only valid for manual event objects.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncEvent::reset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// In a web application:
-$event = new SyncEvent("DemoApplication", true);
-$event->wait();
-
-// In a cron job:
-$event = new SyncEvent("DemoApplication", true);
-$event->reset();
-/* ... Do some maintenance task(s) ... */
-$event->fire();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncEvent::fire</methodname></member>
-   <member><methodname>SyncEvent::reset</methodname></member>
-   <member><methodname>SyncEvent::wait</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/sync/syncevent/wait.xml b/reference/sync/syncevent/wait.xml
deleted file mode 100644
index e3171251b868..000000000000
--- a/reference/sync/syncevent/wait.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncevent.wait">
- <refnamediv>
-  <refname>SyncEvent::wait</refname>
-  <refpurpose>Waits for the event to be fired/set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncEvent::wait</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Waits for the <classname>SyncEvent</classname> object to be fired.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>wait</parameter></term>
-    <listitem>
-     <simpara>
-      The number of milliseconds to wait for the event to be fired.
-      A value of -1 is infinite.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncEvent::wait</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// In a web application:
-$event = new SyncEvent("GetAppReport");
-$event->fire();
-
-// In a cron job:
-$event = new SyncEvent("GetAppReport");
-$event->wait();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncEvent::fire</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/sync/syncmutex.xml b/reference/sync/syncmutex.xml
deleted file mode 100644
index ac21d2ae424c..000000000000
--- a/reference/sync/syncmutex.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.syncmutex" role="class">
-
- <title>The SyncMutex class</title>
- <titleabbrev>SyncMutex</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SyncMutex intro -->
-  <section xml:id="syncmutex.intro">
-   &reftitle.intro;
-   <simpara>
-    A cross-platform, native implementation of named and unnamed countable mutex objects.
-   </simpara>
-   <simpara>
-    A mutex is a mutual exclusion object that restricts access to a shared resource (e.g. a file) to a single instance.
-    Countable mutexes acquire the mutex a single time and internally track the number of times the mutex is locked.
-    The mutex is unlocked as soon as it goes out of scope or is unlocked the same number of times that it was locked.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="syncmutex.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SyncMutex</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SyncMutex</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.syncmutex')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sync.entities.syncmutex;
-
-</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/sync/syncmutex/construct.xml b/reference/sync/syncmutex/construct.xml
deleted file mode 100644
index 5ff75c557117..000000000000
--- a/reference/sync/syncmutex/construct.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncmutex.construct">
- <refnamediv>
-  <refname>SyncMutex::__construct</refname>
-  <refpurpose>Constructs a new SyncMutex object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncMutex::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a named or unnamed countable mutex.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the mutex if this is a named mutex object.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new <classname>SyncMutex</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An exception is thrown if the mutex cannot be created or opened.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncMutex::__construct</function> named mutex with lock timeout example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mutex = new SyncMutex("UniqueName");
-
-if (!$mutex->lock(3000))
-{
-    echo "Unable to lock mutex.";
-
-    exit();
-}
-
-/* ... */
-
-$mutex->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>SyncMutex::__construct</function> unnamed mutex example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mutex = new SyncMutex();
-
-$mutex->lock();
-
-/* ... */
-
-$mutex->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncMutex::lock</methodname></member>
-   <member><methodname>SyncMutex::unlock</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/sync/syncmutex/lock.xml b/reference/sync/syncmutex/lock.xml
deleted file mode 100644
index 5a7791d2e03f..000000000000
--- a/reference/sync/syncmutex/lock.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncmutex.lock">
- <refnamediv>
-  <refname>SyncMutex::lock</refname>
-  <refpurpose>Waits for an exclusive lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncMutex::lock</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Obtains an exclusive lock on a <classname>SyncMutex</classname> object.
-   If the lock is already acquired, then this increments an internal counter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>wait</parameter></term>
-    <listitem>
-     <simpara>
-      The number of milliseconds to wait for the exclusive lock.
-      A value of -1 is infinite.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncMutex::lock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mutex = new SyncMutex("UniqueName");
-
-if (!$mutex->lock(3000))
-{
-    echo "Unable to lock mutex.";
-
-    exit();
-}
-
-/* ... */
-
-$mutex->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncMutex::unlock</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/sync/syncmutex/unlock.xml b/reference/sync/syncmutex/unlock.xml
deleted file mode 100644
index 75a5cd0f6527..000000000000
--- a/reference/sync/syncmutex/unlock.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncmutex.unlock">
- <refnamediv>
-  <refname>SyncMutex::unlock</refname>
-  <refpurpose>Unlocks the mutex</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncMutex::unlock</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>all</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decreases the internal counter of a <classname>SyncMutex</classname> object.
-   When the internal counter reaches zero, the actual lock on the object is released.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>all</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies whether or not to set the internal counter to zero and therefore release the lock.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncMutex::unlock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mutex = new SyncMutex("UniqueName");
-
-$mutex->lock();
-
-/* ... */
-
-$mutex->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncMutex::lock</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/sync/syncreaderwriter.xml b/reference/sync/syncreaderwriter.xml
deleted file mode 100644
index 551ebf5a744a..000000000000
--- a/reference/sync/syncreaderwriter.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.syncreaderwriter" role="class">
-
- <title>The SyncReaderWriter class</title>
- <titleabbrev>SyncReaderWriter</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SyncReaderWriter intro -->
-  <section xml:id="syncreaderwriter.intro">
-   &reftitle.intro;
-   <simpara>
-    A cross-platform, native implementation of named and unnamed reader-writer objects.
-   </simpara>
-   <simpara>
-    A reader-writer object allows many readers or one writer to access a resource.
-    This is an efficient solution for managing resources where access will primarily be
-    read-only but exclusive write access is occasionally necessary.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="syncreaderwriter.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SyncReaderWriter</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SyncReaderWriter</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.syncreaderwriter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sync.entities.syncreaderwriter;
-
-</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/sync/syncreaderwriter/construct.xml b/reference/sync/syncreaderwriter/construct.xml
deleted file mode 100644
index 8bc769e70cb4..000000000000
--- a/reference/sync/syncreaderwriter/construct.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncreaderwriter.construct">
- <refnamediv>
-  <refname>SyncReaderWriter::__construct</refname>
-  <refpurpose>Constructs a new SyncReaderWriter object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncReaderWriter::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>autounlock</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a named or unnamed reader-writer object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the reader-writer if this is a named reader-writer object.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-     <note>
-      <simpara>
-       On Windows, <parameter>name</parameter> must not contain backslashes.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>autounlock</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies whether or not to automatically unlock the reader-writer at the
-      conclusion of the PHP script.
-     </simpara>
-     <warning>
-      <simpara>
-       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.
-      </simpara>
-     </warning>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new <classname>SyncReaderWriter</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An exception is thrown if the reader-writer cannot be created or opened.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncReaderWriter::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$readwrite = new SyncReaderWriter("FileCacheLock");
-$readwrite->readlock();
-/* ... */
-$readwrite->readunlock();
-
-$readwrite->writelock();
-/* ... */
-$readwrite->writeunlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncReaderWriter::readlock</methodname></member>
-   <member><methodname>SyncReaderWriter::readunlock</methodname></member>
-   <member><methodname>SyncReaderWriter::writelock</methodname></member>
-   <member><methodname>SyncReaderWriter::writeunlock</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/sync/syncreaderwriter/readlock.xml b/reference/sync/syncreaderwriter/readlock.xml
deleted file mode 100644
index 8234bb6c27ef..000000000000
--- a/reference/sync/syncreaderwriter/readlock.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncreaderwriter.readlock">
- <refnamediv>
-  <refname>SyncReaderWriter::readlock</refname>
-  <refpurpose>Waits for a read lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncReaderWriter::readlock</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Obtains a read lock on a <classname>SyncReaderWriter</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>wait</parameter></term>
-    <listitem>
-     <simpara>
-      The number of milliseconds to wait for a lock.
-      A value of -1 is infinite.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncReaderWriter::readlock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$readwrite = new SyncReaderWriter("FileCacheLock");
-$readwrite->readlock();
-/* ... */
-$readwrite->readunlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncReaderWriter::readunlock</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/sync/syncreaderwriter/readunlock.xml b/reference/sync/syncreaderwriter/readunlock.xml
deleted file mode 100644
index 1095994da7e6..000000000000
--- a/reference/sync/syncreaderwriter/readunlock.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncreaderwriter.readunlock">
- <refnamediv>
-  <refname>SyncReaderWriter::readunlock</refname>
-  <refpurpose>Releases a read lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncReaderWriter::readunlock</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Releases a read lock on a <classname>SyncReaderWriter</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncReaderWriter::readunlock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$readwrite = new SyncReaderWriter("FileCacheLock");
-$readwrite->readlock();
-/* ... */
-$readwrite->readunlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncReaderWriter::readlock</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/sync/syncreaderwriter/writelock.xml b/reference/sync/syncreaderwriter/writelock.xml
deleted file mode 100644
index 212a54b9e3e6..000000000000
--- a/reference/sync/syncreaderwriter/writelock.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncreaderwriter.writelock">
- <refnamediv>
-  <refname>SyncReaderWriter::writelock</refname>
-  <refpurpose>Waits for an exclusive write lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncReaderWriter::writelock</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Obtains an exclusive write lock on a <classname>SyncReaderWriter</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>wait</parameter></term>
-    <listitem>
-     <simpara>
-      The number of milliseconds to wait for a lock.
-      A value of -1 is infinite.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncReaderWriter::writelock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$readwrite = new SyncReaderWriter("FileCacheLock");
-$readwrite->writelock();
-/* ... */
-$readwrite->writeunlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncReaderWriter::writeunlock</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/sync/syncreaderwriter/writeunlock.xml b/reference/sync/syncreaderwriter/writeunlock.xml
deleted file mode 100644
index b9fba06ec186..000000000000
--- a/reference/sync/syncreaderwriter/writeunlock.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncreaderwriter.writeunlock">
- <refnamediv>
-  <refname>SyncReaderWriter::writeunlock</refname>
-  <refpurpose>Releases a write lock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncReaderWriter::writeunlock</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Releases a write lock on a <classname>SyncReaderWriter</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncReaderWriter::writeunlock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$readwrite = new SyncReaderWriter("FileCacheLock");
-$readwrite->writelock();
-/* ... */
-$readwrite->writeunlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncReaderWriter::writelock</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/sync/syncsemaphore.xml b/reference/sync/syncsemaphore.xml
deleted file mode 100644
index 34a52c292848..000000000000
--- a/reference/sync/syncsemaphore.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.syncsemaphore" role="class">
-
- <title>The SyncSemaphore class</title>
- <titleabbrev>SyncSemaphore</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SyncSemaphore intro -->
-  <section xml:id="syncsemaphore.intro">
-   &reftitle.intro;
-   <simpara>
-    A cross-platform, native implementation of named and unnamed semaphore objects.
-   </simpara>
-   <simpara>
-    A semaphore restricts access to a limited resource to a limited number of instances.
-    Semaphores differ from mutexes in that they can allow more than one instance to
-    access a resource at one time while a mutex only allows one instance at a time.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="syncsemaphore.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SyncSemaphore</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SyncSemaphore</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.syncsemaphore')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sync.entities.syncsemaphore;
-
-</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/sync/syncsemaphore/construct.xml b/reference/sync/syncsemaphore/construct.xml
deleted file mode 100644
index baa6e5c46203..000000000000
--- a/reference/sync/syncsemaphore/construct.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsemaphore.construct">
- <refnamediv>
-  <refname>SyncSemaphore::__construct</refname>
-  <refpurpose>Constructs a new SyncSemaphore object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncSemaphore::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>initialval</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>autounlock</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a named or unnamed semaphore.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the semaphore if this is a named semaphore object.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>initialval</parameter></term>
-    <listitem>
-     <simpara>
-      The initial value of the semaphore. This is the number of locks that may be obtained.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>autounlock</parameter></term>
-    <listitem>
-     <simpara>
-      Specifies whether or not to automatically unlock the semaphore at the
-      conclusion of the PHP script.
-     </simpara>
-     <warning>
-      <simpara>
-       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.
-      </simpara>
-     </warning>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new <classname>SyncSemaphore</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An exception is thrown if the semaphore cannot be created or opened.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSemaphore::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$semaphore = new SyncSemaphore("LimitedResource_2clients", 2);
-
-if (!$semaphore->lock(3000))
-{
-    echo "Unable to lock semaphore.";
-
-    exit();
-}
-
-/* ... */
-
-$semaphore->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSemaphore::lock</methodname></member>
-   <member><methodname>SyncSemaphore::unlock</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/sync/syncsemaphore/lock.xml b/reference/sync/syncsemaphore/lock.xml
deleted file mode 100644
index fe4b9323b7ee..000000000000
--- a/reference/sync/syncsemaphore/lock.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsemaphore.lock">
- <refnamediv>
-  <refname>SyncSemaphore::lock</refname>
-  <refpurpose>Decreases the count of the semaphore or waits</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncSemaphore::lock</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>wait</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Decreases the count of a <classname>SyncSemaphore</classname> object or waits until the semaphore becomes non-zero.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>wait</parameter></term>
-    <listitem>
-     <simpara>
-      The number of milliseconds to wait for the semaphore.
-      A value of -1 is infinite.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSemaphore::lock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$semaphore = new SyncSemaphore("LimitedResource_2clients", 2);
-
-if (!$semaphore->lock(3000))
-{
-    echo "Unable to lock semaphore.";
-
-    exit();
-}
-
-/* ... */
-
-$semaphore->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSemaphore::unlock</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/sync/syncsemaphore/unlock.xml b/reference/sync/syncsemaphore/unlock.xml
deleted file mode 100644
index 57d4c178e830..000000000000
--- a/reference/sync/syncsemaphore/unlock.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsemaphore.unlock">
- <refnamediv>
-  <refname>SyncSemaphore::unlock</refname>
-  <refpurpose>Increases the count of the semaphore</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncSemaphore::unlock</methodname>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">prevcount</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Increases the count of a <classname>SyncSemaphore</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>prevcount</parameter></term>
-    <listitem>
-     <simpara>
-      Returns the previous count of the semaphore.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSemaphore::unlock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$semaphore = new SyncSemaphore("LimitedResource_2clients", 2);
-
-if (!$semaphore->lock(3000))
-{
-    echo "Unable to lock semaphore.";
-
-    exit();
-}
-
-/* ... */
-
-$semaphore->unlock();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSemaphore::lock</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/sync/syncsharedmemory.xml b/reference/sync/syncsharedmemory.xml
deleted file mode 100644
index 9c1442795234..000000000000
--- a/reference/sync/syncsharedmemory.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="class.syncsharedmemory" role="class">
-
- <title>The SyncSharedMemory class</title>
- <titleabbrev>SyncSharedMemory</titleabbrev>
-
- <partintro>
-
-<!-- {{{ SyncSharedMemory intro -->
-  <section xml:id="syncsharedmemory.intro">
-   &reftitle.intro;
-   <simpara>
-    A cross-platform, native, consistent implementation of named shared memory
-    objects.
-   </simpara>
-   <simpara>
-    Shared memory lets two separate processes communicate without the need for
-    complex pipes or sockets. There are several integer-based shared memory
-    implementations for PHP. Named shared memory is an alternative.
-   </simpara>
-   <simpara>
-    Synchronization objects (e.g. SyncMutex) are still required to protect most
-    uses of shared memory.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="syncsharedmemory.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>SyncSharedMemory</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>SyncSharedMemory</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.syncsharedmemory')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.sync.entities.syncsharedmemory;
-
-</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/sync/syncsharedmemory/construct.xml b/reference/sync/syncsharedmemory/construct.xml
deleted file mode 100644
index 37db997c993a..000000000000
--- a/reference/sync/syncsharedmemory/construct.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsharedmemory.construct">
- <refnamediv>
-  <refname>SyncSharedMemory::__construct</refname>
-  <refpurpose>Constructs a new SyncSharedMemory object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncSharedMemory::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Constructs a named shared memory object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the shared memory object.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <simpara>
-      The size, in bytes, of shared memory to reserve.
-     </simpara>
-     <note>
-      <simpara>
-       The amount of memory cannot be resized later.  Request sufficient storage up front.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The new <classname>SyncSharedMemory</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   An exception is thrown if the shared memory object cannot be created or opened.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSharedMemory::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// You will probably need to protect shared memory with other synchronization objects.
-// Shared memory goes away when the last reference to it disappears.
-$mem = new SyncSharedMemory("AppReportName", 1024);
-if ($mem->first())
-{
-    // Do first time initialization work here.
-}
-
-$result = $mem->write(json_encode(array("name" => "my_report.txt")));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSharedMemory::first</methodname></member>
-   <member><methodname>SyncSharedMemory::size</methodname></member>
-   <member><methodname>SyncSharedMemory::write</methodname></member>
-   <member><methodname>SyncSharedMemory::read</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/sync/syncsharedmemory/first.xml b/reference/sync/syncsharedmemory/first.xml
deleted file mode 100644
index 3ecfa36dbbc1..000000000000
--- a/reference/sync/syncsharedmemory/first.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsharedmemory.first">
- <refnamediv>
-  <refname>SyncSharedMemory::first</refname>
-  <refpurpose>Check to see if the object is the first instance system-wide of named shared memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>SyncSharedMemory::first</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the system-wide first instance status of a <classname>SyncSharedMemory</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.success;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSharedMemory::first</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mem = new SyncSharedMemory("AppReportName", 1024);
-if ($mem->first())
-{
-    // Do first time initialization work here.
-}
-
-var_dump($mem->first());
-
-$mem2 = new SyncSharedMemory("AppReportName", 1024);
-
-var_dump($mem2->first());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSharedMemory::write</methodname></member>
-   <member><methodname>SyncSharedMemory::read</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/sync/syncsharedmemory/read.xml b/reference/sync/syncsharedmemory/read.xml
deleted file mode 100644
index d745d76f9b82..000000000000
--- a/reference/sync/syncsharedmemory/read.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsharedmemory.read">
- <refnamediv>
-  <refname>SyncSharedMemory::read</refname>
-  <refpurpose>Copy data from named shared memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncSharedMemory::read</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>length</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Copies data from named shared memory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <simpara>
-      The start/offset, in bytes, to begin reading.
-     </simpara>
-     <note>
-      <simpara>
-       If the value is negative, the starting position will begin at the specified
-       number of bytes from the end of the shared memory segment.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>length</parameter></term>
-    <listitem>
-     <simpara>
-      The number of bytes to read.
-     </simpara>
-     <note>
-      <simpara>
-       If unspecified, reading will stop at the end of the shared memory segment.
-      </simpara>
-      <simpara>
-       If the value is negative, reading will stop the specified number of bytes
-       from the end of the shared memory segment.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A string containing the data read from shared memory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSharedMemory::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// You will probably need to protect shared memory with other synchronization objects.
-// Shared memory goes away when the last reference to it disappears.
-$mem = new SyncSharedMemory("AppReportName", 1024);
-if ($mem->first())
-{
-    // Do first time initialization work here.
-}
-
-$result = $mem->write("report.txt");
-
-$result = $mem->read(3, -4);
-var_dump($result);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "ort"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSharedMemory::__construct</methodname></member>
-   <member><methodname>SyncSharedMemory::first</methodname></member>
-   <member><methodname>SyncSharedMemory::write</methodname></member>
-   <member><methodname>SyncSharedMemory::read</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/sync/syncsharedmemory/size.xml b/reference/sync/syncsharedmemory/size.xml
deleted file mode 100644
index bdd7b70b71d0..000000000000
--- a/reference/sync/syncsharedmemory/size.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsharedmemory.size">
- <refnamediv>
-  <refname>SyncSharedMemory::size</refname>
-  <refpurpose>Returns the size of the named shared memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>SyncSharedMemory::size</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the shared memory size of a <classname>SyncSharedMemory</classname> object.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An integer containing the size of the shared memory. This will be the same size that was passed to the constructor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSharedMemory::size</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$mem = new SyncSharedMemory("AppReportName", 1024);
-var_dump($mem->size());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(1024)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSharedMemory::__construct</methodname></member>
-   <member><methodname>SyncSharedMemory::write</methodname></member>
-   <member><methodname>SyncSharedMemory::read</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/sync/syncsharedmemory/write.xml b/reference/sync/syncsharedmemory/write.xml
deleted file mode 100644
index 058a190f1ac7..000000000000
--- a/reference/sync/syncsharedmemory/write.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="syncsharedmemory.write">
- <refnamediv>
-  <refname>SyncSharedMemory::write</refname>
-  <refpurpose>Copy data to named shared memory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>SyncSharedMemory::write</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>string</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Copies data to named shared memory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <simpara>
-      The data to write to shared memory.
-     </simpara>
-     <note>
-      <simpara>
-       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.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <simpara>
-      The start/offset, in bytes, to begin writing.
-     </simpara>
-     <note>
-      <simpara>
-       If the value is negative, the starting position will begin at the specified
-       number of bytes from the end of the shared memory segment.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An integer containing the number of bytes written to shared memory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>SyncSharedMemory::write</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// You will probably need to protect shared memory with other synchronization objects.
-// Shared memory goes away when the last reference to it disappears.
-$mem = new SyncSharedMemory("AppReportName", 1024);
-if ($mem->first())
-{
-    // Do first time initialization work here.
-}
-
-$result = $mem->write("report.txt");
-var_dump($result);
-
-$result = $mem->write("report.txt", -3);
-var_dump($result);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(3)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>SyncSharedMemory::__construct</methodname></member>
-   <member><methodname>SyncSharedMemory::first</methodname></member>
-   <member><methodname>SyncSharedMemory::write</methodname></member>
-   <member><methodname>SyncSharedMemory::read</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/sync/versions.xml b/reference/sync/versions.xml
deleted file mode 100644
index 8dab271e52d9..000000000000
--- a/reference/sync/versions.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='syncmutex' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncmutex::__construct' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncmutex::lock' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncmutex::unlock' from='PECL sync &gt;= 1.0.0'/>
-
- <function name='syncsemaphore' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncsemaphore::__construct' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncsemaphore::lock' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncsemaphore::unlock' from='PECL sync &gt;= 1.0.0'/>
-
- <function name='syncevent' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncevent::__construct' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncevent::wait' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncevent::fire' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncevent::reset' from='PECL sync &gt;= 1.0.0'/>
-
- <function name='syncreaderwriter' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncreaderwriter::__construct' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncreaderwriter::readlock' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncreaderwriter::writelock' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncreaderwriter::readunlock' from='PECL sync &gt;= 1.0.0'/>
- <function name='syncreaderwriter::writeunlock' from='PECL sync &gt;= 1.0.0'/>
-
- <function name='syncsharedmemory' from='PECL sync &gt;= 1.1.0'/>
- <function name='syncsharedmemory::__construct' from='PECL sync &gt;= 1.1.0'/>
- <function name='syncsharedmemory::first' from='PECL sync &gt;= 1.1.0'/>
- <function name='syncsharedmemory::size' from='PECL sync &gt;= 1.1.0'/>
- <function name='syncsharedmemory::write' from='PECL sync &gt;= 1.1.0'/>
- <function name='syncsharedmemory::read' from='PECL sync &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/taint/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/taint/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/taint/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/taint/book.xml b/reference/taint/book.xml
deleted file mode 100644
index 74ead3a7848e..000000000000
--- a/reference/taint/book.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.taint">
-  &reftitle.intro;
-  <simpara>
-   Taint is an extension for detecting XSS code (tainted strings). It can
-   also be used to spot SQL injection, command injection, file path
-   injection and similar vulnerabilities.
-  </simpara>
-  <simpara>
-   When taint is enabled, strings received from user input —
-   <varname>$_GET</varname>, <varname>$_POST</varname> and
-   <varname>$_COOKIE</varname> — are marked as tainted at request startup,
-   and the mark is tracked through string operations. When a tainted
-   string reaches a dangerous sink (output, SQL query, shell command,
-   file path, ...), taint raises a warning pointing at that spot. See
-   <link linkend="taint.detail">Propagation and Checked Sinks</link> for
-   the complete lists.
-  </simpara>
-  <simpara>
-   Taint is a development and auditing tool, not a runtime defense: it
-   only reports possible problems and never blocks or alters data. It is
-   deliberately conservative and may over-report, so a clean run means
-   only "nothing taint could see", never "provably secure". Do not enable
-   it in production environments.
-  </simpara>
-  <example>
-   <title>Taint example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$a = trim($_GET['a']);
-
-$file_name = '/tmp/' . $a;
-$output    = "Welcome, {$a} !!!";
-$sql       = "SELECT * FROM users WHERE name = " . $a;
-
-echo $output;
-print $output;
-include $file_name;
-mysqli_query($link, $sql);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Warning: main() [echo]: Attempt to echo a string that might be tainted in /path/to/script.php on line 9
-
-Warning: main() [print]: Attempt to print a string that might be tainted in /path/to/script.php on line 10
-
-Warning: main() [include]: File path contains data that might be tainted in /path/to/script.php on line 11
-
-Warning: main() [mysqli_query]: SQL statement contains data that might be tainted in /path/to/script.php on line 12
-]]>
-   </screen>
-  </example>
- </preface>
-
- &reference.taint.setup;
- &reference.taint.detail;
- &reference.taint.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/taint/configure.xml b/reference/taint/configure.xml
deleted file mode 100644
index fe737e0327a0..000000000000
--- a/reference/taint/configure.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="taint.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;taint">&url.pecl.package;taint</link>.
- </simpara>
-
- <simpara>
-  Install it with <acronym>PECL</acronym>:
- </simpara>
- <para>
-  <screen>
-<![CDATA[
-$ pecl install taint
-]]>
-  </screen>
- </para>
-
- <para>
-  The source code is hosted on
-  <link xlink:href="&url.git.hub;laruence/taint">GitHub</link>. To build the
-  extension from source:
-  <screen>
-<![CDATA[
-$ git clone https://github.com/laruence/taint.git
-$ cd taint
-$ phpize
-$ ./configure
-$ make
-$ sudo make install
-]]>
-  </screen>
- </para>
-
- <simpara>
-  Then enable the extension by adding
-  <literal>extension=taint.so</literal> (or <literal>extension=php_taint.dll</literal>
-  on Windows) to &php.ini;, and set
-  <link linkend="ini.taint.enable">taint.enable</link> to
-  <literal>1</literal>.
- </simpara>
-
- <warning>
-  <simpara>
-   Taint is a development and auditing tool. Do not enable it in
-   production environments: the instrumentation slows every request down
-   and disables the OPcache JIT, and the warnings may leak request data
-   into logs.
-  </simpara>
- </warning>
-</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/taint/detail.xml b/reference/taint/detail.xml
deleted file mode 100644
index 1c2cc8e0fb45..000000000000
--- a/reference/taint/detail.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="taint.detail" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Propagation and Checked Sinks</title>
-
- <section xml:id="taint.detail.basic">
-  <title>How the taint mark is propagated</title>
-  <simpara>
-   The taint mark is a single bit stored on the string itself, not on the
-   variable holding it. Assigning, passing or otherwise sharing a tainted
-   string keeps the mark. String concatenation and interpolation propagate
-   it as well:
-  </simpara>
-  <para>
-   <table>
-    <title>Operators which propagate the taint mark</title>
-    <tgroup cols="1">
-     <tbody>
-      <row>
-       <entry><literal>=</literal> (assignment, including <literal>list()</literal>/<literal>array destructuring</literal>)</entry>
-      </row>
-      <row>
-       <entry><literal>.</literal> (concatenation)</entry>
-      </row>
-      <row>
-       <entry><literal>.=</literal> (concatenating assignment)</entry>
-      </row>
-      <row>
-       <entry><literal>"{$var}"</literal> (string interpolation, including the <literal>ROPE</literal> fast path)</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <simpara>
-   In addition, taint understands a fixed set of string functions: when any
-   of the relevant string arguments is tainted, the returned string is
-   marked tainted too. Both the regular call and, on PHP 8.4+, the
-   frameless fast-path call are covered.
-  </simpara>
-  <para>
-   <table>
-    <title>Functions which propagate the taint mark</title>
-    <tgroup cols="1">
-     <tbody>
-      <row>
-       <entry><function>trim</function>, <function>rtrim</function>, <function>ltrim</function></entry>
-      </row>
-      <row>
-       <entry><function>substr</function>, <function>strstr</function></entry>
-      </row>
-      <row>
-       <entry><function>str_replace</function>, <function>str_ireplace</function></entry>
-      </row>
-      <row>
-       <entry><function>str_pad</function>, <function>strtolower</function>, <function>strtoupper</function>, <function>strval</function></entry>
-      </row>
-      <row>
-       <entry><function>explode</function> (every element of the resulting array)</entry>
-      </row>
-      <row>
-       <entry><function>implode</function>/<function>join</function> (a tainted separator taints the result as well)</entry>
-      </row>
-      <row>
-       <entry><function>sprintf</function>, <function>vsprintf</function> (only the <literal>%s</literal> specifier carries the mark; <literal>sprintf("%d", $t)</literal> returns a clean string)</entry>
-      </row>
-      <row>
-       <entry><function>dirname</function>, <function>basename</function>, <function>pathinfo</function></entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <simpara>
-   Any function taint does not explicitly understand returns a fresh,
-   unmarked string — including escaping helpers such as
-   <function>htmlspecialchars</function>, <function>htmlentities</function> or
-   <function>mysqli_real_escape_string</function>. This is deliberate: taint
-   over-reports rather than trying to decide whether a value is
-   <quote>safe</quote> for a particular output context. Use
-   <function>untaint</function> to clear the mark on values you have validated
-   yourself.
-  </simpara>
- </section>
-
- <section xml:id="taint.detail.sinks">
-  <title>Where taint raises warnings</title>
-  <simpara>
-   When a tainted string reaches one of the sinks below, taint raises a
-   warning (by default an <constant>E_USER_WARNING</constant>; the level is
-   configurable via <link linkend="ini.taint.error-level">taint.error_level</link>).
-   Only top-level string arguments are inspected; dumping an array that
-   merely contains tainted values does not warn.
-  </simpara>
-  <para>
-   <table>
-    <title>Output sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><literal>echo</literal>, <literal>print</literal></entry>
-       <entry>the echoed/printed expression</entry>
-      </row>
-      <row>
-       <entry><function>printf</function>, <function>vprintf</function></entry>
-       <entry>the format string and the substituted values</entry>
-      </row>
-      <row>
-       <entry><function>print_r</function>, <function>var_dump</function>, <function>var_export</function></entry>
-       <entry>the value being dumped, when it is a string</entry>
-      </row>
-      <row>
-       <entry><literal>exit</literal>/<literal>die</literal> with a message</entry>
-       <entry>the message</entry>
-      </row>
-      <row>
-       <entry><function>file_put_contents</function>, <function>fwrite</function>, <function>fputs</function> to <literal>php://output</literal></entry>
-       <entry>the data being written</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   <table>
-    <title>Filesystem sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><function>fopen</function>, <function>opendir</function>, <function>unlink</function></entry>
-       <entry>the path</entry>
-      </row>
-      <row>
-       <entry><function>file</function>, <function>readfile</function>, <function>file_get_contents</function>, <function>highlight_file</function>/<function>show_source</function></entry>
-       <entry>the path</entry>
-      </row>
-      <row>
-       <entry><function>copy</function>, <function>rename</function>, <function>move_uploaded_file</function></entry>
-       <entry>both the source and destination paths</entry>
-      </row>
-      <row>
-       <entry><function>mkdir</function>, <function>rmdir</function>, <function>touch</function></entry>
-       <entry>the path</entry>
-      </row>
-      <row>
-       <entry><literal>include</literal>, <literal>include_once</literal>, <literal>require</literal>, <literal>require_once</literal></entry>
-       <entry>the file path</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   <table>
-    <title>SQL sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><function>mysqli_query</function>, <function>mysqli_prepare</function>, <function>mysqli_real_query</function>, <function>mysqli_multi_query</function></entry>
-       <entry>the query string</entry>
-      </row>
-      <row>
-       <entry><function>mysql_query</function>, <function>sqlite_query</function>, <function>sqlite_single_query</function>, <function>oci_parse</function>, <function>pg_query</function>, <function>pg_send_query</function></entry>
-       <entry>the query string</entry>
-      </row>
-      <row>
-       <entry><methodname>mysqli::query</methodname>, <methodname>mysqli::prepare</methodname>, <methodname>mysqli::real_query</methodname>, <methodname>mysqli::multi_query</methodname></entry>
-       <entry>the query string</entry>
-      </row>
-      <row>
-       <entry><methodname>PDO::query</methodname>, <methodname>PDO::prepare</methodname>, <methodname>PDO::exec</methodname></entry>
-       <entry>the query string</entry>
-      </row>
-      <row>
-       <entry><methodname>SQLite3::query</methodname>, <methodname>SQLite3::prepare</methodname>, <methodname>SQLite3::exec</methodname>, <methodname>SQLiteDatabase::query</methodname>, <methodname>SQLiteDatabase::singleQuery</methodname></entry>
-       <entry>the query string</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   <table>
-    <title>Command execution sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><function>exec</function>, <function>system</function>, <function>passthru</function>, <function>shell_exec</function> (including the backtick operator)</entry>
-       <entry>the command string</entry>
-      </row>
-      <row>
-       <entry><function>proc_open</function>, <function>popen</function></entry>
-       <entry>the command string</entry>
-      </row>
-      <row>
-       <entry><literal>eval</literal></entry>
-       <entry>the evaluated code</entry>
-      </row>
-      <row>
-       <entry>dynamic calls such as <literal>$func()</literal>, <literal>$obj-&gt;$method()</literal>, <function>call_user_func</function>, array callables</entry>
-       <entry>the function/method/class name being resolved</entry>
-      </row>
-      <row>
-       <entry><function>preg_match</function>, <function>preg_match_all</function>, <function>preg_replace</function>, <function>preg_split</function>, <function>preg_grep</function>, <function>preg_replace_callback</function></entry>
-       <entry>the pattern (and the callback name for <function>preg_replace_callback</function>)</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   <table>
-    <title>Header and cookie sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><function>header</function></entry>
-       <entry>the header string</entry>
-      </row>
-      <row>
-       <entry><function>setcookie</function>, <function>setrawcookie</function></entry>
-       <entry>the cookie name and value</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <para>
-   <table>
-    <title>Other sinks</title>
-    <tgroup cols="2">
-     <thead>
-      <row><entry>Sink</entry><entry>Checked</entry></row>
-     </thead>
-     <tbody>
-      <row>
-       <entry><function>unserialize</function></entry>
-       <entry>the serialized string</entry>
-      </row>
-      <row>
-       <entry><function>mail</function></entry>
-       <entry>to, subject, additional parameters and additional headers (the message body is content and is not checked)</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
-  <simpara>
-   Warnings follow the format
-   <literal>function_name() [sink]: message</literal>, where
-   <literal>sink</literal> identifies the checked operation (for example
-   <literal>echo</literal>, <literal>include</literal> or the function name) and
-   the message describes what was found to be possibly tainted.
-  </simpara>
- </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/taint/functions/is-tainted.xml b/reference/taint/functions/is-tainted.xml
deleted file mode 100644
index 9f6ec527df31..000000000000
--- a/reference/taint/functions/is-tainted.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.is-tainted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>is_tainted</refname>
-  <refpurpose>Check whether a string is tainted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>is_tainted</methodname>
-   <methodparam><type>string</type><parameter>string</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks whether the given value carries the taint mark. Only strings can
-   ever be tainted; any other type returns &false;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <simpara>
-      The value to check.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if the value is a tainted string, &false; otherwise.
-   Always returns &false; when
-   <link linkend="ini.taint.enable">taint.enable</link> is off.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>is_tainted</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$name = $_GET['name'] ?? 'world';
-var_dump(is_tainted($name));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>taint</function></member>
-    <member><function>untaint</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/taint/functions/taint.xml b/reference/taint/functions/taint.xml
deleted file mode 100644
index cce73f9728df..000000000000
--- a/reference/taint/functions/taint.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.taint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>taint</refname>
-  <refpurpose>Mark strings as tainted</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>taint</methodname>
-   <methodparam><type>string</type><parameter role="reference">string</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter role="reference">strings</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Manually marks the given strings as tainted, as if they had arrived
-   from user input. The variables are passed by reference, but the mark
-   itself is stored on the string rather than on the variable: every
-   variable sharing the same string becomes tainted at once.
-  </simpara>
-  <simpara>
-   This is mainly useful for testing, and for simulating user input in
-   CLI scripts where the <link linkend="reserved.variables.get">$_GET</link>,
-   <link linkend="reserved.variables.post">$_POST</link> and
-   <link linkend="reserved.variables.cookies">$_COOKIE</link>
-   superglobals are not populated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <simpara>
-      A variable holding the string to mark.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>strings</parameter></term>
-    <listitem>
-     <simpara>
-      Further variables to mark.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;. When
-   <link linkend="ini.taint.enable">taint.enable</link> is off, the
-   function does nothing and still returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>taint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$name = "world";
-taint($name);
-var_dump(is_tainted($name));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Only non-empty strings are marked; variables holding other types, or
-    empty strings, are silently ignored.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    Interned, persistent and permanent strings (string literals, opcache
-    shared strings) can never carry the mark and are silently skipped.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>untaint</function></member>
-    <member><function>is_tainted</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/taint/functions/untaint.xml b/reference/taint/functions/untaint.xml
deleted file mode 100644
index 27b14560fe67..000000000000
--- a/reference/taint/functions/untaint.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.untaint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>untaint</refname>
-  <refpurpose>Remove the taint mark from strings</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>untaint</methodname>
-   <methodparam><type>string</type><parameter role="reference">string</parameter></methodparam>
-   <methodparam rep="repeat"><type>string</type><parameter role="reference">strings</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Clears the taint mark on the given strings.
-  </simpara>
-  <simpara>
-   The mark is stored on the string itself, not on the variable, so this
-   clears it for every variable sharing the same string at once. Use it to
-   whitelist values you have validated yourself, for example after a strict
-   allow-list check.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>string</parameter></term>
-    <listitem>
-     <simpara>
-      A variable holding the string to clean.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>strings</parameter></term>
-    <listitem>
-     <simpara>
-      Further variables to clean.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Always returns &true;. When
-   <link linkend="ini.taint.enable">taint.enable</link> is off, the
-   function does nothing and still returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>untaint</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$id = "42";
-taint($id);
-if (preg_match('/^\d+$/', $id)) {
-    // strictly validated as digits: safe to trust
-    untaint($id);
-}
-var_dump(is_tainted($id));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <simpara>
-    Only string values can carry the mark; passing a non-string is a
-    no-op.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>taint</function></member>
-    <member><function>is_tainted</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/taint/ini.xml b/reference/taint/ini.xml
deleted file mode 100644
index 8e2b3824e1f0..000000000000
--- a/reference/taint/ini.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="taint.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Taint &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.taint.enable">taint.enable</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.taint.error-level">taint.error_level</link></entry>
-      <entry>512 (E_USER_WARNING)</entry>
-      <entry><constant>INI_ALL</constant></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.taint.enable">
-     <term>
-      <parameter>taint.enable</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <simpara>
-       Master switch. When enabled, taint hooks the executor and marks
-       strings from <varname>$_GET</varname>, <varname>$_POST</varname> and
-       <varname>$_COOKIE</varname> as tainted at request startup.
-      </simpara>
-      <simpara>
-       This is an &php.ini;-only directive: enabling it requires a process
-       restart, so it cannot be toggled per request or per directory.
-      </simpara>
-      <note>
-       <simpara>
-        Do not enable this directive in production environments: the
-        instrumentation slows every request down and is incompatible with
-        the OPcache JIT.
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.taint.error-level">
-     <term>
-      <parameter>taint.error_level</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       The error level used when taint reports a possibly tainted string.
-       Defaults to <constant>E_USER_WARNING</constant> (512).
-      </simpara>
-      <simpara>
-       Because this directive is <constant>INI_ALL</constant>, it can be
-       changed at runtime. For example, to silence taint warnings for the
-       current script:
-      </simpara>
-      <para>
-       <programlisting role="php">
-<![CDATA[
-<?php
-ini_set('taint.error_level', 0);
-?>
-]]>
-       </programlisting>
-      </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/taint/reference.xml b/reference/taint/reference.xml
deleted file mode 100644
index 1c818daa5122..000000000000
--- a/reference/taint/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.taint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Taint &Functions;</title>
-
- &reference.taint.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/taint/setup.xml b/reference/taint/setup.xml
deleted file mode 100644
index e754cedd9ea4..000000000000
--- a/reference/taint/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="taint.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="taint.requirements">
-  &reftitle.required;
-  <simpara>
-   Taint 3.x requires PHP 8.0 or newer. For PHP 7.x use the taint 2.1.x
-   releases, and for PHP 5.x the taint 1.x releases.
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- &reference.taint.configure;
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.taint.ini;
- <!-- }}} -->
-
- <section xml:id="taint.resources">
-  &reftitle.resources;
-  <simpara>
-   Taint defines no resource types. The taint mark itself is stored in the
-   internal <literal>zend_string</literal> structure, not in a user-visible
-   resource.
-  </simpara>
- </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/taint/versions.xml b/reference/taint/versions.xml
deleted file mode 100644
index 2ece4f6ffe07..000000000000
--- a/reference/taint/versions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='taint' from='PECL taint &gt;=0.1.0'/>
- <function name='untaint' from='PECL taint &gt;=0.1.0'/>
- <function name='is_tainted' from='PECL taint &gt;=0.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/tcpwrap/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/tcpwrap/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/tcpwrap/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/tcpwrap/book.xml b/reference/tcpwrap/book.xml
deleted file mode 100644
index 1b31f4c36f33..000000000000
--- a/reference/tcpwrap/book.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.tcpwrap">
-  &reftitle.intro;
-  <para>
-   The TCP wrappers provides a classical Unix mechanism which has been
-   designed to check if the remote client is able to connect from the given IP
-   address.
-  </para>
- </preface>
- <!-- }}} -->
-
- &reference.tcpwrap.setup;
- &reference.tcpwrap.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/tcpwrap/configure.xml b/reference/tcpwrap/configure.xml
deleted file mode 100644
index d2ef476ec6d4..000000000000
--- a/reference/tcpwrap/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="tcpwrap.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;tcpwrap">&url.pecl.package;tcpwrap</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/tcpwrap/functions/tcpwrap-check.xml b/reference/tcpwrap/functions/tcpwrap-check.xml
deleted file mode 100644
index 14f3669e646f..000000000000
--- a/reference/tcpwrap/functions/tcpwrap-check.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.tcpwrap-check" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>tcpwrap_check</refname>
-  <refpurpose>Performs a tcpwrap check</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>tcpwrap_check</methodname>
-   <methodparam><type>string</type><parameter>daemon</parameter></methodparam>
-   <methodparam><type>string</type><parameter>address</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>user</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>nodns</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function consults the <filename>/etc/hosts.allow</filename> and 
-   <filename>/etc/hosts.deny</filename> files to check if access to service 
-   <parameter>daemon</parameter> should be granted or denied for a client.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>daemon</parameter></term>
-     <listitem>
-      <para>
-       The service name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>address</parameter></term>
-     <listitem>
-      <para>
-       The client remote address. Can be either an IP address or a domain name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>user</parameter></term>
-     <listitem>
-      <para>
-       An optional user name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>nodns</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>address</parameter> looks like domain name then DNS is 
-       used to resolve it to IP address; set <parameter>nodns</parameter> to 
-       &true; to avoid this.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This function returns &true; if access should be granted, &false; otherwise.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Deny all connections from localhost</title>
-   <para>
-    If your <filename>/etc/hosts.deny</filename> file contains:
-   </para>
-   <screen>
-<![CDATA[
-php: 127.0.0.1
-]]>
-   </screen>
-   <para>
-    And your code looks like:
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if (!tcpwrap_check('php', $_SERVER['REMOTE_ADDR'])) {
-  die('You are not welcome here');
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   For more details please consult hosts_access(3) man page.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/tcpwrap/reference.xml b/reference/tcpwrap/reference.xml
deleted file mode 100644
index eeae41c61ce5..000000000000
--- a/reference/tcpwrap/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.tcpwrap" xmlns="http://docbook.org/ns/docbook">
- <title>TCP &Functions;</title>
-
- &reference.tcpwrap.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/tcpwrap/setup.xml b/reference/tcpwrap/setup.xml
deleted file mode 100644
index 91b75ef13900..000000000000
--- a/reference/tcpwrap/setup.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="tcpwrap.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- &reference.tcpwrap.configure;
- <!-- }}} -->
-
-</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/tcpwrap/versions.xml b/reference/tcpwrap/versions.xml
deleted file mode 100644
index 7aad56180867..000000000000
--- a/reference/tcpwrap/versions.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='tcpwrap_check' from='PECL tcpwrap &gt;= 0.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/trader/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/trader/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/trader/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/trader/book.xml b/reference/trader/book.xml
deleted file mode 100644
index cf6538d96ccd..000000000000
--- a/reference/trader/book.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.trader">
-  &reftitle.intro;
-  <para>
-   The trader extension is a free open source stock library based on TA-Lib. It's dedicated to trading software developers requiring to perform technical analysis of financial market data. Alongside many indicators like ADX, MACD, RSI, Stochastic, TRIX the candlestick pattern recognition and several vector arithmetic and algebraic functions are present.
-  </para>
-  <para>
-   Calculations can be done in two modes - TA-Lib and Metastock. Changing it using <link xmlns="http://docbook.org/ns/docbook" linkend="function.trader-set-compat">trader_set_compat()</link> will affect the way some trader functions work.
-  </para>
-  <para>
-  Some trader functions provide different results depending of the &quot;starting point&quot; of the data being involved. This is often referred as a function having memories. An example of such function is the Exponential Moving Average. It is possible to control the unstable period (the amount of data to strip off) using <link xmlns="http://docbook.org/ns/docbook" linkend="function.trader-set-unstable-period">trader_set_unstable_period()</link> function.
-  </para>
-  <para>
-   Extended documentation about indicators, formulas and implementations in other programming languages can be found under <link xlink:href="&url.trader.lib;">&url.trader.lib;</link>.
-  </para>
- </preface>
-
- &reference.trader.setup;
- &reference.trader.constants;
- <!-- &reference.trader.examples; -->
- &reference.trader.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/trader/configure.xml b/reference/trader/configure.xml
deleted file mode 100644
index e6b68662c2fe..000000000000
--- a/reference/trader/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="trader.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;trader">&url.pecl.package;trader</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/trader/constants.xml b/reference/trader/constants.xml
deleted file mode 100644
index a7ec666c3755..000000000000
--- a/reference/trader/constants.xml
+++ /dev/null
@@ -1,602 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="trader.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.trader-ma-type-sma">
-    <term>
-     <constant>TRADER_MA_TYPE_SMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-ema">
-    <term>
-     <constant>TRADER_MA_TYPE_EMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-wma">
-    <term>
-     <constant>TRADER_MA_TYPE_WMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-dema">
-    <term>
-     <constant>TRADER_MA_TYPE_DEMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-tema">
-    <term>
-     <constant>TRADER_MA_TYPE_TEMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-trima">
-    <term>
-     <constant>TRADER_MA_TYPE_TRIMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-kama">
-    <term>
-     <constant>TRADER_MA_TYPE_KAMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-mama">
-    <term>
-     <constant>TRADER_MA_TYPE_MAMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-ma-type-t3">
-    <term>
-     <constant>TRADER_MA_TYPE_T3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-real-min">
-    <term>
-     <constant>TRADER_REAL_MIN</constant>
-     (<type>float</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-real-max">
-    <term>
-     <constant>TRADER_REAL_MAX</constant>
-     (<type>float</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-adx">
-    <term>
-     <constant>TRADER_FUNC_UNST_ADX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-adxr">
-    <term>
-     <constant>TRADER_FUNC_UNST_ADXR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-atr">
-    <term>
-     <constant>TRADER_FUNC_UNST_ATR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-cmo">
-    <term>
-     <constant>TRADER_FUNC_UNST_CMO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-dx">
-    <term>
-     <constant>TRADER_FUNC_UNST_DX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ema">
-    <term>
-     <constant>TRADER_FUNC_UNST_EMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-dcperiod">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_DCPERIOD</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-dcphase">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_DCPHASE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-phasor">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_PHASOR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-sine">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_SINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-trendline">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_TRENDLINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-ht-trendmode">
-    <term>
-     <constant>TRADER_FUNC_UNST_HT_TRENDMODE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-kama">
-    <term>
-     <constant>TRADER_FUNC_UNST_KAMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-mama">
-    <term>
-     <constant>TRADER_FUNC_UNST_MAMA</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-mfi">
-    <term>
-     <constant>TRADER_FUNC_UNST_MFI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-minus-di">
-    <term>
-     <constant>TRADER_FUNC_UNST_MINUS_DI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-minus-dm">
-    <term>
-     <constant>TRADER_FUNC_UNST_MINUS_DM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-natr">
-    <term>
-     <constant>TRADER_FUNC_UNST_NATR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-plus-di">
-    <term>
-     <constant>TRADER_FUNC_UNST_PLUS_DI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-plus-dm">
-    <term>
-     <constant>TRADER_FUNC_UNST_PLUS_DM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-rsi">
-    <term>
-     <constant>TRADER_FUNC_UNST_RSI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-stochrsi">
-    <term>
-     <constant>TRADER_FUNC_UNST_STOCHRSI</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-t3">
-    <term>
-     <constant>TRADER_FUNC_UNST_T3</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-all">
-    <term>
-     <constant>TRADER_FUNC_UNST_ALL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-func-unst-none">
-    <term>
-     <constant>TRADER_FUNC_UNST_NONE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-compatibility-default">
-    <term>
-     <constant>TRADER_COMPATIBILITY_DEFAULT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-compatibility-metastock">
-    <term>
-     <constant>TRADER_COMPATIBILITY_METASTOCK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-success">
-    <term>
-     <constant>TRADER_ERR_SUCCESS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-lib-not-initialize">
-    <term>
-     <constant>TRADER_ERR_LIB_NOT_INITIALIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-bad-param">
-    <term>
-     <constant>TRADER_ERR_BAD_PARAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-alloc-err">
-    <term>
-     <constant>TRADER_ERR_ALLOC_ERR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-group-not-found">
-    <term>
-     <constant>TRADER_ERR_GROUP_NOT_FOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-func-not-found">
-    <term>
-     <constant>TRADER_ERR_FUNC_NOT_FOUND</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-invalid-handle">
-    <term>
-     <constant>TRADER_ERR_INVALID_HANDLE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-invalid-param-holder">
-    <term>
-     <constant>TRADER_ERR_INVALID_PARAM_HOLDER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-invalid-param-holder-type">
-    <term>
-     <constant>TRADER_ERR_INVALID_PARAM_HOLDER_TYPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-invalid-param-function">
-    <term>
-     <constant>TRADER_ERR_INVALID_PARAM_FUNCTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-input-not-all-initialize">
-    <term>
-     <constant>TRADER_ERR_INPUT_NOT_ALL_INITIALIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-output-not-all-initialize">
-    <term>
-     <constant>TRADER_ERR_OUTPUT_NOT_ALL_INITIALIZE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-out-of-range-start-index">
-    <term>
-     <constant>TRADER_ERR_OUT_OF_RANGE_START_INDEX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-out-of-range-end-index">
-    <term>
-     <constant>TRADER_ERR_OUT_OF_RANGE_END_INDEX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-invalid-list-type">
-    <term>
-     <constant>TRADER_ERR_INVALID_LIST_TYPE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-bad-object">
-    <term>
-     <constant>TRADER_ERR_BAD_OBJECT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-not-supported">
-    <term>
-     <constant>TRADER_ERR_NOT_SUPPORTED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-internal-error">
-    <term>
-     <constant>TRADER_ERR_INTERNAL_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.trader-err-unknown-error">
-    <term>
-     <constant>TRADER_ERR_UNKNOWN_ERROR</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/trader/functions/trader-acos.xml b/reference/trader/functions/trader-acos.xml
deleted file mode 100644
index bacee78ccd24..000000000000
--- a/reference/trader/functions/trader-acos.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-acos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_acos</refname>
-  <refpurpose>Vector Trigonometric ACos</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_acos</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the arc cosine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ad.xml b/reference/trader/functions/trader-ad.xml
deleted file mode 100644
index bcfd4fdd50f3..000000000000
--- a/reference/trader/functions/trader-ad.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ad" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ad</refname>
-  <refpurpose>Chaikin A/D Line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ad</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam><type>array</type><parameter>volume</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>volume</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.volume;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-add.xml b/reference/trader/functions/trader-add.xml
deleted file mode 100644
index 6cb48fd0f02d..000000000000
--- a/reference/trader/functions/trader-add.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_add</refname>
-  <refpurpose>Vector Arithmetic Add</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_add</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the vector addition of <parameter>real0</parameter> to
-   <parameter>real1</parameter> and returns the resulting vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-adosc.xml b/reference/trader/functions/trader-adosc.xml
deleted file mode 100644
index c490998c5ea8..000000000000
--- a/reference/trader/functions/trader-adosc.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-adosc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_adosc</refname>
-  <refpurpose>Chaikin A/D Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_adosc</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam><type>array</type><parameter>volume</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowPeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>volume</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.volume;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-adx.xml b/reference/trader/functions/trader-adx.xml
deleted file mode 100644
index fc3acd73c184..000000000000
--- a/reference/trader/functions/trader-adx.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-adx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_adx</refname>
-  <refpurpose>Average Directional Movement Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_adx</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-adxr.xml b/reference/trader/functions/trader-adxr.xml
deleted file mode 100644
index 8260d0965908..000000000000
--- a/reference/trader/functions/trader-adxr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-adxr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_adxr</refname>
-  <refpurpose>Average Directional Movement Index Rating</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_adxr</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-apo.xml b/reference/trader/functions/trader-apo.xml
deleted file mode 100644
index af3071fc8792..000000000000
--- a/reference/trader/functions/trader-apo.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-apo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_apo</refname>
-  <refpurpose>Absolute Price Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_apo</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-aroon.xml b/reference/trader/functions/trader-aroon.xml
deleted file mode 100644
index 7aa1702a6896..000000000000
--- a/reference/trader/functions/trader-aroon.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-aroon" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_aroon</refname>
-  <refpurpose>Aroon</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_aroon</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-aroonosc.xml b/reference/trader/functions/trader-aroonosc.xml
deleted file mode 100644
index 353920bbeafd..000000000000
--- a/reference/trader/functions/trader-aroonosc.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-aroonosc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_aroonosc</refname>
-  <refpurpose>Aroon Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_aroonosc</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-asin.xml b/reference/trader/functions/trader-asin.xml
deleted file mode 100644
index fc3a5d0d3ce9..000000000000
--- a/reference/trader/functions/trader-asin.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-asin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_asin</refname>
-  <refpurpose>Vector Trigonometric ASin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_asin</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the arc sine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-atan.xml b/reference/trader/functions/trader-atan.xml
deleted file mode 100644
index 7f8323b728ba..000000000000
--- a/reference/trader/functions/trader-atan.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-atan" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_atan</refname>
-  <refpurpose>Vector Trigonometric ATan</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_atan</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the arc tangent for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-atr.xml b/reference/trader/functions/trader-atr.xml
deleted file mode 100644
index b7051da7575c..000000000000
--- a/reference/trader/functions/trader-atr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-atr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_atr</refname>
-  <refpurpose>Average True Range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_atr</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-avgprice.xml b/reference/trader/functions/trader-avgprice.xml
deleted file mode 100644
index 1233f68a2a69..000000000000
--- a/reference/trader/functions/trader-avgprice.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-avgprice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_avgprice</refname>
-  <refpurpose>Average Price</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_avgprice</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-bbands.xml b/reference/trader/functions/trader-bbands.xml
deleted file mode 100644
index 08274f21822c..000000000000
--- a/reference/trader/functions/trader-bbands.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-bbands" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_bbands</refname>
-  <refpurpose>Bollinger Bands</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_bbands</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>nbDevUp</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>nbDevDn</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nbDevUp</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.nbdevup;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nbDevDn</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.nbdevdn;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-beta.xml b/reference/trader/functions/trader-beta.xml
deleted file mode 100644
index 1882bd894eaa..000000000000
--- a/reference/trader/functions/trader-beta.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-beta" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_beta</refname>
-  <refpurpose>Beta</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_beta</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-bop.xml b/reference/trader/functions/trader-bop.xml
deleted file mode 100644
index af873106c7bc..000000000000
--- a/reference/trader/functions/trader-bop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-bop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_bop</refname>
-  <refpurpose>Balance Of Power</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_bop</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cci.xml b/reference/trader/functions/trader-cci.xml
deleted file mode 100644
index 48ce0dc57081..000000000000
--- a/reference/trader/functions/trader-cci.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cci" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cci</refname>
-  <refpurpose>Commodity Channel Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cci</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl2crows.xml b/reference/trader/functions/trader-cdl2crows.xml
deleted file mode 100644
index bc2f350bed6e..000000000000
--- a/reference/trader/functions/trader-cdl2crows.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl2crows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl2crows</refname>
-  <refpurpose>Two Crows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl2crows</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3blackcrows.xml b/reference/trader/functions/trader-cdl3blackcrows.xml
deleted file mode 100644
index 8645eb7e1859..000000000000
--- a/reference/trader/functions/trader-cdl3blackcrows.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3blackcrows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3blackcrows</refname>
-  <refpurpose>Three Black Crows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3blackcrows</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3inside.xml b/reference/trader/functions/trader-cdl3inside.xml
deleted file mode 100644
index d14260eaf148..000000000000
--- a/reference/trader/functions/trader-cdl3inside.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3inside" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3inside</refname>
-  <refpurpose>Three Inside Up/Down</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3inside</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3linestrike.xml b/reference/trader/functions/trader-cdl3linestrike.xml
deleted file mode 100644
index e5dc18263efc..000000000000
--- a/reference/trader/functions/trader-cdl3linestrike.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3linestrike" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3linestrike</refname>
-  <refpurpose>Three-Line Strike</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3linestrike</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3outside.xml b/reference/trader/functions/trader-cdl3outside.xml
deleted file mode 100644
index ca4ea91bd707..000000000000
--- a/reference/trader/functions/trader-cdl3outside.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3outside" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3outside</refname>
-  <refpurpose>Three Outside Up/Down</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3outside</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3starsinsouth.xml b/reference/trader/functions/trader-cdl3starsinsouth.xml
deleted file mode 100644
index 39ce3b2dd630..000000000000
--- a/reference/trader/functions/trader-cdl3starsinsouth.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3starsinsouth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3starsinsouth</refname>
-  <refpurpose>Three Stars In The South</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3starsinsouth</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdl3whitesoldiers.xml b/reference/trader/functions/trader-cdl3whitesoldiers.xml
deleted file mode 100644
index 3a171b6a36ef..000000000000
--- a/reference/trader/functions/trader-cdl3whitesoldiers.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdl3whitesoldiers" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdl3whitesoldiers</refname>
-  <refpurpose>Three Advancing White Soldiers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdl3whitesoldiers</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlabandonedbaby.xml b/reference/trader/functions/trader-cdlabandonedbaby.xml
deleted file mode 100644
index e67b1539cb7e..000000000000
--- a/reference/trader/functions/trader-cdlabandonedbaby.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlabandonedbaby" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlabandonedbaby</refname>
-  <refpurpose>Abandoned Baby</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlabandonedbaby</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdladvanceblock.xml b/reference/trader/functions/trader-cdladvanceblock.xml
deleted file mode 100644
index f79f83218254..000000000000
--- a/reference/trader/functions/trader-cdladvanceblock.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdladvanceblock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdladvanceblock</refname>
-  <refpurpose>Advance Block</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdladvanceblock</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlbelthold.xml b/reference/trader/functions/trader-cdlbelthold.xml
deleted file mode 100644
index 73ec15629503..000000000000
--- a/reference/trader/functions/trader-cdlbelthold.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlbelthold" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlbelthold</refname>
-  <refpurpose>Belt-hold</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlbelthold</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlbreakaway.xml b/reference/trader/functions/trader-cdlbreakaway.xml
deleted file mode 100644
index d87f1d7c500e..000000000000
--- a/reference/trader/functions/trader-cdlbreakaway.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlbreakaway" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlbreakaway</refname>
-  <refpurpose>Breakaway</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlbreakaway</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlclosingmarubozu.xml b/reference/trader/functions/trader-cdlclosingmarubozu.xml
deleted file mode 100644
index 0bc0a33980b2..000000000000
--- a/reference/trader/functions/trader-cdlclosingmarubozu.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlclosingmarubozu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlclosingmarubozu</refname>
-  <refpurpose>Closing Marubozu</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlclosingmarubozu</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlconcealbabyswall.xml b/reference/trader/functions/trader-cdlconcealbabyswall.xml
deleted file mode 100644
index abe73f65911c..000000000000
--- a/reference/trader/functions/trader-cdlconcealbabyswall.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlconcealbabyswall" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlconcealbabyswall</refname>
-  <refpurpose>Concealing Baby Swallow</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlconcealbabyswall</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlcounterattack.xml b/reference/trader/functions/trader-cdlcounterattack.xml
deleted file mode 100644
index ef75296537fe..000000000000
--- a/reference/trader/functions/trader-cdlcounterattack.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlcounterattack" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlcounterattack</refname>
-  <refpurpose>Counterattack</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlcounterattack</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdldarkcloudcover.xml b/reference/trader/functions/trader-cdldarkcloudcover.xml
deleted file mode 100644
index 58cda82a79cf..000000000000
--- a/reference/trader/functions/trader-cdldarkcloudcover.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdldarkcloudcover" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdldarkcloudcover</refname>
-  <refpurpose>Dark Cloud Cover</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdldarkcloudcover</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdldoji.xml b/reference/trader/functions/trader-cdldoji.xml
deleted file mode 100644
index f66841a8d8b7..000000000000
--- a/reference/trader/functions/trader-cdldoji.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdldoji" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdldoji</refname>
-  <refpurpose>Doji</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdldoji</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdldojistar.xml b/reference/trader/functions/trader-cdldojistar.xml
deleted file mode 100644
index ae133149c50f..000000000000
--- a/reference/trader/functions/trader-cdldojistar.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdldojistar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdldojistar</refname>
-  <refpurpose>Doji Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdldojistar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdldragonflydoji.xml b/reference/trader/functions/trader-cdldragonflydoji.xml
deleted file mode 100644
index 9484bfb999e3..000000000000
--- a/reference/trader/functions/trader-cdldragonflydoji.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdldragonflydoji" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdldragonflydoji</refname>
-  <refpurpose>Dragonfly Doji</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdldragonflydoji</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlengulfing.xml b/reference/trader/functions/trader-cdlengulfing.xml
deleted file mode 100644
index 75d35ac62907..000000000000
--- a/reference/trader/functions/trader-cdlengulfing.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlengulfing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlengulfing</refname>
-  <refpurpose>Engulfing Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlengulfing</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdleveningdojistar.xml b/reference/trader/functions/trader-cdleveningdojistar.xml
deleted file mode 100644
index aaf73002a669..000000000000
--- a/reference/trader/functions/trader-cdleveningdojistar.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdleveningdojistar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdleveningdojistar</refname>
-  <refpurpose>Evening Doji Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdleveningdojistar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdleveningstar.xml b/reference/trader/functions/trader-cdleveningstar.xml
deleted file mode 100644
index 2d7d1046053b..000000000000
--- a/reference/trader/functions/trader-cdleveningstar.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdleveningstar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdleveningstar</refname>
-  <refpurpose>Evening Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdleveningstar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlgapsidesidewhite.xml b/reference/trader/functions/trader-cdlgapsidesidewhite.xml
deleted file mode 100644
index edfc1216ad51..000000000000
--- a/reference/trader/functions/trader-cdlgapsidesidewhite.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlgapsidesidewhite" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlgapsidesidewhite</refname>
-  <refpurpose>Up/Down-gap side-by-side white lines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlgapsidesidewhite</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlgravestonedoji.xml b/reference/trader/functions/trader-cdlgravestonedoji.xml
deleted file mode 100644
index ade8b0b5959f..000000000000
--- a/reference/trader/functions/trader-cdlgravestonedoji.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlgravestonedoji" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlgravestonedoji</refname>
-  <refpurpose>Gravestone Doji</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlgravestonedoji</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhammer.xml b/reference/trader/functions/trader-cdlhammer.xml
deleted file mode 100644
index 2bc4cd8b4c6b..000000000000
--- a/reference/trader/functions/trader-cdlhammer.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhammer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhammer</refname>
-  <refpurpose>Hammer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhammer</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhangingman.xml b/reference/trader/functions/trader-cdlhangingman.xml
deleted file mode 100644
index 52233e2128a3..000000000000
--- a/reference/trader/functions/trader-cdlhangingman.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhangingman" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhangingman</refname>
-  <refpurpose>Hanging Man</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhangingman</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlharami.xml b/reference/trader/functions/trader-cdlharami.xml
deleted file mode 100644
index bd6e3ed3f9a1..000000000000
--- a/reference/trader/functions/trader-cdlharami.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlharami" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlharami</refname>
-  <refpurpose>Harami Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlharami</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlharamicross.xml b/reference/trader/functions/trader-cdlharamicross.xml
deleted file mode 100644
index b171fa0efe6e..000000000000
--- a/reference/trader/functions/trader-cdlharamicross.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlharamicross" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlharamicross</refname>
-  <refpurpose>Harami Cross Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlharamicross</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhighwave.xml b/reference/trader/functions/trader-cdlhighwave.xml
deleted file mode 100644
index ff36abba0da0..000000000000
--- a/reference/trader/functions/trader-cdlhighwave.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhighwave" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhighwave</refname>
-  <refpurpose>High-Wave Candle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhighwave</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhikkake.xml b/reference/trader/functions/trader-cdlhikkake.xml
deleted file mode 100644
index 926772637f7b..000000000000
--- a/reference/trader/functions/trader-cdlhikkake.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhikkake" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhikkake</refname>
-  <refpurpose>Hikkake Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhikkake</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhikkakemod.xml b/reference/trader/functions/trader-cdlhikkakemod.xml
deleted file mode 100644
index 55d1398a646c..000000000000
--- a/reference/trader/functions/trader-cdlhikkakemod.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhikkakemod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhikkakemod</refname>
-  <refpurpose>Modified Hikkake Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhikkakemod</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlhomingpigeon.xml b/reference/trader/functions/trader-cdlhomingpigeon.xml
deleted file mode 100644
index cd21c519b33c..000000000000
--- a/reference/trader/functions/trader-cdlhomingpigeon.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlhomingpigeon" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlhomingpigeon</refname>
-  <refpurpose>Homing Pigeon</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlhomingpigeon</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlidentical3crows.xml b/reference/trader/functions/trader-cdlidentical3crows.xml
deleted file mode 100644
index 584b8cbdf673..000000000000
--- a/reference/trader/functions/trader-cdlidentical3crows.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlidentical3crows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlidentical3crows</refname>
-  <refpurpose>Identical Three Crows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlidentical3crows</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlinneck.xml b/reference/trader/functions/trader-cdlinneck.xml
deleted file mode 100644
index e17ae3705e8a..000000000000
--- a/reference/trader/functions/trader-cdlinneck.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlinneck" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlinneck</refname>
-  <refpurpose>In-Neck Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlinneck</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlinvertedhammer.xml b/reference/trader/functions/trader-cdlinvertedhammer.xml
deleted file mode 100644
index f287f51d2f62..000000000000
--- a/reference/trader/functions/trader-cdlinvertedhammer.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlinvertedhammer" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlinvertedhammer</refname>
-  <refpurpose>Inverted Hammer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlinvertedhammer</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlkicking.xml b/reference/trader/functions/trader-cdlkicking.xml
deleted file mode 100644
index 574f33338c4f..000000000000
--- a/reference/trader/functions/trader-cdlkicking.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlkicking" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlkicking</refname>
-  <refpurpose>Kicking</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlkicking</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlkickingbylength.xml b/reference/trader/functions/trader-cdlkickingbylength.xml
deleted file mode 100644
index 5c445be7a8df..000000000000
--- a/reference/trader/functions/trader-cdlkickingbylength.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlkickingbylength" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlkickingbylength</refname>
-  <refpurpose>Kicking - bull/bear determined by the longer marubozu</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlkickingbylength</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlladderbottom.xml b/reference/trader/functions/trader-cdlladderbottom.xml
deleted file mode 100644
index e926abd550ca..000000000000
--- a/reference/trader/functions/trader-cdlladderbottom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlladderbottom" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlladderbottom</refname>
-  <refpurpose>Ladder Bottom</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlladderbottom</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdllongleggeddoji.xml b/reference/trader/functions/trader-cdllongleggeddoji.xml
deleted file mode 100644
index 763eaf7c8483..000000000000
--- a/reference/trader/functions/trader-cdllongleggeddoji.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdllongleggeddoji" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdllongleggeddoji</refname>
-  <refpurpose>Long Legged Doji</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdllongleggeddoji</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdllongline.xml b/reference/trader/functions/trader-cdllongline.xml
deleted file mode 100644
index 44f95bdb7f00..000000000000
--- a/reference/trader/functions/trader-cdllongline.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdllongline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdllongline</refname>
-  <refpurpose>Long Line Candle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdllongline</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlmarubozu.xml b/reference/trader/functions/trader-cdlmarubozu.xml
deleted file mode 100644
index 54178ecca55b..000000000000
--- a/reference/trader/functions/trader-cdlmarubozu.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlmarubozu" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlmarubozu</refname>
-  <refpurpose>Marubozu</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlmarubozu</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlmatchinglow.xml b/reference/trader/functions/trader-cdlmatchinglow.xml
deleted file mode 100644
index 4aad7898350a..000000000000
--- a/reference/trader/functions/trader-cdlmatchinglow.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlmatchinglow" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlmatchinglow</refname>
-  <refpurpose>Matching Low</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlmatchinglow</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlmathold.xml b/reference/trader/functions/trader-cdlmathold.xml
deleted file mode 100644
index 3fa20a2cb532..000000000000
--- a/reference/trader/functions/trader-cdlmathold.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlmathold" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlmathold</refname>
-  <refpurpose>Mat Hold</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlmathold</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlmorningdojistar.xml b/reference/trader/functions/trader-cdlmorningdojistar.xml
deleted file mode 100644
index d730ce517742..000000000000
--- a/reference/trader/functions/trader-cdlmorningdojistar.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlmorningdojistar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlmorningdojistar</refname>
-  <refpurpose>Morning Doji Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlmorningdojistar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlmorningstar.xml b/reference/trader/functions/trader-cdlmorningstar.xml
deleted file mode 100644
index 4d2859feadf3..000000000000
--- a/reference/trader/functions/trader-cdlmorningstar.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlmorningstar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlmorningstar</refname>
-  <refpurpose>Morning Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlmorningstar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>penetration</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>penetration</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.penetration;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlonneck.xml b/reference/trader/functions/trader-cdlonneck.xml
deleted file mode 100644
index 6cbb6376ba7b..000000000000
--- a/reference/trader/functions/trader-cdlonneck.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlonneck" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlonneck</refname>
-  <refpurpose>On-Neck Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlonneck</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlpiercing.xml b/reference/trader/functions/trader-cdlpiercing.xml
deleted file mode 100644
index 5805177dcaec..000000000000
--- a/reference/trader/functions/trader-cdlpiercing.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlpiercing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlpiercing</refname>
-  <refpurpose>Piercing Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlpiercing</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlrickshawman.xml b/reference/trader/functions/trader-cdlrickshawman.xml
deleted file mode 100644
index 7a53148ec065..000000000000
--- a/reference/trader/functions/trader-cdlrickshawman.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlrickshawman" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlrickshawman</refname>
-  <refpurpose>Rickshaw Man</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlrickshawman</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlrisefall3methods.xml b/reference/trader/functions/trader-cdlrisefall3methods.xml
deleted file mode 100644
index 3c6b570eb8b1..000000000000
--- a/reference/trader/functions/trader-cdlrisefall3methods.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlrisefall3methods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlrisefall3methods</refname>
-  <refpurpose>Rising/Falling Three Methods</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlrisefall3methods</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlseparatinglines.xml b/reference/trader/functions/trader-cdlseparatinglines.xml
deleted file mode 100644
index 386075fb44bb..000000000000
--- a/reference/trader/functions/trader-cdlseparatinglines.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlseparatinglines" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlseparatinglines</refname>
-  <refpurpose>Separating Lines</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlseparatinglines</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlshootingstar.xml b/reference/trader/functions/trader-cdlshootingstar.xml
deleted file mode 100644
index 9496a2cbf701..000000000000
--- a/reference/trader/functions/trader-cdlshootingstar.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlshootingstar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlshootingstar</refname>
-  <refpurpose>Shooting Star</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlshootingstar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlshortline.xml b/reference/trader/functions/trader-cdlshortline.xml
deleted file mode 100644
index 6cd1fd1c8131..000000000000
--- a/reference/trader/functions/trader-cdlshortline.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlshortline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlshortline</refname>
-  <refpurpose>Short Line Candle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlshortline</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlspinningtop.xml b/reference/trader/functions/trader-cdlspinningtop.xml
deleted file mode 100644
index 0da1ef5bceaa..000000000000
--- a/reference/trader/functions/trader-cdlspinningtop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlspinningtop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlspinningtop</refname>
-  <refpurpose>Spinning Top</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlspinningtop</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlstalledpattern.xml b/reference/trader/functions/trader-cdlstalledpattern.xml
deleted file mode 100644
index b2b3b88973c6..000000000000
--- a/reference/trader/functions/trader-cdlstalledpattern.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlstalledpattern" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlstalledpattern</refname>
-  <refpurpose>Stalled Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlstalledpattern</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlsticksandwich.xml b/reference/trader/functions/trader-cdlsticksandwich.xml
deleted file mode 100644
index c10168725dc3..000000000000
--- a/reference/trader/functions/trader-cdlsticksandwich.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlsticksandwich" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlsticksandwich</refname>
-  <refpurpose>Stick Sandwich</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlsticksandwich</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdltakuri.xml b/reference/trader/functions/trader-cdltakuri.xml
deleted file mode 100644
index 775da73f7714..000000000000
--- a/reference/trader/functions/trader-cdltakuri.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdltakuri" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdltakuri</refname>
-  <refpurpose>Takuri (Dragonfly Doji with very long lower shadow)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdltakuri</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdltasukigap.xml b/reference/trader/functions/trader-cdltasukigap.xml
deleted file mode 100644
index 3406811ab29e..000000000000
--- a/reference/trader/functions/trader-cdltasukigap.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdltasukigap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdltasukigap</refname>
-  <refpurpose>Tasuki Gap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdltasukigap</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlthrusting.xml b/reference/trader/functions/trader-cdlthrusting.xml
deleted file mode 100644
index 843d05e12704..000000000000
--- a/reference/trader/functions/trader-cdlthrusting.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlthrusting" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlthrusting</refname>
-  <refpurpose>Thrusting Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlthrusting</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdltristar.xml b/reference/trader/functions/trader-cdltristar.xml
deleted file mode 100644
index 1c7c121cbf57..000000000000
--- a/reference/trader/functions/trader-cdltristar.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdltristar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdltristar</refname>
-  <refpurpose>Tristar Pattern</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdltristar</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlunique3river.xml b/reference/trader/functions/trader-cdlunique3river.xml
deleted file mode 100644
index fbe8cc7d156c..000000000000
--- a/reference/trader/functions/trader-cdlunique3river.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlunique3river" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlunique3river</refname>
-  <refpurpose>Unique 3 River</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlunique3river</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlupsidegap2crows.xml b/reference/trader/functions/trader-cdlupsidegap2crows.xml
deleted file mode 100644
index 9917d41e2c46..000000000000
--- a/reference/trader/functions/trader-cdlupsidegap2crows.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlupsidegap2crows" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlupsidegap2crows</refname>
-  <refpurpose>Upside Gap Two Crows</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlupsidegap2crows</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cdlxsidegap3methods.xml b/reference/trader/functions/trader-cdlxsidegap3methods.xml
deleted file mode 100644
index 83093c09bff6..000000000000
--- a/reference/trader/functions/trader-cdlxsidegap3methods.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cdlxsidegap3methods" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cdlxsidegap3methods</refname>
-  <refpurpose>Upside/Downside Gap Three Methods</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cdlxsidegap3methods</methodname>
-   <methodparam><type>array</type><parameter>open</parameter></methodparam>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>open</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.open;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ceil.xml b/reference/trader/functions/trader-ceil.xml
deleted file mode 100644
index 4da33e05b32b..000000000000
--- a/reference/trader/functions/trader-ceil.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ceil" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ceil</refname>
-  <refpurpose>Vector Ceil</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ceil</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the next highest integer for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cmo.xml b/reference/trader/functions/trader-cmo.xml
deleted file mode 100644
index 165d3849930d..000000000000
--- a/reference/trader/functions/trader-cmo.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cmo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cmo</refname>
-  <refpurpose>Chande Momentum Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cmo</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-correl.xml b/reference/trader/functions/trader-correl.xml
deleted file mode 100644
index a719766719c8..000000000000
--- a/reference/trader/functions/trader-correl.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-correl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_correl</refname>
-  <refpurpose>Pearson's Correlation Coefficient (r)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_correl</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cos.xml b/reference/trader/functions/trader-cos.xml
deleted file mode 100644
index cc447f949e91..000000000000
--- a/reference/trader/functions/trader-cos.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cos" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cos</refname>
-  <refpurpose>Vector Trigonometric Cos</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cos</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the cosine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-cosh.xml b/reference/trader/functions/trader-cosh.xml
deleted file mode 100644
index 73c310cdcbad..000000000000
--- a/reference/trader/functions/trader-cosh.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-cosh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_cosh</refname>
-  <refpurpose>Vector Trigonometric Cosh</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_cosh</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the hyperbolic cosine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-dema.xml b/reference/trader/functions/trader-dema.xml
deleted file mode 100644
index 52126d451d48..000000000000
--- a/reference/trader/functions/trader-dema.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-dema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_dema</refname>
-  <refpurpose>Double Exponential Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_dema</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-div.xml b/reference/trader/functions/trader-div.xml
deleted file mode 100644
index 43c7b2f5538e..000000000000
--- a/reference/trader/functions/trader-div.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-div" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_div</refname>
-  <refpurpose>Vector Arithmetic Div</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_div</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Divides each value from <parameter>real0</parameter> by the corresponding
-   value from <parameter>real1</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-dx.xml b/reference/trader/functions/trader-dx.xml
deleted file mode 100644
index 99a10c481594..000000000000
--- a/reference/trader/functions/trader-dx.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-dx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_dx</refname>
-  <refpurpose>Directional Movement Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_dx</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ema.xml b/reference/trader/functions/trader-ema.xml
deleted file mode 100644
index c9aa231c5d4d..000000000000
--- a/reference/trader/functions/trader-ema.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ema</refname>
-  <refpurpose>Exponential Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ema</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-errno.xml b/reference/trader/functions/trader-errno.xml
deleted file mode 100644
index e1cfc4da3ce4..000000000000
--- a/reference/trader/functions/trader-errno.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-  <refpurpose>Get error code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>trader_errno</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/trader-exp.xml b/reference/trader/functions/trader-exp.xml
deleted file mode 100644
index 186e1fec8dd1..000000000000
--- a/reference/trader/functions/trader-exp.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-exp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_exp</refname>
-  <refpurpose>Vector Arithmetic Exp</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_exp</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates <constant>e</constant> raised to the power of each value in <parameter>real</parameter>. Returns an array with the calculated data.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-floor.xml b/reference/trader/functions/trader-floor.xml
deleted file mode 100644
index 0ae61f3632bf..000000000000
--- a/reference/trader/functions/trader-floor.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-floor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_floor</refname>
-  <refpurpose>Vector Floor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_floor</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the next lowest integer for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-get-compat.xml b/reference/trader/functions/trader-get-compat.xml
deleted file mode 100644
index 05512ee73a0b..000000000000
--- a/reference/trader/functions/trader-get-compat.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
-  <refpurpose>Get compatibility mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>trader_get_compat</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-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/functions/trader-get-unstable-period.xml b/reference/trader/functions/trader-get-unstable-period.xml
deleted file mode 100644
index e71f9c420aad..000000000000
--- a/reference/trader/functions/trader-get-unstable-period.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-get-unstable-period" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_get_unstable_period</refname>
-  <refpurpose>Get unstable period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>trader_get_unstable_period</methodname>
-   <methodparam><type>int</type><parameter>functionId</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Get unstable period factor for a particular function.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>functionId</parameter></term>
-    <listitem>
-     <para>
-      Function ID the factor to be read for. <link xmlns="http://docbook.org/ns/docbook" linkend="trader.constants">TRADER_FUNC_UNST_*</link> series of constants should be used.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns the unstable period factor for the corresponding 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/trader/functions/trader-ht-dcperiod.xml b/reference/trader/functions/trader-ht-dcperiod.xml
deleted file mode 100644
index 86e5efef5aae..000000000000
--- a/reference/trader/functions/trader-ht-dcperiod.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-dcperiod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_dcperiod</refname>
-  <refpurpose>Hilbert Transform - Dominant Cycle Period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_dcperiod</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ht-dcphase.xml b/reference/trader/functions/trader-ht-dcphase.xml
deleted file mode 100644
index af700e60fa62..000000000000
--- a/reference/trader/functions/trader-ht-dcphase.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-dcphase" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_dcphase</refname>
-  <refpurpose>Hilbert Transform - Dominant Cycle Phase</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_dcphase</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ht-phasor.xml b/reference/trader/functions/trader-ht-phasor.xml
deleted file mode 100644
index 8c22813be893..000000000000
--- a/reference/trader/functions/trader-ht-phasor.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-phasor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_phasor</refname>
-  <refpurpose>Hilbert Transform - Phasor Components</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_phasor</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ht-sine.xml b/reference/trader/functions/trader-ht-sine.xml
deleted file mode 100644
index eff84c895392..000000000000
--- a/reference/trader/functions/trader-ht-sine.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-sine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_sine</refname>
-  <refpurpose>Hilbert Transform - SineWave</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_sine</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ht-trendline.xml b/reference/trader/functions/trader-ht-trendline.xml
deleted file mode 100644
index b2fb4120aab7..000000000000
--- a/reference/trader/functions/trader-ht-trendline.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-trendline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_trendline</refname>
-  <refpurpose>Hilbert Transform - Instantaneous Trendline</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_trendline</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ht-trendmode.xml b/reference/trader/functions/trader-ht-trendmode.xml
deleted file mode 100644
index 22d17939caa1..000000000000
--- a/reference/trader/functions/trader-ht-trendmode.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ht-trendmode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ht_trendmode</refname>
-  <refpurpose>Hilbert Transform - Trend vs Cycle Mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ht_trendmode</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-kama.xml b/reference/trader/functions/trader-kama.xml
deleted file mode 100644
index 38a10b0c110a..000000000000
--- a/reference/trader/functions/trader-kama.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-kama" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_kama</refname>
-  <refpurpose>Kaufman Adaptive Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_kama</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-linearreg-angle.xml b/reference/trader/functions/trader-linearreg-angle.xml
deleted file mode 100644
index 766fb62fad92..000000000000
--- a/reference/trader/functions/trader-linearreg-angle.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-linearreg-angle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_linearreg_angle</refname>
-  <refpurpose>Linear Regression Angle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_linearreg_angle</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-linearreg-intercept.xml b/reference/trader/functions/trader-linearreg-intercept.xml
deleted file mode 100644
index 7c4b07876e22..000000000000
--- a/reference/trader/functions/trader-linearreg-intercept.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-linearreg-intercept" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_linearreg_intercept</refname>
-  <refpurpose>Linear Regression Intercept</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_linearreg_intercept</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-linearreg-slope.xml b/reference/trader/functions/trader-linearreg-slope.xml
deleted file mode 100644
index 5e0e361e0016..000000000000
--- a/reference/trader/functions/trader-linearreg-slope.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-linearreg-slope" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_linearreg_slope</refname>
-  <refpurpose>Linear Regression Slope</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_linearreg_slope</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-linearreg.xml b/reference/trader/functions/trader-linearreg.xml
deleted file mode 100644
index 39891f4e1be5..000000000000
--- a/reference/trader/functions/trader-linearreg.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-linearreg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_linearreg</refname>
-  <refpurpose>Linear Regression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_linearreg</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ln.xml b/reference/trader/functions/trader-ln.xml
deleted file mode 100644
index 9e673d40b4d6..000000000000
--- a/reference/trader/functions/trader-ln.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ln" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ln</refname>
-  <refpurpose>Vector Log Natural</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ln</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the natural logarithm for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-log10.xml b/reference/trader/functions/trader-log10.xml
deleted file mode 100644
index bb2c3ebc8767..000000000000
--- a/reference/trader/functions/trader-log10.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-log10" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_log10</refname>
-  <refpurpose>Vector Log10</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_log10</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the base-10 logarithm for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ma.xml b/reference/trader/functions/trader-ma.xml
deleted file mode 100644
index 70edcdd4fcd2..000000000000
--- a/reference/trader/functions/trader-ma.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ma" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ma</refname>
-  <refpurpose>Moving average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ma</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-macd.xml b/reference/trader/functions/trader-macd.xml
deleted file mode 100644
index 23579d759fa4..000000000000
--- a/reference/trader/functions/trader-macd.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-macd" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_macd</refname>
-  <refpurpose>Moving Average Convergence/Divergence</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_macd</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>signalPeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signalPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.signal.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-macdext.xml b/reference/trader/functions/trader-macdext.xml
deleted file mode 100644
index cc45d1c97074..000000000000
--- a/reference/trader/functions/trader-macdext.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-macdext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_macdext</refname>
-  <refpurpose>MACD with controllable MA type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_macdext</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastMAType</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowMAType</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>signalPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>signalMAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastMAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowMAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signalPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.signal.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signalMAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.signal.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-macdfix.xml b/reference/trader/functions/trader-macdfix.xml
deleted file mode 100644
index e6c2d025068b..000000000000
--- a/reference/trader/functions/trader-macdfix.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-macdfix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_macdfix</refname>
-  <refpurpose>Moving Average Convergence/Divergence Fix 12/26</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_macdfix</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>signalPeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>signalPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.signal.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-mama.xml b/reference/trader/functions/trader-mama.xml
deleted file mode 100644
index 0ea5e2d1a11a..000000000000
--- a/reference/trader/functions/trader-mama.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-mama" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_mama</refname>
-  <refpurpose>MESA Adaptive Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_mama</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>fastLimit</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>slowLimit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastLimit</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.limit;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowLimit</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.limit;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-mavp.xml b/reference/trader/functions/trader-mavp.xml
deleted file mode 100644
index 3ca71ad07905..000000000000
--- a/reference/trader/functions/trader-mavp.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-mavp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_mavp</refname>
-  <refpurpose>Moving average with variable period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_mavp</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam><type>array</type><parameter>periods</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>minPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>maxPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>periods</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.periods;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>minPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.min.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>maxPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.max.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-max.xml b/reference/trader/functions/trader-max.xml
deleted file mode 100644
index e83bcffc3b91..000000000000
--- a/reference/trader/functions/trader-max.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-max" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_max</refname>
-  <refpurpose>Highest value over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_max</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-maxindex.xml b/reference/trader/functions/trader-maxindex.xml
deleted file mode 100644
index 93cd40c87407..000000000000
--- a/reference/trader/functions/trader-maxindex.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-maxindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_maxindex</refname>
-  <refpurpose>Index of highest value over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_maxindex</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-medprice.xml b/reference/trader/functions/trader-medprice.xml
deleted file mode 100644
index c18104d29ae0..000000000000
--- a/reference/trader/functions/trader-medprice.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-medprice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_medprice</refname>
-  <refpurpose>Median Price</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_medprice</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-mfi.xml b/reference/trader/functions/trader-mfi.xml
deleted file mode 100644
index d01af78bba7c..000000000000
--- a/reference/trader/functions/trader-mfi.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-mfi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_mfi</refname>
-  <refpurpose>Money Flow Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_mfi</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam><type>array</type><parameter>volume</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>volume</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.volume;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-midpoint.xml b/reference/trader/functions/trader-midpoint.xml
deleted file mode 100644
index fbcfa8cc9033..000000000000
--- a/reference/trader/functions/trader-midpoint.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-midpoint" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_midpoint</refname>
-  <refpurpose>MidPoint over period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_midpoint</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-midprice.xml b/reference/trader/functions/trader-midprice.xml
deleted file mode 100644
index 9a46c5d0afe4..000000000000
--- a/reference/trader/functions/trader-midprice.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-midprice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_midprice</refname>
-  <refpurpose>Midpoint Price over period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_midprice</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-min.xml b/reference/trader/functions/trader-min.xml
deleted file mode 100644
index ca6754641b20..000000000000
--- a/reference/trader/functions/trader-min.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-min" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_min</refname>
-  <refpurpose>Lowest value over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_min</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-minindex.xml b/reference/trader/functions/trader-minindex.xml
deleted file mode 100644
index 57f1cfffd51d..000000000000
--- a/reference/trader/functions/trader-minindex.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-minindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_minindex</refname>
-  <refpurpose>Index of lowest value over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_minindex</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-minmax.xml b/reference/trader/functions/trader-minmax.xml
deleted file mode 100644
index 0c15e8835128..000000000000
--- a/reference/trader/functions/trader-minmax.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-minmax" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_minmax</refname>
-  <refpurpose>Lowest and highest values over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_minmax</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-minmaxindex.xml b/reference/trader/functions/trader-minmaxindex.xml
deleted file mode 100644
index 92696e691787..000000000000
--- a/reference/trader/functions/trader-minmaxindex.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-minmaxindex" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_minmaxindex</refname>
-  <refpurpose>Indexes of lowest and highest values over a specified period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_minmaxindex</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-minus-di.xml b/reference/trader/functions/trader-minus-di.xml
deleted file mode 100644
index 4e96bfc22578..000000000000
--- a/reference/trader/functions/trader-minus-di.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-minus-di" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_minus_di</refname>
-  <refpurpose>Minus Directional Indicator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_minus_di</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-minus-dm.xml b/reference/trader/functions/trader-minus-dm.xml
deleted file mode 100644
index 9f410b83c75c..000000000000
--- a/reference/trader/functions/trader-minus-dm.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-minus-dm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_minus_dm</refname>
-  <refpurpose>Minus Directional Movement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_minus_dm</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-mom.xml b/reference/trader/functions/trader-mom.xml
deleted file mode 100644
index a821c5270120..000000000000
--- a/reference/trader/functions/trader-mom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-mom" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_mom</refname>
-  <refpurpose>Momentum</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_mom</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-mult.xml b/reference/trader/functions/trader-mult.xml
deleted file mode 100644
index 5eed97abdd5d..000000000000
--- a/reference/trader/functions/trader-mult.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-mult" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_mult</refname>
-  <refpurpose>Vector Arithmetic Mult</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_mult</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the vector dot product of <parameter>real0</parameter> with
-   <parameter>real1</parameter> and returns the resulting vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-natr.xml b/reference/trader/functions/trader-natr.xml
deleted file mode 100644
index e3738055e1f4..000000000000
--- a/reference/trader/functions/trader-natr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-natr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_natr</refname>
-  <refpurpose>Normalized Average True Range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_natr</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-obv.xml b/reference/trader/functions/trader-obv.xml
deleted file mode 100644
index f9d41a3031b6..000000000000
--- a/reference/trader/functions/trader-obv.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-obv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_obv</refname>
-  <refpurpose>On Balance Volume</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_obv</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam><type>array</type><parameter>volume</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>volume</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.volume;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-plus-di.xml b/reference/trader/functions/trader-plus-di.xml
deleted file mode 100644
index 3be262eb9d8d..000000000000
--- a/reference/trader/functions/trader-plus-di.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-plus-di" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_plus_di</refname>
-  <refpurpose>Plus Directional Indicator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_plus_di</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-plus-dm.xml b/reference/trader/functions/trader-plus-dm.xml
deleted file mode 100644
index 331a79c511df..000000000000
--- a/reference/trader/functions/trader-plus-dm.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-plus-dm" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_plus_dm</refname>
-  <refpurpose>Plus Directional Movement</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_plus_dm</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ppo.xml b/reference/trader/functions/trader-ppo.xml
deleted file mode 100644
index 7e5a5c4276f8..000000000000
--- a/reference/trader/functions/trader-ppo.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ppo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ppo</refname>
-  <refpurpose>Percentage Price Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ppo</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowPeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fast.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowPeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slow.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-roc.xml b/reference/trader/functions/trader-roc.xml
deleted file mode 100644
index abb053ea9ca8..000000000000
--- a/reference/trader/functions/trader-roc.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-roc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_roc</refname>
-  <refpurpose>Rate of change : ((price/prevPrice)-1)*100</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_roc</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-rocp.xml b/reference/trader/functions/trader-rocp.xml
deleted file mode 100644
index e5788a1b9df5..000000000000
--- a/reference/trader/functions/trader-rocp.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-rocp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_rocp</refname>
-  <refpurpose>Rate of change Percentage: (price-prevPrice)/prevPrice</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_rocp</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-rocr.xml b/reference/trader/functions/trader-rocr.xml
deleted file mode 100644
index 40081f72b234..000000000000
--- a/reference/trader/functions/trader-rocr.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-rocr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_rocr</refname>
-  <refpurpose>Rate of change ratio: (price/prevPrice)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_rocr</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-rocr100.xml b/reference/trader/functions/trader-rocr100.xml
deleted file mode 100644
index d1d6f61d6b4a..000000000000
--- a/reference/trader/functions/trader-rocr100.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-rocr100" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_rocr100</refname>
-  <refpurpose>Rate of change ratio 100 scale: (price/prevPrice)*100</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_rocr100</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-rsi.xml b/reference/trader/functions/trader-rsi.xml
deleted file mode 100644
index a9e7d28ea503..000000000000
--- a/reference/trader/functions/trader-rsi.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-rsi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_rsi</refname>
-  <refpurpose>Relative Strength Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_rsi</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sar.xml b/reference/trader/functions/trader-sar.xml
deleted file mode 100644
index b7f022ec00da..000000000000
--- a/reference/trader/functions/trader-sar.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sar</refname>
-  <refpurpose>Parabolic SAR</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sar</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>acceleration</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>maximum</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>acceleration</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor used up to the Maximum value. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>maximum</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor Maximum value. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sarext.xml b/reference/trader/functions/trader-sarext.xml
deleted file mode 100644
index d0e08e643ea3..000000000000
--- a/reference/trader/functions/trader-sarext.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sarext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sarext</refname>
-  <refpurpose>Parabolic SAR - Extended</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sarext</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>startValue</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>offsetOnReverse</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationInitLong</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationLong</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationMaxLong</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationInitShort</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationShort</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>accelerationMaxShort</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>startValue</parameter></term>
-    <listitem>
-     <para>
-       Start value and direction. 0 for Auto, &gt;0 for Long, &lt;0 for Short. Valid range from <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-min">TRADER_REAL_MIN</link> to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offsetOnReverse</parameter></term>
-    <listitem>
-     <para>
-      Percent offset added/removed to initial stop on short/long reversal. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationInitLong</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor initial value for the Long direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationLong</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor for the Long direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationMaxLong</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor maximum value for the Long direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationInitShort</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor initial value for the Short direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationShort</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor for the Short direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>accelerationMaxShort</parameter></term>
-    <listitem>
-     <para>
-      Acceleration Factor maximum value for the Short direction. Valid range from 0 to <link xmlns="http://docbook.org/ns/docbook" linkend="constant.trader-real-max">TRADER_REAL_MAX</link>.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-set-compat.xml b/reference/trader/functions/trader-set-compat.xml
deleted file mode 100644
index 6a41bc2117fc..000000000000
--- a/reference/trader/functions/trader-set-compat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-set-compat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_set_compat</refname>
-  <refpurpose>Set compatibility mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>trader_set_compat</methodname>
-   <methodparam><type>int</type><parameter>compatId</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set compatibility mode which will affect the way calculations are done by all the extension functions.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>compatId</parameter></term>
-    <listitem>
-     <para>
-      Compatibility Id. <link xmlns="http://docbook.org/ns/docbook" linkend="trader.constants">TRADER_COMPATIBILITY_*</link> series of constants should be used. 
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/trader/functions/trader-set-unstable-period.xml b/reference/trader/functions/trader-set-unstable-period.xml
deleted file mode 100644
index 2a6411cad7b4..000000000000
--- a/reference/trader/functions/trader-set-unstable-period.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-set-unstable-period" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_set_unstable_period</refname>
-  <refpurpose>Set unstable period</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>trader_set_unstable_period</methodname>
-   <methodparam><type>int</type><parameter>functionId</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Influences unstable period factor for functions, which are sensible to it. More information about unstable periods can be found on the <link xlink:href="&url.trader.unstable-period;">TA-Lib</link> API documentation page. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>functionId</parameter></term>
-    <listitem>
-     <para>
-      Function ID the factor should be set for. <link xmlns="http://docbook.org/ns/docbook" linkend="trader.constants">TRADER_FUNC_UNST_*</link> constant series can be used to affect the corresponding function. 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-     Unstable period value. 
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </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/trader/functions/trader-sin.xml b/reference/trader/functions/trader-sin.xml
deleted file mode 100644
index 196644068ed5..000000000000
--- a/reference/trader/functions/trader-sin.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sin</refname>
-  <refpurpose>Vector Trigonometric Sin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sin</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the sine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sinh.xml b/reference/trader/functions/trader-sinh.xml
deleted file mode 100644
index 32dc4a51d667..000000000000
--- a/reference/trader/functions/trader-sinh.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sinh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sinh</refname>
-  <refpurpose>Vector Trigonometric Sinh</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sinh</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the hyperbolic sine for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sma.xml b/reference/trader/functions/trader-sma.xml
deleted file mode 100644
index 2a941e2f3c78..000000000000
--- a/reference/trader/functions/trader-sma.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sma" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sma</refname>
-  <refpurpose>Simple Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sma</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sqrt.xml b/reference/trader/functions/trader-sqrt.xml
deleted file mode 100644
index 5f5de5dad533..000000000000
--- a/reference/trader/functions/trader-sqrt.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sqrt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sqrt</refname>
-  <refpurpose>Vector Square Root</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sqrt</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the square root of each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-stddev.xml b/reference/trader/functions/trader-stddev.xml
deleted file mode 100644
index de0e91ac3746..000000000000
--- a/reference/trader/functions/trader-stddev.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-stddev" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_stddev</refname>
-  <refpurpose>Standard Deviation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_stddev</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>nbDev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nbDev</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-stoch.xml b/reference/trader/functions/trader-stoch.xml
deleted file mode 100644
index e55a75a0476f..000000000000
--- a/reference/trader/functions/trader-stoch.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-stoch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_stoch</refname>
-  <refpurpose>Stochastic</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_stoch</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastK_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowK_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowK_MAType</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowD_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>slowD_MAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastK_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastk.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowK_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slowk.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowK_MAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slowk.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowD_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slowd.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>slowD_MAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.slowd.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-stochf.xml b/reference/trader/functions/trader-stochf.xml
deleted file mode 100644
index ca66a7eed8a9..000000000000
--- a/reference/trader/functions/trader-stochf.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-stochf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_stochf</refname>
-  <refpurpose>Stochastic Fast</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_stochf</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastK_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastD_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastD_MAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastK_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastk.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastD_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastd.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastD_MAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastd.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-stochrsi.xml b/reference/trader/functions/trader-stochrsi.xml
deleted file mode 100644
index 41254da1cd2e..000000000000
--- a/reference/trader/functions/trader-stochrsi.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-stochrsi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_stochrsi</refname>
-  <refpurpose>Stochastic Relative Strength Index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_stochrsi</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastK_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastD_Period</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>fastD_MAType</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastK_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastk.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastD_Period</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastd.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>fastD_MAType</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.fastd.ma.type;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sub.xml b/reference/trader/functions/trader-sub.xml
deleted file mode 100644
index a656729151e4..000000000000
--- a/reference/trader/functions/trader-sub.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sub" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sub</refname>
-  <refpurpose>Vector Arithmetic Subtraction</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sub</methodname>
-   <methodparam><type>array</type><parameter>real0</parameter></methodparam>
-   <methodparam><type>array</type><parameter>real1</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the vector subtraction of <parameter>real1</parameter> from
-   <parameter>real0</parameter> and returns the resulting vector.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real0</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>real1</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-sum.xml b/reference/trader/functions/trader-sum.xml
deleted file mode 100644
index 07d66cf7c1e7..000000000000
--- a/reference/trader/functions/trader-sum.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-sum" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_sum</refname>
-  <refpurpose>Summation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_sum</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-t3.xml b/reference/trader/functions/trader-t3.xml
deleted file mode 100644
index ad74fb4cee8a..000000000000
--- a/reference/trader/functions/trader-t3.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-t3" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_t3</refname>
-  <refpurpose>Triple Exponential Moving Average (T3)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_t3</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>vFactor</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vFactor</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.vfactor;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-tan.xml b/reference/trader/functions/trader-tan.xml
deleted file mode 100644
index 5c9fa020f85b..000000000000
--- a/reference/trader/functions/trader-tan.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-tan" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_tan</refname>
-  <refpurpose>Vector Trigonometric Tan</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_tan</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the tangent for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-tanh.xml b/reference/trader/functions/trader-tanh.xml
deleted file mode 100644
index ba7dfd89e628..000000000000
--- a/reference/trader/functions/trader-tanh.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-tanh" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_tanh</refname>
-  <refpurpose>Vector Trigonometric Tanh</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_tanh</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Calculates the hyperbolic tangent for each value in
-   <parameter>real</parameter> and returns the resulting array.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-       &trader.arg.array.of.real;      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-tema.xml b/reference/trader/functions/trader-tema.xml
deleted file mode 100644
index b23f422e0411..000000000000
--- a/reference/trader/functions/trader-tema.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-tema" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_tema</refname>
-  <refpurpose>Triple Exponential Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_tema</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-trange.xml b/reference/trader/functions/trader-trange.xml
deleted file mode 100644
index e99fc4222a78..000000000000
--- a/reference/trader/functions/trader-trange.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-trange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_trange</refname>
-  <refpurpose>True Range</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_trange</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-trima.xml b/reference/trader/functions/trader-trima.xml
deleted file mode 100644
index 33915e2929af..000000000000
--- a/reference/trader/functions/trader-trima.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-trima" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_trima</refname>
-  <refpurpose>Triangular Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_trima</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-trix.xml b/reference/trader/functions/trader-trix.xml
deleted file mode 100644
index 1029fbc42b9b..000000000000
--- a/reference/trader/functions/trader-trix.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-trix" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_trix</refname>
-  <refpurpose>1-day Rate-Of-Change (ROC) of a Triple Smooth EMA</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_trix</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-tsf.xml b/reference/trader/functions/trader-tsf.xml
deleted file mode 100644
index c66d8d36fb4b..000000000000
--- a/reference/trader/functions/trader-tsf.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-tsf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_tsf</refname>
-  <refpurpose>Time Series Forecast</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_tsf</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-typprice.xml b/reference/trader/functions/trader-typprice.xml
deleted file mode 100644
index c83a7d54fada..000000000000
--- a/reference/trader/functions/trader-typprice.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-typprice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_typprice</refname>
-  <refpurpose>Typical Price</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_typprice</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-ultosc.xml b/reference/trader/functions/trader-ultosc.xml
deleted file mode 100644
index 3009559f3afa..000000000000
--- a/reference/trader/functions/trader-ultosc.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-ultosc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_ultosc</refname>
-  <refpurpose>Ultimate Oscillator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_ultosc</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod1</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod2</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod3</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod1</parameter></term>
-    <listitem>
-     <para>
-      Number of bars for 1st period. Valid range from 1 to 100000.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod2</parameter></term>
-    <listitem>
-     <para>
-      Number of bars for 2nd period. Valid range from 1 to 100000.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod3</parameter></term>
-    <listitem>
-     <para>
-      Number of bars for 3rd period. Valid range from 1 to 100000.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-var.xml b/reference/trader/functions/trader-var.xml
deleted file mode 100644
index 3365f3ec1f96..000000000000
--- a/reference/trader/functions/trader-var.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-var" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_var</refname>
-  <refpurpose>Variance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_var</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>nbDev</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>nbDev</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-wclprice.xml b/reference/trader/functions/trader-wclprice.xml
deleted file mode 100644
index b6e2022c16b7..000000000000
--- a/reference/trader/functions/trader-wclprice.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-wclprice" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_wclprice</refname>
-  <refpurpose>Weighted Close Price</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_wclprice</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-willr.xml b/reference/trader/functions/trader-willr.xml
deleted file mode 100644
index a2c814bec1e4..000000000000
--- a/reference/trader/functions/trader-willr.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-willr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_willr</refname>
-  <refpurpose>Williams' %R</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_willr</methodname>
-   <methodparam><type>array</type><parameter>high</parameter></methodparam>
-   <methodparam><type>array</type><parameter>low</parameter></methodparam>
-   <methodparam><type>array</type><parameter>close</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>high</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.high;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>low</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.low;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>close</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real.close;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/functions/trader-wma.xml b/reference/trader/functions/trader-wma.xml
deleted file mode 100644
index e2890d09e44d..000000000000
--- a/reference/trader/functions/trader-wma.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.trader-wma" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>trader_wma</refname>
-  <refpurpose>Weighted Moving Average</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>trader_wma</methodname>
-   <methodparam><type>array</type><parameter>real</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timePeriod</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>real</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.array.of.real;
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timePeriod</parameter></term>
-    <listitem>
-     <para>
-      &trader.arg.time.period;
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>Returns an array with calculated data 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/trader/ini.xml b/reference/trader/ini.xml
deleted file mode 100644
index 75fc067eb4e1..000000000000
--- a/reference/trader/ini.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="trader.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Trader &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.trader.real-precision">trader.real_precision</link></entry>
-      <entry>3</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Since trader 0.2.1</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.trader.real-round-mode">trader.real_round_mode</link></entry>
-      <entry>HALF_DOWN</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Since trader 0.3.0</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.trader.real-precision">
-     <term>
-      <parameter>trader.real_precision</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-      All the values in the returned arrays will be rounded to this precision.
-      However the calculations inside TA-Lib happen with unrounded values.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.trader.real-round-mode">
-      <term>
-       <parameter>trader.real_round_mode</parameter>
-       <type>string</type>
-      </term>
-      <listitem>
-       <para>
-        Controls the trader real rounding policy. Valid values are <literal>HALF_UP</literal>,
-        <literal>HALF_DOWN</literal>, <literal>HALF_EVEN</literal> and <literal>HALF_ODD</literal>. The behaviour is identical to the <link linkend="function.round">round()</link> function used with the mode argument.
-       </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/trader/reference.xml b/reference/trader/reference.xml
deleted file mode 100644
index c387864e7e2b..000000000000
--- a/reference/trader/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.trader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Trader &Functions;</title>
-
- &reference.trader.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/trader/setup.xml b/reference/trader/setup.xml
deleted file mode 100644
index 52932e87371d..000000000000
--- a/reference/trader/setup.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="trader.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="trader.requirements">
-  &reftitle.required;
-  <para>
-   The trader extension is based on <link xlink:href="&url.trader.lib;">TA-Lib</link>. TA-Lib is fully integrated into the extension, therefore no external libraries are needed.
-  </para>
- </section>
-
- <section xml:id="trader.installation">
-  &reftitle.install;
-   <para>
-    &pecl.moved;
-   </para>
-   <para>
-    &pecl.info;
-    <link xlink:href="&url.pecl.package;trader">&url.pecl.package;trader</link>.
-   </para>
- </section>
- 
- <!--<section xml:id="trader.configuration">
-  &reftitle.runtime;-->
-  &reference.trader.ini;
-  <!-- </section> -->
-
- <!-- <section xml:id="trader.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/trader/versions.xml b/reference/trader/versions.xml
deleted file mode 100644
index 4f65bdf740fa..000000000000
--- a/reference/trader/versions.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='trader_acos' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ad' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_add' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_adosc' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_adx' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_adxr' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_apo' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_aroon' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_aroonosc' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_asin' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_atan' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_atr' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_avgprice' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_bbands' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_beta' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_bop' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cci' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl2crows' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3blackcrows' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3inside' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3linestrike' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3outside' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3starsinsouth' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdl3whitesoldiers' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlabandonedbaby' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdladvanceblock' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlbelthold' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlbreakaway' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlclosingmarubozu' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlconcealbabyswall' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlcounterattack' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdldarkcloudcover' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdldoji' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdldojistar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdldragonflydoji' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlengulfing' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdleveningdojistar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdleveningstar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlgapsidesidewhite' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlgravestonedoji' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhammer' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhangingman' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlharami' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlharamicross' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhighwave' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhikkake' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhikkakemod' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlhomingpigeon' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlidentical3crows' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlinneck' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlinvertedhammer' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlkicking' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlkickingbylength' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlladderbottom' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdllongleggeddoji' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdllongline' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlmarubozu' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlmatchinglow' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlmathold' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlmorningdojistar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlmorningstar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlonneck' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlpiercing' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlrickshawman' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlrisefall3methods' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlseparatinglines' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlshootingstar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlshortline' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlspinningtop' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlstalledpattern' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlsticksandwich' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdltakuri' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdltasukigap' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlthrusting' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdltristar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlunique3river' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlupsidegap2crows' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cdlxsidegap3methods' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ceil' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cmo' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_correl' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cos' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_cosh' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_dema' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_div' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_dx' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ema' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_exp' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_floor' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_dcperiod' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_dcphase' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_phasor' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_sine' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_trendline' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ht_trendmode' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_kama' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_linearreg' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_linearreg_angle' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_linearreg_intercept' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_linearreg_slope' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ln' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_log10' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ma' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_macd' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_macdext' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_macdfix' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_mama' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_mavp' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_max' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_maxindex' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_medprice' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_mfi' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_midpoint' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_midprice' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_min' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_minindex' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_minmax' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_minmaxindex' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_minus_di' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_minus_dm' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_mom' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_mult' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_natr' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_obv' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_plus_di' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_plus_dm' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ppo' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_roc' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_rocp' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_rocr' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_rocr100' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_rsi' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sar' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sarext' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sin' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sinh' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sma' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sqrt' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_stddev' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_stoch' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_stochf' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_stochrsi' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sub' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_sum' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_t3' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_tan' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_tanh' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_tema' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_trange' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_trima' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_trix' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_tsf' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_typprice' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_ultosc' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_var' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_wclprice' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_willr' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_wma' from='PECL trader &gt;= 0.2.0'/>
- <function name='trader_set_unstable_period' from='PECL trader &gt;= 0.2.2'/>
- <function name='trader_get_unstable_period' from='PECL trader &gt;= 0.2.2'/>
- <function name='trader_set_compat' from='PECL trader &gt;= 0.2.2'/>
- <function name='trader_get_compat' from='PECL trader &gt;= 0.2.2'/>
- <function name='trader_errno' from='PECL trader &gt;= 0.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
--->
diff --git a/reference/ui/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/ui/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/ui/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/ui/book.xml b/reference/ui/book.xml
deleted file mode 100644
index 353dca65d15a..000000000000
--- a/reference/ui/book.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-
-<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>
-
- <preface xml:id="intro.ui">
-  &reftitle.intro;
-  <para>
-   &warn.experimental;
-   This extension wraps <link xlink:href="&url.ui.libui;">libui</link>
-   to provide an object-oriented API for the cross platform development
-   of native look-and-feel user interfaces.
-  </para>
- </preface>
-
- &reference.ui.setup;
- <!-- &reference.ui.examples; -->
-
- &reference.ui.ui.point;
- &reference.ui.ui.size;
-
- &reference.ui.ui.window;
- &reference.ui.ui.control;
- &reference.ui.ui.menu;
- &reference.ui.ui.menuitem;
- &reference.ui.ui.area;
- &reference.ui.ui.executor;
-
- &reference.ui.ui.controls.tab;
- &reference.ui.ui.controls.check;
- &reference.ui.ui.controls.button;
- &reference.ui.ui.controls.colorbutton;
- &reference.ui.ui.controls.label;
- &reference.ui.ui.controls.entry;
- &reference.ui.ui.controls.multilineentry;
- &reference.ui.ui.controls.spin;
- &reference.ui.ui.controls.slider;
- &reference.ui.ui.controls.progress;
- &reference.ui.ui.controls.separator;
- &reference.ui.ui.controls.combo;
- &reference.ui.ui.controls.editablecombo;
- &reference.ui.ui.controls.radio;
- &reference.ui.ui.controls.picker;
-
- &reference.ui.ui.controls.form;
- &reference.ui.ui.controls.grid;
- &reference.ui.ui.controls.group;
- &reference.ui.ui.controls.box;
-
- &reference.ui.ui.draw.pen;
- &reference.ui.ui.draw.path;
- &reference.ui.ui.draw.matrix;
- &reference.ui.ui.draw.color;
- &reference.ui.ui.draw.stroke;
- &reference.ui.ui.draw.brush;
- &reference.ui.ui.draw.brush.gradient;
- &reference.ui.ui.draw.brush.lineargradient;
- &reference.ui.ui.draw.brush.radialgradient;
-
- &reference.ui.ui.draw.text.layout;
- &reference.ui.ui.draw.text.font;
- &reference.ui.ui.draw.text.font.descriptor;
-
- &reference.ui.reference;
-
- &reference.ui.ui.draw.text.font.weight;
- &reference.ui.ui.draw.text.font.italic;
- &reference.ui.ui.draw.text.font.stretch;
- &reference.ui.ui.draw.line.cap;
- &reference.ui.ui.draw.line.join;
- &reference.ui.ui.key;
-
- &reference.ui.ui.exception.invalidargumentexception;
- &reference.ui.ui.exception.runtimeexception;
-</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/ui/configure.xml b/reference/ui/configure.xml
deleted file mode 100644
index fdf622081f2a..000000000000
--- a/reference/ui/configure.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="ui.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Use <option role="configure">--with-ui[=DIR]</option> when compiling PHP.
- </para>
-
- <para>
-  Windows users should include <filename>php_ui.dll</filename> into &php.ini;
- </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/ui/functions/ui.draw.text.font.fontfamilies.xml b/reference/ui/functions/ui.draw.text.font.fontfamilies.xml
deleted file mode 100644
index db95341fc9e3..000000000000
--- a/reference/ui/functions/ui.draw.text.font.fontfamilies.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.ui-draw-text-font-fontfamilies" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\fontFamilies</refname>
-  <refpurpose>Retrieve Font Families</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>UI\Draw\Text\Font\fontFamilies</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns an array of valid font families for the current system
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/functions/ui.quit.xml b/reference/ui/functions/ui.quit.xml
deleted file mode 100644
index 0238e27fc16c..000000000000
--- a/reference/ui/functions/ui.quit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.ui-quit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\quit</refname>
-  <refpurpose>Quit UI Loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>UI\quit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall cause the main loop to be exited
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/functions/ui.run.xml b/reference/ui/functions/ui.run.xml
deleted file mode 100644
index 502001cad328..000000000000
--- a/reference/ui/functions/ui.run.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.ui-run" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\run</refname>
-  <refpurpose>Enter UI Loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>UI\run</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall cause PHP to enter into the main loop, by default control will not be returned to the caller
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Set UI\Loop to return control, and UI\Wait to return control after waiting
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/reference.xml b/reference/ui/reference.xml
deleted file mode 100644
index 7791a1ed35c0..000000000000
--- a/reference/ui/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.ui" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>UI &Functions;</title>
-
- &reference.ui.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/ui/setup.xml b/reference/ui/setup.xml
deleted file mode 100644
index 8d6cc37b4efb..000000000000
--- a/reference/ui/setup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="ui.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="ui.requirements">
-  &reftitle.required;
-  <para>
-   Installation requires the libui library, and PHP 7 or newer. 
-  </para>
-  <para>
-   This extension requires the <link xlink:href="&url.ui.libui;">libui library</link> 
-   version 0.1.0 or higher to be installed. See the libui documentation 
-   for a list of prerequisites.
-  </para>
- </section>
-
- <section xml:id="ui.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;ui">&url.pecl.package;ui</link>. 
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </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/ui/ui.area.xml b/reference/ui/ui.area.xml
deleted file mode 100644
index 5ba1fc9f974c..000000000000
--- a/reference/ui/ui.area.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-area" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Area</title>
- <titleabbrev>UI\Area</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Area intro -->
-  <section xml:id="ui-area.intro">
-   &reftitle.intro;
-   <para>
-    An Area represents a canvas which can be used to draw, and respond to mouse and key events.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-area.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Area</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Area</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.ctrl">UI\Area::Ctrl</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.alt">UI\Area::Alt</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.shift">UI\Area::Shift</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.super">UI\Area::Super</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.down">UI\Area::Down</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-area.constants.up">UI\Area::Up</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-area')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Area constants -->
-  <section xml:id="ui-area.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-area.constants.ctrl">
-     <term><constant>UI\Area::Ctrl</constant></term>
-     <listitem>
-      <simpara>
-       Shall be set in the modifiers passed to key and mouse events
-       when the <keycap>CTRL</keycap> key is active
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-area.constants.alt">
-     <term><constant>UI\Area::Alt</constant></term>
-     <listitem>
-      <simpara>
-       Shall be set in the modifiers passed to key and mouse events
-       when the <keycap>ALT</keycap> key is active
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-area.constants.shift">
-     <term><constant>UI\Area::Shift</constant></term>
-     <listitem>
-      <simpara>
-       Shall be set in the modifiers passed to key and mouse events
-       when the <keycap>SHIFT</keycap> key is active
-      </simpara>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-area.constants.super">
-     <term><constant>UI\Area::Super</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-area.constants.down">
-     <term><constant>UI\Area::Down</constant></term>
-     <listitem>
-      <para>Shall be set in the modifiers passed to key and mouse events</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-area.constants.up">
-     <term><constant>UI\Area::Up</constant></term>
-     <listitem>
-      <para>Shall be set in the modifiers passed to key and mouse events</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.entities.area;
-
-</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/ui/ui.control.xml b/reference/ui/ui.control.xml
deleted file mode 100644
index 7a48c946591c..000000000000
--- a/reference/ui/ui.control.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-control" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control</title>
- <titleabbrev>UI\Control</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Control intro -->
-  <section xml:id="ui-control.intro">
-   &reftitle.intro;
-   <para>
-    This is the closed base class for all UI Controls.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-control.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Control</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.entities.control;
-
-</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/ui/ui.controls.box.xml b/reference/ui/ui.controls.box.xml
deleted file mode 100644
index 07448f1f3152..000000000000
--- a/reference/ui/ui.controls.box.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-box" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control Box (Arrangement)</title>
- <titleabbrev>UI\Controls\Box</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Box intro -->
-  <section xml:id="ui-controls-box.intro">
-   &reftitle.intro;
-   <para>
-    A Box allows the arrangement of other controls
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-box.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Box</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Box</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-box.constants.vertical">UI\Controls\Box::Vertical</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-box.constants.horizontal">UI\Controls\Box::Horizontal</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-controls-box.props.controls">controls</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-box')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-box')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Box properties -->
-  <section xml:id="ui-controls-box.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-controls-box.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ UI\Controls\Box constants -->
-  <section xml:id="ui-controls-box.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-box.constants.vertical">
-     <term><constant>UI\Controls\Box::Vertical</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-box.constants.horizontal">
-     <term><constant>UI\Controls\Box::Horizontal</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.box;
-
-</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/ui/ui.controls.button.xml b/reference/ui/ui.controls.button.xml
deleted file mode 100644
index a98ffcec0d9e..000000000000
--- a/reference/ui/ui.controls.button.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-button" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Button Control</title>
- <titleabbrev>UI\Controls\Button</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Button intro -->
-  <section xml:id="ui-controls-button.intro">
-   &reftitle.intro;
-   <para>
-    Represents a labelled clickable button
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-button.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Button</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Button</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-button')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />    
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-button')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.button;
-
-</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/ui/ui.controls.check.xml b/reference/ui/ui.controls.check.xml
deleted file mode 100644
index b8d573bcbb5a..000000000000
--- a/reference/ui/ui.controls.check.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-check" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Check Control</title>
- <titleabbrev>UI\Controls\Check</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Check intro -->
-  <section xml:id="ui-controls-check.intro">
-   &reftitle.intro;
-   <para>
-    A Check is a labelled checkable box
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-check.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Check</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Check</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-check')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-check')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.check;
-
-</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/ui/ui.controls.colorbutton.xml b/reference/ui/ui.controls.colorbutton.xml
deleted file mode 100644
index 1c080bb97f16..000000000000
--- a/reference/ui/ui.controls.colorbutton.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-colorbutton" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>ColorButton Control</title>
- <titleabbrev>UI\Controls\ColorButton</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\ColorButton intro -->
-  <section xml:id="ui-controls-colorbutton.intro">
-   &reftitle.intro;
-   <para>
-    A Color Button is a button which displays a color picker when clicked
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-colorbutton.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\ColorButton</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\ColorButton</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-colorbutton')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.colorbutton;
-
-</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/ui/ui.controls.combo.xml b/reference/ui/ui.controls.combo.xml
deleted file mode 100644
index 4ef69d0973ef..000000000000
--- a/reference/ui/ui.controls.combo.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-combo" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Combo Control</title>
- <titleabbrev>UI\Controls\Combo</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Combo intro -->
-  <section xml:id="ui-controls-combo.intro">
-   &reftitle.intro;
-   <para>
-    A Combo control represents a list of options, like the familiar select HTML element.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-combo.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Combo</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Combo</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-combo')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.combo;
-
-</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/ui/ui.controls.editablecombo.xml b/reference/ui/ui.controls.editablecombo.xml
deleted file mode 100644
index 3046942c8236..000000000000
--- a/reference/ui/ui.controls.editablecombo.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-editablecombo" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>EditableCombo Control</title>
- <titleabbrev>UI\Controls\EditableCombo</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\EditableCombo intro -->
-  <section xml:id="ui-controls-editablecombo.intro">
-   &reftitle.intro;
-   <para>
-    An Editable Combo is a Combo which allows the user to enter custom options
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-editablecombo.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\EditableCombo</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\EditableCombo</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-editablecombo')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.editablecombo;
-
-</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/ui/ui.controls.entry.xml b/reference/ui/ui.controls.entry.xml
deleted file mode 100644
index e774e9fb4df3..000000000000
--- a/reference/ui/ui.controls.entry.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-entry" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Entry Control</title>
- <titleabbrev>UI\Controls\Entry</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Entry intro -->
-  <section xml:id="ui-controls-entry.intro">
-   &reftitle.intro;
-   <para>
-    An Entry is a text entry control, suitable for entering plain text, passwords, or search terms.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-entry.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Entry</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Entry</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-entry.constants.normal">UI\Controls\Entry::Normal</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-entry.constants.password">UI\Controls\Entry::Password</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-entry.constants.search">UI\Controls\Entry::Search</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-entry')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-entry')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Entry constants -->
-  <section xml:id="ui-controls-entry.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-entry.constants.normal">
-     <term><constant>UI\Controls\Entry::Normal</constant></term>
-     <listitem>
-      <para>A normal single line entry</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-entry.constants.password">
-     <term><constant>UI\Controls\Entry::Password</constant></term>
-     <listitem>
-      <para>A password entry</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-entry.constants.search">
-     <term><constant>UI\Controls\Entry::Search</constant></term>
-     <listitem>
-      <para>A search entry</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.entry;
-
-</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/ui/ui.controls.form.xml b/reference/ui/ui.controls.form.xml
deleted file mode 100644
index 4c90ba3f53d1..000000000000
--- a/reference/ui/ui.controls.form.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-form" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control Form (Arrangement)</title>
- <titleabbrev>UI\Controls\Form</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Form intro -->
-  <section xml:id="ui-controls-form.intro">
-   &reftitle.intro;
-   <para>
-    A Form is a control which allows the arrangement of other controls into a familiar layout (the form).
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-form.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Form</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Form</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-controls-form.props.controls">controls</varname>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-form')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-<!-- {{{ UI\Controls\Form properties -->
-  <section xml:id="ui-controls-form.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-controls-form.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.form;
-
-</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/ui/ui.controls.grid.xml b/reference/ui/ui.controls.grid.xml
deleted file mode 100644
index 1c7953e57653..000000000000
--- a/reference/ui/ui.controls.grid.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-grid" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control Grid (Arrangement)</title>
- <titleabbrev>UI\Controls\Grid</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Grid intro -->
-  <section xml:id="ui-controls-grid.intro">
-   &reftitle.intro;
-   <para>
-    A Grid is a control which is allows the arrangement of children into a grid
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-grid.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Grid</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Grid</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.fill">UI\Controls\Grid::Fill</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.start">UI\Controls\Grid::Start</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.center">UI\Controls\Grid::Center</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.end">UI\Controls\Grid::End</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.leading">UI\Controls\Grid::Leading</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.top">UI\Controls\Grid::Top</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.trailing">UI\Controls\Grid::Trailing</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-grid.constants.bottom">UI\Controls\Grid::Bottom</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-controls-grid.props.controls">controls</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-grid')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Grid constants -->
-  <section xml:id="ui-controls-grid.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-grid.constants.fill">
-     <term><constant>UI\Controls\Grid::Fill</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.start">
-     <term><constant>UI\Controls\Grid::Start</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.center">
-     <term><constant>UI\Controls\Grid::Center</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.end">
-     <term><constant>UI\Controls\Grid::End</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.leading">
-     <term><constant>UI\Controls\Grid::Leading</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.top">
-     <term><constant>UI\Controls\Grid::Top</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.trailing">
-     <term><constant>UI\Controls\Grid::Trailing</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-grid.constants.bottom">
-     <term><constant>UI\Controls\Grid::Bottom</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-<!-- {{{ UI\Controls\Grid properties -->
-  <section xml:id="ui-controls-grid.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-controls-grid.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.grid;
-
-</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/ui/ui.controls.group.xml b/reference/ui/ui.controls.group.xml
deleted file mode 100644
index db8114e0a4a9..000000000000
--- a/reference/ui/ui.controls.group.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-group" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control Group (Arrangement)</title>
- <titleabbrev>UI\Controls\Group</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Group intro -->
-  <section xml:id="ui-controls-group.intro">
-   &reftitle.intro;
-   <para>
-    A Group is a titled container for child controls
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-group.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Group</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Group</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-controls-group.props.controls">controls</varname>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-group')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-group')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Group properties -->
-  <section xml:id="ui-controls-group.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-controls-group.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.ui.ui.controls.entities.group;
-
-</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/ui/ui.controls.label.xml b/reference/ui/ui.controls.label.xml
deleted file mode 100644
index 325260352610..000000000000
--- a/reference/ui/ui.controls.label.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-label" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Label Control</title>
- <titleabbrev>UI\Controls\Label</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Label intro -->
-  <section xml:id="ui-controls-label.intro">
-   &reftitle.intro;
-   <para>
-    A Label is a single line of text, meant to identify, for the user, some element of the interface.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-label.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Label</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Label</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-label')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-label')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.label;
-
-</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/ui/ui.controls.multilineentry.xml b/reference/ui/ui.controls.multilineentry.xml
deleted file mode 100644
index 5cd0c1dc6a6e..000000000000
--- a/reference/ui/ui.controls.multilineentry.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-multilineentry" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>MultilineEntry Control</title>
- <titleabbrev>UI\Controls\MultilineEntry</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\MultilineEntry intro -->
-  <section xml:id="ui-controls-multilineentry.intro">
-   &reftitle.intro;
-   <para>
-    A Multiline Entry is a text entry control able to hold multiple lines of text, with or without wrapping.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-multilineentry.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\MultilineEntry</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\MultilineEntry</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-multilineentry.constants.wrap">UI\Controls\MultilineEntry::Wrap</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-multilineentry.constants.nowrap">UI\Controls\MultilineEntry::NoWrap</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-multilineentry')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-multilineentry')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\MultilineEntry constants -->
-  <section xml:id="ui-controls-multilineentry.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-multilineentry.constants.wrap">
-     <term><constant>UI\Controls\MultilineEntry::Wrap</constant></term>
-     <listitem>
-      <para>Allow lines to wrap</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-multilineentry.constants.nowrap">
-     <term><constant>UI\Controls\MultilineEntry::NoWrap</constant></term>
-     <listitem>
-      <para>Do not allow lines to wrap</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.multilineentry;
-
-</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/ui/ui.controls.picker.xml b/reference/ui/ui.controls.picker.xml
deleted file mode 100644
index ec3fd1e54384..000000000000
--- a/reference/ui/ui.controls.picker.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-picker" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Picker Control</title>
- <titleabbrev>UI\Controls\Picker</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Picker intro -->
-  <section xml:id="ui-controls-picker.intro">
-   &reftitle.intro;
-   <para>
-    A Picker represents a button which when clicked presents a native Date/Time/DateTime Picker interface to the user.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-picker.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Picker</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Picker</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-picker.constants.date">UI\Controls\Picker::Date</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-picker.constants.time">UI\Controls\Picker::Time</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-picker.constants.datetime">UI\Controls\Picker::DateTime</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-picker')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Picker constants -->
-  <section xml:id="ui-controls-picker.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-picker.constants.date">
-     <term><constant>UI\Controls\Picker::Date</constant></term>
-     <listitem>
-      <para>A Date Picker</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-picker.constants.time">
-     <term><constant>UI\Controls\Picker::Time</constant></term>
-     <listitem>
-      <para>A Time Picker</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-picker.constants.datetime">
-     <term><constant>UI\Controls\Picker::DateTime</constant></term>
-     <listitem>
-      <para>A Date and Time Picker</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.picker;
-
-</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/ui/ui.controls.progress.xml b/reference/ui/ui.controls.progress.xml
deleted file mode 100644
index 7954f7fed8cf..000000000000
--- a/reference/ui/ui.controls.progress.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-progress" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Progress Control</title>
- <titleabbrev>UI\Controls\Progress</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Progress intro -->
-  <section xml:id="ui-controls-progress.intro">
-   &reftitle.intro;
-   <para>
-    A Progress control is a familiar Progress bar: It represents progress as a percentage, with a possible range of 0 to 100 (inclusive).
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-progress.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Progress</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Progress</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-progress')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.progress;
-
-</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/ui/ui.controls.radio.xml b/reference/ui/ui.controls.radio.xml
deleted file mode 100644
index ead101137579..000000000000
--- a/reference/ui/ui.controls.radio.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-radio" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Radio Control</title>
- <titleabbrev>UI\Controls\Radio</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Radio intro -->
-  <section xml:id="ui-controls-radio.intro">
-   &reftitle.intro;
-   <para>
-    A Radio is similar to the radio input type familiar from HTML
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-radio.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Radio</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Radio</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-radio')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.radio;
-
-</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/ui/ui.controls.separator.xml b/reference/ui/ui.controls.separator.xml
deleted file mode 100644
index f4d425d7ce7f..000000000000
--- a/reference/ui/ui.controls.separator.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-separator" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Control Separator</title>
- <titleabbrev>UI\Controls\Separator</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Separator intro -->
-  <section xml:id="ui-controls-separator.intro">
-   &reftitle.intro;
-   <para>
-    A Separator represents a control separator, it has no other function.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-separator.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Separator</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Separator</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-separator.constants.horizontal">UI\Controls\Separator::Horizontal</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-controls-separator.constants.vertical">UI\Controls\Separator::Vertical</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-separator')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Separator constants -->
-  <section xml:id="ui-controls-separator.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-controls-separator.constants.horizontal">
-     <term><constant>UI\Controls\Separator::Horizontal</constant></term>
-     <listitem>
-      <para>A Horizontal Separator</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-controls-separator.constants.vertical">
-     <term><constant>UI\Controls\Separator::Vertical</constant></term>
-     <listitem>
-      <para>A Vertical Separator</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.controls.entities.separator;
-
-</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/ui/ui.controls.slider.xml b/reference/ui/ui.controls.slider.xml
deleted file mode 100644
index 7f9a69603be7..000000000000
--- a/reference/ui/ui.controls.slider.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-slider" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Slider Control</title>
- <titleabbrev>UI\Controls\Slider</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Slider intro -->
-  <section xml:id="ui-controls-slider.intro">
-   &reftitle.intro;
-   <para>
-    A Slider is a control which represents a range, and a current value in the range. The sliding element of the control (sometimes called the "thumb") reflects the value, and can be adjusted within the range.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-slider.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Slider</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Slider</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-slider')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />    
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-slider')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.slider;
-
-</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/ui/ui.controls.spin.xml b/reference/ui/ui.controls.spin.xml
deleted file mode 100644
index aed7d171168a..000000000000
--- a/reference/ui/ui.controls.spin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-spin" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Spin Control</title>
- <titleabbrev>UI\Controls\Spin</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Spin intro -->
-  <section xml:id="ui-controls-spin.intro">
-   &reftitle.intro;
-   <para>
-    A Spin box is a text box with an up-down control which changes the integer value in the box, within a defined range
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-spin.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Spin</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Spin</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-spin')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-spin')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.controls.entities.spin;
-
-</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/ui/ui.controls.tab.xml b/reference/ui/ui.controls.tab.xml
deleted file mode 100644
index 6bb2938e4fc3..000000000000
--- a/reference/ui/ui.controls.tab.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-controls-tab" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Tab Control</title>
- <titleabbrev>UI\Controls\Tab</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Controls\Tab intro -->
-  <section xml:id="ui-controls-tab.intro">
-   &reftitle.intro;
-   <para>
-    A Tab can contain many pages of Controls, each with a title, each selectable by the user.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-controls-tab.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Controls\Tab</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Controls\Tab</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-controls-tab.props.controls">controls</varname>
-    </fieldsynopsis>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-controls-tab')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Controls\Tab properties -->
-  <section xml:id="ui-controls-tab.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-controls-tab.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.ui.ui.controls.entities.tab;
-
-</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/ui/ui.draw.brush.gradient.xml b/reference/ui/ui.draw.brush.gradient.xml
deleted file mode 100644
index 99c0f61224bc..000000000000
--- a/reference/ui/ui.draw.brush.gradient.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-brush-gradient" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Gradient Brushes</title>
- <titleabbrev>UI\Draw\Brush\Gradient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Brush\Gradient intro -->
-  <section xml:id="ui-draw-brush-gradient.intro">
-   &reftitle.intro;
-   <para>
-     Abstract for gradient brushes
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-brush-gradient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Brush\Gradient</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>UI\Draw\Brush\Gradient</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Draw\Brush</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush-gradient')/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.ui-draw-brush')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.brush.gradient;
-
-</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/ui/ui.draw.brush.lineargradient.xml b/reference/ui/ui.draw.brush.lineargradient.xml
deleted file mode 100644
index 12010456c996..000000000000
--- a/reference/ui/ui.draw.brush.lineargradient.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-brush-lineargradient" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Linear Gradient</title>
- <titleabbrev>UI\Draw\Brush\LinearGradient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Brush\LinearGradient intro -->
-  <section xml:id="ui-draw-brush-lineargradient.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-brush-lineargradient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Brush\LinearGradient</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Brush\LinearGradient</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Draw\Brush\Gradient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush-lineargradient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <!--<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush-lineargradient')/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.ui-draw-brush-gradient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.brush.lineargradient;
-
-</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/ui/ui.draw.brush.radialgradient.xml b/reference/ui/ui.draw.brush.radialgradient.xml
deleted file mode 100644
index 7b63ab701cfc..000000000000
--- a/reference/ui/ui.draw.brush.radialgradient.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-brush-radialgradient" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Radial Gradient</title>
- <titleabbrev>UI\Draw\Brush\RadialGradient</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Brush\RadialGradient intro -->
-  <section xml:id="ui-draw-brush-radialgradient.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-brush-radialgradient.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Brush\RadialGradient</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Brush\RadialGradient</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Draw\Brush\Gradient</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush-radialgradient')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-   
-    <!--<classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush-radialgradient')/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.ui-draw-brush-gradient')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.brush.radialgradient;
-
-</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/ui/ui.draw.brush.xml b/reference/ui/ui.draw.brush.xml
deleted file mode 100644
index 6a003796be97..000000000000
--- a/reference/ui/ui.draw.brush.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-brush" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Brushes</title>
- <titleabbrev>UI\Draw\Brush</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Brush intro -->
-  <section xml:id="ui-draw-brush.intro">
-   &reftitle.intro;
-   <para>
-    Represents a solid color brush
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-brush.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Brush</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Brush</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-brush')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-    </classsynopsis>    
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.brush;
-
-</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/ui/ui.draw.color.xml b/reference/ui/ui.draw.color.xml
deleted file mode 100644
index 0ff735a7937e..000000000000
--- a/reference/ui/ui.draw.color.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-color" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Color Representation</title>
- <titleabbrev>UI\Draw\Color</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Color intro -->
-  <section xml:id="ui-draw-color.intro">
-   &reftitle.intro;
-   <para>
-    Represents RGBA colours, individual channels are accessible via public properties.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-color.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Color</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Color</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-color.constants.red">UI\Draw\Color::Red</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-color.constants.green">UI\Draw\Color::Green</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-color.constants.blue">UI\Draw\Color::Blue</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-color.constants.alpha">UI\Draw\Color::Alpha</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-draw-color.props.r">r</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-draw-color.props.g">g</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-draw-color.props.b">b</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-draw-color.props.a">a</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-color')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-color')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ UI\Draw\Color properties -->
-  <section xml:id="ui-draw-color.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-draw-color.props.r">
-     <term><varname>r</varname></term>
-     <listitem>
-      <para>Provides access to the red channel</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-color.props.g">
-     <term><varname>g</varname></term>
-     <listitem>
-      <para>Provides access to the green channel</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-color.props.b">
-     <term><varname>b</varname></term>
-     <listitem>
-      <para>Provides access to the blue channel</para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-color.props.a">
-     <term><varname>a</varname></term>
-     <listitem>
-      <para>Provides access to the alpha channel</para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ UI\Draw\Color constants -->
-  <section xml:id="ui-draw-color.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-color.constants.red">
-     <term><constant>UI\Draw\Color::Red</constant></term>
-     <listitem>
-      <para>Identifies the red channel</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-draw-color.constants.green">
-     <term><constant>UI\Draw\Color::Green</constant></term>
-     <listitem>
-      <para>Identifies the green channel</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-draw-color.constants.blue">
-     <term><constant>UI\Draw\Color::Blue</constant></term>
-     <listitem>
-      <para>Identifies the blue channel</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-draw-color.constants.alpha">
-     <term><constant>UI\Draw\Color::Alpha</constant></term>
-     <listitem>
-      <para>Identifies the alpha channel</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.draw.entities.color;
-
-</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/ui/ui.draw.line.cap.xml b/reference/ui/ui.draw.line.cap.xml
deleted file mode 100644
index 2a9488989229..000000000000
--- a/reference/ui/ui.draw.line.cap.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-line-cap" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Line Cap Settings</title>
- <titleabbrev>UI\Draw\Line\Cap</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Line\Cap intro -->
-  <section xml:id="ui-draw-line-cap.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-line-cap.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Line\Cap</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Line\Cap</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-cap.constants.flat">UI\Draw\Line\Cap::Flat</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-cap.constants.round">UI\Draw\Line\Cap::Round</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-cap.constants.square">UI\Draw\Line\Cap::Square</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Draw\Line\Cap constants -->
-  <section xml:id="ui-draw-line-cap.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-line-cap.constants.flat">
-     <term><constant>UI\Draw\Line\Cap::Flat</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-line-cap.constants.round">
-     <term><constant>UI\Draw\Line\Cap::Round</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-line-cap.constants.square">
-     <term><constant>UI\Draw\Line\Cap::Square</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.draw.line.join.xml b/reference/ui/ui.draw.line.join.xml
deleted file mode 100644
index 91303b3ad8cc..000000000000
--- a/reference/ui/ui.draw.line.join.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-line-join" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Line Join Settings</title>
- <titleabbrev>UI\Draw\Line\Join</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Line\Join intro -->
-  <section xml:id="ui-draw-line-join.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-line-join.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Line\Join</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Line\Join</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-join.constants.miter">UI\Draw\Line\Join::Miter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-join.constants.round">UI\Draw\Line\Join::Round</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-line-join.constants.bevel">UI\Draw\Line\Join::Bevel</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Draw\Line\Join constants -->
-  <section xml:id="ui-draw-line-join.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-line-join.constants.miter">
-     <term><constant>UI\Draw\Line\Join::Miter</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-line-join.constants.round">
-     <term><constant>UI\Draw\Line\Join::Round</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-line-join.constants.bevel">
-     <term><constant>UI\Draw\Line\Join::Bevel</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.draw.matrix.xml b/reference/ui/ui.draw.matrix.xml
deleted file mode 100644
index 54ae7ea24eba..000000000000
--- a/reference/ui/ui.draw.matrix.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-matrix" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Draw Matrix</title>
- <titleabbrev>UI\Draw\Matrix</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Matrix intro -->
-  <section xml:id="ui-draw-matrix.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-matrix.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Matrix</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Matrix</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-matrix')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.matrix;
-
-</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/ui/ui.draw.path.xml b/reference/ui/ui.draw.path.xml
deleted file mode 100644
index 273238d76db0..000000000000
--- a/reference/ui/ui.draw.path.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-path" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Draw Path</title>
- <titleabbrev>UI\Draw\Path</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Path intro -->
-  <section xml:id="ui-draw-path.intro">
-   &reftitle.intro;
-   <para>
-    A Draw Path guides a Draw Pen, telling the Pen where to draw on an Area.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-path.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Path</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Path</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-path.constants.winding">UI\Draw\Path::Winding</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-path.constants.alternate">UI\Draw\Path::Alternate</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-path')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-path')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Draw\Path constants -->
-  <section xml:id="ui-draw-path.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-path.constants.winding">
-     <term><constant>UI\Draw\Path::Winding</constant></term>
-     <listitem>
-      <para>
-       This is the default draw path mode
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="ui-draw-path.constants.alternate">
-     <term><constant>UI\Draw\Path::Alternate</constant></term>
-     <listitem>
-      <para>
-       This is the alternate draw path mode
-      </para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.draw.entities.path;
-
-</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/ui/ui.draw.pen.xml b/reference/ui/ui.draw.pen.xml
deleted file mode 100644
index dd83be9f78bb..000000000000
--- a/reference/ui/ui.draw.pen.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-pen" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Draw Pen</title>
- <titleabbrev>UI\Draw\Pen</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Pen intro -->
-  <section xml:id="ui-draw-pen.intro">
-   &reftitle.intro;
-   <para>
-    The Pen is passed to the Area Draw event handler, it is used for clipping, filling, stroking, and writing to Draw Paths.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-pen.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Pen</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Pen</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-pen')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.pen;
-
-</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/ui/ui.draw.stroke.xml b/reference/ui/ui.draw.stroke.xml
deleted file mode 100644
index c11b3d434f1c..000000000000
--- a/reference/ui/ui.draw.stroke.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-stroke" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Draw Stroke</title>
- <titleabbrev>UI\Draw\Stroke</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Stroke intro -->
-  <section xml:id="ui-draw-stroke.intro">
-   &reftitle.intro;
-   <para>
-    Holds the configuration for the Pen to perform a stroke
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-stroke.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Stroke</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Stroke</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-stroke')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-stroke')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.entities.stroke;
-
-</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/ui/ui.draw.text.font.descriptor.xml b/reference/ui/ui.draw.text.font.descriptor.xml
deleted file mode 100644
index 1acec0444525..000000000000
--- a/reference/ui/ui.draw.text.font.descriptor.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-font-descriptor" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Font Descriptor</title>
- <titleabbrev>UI\Draw\Text\Font\Descriptor</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Font\Descriptor intro -->
-  <section xml:id="ui-draw-text-font-descriptor.intro">
-   &reftitle.intro;
-   <para>
-    Describes a font
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-font-descriptor.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Font\Descriptor</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Text\Font\Descriptor</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-font-descriptor')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-font-descriptor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-<!-- }}} -->
-   </classsynopsis>
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.text.entities.font.descriptor;
-
-</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/ui/ui.draw.text.font.italic.xml b/reference/ui/ui.draw.text.font.italic.xml
deleted file mode 100644
index 34c1bbaa53e7..000000000000
--- a/reference/ui/ui.draw.text.font.italic.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-font-italic" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Italic Font Settings</title>
- <titleabbrev>UI\Draw\Text\Font\Italic</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Font\Italic intro -->
-  <section xml:id="ui-draw-text-font-italic.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-font-italic.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Font\Italic</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Text\Font\Italic</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-italic.constants.normal">UI\Draw\Text\Font\Italic::Normal</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-italic.constants.oblique">UI\Draw\Text\Font\Italic::Oblique</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-italic.constants.italic">UI\Draw\Text\Font\Italic::Italic</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Draw\Text\Font\Italic constants -->
-  <section xml:id="ui-draw-text-font-italic.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-text-font-italic.constants.normal">
-     <term><constant>UI\Draw\Text\Font\Italic::Normal</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-italic.constants.oblique">
-     <term><constant>UI\Draw\Text\Font\Italic::Oblique</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-italic.constants.italic">
-     <term><constant>UI\Draw\Text\Font\Italic::Italic</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.draw.text.font.stretch.xml b/reference/ui/ui.draw.text.font.stretch.xml
deleted file mode 100644
index 4f3da6c698b6..000000000000
--- a/reference/ui/ui.draw.text.font.stretch.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-font-stretch" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Font Stretch Settings</title>
- <titleabbrev>UI\Draw\Text\Font\Stretch</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Font\Stretch intro -->
-  <section xml:id="ui-draw-text-font-stretch.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-font-stretch.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Font\Stretch</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Text\Font\Stretch</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.ultracondensed">UI\Draw\Text\Font\Stretch::UltraCondensed</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.extracondensed">UI\Draw\Text\Font\Stretch::ExtraCondensed</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.condensed">UI\Draw\Text\Font\Stretch::Condensed</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.semicondensed">UI\Draw\Text\Font\Stretch::SemiCondensed</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.normal">UI\Draw\Text\Font\Stretch::Normal</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.semiexpanded">UI\Draw\Text\Font\Stretch::SemiExpanded</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.expanded">UI\Draw\Text\Font\Stretch::Expanded</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.extraexpanded">UI\Draw\Text\Font\Stretch::ExtraExpanded</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-stretch.constants.ultraexpanded">UI\Draw\Text\Font\Stretch::UltraExpanded</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Draw\Text\Font\Stretch constants -->
-  <section xml:id="ui-draw-text-font-stretch.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.ultracondensed">
-     <term><constant>UI\Draw\Text\Font\Stretch::UltraCondensed</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.extracondensed">
-     <term><constant>UI\Draw\Text\Font\Stretch::ExtraCondensed</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.condensed">
-     <term><constant>UI\Draw\Text\Font\Stretch::Condensed</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.semicondensed">
-     <term><constant>UI\Draw\Text\Font\Stretch::SemiCondensed</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.normal">
-     <term><constant>UI\Draw\Text\Font\Stretch::Normal</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.semiexpanded">
-     <term><constant>UI\Draw\Text\Font\Stretch::SemiExpanded</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.expanded">
-     <term><constant>UI\Draw\Text\Font\Stretch::Expanded</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.extraexpanded">
-     <term><constant>UI\Draw\Text\Font\Stretch::ExtraExpanded</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-stretch.constants.ultraexpanded">
-     <term><constant>UI\Draw\Text\Font\Stretch::UltraExpanded</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.draw.text.font.weight.xml b/reference/ui/ui.draw.text.font.weight.xml
deleted file mode 100644
index ab3952e8c857..000000000000
--- a/reference/ui/ui.draw.text.font.weight.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-font-weight" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Font Weight Settings</title>
- <titleabbrev>UI\Draw\Text\Font\Weight</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Font\Weight intro -->
-  <section xml:id="ui-draw-text-font-weight.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-font-weight.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Font\Weight</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Draw\Text\Font\Weight</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.thin">UI\Draw\Text\Font\Weight::Thin</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.ultralight">UI\Draw\Text\Font\Weight::UltraLight</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.light">UI\Draw\Text\Font\Weight::Light</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.book">UI\Draw\Text\Font\Weight::Book</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.normal">UI\Draw\Text\Font\Weight::Normal</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.medium">UI\Draw\Text\Font\Weight::Medium</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.semibold">UI\Draw\Text\Font\Weight::SemiBold</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.bold">UI\Draw\Text\Font\Weight::Bold</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.ultrabold">UI\Draw\Text\Font\Weight::UltraBold</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.heavy">UI\Draw\Text\Font\Weight::Heavy</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-draw-text-font-weight.constants.ultraheavy">UI\Draw\Text\Font\Weight::UltraHeavy</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Draw\Text\Font\Weight constants -->
-  <section xml:id="ui-draw-text-font-weight.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.thin">
-     <term><constant>UI\Draw\Text\Font\Weight::Thin</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.ultralight">
-     <term><constant>UI\Draw\Text\Font\Weight::UltraLight</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.light">
-     <term><constant>UI\Draw\Text\Font\Weight::Light</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.book">
-     <term><constant>UI\Draw\Text\Font\Weight::Book</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.normal">
-     <term><constant>UI\Draw\Text\Font\Weight::Normal</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.medium">
-     <term><constant>UI\Draw\Text\Font\Weight::Medium</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.semibold">
-     <term><constant>UI\Draw\Text\Font\Weight::SemiBold</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.bold">
-     <term><constant>UI\Draw\Text\Font\Weight::Bold</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.ultrabold">
-     <term><constant>UI\Draw\Text\Font\Weight::UltraBold</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.heavy">
-     <term><constant>UI\Draw\Text\Font\Weight::Heavy</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-draw-text-font-weight.constants.ultraheavy">
-     <term><constant>UI\Draw\Text\Font\Weight::UltraHeavy</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.draw.text.font.xml b/reference/ui/ui.draw.text.font.xml
deleted file mode 100644
index f1084d49a84c..000000000000
--- a/reference/ui/ui.draw.text.font.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-font" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Represents a Font</title>
- <titleabbrev>UI\Draw\Text\Font</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Font intro -->
-  <section xml:id="ui-draw-text-font.intro">
-   &reftitle.intro;
-   <para>
-    Loads a described font
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-font.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Font</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Text\Font</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-font')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-font')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.text.entities.font;
-
-</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/ui/ui.draw.text.layout.xml b/reference/ui/ui.draw.text.layout.xml
deleted file mode 100644
index 5a86970d2f21..000000000000
--- a/reference/ui/ui.draw.text.layout.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-draw-text-layout" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Represents Text Layout</title>
- <titleabbrev>UI\Draw\Text\Layout</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Draw\Text\Layout intro -->
-  <section xml:id="ui-draw-text-layout.intro">
-   &reftitle.intro;
-   <para>
-    A Text Layout represents the layout of text which will be drawn by the Pen
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-draw-text-layout.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Draw\Text\Layout</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Draw\Text\Layout</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-layout')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-   
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-draw-text-layout')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.draw.text.entities.layout;
-
-</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/ui/ui.exception.invalidargumentexception.xml b/reference/ui/ui.exception.invalidargumentexception.xml
deleted file mode 100644
index 434da197d86d..000000000000
--- a/reference/ui/ui.exception.invalidargumentexception.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-exception-invalidargumentexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>InvalidArgumentException</title>
- <titleabbrev>UI\Exception\InvalidArgumentException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Exception\InvalidArgumentException intro -->
-  <section xml:id="ui-exception-invalidargumentexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-exception-invalidargumentexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Exception\InvalidArgumentException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Exception\InvalidArgumentException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>InvalidArgumentException</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/ui/ui.exception.runtimeexception.xml b/reference/ui/ui.exception.runtimeexception.xml
deleted file mode 100644
index 89f379417214..000000000000
--- a/reference/ui/ui.exception.runtimeexception.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-exception-runtimeexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>RuntimeException</title>
- <titleabbrev>UI\Exception\RuntimeException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Exception\RuntimeException intro -->
-  <section xml:id="ui-exception-runtimeexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-exception-runtimeexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Exception\RuntimeException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Exception\RuntimeException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
-    </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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/ui/ui.executor.xml b/reference/ui/ui.executor.xml
deleted file mode 100644
index cf240f1bc7fa..000000000000
--- a/reference/ui/ui.executor.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-executor" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Execution Scheduler</title>
- <titleabbrev>UI\Executor</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Executor intro -->
-  <section xml:id="ui-executor.intro">
-   &reftitle.intro;
-   <para>
-    This facility schedules repetitive execution of a callback, useful for animations and other such activities.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-executor.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Executor</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>UI\Executor</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-executor')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-executor')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.entities.executor;
-
-</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/ui/ui.key.xml b/reference/ui/ui.key.xml
deleted file mode 100644
index cf1e612c87bc..000000000000
--- a/reference/ui/ui.key.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-key" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Key Identifiers</title>
- <titleabbrev>UI\Key</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Key intro -->
-  <section xml:id="ui-key.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-key.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Key</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Key</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.escape">UI\Key::Escape</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.insert">UI\Key::Insert</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.delete">UI\Key::Delete</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.home">UI\Key::Home</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.end">UI\Key::End</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.pageup">UI\Key::PageUp</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.pagedown">UI\Key::PageDown</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.up">UI\Key::Up</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.down">UI\Key::Down</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.left">UI\Key::Left</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.right">UI\Key::Right</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f1">UI\Key::F1</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f2">UI\Key::F2</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f3">UI\Key::F3</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f4">UI\Key::F4</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f5">UI\Key::F5</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f6">UI\Key::F6</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f7">UI\Key::F7</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f8">UI\Key::F8</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f9">UI\Key::F9</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f10">UI\Key::F10</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f11">UI\Key::F11</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.f12">UI\Key::F12</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n0">UI\Key::N0</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n1">UI\Key::N1</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n2">UI\Key::N2</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n3">UI\Key::N3</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n4">UI\Key::N4</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n5">UI\Key::N5</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n6">UI\Key::N6</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n7">UI\Key::N7</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n8">UI\Key::N8</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.n9">UI\Key::N9</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.ndot">UI\Key::NDot</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.nenter">UI\Key::NEnter</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.nadd">UI\Key::NAdd</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.nsubtract">UI\Key::NSubtract</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.nmultiply">UI\Key::NMultiply</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="ui-key.constants.ndivide">UI\Key::NDivide</varname>
-    </fieldsynopsis>
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  <!-- {{{ UI\Key constants -->
-  <section xml:id="ui-key-stretch.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="ui-key.constants.escape">
-     <term><constant>UI\Key::Escape</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.insert">
-     <term><constant>UI\Key::Insert</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.delete">
-     <term><constant>UI\Key::Delete</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.home">
-     <term><constant>UI\Key::Home</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.end">
-     <term><constant>UI\Key::End</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.pageup">
-     <term><constant>UI\Key::PageUp</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.pagedown">
-     <term><constant>UI\Key::PageDown</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.up">
-     <term><constant>UI\Key::Up</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.down">
-     <term><constant>UI\Key::Down</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.left">
-     <term><constant>UI\Key::Left</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.right">
-     <term><constant>UI\Key::Right</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f1">
-     <term><constant>UI\Key::F1</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f2">
-     <term><constant>UI\Key::F2</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f3">
-     <term><constant>UI\Key::F3</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f4">
-     <term><constant>UI\Key::F4</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f5">
-     <term><constant>UI\Key::F5</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f6">
-     <term><constant>UI\Key::F6</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f7">
-     <term><constant>UI\Key::F7</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f8">
-     <term><constant>UI\Key::F8</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f9">
-     <term><constant>UI\Key::F9</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f10">
-     <term><constant>UI\Key::F10</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f11">
-     <term><constant>UI\Key::F11</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.f12">
-     <term><constant>UI\Key::F12</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n0">
-     <term><constant>UI\Key::N0</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n1">
-     <term><constant>UI\Key::N1</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n2">
-     <term><constant>UI\Key::N2</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n3">
-     <term><constant>UI\Key::N3</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n4">
-     <term><constant>UI\Key::N4</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n5">
-     <term><constant>UI\Key::N5</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n6">
-     <term><constant>UI\Key::N6</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n7">
-     <term><constant>UI\Key::N7</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n8">
-     <term><constant>UI\Key::N8</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.n9">
-     <term><constant>UI\Key::N9</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.ndot">
-     <term><constant>UI\Key::NDot</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.nenter">
-     <term><constant>UI\Key::NEnter</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.nadd">
-     <term><constant>UI\Key::NAdd</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.nsubtract">
-     <term><constant>UI\Key::NSubtract</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.nmultiply">
-     <term><constant>UI\Key::NMultiply</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-key.constants.ndivide">
-     <term><constant>UI\Key::NDivide</constant></term>
-     <listitem>
-      <simpara></simpara>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-
- </partintro>
-
-</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/ui/ui.menu.xml b/reference/ui/ui.menu.xml
deleted file mode 100644
index dce779bc860d..000000000000
--- a/reference/ui/ui.menu.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-menu" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Menu</title>
- <titleabbrev>UI\Menu</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Menu intro -->
-  <section xml:id="ui-menu.intro">
-   &reftitle.intro;
-   <para>
-    Menus must be constructed before the first Window, and can be shown on any Window
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-menu.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Menu</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Menu</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-     <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-menu')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-menu')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.entities.menu;
-
-</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/ui/ui.menuitem.xml b/reference/ui/ui.menuitem.xml
deleted file mode 100644
index 165720394dba..000000000000
--- a/reference/ui/ui.menuitem.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-menuitem" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Menu Item</title>
- <titleabbrev>UI\MenuItem</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\MenuItem intro -->
-  <section xml:id="ui-menuitem.intro">
-   &reftitle.intro;
-   <para>
-    Menu Items should only be created by the Menu
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-menuitem.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\MenuItem</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\MenuItem</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-menuitem')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.ui.ui.entities.menuitem;
-
-</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/ui/ui.point.xml b/reference/ui/ui.point.xml
deleted file mode 100644
index 2e47a6987afb..000000000000
--- a/reference/ui/ui.point.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-point" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Represents a position (x,y)</title>
- <titleabbrev>UI\Point</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Point intro -->
-  <section xml:id="ui-point.intro">
-   &reftitle.intro;
-   <para>
-    Points are used throughout UI to represent co-ordinates on a screen, control, or area.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-point.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Point</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Point</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-point.props.x">x</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-point.props.y">y</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-point')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-point')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ UI\Point properties -->
-  <section xml:id="ui-point.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-point.props.x">
-     <term><varname>x</varname></term>
-     <listitem>
-      <para>
-       Holds the X co-ordinate, can be read/written directly
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-point.props.y">
-     <term><varname>y</varname></term>
-     <listitem>
-      <para>
-       Holds the Y co-ordinate, can be read/written directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.ui.ui.entities.point;
-
-</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/ui/ui.size.xml b/reference/ui/ui.size.xml
deleted file mode 100644
index a285ac0aeab6..000000000000
--- a/reference/ui/ui.size.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-size" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Represents dimensions (width, height)</title>
- <titleabbrev>UI\Size</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Size intro -->
-  <section xml:id="ui-size.intro">
-   &reftitle.intro;
-   <para>
-    Sizes are used throughout UI to represent the size of a screen, control, or area.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-size.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Size</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>UI\Size</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-size.props.width">width</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="ui-size.props.height">height</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-size')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-size')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Size properties -->
-  <section xml:id="ui-size.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-size.props.width">
-     <term><varname>width</varname></term>
-     <listitem>
-      <para>
-       Holds the width, can be read/written directly
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ui-size.props.height">
-     <term><varname>height</varname></term>
-     <listitem>
-      <para>
-       Holds the height, can be read/written directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.ui.ui.entities.size;
-
-</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/ui/ui.window.xml b/reference/ui/ui.window.xml
deleted file mode 100644
index 4a63a06d1bac..000000000000
--- a/reference/ui/ui.window.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.ui-window" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>Window</title>
- <titleabbrev>UI\Window</titleabbrev>
-
- <partintro>
-
-<!-- {{{ UI\Window intro -->
-  <section xml:id="ui-window.intro">
-   &reftitle.intro;
-   <para>
-    Represents a UI Window
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="ui-window.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>UI\Window</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>UI\Window</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>UI\Control</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="ui-window.props.controls">controls</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-window')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ui-window')/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.ui-control')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ UI\Window properties -->
-  <section xml:id="ui-window.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="ui-window.props.controls">
-     <term><varname>controls</varname></term>
-     <listitem>
-      <para>
-       Contains controls, should not be manipulated directly
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.ui.ui.entities.window;
-
-</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/ui/ui/area/ondraw.xml b/reference/ui/ui/area/ondraw.xml
deleted file mode 100644
index f971e9ef3fb8..000000000000
--- a/reference/ui/ui/area/ondraw.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.ondraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::onDraw</refname>
-  <refpurpose>Draw Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Area::onDraw</methodname>
-   <methodparam><type>UI\Draw\Pen</type><parameter>pen</parameter></methodparam>
-   <methodparam><type>UI\Size</type><parameter>areaSize</parameter></methodparam>
-   <methodparam><type>UI\Point</type><parameter>clipPoint</parameter></methodparam>
-   <methodparam><type>UI\Size</type><parameter>clipSize</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall be invoked when this Area requires redrawing
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>pen</parameter></term>
-    <listitem>
-     <para>
-      A Pen suitable for drawing in this Area
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>areaSize</parameter></term>
-    <listitem>
-     <para>
-      The size of the Area
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>clipPoint</parameter></term>
-    <listitem>
-     <para>
-      The clip point of the Area
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>clipSize</parameter></term>
-    <listitem>
-     <para>
-      The clip size of the Area
-     </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/ui/ui/area/onkey.xml b/reference/ui/ui/area/onkey.xml
deleted file mode 100644
index 9a22470403b4..000000000000
--- a/reference/ui/ui/area/onkey.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.onkey" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::onKey</refname>
-  <refpurpose>Key Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Area::onKey</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>ext</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall be executed on key events
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <para>
-      The key pressed
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ext</parameter></term>
-    <listitem>
-     <para>
-      The extended key pressed
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Event modifiers
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/area/onmouse.xml b/reference/ui/ui/area/onmouse.xml
deleted file mode 100644
index da448b6584cb..000000000000
--- a/reference/ui/ui/area/onmouse.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.onmouse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::onMouse</refname>
-  <refpurpose>Mouse Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Area::onMouse</methodname>
-   <methodparam><type>UI\Point</type><parameter>areaPoint</parameter></methodparam>
-   <methodparam><type>UI\Size</type><parameter>areaSize</parameter></methodparam>
-   <methodparam><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall be executed on mouse events
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>areaPoint</parameter></term>
-    <listitem>
-     <para>
-      The co-ordinates of the event
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>areaSize</parameter></term>
-    <listitem>
-     <para>
-      The size of the area of the event
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Event modifiers
-     </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/ui/ui/area/redraw.xml b/reference/ui/ui/area/redraw.xml
deleted file mode 100644
index 9fb70ec27a55..000000000000
--- a/reference/ui/ui/area/redraw.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.redraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::redraw</refname>
-  <refpurpose>Redraw Area</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Area::redraw</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Requests that this Area is redrawn
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/area/scrollto.xml b/reference/ui/ui/area/scrollto.xml
deleted file mode 100644
index 43ef2d991b93..000000000000
--- a/reference/ui/ui/area/scrollto.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.scrollto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::scrollTo</refname>
-  <refpurpose>Area Scroll</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Area::scrollTo</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>UI\Size</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Scroll this Area
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to scroll to
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The size of the scroll pane
-     </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/ui/ui/area/setsize.xml b/reference/ui/ui/area/setsize.xml
deleted file mode 100644
index 49d734b23eb7..000000000000
--- a/reference/ui/ui/area/setsize.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-area.setsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Area::setSize</refname>
-  <refpurpose>Set Size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Area::setSize</methodname>
-   <methodparam><type>UI\Size</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the size of this Area
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The new size
-     </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/ui/ui/control/destroy.xml b/reference/ui/ui/control/destroy.xml
deleted file mode 100644
index 0dfe346966ec..000000000000
--- a/reference/ui/ui/control/destroy.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.destroy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::destroy</refname>
-  <refpurpose>Destroy Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::destroy</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall destroy this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/disable.xml b/reference/ui/ui/control/disable.xml
deleted file mode 100644
index b1df41f497e4..000000000000
--- a/reference/ui/ui/control/disable.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::disable</refname>
-  <refpurpose>Disable Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::disable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall disable this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/enable.xml b/reference/ui/ui/control/enable.xml
deleted file mode 100644
index 907ebc1ce8a3..000000000000
--- a/reference/ui/ui/control/enable.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::enable</refname>
-  <refpurpose>Enable Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::enable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall enable this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/getparent.xml b/reference/ui/ui/control/getparent.xml
deleted file mode 100644
index 3945071b0d7e..000000000000
--- a/reference/ui/ui/control/getparent.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.getparent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::getParent</refname>
-  <refpurpose>Get Parent Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\Control</type><methodname>UI\Control::getParent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Shall return the parent Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/gettoplevel.xml b/reference/ui/ui/control/gettoplevel.xml
deleted file mode 100644
index 0fa6de8a430b..000000000000
--- a/reference/ui/ui/control/gettoplevel.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.gettoplevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::getTopLevel</refname>
-  <refpurpose>Get Top Level</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Control::getTopLevel</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/hide.xml b/reference/ui/ui/control/hide.xml
deleted file mode 100644
index b8dd6da8cb1c..000000000000
--- a/reference/ui/ui/control/hide.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.hide" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::hide</refname>
-  <refpurpose>Hide Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::hide</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall hide this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/isenabled.xml b/reference/ui/ui/control/isenabled.xml
deleted file mode 100644
index 07a33918b0c3..000000000000
--- a/reference/ui/ui/control/isenabled.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.isenabled" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::isEnabled</refname>
-  <refpurpose>Determine if Control is enabled</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Control::isEnabled</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Control is enabled
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/isvisible.xml b/reference/ui/ui/control/isvisible.xml
deleted file mode 100644
index 0d7d70428e71..000000000000
--- a/reference/ui/ui/control/isvisible.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.isvisible" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::isVisible</refname>
-  <refpurpose>Determine if Control is visible</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Control::isVisible</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Control is visible
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/setparent.xml b/reference/ui/ui/control/setparent.xml
deleted file mode 100644
index 851a728e2a1d..000000000000
--- a/reference/ui/ui/control/setparent.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.setparent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::setParent</refname>
-  <refpurpose>Set Parent Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::setParent</methodname>
-   <methodparam><type>UI\Control</type><parameter>parent</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the parent Control of this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>parent</parameter></term>
-    <listitem>
-     <para>
-      The parent Control
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/control/show.xml b/reference/ui/ui/control/show.xml
deleted file mode 100644
index 8fe37f6d1ff4..000000000000
--- a/reference/ui/ui/control/show.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-control.show" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Control::show</refname>
-  <refpurpose>Control Show</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Control::show</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall show this Control
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/box/append.xml b/reference/ui/ui/controls/box/append.xml
deleted file mode 100644
index 0d199a8bcdce..000000000000
--- a/reference/ui/ui/controls/box/append.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::append</refname>
-  <refpurpose>Append Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Box::append</methodname>
-   <methodparam><type>Control</type><parameter>control</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>stretchy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append the given control to this Box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The control to append
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stretchy</parameter></term>
-    <listitem>
-     <para>
-      Set true to stretch the control
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Shall return the index of the appended control, may be 0
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/box/construct.xml b/reference/ui/ui/controls/box/construct.xml
deleted file mode 100644
index 6d3b2b20102c..000000000000
--- a/reference/ui/ui/controls/box/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::__construct</refname>
-  <refpurpose>Construct a new Box</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Box::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>orientation</parameter><initializer>UI\Controls\Box::Horizontal</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>orientation</parameter></term>
-    <listitem>
-     <para>
-      Box::Horizontal or Box::Vertical
-     </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/ui/ui/controls/box/delete.xml b/reference/ui/ui/controls/box/delete.xml
deleted file mode 100644
index 36f5c12efe27..000000000000
--- a/reference/ui/ui/controls/box/delete.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::delete</refname>
-  <refpurpose>Delete Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Box::delete</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall delete the control at the given index from this Box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the control to delete
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Indication of 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/ui/ui/controls/box/getorientation.xml b/reference/ui/ui/controls/box/getorientation.xml
deleted file mode 100644
index c3de918e9098..000000000000
--- a/reference/ui/ui/controls/box/getorientation.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.getorientation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::getOrientation</refname>
-  <refpurpose>Get Orientation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Box::getOrientation</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the orientation of this Box
-  </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/ui/ui/controls/box/ispadded.xml b/reference/ui/ui/controls/box/ispadded.xml
deleted file mode 100644
index beb15d6a406d..000000000000
--- a/reference/ui/ui/controls/box/ispadded.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.ispadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::isPadded</refname>
-  <refpurpose>Padding Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Box::isPadded</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if padding is enabled on this Box
-  </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/ui/ui/controls/box/setpadded.xml b/reference/ui/ui/controls/box/setpadded.xml
deleted file mode 100644
index f20137f83a8e..000000000000
--- a/reference/ui/ui/controls/box/setpadded.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-box.setpadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Box::setPadded</refname>
-  <refpurpose>Set Padding</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Box::setPadded</methodname>
-   <methodparam><type>bool</type><parameter>padded</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable padding on this Box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>padded</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/button/construct.xml b/reference/ui/ui/controls/button/construct.xml
deleted file mode 100644
index 36dcb48dd1c8..000000000000
--- a/reference/ui/ui/controls/button/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-button.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Button::__construct</refname>
-  <refpurpose>Construct a new Button</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Button::__construct</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Button
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text (label) for this Button
-     </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/ui/ui/controls/button/gettext.xml b/reference/ui/ui/controls/button/gettext.xml
deleted file mode 100644
index fda90a4e6f8d..000000000000
--- a/reference/ui/ui/controls/button/gettext.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-button.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Button::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\Button::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the text (label) for this Button
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current text (label)
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/button/onclick.xml b/reference/ui/ui/controls/button/onclick.xml
deleted file mode 100644
index 6fdf9ce4d444..000000000000
--- a/reference/ui/ui/controls/button/onclick.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-button.onclick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Button::onClick</refname>
-  <refpurpose>Click Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Button::onClick</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when this Button is clicked
-  </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/ui/ui/controls/button/settext.xml b/reference/ui/ui/controls/button/settext.xml
deleted file mode 100644
index 6604cddd9d99..000000000000
--- a/reference/ui/ui/controls/button/settext.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-button.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Button::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Button::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text (label) for this Button
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text (label)
-     </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/ui/ui/controls/check/construct.xml b/reference/ui/ui/controls/check/construct.xml
deleted file mode 100644
index 600c1e9aebdc..000000000000
--- a/reference/ui/ui/controls/check/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::__construct</refname>
-  <refpurpose>Construct a new Check</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Check::__construct</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Check
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text (label) for the Check box
-     </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/ui/ui/controls/check/gettext.xml b/reference/ui/ui/controls/check/gettext.xml
deleted file mode 100644
index 4856d3daf3fa..000000000000
--- a/reference/ui/ui/controls/check/gettext.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\Check::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the text (label) for this Check
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current text (label)
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/check/ischecked.xml b/reference/ui/ui/controls/check/ischecked.xml
deleted file mode 100644
index 1c35432049e3..000000000000
--- a/reference/ui/ui/controls/check/ischecked.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.ischecked" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::isChecked</refname>
-  <refpurpose>Checked Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Check::isChecked</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect the status of this Check
-  </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/ui/ui/controls/check/ontoggle.xml b/reference/ui/ui/controls/check/ontoggle.xml
deleted file mode 100644
index aa2e59effe66..000000000000
--- a/reference/ui/ui/controls/check/ontoggle.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.ontoggle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::onToggle</refname>
-  <refpurpose>Toggle Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Check::onToggle</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the status of this Check is changed
-  </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/ui/ui/controls/check/setchecked.xml b/reference/ui/ui/controls/check/setchecked.xml
deleted file mode 100644
index 46c2400ef3eb..000000000000
--- a/reference/ui/ui/controls/check/setchecked.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.setchecked" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::setChecked</refname>
-  <refpurpose>Set Checked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Check::setChecked</methodname>
-   <methodparam><type>bool</type><parameter>checked</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall change the status of this Check
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>checked</parameter></term>
-    <listitem>
-     <para>
-      The new status
-     </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/ui/ui/controls/check/settext.xml b/reference/ui/ui/controls/check/settext.xml
deleted file mode 100644
index de2642afe79c..000000000000
--- a/reference/ui/ui/controls/check/settext.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-check.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Check::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Check::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text (label) for this Check
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text (label)
-     </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/ui/ui/controls/colorbutton/getcolor.xml b/reference/ui/ui/controls/colorbutton/getcolor.xml
deleted file mode 100644
index f5205749c2fc..000000000000
--- a/reference/ui/ui/controls/colorbutton/getcolor.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-colorbutton.getcolor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\ColorButton::getColor</refname>
-  <refpurpose>Get Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\Color</type><methodname>UI\Controls\ColorButton::getColor</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the currently selected Color
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/colorbutton/onchange.xml b/reference/ui/ui/controls/colorbutton/onchange.xml
deleted file mode 100644
index a9256e50a87a..000000000000
--- a/reference/ui/ui/controls/colorbutton/onchange.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-colorbutton.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\ColorButton::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\ColorButton::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the selected Color is changed
-  </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/ui/ui/controls/colorbutton/setcolor.xml b/reference/ui/ui/controls/colorbutton/setcolor.xml
deleted file mode 100644
index 07b2dd1fab55..000000000000
--- a/reference/ui/ui/controls/colorbutton/setcolor.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-colorbutton.setcolor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\ColorButton::setColor</refname>
-  <refpurpose>Set Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\ColorButton::setColor</methodname>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\ColorButton::setColor</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the currently selected Color
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      The new color
-     </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/ui/ui/controls/combo/append.xml b/reference/ui/ui/controls/combo/append.xml
deleted file mode 100644
index be6012ab7916..000000000000
--- a/reference/ui/ui/controls/combo/append.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-combo.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Combo::append</refname>
-  <refpurpose>Append Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Combo::append</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Append an option to this Combo
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text for the new option
-     </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/ui/ui/controls/combo/getselected.xml b/reference/ui/ui/controls/combo/getselected.xml
deleted file mode 100644
index 0feb52925e72..000000000000
--- a/reference/ui/ui/controls/combo/getselected.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-combo.getselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Combo::getSelected</refname>
-  <refpurpose>Get Selected Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Combo::getSelected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the index of the option selected in this Combo
-  </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/ui/ui/controls/combo/onselected.xml b/reference/ui/ui/controls/combo/onselected.xml
deleted file mode 100644
index 57f7ff8d6893..000000000000
--- a/reference/ui/ui/controls/combo/onselected.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-combo.onselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Combo::onSelected</refname>
-  <refpurpose>Selected Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Combo::onSelected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when an option is selected in this Combo
-  </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/ui/ui/controls/combo/setselected.xml b/reference/ui/ui/controls/combo/setselected.xml
deleted file mode 100644
index 1755fcbb6459..000000000000
--- a/reference/ui/ui/controls/combo/setselected.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-combo.setselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Combo::setSelected</refname>
-  <refpurpose>Set Selected Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Combo::setSelected</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the currently selected option in this Combo
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the option to select
-     </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/ui/ui/controls/editablecombo/append.xml b/reference/ui/ui/controls/editablecombo/append.xml
deleted file mode 100644
index 333b35c7da72..000000000000
--- a/reference/ui/ui/controls/editablecombo/append.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-editablecombo.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\EditableCombo::append</refname>
-  <refpurpose>Append Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\EditableCombo::append</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a new option to this Editable Combo
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text for the new option
-     </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/ui/ui/controls/editablecombo/gettext.xml b/reference/ui/ui/controls/editablecombo/gettext.xml
deleted file mode 100644
index f9b151094a8c..000000000000
--- a/reference/ui/ui/controls/editablecombo/gettext.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-editablecombo.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\EditableCombo::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\EditableCombo::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the value of the currently selected option in this Editable Combo
-  </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/ui/ui/controls/editablecombo/onchange.xml b/reference/ui/ui/controls/editablecombo/onchange.xml
deleted file mode 100644
index 09b9a4735df3..000000000000
--- a/reference/ui/ui/controls/editablecombo/onchange.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-editablecombo.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\EditableCombo::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\EditableCombo::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the value of this Editable Combobox changes
-  </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/ui/ui/controls/editablecombo/settext.xml b/reference/ui/ui/controls/editablecombo/settext.xml
deleted file mode 100644
index 82982d41e80c..000000000000
--- a/reference/ui/ui/controls/editablecombo/settext.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-editablecombo.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\EditableCombo::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\EditableCombo::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text of the currently selected option in this Editable Combo
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text
-     </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/ui/ui/controls/entry/construct.xml b/reference/ui/ui/controls/entry/construct.xml
deleted file mode 100644
index a645a77e7c4f..000000000000
--- a/reference/ui/ui/controls/entry/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::__construct</refname>
-  <refpurpose>Construct a new Entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Entry::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>UI\Controls\Entry::Normal</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Construct a new entry of the given type
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      Entry::Normal, Entry::Password, or Entry::Search
-     </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/ui/ui/controls/entry/gettext.xml b/reference/ui/ui/controls/entry/gettext.xml
deleted file mode 100644
index 56d0d914ede9..000000000000
--- a/reference/ui/ui/controls/entry/gettext.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\Entry::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the current text from this Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current text
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/entry/isreadonly.xml b/reference/ui/ui/controls/entry/isreadonly.xml
deleted file mode 100644
index e6231563e52e..000000000000
--- a/reference/ui/ui/controls/entry/isreadonly.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.isreadonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::isReadOnly</refname>
-  <refpurpose>Detect Read Only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Entry::isReadOnly</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Entry is read only
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/entry/onchange.xml b/reference/ui/ui/controls/entry/onchange.xml
deleted file mode 100644
index 570e1eec1664..000000000000
--- a/reference/ui/ui/controls/entry/onchange.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Entry::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the text in this Entry changes
-  </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/ui/ui/controls/entry/setreadonly.xml b/reference/ui/ui/controls/entry/setreadonly.xml
deleted file mode 100644
index a7151962f9d7..000000000000
--- a/reference/ui/ui/controls/entry/setreadonly.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.setreadonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::setReadOnly</refname>
-  <refpurpose>Set Read Only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Entry::setReadOnly</methodname>
-   <methodparam><type>bool</type><parameter>readOnly</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable read only for this Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>readOnly</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/entry/settext.xml b/reference/ui/ui/controls/entry/settext.xml
deleted file mode 100644
index 2c7399359333..000000000000
--- a/reference/ui/ui/controls/entry/settext.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-entry.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Entry::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Entry::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text for this Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text
-     </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/ui/ui/controls/form/append.xml b/reference/ui/ui/controls/form/append.xml
deleted file mode 100644
index 123b37f37b00..000000000000
--- a/reference/ui/ui/controls/form/append.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-form.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Form::append</refname>
-  <refpurpose>Append Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Form::append</methodname>
-   <methodparam><type>string</type><parameter>label</parameter></methodparam>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>stretchy</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append the control to the form, and set the label
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>label</parameter></term>
-    <listitem>
-     <para>
-      The text for the label
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      A control
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stretchy</parameter></term>
-    <listitem>
-     <para>
-      Should be set true to stretch the control
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Shall return the index of the appended control, may be 0
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/form/delete.xml b/reference/ui/ui/controls/form/delete.xml
deleted file mode 100644
index cd7a95b71c14..000000000000
--- a/reference/ui/ui/controls/form/delete.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-form.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Form::delete</refname>
-  <refpurpose>Delete Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Form::delete</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall delete the control at the given index in this Form
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the control to remove
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Indication of success
-  </simpara>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/form/ispadded.xml b/reference/ui/ui/controls/form/ispadded.xml
deleted file mode 100644
index e37a922b1d52..000000000000
--- a/reference/ui/ui/controls/form/ispadded.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-form.ispadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Form::isPadded</refname>
-  <refpurpose>Padding Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Form::isPadded</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if padding is enabled on this Form
-  </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/ui/ui/controls/form/setpadded.xml b/reference/ui/ui/controls/form/setpadded.xml
deleted file mode 100644
index e7625f6d65e2..000000000000
--- a/reference/ui/ui/controls/form/setpadded.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-form.setpadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Form::setPadded</refname>
-  <refpurpose>Set Padding</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Form::setPadded</methodname>
-   <methodparam><type>bool</type><parameter>padded</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable padding on this Form
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>padded</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/grid/append.xml b/reference/ui/ui/controls/grid/append.xml
deleted file mode 100644
index d99c64137d4c..000000000000
--- a/reference/ui/ui/controls/grid/append.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-grid.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Grid::append</refname>
-  <refpurpose>Append Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Grid::append</methodname>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-   <methodparam><type>int</type><parameter>left</parameter></methodparam>
-   <methodparam><type>int</type><parameter>top</parameter></methodparam>
-   <methodparam><type>int</type><parameter>xspan</parameter></methodparam>
-   <methodparam><type>int</type><parameter>yspan</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>hexpand</parameter></methodparam>
-   <methodparam><type>int</type><parameter>halign</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>vexpand</parameter></methodparam>
-   <methodparam><type>int</type><parameter>valign</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The Control to append
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>left</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>top</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>xspan</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>yspan</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>hexpand</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>halign</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vexpand</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>valign</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/grid/ispadded.xml b/reference/ui/ui/controls/grid/ispadded.xml
deleted file mode 100644
index 0b2a8648668a..000000000000
--- a/reference/ui/ui/controls/grid/ispadded.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-grid.ispadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Grid::isPadded</refname>
-  <refpurpose>Padding Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Grid::isPadded</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if padding is enabled on this Grid
-  </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/ui/ui/controls/grid/setpadded.xml b/reference/ui/ui/controls/grid/setpadded.xml
deleted file mode 100644
index 0cb609e54b38..000000000000
--- a/reference/ui/ui/controls/grid/setpadded.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-grid.setpadded" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Grid::setPadded</refname>
-  <refpurpose>Set Padding</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Grid::setPadded</methodname>
-   <methodparam><type>bool</type><parameter>padding</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable padding for this Grid
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>padding</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/group/append.xml b/reference/ui/ui/controls/group/append.xml
deleted file mode 100644
index 3ca0a77ec738..000000000000
--- a/reference/ui/ui/controls/group/append.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::append</refname>
-  <refpurpose>Append Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Group::append</methodname>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a control to this Group
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The control to append
-     </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/ui/ui/controls/group/construct.xml b/reference/ui/ui/controls/group/construct.xml
deleted file mode 100644
index 5137f3430659..000000000000
--- a/reference/ui/ui/controls/group/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::__construct</refname>
-  <refpurpose>Construct a new Group</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Group::__construct</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Group with the given title
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The text for the title label
-     </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/ui/ui/controls/group/gettitle.xml b/reference/ui/ui/controls/group/gettitle.xml
deleted file mode 100644
index 10e8026b5ceb..000000000000
--- a/reference/ui/ui/controls/group/gettitle.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.gettitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::getTitle</refname>
-  <refpurpose>Get Title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\Group::getTitle</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the current title for this Group
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current title
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/group/hasmargin.xml b/reference/ui/ui/controls/group/hasmargin.xml
deleted file mode 100644
index 34d4f30c9568..000000000000
--- a/reference/ui/ui/controls/group/hasmargin.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.hasmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::hasMargin</refname>
-  <refpurpose>Margin Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Group::hasMargin</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Group has a margin
-  </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/ui/ui/controls/group/setmargin.xml b/reference/ui/ui/controls/group/setmargin.xml
deleted file mode 100644
index 021d40276a6e..000000000000
--- a/reference/ui/ui/controls/group/setmargin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.setmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::setMargin</refname>
-  <refpurpose>Set Margin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Group::setMargin</methodname>
-   <methodparam><type>bool</type><parameter>margin</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable margins for this Group
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>margin</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/group/settitle.xml b/reference/ui/ui/controls/group/settitle.xml
deleted file mode 100644
index a5b4f1c7f65d..000000000000
--- a/reference/ui/ui/controls/group/settitle.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-group.settitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Group::setTitle</refname>
-  <refpurpose>Set Title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Group::setTitle</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the title for this Group
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The text for the new title
-     </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/ui/ui/controls/label/construct.xml b/reference/ui/ui/controls/label/construct.xml
deleted file mode 100644
index 05544f24a184..000000000000
--- a/reference/ui/ui/controls/label/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-label.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Label::__construct</refname>
-  <refpurpose>Construct a new Label</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Label::__construct</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Label
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text for this label
-     </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/ui/ui/controls/label/gettext.xml b/reference/ui/ui/controls/label/gettext.xml
deleted file mode 100644
index e7e2fd5195de..000000000000
--- a/reference/ui/ui/controls/label/gettext.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-label.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Label::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\Label::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the current text for this Label
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/label/settext.xml b/reference/ui/ui/controls/label/settext.xml
deleted file mode 100644
index bf9391cff054..000000000000
--- a/reference/ui/ui/controls/label/settext.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-label.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Label::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Label::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text for this Label
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text
-     </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/ui/ui/controls/multilineentry/append.xml b/reference/ui/ui/controls/multilineentry/append.xml
deleted file mode 100644
index 3971e70392e3..000000000000
--- a/reference/ui/ui/controls/multilineentry/append.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::append</refname>
-  <refpurpose>Append Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\MultilineEntry::append</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append the given text to the text in this Multiline Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text to append
-     </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/ui/ui/controls/multilineentry/construct.xml b/reference/ui/ui/controls/multilineentry/construct.xml
deleted file mode 100644
index 17ec057cd93b..000000000000
--- a/reference/ui/ui/controls/multilineentry/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::__construct</refname>
-  <refpurpose>Construct a new Multiline Entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\MultilineEntry::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Multiline Entry of the given type
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      MultilineEntry::Wrap or MultilineEntry::NoWrap
-     </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/ui/ui/controls/multilineentry/gettext.xml b/reference/ui/ui/controls/multilineentry/gettext.xml
deleted file mode 100644
index 9e2d48fd3bdc..000000000000
--- a/reference/ui/ui/controls/multilineentry/gettext.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.gettext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::getText</refname>
-  <refpurpose>Get Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Controls\MultilineEntry::getText</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the text in this Multiline Entry
-  </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/ui/ui/controls/multilineentry/isreadonly.xml b/reference/ui/ui/controls/multilineentry/isreadonly.xml
deleted file mode 100644
index 413e3efc12d2..000000000000
--- a/reference/ui/ui/controls/multilineentry/isreadonly.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.isreadonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::isReadOnly</refname>
-  <refpurpose>Read Only Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\MultilineEntry::isReadOnly</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Multiline Entry is read only
-  </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/ui/ui/controls/multilineentry/onchange.xml b/reference/ui/ui/controls/multilineentry/onchange.xml
deleted file mode 100644
index 2c9f18bbec5c..000000000000
--- a/reference/ui/ui/controls/multilineentry/onchange.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\MultilineEntry::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the text in this Multiline Entry is changed
-  </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/ui/ui/controls/multilineentry/setreadonly.xml b/reference/ui/ui/controls/multilineentry/setreadonly.xml
deleted file mode 100644
index 107be40102e2..000000000000
--- a/reference/ui/ui/controls/multilineentry/setreadonly.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.setreadonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::setReadOnly</refname>
-  <refpurpose>Set Read Only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\MultilineEntry::setReadOnly</methodname>
-   <methodparam><type>bool</type><parameter>readOnly</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable read only on this Multiline Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>readOnly</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/controls/multilineentry/settext.xml b/reference/ui/ui/controls/multilineentry/settext.xml
deleted file mode 100644
index 367b3a00c657..000000000000
--- a/reference/ui/ui/controls/multilineentry/settext.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-multilineentry.settext" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\MultilineEntry::setText</refname>
-  <refpurpose>Set Text</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\MultilineEntry::setText</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the text in this Multiline Entry
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The new text
-     </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/ui/ui/controls/picker/construct.xml b/reference/ui/ui/controls/picker/construct.xml
deleted file mode 100644
index 68ee370cd78d..000000000000
--- a/reference/ui/ui/controls/picker/construct.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-picker.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Picker::__construct</refname>
-  <refpurpose>Construct a new Picker</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Picker::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>UI\Controls\Picker::Date</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Construct a new Picker of the given type
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      Picker::Date, Picker::Time, or Picker::DateTime
-     </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/ui/ui/controls/progress/getvalue.xml b/reference/ui/ui/controls/progress/getvalue.xml
deleted file mode 100644
index 286f05001ad0..000000000000
--- a/reference/ui/ui/controls/progress/getvalue.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-progress.getvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Progress::getValue</refname>
-  <refpurpose>Get Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Progress::getValue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the current value of this Progress bar
-  </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/ui/ui/controls/progress/setvalue.xml b/reference/ui/ui/controls/progress/setvalue.xml
deleted file mode 100644
index ce736ee82477..000000000000
--- a/reference/ui/ui/controls/progress/setvalue.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-progress.setvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Progress::setValue</refname>
-  <refpurpose>Set Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Progress::setValue</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the value for this Progress bar
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      An integer between 0 and 100 (inclusive)
-     </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/ui/ui/controls/radio/append.xml b/reference/ui/ui/controls/radio/append.xml
deleted file mode 100644
index 1ebfd2e02f55..000000000000
--- a/reference/ui/ui/controls/radio/append.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-radio.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Radio::append</refname>
-  <refpurpose>Append Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Radio::append</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a new option to this Radio
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text (label) for the option
-     </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/ui/ui/controls/radio/getselected.xml b/reference/ui/ui/controls/radio/getselected.xml
deleted file mode 100644
index 104fdca6356d..000000000000
--- a/reference/ui/ui/controls/radio/getselected.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-radio.getselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Radio::getSelected</refname>
-  <refpurpose>Get Selected Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Radio::getSelected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the index of the currently selected option in this Radio
-  </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/ui/ui/controls/radio/onselected.xml b/reference/ui/ui/controls/radio/onselected.xml
deleted file mode 100644
index 63494f126558..000000000000
--- a/reference/ui/ui/controls/radio/onselected.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-radio.onselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Radio::onSelected</refname>
-  <refpurpose>Selected Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Radio::onSelected</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the option selected in this Radio changes
-  </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/ui/ui/controls/radio/setselected.xml b/reference/ui/ui/controls/radio/setselected.xml
deleted file mode 100644
index 01fd2379d65b..000000000000
--- a/reference/ui/ui/controls/radio/setselected.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-radio.setselected" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Radio::setSelected</refname>
-  <refpurpose>Set Selected Option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Radio::setSelected</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the currently selected option in this Radio
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the option to select
-     </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/ui/ui/controls/separator/construct.xml b/reference/ui/ui/controls/separator/construct.xml
deleted file mode 100644
index 7285028a2985..000000000000
--- a/reference/ui/ui/controls/separator/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-separator.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Separator::__construct</refname>
-  <refpurpose>Construct a new Separator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Separator::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>type</parameter><initializer>UI\Controls\Separator::Horizontal</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Separator of the given type
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <simpara>
-      Separator::Horizontal or Separator::Vertical
-     </simpara>
-    </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/ui/ui/controls/slider/construct.xml b/reference/ui/ui/controls/slider/construct.xml
deleted file mode 100644
index f23dccda992c..000000000000
--- a/reference/ui/ui/controls/slider/construct.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-slider.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Slider::__construct</refname>
-  <refpurpose>Construct a new Slider</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Slider::__construct</methodname>
-   <methodparam><type>int</type><parameter>min</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Construct a new Slider with the given range
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>min</parameter></term>
-    <listitem>
-     <para>
-      The minimum allowed value
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max</parameter></term>
-    <listitem>
-     <para>
-      The maximum allowed value
-     </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/ui/ui/controls/slider/getvalue.xml b/reference/ui/ui/controls/slider/getvalue.xml
deleted file mode 100644
index 1c5acdab2f21..000000000000
--- a/reference/ui/ui/controls/slider/getvalue.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-slider.getvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Slider::getValue</refname>
-  <refpurpose>Get Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Slider::getValue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the value from this Slider
-  </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/ui/ui/controls/slider/onchange.xml b/reference/ui/ui/controls/slider/onchange.xml
deleted file mode 100644
index 8de3d27710f1..000000000000
--- a/reference/ui/ui/controls/slider/onchange.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-slider.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Slider::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Slider::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the value of this Slider changes
-  </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/ui/ui/controls/slider/setvalue.xml b/reference/ui/ui/controls/slider/setvalue.xml
deleted file mode 100644
index 9aeeec9b0e35..000000000000
--- a/reference/ui/ui/controls/slider/setvalue.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-slider.setvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Slider::setValue</refname>
-  <refpurpose>Set Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Slider::setValue</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the value for this Slider
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The new value
-     </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/ui/ui/controls/spin/construct.xml b/reference/ui/ui/controls/spin/construct.xml
deleted file mode 100644
index 9c45077ecbd3..000000000000
--- a/reference/ui/ui/controls/spin/construct.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-spin.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Spin::__construct</refname>
-  <refpurpose>Construct a new Spin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Spin::__construct</methodname>
-   <methodparam><type>int</type><parameter>min</parameter></methodparam>
-   <methodparam><type>int</type><parameter>max</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructs a new Spin with the given range
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>min</parameter></term>
-    <listitem>
-     <para>
-      The minimum value allowed
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max</parameter></term>
-    <listitem>
-     <para>
-      The maximum value allowed
-     </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/ui/ui/controls/spin/getvalue.xml b/reference/ui/ui/controls/spin/getvalue.xml
deleted file mode 100644
index 929954d22c12..000000000000
--- a/reference/ui/ui/controls/spin/getvalue.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-spin.getvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Spin::getValue</refname>
-  <refpurpose>Get Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Spin::getValue</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the value in this Spin
-  </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/ui/ui/controls/spin/onchange.xml b/reference/ui/ui/controls/spin/onchange.xml
deleted file mode 100644
index 7a788ec36923..000000000000
--- a/reference/ui/ui/controls/spin/onchange.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-spin.onchange" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Spin::onChange</refname>
-  <refpurpose>Change Handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\Controls\Spin::onChange</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when the value in this Spin changes
-  </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/ui/ui/controls/spin/setvalue.xml b/reference/ui/ui/controls/spin/setvalue.xml
deleted file mode 100644
index 324a6f236444..000000000000
--- a/reference/ui/ui/controls/spin/setvalue.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-spin.setvalue" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Spin::setValue</refname>
-  <refpurpose>Set Value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Spin::setValue</methodname>
-   <methodparam><type>int</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the value in this Spin
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The new value
-     </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/ui/ui/controls/tab/append.xml b/reference/ui/ui/controls/tab/append.xml
deleted file mode 100644
index 28d2fc9c6bf6..000000000000
--- a/reference/ui/ui/controls/tab/append.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::append</refname>
-  <refpurpose>Append Page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Tab::append</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Append a new page to this Tab
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name for the new page
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The control for the new page
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Shall return the index of the appended control, may be 0
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/tab/delete.xml b/reference/ui/ui/controls/tab/delete.xml
deleted file mode 100644
index e9c4d2830fb6..000000000000
--- a/reference/ui/ui/controls/tab/delete.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::delete</refname>
-  <refpurpose>Delete Page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Tab::delete</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall remove the selected page from this Tab
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the page to remove
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Indication of 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/ui/ui/controls/tab/hasmargin.xml b/reference/ui/ui/controls/tab/hasmargin.xml
deleted file mode 100644
index 658ff37a785d..000000000000
--- a/reference/ui/ui/controls/tab/hasmargin.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.hasmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::hasMargin</refname>
-  <refpurpose>Margin Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Controls\Tab::hasMargin</methodname>
-   <methodparam><type>int</type><parameter>page</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall detect if the given page has a margin.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>page</parameter></term>
-    <listitem>
-     <para>
-      The index of the page
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/tab/insertat.xml b/reference/ui/ui/controls/tab/insertat.xml
deleted file mode 100644
index 387b8fe453ac..000000000000
--- a/reference/ui/ui/controls/tab/insertat.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.insertat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::insertAt</refname>
-  <refpurpose>Insert Page</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Tab::insertAt</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>int</type><parameter>page</parameter></methodparam>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall insert a new page into this Tab
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name for the new page
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>page</parameter></term>
-    <listitem>
-     <para>
-      The index to perform the insertion before
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The control for the new page
-     </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/ui/ui/controls/tab/pages.xml b/reference/ui/ui/controls/tab/pages.xml
deleted file mode 100644
index 20d8760f529c..000000000000
--- a/reference/ui/ui/controls/tab/pages.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.pages" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::pages</refname>
-  <refpurpose>Page Count</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Controls\Tab::pages</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the number of pages in this Tab
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The number of pages in this Tab
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/controls/tab/setmargin.xml b/reference/ui/ui/controls/tab/setmargin.xml
deleted file mode 100644
index 4143018a94c2..000000000000
--- a/reference/ui/ui/controls/tab/setmargin.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-controls-tab.setmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Controls\Tab::setMargin</refname>
-  <refpurpose>Set Margin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Controls\Tab::setMargin</methodname>
-   <methodparam><type>int</type><parameter>page</parameter></methodparam>
-   <methodparam><type>bool</type><parameter>margin</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable margins on the selected page
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>page</parameter></term>
-    <listitem>
-     <para>
-      The page to select
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>margin</parameter></term>
-    <listitem>
-     <para>
-      Margin switch
-     </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/ui/ui/draw/brush.gradient/addstop.xml b/reference/ui/ui/draw/brush.gradient/addstop.xml
deleted file mode 100644
index ac77d0387114..000000000000
--- a/reference/ui/ui/draw/brush.gradient/addstop.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush-gradient.addstop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush\Gradient::addStop</refname>
-  <refpurpose>Stop Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Brush\Gradient::addStop</methodname>
-   <methodparam><type>float</type><parameter>position</parameter></methodparam>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Brush\Gradient::addStop</methodname>
-   <methodparam><type>float</type><parameter>position</parameter></methodparam>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Shall add a stop of the given color at the given position
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-      The position for the new stop
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      The color for the new stop, may be UI\Draw\Color or RRGGBBAA
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Total number of stops
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/brush.gradient/delstop.xml b/reference/ui/ui/draw/brush.gradient/delstop.xml
deleted file mode 100644
index 7a40a0a32b01..000000000000
--- a/reference/ui/ui/draw/brush.gradient/delstop.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush-gradient.delstop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush\Gradient::delStop</refname>
-  <refpurpose>Stop Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Brush\Gradient::delStop</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Total number of stops
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/brush.gradient/setstop.xml b/reference/ui/ui/draw/brush.gradient/setstop.xml
deleted file mode 100644
index f0944eebd64a..000000000000
--- a/reference/ui/ui/draw/brush.gradient/setstop.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush-gradient.setstop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush\Gradient::setStop</refname>
-  <refpurpose>Stop Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Draw\Brush\Gradient::setStop</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>float</type><parameter>position</parameter></methodparam>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Draw\Brush\Gradient::setStop</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-   <methodparam><type>float</type><parameter>position</parameter></methodparam>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>index</parameter></term>
-    <listitem>
-     <para>
-      The index of the stop to set
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>position</parameter></term>
-    <listitem>
-     <para>
-      The position for the stop
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      The color for the stop, may be UI\Draw\Color or RRGGBBAA
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Indication of 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/ui/ui/draw/brush.lineargradient/construct.xml b/reference/ui/ui/draw/brush.lineargradient/construct.xml
deleted file mode 100644
index 20ffabefc2b2..000000000000
--- a/reference/ui/ui/draw/brush.lineargradient/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush-lineargradient.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush\LinearGradient::__construct</refname>
-  <refpurpose>Construct a Linear Gradient</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Brush\LinearGradient::__construct</methodname>
-   <methodparam><type>UI\Point</type><parameter>start</parameter></methodparam>
-   <methodparam><type>UI\Point</type><parameter>end</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new linear gradient
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>end</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/brush.radialgradient/construct.xml b/reference/ui/ui/draw/brush.radialgradient/construct.xml
deleted file mode 100644
index 6269dc12800e..000000000000
--- a/reference/ui/ui/draw/brush.radialgradient/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush-radialgradient.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush\RadialGradient::__construct</refname>
-  <refpurpose>Construct a new Radial Gradient</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Brush\RadialGradient::__construct</methodname>
-   <methodparam><type>UI\Point</type><parameter>start</parameter></methodparam>
-   <methodparam><type>UI\Point</type><parameter>outer</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new radial gradient
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>outer</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/brush/construct.xml b/reference/ui/ui/draw/brush/construct.xml
deleted file mode 100644
index e73d31713067..000000000000
--- a/reference/ui/ui/draw/brush/construct.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush::__construct</refname>
-  <refpurpose>Construct a new Brush</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Brush::__construct</methodname>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Brush::__construct</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a solid brush using the given color
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      Can be a UI\Draw\Color or RRGGBBAA
-     </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/ui/ui/draw/brush/getcolor.xml b/reference/ui/ui/draw/brush/getcolor.xml
deleted file mode 100644
index e9c47cee5992..000000000000
--- a/reference/ui/ui/draw/brush/getcolor.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush.getcolor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush::getColor</refname>
-  <refpurpose>Get Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\Draw\Color</type><methodname>UI\Draw\Brush::getColor</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return a UI\Draw\Color for this brush
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current color of the brush
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/brush/setcolor.xml b/reference/ui/ui/draw/brush/setcolor.xml
deleted file mode 100644
index 7bb1dc66c274..000000000000
--- a/reference/ui/ui/draw/brush/setcolor.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-brush.setcolor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Brush::setColor</refname>
-  <refpurpose>Set Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UI\Draw\Brush::setColor</methodname>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UI\Draw\Brush::setColor</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the color of this brush to the color provided
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      Can be a UI\Draw\Color or RRGGBBAA
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/color/construct.xml b/reference/ui/ui/draw/color/construct.xml
deleted file mode 100644
index 5c24d4224063..000000000000
--- a/reference/ui/ui/draw/color/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-color.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Color::__construct</refname>
-  <refpurpose>Construct new Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Color::__construct</methodname>
-   <methodparam choice="opt"><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Color::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>color</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new color
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      May be UI\Draw\Color or RRGGBBAA
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/color/getchannel.xml b/reference/ui/ui/draw/color/getchannel.xml
deleted file mode 100644
index 12d55ce9bb81..000000000000
--- a/reference/ui/ui/draw/color/getchannel.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-color.getchannel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Color::getChannel</refname>
-  <refpurpose>Color Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Color::getChannel</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall retrieve the value for a channel
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      Constant channel identity
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current value of the requested channel
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/color/setchannel.xml b/reference/ui/ui/draw/color/setchannel.xml
deleted file mode 100644
index 2e11e9ef5929..000000000000
--- a/reference/ui/ui/draw/color/setchannel.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-color.setchannel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Color::setChannel</refname>
-  <refpurpose>Color Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UI\Draw\Color::setChannel</methodname>
-   <methodparam><type>int</type><parameter>channel</parameter></methodparam>
-   <methodparam><type>float</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the selected channel to the given value
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>channel</parameter></term>
-    <listitem>
-     <para>
-      Constant channel identity
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The new value for the selected channel
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/matrix/invert.xml b/reference/ui/ui/draw/matrix/invert.xml
deleted file mode 100644
index ff8fe35c84a8..000000000000
--- a/reference/ui/ui/draw/matrix/invert.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.invert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::invert</refname>
-  <refpurpose>Invert Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Matrix::invert</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall invert this matrix
-  </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/ui/ui/draw/matrix/isinvertible.xml b/reference/ui/ui/draw/matrix/isinvertible.xml
deleted file mode 100644
index a8db70be8748..000000000000
--- a/reference/ui/ui/draw/matrix/isinvertible.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.isinvertible" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::isInvertible</refname>
-  <refpurpose>Invertible Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Draw\Matrix::isInvertible</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Matrix may be inverted
-  </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/ui/ui/draw/matrix/multiply.xml b/reference/ui/ui/draw/matrix/multiply.xml
deleted file mode 100644
index a7edc58eda7f..000000000000
--- a/reference/ui/ui/draw/matrix/multiply.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.multiply" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::multiply</refname>
-  <refpurpose>Multiply Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\Draw\Matrix</type><methodname>UI\Draw\Matrix::multiply</methodname>
-   <methodparam><type>UI\Draw\Matrix</type><parameter>matrix</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall multiply this matrix with the given matrix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The new Matrix
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/matrix/rotate.xml b/reference/ui/ui/draw/matrix/rotate.xml
deleted file mode 100644
index b0c1f13cd077..000000000000
--- a/reference/ui/ui/draw/matrix/rotate.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.rotate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::rotate</refname>
-  <refpurpose>Rotate Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Matrix::rotate</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>amount</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall rotate this Matrix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>amount</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/draw/matrix/scale.xml b/reference/ui/ui/draw/matrix/scale.xml
deleted file mode 100644
index 68471373f452..000000000000
--- a/reference/ui/ui/draw/matrix/scale.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.scale" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::scale</refname>
-  <refpurpose>Scale Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Matrix::scale</methodname>
-   <methodparam><type>UI\Point</type><parameter>center</parameter></methodparam>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall scale this Matrix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>center</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/draw/matrix/skew.xml b/reference/ui/ui/draw/matrix/skew.xml
deleted file mode 100644
index 9897d82347b6..000000000000
--- a/reference/ui/ui/draw/matrix/skew.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.skew" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::skew</refname>
-  <refpurpose>Skew Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Matrix::skew</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>UI\Point</type><parameter>amount</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall skew this Matrix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>amount</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/draw/matrix/translate.xml b/reference/ui/ui/draw/matrix/translate.xml
deleted file mode 100644
index ffd9cd1ae867..000000000000
--- a/reference/ui/ui/draw/matrix/translate.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-matrix.translate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Matrix::translate</refname>
-  <refpurpose>Translate Matrix</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Matrix::translate</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall translate this Matrix
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/draw/path/addrectangle.xml b/reference/ui/ui/draw/path/addrectangle.xml
deleted file mode 100644
index 721818a39c6c..000000000000
--- a/reference/ui/ui/draw/path/addrectangle.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.addrectangle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::addRectangle</refname>
-  <refpurpose>Draw a Rectangle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::addRectangle</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>UI\Size</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall map the path of a rectangle of the given size, at the given point
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to begin the shape
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The size of the rectangle
-     </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/ui/ui/draw/path/arcto.xml b/reference/ui/ui/draw/path/arcto.xml
deleted file mode 100644
index c427a883cb37..000000000000
--- a/reference/ui/ui/draw/path/arcto.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.arcto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::arcTo</refname>
-  <refpurpose>Draw an Arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::arcTo</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>negative</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall map the path for an arc
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to begin mapping
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      The radius of the arc
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <para>
-      The angle of the arc
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sweep</parameter></term>
-    <listitem>
-     <para>
-      The sweep of the arc
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>negative</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/path/bezierto.xml b/reference/ui/ui/draw/path/bezierto.xml
deleted file mode 100644
index c06a23f2a8c1..000000000000
--- a/reference/ui/ui/draw/path/bezierto.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.bezierto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::bezierTo</refname>
-  <refpurpose>Draw Bezier Curve</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::bezierTo</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>negative</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall draw a bezier curve
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point at which to begin mapping
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      The radius of the curve
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <para>
-      The angle of the curve
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sweep</parameter></term>
-    <listitem>
-     <para>
-      The sweep of the curve
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>negative</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/draw/path/closefigure.xml b/reference/ui/ui/draw/path/closefigure.xml
deleted file mode 100644
index 3342696f2e43..000000000000
--- a/reference/ui/ui/draw/path/closefigure.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.closefigure" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::closeFigure</refname>
-  <refpurpose>Close Figure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::closeFigure</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall close the current figure
-  </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/ui/ui/draw/path/construct.xml b/reference/ui/ui/draw/path/construct.xml
deleted file mode 100644
index bc5318bbbddd..000000000000
--- a/reference/ui/ui/draw/path/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::__construct</refname>
-  <refpurpose>Construct a new Path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>UI\Draw\Path::Winding</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new path in the given mode
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>mode</parameter></term>
-    <listitem>
-     <para>
-      Path::Winding or Path::Alternate
-     </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/ui/ui/draw/path/end.xml b/reference/ui/ui/draw/path/end.xml
deleted file mode 100644
index 5f9ea233deee..000000000000
--- a/reference/ui/ui/draw/path/end.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.end" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::end</refname>
-  <refpurpose>Finalize Path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::end</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall finalize this Path
-  </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/ui/ui/draw/path/lineto.xml b/reference/ui/ui/draw/path/lineto.xml
deleted file mode 100644
index 4eb6bd3007c5..000000000000
--- a/reference/ui/ui/draw/path/lineto.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.lineto" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::lineTo</refname>
-  <refpurpose>Draw a Line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::lineTo</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>negative</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall map the path for a line
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to begin mapping
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sweep</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>negative</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/path/newfigure.xml b/reference/ui/ui/draw/path/newfigure.xml
deleted file mode 100644
index 57cb3b47e447..000000000000
--- a/reference/ui/ui/draw/path/newfigure.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.newfigure" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::newFigure</refname>
-  <refpurpose>Draw Figure</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::newFigure</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall map a new figure at the given point
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to begin mapping
-     </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/ui/ui/draw/path/newfigurewitharc.xml b/reference/ui/ui/draw/path/newfigurewitharc.xml
deleted file mode 100644
index d62cb219ee9a..000000000000
--- a/reference/ui/ui/draw/path/newfigurewitharc.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-path.newfigurewitharc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Path::newFigureWithArc</refname>
-  <refpurpose>Draw Figure with Arc</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Path::newFigureWithArc</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>float</type><parameter>radius</parameter></methodparam>
-   <methodparam><type>float</type><parameter>angle</parameter></methodparam>
-   <methodparam><type>float</type><parameter>sweep</parameter></methodparam>
-   <methodparam><type>float</type><parameter>negative</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>radius</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>angle</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sweep</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>negative</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/pen/clip.xml b/reference/ui/ui/draw/pen/clip.xml
deleted file mode 100644
index 6bbe11506ea4..000000000000
--- a/reference/ui/ui/draw/pen/clip.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.clip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::clip</refname>
-  <refpurpose>Clip a Path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::clip</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall clip the given Path
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The path to clip
-     </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/ui/ui/draw/pen/fill.xml b/reference/ui/ui/draw/pen/fill.xml
deleted file mode 100644
index 4cb78daa8352..000000000000
--- a/reference/ui/ui/draw/pen/fill.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.fill" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::fill</refname>
-  <refpurpose>Fill a Path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::fill</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>UI\Draw\Brush</type><parameter>with</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::fill</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>UI\Draw\Color</type><parameter>with</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::fill</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>with</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall fill the given path
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The path to fill
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>with</parameter></term>
-    <listitem>
-     <para>
-     The color or brush to fill with
-     </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/ui/ui/draw/pen/restore.xml b/reference/ui/ui/draw/pen/restore.xml
deleted file mode 100644
index ef8f80bf301b..000000000000
--- a/reference/ui/ui/draw/pen/restore.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.restore" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::restore</refname>
-  <refpurpose>Restore</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::restore</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall restore a previously saved Pen
-  </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/ui/ui/draw/pen/save.xml b/reference/ui/ui/draw/pen/save.xml
deleted file mode 100644
index 7f854f860675..000000000000
--- a/reference/ui/ui/draw/pen/save.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.save" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::save</refname>
-  <refpurpose>Save</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::save</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall save the Pen
-  </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/ui/ui/draw/pen/stroke.xml b/reference/ui/ui/draw/pen/stroke.xml
deleted file mode 100644
index 1bc47e9663b6..000000000000
--- a/reference/ui/ui/draw/pen/stroke.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.stroke" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::stroke</refname>
-  <refpurpose>Stroke a Path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::stroke</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>UI\Draw\Brush</type><parameter>with</parameter></methodparam>
-   <methodparam><type>UI\Draw\Stroke</type><parameter>stroke</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::stroke</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>UI\Draw\Color</type><parameter>with</parameter></methodparam>
-   <methodparam><type>UI\Draw\Stroke</type><parameter>stroke</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::stroke</methodname>
-   <methodparam><type>UI\Draw\Path</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>with</parameter></methodparam>
-   <methodparam><type>UI\Draw\Stroke</type><parameter>stroke</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall stroke the given path
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The path to stroke
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>with</parameter></term>
-    <listitem>
-     <para>
-      The color or brush to stroke with
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stroke</parameter></term>
-    <listitem>
-     <para>
-      The configuration of the stroke
-     </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/ui/ui/draw/pen/transform.xml b/reference/ui/ui/draw/pen/transform.xml
deleted file mode 100644
index e421240c6a16..000000000000
--- a/reference/ui/ui/draw/pen/transform.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.transform" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::transform</refname>
-  <refpurpose>Matrix Transform</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::transform</methodname>
-   <methodparam><type>UI\Draw\Matrix</type><parameter>matrix</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall perform matrix transformation
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>matrix</parameter></term>
-    <listitem>
-     <para>
-      The matrix to use
-     </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/ui/ui/draw/pen/write.xml b/reference/ui/ui/draw/pen/write.xml
deleted file mode 100644
index 4d0d67c80b17..000000000000
--- a/reference/ui/ui/draw/pen/write.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-pen.write" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Pen::write</refname>
-  <refpurpose>Draw Text at Point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Pen::write</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-   <methodparam><type>UI\Draw\Text\Layout</type><parameter>layout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall draw the given text layout at the given point
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The point to perform the drawing
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>layout</parameter></term>
-    <listitem>
-     <para>
-      The layout of the text to draw
-     </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/ui/ui/draw/stroke/construct.xml b/reference/ui/ui/draw/stroke/construct.xml
deleted file mode 100644
index 073e0b7b51c3..000000000000
--- a/reference/ui/ui/draw/stroke/construct.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::__construct</refname>
-  <refpurpose>Construct a new Stroke</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Stroke::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>cap</parameter><initializer>UI\Draw\Line\Cap::Flat</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>join</parameter><initializer>UI\Draw\Line\Join::Miter</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>thickness</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>float</type><parameter>miterLimit</parameter><initializer>10</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cap</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Line\Cap::Flat, UI\Draw\Line\Cap::Round, or UI\Draw\Line\Cap::Square
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>join</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Line\Join::Miter, UI\Draw\Line\Join::Round, or UI\Draw\Line\Join::Bevel
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>thickness</parameter></term>
-    <listitem>
-     <para>
-      The thickness of the stroke
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>miterLimit</parameter></term>
-    <listitem>
-     <para>
-      Miter limit (default is sensible for all supported platforms)
-     </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/ui/ui/draw/stroke/getcap.xml b/reference/ui/ui/draw/stroke/getcap.xml
deleted file mode 100644
index 3a04f4343278..000000000000
--- a/reference/ui/ui/draw/stroke/getcap.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.getcap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::getCap</refname>
-  <refpurpose>Get Line Cap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Stroke::getCap</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the line cap setting of this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   UI\Draw\Line\Cap::Flat, UI\Draw\Line\Cap::Round, or UI\Draw\Line\Cap::Square
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/stroke/getjoin.xml b/reference/ui/ui/draw/stroke/getjoin.xml
deleted file mode 100644
index f6c376454369..000000000000
--- a/reference/ui/ui/draw/stroke/getjoin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.getjoin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::getJoin</refname>
-  <refpurpose>Get Line Join</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Stroke::getJoin</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the line join setting of this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   UI\Draw\Line\Join::Miter, UI\Draw\Line\Join::Round, or UI\Draw\Line\Join::Bevel
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/stroke/getmiterlimit.xml b/reference/ui/ui/draw/stroke/getmiterlimit.xml
deleted file mode 100644
index 25489411503c..000000000000
--- a/reference/ui/ui/draw/stroke/getmiterlimit.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.getmiterlimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::getMiterLimit</refname>
-  <refpurpose>Get Miter Limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Stroke::getMiterLimit</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the miter limit of this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current miter limit
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/stroke/getthickness.xml b/reference/ui/ui/draw/stroke/getthickness.xml
deleted file mode 100644
index 4a1cf9de6eea..000000000000
--- a/reference/ui/ui/draw/stroke/getthickness.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.getthickness" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::getThickness</refname>
-  <refpurpose>Get Thickness</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Stroke::getThickness</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the thickness of this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current thickness
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/stroke/setcap.xml b/reference/ui/ui/draw/stroke/setcap.xml
deleted file mode 100644
index 63116e09d5cf..000000000000
--- a/reference/ui/ui/draw/stroke/setcap.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.setcap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::setCap</refname>
-  <refpurpose>Set Line Cap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Stroke::setCap</methodname>
-   <methodparam><type>int</type><parameter>cap</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the line cap setting for this Stroke
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cap</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Line\Cap::Flat, UI\Draw\Line\Cap::Round, or UI\Draw\Line\Cap::Square
-     </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/ui/ui/draw/stroke/setjoin.xml b/reference/ui/ui/draw/stroke/setjoin.xml
deleted file mode 100644
index e82b558af25e..000000000000
--- a/reference/ui/ui/draw/stroke/setjoin.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.setjoin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::setJoin</refname>
-  <refpurpose>Set Line Join</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Stroke::setJoin</methodname>
-   <methodparam><type>int</type><parameter>join</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the line join setting for this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>join</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Line\Join::Miter, UI\Draw\Line\Join::Round, or UI\Draw\Line\Join::Bevel
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/stroke/setmiterlimit.xml b/reference/ui/ui/draw/stroke/setmiterlimit.xml
deleted file mode 100644
index 5b9cbb1515fa..000000000000
--- a/reference/ui/ui/draw/stroke/setmiterlimit.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.setmiterlimit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::setMiterLimit</refname>
-  <refpurpose>Set Miter Limit</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Stroke::setMiterLimit</methodname>
-   <methodparam><type>float</type><parameter>limit</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the miter limit for this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <para>
-      The new limit
-     </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/ui/ui/draw/stroke/setthickness.xml b/reference/ui/ui/draw/stroke/setthickness.xml
deleted file mode 100644
index e1bc054f3ff9..000000000000
--- a/reference/ui/ui/draw/stroke/setthickness.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-stroke.setthickness" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Stroke::setThickness</refname>
-  <refpurpose>Set Thickness</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Stroke::setThickness</methodname>
-   <methodparam><type>float</type><parameter>thickness</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the thickness for this Stroke
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>thickness</parameter></term>
-    <listitem>
-     <para>
-      The new thickness
-     </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/ui/ui/draw/text/font.descriptor/construct.xml b/reference/ui/ui/draw/text/font.descriptor/construct.xml
deleted file mode 100644
index 6c1b47738b2a..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/construct.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::__construct</refname>
-  <refpurpose>Construct a new Font Descriptor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Font\Descriptor::__construct</methodname>
-   <methodparam><type>string</type><parameter>family</parameter></methodparam>
-   <methodparam><type>float</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>weight</parameter><initializer>UI\Draw\Text\Font\Weight::Normal</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>italic</parameter><initializer>UI\Draw\Text\Font\Italic::Normal</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>stretch</parameter><initializer>UI\Draw\Text\Font\Stretch::Normal</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Font Descriptor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>family</parameter></term>
-    <listitem>
-     <para>
-      The name of a valid family of fonts
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The preferred size
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>weight</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Text\Font\Weight constant
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>italic</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Text\Font\Italic constant
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stretch</parameter></term>
-    <listitem>
-     <para>
-      UI\Draw\Text\Font\Stretch constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font.descriptor/getfamily.xml b/reference/ui/ui/draw/text/font.descriptor/getfamily.xml
deleted file mode 100644
index 591f46b56677..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/getfamily.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.getfamily" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::getFamily</refname>
-  <refpurpose>Get Font Family</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Draw\Text\Font\Descriptor::getFamily</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the requested font family
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font.descriptor/getitalic.xml b/reference/ui/ui/draw/text/font.descriptor/getitalic.xml
deleted file mode 100644
index 667a8acfdc43..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/getitalic.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.getitalic" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::getItalic</refname>
-  <refpurpose>Style Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Text\Font\Descriptor::getItalic</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return constant setting
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font.descriptor/getsize.xml b/reference/ui/ui/draw/text/font.descriptor/getsize.xml
deleted file mode 100644
index ccd31d80c582..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/getsize.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::getSize</refname>
-  <refpurpose>Size Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font\Descriptor::getSize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the requested size
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font.descriptor/getstretch.xml b/reference/ui/ui/draw/text/font.descriptor/getstretch.xml
deleted file mode 100644
index 06bc62956d61..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/getstretch.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.getstretch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::getStretch</refname>
-  <refpurpose>Style Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Text\Font\Descriptor::getStretch</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return requested stretch
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font.descriptor/getweight.xml b/reference/ui/ui/draw/text/font.descriptor/getweight.xml
deleted file mode 100644
index 2fc7ef5f1e71..000000000000
--- a/reference/ui/ui/draw/text/font.descriptor/getweight.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font-descriptor.getweight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font\Descriptor::getWeight</refname>
-  <refpurpose>Weight Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>UI\Draw\Text\Font\Descriptor::getWeight</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return requested weight
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font/construct.xml b/reference/ui/ui/draw/text/font/construct.xml
deleted file mode 100644
index ff73a497eb7f..000000000000
--- a/reference/ui/ui/draw/text/font/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::__construct</refname>
-  <refpurpose>Construct a new Font</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Font::__construct</methodname>
-   <methodparam><type>UI\Draw\Text\Font\Descriptor</type><parameter>descriptor</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Font using the given descriptor
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>descriptor</parameter></term>
-    <listitem>
-     <para>
-      The descriptor for the Font
-     </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/ui/ui/draw/text/font/getascent.xml b/reference/ui/ui/draw/text/font/getascent.xml
deleted file mode 100644
index 7d0e202f3ba5..000000000000
--- a/reference/ui/ui/draw/text/font/getascent.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.getascent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::getAscent</refname>
-  <refpurpose>Font Metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font::getAscent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font/getdescent.xml b/reference/ui/ui/draw/text/font/getdescent.xml
deleted file mode 100644
index d6248a6dd6c2..000000000000
--- a/reference/ui/ui/draw/text/font/getdescent.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.getdescent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::getDescent</refname>
-  <refpurpose>Font Metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font::getDescent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font/getleading.xml b/reference/ui/ui/draw/text/font/getleading.xml
deleted file mode 100644
index bbf0e83ee4d6..000000000000
--- a/reference/ui/ui/draw/text/font/getleading.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.getleading" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::getLeading</refname>
-  <refpurpose>Font Metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font::getLeading</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font/getunderlineposition.xml b/reference/ui/ui/draw/text/font/getunderlineposition.xml
deleted file mode 100644
index dd178b938dc8..000000000000
--- a/reference/ui/ui/draw/text/font/getunderlineposition.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.getunderlineposition" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::getUnderlinePosition</refname>
-  <refpurpose>Font Metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font::getUnderlinePosition</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/font/getunderlinethickness.xml b/reference/ui/ui/draw/text/font/getunderlinethickness.xml
deleted file mode 100644
index 7e989fb94d40..000000000000
--- a/reference/ui/ui/draw/text/font/getunderlinethickness.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-font.getunderlinethickness" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Font::getUnderlineThickness</refname>
-  <refpurpose>Font Metrics</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Draw\Text\Font::getUnderlineThickness</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/draw/text/layout/construct.xml b/reference/ui/ui/draw/text/layout/construct.xml
deleted file mode 100644
index e52d13520d33..000000000000
--- a/reference/ui/ui/draw/text/layout/construct.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-layout.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Layout::__construct</refname>
-  <refpurpose>Construct a new Text Layout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Layout::__construct</methodname>
-   <methodparam><type>string</type><parameter>text</parameter></methodparam>
-   <methodparam><type>UI\Draw\Text\Font</type><parameter>font</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Text Layout
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>text</parameter></term>
-    <listitem>
-     <para>
-      The text for the layout
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>font</parameter></term>
-    <listitem>
-     <para>
-      The font to use for writing
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <para>
-      The width of the layout
-     </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/ui/ui/draw/text/layout/setcolor.xml b/reference/ui/ui/draw/text/layout/setcolor.xml
deleted file mode 100644
index e299ecd3bccb..000000000000
--- a/reference/ui/ui/draw/text/layout/setcolor.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-layout.setcolor" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Layout::setColor</refname>
-  <refpurpose>Set Color</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Layout::setColor</methodname>
-   <methodparam><type>UI\Draw\Color</type><parameter>color</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>end</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Layout::setColor</methodname>
-   <methodparam><type>int</type><parameter>color</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>start</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>end</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the Color for all of, or a range of the text in the Layout
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>color</parameter></term>
-    <listitem>
-     <para>
-      The color to use
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>start</parameter></term>
-    <listitem>
-     <para>
-      The starting character
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>end</parameter></term>
-    <listitem>
-     <para>
-      The ending character, by default the end of the string
-     </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/ui/ui/draw/text/layout/setwidth.xml b/reference/ui/ui/draw/text/layout/setwidth.xml
deleted file mode 100644
index 031c7f5df5fb..000000000000
--- a/reference/ui/ui/draw/text/layout/setwidth.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-draw-text-layout.setwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Draw\Text\Layout::setWidth</refname>
-  <refpurpose>Set Width</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Draw\Text\Layout::setWidth</methodname>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the width of this Text Layout
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <para>
-      The new width
-     </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/ui/ui/executor/construct.xml b/reference/ui/ui/executor/construct.xml
deleted file mode 100644
index 7f7dda552c2f..000000000000
--- a/reference/ui/ui/executor/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-executor.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Executor::__construct</refname>
-  <refpurpose>Construct a new Executor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Executor::__construct</methodname>
-   <void /> 
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Executor::__construct</methodname>
-   <methodparam><type>int</type><parameter>microseconds</parameter></methodparam>
-  </constructorsynopsis>
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Executor::__construct</methodname>
-   <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
-   <methodparam><type>int</type><parameter>microseconds</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct an executor with the given interval, will not start executing until main loop is entered
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>seconds</parameter></term>
-    <listitem>
-     <para>
-      Seconds between executions
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>microseconds</parameter></term>
-    <listitem>
-     <para>
-      Microseconds between executions
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/executor/kill.xml b/reference/ui/ui/executor/kill.xml
deleted file mode 100644
index 7bffdc877dd5..000000000000
--- a/reference/ui/ui/executor/kill.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-executor.kill" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Executor::kill</refname>
-  <refpurpose>Stop Executor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>UI\Executor::kill</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall stop an executor, the executor cannot be restarted
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/executor/onexecute.xml b/reference/ui/ui/executor/onexecute.xml
deleted file mode 100644
index 81c6f665f5f8..000000000000
--- a/reference/ui/ui/executor/onexecute.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-executor.onexecute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Executor::onExecute</refname>
-  <refpurpose>Execution Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>protected</modifier> <type>void</type><methodname>UI\Executor::onExecute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be repetitively queued for execution in the main thread
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/executor/setinterval.xml b/reference/ui/ui/executor/setinterval.xml
deleted file mode 100644
index b0914670c7aa..000000000000
--- a/reference/ui/ui/executor/setinterval.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-executor.setinterval" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Executor::setInterval</refname>
-  <refpurpose>Interval Manipulation</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Executor::setInterval</methodname>
-   <methodparam><type>int</type><parameter>microseconds</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Executor::setInterval</methodname>
-   <methodparam><type>int</type><parameter>seconds</parameter></methodparam>
-   <methodparam><type>int</type><parameter>microseconds</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the new interval. An interval of 0 will pause the executor until a new interval has been set
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>seconds</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>microseconds</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Indication of 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/ui/ui/menu/append.xml b/reference/ui/ui/menu/append.xml
deleted file mode 100644
index 98e183927900..000000000000
--- a/reference/ui/ui/menu/append.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.append" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::append</refname>
-  <refpurpose>Append Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\MenuItem</type><methodname>UI\Menu::append</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>UI\MenuItem::class</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a new Menu Item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name (text) for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      The type for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A constructed object of the given type
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/menu/appendabout.xml b/reference/ui/ui/menu/appendabout.xml
deleted file mode 100644
index c105998668c5..000000000000
--- a/reference/ui/ui/menu/appendabout.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.appendabout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::appendAbout</refname>
-  <refpurpose>Append About Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\MenuItem</type><methodname>UI\Menu::appendAbout</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>UI\MenuItem::class</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append an About menu item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      The type for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A constructed About menu item of the given type
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/menu/appendcheck.xml b/reference/ui/ui/menu/appendcheck.xml
deleted file mode 100644
index 2c6d7dff221b..000000000000
--- a/reference/ui/ui/menu/appendcheck.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.appendcheck" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::appendCheck</refname>
-  <refpurpose>Append Checkable Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\MenuItem</type><methodname>UI\Menu::appendCheck</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>UI\MenuItem::class</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-  Shall append a checkable menu item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name (text) for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      The type for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    A constructed checkable menu item of the given type
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/menu/appendpreferences.xml b/reference/ui/ui/menu/appendpreferences.xml
deleted file mode 100644
index 2dbab7656381..000000000000
--- a/reference/ui/ui/menu/appendpreferences.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.appendpreferences" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::appendPreferences</refname>
-  <refpurpose>Append Preferences Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\MenuItem</type><methodname>UI\Menu::appendPreferences</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>UI\MenuItem::class</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a Preferences menu item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      The type for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A constructed Preferences menu item of the given type
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/menu/appendquit.xml b/reference/ui/ui/menu/appendquit.xml
deleted file mode 100644
index a1d03b0b3ce4..000000000000
--- a/reference/ui/ui/menu/appendquit.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.appendquit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::appendQuit</refname>
-  <refpurpose>Append Quit Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\MenuItem</type><methodname>UI\Menu::appendQuit</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>type</parameter><initializer>UI\MenuItem::class</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall append a Quit menu item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>type</parameter></term>
-    <listitem>
-     <para>
-      The type for the new item
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A constructed Quit menu item of the given type
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/menu/appendseparator.xml b/reference/ui/ui/menu/appendseparator.xml
deleted file mode 100644
index 078c254984e8..000000000000
--- a/reference/ui/ui/menu/appendseparator.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.appendseparator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::appendSeparator</refname>
-  <refpurpose>Append Menu Item Separator</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Menu::appendSeparator</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall append a separator
-  </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/ui/ui/menu/construct.xml b/reference/ui/ui/menu/construct.xml
deleted file mode 100644
index cd326d0e9054..000000000000
--- a/reference/ui/ui/menu/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menu.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Menu::__construct</refname>
-  <refpurpose>Construct a new Menu</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Menu::__construct</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Menu
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      The name (text) for the menu
-     </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/ui/ui/menuitem/disable.xml b/reference/ui/ui/menuitem/disable.xml
deleted file mode 100644
index 16d9dced3365..000000000000
--- a/reference/ui/ui/menuitem/disable.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menuitem.disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\MenuItem::disable</refname>
-  <refpurpose>Disable Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\MenuItem::disable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall disable this Menu Item
-  </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/ui/ui/menuitem/enable.xml b/reference/ui/ui/menuitem/enable.xml
deleted file mode 100644
index ff96fe1c2129..000000000000
--- a/reference/ui/ui/menuitem/enable.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menuitem.enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\MenuItem::enable</refname>
-  <refpurpose>Enable Menu Item</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\MenuItem::enable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall enable this Menu Item
-  </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/ui/ui/menuitem/ischecked.xml b/reference/ui/ui/menuitem/ischecked.xml
deleted file mode 100644
index f79262d35f70..000000000000
--- a/reference/ui/ui/menuitem/ischecked.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menuitem.ischecked" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\MenuItem::isChecked</refname>
-  <refpurpose>Detect Checked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\MenuItem::isChecked</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if this Menu Item is checked
-  </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/ui/ui/menuitem/onclick.xml b/reference/ui/ui/menuitem/onclick.xml
deleted file mode 100644
index 67192168a441..000000000000
--- a/reference/ui/ui/menuitem/onclick.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menuitem.onclick" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\MenuItem::onClick</refname>
-  <refpurpose>On Click Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <methodname>UI\MenuItem::onClick</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall be executed when this Menu Item is clicked
-  </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/ui/ui/menuitem/setchecked.xml b/reference/ui/ui/menuitem/setchecked.xml
deleted file mode 100644
index af2409f2fbde..000000000000
--- a/reference/ui/ui/menuitem/setchecked.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-menuitem.setchecked" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\MenuItem::setChecked</refname>
-  <refpurpose>Set Checked</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\MenuItem::setChecked</methodname>
-   <methodparam><type>bool</type><parameter>checked</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the checked status of this Menu Item
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>checked</parameter></term>
-    <listitem>
-     <para>
-      The new status
-     </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/ui/ui/point/at.xml b/reference/ui/ui/point/at.xml
deleted file mode 100644
index 857af3b100ae..000000000000
--- a/reference/ui/ui/point/at.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.at" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::at</refname>
-  <refpurpose>Size Coercion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>UI\Point</type><methodname>UI\Point::at</methodname>
-   <methodparam><type>float</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>UI\Point</type><methodname>UI\Point::at</methodname>
-   <methodparam><type>UI\Size</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall return a UI\Point object where x and y are equal to those supplied, either in float or UI\Size form
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The value for x and y
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The Size to convert
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The resulting Point
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/point/construct.xml b/reference/ui/ui/point/construct.xml
deleted file mode 100644
index f6b436eac0a8..000000000000
--- a/reference/ui/ui/point/construct.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::__construct</refname>
-  <refpurpose>Construct a new Point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Point::__construct</methodname>
-   <methodparam><type>float</type><parameter>x</parameter></methodparam>
-   <methodparam><type>float</type><parameter>y</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Construct a new Point using new co-ordinates
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>x</parameter></term>
-    <listitem>
-     <para>
-      The new X co-ordinate
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>y</parameter></term>
-    <listitem>
-     <para>
-      The new Y co-ordinate
-     </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/ui/ui/point/getx.xml b/reference/ui/ui/point/getx.xml
deleted file mode 100644
index a0ea3ec3ee80..000000000000
--- a/reference/ui/ui/point/getx.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.getx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::getX</refname>
-  <refpurpose>Retrieves X</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Point::getX</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the X co-ordinate
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current X co-ordinate
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/point/gety.xml b/reference/ui/ui/point/gety.xml
deleted file mode 100644
index 81091f840802..000000000000
--- a/reference/ui/ui/point/gety.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.gety" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::getY</refname>
-  <refpurpose>Retrieves Y</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Point::getY</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the Y co-ordinate
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current Y co-ordinate
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/point/setx.xml b/reference/ui/ui/point/setx.xml
deleted file mode 100644
index 89bdaa4fb3bf..000000000000
--- a/reference/ui/ui/point/setx.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.setx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::setX</refname>
-  <refpurpose>Set X</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Point::setX</methodname>
-   <methodparam><type>float</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the X co-ordinate
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The new X co-ordinate
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/point/sety.xml b/reference/ui/ui/point/sety.xml
deleted file mode 100644
index 8032d4bf5354..000000000000
--- a/reference/ui/ui/point/sety.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-point.sety" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Point::setY</refname>
-  <refpurpose>Set Y</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Point::setY</methodname>
-   <methodparam><type>float</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set the Y co-ordinate
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The new Y co-ordinate
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/construct.xml b/reference/ui/ui/size/construct.xml
deleted file mode 100644
index 026366a3abba..000000000000
--- a/reference/ui/ui/size/construct.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::__construct</refname>
-  <refpurpose>Construct a new Size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Size::__construct</methodname>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Construct a new Size using new width and height
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <para>
-      The new width
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <para>
-      The new height
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/getheight.xml b/reference/ui/ui/size/getheight.xml
deleted file mode 100644
index 074078af2c6d..000000000000
--- a/reference/ui/ui/size/getheight.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.getheight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::getHeight</refname>
-  <refpurpose>Retrieves Height</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Size::getHeight</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the Height
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current Height
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/getwidth.xml b/reference/ui/ui/size/getwidth.xml
deleted file mode 100644
index 2e54545997ce..000000000000
--- a/reference/ui/ui/size/getwidth.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.getwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::getWidth</refname>
-  <refpurpose>Retrieves Width</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>float</type><methodname>UI\Size::getWidth</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Retrieves the Width
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The current Width
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/of.xml b/reference/ui/ui/size/of.xml
deleted file mode 100644
index 476f97809f3c..000000000000
--- a/reference/ui/ui/size/of.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.of" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::of</refname>
-  <refpurpose>Point Coercion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>UI\Size</type><methodname>UI\Size::of</methodname>
-   <methodparam><type>float</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>UI\Size</type><methodname>UI\Size::of</methodname>
-   <methodparam><type>UI\Point</type><parameter>point</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall return a UI\Size object where width and height are equal to those supplied, either in float or UI\Point form
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The value for width and height
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>point</parameter></term>
-    <listitem>
-     <para>
-      The Point to convert
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The resulting 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/setheight.xml b/reference/ui/ui/size/setheight.xml
deleted file mode 100644
index 2d505cd403a9..000000000000
--- a/reference/ui/ui/size/setheight.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.setheight" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::setHeight</refname>
-  <refpurpose>Set Height</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Size::setHeight</methodname>
-   <methodparam><type>float</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set new Height
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The new Height
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/size/setwidth.xml b/reference/ui/ui/size/setwidth.xml
deleted file mode 100644
index 6269bbb7fd93..000000000000
--- a/reference/ui/ui/size/setwidth.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-size.setwidth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Size::setWidth</refname>
-  <refpurpose>Set Width</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Size::setWidth</methodname>
-   <methodparam><type>float</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set new Width
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The new Width
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/add.xml b/reference/ui/ui/window/add.xml
deleted file mode 100644
index 584e36d62320..000000000000
--- a/reference/ui/ui/window/add.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::add</refname>
-  <refpurpose>Add a Control</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::add</methodname>
-   <methodparam><type>UI\Control</type><parameter>control</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall add a Control to this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The Control to add
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/construct.xml b/reference/ui/ui/window/construct.xml
deleted file mode 100644
index 704c4692c8c0..000000000000
--- a/reference/ui/ui/window/construct.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::__construct</refname>
-  <refpurpose>Construct a new Window</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::__construct</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-   <methodparam><type>Size</type><parameter>size</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>menu</parameter><initializer>&false;</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Shall construct a new Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The title of the Window
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      The size of the Window
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>menu</parameter></term>
-    <listitem>
-     <para>
-      Menu switch
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/error.xml b/reference/ui/ui/window/error.xml
deleted file mode 100644
index 1d19857c7bf7..000000000000
--- a/reference/ui/ui/window/error.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::error</refname>
-  <refpurpose>Show Error Box</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::error</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-   <methodparam><type>string</type><parameter>msg</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall show an error box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The title of the error box
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>msg</parameter></term>
-    <listitem>
-     <para>
-      The message for the error box
-     </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/ui/ui/window/getsize.xml b/reference/ui/ui/window/getsize.xml
deleted file mode 100644
index 398db5fd58d8..000000000000
--- a/reference/ui/ui/window/getsize.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.getsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::getSize</refname>
-  <refpurpose>Get Window Size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>UI\Size</type><methodname>UI\Window::getSize</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall return the size of this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/gettitle.xml b/reference/ui/ui/window/gettitle.xml
deleted file mode 100644
index 6687a4411b56..000000000000
--- a/reference/ui/ui/window/gettitle.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.gettitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::getTitle</refname>
-  <refpurpose>Get Title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Window::getTitle</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall retrieve the title of this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/hasborders.xml b/reference/ui/ui/window/hasborders.xml
deleted file mode 100644
index 7f601c91b3e5..000000000000
--- a/reference/ui/ui/window/hasborders.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.hasborders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::hasBorders</refname>
-  <refpurpose>Border Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Window::hasBorders</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if borders are used on this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/hasmargin.xml b/reference/ui/ui/window/hasmargin.xml
deleted file mode 100644
index dd730ad7f773..000000000000
--- a/reference/ui/ui/window/hasmargin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.hasmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::hasMargin</refname>
-  <refpurpose>Margin Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Window::hasMargin</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall detect if margins are used on this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/isfullscreen.xml b/reference/ui/ui/window/isfullscreen.xml
deleted file mode 100644
index be55a2704e7a..000000000000
--- a/reference/ui/ui/window/isfullscreen.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.isfullscreen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::isFullScreen</refname>
-  <refpurpose>Full Screen Detection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>UI\Window::isFullScreen</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Shall detect if this Window is using the whole screen
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/msg.xml b/reference/ui/ui/window/msg.xml
deleted file mode 100644
index a229906ec6d3..000000000000
--- a/reference/ui/ui/window/msg.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.msg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::msg</refname>
-  <refpurpose>Show Message Box</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::msg</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-   <methodparam><type>string</type><parameter>msg</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall show a message box
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The title of the message box
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>msg</parameter></term>
-    <listitem>
-     <para>
-      The message
-     </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/ui/ui/window/onclosing.xml b/reference/ui/ui/window/onclosing.xml
deleted file mode 100644
index 6c7653fe16a9..000000000000
--- a/reference/ui/ui/window/onclosing.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.onclosing" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::onClosing</refname>
-  <refpurpose>Closing Callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <type>int</type><methodname>UI\Window::onClosing</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Should gracefully destroy this Window 
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/open.xml b/reference/ui/ui/window/open.xml
deleted file mode 100644
index 5e4f799d6a2d..000000000000
--- a/reference/ui/ui/window/open.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.open" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::open</refname>
-  <refpurpose>Open Dialog</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Window::open</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall show an open file dialog
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the name of the file selected for opening
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/save.xml b/reference/ui/ui/window/save.xml
deleted file mode 100644
index bebbc89f543c..000000000000
--- a/reference/ui/ui/window/save.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.save" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::save</refname>
-  <refpurpose>Save Dialog</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>UI\Window::save</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Shall show a save dialog
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the file name selecting for saving
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/setborders.xml b/reference/ui/ui/window/setborders.xml
deleted file mode 100644
index 2074dccc6772..000000000000
--- a/reference/ui/ui/window/setborders.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.setborders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::setBorders</refname>
-  <refpurpose>Border Use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::setBorders</methodname>
-   <methodparam><type>bool</type><parameter>borders</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable the use of borders on this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>borders</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/window/setfullscreen.xml b/reference/ui/ui/window/setfullscreen.xml
deleted file mode 100644
index 59b1e61527b4..000000000000
--- a/reference/ui/ui/window/setfullscreen.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.setfullscreen" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::setFullScreen</refname>
-  <refpurpose>Full Screen Use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::setFullScreen</methodname>
-   <methodparam><type>bool</type><parameter>full</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable the use of the full screen for this Window
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>full</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/window/setmargin.xml b/reference/ui/ui/window/setmargin.xml
deleted file mode 100644
index ebbd5d03603b..000000000000
--- a/reference/ui/ui/window/setmargin.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.setmargin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::setMargin</refname>
-  <refpurpose>Margin Use</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::setMargin</methodname>
-   <methodparam><type>bool</type><parameter>margin</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall enable or disable the use of margins for this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>margin</parameter></term>
-    <listitem>
-     <para>
-      
-     </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/ui/ui/window/setsize.xml b/reference/ui/ui/window/setsize.xml
deleted file mode 100644
index 3cfa9af1d813..000000000000
--- a/reference/ui/ui/window/setsize.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.setsize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::setSize</refname>
-  <refpurpose>Set Size</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::setSize</methodname>
-   <methodparam><type>UI\Size</type><parameter>size</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the size of this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>size</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/ui/ui/window/settitle.xml b/reference/ui/ui/window/settitle.xml
deleted file mode 100644
index 86131fc232b1..000000000000
--- a/reference/ui/ui/window/settitle.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="ui-window.settitle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>UI\Window::setTitle</refname>
-  <refpurpose>Window Title</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>UI\Window::setTitle</methodname>
-   <methodparam><type>string</type><parameter>title</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Shall set the title for this Window
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>title</parameter></term>
-    <listitem>
-     <para>
-      The new title
-     </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/ui/versions.xml b/reference/ui/versions.xml
deleted file mode 100644
index dd379e5d04a7..000000000000
--- a/reference/ui/versions.xml
+++ /dev/null
@@ -1,539 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='ui\draw\text\font\fontfamilies' from='UI 0.9.9'/>
- <function name='ui\run' from='UI 2.0.0'/>
- <function name='ui\quit' from='UI 2.0.0'/>
-
- <!-- Classes and Methods -->
-
- <function name='ui\point' from='UI 0.9.9'/>
- <function name='ui\point::__construct' from='UI 0.9.9'/>
- <function name='ui\point::getx' from='UI 0.9.9'/>
- <function name='ui\point::gety' from='UI 0.9.9'/>
- <function name='ui\point::setx' from='UI 0.9.9'/>
- <function name='ui\point::sety' from='UI 0.9.9'/>
- <function name='ui\point::at' from='UI 1.0.2'/>
-
- <function name='ui\size' from='UI 0.9.9'/>
- <function name='ui\size::__construct' from='UI 0.9.9'/>
- <function name='ui\size::getwidth' from='UI 0.9.9'/>
- <function name='ui\size::getheight' from='UI 0.9.9'/>
- <function name='ui\size::setwidth' from='UI 0.9.9'/>
- <function name='ui\size::setheight' from='UI 0.9.9'/>
- <function name='ui\size::of' from='UI 1.0.2'/>
-
- <function name='ui\control' from='UI 0.9.9'/>
- <function name='ui\control::getparent' from='UI 0.9.9'/>
- <function name='ui\control::setparent' from='UI 0.9.9'/>
- <function name='ui\control::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\control::isvisible' from='UI 0.9.9'/>
- <function name='ui\control::show' from='UI 0.9.9'/>
- <function name='ui\control::hide' from='UI 0.9.9'/>
- <function name='ui\control::isenabled' from='UI 0.9.9'/>
- <function name='ui\control::enable' from='UI 0.9.9'/>
- <function name='ui\control::disable' from='UI 0.9.9'/>
- <function name='ui\control::destroy' from='UI 0.9.9'/>
-
- <function name='ui\window' from='UI 0.9.9'/>
- <function name='ui\window::__construct' from='UI 0.9.9'/>
- <function name='ui\window::settitle' from='UI 0.9.9'/>
- <function name='ui\window::gettitle' from='UI 0.9.9'/>
- <function name='ui\window::setsize' from='UI 0.9.9'/>
- <function name='ui\window::getsize' from='UI 0.9.9'/>
- <function name='ui\window::setfullscreen' from='UI 0.9.9'/>
- <function name='ui\window::isfullscreen' from='UI 0.9.9'/>
- <function name='ui\window::setborders' from='UI 0.9.9'/>
- <function name='ui\window::hasborders' from='UI 0.9.9'/>
- <function name='ui\window::setmargin' from='UI 0.9.9'/>
- <function name='ui\window::hasmargin' from='UI 0.9.9'/>
- <function name='ui\window::center' from='UI 0.9.9'/>
- <function name='ui\window::add' from='UI 0.9.9'/>
- <function name='ui\window::msg' from='UI 0.9.9'/>
- <function name='ui\window::error' from='UI 0.9.9'/>
- <function name='ui\window::open' from='UI 0.9.9'/>
- <function name='ui\window::save' from='UI 0.9.9'/>
- <function name='ui\window::onclosing' from='UI 0.9.9'/>
- <function name='ui\window::getparent' from='UI 0.9.9'/>
- <function name='ui\window::setparent' from='UI 0.9.9'/>
- <function name='ui\window::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\window::isvisible' from='UI 0.9.9'/>
- <function name='ui\window::show' from='UI 0.9.9'/>
- <function name='ui\window::hide' from='UI 0.9.9'/>
- <function name='ui\window::isenabled' from='UI 0.9.9'/>
- <function name='ui\window::enable' from='UI 0.9.9'/>
- <function name='ui\window::disable' from='UI 0.9.9'/>
- <function name='ui\window::destroy' from='UI 0.9.9'/>
-
- <function name="ui\executor" from="UI 2.0.0" />
- <function name="ui\executor::__construct" from="UI 2.0.0" />
- <function name="ui\executor::onexecute" from="UI 2.0.0" />
- <function name="ui\executor::setinterval" from="UI 2.0.0" />
- <function name="ui\executor::kill" from="UI 2.0.0" />
-
- <function name='ui\controls\form' from='UI 0.9.9'/>
- <function name='ui\controls\form::setpadded' from='UI 0.9.9'/>
- <function name='ui\controls\form::ispadded' from='UI 0.9.9'/>
- <function name='ui\controls\form::append' from='UI 0.9.9'/>
- <function name='ui\controls\form::delete' from='UI 0.9.9'/>
- <function name='ui\controls\form::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\form::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\form::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\form::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\form::show' from='UI 0.9.9'/>
- <function name='ui\controls\form::hide' from='UI 0.9.9'/>
- <function name='ui\controls\form::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\form::enable' from='UI 0.9.9'/>
- <function name='ui\controls\form::disable' from='UI 0.9.9'/>
- <function name='ui\controls\form::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\grid' from='UI 0.9.9'/>
- <function name='ui\controls\grid::setpadded' from='UI 0.9.9'/>
- <function name='ui\controls\grid::ispadded' from='UI 0.9.9'/>
- <function name='ui\controls\grid::append' from='UI 0.9.9'/>
- <function name='ui\controls\grid::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\grid::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\grid::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\grid::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\grid::show' from='UI 0.9.9'/>
- <function name='ui\controls\grid::hide' from='UI 0.9.9'/>
- <function name='ui\controls\grid::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\grid::enable' from='UI 0.9.9'/>
- <function name='ui\controls\grid::disable' from='UI 0.9.9'/>
- <function name='ui\controls\grid::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\tab' from='UI 0.9.9'/>
- <function name='ui\controls\tab::append' from='UI 0.9.9'/>
- <function name='ui\controls\tab::delete' from='UI 0.9.9'/>
- <function name='ui\controls\tab::pages' from='UI 0.9.9'/>
- <function name='ui\controls\tab::insertat' from='UI 0.9.9'/>
- <function name='ui\controls\tab::setmargin' from='UI 0.9.9'/>
- <function name='ui\controls\tab::hasmargin' from='UI 0.9.9'/>
- <function name='ui\controls\tab::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\tab::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\tab::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\tab::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\tab::show' from='UI 0.9.9'/>
- <function name='ui\controls\tab::hide' from='UI 0.9.9'/>
- <function name='ui\controls\tab::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\tab::enable' from='UI 0.9.9'/>
- <function name='ui\controls\tab::disable' from='UI 0.9.9'/>
- <function name='ui\controls\tab::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\box' from='UI 0.9.9'/>
- <function name='ui\controls\box::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\box::getorientation' from='UI 0.9.9'/>
- <function name='ui\controls\box::append' from='UI 0.9.9'/>
- <function name='ui\controls\box::delete' from='UI 0.9.9'/>
- <function name='ui\controls\box::setpadded' from='UI 0.9.9'/>
- <function name='ui\controls\box::ispadded' from='UI 0.9.9'/>
- <function name='ui\controls\box::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\box::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\box::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\box::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\box::show' from='UI 0.9.9'/>
- <function name='ui\controls\box::hide' from='UI 0.9.9'/>
- <function name='ui\controls\box::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\box::enable' from='UI 0.9.9'/>
- <function name='ui\controls\box::disable' from='UI 0.9.9'/>
- <function name='ui\controls\box::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\check' from='UI 0.9.9'/>
- <function name='ui\controls\check::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\check::settext' from='UI 0.9.9'/>
- <function name='ui\controls\check::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\check::setchecked' from='UI 0.9.9'/>
- <function name='ui\controls\check::ischecked' from='UI 0.9.9'/>
- <function name='ui\controls\check::ontoggle' from='UI 0.9.9'/>
- <function name='ui\controls\check::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\check::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\check::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\check::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\check::show' from='UI 0.9.9'/>
- <function name='ui\controls\check::hide' from='UI 0.9.9'/>
- <function name='ui\controls\check::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\check::enable' from='UI 0.9.9'/>
- <function name='ui\controls\check::disable' from='UI 0.9.9'/>
- <function name='ui\controls\check::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\button' from='UI 0.9.9'/>
- <function name='ui\controls\button::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\button::settext' from='UI 0.9.9'/>
- <function name='ui\controls\button::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\button::onclick' from='UI 0.9.9'/>
- <function name='ui\controls\button::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\button::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\button::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\button::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\button::show' from='UI 0.9.9'/>
- <function name='ui\controls\button::hide' from='UI 0.9.9'/>
- <function name='ui\controls\button::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\button::enable' from='UI 0.9.9'/>
- <function name='ui\controls\button::disable' from='UI 0.9.9'/>
- <function name='ui\controls\button::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\colorbutton' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::setcolor' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::getcolor' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::show' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::hide' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::enable' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::disable' from='UI 0.9.9'/>
- <function name='ui\controls\colorbutton::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\label' from='UI 0.9.9'/>
- <function name='ui\controls\label::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\label::settext' from='UI 0.9.9'/>
- <function name='ui\controls\label::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\label::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\label::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\label::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\label::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\label::show' from='UI 0.9.9'/>
- <function name='ui\controls\label::hide' from='UI 0.9.9'/>
- <function name='ui\controls\label::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\label::enable' from='UI 0.9.9'/>
- <function name='ui\controls\label::disable' from='UI 0.9.9'/>
- <function name='ui\controls\label::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\entry' from='UI 0.9.9'/>
- <function name='ui\controls\entry::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\entry::settext' from='UI 0.9.9'/>
- <function name='ui\controls\entry::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\entry::setreadonly' from='UI 0.9.9'/>
- <function name='ui\controls\entry::isreadonly' from='UI 0.9.9'/>
- <function name='ui\controls\entry::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\entry::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\entry::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\entry::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\entry::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\entry::show' from='UI 0.9.9'/>
- <function name='ui\controls\entry::hide' from='UI 0.9.9'/>
- <function name='ui\controls\entry::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\entry::enable' from='UI 0.9.9'/>
- <function name='ui\controls\entry::disable' from='UI 0.9.9'/>
- <function name='ui\controls\entry::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\multilineentry' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::settext' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::append' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::setreadonly' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::isreadonly' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::show' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::hide' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::enable' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::disable' from='UI 0.9.9'/>
- <function name='ui\controls\multilineentry::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\group' from='UI 0.9.9'/>
- <function name='ui\controls\group::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\group::settitle' from='UI 0.9.9'/>
- <function name='ui\controls\group::gettitle' from='UI 0.9.9'/>
- <function name='ui\controls\group::setmargin' from='UI 0.9.9'/>
- <function name='ui\controls\group::hasmargin' from='UI 0.9.9'/>
- <function name='ui\controls\group::add' from='UI 0.9.9'/>
- <function name='ui\controls\group::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\group::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\group::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\group::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\group::show' from='UI 0.9.9'/>
- <function name='ui\controls\group::hide' from='UI 0.9.9'/>
- <function name='ui\controls\group::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\group::enable' from='UI 0.9.9'/>
- <function name='ui\controls\group::disable' from='UI 0.9.9'/>
- <function name='ui\controls\group::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\spin' from='UI 0.9.9'/>
- <function name='ui\controls\spin::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\spin::setvalue' from='UI 0.9.9'/>
- <function name='ui\controls\spin::getvalue' from='UI 0.9.9'/>
- <function name='ui\controls\spin::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\spin::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\spin::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\spin::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\spin::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\spin::show' from='UI 0.9.9'/>
- <function name='ui\controls\spin::hide' from='UI 0.9.9'/>
- <function name='ui\controls\spin::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\spin::enable' from='UI 0.9.9'/>
- <function name='ui\controls\spin::disable' from='UI 0.9.9'/>
- <function name='ui\controls\spin::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\slider' from='UI 0.9.9'/>
- <function name='ui\controls\slider::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\slider::setvalue' from='UI 0.9.9'/>
- <function name='ui\controls\slider::getvalue' from='UI 0.9.9'/>
- <function name='ui\controls\slider::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\slider::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\slider::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\slider::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\slider::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\slider::show' from='UI 0.9.9'/>
- <function name='ui\controls\slider::hide' from='UI 0.9.9'/>
- <function name='ui\controls\slider::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\slider::enable' from='UI 0.9.9'/>
- <function name='ui\controls\slider::disable' from='UI 0.9.9'/>
- <function name='ui\controls\slider::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\progress' from='UI 0.9.9'/>
- <function name='ui\controls\progress::setvalue' from='UI 0.9.9'/>
- <function name='ui\controls\progress::getvalue' from='UI 0.9.9'/>
- <function name='ui\controls\progress::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\progress::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\progress::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\progress::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\progress::show' from='UI 0.9.9'/>
- <function name='ui\controls\progress::hide' from='UI 0.9.9'/>
- <function name='ui\controls\progress::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\progress::enable' from='UI 0.9.9'/>
- <function name='ui\controls\progress::disable' from='UI 0.9.9'/>
- <function name='ui\controls\progress::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\separator' from='UI 0.9.9'/>
- <function name='ui\controls\separator::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\separator::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\separator::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\separator::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\separator::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\separator::show' from='UI 0.9.9'/>
- <function name='ui\controls\separator::hide' from='UI 0.9.9'/>
- <function name='ui\controls\separator::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\separator::enable' from='UI 0.9.9'/>
- <function name='ui\controls\separator::disable' from='UI 0.9.9'/>
- <function name='ui\controls\separator::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\combo' from='UI 0.9.9'/>
- <function name='ui\controls\combo::setselected' from='UI 0.9.9'/>
- <function name='ui\controls\combo::getselected' from='UI 0.9.9'/>
- <function name='ui\controls\combo::append' from='UI 0.9.9'/>
- <function name='ui\controls\combo::onselected' from='UI 0.9.9'/>
- <function name='ui\controls\combo::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\combo::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\combo::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\combo::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\combo::show' from='UI 0.9.9'/>
- <function name='ui\controls\combo::hide' from='UI 0.9.9'/>
- <function name='ui\controls\combo::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\combo::enable' from='UI 0.9.9'/>
- <function name='ui\controls\combo::disable' from='UI 0.9.9'/>
- <function name='ui\controls\combo::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\editablecombo' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::settext' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::gettext' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::append' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::onchange' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::show' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::hide' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::enable' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::disable' from='UI 0.9.9'/>
- <function name='ui\controls\editablecombo::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\radio' from='UI 0.9.9'/>
- <function name='ui\controls\radio::setselected' from='UI 0.9.9'/>
- <function name='ui\controls\radio::getselected' from='UI 0.9.9'/>
- <function name='ui\controls\radio::append' from='UI 0.9.9'/>
- <function name='ui\controls\radio::onselected' from='UI 0.9.9'/>
- <function name='ui\controls\radio::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\radio::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\radio::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\radio::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\radio::show' from='UI 0.9.9'/>
- <function name='ui\controls\radio::hide' from='UI 0.9.9'/>
- <function name='ui\controls\radio::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\radio::enable' from='UI 0.9.9'/>
- <function name='ui\controls\radio::disable' from='UI 0.9.9'/>
- <function name='ui\controls\radio::destroy' from='UI 0.9.9'/>
-
- <function name='ui\controls\picker' from='UI 0.9.9'/>
- <function name='ui\controls\picker::__construct' from='UI 0.9.9'/>
- <function name='ui\controls\picker::getparent' from='UI 0.9.9'/>
- <function name='ui\controls\picker::setparent' from='UI 0.9.9'/>
- <function name='ui\controls\picker::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\controls\picker::isvisible' from='UI 0.9.9'/>
- <function name='ui\controls\picker::show' from='UI 0.9.9'/>
- <function name='ui\controls\picker::hide' from='UI 0.9.9'/>
- <function name='ui\controls\picker::isenabled' from='UI 0.9.9'/>
- <function name='ui\controls\picker::enable' from='UI 0.9.9'/>
- <function name='ui\controls\picker::disable' from='UI 0.9.9'/>
- <function name='ui\controls\picker::destroy' from='UI 0.9.9'/>
-
- <function name='ui\menu' from='UI 0.9.9'/>
- <function name='ui\menu::__construct' from='UI 0.9.9'/>
- <function name='ui\menu::append' from='UI 0.9.9'/>
- <function name='ui\menu::appendcheck' from='UI 0.9.9'/>
- <function name='ui\menu::appendquit' from='UI 0.9.9'/>
- <function name='ui\menu::appendpreferences' from='UI 0.9.9'/>
- <function name='ui\menu::appendabout' from='UI 0.9.9'/>
- <function name='ui\menu::appendseparator' from='UI 0.9.9'/>
-
- <function name='ui\menuitem' from='UI 0.9.9'/>
- <function name='ui\menuitem::enable' from='UI 0.9.9'/>
- <function name='ui\menuitem::disable' from='UI 0.9.9'/>
- <function name='ui\menuitem::ischecked' from='UI 0.9.9'/>
- <function name='ui\menuitem::setchecked' from='UI 0.9.9'/>
- <function name='ui\menuitem::onclick' from='UI 0.9.9'/>
-
- <function name='ui\area' from='UI 0.9.9'/>
- <function name='ui\area::redraw' from='UI 0.9.9'/>
- <function name='ui\area::setsize' from='UI 0.9.9'/>
- <function name='ui\area::scrollto' from='UI 0.9.9'/>
- <function name='ui\area::ondraw' from='UI 0.9.9'/>
- <function name='ui\area::onmouse' from='UI 0.9.9'/>
- <function name='ui\area::onkey' from='UI 0.9.9'/>
- <function name='ui\area::getparent' from='UI 0.9.9'/>
- <function name='ui\area::setparent' from='UI 0.9.9'/>
- <function name='ui\area::gettoplevel' from='UI 0.9.9'/>
- <function name='ui\area::isvisible' from='UI 0.9.9'/>
- <function name='ui\area::show' from='UI 0.9.9'/>
- <function name='ui\area::hide' from='UI 0.9.9'/>
- <function name='ui\area::isenabled' from='UI 0.9.9'/>
- <function name='ui\area::enable' from='UI 0.9.9'/>
- <function name='ui\area::disable' from='UI 0.9.9'/>
- <function name='ui\area::destroy' from='UI 0.9.9'/>
-
- <function name='ui\draw\pen' from='UI 0.9.9'/>
- <function name='ui\draw\pen::fill' from='UI 0.9.9'/>
- <function name='ui\draw\pen::stroke' from='UI 0.9.9'/>
- <function name='ui\draw\pen::transform' from='UI 0.9.9'/>
- <function name='ui\draw\pen::clip' from='UI 0.9.9'/>
- <function name='ui\draw\pen::save' from='UI 0.9.9'/>
- <function name='ui\draw\pen::restore' from='UI 0.9.9'/>
- <function name='ui\draw\pen::write' from='UI 0.9.9'/>
-
- <function name='ui\draw\path' from='UI 0.9.9'/>
- <function name='ui\draw\path::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\path::newfigure' from='UI 0.9.9'/>
- <function name='ui\draw\path::newfigurewitharc' from='UI 0.9.9'/>
- <function name='ui\draw\path::lineto' from='UI 0.9.9'/>
- <function name='ui\draw\path::arcto' from='UI 0.9.9'/>
- <function name='ui\draw\path::bezierto' from='UI 0.9.9'/>
- <function name='ui\draw\path::closefigure' from='UI 0.9.9'/>
- <function name='ui\draw\path::addrectangle' from='UI 0.9.9'/>
- <function name='ui\draw\path::end' from='UI 0.9.9'/>
-
- <function name='ui\draw\color' from='UI 0.9.9'/>
- <function name='ui\draw\color::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\color::setchannel' from='UI 0.9.9'/>
- <function name='ui\draw\color::getchannel' from='UI 0.9.9'/>
-
- <function name='ui\draw\brush' from='UI 0.9.9'/>
- <function name='ui\draw\brush::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\brush::gettype' from='UI 0.9.9'/>
- <function name='ui\draw\brush::settype' from='UI 0.9.9'/>
- <function name='ui\draw\brush::setcolor' from='UI 0.9.9'/>
- <function name='ui\draw\brush::getcolor' from='UI 0.9.9'/>
- <function name='ui\draw\brush::addstop' from='UI 1.0.3'/>
- <function name='ui\draw\brush::delstop' from='UI 1.0.3'/>
- <function name='ui\draw\brush::getstop' from='UI 1.0.3'/>
-
- <function name='ui\draw\brush\gradient' from='UI 2.0.0'/>
- <function name='ui\draw\brush\gradient::addstop' from='UI 2.0.0'/>
- <function name='ui\draw\brush\gradient::delstop' from='UI 2.0.0'/>
- <function name='ui\draw\brush\gradient::setstop' from='UI 2.0.0'/>
-
- <function name='ui\draw\brush\lineargradient' from='UI 2.0.0'/>
- <function name='ui\draw\brush\lineargradient::__construct' from='UI 2.0.0'/>
-
- <function name='ui\draw\brush\radialgradient' from='UI 2.0.0'/>
- <function name='ui\draw\brush\radialgradient::__construct' from='UI 2.0.0'/>
-
- <function name='ui\draw\stroke' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::setcap' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::getcap' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::setjoin' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::getjoin' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::setthickness' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::getthickness' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::getmiterlimit' from='UI 0.9.9'/>
- <function name='ui\draw\stroke::setmiterlimit' from='UI 0.9.9'/>
-
- <function name='ui\draw\line\cap' from='UI 0.9.9'/>
-
- <function name='ui\draw\line\join' from='UI 0.9.9'/>
-
- <function name='ui\draw\matrix' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::translate' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::scale' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::rotate' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::skew' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::multiply' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::isinvertible' from='UI 0.9.9'/>
- <function name='ui\draw\matrix::invert' from='UI 0.9.9'/>
-
- <function name='ui\draw\text\font\descriptor' from='UI 0.9.9'/>
- <function name='ui\draw\text\font\descriptor::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\text\font\descriptor::getfamily' from='UI 1.0.3'/>
- <function name='ui\draw\text\font\descriptor::getitalic' from='UI 1.0.3'/>
- <function name='ui\draw\text\font\descriptor::getsize' from='UI 1.0.3'/>
- <function name='ui\draw\text\font\descriptor::getstretch' from='UI 1.0.3'/>
- <function name='ui\draw\text\font\descriptor::getweight' from='UI 1.0.3'/>
-
-
- <function name='ui\draw\text\font\weight' from='UI 0.9.9'/>
-
- <function name='ui\draw\text\font\italic' from='UI 0.9.9'/>
-
- <function name='ui\draw\text\font\stretch' from='UI 0.9.9'/>
-
- <function name='ui\draw\text\font' from='UI 0.9.9'/>
- <function name='ui\draw\text\font::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\text\font::getascent' from='UI 1.0.3'/>
- <function name='ui\draw\text\font::getdescent' from='UI 1.0.3'/>
- <function name='ui\draw\text\font::getleading' from='UI 1.0.3'/>
- <function name='ui\draw\text\font::getunderlineposition' from='UI 1.0.3'/>
- <function name='ui\draw\text\font::getunderlinethickness' from='UI 1.0.3'/>
-
- <function name='ui\draw\text\layout' from='UI 0.9.9'/>
- <function name='ui\draw\text\layout::__construct' from='UI 0.9.9'/>
- <function name='ui\draw\text\layout::setwidth' from='UI 0.9.9'/>
- <function name='ui\draw\text\layout::setcolor' from='UI 0.9.9'/>
-
- <function name='ui\key' from='UI 1.0.0'/>
-
- <function name='ui\exception\runtimeexception' from='UI 1.0.3'/>
- <function name='ui\exception\invalidargumentexception' from='UI 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/uopz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/uopz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/uopz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/uopz/book.xml b/reference/uopz/book.xml
deleted file mode 100644
index f36619cea571..000000000000
--- a/reference/uopz/book.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.uopz">
-  &reftitle.intro;
-  <para>
-   The uopz - User Operations for Zend -
-   extension exposes Zend Engine functionality normally
-   used at compilation and execution time in order to
-   allow modification of the internal structures that represent PHP code,
-   and for user code to interact with the VM.
-  </para>
-  <para>
-   uopz supports the following activities:
-  </para>
-  <simplelist>
-   <member>Overloading some opcodes including ZEND_EXIT and ZEND_NEW</member>
-   <member>Backup and restore functions and methods</member>
-   <member>Renaming functions and methods</member>
-   <member>Copying of functions and methods</member>
-   <member>Deletion of functions and methods</member>
-   <member>Redefinition of global and class constants</member>
-   <member>Deletion of global and class constants</member>
-   <member>Runtime composition and modification of classes</member>
-  </simplelist>
-  <note>
-   <para>
-    All of the activities supported are compatible with opcache
-   </para>
-  </note>
-  <caution>
-   <simpara>
-    PECL uopz 6.1.1 is not compatible with Xdebug &gt;= 2.9.4.
-    Later uopz versions are not compatible with Xdebug &lt; 2.9.4.
-   </simpara>
-  </caution>
- </preface>
-
- &reference.uopz.setup;
- &reference.uopz.constants;
- &reference.uopz.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/uopz/configure.xml b/reference/uopz/configure.xml
deleted file mode 100644
index ac2389dee875..000000000000
--- a/reference/uopz/configure.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="uopz.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Use <option role="configure">--enable-uopz[=DIR]</option> when compiling PHP.
- </para>
-
- <para>
-  Windows users should include <filename>php_uopz.dll</filename> into &php.ini;
- </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/uopz/constants.xml b/reference/uopz/constants.xml
deleted file mode 100644
index 7ff31d9daed8..000000000000
--- a/reference/uopz/constants.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="uopz.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
- The following opcodes are defined as constants by uopz before 5.0.0:
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.zend-exit">
-    <term>
-     <constant>ZEND_EXIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked by exit() and die(), receives no arguments.
-      Return boolean &true; to exit, &false; to continue
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-new">
-    <term>
-     <constant>ZEND_NEW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked by object construction,
-      receives the class of object being created as the only argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-throw">
-    <term>
-     <constant>ZEND_THROW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked by the throw construct,
-      receives the class of exception being thrown as the only argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-fetch-class">
-    <term>
-     <constant>ZEND_FETCH_CLASS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked upon composure,
-      receives the class the name of the class being fetched as the only argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-add-trait">
-    <term>
-     <constant>ZEND_ADD_TRAIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked upon composure,
-      receives the class the trait is being added to as the first argument,
-      and the name of the trait as the second argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-add-interface">
-    <term>
-     <constant>ZEND_ADD_INTERFACE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked upon composure,
-      receives the class the interface is being added to as the first argument,
-      and the name of the interface as the second argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-instanceof">
-    <term>
-     <constant>ZEND_INSTANCEOF</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Invoked by instanceof operator,
-      receives the object being verified as the first argument,
-      and the name of the class which that object should be as the second argument
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  The following constants control the VM's behaviour after a user handler is invoked,
-  be extremely careful!
-  These constants are removed as of uopz 5.0.0.
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.zend-user-opcode-continue">
-    <term>
-     <constant>ZEND_USER_OPCODE_CONTINUE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Advance 1 opcode and continuue
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-user-opcode-enter">
-    <term>
-     <constant>ZEND_USER_OPCODE_ENTER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Enter into new op_array without recursion
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-user-opcode-leave">
-    <term>
-     <constant>ZEND_USER_OPCODE_LEAVE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Return to calling op_array within the same executor
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-user-opcode-dispatch">
-    <term>
-     <constant>ZEND_USER_OPCODE_DISPATCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dispatch to original opcode handler
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-user-opcode-dispatch-to">
-    <term>
-     <constant>ZEND_USER_OPCODE_DISPATCH_TO</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dispatch to a specific handler (OR'd with ZEND opcode constant)
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-user-opcode-return">
-    <term>
-     <constant>ZEND_USER_OPCODE_RETURN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Exit from executor (return from function)
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </para>
- <para>
-  The following modifiers are registered as constants by uopz
- </para>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.zend-acc-public">
-    <term>
-     <constant>ZEND_ACC_PUBLIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as public, the default
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-protected">
-    <term>
-     <constant>ZEND_ACC_PROTECTED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as protected
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-private">
-    <term>
-     <constant>ZEND_ACC_PRIVATE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as private
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-static">
-    <term>
-     <constant>ZEND_ACC_STATIC</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as static
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-final">
-    <term>
-     <constant>ZEND_ACC_FINAL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as final
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-abstract">
-    <term>
-     <constant>ZEND_ACC_ABSTRACT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark function as abstract
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-class">
-    <term>
-     <constant>ZEND_ACC_CLASS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dummy registered for consistency, the default kind of class entry.
-      Removed as of uopz 5.0.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-interface">
-    <term>
-     <constant>ZEND_ACC_INTERFACE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark class as interface.
-      Removed as of uopz 5.0.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-trait">
-    <term>
-     <constant>ZEND_ACC_TRAIT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Mark class as trait.
-      Removed as of uopz 5.0.0.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.zend-acc-fetch">
-    <term>
-     <constant>ZEND_ACC_FETCH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Used for getting flags only.
-      Removed as of uopz 5.0.0.
-     </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/uopz/functions/uopz-add-function.xml b/reference/uopz/functions/uopz-add-function.xml
deleted file mode 100644
index 86b4f3525366..000000000000
--- a/reference/uopz/functions/uopz-add-function.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-add-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_add_function</refname>
-  <refpurpose>Adds non-existent function or method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_add_function</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter><initializer>ZEND_ACC_PUBLIC</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_add_function</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">flags</parameter><initializer>ZEND_ACC_PUBLIC</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">all</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a non-existent function or method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>handler</parameter></term>
-    <listitem>
-     <para>
-      The <classname>Closure</classname> that defines the new function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Flags to set for the new function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>all</parameter></term>
-    <listitem>
-     <para>
-      Whether all classes that descend from <parameter>class</parameter> will
-      also be affected.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <function>uopz_add_function</function> throws a <classname>RuntimeException</classname>
-   if the function or method to add already exists.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-add-function.example.basic">
-   <title>Basic <function>uopz_add_function</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_add_function('foo', function () {echo 'bar';});
-foo();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bar
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_del_function</function></member>
-   <member><function>uopz_set_return</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/uopz/functions/uopz-allow-exit.xml b/reference/uopz/functions/uopz-allow-exit.xml
deleted file mode 100644
index 563f78d5492c..000000000000
--- a/reference/uopz/functions/uopz-allow-exit.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-allow-exit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_allow_exit</refname>
-  <refpurpose>Allows control over disabled exit opcode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>uopz_allow_exit</methodname>
-   <methodparam><type>bool</type><parameter>allow</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   By default uopz disables the exit opcode, so <function>exit</function> calls
-   are practically ignored. <function>uopz_allow_exit</function>
-   allows to control this behavior.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>allow</parameter></term>
-    <listitem>
-     <para>
-      Whether to allow the execution of exit opcodes or not.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-allow-exit.example.basic">
-   <title><function>uopz_allow_exit</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-exit(1);
-echo 1;
-uopz_allow_exit(true);
-exit(2);
-echo 2;
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-1
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <caution>
-   <para>
-    <link linkend="book.opcache">OPcache</link> optimizes away dead code after unconditional exit.
-   </para>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_get_exit_status</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/uopz/functions/uopz-backup.xml b/reference/uopz/functions/uopz-backup.xml
deleted file mode 100644
index 49b4dbd7432a..000000000000
--- a/reference/uopz/functions/uopz-backup.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-backup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_backup</refname>
-  <refpurpose>Backup a function</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_backup</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_backup</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Backup a function at runtime, to be restored on shutdown
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function to backup
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_backup</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_backup("fgets");
-uopz_function("fgets", function(){
-    return true;
-});
-var_dump(fgets());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-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/uopz/functions/uopz-compose.xml b/reference/uopz/functions/uopz-compose.xml
deleted file mode 100644
index 88b5a65a1b4f..000000000000
--- a/reference/uopz/functions/uopz-compose.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-compose" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_compose</refname>
-  <refpurpose>Compose a class</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_compose</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>array</type><parameter>classes</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>methods</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>properties</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a new class of the given name that implements, extends, or uses all of the provided classes
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <para>
-      A legal class name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>classes</parameter></term>
-    <listitem>
-     <para>
-      An array of class, interface and trait names
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>methods</parameter></term>
-    <listitem>
-     <para>
-      An associative array of methods, values are either closures or [modifiers => closure]
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>properties</parameter></term>
-    <listitem>
-     <para>
-     An associative array of properties, keys are names, values are modifiers
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Entry type, by default ZEND_ACC_CLASS
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_compose</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class myClass {}
-trait myTrait {}
-interface myInterface {}
-
-uopz_compose(
-    Composed::class, [
-        myClass::class,
-        myTrait::class,
-        myInterface::class
-    ], [
-    "__construct" => function() {
-        /* ... */
-    }
-]);
-
-var_dump(
- class_uses(Composed::class),
- class_parents(Composed::class),
- class_implements(Composed::class));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["myTrait"]=>
-  string(7) "myTrait"
-}
-array(1) {
-  ["myClass"]=>
-  string(7) "myClass"
-}
-array(1) {
-  ["myInterface"]=>
-  string(11) "myInterface"
-}
-]]>
-   </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/uopz/functions/uopz-copy.xml b/reference/uopz/functions/uopz-copy.xml
deleted file mode 100644
index ea9e85a69260..000000000000
--- a/reference/uopz/functions/uopz-copy.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-copy" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_copy</refname>
-  <refpurpose>Copy a function</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>Closure</type><methodname>uopz_copy</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>Closure</type><methodname>uopz_copy</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Copy a function by name
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function to copy
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A Closure for the specified function
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_copy</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$strtotime = uopz_copy('strtotime');
-
-uopz_function("strtotime", function($arg1, $arg2) use($strtotime) {
-    /* can call original strtotime from here */
-    var_dump($arg1);
-});
-
-var_dump(strtotime('dummy'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(5) "dummy"
-]]>
-   </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/uopz/functions/uopz-del-function.xml b/reference/uopz/functions/uopz-del-function.xml
deleted file mode 100644
index 4215982becf5..000000000000
--- a/reference/uopz/functions/uopz-del-function.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-del-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_del_function</refname>
-  <refpurpose>Deletes previously added function or method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_del_function</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_del_function</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">all</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes a previously added function or method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>all</parameter></term>
-    <listitem>
-     <para>
-      Whether all classes that descend from <parameter>class</parameter> will
-      also be affected.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <function>uopz_del_function</function> throws a <classname>RuntimeException</classname>
-   if the function or method to delete has not been added by <function>uopz_add_function</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-del-function.example.basic">
-   <title>Basic <function>uopz_del_function</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_add_function('foo', function () {echo 'bar';});
-var_dump(function_exists('foo'));
-uopz_del_function('foo');
-var_dump(function_exists('foo'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_add_function</function></member>
-   <member><function>uopz_unset_return</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/uopz/functions/uopz-delete.xml b/reference/uopz/functions/uopz-delete.xml
deleted file mode 100644
index fab090309282..000000000000
--- a/reference/uopz/functions/uopz-delete.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_delete</refname>
-  <refpurpose>Delete a function</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_delete</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_delete</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes a function or method
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_delete</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_delete("strlen");
-
-echo strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error: Call to undefined function strlen() in /path/to/script.php on line 4
-]]>
-   </screen>
-  </example>
- <example>
-   <title><function>uopz_delete</function> class example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My {
-    public static function strlen($arg) {
-        return strlen($arg);
-    }
-}
-
-uopz_delete(My::class, "strlen");
-
-echo My::strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error: Call to undefined method My::strlen() in /path/to/script.php on line 10
-]]>
-   </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/uopz/functions/uopz-extend.xml b/reference/uopz/functions/uopz-extend.xml
deleted file mode 100644
index 171ec21bde8a..000000000000
--- a/reference/uopz/functions/uopz-extend.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-extend" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_extend</refname>
-  <refpurpose>Extend a class at runtime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_extend</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>parent</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes <parameter>class</parameter> extend <parameter>parent</parameter>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class to extend
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parent</parameter></term>
-    <listitem>
-     <para>
-      The name of the class to inherit
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   As of PHP 7.4.0, <function>uopz_extend</function> throws a <classname>RuntimeException</classname>,
-   if <link linkend="book.opcache">OPcache</link> is enabled,
-   and the class entry of either <parameter>class</parameter>
-   or <parameter>parent</parameter> (if it is a trait) is immutable.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_extend</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {}
-class B {}
-
-uopz_extend(A::class, B::class);
-
-var_dump(class_parents(A::class));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["B"]=>
-  string(1) "B"
-}
-]]>
-   </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/uopz/functions/uopz-flags.xml b/reference/uopz/functions/uopz-flags.xml
deleted file mode 100644
index e92880c7bc0f..000000000000
--- a/reference/uopz/functions/uopz-flags.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-flags" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_flags</refname>
-  <refpurpose>Get or set flags on function or class</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>uopz_flags</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>PHP_INT_MAX</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>int</type><methodname>uopz_flags</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>PHP_INT_MAX</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Get or set the flags on a class or function entry at runtime
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of a class
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function. If <parameter>class</parameter> is given and an empty string
-      is passed as <parameter>function</parameter>, <function>uopz_flags</function>
-      gets or sets the flags of the class entry.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry> 
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      A valid set of ZEND_ACC_ flags.
-      If omitted, <function>uopz_flags</function> acts as getter.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   If setting, returns old flags, else returns flags
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   As of PHP 7.4.0, if the parameter <parameter>flags</parameter> is passed,
-   <function>uopz_flags</function> throws a <classname>RuntimeException</classname>,
-   if <link linkend="book.opcache">OPcache</link> is enabled,
-   and the class entry of <parameter>class</parameter>
-   or the function entry of <parameter>function</parameter> is immutable.
-  </simpara>
- </refsect1>
-
- <refsect1 role="changelog">
-  &reftitle.changelog;
-  <informaltable>
-   <tgroup cols="2">
-    <thead>
-     <row>
-      <entry>&Version;</entry>
-      <entry>&Description;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>PECL uopz 5.0.0</entry>
-      <entry>
-       The <parameter>flags</parameter> parameter is now optional. Formerly,
-       <constant>ZEND_ACC_FETCH</constant> had to be passed to use <function>uopz_flags</function>
-       as getter.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_flags</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Test {
-    public function method() {
-        return __CLASS__;
-    }
-}
-
-$flags = uopz_flags("Test", "method");
-
-var_dump((bool) (uopz_flags("Test", "method") & ZEND_ACC_PRIVATE));
-var_dump((bool) (uopz_flags("Test", "method") & ZEND_ACC_STATIC));
-
-var_dump(uopz_flags("Test", "method", $flags|ZEND_ACC_STATIC|ZEND_ACC_PRIVATE));
-
-var_dump((bool) (uopz_flags("Test", "method") & ZEND_ACC_PRIVATE));
-var_dump((bool) (uopz_flags("Test", "method") & ZEND_ACC_STATIC));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-bool(false)
-int(1234567890)
-bool(true)
-bool(true)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>"Unfinalize" a Class</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-final class MyClass
-{
-}
-
-$flags = uopz_flags(MyClass::class, '');
-uopz_flags(MyClass::class, '', $flags & ~ZEND_ACC_FINAL);
-var_dump((new ReflectionClass(MyClass::class))->isFinal());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </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/uopz/functions/uopz-function.xml b/reference/uopz/functions/uopz-function.xml
deleted file mode 100644
index 79b208885769..000000000000
--- a/reference/uopz/functions/uopz-function.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-function" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_function</refname>
-  <refpurpose>Creates a function at runtime</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_function</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>modifiers</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_function</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>handler</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>modifiers</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a function at runtime
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class to receive the new function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>handler</parameter></term>
-    <listitem>
-     <para>
-      The Closure for the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>modifiers</parameter></term>
-    <listitem>
-     <para>
-      The modifiers for the function, by default copied or ZEND_ACC_PUBLIC
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_function</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_function("my_strlen", function($arg) {
-    return strlen($arg);
-});
-echo my_strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-11
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>uopz_function</function> class example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My {}
-
-uopz_function(My::class, "strlen", function($arg) {
-    return strlen($arg);
-}, ZEND_ACC_STATIC);
-
-echo My::strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-11
-]]>
-   </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/uopz/functions/uopz-get-exit-status.xml b/reference/uopz/functions/uopz-get-exit-status.xml
deleted file mode 100644
index 3f1035ede329..000000000000
--- a/reference/uopz/functions/uopz-get-exit-status.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-exit-status" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_exit_status</refname>
-  <refpurpose>Retrieve the last set exit status</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>mixed</type><methodname>uopz_get_exit_status</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieves the last set exit status, i.e. the value passed to
-   <function>exit</function>.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   This function returns the last exit status, or &null; if <function>exit</function>
-   has not been called.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="examples"><!-- {{{ -->
-  &reftitle.examples;
-  <example xml:id="uopz-get-exit-status.example.basic"><!-- {{{ -->
-   <title><function>uopz_get_exit_status</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-exit(123); 
-echo uopz_get_exit_status();?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-123
-]]>
-   </screen>
-  </example><!-- }}} -->
- </refsect1><!-- }}} -->
-
- <refsect1 role="notes"><!-- {{{ -->
-  &reftitle.notes;
-  <caution>
-   <para>
-    <link linkend="book.opcache">OPcache</link> optimizes away dead code after unconditional exit.
-   </para>
-  </caution>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_allow_exit</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/uopz/functions/uopz-get-hook.xml b/reference/uopz/functions/uopz-get-hook.xml
deleted file mode 100644
index 2b3bc23857b4..000000000000
--- a/reference/uopz/functions/uopz-get-hook.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-hook" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_hook</refname>
-  <refpurpose>Gets previously set hook on function or method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>Closure</type><methodname>uopz_get_hook</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>Closure</type><methodname>uopz_get_hook</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the previously set hook on a function or method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the previously set hook on a function or method, or &null; if no hook
-   has been set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-get-hook.example.basic">
-   <title>Basic <function>uopz_get_hook</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function foo() {
-    echo 'foo';
-}
-uopz_set_hook('foo', function () {echo 'bar';});
-var_dump(uopz_get_hook('foo'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Closure)#2 (0) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_set_hook</function></member>
-   <member><function>uopz_unset_hook</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/uopz/functions/uopz-get-mock.xml b/reference/uopz/functions/uopz-get-mock.xml
deleted file mode 100644
index acc6abbb8610..000000000000
--- a/reference/uopz/functions/uopz-get-mock.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-mock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_mock</refname>
-  <refpurpose>Get the current mock for a class</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>uopz_get_mock</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the current mock for <parameter>class</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the mocked class.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Either a string containing the name of the mock, or an object,
-   or &null; if no mock has been set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_get_mock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {
-    public static function who() {
-        echo "A";
-    }
-}
-
-class mockA {
-    public static function who() {
-        echo "mockA";
-    }
-}
-
-uopz_set_mock(A::class, mockA::class);
-echo uopz_get_mock(A::class);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-mockA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_set_mock</function></member>
-   <member><function>uopz_unset_mock</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/uopz/functions/uopz-get-property.xml b/reference/uopz/functions/uopz-get-property.xml
deleted file mode 100644
index 6576e91c8122..000000000000
--- a/reference/uopz/functions/uopz-get-property.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-property" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_property</refname>
-  <refpurpose>Gets value of class or instance property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>mixed</type><methodname>uopz_get_property</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>property</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>mixed</type><methodname>uopz_get_property</methodname>
-   <methodparam><type>object</type><parameter>instance</parameter></methodparam>
-   <methodparam><type>string</type><parameter>property</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the value of a static class property, if <parameter>class</parameter>
-   is given, or the value of an instance property, if <parameter>instance</parameter>
-   is given.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>instance</parameter></term>
-    <listitem>
-     <para>
-      The object instance.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <para>
-      The name of the property.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the class or instance property, or &null; if the property
-   is not defined.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-get-property.example.basic">
-   <title>Basic <function>uopz_get_property</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Foo {
-    private static $staticBar = 10;
-    private $bar = 100;
-}
-$foo = new Foo;
-var_dump(uopz_get_property('Foo', 'staticBar'));
-var_dump(uopz_get_property($foo, 'bar'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(10)
-int(100)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_set_property</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/uopz/functions/uopz-get-return.xml b/reference/uopz/functions/uopz-get-return.xml
deleted file mode 100644
index 41fed270e6b8..000000000000
--- a/reference/uopz/functions/uopz-get-return.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-return" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_return</refname>
-  <refpurpose>Gets a previous set return value for a function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>uopz_get_return</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>mixed</type><methodname>uopz_get_return</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the return value of the <parameter>function</parameter> previously set by <methodname>uopz_set_return</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-     The name of the class containing the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   The return value or Closure previously set.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_get_return</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_set_return("strlen", 42);
-echo uopz_get_return("strlen");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-42
-]]>
-   </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/uopz/functions/uopz-get-static.xml b/reference/uopz/functions/uopz-get-static.xml
deleted file mode 100644
index 93ce34b94ed2..000000000000
--- a/reference/uopz/functions/uopz-get-static.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-get-static" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_get_static</refname>
-  <refpurpose>Gets the static variables from function or method scope</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>array</type><methodname>uopz_get_static</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>array</type><methodname>uopz_get_static</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets the static variables from function or method scope.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an associative <type>array</type> of variable names mapped to their
-   current values on success, or &null; if the function or method does not exist.
-  </para>
-  <simpara>
-   As of PHP 8.3.0, static initializers are either computed during compile time,
-   or if that is not possible, only when the function or method is run the first
-   time, in which case the value of the static variable is reported as &null;
-   prior to the first invocation.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-get-static.example.basic">
-   <title>Basic <function>uopz_get_static</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function foo() {
-    static $bar = 'baz';
-}
-var_dump(uopz_get_static('foo'));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["bar"]=>
-  string(3) "baz"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>ReflectionFunctionAbstract::getStaticVariables</methodname></member>
-   <member><function>uopz_set_static</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/uopz/functions/uopz-implement.xml b/reference/uopz/functions/uopz-implement.xml
deleted file mode 100644
index 6ed8b25fa823..000000000000
--- a/reference/uopz/functions/uopz-implement.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-implement" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_implement</refname>
-  <refpurpose>Implements an interface at runtime</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_implement</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>interface</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes <parameter>class</parameter> implement <parameter>interface</parameter>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>interface</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   As of PHP 7.4.0, <function>uopz_implement</function> throws a <classname>RuntimeException</classname>,
-   if <link linkend="book.opcache">OPcache</link> is enabled,
-   and the class entry of <parameter>class</parameter> is immutable.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_implement</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-interface myInterface {}
-
-class myClass {}
-
-uopz_implement(myClass::class, myInterface::class);
-
-var_dump(class_implements(myClass::class));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  ["myInterface"]=>
-  string(11) "myInterface"
-}
-]]>
-   </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/uopz/functions/uopz-overload.xml b/reference/uopz/functions/uopz-overload.xml
deleted file mode 100644
index 0539df8f3380..000000000000
--- a/reference/uopz/functions/uopz-overload.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-overload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_overload</refname>
-  <refpurpose>Overload a VM opcode</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_overload</methodname>
-   <methodparam><type>int</type><parameter>opcode</parameter></methodparam>
-   <methodparam><type>Callable</type><parameter>callable</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Overloads the specified <parameter>opcode</parameter> with the user defined function
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>opcode</parameter></term>
-    <listitem>
-     <para>
-      A valid opcode, see constants for details of supported codes
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callable</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_overload</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_overload(ZEND_EXIT, function(){});
-
-exit();
-echo "Hello World";
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-Hello World
-]]>
-   </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/uopz/functions/uopz-redefine.xml b/reference/uopz/functions/uopz-redefine.xml
deleted file mode 100644
index 6bece72b59b6..000000000000
--- a/reference/uopz/functions/uopz-redefine.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-redefine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_redefine</refname>
-  <refpurpose>Redefine a constant</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_redefine</methodname>
-   <methodparam><type>string</type><parameter>constant</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_redefine</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>constant</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Redefines the given <parameter>constant</parameter> as <parameter>value</parameter>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the constant
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>constant</parameter></term>
-    <listitem>
-     <para>
-      The name of the constant
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The new value for the constant, must be a valid type for a constant variable
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_redefine</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-define("MY", 100);
-
-uopz_redefine("MY", 1000);
-
-echo MY;
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-1000
-]]>
-   </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/uopz/functions/uopz-rename.xml b/reference/uopz/functions/uopz-rename.xml
deleted file mode 100644
index 064747c993be..000000000000
--- a/reference/uopz/functions/uopz-rename.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-rename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_rename</refname>
-  <refpurpose>Rename a function at runtime</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_rename</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>rename</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_rename</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>string</type><parameter>rename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Renames <parameter>function</parameter> to <parameter>rename</parameter>
-  </para>
-  <note>
-   <para>
-   If both functions exist, this effectively swaps their names
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of an existing function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>rename</parameter></term>
-    <listitem>
-     <para>
-      The new name for the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_rename</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_rename("strlen", "original_strlen");
-
-echo original_strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-11
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>uopz_rename</function> class example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My {
-    public function strlen($arg) {
-        return strlen($arg);
-    }
-}
-
-uopz_rename(My::class, "strlen", "original_strlen");
-
-echo My::original_strlen("Hello World");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-11
-]]>
-   </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/uopz/functions/uopz-restore.xml b/reference/uopz/functions/uopz-restore.xml
deleted file mode 100644
index 80a67864046d..000000000000
--- a/reference/uopz/functions/uopz-restore.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-restore" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_restore</refname>
-  <refpurpose>Restore a previously backed up function</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-  &uopz.warn.removed.function-5-0-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_restore</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_restore</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Restore a previously backed up function
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function to restore
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_restore</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_backup("fgets");
-uopz_function("fgets", function(){
-    return true;
-});
-var_dump(fgets());
-uopz_restore('fgets');
-fgets();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Warning: fgets() expects at least 1 parameter, 0 given in /path/to/script.php on line 8
-]]>
-   </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/uopz/functions/uopz-set-hook.xml b/reference/uopz/functions/uopz-set-hook.xml
deleted file mode 100644
index 6cf4041c6067..000000000000
--- a/reference/uopz/functions/uopz-set-hook.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-set-hook" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_set_hook</refname>
-  <refpurpose>Sets hook to execute when entering a function or method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_set_hook</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>hook</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_set_hook</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>Closure</type><parameter>hook</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a hook to execute when entering a function or method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>hook</parameter></term>
-    <listitem>
-     <para>
-      A closure to execute when entering the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-set-hook.example.basic">
-   <title>Basic <function>uopz_set_hook</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function foo() {
-    echo 'foo';
-}
-uopz_set_hook('foo', function () {echo 'bar';});
-foo();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-barfoo
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_get_hook</function></member>
-   <member><function>uopz_unset_hook</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/uopz/functions/uopz-set-mock.xml b/reference/uopz/functions/uopz-set-mock.xml
deleted file mode 100644
index fedc74606f83..000000000000
--- a/reference/uopz/functions/uopz-set-mock.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-set-mock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_set_mock</refname>
-  <refpurpose>Use mock instead of class for new objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_set_mock</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>mock</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If <parameter>mock</parameter> is a string containing the name of a class then it will be instantiated instead of
-   <parameter>class</parameter>. <parameter>mock</parameter> can also be an object.
-  </para>
-  <note>
-   <para>
-    Only dynamic access to properties and methods will use the <parameter>mock</parameter> object.
-    Static access still uses the original <parameter>class</parameter>.
-    See <link linkend="uopz_set_mock.example.static">example</link> below.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class to be mocked.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>mock</parameter></term>
-    <listitem>
-     <para>
-      The mock to use in the form of a string containing the name of the class to use or an object.
-      If a string is passed, it has to be the fully qualified class name. It is
-      recommended to use the <code>::class</code> magic constant in this case.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &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>PECL uopz 6.0.0</entry>
-      <entry>
-       Mocking static members is no longer supported by this function.
-       <function>uopz_redefine</function> and <function>uopz_set_return</function>,
-       or <link linkend="book.componere">Componere</link> can be used instead.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_set_mock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {
-    public function who() {
-        echo "A";
-    }
-}
-
-class mockA {
-    public function who() {
-        echo "mockA";
-    }
-}
-
-uopz_set_mock(A::class, mockA::class);
-(new A)->who();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-mockA
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>uopz_set_mock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {
-    public function who() {
-        echo "A";
-    }
-}
-
-uopz_set_mock(A::class, new class {
-                            public function who() {
-                                echo "mockA";
-                            }
-                        });
-(new A)->who();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-mockA
-]]>
-   </screen>
-  </example>
-  <example xml:id="uopz_set_mock.example.static">
-   <title><function>uopz_set_mock</function> and static members</title>
-   <para>
-    As of uopz 6.0.0 mocking static members is no longer supported.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {
-    const CON = 'A';
-    public static function who() {
-        echo "A";
-    }
-}
-
-uopz_set_mock(A::class, new class {
-                            const CON = 'mockA';
-                            public static function who() {
-                                echo "mockA";
-                            }
-                        });
-echo A::CON, PHP_EOL;
-A::who();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-A
-A
-]]>
-   </screen>
-    <para>
-     Output of the above example in uopz 5:
-    </para>
-   <screen>
-<![CDATA[
-mockA
-mockA
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_get_mock</function></member>
-   <member><function>uopz_unset_mock</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/uopz/functions/uopz-set-property.xml b/reference/uopz/functions/uopz-set-property.xml
deleted file mode 100644
index e8377d9e2354..000000000000
--- a/reference/uopz/functions/uopz-set-property.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-set-property" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_set_property</refname>
-  <refpurpose>Sets value of existing class or instance property</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>uopz_set_property</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>property</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>uopz_set_property</methodname>
-   <methodparam><type>object</type><parameter>instance</parameter></methodparam>
-   <methodparam><type>string</type><parameter>property</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the value of an existing static class property, if <parameter>class</parameter>
-   is given, or the value of an instance property (regardless whether the instance property already exists), if <parameter>instance</parameter>
-   is given.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>instance</parameter></term>
-    <listitem>
-     <para>
-      The object instance.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>property</parameter></term>
-    <listitem>
-     <para>
-      The name of the property.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The value to assign to the property.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-set-property.example.basic">
-   <title>Basic <function>uopz_set_property</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Foo {
-   private static $staticBar;
-   private $bar;
-   public static function testStaticBar() {
-      return self::$staticBar;
-   }
-   public function testBar() {
-      return $this->bar;
-   }
-}
-$foo = new Foo;
-uopz_set_property('Foo', 'staticBar', 10);
-uopz_set_property($foo, 'bar', 100);
-var_dump(Foo::testStaticBar());
-var_dump($foo->testBar());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-int(10)
-
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_get_property</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/uopz/functions/uopz-set-return.xml b/reference/uopz/functions/uopz-set-return.xml
deleted file mode 100644
index e0400cc03856..000000000000
--- a/reference/uopz/functions/uopz-set-return.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-set-return" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_set_return</refname>
-  <refpurpose>Provide a return value for an existing function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_set_return</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>execute</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_set_return</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>execute</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the return value of the <parameter>function</parameter> to <parameter>value</parameter>. If <parameter>value</parameter>
-   is a Closure and <parameter>execute</parameter> is set, the Closure will be executed in place of the original function.
-   It is possible to call the original function from the Closure.
-  </para>
-  <note>
-   <para>
-    This function replaces <methodname>uopz_rename</methodname>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of an existing function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The value the function should return. If a Closure is provided and the execute flag is set, the Closure will be executed in place of the original function.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>execute</parameter></term>
-    <listitem>
-     <para>
-      If true, and a Closure was provided as the value, the Closure will be executed in place of the original function.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   True if succeeded, false otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_set_return</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_set_return("strlen", 42);
-echo strlen("Banana");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-42
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>uopz_set_return</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_set_return("strlen", function($str) { return strlen($str) * 2; }, true );
-echo strlen("Banana");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-12
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>uopz_set_return</function> class example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class My {
-    public static function strlen($arg) {
-        return strlen($arg);
-    }
-}
-uopz_set_return(My::class, "strlen", function($str) { return strlen($str) * 2; }, true );
-echo My::strlen("Banana");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-12
-]]>
-   </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/uopz/functions/uopz-undefine.xml b/reference/uopz/functions/uopz-undefine.xml
deleted file mode 100644
index ef16d3467bb0..000000000000
--- a/reference/uopz/functions/uopz-undefine.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-undefine" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_undefine</refname>
-  <refpurpose>Undefine a constant</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_undefine</methodname>
-   <methodparam><type>string</type><parameter>constant</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_undefine</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>constant</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes the constant at runtime
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing <parameter>constant</parameter>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>constant</parameter></term>
-    <listitem>
-     <para>
-      The name of an existing constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_undefine</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-define("MY", true);
-
-uopz_undefine("MY");
-
-var_dump(defined("MY"));
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </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/uopz/functions/uopz-unset-hook.xml b/reference/uopz/functions/uopz-unset-hook.xml
deleted file mode 100644
index a12820ea9aff..000000000000
--- a/reference/uopz/functions/uopz-unset-hook.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-unset-hook" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_unset_hook</refname>
-  <refpurpose>Removes previously set hook on function or method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_unset_hook</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>uopz_unset_hook</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Removes the previously set hook on a function or method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-unset-hook.example.basic">
-   <title>Basic <function>uopz_unset_hook</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function foo() {
-    echo 'foo';
-}
-uopz_set_hook('foo', function () {echo 'bar';});
-foo();
-echo PHP_EOL;
-uopz_unset_hook('foo');
-foo();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-barfoo
-foo
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_set_hook</function></member>
-   <member><function>uopz_get_hook</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/uopz/functions/uopz-unset-mock.xml b/reference/uopz/functions/uopz-unset-mock.xml
deleted file mode 100644
index fc83562a0288..000000000000
--- a/reference/uopz/functions/uopz-unset-mock.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-unset-mock" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_unset_mock</refname>
-  <refpurpose>Unset previously set mock</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>uopz_unset_mock</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Unsets the previously set mock for <parameter>class</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the mocked class.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <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 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_unset_mock</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class A {
-    public static function who() {
-        echo "A";
-    }
-}
-
-class mockA {
-    public static function who() {
-        echo "mockA";
-    }
-}
-
-uopz_set_mock(A::class, mockA::class);
-uopz_unset_mock(A::class);
-A::who();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-A
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_set_mock</function></member>
-   <member><function>uopz_get_mock</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/uopz/functions/uopz-unset-return.xml b/reference/uopz/functions/uopz-unset-return.xml
deleted file mode 100644
index a9437042dde4..000000000000
--- a/reference/uopz/functions/uopz-unset-return.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-unset-return" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_unset_return</refname>
-  <refpurpose>Unsets a previously set return value for a function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_unset_return</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>uopz_unset_return</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Unsets the return value of the <parameter>function</parameter> previously set by <methodname>uopz_set_return</methodname>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class containing the function
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   True on success
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>uopz_unset_return</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-uopz_set_return("strlen", 42);
-$len = strlen("Banana");
-uopz_unset_return("strlen");
-echo $len + strlen("Banana");
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-48
-]]>
-   </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/uopz/functions/uopz_set_static.xml b/reference/uopz/functions/uopz_set_static.xml
deleted file mode 100644
index 52b09fab9f61..000000000000
--- a/reference/uopz/functions/uopz_set_static.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.uopz-set-static" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>uopz_set_static</refname>
-  <refpurpose>Sets the static variables in function or method scope</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>uopz_set_static</methodname>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>array</type><parameter>static</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>uopz_set_static</methodname>
-   <methodparam><type>string</type><parameter>class</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-   <methodparam><type>array</type><parameter>static</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the static variables in function or method scope.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class</parameter></term>
-    <listitem>
-     <para>
-      The name of the class.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>function</parameter></term>
-    <listitem>
-     <para>
-      The name of the function or method.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>static</parameter></term>
-    <listitem>
-     <para>
-      The associative <type>array</type> of variable names mapped to their
-      values.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="uopz-set-static.example.basic">
-   <title>Basic <function>uopz_set_static</function> Usage</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function foo() {
-    static $bar = 'baz';
-    var_dump($bar);
-}
-uopz_set_static('foo', ['bar' => 'qux']);
-foo();
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "qux"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>uopz_get_static</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/uopz/reference.xml b/reference/uopz/reference.xml
deleted file mode 100644
index 1ab119f2d0be..000000000000
--- a/reference/uopz/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.uopz" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Uopz &Functions;</title>
-
- &reference.uopz.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/uopz/setup.xml b/reference/uopz/setup.xml
deleted file mode 100644
index 076648b53a16..000000000000
--- a/reference/uopz/setup.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="uopz.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="uopz.requirements">
-  &reftitle.required;
-  <para>
-   As of uopz 5.0 PHP 7.0 is required. As of uopz 5.1, PHP 7.1+ is required.
-  </para>
- </section>
-
- <section xml:id="uopz.installation">
-  &reftitle.install;
-  <para>
-   uopz releases are hosted by PECL and the source code by
-   <link xlink:href="&url.git.hub;krakjoe/uopz">github</link>,
-   the easiest route to installation is the normal PECL route:
-   <link xlink:href="&url.pecl.package;uopz">&url.pecl.package;uopz</link>.
-  </para>
-  <para>
-   Windows users can download prebuilt release binaries from the <link xlink:href="&url.pecl.package;uopz">PECL</link> website.
-  </para>
-  <para>
-   As of uopz 5.0.0 the extension must be loaded as
-   <link linkend="ini.extension">extension</link>. Before this version it must be
-   loaded as <link linkend="ini.zend-extension">zend_extension</link>.
-  </para>
- </section>
-
- <section xml:id="uopz.configuration">
-  &reftitle.runtime;
-  &extension.runtime;
-  <para>
-   <table>
-    <title>uopz &ConfigureOptions;</title>
-    <tgroup cols="4">
-     <thead>
-      <row>
-       <entry>&Name;</entry>
-       <entry>&Default;</entry>
-       <entry>&Changeable;</entry>
-       <entry>&Changelog;</entry>
-      </row>
-     </thead>
-     <tbody xml:id="uopz.configuration.list">
-      <row>
-       <entry><link linkend="ini.uopz.disable">uopz.disable</link></entry>
-       <entry>"0"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
-       <entry>Available as of uopz 5.0.2</entry>
-      </row>
-      <row>
-       <entry><link linkend="ini.uopz.exit">uopz.exit</link></entry>
-       <entry>"0"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
-       <entry>Available as of uopz 6.0.1</entry>
-      </row>
-      <row>
-       <entry><link linkend="ini.uopz.overloads">uopz.overloads</link></entry>
-       <entry>"1"</entry>
-       <entry><constant>INI_SYSTEM</constant></entry>
-       <entry>Available as of uopz 2.0.2. Removed as of uopz 5.0.0.</entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-   &ini.php.constants;
-  </para>
-
-  &ini.descriptions.title;
-
-  <para>
-   <variablelist>
-    <varlistentry xml:id="ini.uopz.disable">
-     <term>
-      <parameter>uopz.disable</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       If enabled, uopz should stop having any effect on the engine.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.uopz.exit">
-     <term>
-      <parameter>uopz.exit</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Whether to allow the execution of exit opcodes or not.
-       This setting can be overridden during runtime by calling <function>uopz_allow_exit</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.uopz.overloads">
-     <term>
-      <parameter>uopz.overloads</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       Enables the ability to use <function>uopz_overload</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
-  <note>
-   <simpara>
-    When running with OPcache enabled, it may be necessary to disable all
-    <link linkend="ini.opcache.optimization-level">OPcache optimizations</link>
-    (<code>opcache.optimization_level=0</code>).
-   </simpara>
-  </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/uopz/test.out b/reference/uopz/test.out
deleted file mode 100644
index 9085588c017a..000000000000
--- a/reference/uopz/test.out
+++ /dev/null
@@ -1,4 +0,0 @@
-array(1) {
-  ["myInterface"]=>
-  string(11) "myInterface"
-}
diff --git a/reference/uopz/versions.xml b/reference/uopz/versions.xml
deleted file mode 100644
index ed2224f3989c..000000000000
--- a/reference/uopz/versions.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <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, 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, 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' deprecated='PECL uopz 5'/>
- <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, 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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/v8js/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/v8js/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/v8js/book.xml b/reference/v8js/book.xml
deleted file mode 100644
index 7bc3c086f596..000000000000
--- a/reference/v8js/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.v8js">
-  &reftitle.intro;
-  <para>
-   This extension embeds the <link xlink:href="&url.v8engine;">V8 Javascript Engine</link> into PHP.
-  </para>
- </preface>
-
- &reference.v8js.setup;
- &reference.v8js.examples;
-
- &reference.v8js.v8js;
- &reference.v8js.v8jsexception;
-
-</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/v8js/configure.xml b/reference/v8js/configure.xml
deleted file mode 100644
index 843a22356747..000000000000
--- a/reference/v8js/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="v8js.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;v8js">&url.pecl.package;v8js</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/v8js/examples.xml b/reference/v8js/examples.xml
deleted file mode 100644
index 20ed5fca38b0..000000000000
--- a/reference/v8js/examples.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="v8js.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  Basic usage
- </para>
- <example>
-  <title>Basic Javascript execution</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$v8 = new V8Js();
-
-/* basic.js */
-$JS = <<< EOT
-len = print('Hello' + ' ' + 'World!' + "\\n");
-len;
-EOT;
-
-try {
-  var_dump($v8->executeString($JS, 'basic.js'));
-} catch (V8JsException $e) {
-  var_dump($e);
-}
-
-?>
-]]>
-  </programlisting>
-  &example.outputs;
-  <screen>
-<![CDATA[
-Hello World!
-int(13)
-]]>
-  </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/v8js/ini.xml b/reference/v8js/ini.xml
deleted file mode 100644
index 636ece6753fd..000000000000
--- a/reference/v8js/ini.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="v8js.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>V8js &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.v8js.max-disposed-contexts">v8js.max_disposed_contexts</link></entry>
-      <entry>25</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.v8js.flags">v8js.flags</link></entry>
-      <entry></entry>
-      <entry><constant>INI_ALL</constant></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.v8js.max-disposed-contexts">
-     <term>
-      <parameter>v8js.max_disposed_contexts</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <para>
-       Sets limit for disposed contexts before forcing V8 to do garbage
-       collection.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.v8js.flags">
-     <term>
-      <parameter>v8js.flags</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Sets V8 command line flags. The list of available flags can be
-       obtained in CLI mode by setting this parameter to
-       <literal>--help</literal>. Example:
-       <informalexample>
-        <screen>
-<![CDATA[
-$ php -r 'ini_set("v8js.flags", "--help"); new V8Js;' | less
-]]>
-        </screen>
-       </informalexample>
-       <note>
-        <para>
-         For these flags to be effective in runtime the ini_set() call has
-         to be done before any V8Js objects are instantiated!
-        </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/v8js/setup.xml b/reference/v8js/setup.xml
deleted file mode 100644
index 83e6faa9253a..000000000000
--- a/reference/v8js/setup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="v8js.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="v8js.requirements">
-  &reftitle.required;
-  <para>
-   PHP and V8 library and headers installed in proper paths.
-  </para>
- </section>
-
-  &reference.v8js.configure;
-
-  &reference.v8js.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/v8js/v8js.xml b/reference/v8js/v8js.xml
deleted file mode 100644
index 059ff7fe2b25..000000000000
--- a/reference/v8js/v8js.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.v8js" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The <classname>V8Js</classname> class</title>
- <titleabbrev>V8Js</titleabbrev>
-
- <partintro>
-
-<!-- {{{ V8Js intro -->
-  <section xml:id="v8js.intro">
-   &reftitle.intro;
-   <para>
-    This is the core class for V8Js extension. Each instance created from
-    this class has own context in which all JavaScript is compiled and
-    executed.
-   </para>
-   <para>
-    See <function>V8Js::__construct</function> for more information.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="v8js.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>V8Js</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>V8Js</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="v8js.constants.v8-version">V8Js::V8_VERSION</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="v8js.constants.flag-none">V8Js::FLAG_NONE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="v8js.constants.flag-force-array">V8Js::FLAG_FORCE_ARRAY</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.v8js')/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.v8js')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ V8Js constants -->
-  <section xml:id="v8js.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="v8js.constants.v8-version">
-     <term><constant>V8Js::V8_VERSION</constant></term>
-     <listitem>
-      <para>The V8 Javascript Engine version.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="v8js.constants.flag-none">
-     <term><constant>V8Js::FLAG_NONE</constant></term>
-     <listitem>
-      <para>No flags.</para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="v8js.constants.flag-force-array">
-     <term><constant>V8Js::FLAG_FORCE_ARRAY</constant></term>
-     <listitem>
-      <para>Forces all JS objects to be associative arrays in PHP.</para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.v8js.entities.v8js;
-
-</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/v8js/v8js/construct.xml b/reference/v8js/v8js/construct.xml
deleted file mode 100644
index 838906a21ba7..000000000000
--- a/reference/v8js/v8js/construct.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8js.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8Js::__construct</refname>
-  <refpurpose>Construct a new <classname>V8Js</classname> object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>V8Js::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>object_name</parameter><initializer>"PHP"</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>variables</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>extensions</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>report_uncaught_exceptions</parameter><initializer>&true;</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   Constructs a new <classname>V8Js</classname> object.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>object_name</parameter></term>
-    <listitem>
-     <para>
-      The name of the object passed to Javascript.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>variables</parameter></term>
-    <listitem>
-     <para>
-      Map of PHP variables that will be available in Javascript. Must be an associative <type>array</type>
-      in format <literal>array("name-for-js" =&gt; "name-of-php-variable")</literal>. Defaults to empty array.
-     </para> 
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>extensions</parameter></term>
-    <listitem>
-     <para>
-      List of extensions registered using <function>V8Js::registerExtension</function> which should be available 
-      in the Javascript context of the created <classname>V8Js</classname> object.
-      <note>
-       <para>
-        Extensions registered to be enabled automatically do not need to be listed in this array.
-        Also if an extension has dependencies, those dependencies can be omitted as well. Defaults to empty array.
-       </para>
-      </note>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>report_uncaught_exceptions</parameter></term>
-    <listitem>
-     <para>
-      Controls whether uncaught Javascript exceptions are reported immediately or not. Defaults to &true;. If set to &false;
-      the uncaught exception can be accessed using <function>V8Js::getPendingException</function>.
-     </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/v8js/v8js/executestring.xml b/reference/v8js/v8js/executestring.xml
deleted file mode 100644
index 1e427a1cd996..000000000000
--- a/reference/v8js/v8js/executestring.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8js.executestring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8Js::executeString</refname>
-  <refpurpose>Execute a string as Javascript code</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>V8Js::executeString</methodname>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>identifier</parameter><initializer>"V8Js::executeString()"</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer><constant>V8Js::FLAG_NONE</constant></initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Compiles and executes the string passed with <parameter>script</parameter> as Javascript code.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>script</parameter></term>
-    <listitem>
-     <para>
-      The code string to be executed.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>identifier</parameter></term>
-    <listitem>
-     <para>
-      Identifier string for the executed code. Used for debugging.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      Execution flags. This value must be one of the
-      <literal>V8Js::FLAG_*</literal> constants, defaulting to
-      <constant>V8Js::FLAG_NONE</constant>.
-      <itemizedlist>
-        <listitem>
-         <para>
-          <constant>V8Js::FLAG_NONE</constant>: no flags
-         </para>
-        </listitem>
-        <listitem>
-         <para>
-          <constant>V8Js::FLAG_FORCE_ARRAY</constant>: forces all Javascript
-          objects passed to PHP to be associative arrays
-         </para>
-        </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the last variable instantiated in the Javascript code converted to matching PHP variable type.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8js/getextensions.xml b/reference/v8js/v8js/getextensions.xml
deleted file mode 100644
index dbe9114cc40a..000000000000
--- a/reference/v8js/v8js/getextensions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8js.getextensions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8Js::getExtensions</refname>
-  <refpurpose>Return an array of registered extensions</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>array</type><methodname>V8Js::getExtensions</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   This function returns array of Javascript extensions registered using <function>V8Js::registerExtension</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array of registered extensions or an empty array if there are none.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8js/getpendingexception.xml b/reference/v8js/v8js/getpendingexception.xml
deleted file mode 100644
index 217564dc3438..000000000000
--- a/reference/v8js/v8js/getpendingexception.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8js.getpendingexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8Js::getPendingException</refname>
-  <refpurpose>Return pending uncaught Javascript exception</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>V8JsException</type><methodname>V8Js::getPendingException</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns any pending uncaught Javascript exception as <classname>V8JsException</classname>
-   left from earlier <function>V8Js::executeString</function> call(s).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Either <classname>V8JsException</classname> 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8js/registerextension.xml b/reference/v8js/v8js/registerextension.xml
deleted file mode 100644
index 07ff8422b6c9..000000000000
--- a/reference/v8js/v8js/registerextension.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8js.registerextension" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8Js::registerExtension</refname>
-  <refpurpose>Register Javascript extensions for V8Js</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>V8Js::registerExtension</methodname>
-   <methodparam><type>string</type><parameter>extension_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>script</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>dependencies</parameter><initializer>array()</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>auto_enable</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Registers passed Javascript <parameter>script</parameter> as extension to
-   be used in <classname>V8Js</classname> contexts.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>extension_name</parameter></term>
-    <listitem>
-     <para>
-      Name of the extension to be registered.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>script</parameter></term>
-    <listitem>
-     <para>
-      The Javascript code to be registered.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>dependencies</parameter></term>
-    <listitem>
-     <para>
-      Array of extension names the extension to be registered depends on. Any such extension is
-      enabled automatically when this extension is loaded.
-      <note>
-       <para>
-        All extensions, including the dependencies, must be registered before any <classname>V8Js</classname>
-        are created which use them.
-       </para>
-      </note>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>auto_enable</parameter></term>
-    <listitem>
-     <para>
-      If set to &true;, the extension will be enabled automatically in all <classname>V8Js</classname> contexts.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if extension was registered successfully, &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/v8js/v8jsexception.xml b/reference/v8js/v8jsexception.xml
deleted file mode 100644
index 4e5cb3c7c2cb..000000000000
--- a/reference/v8js/v8jsexception.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.v8jsexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The <classname>V8JsException</classname> class</title>
- <titleabbrev>V8JsException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ V8JsException intro -->
-  <section xml:id="v8jsexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="v8jsexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>V8JsException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>V8JsException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="v8jsexception.props.jsfilename">JsFileName</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="v8jsexception.props.jslinenumber">JsLineNumber</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="v8jsexception.props.jssourceline">JsSourceLine</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="v8jsexception.props.jstrace">JsTrace</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.v8jsexception')/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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ V8JsException properties -->
-  <section xml:id="v8jsexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="v8jsexception.props.jsfilename">
-     <term><varname>JsFileName</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="v8jsexception.props.jslinenumber">
-     <term><varname>JsLineNumber</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="v8jsexception.props.jssourceline">
-     <term><varname>JsSourceLine</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="v8jsexception.props.jstrace">
-     <term><varname>JsTrace</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.v8js.entities.v8jsexception;
-
-</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/v8js/v8jsexception/getjsfilename.xml b/reference/v8js/v8jsexception/getjsfilename.xml
deleted file mode 100644
index d5926ad3b1ca..000000000000
--- a/reference/v8js/v8jsexception/getjsfilename.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8jsexception.getjsfilename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8JsException::getJsFileName</refname>
-  <refpurpose>The getJsFileName purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsFileName</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8jsexception/getjslinenumber.xml b/reference/v8js/v8jsexception/getjslinenumber.xml
deleted file mode 100644
index 172fd7d3d8fa..000000000000
--- a/reference/v8js/v8jsexception/getjslinenumber.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8jsexception.getjslinenumber" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8JsException::getJsLineNumber</refname>
-  <refpurpose>The getJsLineNumber purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>int</type><methodname>V8JsException::getJsLineNumber</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8jsexception/getjssourceline.xml b/reference/v8js/v8jsexception/getjssourceline.xml
deleted file mode 100644
index adc21d43e8ac..000000000000
--- a/reference/v8js/v8jsexception/getjssourceline.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8jsexception.getjssourceline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8JsException::getJsSourceLine</refname>
-  <refpurpose>The getJsSourceLine purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsSourceLine</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/v8jsexception/getjstrace.xml b/reference/v8js/v8jsexception/getjstrace.xml
deleted file mode 100644
index dc3489a54591..000000000000
--- a/reference/v8js/v8jsexception/getjstrace.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="v8jsexception.getjstrace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>V8JsException::getJsTrace</refname>
-  <refpurpose>The getJsTrace purpose</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>string</type><methodname>V8JsException::getJsTrace</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/v8js/versions.xml b/reference/v8js/versions.xml
deleted file mode 100644
index 062fcedf12ab..000000000000
--- a/reference/v8js/versions.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
-
- <function name='v8js' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8js::__construct' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8js::executestring' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8js::getpendingexception' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8js::registerextension' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8js::getextensions' from='PECL v8js &gt;= 0.1.0'/>
-
- <function name='v8jsexception' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getjsfilename' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getjslinenumber' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getjssourceline' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getjstrace' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::__clone' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::__construct' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getmessage' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getcode' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getfile' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getline' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::gettrace' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::getprevious' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::gettraceasstring' from='PECL v8js &gt;= 0.1.0'/>
- <function name='v8jsexception::__tostring' from='PECL v8js &gt;= 0.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/var_representation/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/var_representation/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/var_representation/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/var_representation/book.xml b/reference/var_representation/book.xml
deleted file mode 100644
index 3ba88d19a753..000000000000
--- a/reference/var_representation/book.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book xml:id="book.var_representation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>var_representation</title>
- <titleabbrev>var_representation</titleabbrev>
-
- <preface xml:id="intro.var_representation">
-  &reftitle.intro;
-  <simpara>
-   The var_representation extension provides a compact alternative to <function>var_export</function> that properly escapes control characters.
-  </simpara>
- </preface>
-
- &reference.var-representation.setup;
- &reference.var-representation.constants;
- &reference.var-representation.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/var_representation/constants.xml b/reference/var_representation/constants.xml
deleted file mode 100644
index a67d0615b62f..000000000000
--- a/reference/var_representation/constants.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appendix xml:id="var-representation.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.var-representation-single-line">
-    <term>
-     <constant>VAR_REPRESENTATION_SINGLE_LINE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      <function>var_representation</function> flag indicating that newlines 
-      should not be used for whitespace in variable representations.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.var-representation-unescaped">
-    <term>
-     <constant>VAR_REPRESENTATION_UNESCAPED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      <function>var_representation</function> flag indicating that strings should be encoded
-      as single quoted strings with unescaped control characters.
-     </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/var_representation/functions/var-representation.xml b/reference/var_representation/functions/var-representation.xml
deleted file mode 100644
index e274129c7a2b..000000000000
--- a/reference/var_representation/functions/var-representation.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xml:id="function.var-representation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>var_representation</refname>
-  <refpurpose>Returns a short, readable, parsable string representation of a variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>var_representation</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <function>var_representation</function> (from the var_representation PECL) returns a string with structured information about the 
-   given variable. It is similar to <function>var_export</function> with differences in indentation, string escaping, and array representations.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-       The variable to generate a representation of.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-       Bitmask consisting of
-       <constant>VAR_REPRESENTATION_SINGLE_LINE</constant>, 
-       <constant>VAR_REPRESENTATION_UNESCAPED</constant>.
-       The behaviour of these constants is described on the
-       <link linkend="var-representation.constants">var_representation constants</link> page.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the variable representation.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>var_representation</function> Examples</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$a = [1, 2, ['key' => 'value']];
-echo var_representation($a), "\n";
-echo var_representation($a, VAR_REPRESENTATION_SINGLE_LINE), "\n";
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-[
-  1,
-  2,
-  [
-    'key' => 'value',
-  ],
-]
-[1, 2, ['key' => 'value']]
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Escaping control characters</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo var_representation("Content-Length: 123\r\n");
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-"Content-Length: 123\r\n"
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Exporting <classname>stdClass</classname></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$person = new stdClass;
-$person->name = 'ElePHPant ElePHPantsdotter';
-$person->website = 'https://php.net/elephpant.php';
-
-echo var_representation($person);
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-(object) [
-  'name' => 'ElePHPant ElePHPantsdotter',
-  'website' => 'https://php.net/elephpant.php',
-]
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Exporting classes</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class A { public $var; }
-$a = new A;
-$a->var = 5;
-echo var_representation($a);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-\A::__set_state([
-  'var' => 5,
-])
-]]>
-    </screen>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Using <link linkend="object.set-state">__set_state()</link></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-class A
-{
-    public $var1;
-    public $var2;
-
-    public static function __set_state($an_array)
-    {
-        $obj = new A;
-        $obj->var1 = $an_array['var1'];
-        $obj->var2 = $an_array['var2'];
-        return $obj;
-    }
-}
-
-$a = new A;
-$a->var1 = 5;
-$a->var2 = 'foo';
-
-eval('$b = ' . var_representation($a) . ';'); // $b = \A::__set_state([
-                                              //   'var1' => 5,
-                                              //   'var2' => 'foo',
-                                              // ]);
-var_dump($b);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-object(A)#2 (2) {
-  ["var1"]=>
-  int(5)
-  ["var2"]=>
-  string(3) "foo"
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>var_export</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_representation/reference.xml b/reference/var_representation/reference.xml
deleted file mode 100644
index 55469e0b56f9..000000000000
--- a/reference/var_representation/reference.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="ref.var-representation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>var_representation &Functions;</title>
-
- &reference.var-representation.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/var_representation/setup.xml b/reference/var_representation/setup.xml
deleted file mode 100644
index 32ebb0ebb5cc..000000000000
--- a/reference/var_representation/setup.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<chapter xml:id="var-representation.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="var-representation.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;var_representation">&url.pecl.package;var_representation</link>.
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </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/var_representation/versions.xml b/reference/var_representation/versions.xml
deleted file mode 100644
index 2aae41a7cac2..000000000000
--- a/reference/var_representation/versions.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='var_representation' from='PECL var_representation &gt;= 0.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/varnish/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/varnish/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/varnish/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/varnish/book.xml b/reference/varnish/book.xml
deleted file mode 100644
index 1d729556d2c7..000000000000
--- a/reference/varnish/book.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.varnish">
-  &reftitle.intro;
-  <para>
-   Varnish Cache is an open source, state of the art web application
-   accelerator. The extension makes it possible to interact with a running
-   varnish instance through TCP socket or shared memory.
-  </para>
- </preface>
-
- &reference.varnish.setup;
- &reference.varnish.constants;
- &reference.varnish.examples;
-
- &reference.varnish.varnishadmin;
- &reference.varnish.varnishstat;
- &reference.varnish.varnishlog;
- &reference.varnish.varnishexception;
-
-</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/varnish/configure.xml b/reference/varnish/configure.xml
deleted file mode 100644
index 46494e7c22c0..000000000000
--- a/reference/varnish/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="varnish.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;varnish">&url.pecl.package;varnish</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/varnish/constants.xml b/reference/varnish/constants.xml
deleted file mode 100644
index ad2decb75cdd..000000000000
--- a/reference/varnish/constants.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="varnish.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.varnish-status-syntax">
-    <term>
-     <constant>VARNISH_STATUS_SYNTAX</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-unknown">
-    <term>
-     <constant>VARNISH_STATUS_UNKNOWN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-unimpl">
-    <term>
-     <constant>VARNISH_STATUS_UNIMPL</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-toofew">
-    <term>
-     <constant>VARNISH_STATUS_TOOFEW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-toomany">
-    <term>
-     <constant>VARNISH_STATUS_TOOMANY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-param">
-    <term>
-     <constant>VARNISH_STATUS_PARAM</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-auth">
-    <term>
-     <constant>VARNISH_STATUS_AUTH</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-ok">
-    <term>
-     <constant>VARNISH_STATUS_OK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-cant">
-    <term>
-     <constant>VARNISH_STATUS_CANT</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-comms">
-    <term>
-     <constant>VARNISH_STATUS_COMMS</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-status-close">
-    <term>
-     <constant>VARNISH_STATUS_CLOSE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-ident">
-    <term>
-     <constant>VARNISH_CONFIG_IDENT</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-host">
-    <term>
-     <constant>VARNISH_CONFIG_HOST</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-port">
-    <term>
-     <constant>VARNISH_CONFIG_PORT</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-timeout">
-    <term>
-     <constant>VARNISH_CONFIG_TIMEOUT</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-secret">
-    <term>
-     <constant>VARNISH_CONFIG_SECRET</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-config-compat">
-    <term>
-     <constant>VARNISH_CONFIG_COMPAT</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-compat-2">
-    <term>
-     <constant>VARNISH_COMPAT_2</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.varnish-compat-3">
-    <term>
-     <constant>VARNISH_COMPAT_3</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/varnish/examples.xml b/reference/varnish/examples.xml
deleted file mode 100644
index bbdd67e1e608..000000000000
--- a/reference/varnish/examples.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="varnish.examples" xmlns="http://docbook.org/ns/docbook">
- &reftitle.examples;
- <section xml:id="varnish.example.admin">
-  <title>Basic VarnishAdmin usage</title>
-  <para>
-   The example illustrates a simple usage of the ban functionality
-  </para>
-  <example>
-   <title>Ban an URL</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$args = array(
-    VARNISH_CONFIG_HOST    => "::1",
-    VARNISH_CONFIG_PORT    => 6082,
-    VARNISH_CONFIG_SECRET  => "5174826b-8595-4958-aa7a-0609632ad7ca",
-    VARNISH_CONFIG_TIMEOUT => 300,
-);
-
-$va = new VarnishAdmin($args);
-
-try {
-    if(!$va->connect()) {
-        throw new VarnishException("Connection failed\n");
-    }   
-} catch (VarnishException $e) {
-    echo $e->getMessage();
-    exit(3);
-}
-
-try {
-    if(!$va->auth()) {
-        throw new VarnishException("Auth failed\n");
-    }   
-} catch (VarnishException $e) {
-    echo $e->getMessage();
-    exit(3);
-}
-
-try {
-    $status = $va->ban('req.url ~ "^/$"');
-    if (VARNISH_STATUS_OK != $status) {
-        throw new VarnishException("Ban method returned $status status\n");
-    }
-} catch (VarnishException $e) {
-    echo $e->getMessage();
-    exit(3);
-}
-
-exit(0);
-
-?>
-]]>
-   </programlisting>
-  </example>
- </section>
- <section xml:id="varnish.example.stat">
-  <title>Basic VarnishStat usage</title>
-  <para>
-   The example illustrates getting varnish statistic snapshot from shared
-   memory
-  </para>
-  <example>
-   <title>Get statistic snapshot</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$vs = new VarnishStat;
-
-try {
-    $data = $vs->getSnapshot();
-} catch (VarnishException $e) {
-    echo $e->getMessage();
-    exit(3);
-}
-
-exit(0);
-?>
-]]>
-   </programlisting>
-  </example>
- </section>
- <section xml:id="varnish.example.log">
-  <title>Basic VarnishLog usage</title>
-  <para>
-   The example illustrates reading varnish log lines from shared memory
-  </para>
-  <example>
-   <title>Read varnish shared memory log</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$vl = new VarnishLog;
-while(1) {
-    $line = $vl->getLine();
-    printf("%s %d %s", VarnishLog::getTagName($line['tag']), $line['id'],
-    $line['data']);
-}
-
-exit(0);
-?>
-]]>
-   </programlisting>
-  </example>
- </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/varnish/setup.xml b/reference/varnish/setup.xml
deleted file mode 100644
index f9f705a09920..000000000000
--- a/reference/varnish/setup.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="varnish.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="varnish.requirements">
-  &reftitle.required;
-  <para>
-   To use this extension, a version of Varnish Cache greater than or equal to 3.0 is required to be installed,
-   which is available on the <link xlink:href="&url.varnish.cache;">Varnish Cache homepage</link>.
-  </para>
- </section>
-
- <section xml:id="varnish.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;varnish">&url.pecl.package;varnish</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/varnish/varnishadmin.xml b/reference/varnish/varnishadmin.xml
deleted file mode 100644
index 6288354f865f..000000000000
--- a/reference/varnish/varnishadmin.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.varnishadmin" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The VarnishAdmin class</title>
- <titleabbrev>VarnishAdmin</titleabbrev>
-
- <partintro>
-
-<!-- {{{ VarnishAdmin intro -->
-  <section xml:id="varnishadmin.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="varnishadmin.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>VarnishAdmin</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>VarnishAdmin</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.varnishadmin')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.varnish.entities.varnishadmin;
-
-</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/varnish/varnishadmin/auth.xml b/reference/varnish/varnishadmin/auth.xml
deleted file mode 100644
index ca30da15e5df..000000000000
--- a/reference/varnish/varnishadmin/auth.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.auth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::auth</refname>
-  <refpurpose>Authenticate on a varnish instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>VarnishAdmin::auth</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/varnish/varnishadmin/ban.xml b/reference/varnish/varnishadmin/ban.xml
deleted file mode 100644
index 2b37d5f365a3..000000000000
--- a/reference/varnish/varnishadmin/ban.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.ban" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::ban</refname>
-  <refpurpose>Ban URLs using a VCL expression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::ban</methodname>
-   <methodparam><type>string</type><parameter>vcl_regex</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>vcl_regex</parameter></term>
-      <listitem>
-       <para>
-         Varnish VCL expression. It's based on the varnish ban command.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/banurl.xml b/reference/varnish/varnishadmin/banurl.xml
deleted file mode 100644
index 437db78bb9e3..000000000000
--- a/reference/varnish/varnishadmin/banurl.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.banurl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::banUrl</refname>
-  <refpurpose>Ban an URL using a VCL expression</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::banUrl</methodname>
-   <methodparam><type>string</type><parameter>vcl_regex</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>vcl_regex</parameter></term>
-      <listitem>
-       <para>
-         URL regular expression in PCRE compatible syntax. It's based on the
-         ban.url varnish command.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/clearpanic.xml b/reference/varnish/varnishadmin/clearpanic.xml
deleted file mode 100644
index 8fafee3468a6..000000000000
--- a/reference/varnish/varnishadmin/clearpanic.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.clearpanic" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::clearPanic</refname>
-  <refpurpose>Clear varnish instance panic messages</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::clearPanic</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.   
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/connect.xml b/reference/varnish/varnishadmin/connect.xml
deleted file mode 100644
index 3462976d1cf9..000000000000
--- a/reference/varnish/varnishadmin/connect.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::connect</refname>
-  <refpurpose>Connect to a varnish instance administration interface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>VarnishAdmin::connect</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/varnish/varnishadmin/construct.xml b/reference/varnish/varnishadmin/construct.xml
deleted file mode 100644
index b2cc38a68619..000000000000
--- a/reference/varnish/varnishadmin/construct.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::__construct</refname>
-  <refpurpose>VarnishAdmin constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>VarnishAdmin::__construct</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-       Configuration arguments. The possible keys are:
-<![CDATA[
-VARNISH_CONFIG_IDENT - local varnish instance ident
-VARNISH_CONFIG_HOST - varnish instance ip
-VARNISH_CONFIG_PORT - varnish instance port
-VARNISH_CONFIG_SECRET - varnish instance secret
-VARNISH_CONFIG_TIMEOUT - connection read timeout
-VARNISH_CONFIG_COMPAT - varnish major version compatibility
-]]>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>VarnishAdmin::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-    $args = array(
-        VARNISH_CONFIG_HOST => "::1",
-        VARNISH_CONFIG_PORT => 6082,
-        VARNISH_CONFIG_SECRET => "5174826b-8595-4958-aa7a-0609632ad7ca",
-        VARNISH_CONFIG_TIMEOUT => 300,
-    );
-    $va = new VarnishAdmin($args);
-?>
-]]>
-   </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/varnish/varnishadmin/disconnect.xml b/reference/varnish/varnishadmin/disconnect.xml
deleted file mode 100644
index 62b704adf655..000000000000
--- a/reference/varnish/varnishadmin/disconnect.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.disconnect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::disconnect</refname>
-  <refpurpose>Disconnect from a varnish instance administration interface</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>VarnishAdmin::disconnect</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/varnish/varnishadmin/getpanic.xml b/reference/varnish/varnishadmin/getpanic.xml
deleted file mode 100644
index 1ad6b6b77f5a..000000000000
--- a/reference/varnish/varnishadmin/getpanic.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.getpanic" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::getPanic</refname>
-  <refpurpose>Get the last panic message on a varnish instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>VarnishAdmin::getPanic</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
-  <para>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the last panic message on the current varnish instance.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/getparams.xml b/reference/varnish/varnishadmin/getparams.xml
deleted file mode 100644
index a07cee2e2426..000000000000
--- a/reference/varnish/varnishadmin/getparams.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.getparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::getParams</refname>
-  <refpurpose>Fetch current varnish instance configuration parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>VarnishAdmin::getParams</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with the varnish configuration parameters.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/isrunning.xml b/reference/varnish/varnishadmin/isrunning.xml
deleted file mode 100644
index 2a88d860fda7..000000000000
--- a/reference/varnish/varnishadmin/isrunning.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.isrunning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::isRunning</refname>
-  <refpurpose>Check if the varnish slave process is currently running</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>VarnishAdmin::isRunning</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </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/varnish/varnishadmin/setcompat.xml b/reference/varnish/varnishadmin/setcompat.xml
deleted file mode 100644
index 9f47fc8ff8c5..000000000000
--- a/reference/varnish/varnishadmin/setcompat.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.setcompat" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setCompat</refname>
-  <refpurpose>Set the class compat configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setCompat</methodname>
-   <methodparam><type>int</type><parameter>compat</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>compat</parameter></term>
-      <listitem>
-       <para>
-         Varnish compatibility option.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/sethost.xml b/reference/varnish/varnishadmin/sethost.xml
deleted file mode 100644
index a72bcaa062c8..000000000000
--- a/reference/varnish/varnishadmin/sethost.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.sethost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setHost</refname>
-  <refpurpose>Set the class host configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setHost</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>host</parameter></term>
-      <listitem>
-       <para>
-         Connection host configuration parameter.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/setident.xml b/reference/varnish/varnishadmin/setident.xml
deleted file mode 100644
index 37b56a3acd0f..000000000000
--- a/reference/varnish/varnishadmin/setident.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.setident" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setIdent</refname>
-  <refpurpose>Set the class ident configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setIdent</methodname>
-   <methodparam><type>string</type><parameter>ident</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ident</parameter></term>
-      <listitem>
-       <para>
-         Connection ident configuration parameter.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/setparam.xml b/reference/varnish/varnishadmin/setparam.xml
deleted file mode 100644
index e3262f8da2a1..000000000000
--- a/reference/varnish/varnishadmin/setparam.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.setparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setParam</refname>
-  <refpurpose>Set configuration param on the current varnish instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::setParam</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-      <listitem>
-       <para>
-         Varnish configuration param name.
-       </para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-      <listitem>
-       <para>
-         Varnish configuration param value.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/setport.xml b/reference/varnish/varnishadmin/setport.xml
deleted file mode 100644
index b554f92d31b1..000000000000
--- a/reference/varnish/varnishadmin/setport.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.setport" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setPort</refname>
-  <refpurpose>Set the class port configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setPort</methodname>
-   <methodparam><type>int</type><parameter>port</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>port</parameter></term>
-      <listitem>
-       <para>
-         Connection port configuration parameter.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/setsecret.xml b/reference/varnish/varnishadmin/setsecret.xml
deleted file mode 100644
index ca8311b4cee4..000000000000
--- a/reference/varnish/varnishadmin/setsecret.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.setsecret" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setSecret</refname>
-  <refpurpose>Set the class secret configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setSecret</methodname>
-   <methodparam><type>string</type><parameter>secret</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>secret</parameter></term>
-      <listitem>
-       <para>
-         Connection secret configuration parameter.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/settimeout.xml b/reference/varnish/varnishadmin/settimeout.xml
deleted file mode 100644
index 6e4df91d77b8..000000000000
--- a/reference/varnish/varnishadmin/settimeout.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.settimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::setTimeout</refname>
-  <refpurpose>Set the class timeout configuration param</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>VarnishAdmin::setTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>timeout</parameter></term>
-      <listitem>
-       <para>
-         Connection timeout configuration parameter.
-       </para>
-      </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/start.xml b/reference/varnish/varnishadmin/start.xml
deleted file mode 100644
index 4e7ae04738eb..000000000000
--- a/reference/varnish/varnishadmin/start.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::start</refname>
-  <refpurpose>Start varnish worker process</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::start</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishadmin/stop.xml b/reference/varnish/varnishadmin/stop.xml
deleted file mode 100644
index 73b131b0e20d..000000000000
--- a/reference/varnish/varnishadmin/stop.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishadmin.stop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishAdmin::stop</refname>
-  <refpurpose>Stop varnish worker process</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>VarnishAdmin::stop</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the varnish command status.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishexception.xml b/reference/varnish/varnishexception.xml
deleted file mode 100644
index 008f90297fb7..000000000000
--- a/reference/varnish/varnishexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.varnishexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The VarnishException class</title>
- <titleabbrev>VarnishException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ VarnishException intro -->
-  <section xml:id="varnishexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="varnishexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>VarnishException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>VarnishException</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
- </partintro>
-
-</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/varnish/varnishlog.xml b/reference/varnish/varnishlog.xml
deleted file mode 100644
index 04aa68e21c44..000000000000
--- a/reference/varnish/varnishlog.xml
+++ /dev/null
@@ -1,754 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.varnishlog" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The VarnishLog class</title>
- <titleabbrev>VarnishLog</titleabbrev>
-
- <partintro>
-
-<!-- {{{ VarnishLog intro -->
-  <section xml:id="varnishlog.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="varnishlog.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>VarnishLog</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>VarnishLog</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-debug">VarnishLog::TAG_Debug</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-error">VarnishLog::TAG_Error</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-cli">VarnishLog::TAG_CLI</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-statsess">VarnishLog::TAG_StatSess</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-reqend">VarnishLog::TAG_ReqEnd</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-sessionopen">VarnishLog::TAG_SessionOpen</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-sessionclose">VarnishLog::TAG_SessionClose</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backendopen">VarnishLog::TAG_BackendOpen</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backendxid">VarnishLog::TAG_BackendXID</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backendreuse">VarnishLog::TAG_BackendReuse</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backendclose">VarnishLog::TAG_BackendClose</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-httpgarbage">VarnishLog::TAG_HttpGarbage</varname>
-     <initializer>11</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backend">VarnishLog::TAG_Backend</varname>
-     <initializer>12</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-length">VarnishLog::TAG_Length</varname>
-     <initializer>13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-fetcherror">VarnishLog::TAG_FetchError</varname>
-     <initializer>14</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxrequest">VarnishLog::TAG_RxRequest</varname>
-     <initializer>15</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxresponse">VarnishLog::TAG_RxResponse</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxstatus">VarnishLog::TAG_RxStatus</varname>
-     <initializer>17</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxurl">VarnishLog::TAG_RxURL</varname>
-     <initializer>18</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxprotocol">VarnishLog::TAG_RxProtocol</varname>
-     <initializer>19</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-rxheader">VarnishLog::TAG_RxHeader</varname>
-     <initializer>20</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txrequest">VarnishLog::TAG_TxRequest</varname>
-     <initializer>21</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txresponse">VarnishLog::TAG_TxResponse</varname>
-     <initializer>22</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txstatus">VarnishLog::TAG_TxStatus</varname>
-     <initializer>23</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txurl">VarnishLog::TAG_TxURL</varname>
-     <initializer>24</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txprotocol">VarnishLog::TAG_TxProtocol</varname>
-     <initializer>25</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-txheader">VarnishLog::TAG_TxHeader</varname>
-     <initializer>26</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objrequest">VarnishLog::TAG_ObjRequest</varname>
-     <initializer>27</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objresponse">VarnishLog::TAG_ObjResponse</varname>
-     <initializer>28</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objstatus">VarnishLog::TAG_ObjStatus</varname>
-     <initializer>29</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objurl">VarnishLog::TAG_ObjURL</varname>
-     <initializer>30</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objprotocol">VarnishLog::TAG_ObjProtocol</varname>
-     <initializer>31</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-objheader">VarnishLog::TAG_ObjHeader</varname>
-     <initializer>32</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-lostheader">VarnishLog::TAG_LostHeader</varname>
-     <initializer>33</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-ttl">VarnishLog::TAG_TTL</varname>
-     <initializer>34</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-fetch-body">VarnishLog::TAG_Fetch_Body</varname>
-     <initializer>35</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-acl">VarnishLog::TAG_VCL_acl</varname>
-     <initializer>36</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-call">VarnishLog::TAG_VCL_call</varname>
-     <initializer>37</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-trace">VarnishLog::TAG_VCL_trace</varname>
-     <initializer>38</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-return">VarnishLog::TAG_VCL_return</varname>
-     <initializer>39</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-error">VarnishLog::TAG_VCL_error</varname>
-     <initializer>40</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-reqstart">VarnishLog::TAG_ReqStart</varname>
-     <initializer>41</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-hit">VarnishLog::TAG_Hit</varname>
-     <initializer>42</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-hitpass">VarnishLog::TAG_HitPass</varname>
-     <initializer>43</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-expban">VarnishLog::TAG_ExpBan</varname>
-     <initializer>44</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-expkill">VarnishLog::TAG_ExpKill</varname>
-     <initializer>45</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-workthread">VarnishLog::TAG_WorkThread</varname>
-     <initializer>46</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-esi-xmlerror">VarnishLog::TAG_ESI_xmlerror</varname>
-     <initializer>47</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-hash">VarnishLog::TAG_Hash</varname>
-     <initializer>48</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-backend-health">VarnishLog::TAG_Backend_health</varname>
-     <initializer>49</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-vcl-log">VarnishLog::TAG_VCL_Log</varname>
-     <initializer>50</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="varnishlog.constants.tag-gzip">VarnishLog::TAG_Gzip</varname>
-     <initializer>51</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.varnishlog')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ VarnishLog constants -->
-  <section xml:id="varnishlog.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="varnishlog.constants.tag-debug">
-     <term><constant>VarnishLog::TAG_Debug</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-error">
-     <term><constant>VarnishLog::TAG_Error</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-cli">
-     <term><constant>VarnishLog::TAG_CLI</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-statsess">
-     <term><constant>VarnishLog::TAG_StatSess</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-reqend">
-     <term><constant>VarnishLog::TAG_ReqEnd</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-sessionopen">
-     <term><constant>VarnishLog::TAG_SessionOpen</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-sessionclose">
-     <term><constant>VarnishLog::TAG_SessionClose</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backendopen">
-     <term><constant>VarnishLog::TAG_BackendOpen</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backendxid">
-     <term><constant>VarnishLog::TAG_BackendXID</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backendreuse">
-     <term><constant>VarnishLog::TAG_BackendReuse</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backendclose">
-     <term><constant>VarnishLog::TAG_BackendClose</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-httpgarbage">
-     <term><constant>VarnishLog::TAG_HttpGarbage</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backend">
-     <term><constant>VarnishLog::TAG_Backend</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-length">
-     <term><constant>VarnishLog::TAG_Length</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-fetcherror">
-     <term><constant>VarnishLog::TAG_FetchError</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxrequest">
-     <term><constant>VarnishLog::TAG_RxRequest</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxresponse">
-     <term><constant>VarnishLog::TAG_RxResponse</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxstatus">
-     <term><constant>VarnishLog::TAG_RxStatus</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxurl">
-     <term><constant>VarnishLog::TAG_RxURL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxprotocol">
-     <term><constant>VarnishLog::TAG_RxProtocol</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-rxheader">
-     <term><constant>VarnishLog::TAG_RxHeader</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txrequest">
-     <term><constant>VarnishLog::TAG_TxRequest</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txresponse">
-     <term><constant>VarnishLog::TAG_TxResponse</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txstatus">
-     <term><constant>VarnishLog::TAG_TxStatus</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txurl">
-     <term><constant>VarnishLog::TAG_TxURL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txprotocol">
-     <term><constant>VarnishLog::TAG_TxProtocol</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-txheader">
-     <term><constant>VarnishLog::TAG_TxHeader</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objrequest">
-     <term><constant>VarnishLog::TAG_ObjRequest</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objresponse">
-     <term><constant>VarnishLog::TAG_ObjResponse</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objstatus">
-     <term><constant>VarnishLog::TAG_ObjStatus</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objurl">
-     <term><constant>VarnishLog::TAG_ObjURL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objprotocol">
-     <term><constant>VarnishLog::TAG_ObjProtocol</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-objheader">
-     <term><constant>VarnishLog::TAG_ObjHeader</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-lostheader">
-     <term><constant>VarnishLog::TAG_LostHeader</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-ttl">
-     <term><constant>VarnishLog::TAG_TTL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-fetch-body">
-     <term><constant>VarnishLog::TAG_Fetch_Body</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-acl">
-     <term><constant>VarnishLog::TAG_VCL_acl</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-call">
-     <term><constant>VarnishLog::TAG_VCL_call</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-trace">
-     <term><constant>VarnishLog::TAG_VCL_trace</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-return">
-     <term><constant>VarnishLog::TAG_VCL_return</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-error">
-     <term><constant>VarnishLog::TAG_VCL_error</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-reqstart">
-     <term><constant>VarnishLog::TAG_ReqStart</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-hit">
-     <term><constant>VarnishLog::TAG_Hit</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-hitpass">
-     <term><constant>VarnishLog::TAG_HitPass</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-expban">
-     <term><constant>VarnishLog::TAG_ExpBan</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-expkill">
-     <term><constant>VarnishLog::TAG_ExpKill</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-workthread">
-     <term><constant>VarnishLog::TAG_WorkThread</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-esi-xmlerror">
-     <term><constant>VarnishLog::TAG_ESI_xmlerror</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-hash">
-     <term><constant>VarnishLog::TAG_Hash</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-backend-health">
-     <term><constant>VarnishLog::TAG_Backend_health</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-vcl-log">
-     <term><constant>VarnishLog::TAG_VCL_Log</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="varnishlog.constants.tag-gzip">
-     <term><constant>VarnishLog::TAG_Gzip</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.varnish.entities.varnishlog;
-
-</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/varnish/varnishlog/construct.xml b/reference/varnish/varnishlog/construct.xml
deleted file mode 100644
index dd03cc1ab835..000000000000
--- a/reference/varnish/varnishlog/construct.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishlog.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishLog::__construct</refname>
-  <refpurpose>Varnishlog constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>VarnishLog::__construct</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-       Configuration arguments. The possible keys are:
-<![CDATA[
-VARNISH_CONFIG_IDENT - local varnish instance ident path
-]]>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishlog/getline.xml b/reference/varnish/varnishlog/getline.xml
deleted file mode 100644
index 34c26da027f4..000000000000
--- a/reference/varnish/varnishlog/getline.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishlog.getline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishLog::getLine</refname>
-  <refpurpose>Get next log line</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>VarnishLog::getLine</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with the log line data.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishlog/gettagname.xml b/reference/varnish/varnishlog/gettagname.xml
deleted file mode 100644
index 6a7e351c9d93..000000000000
--- a/reference/varnish/varnishlog/gettagname.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishlog.gettagname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishLog::getTagName</refname>
-  <refpurpose>Get the log tag string representation by its index</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>string</type><methodname>VarnishLog::getTagName</methodname>
-   <methodparam><type>int</type><parameter>index</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>index</parameter></term>
-     <listitem>
-      <para>
-        Log tag index.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the log tag name as &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/varnish/varnishstat.xml b/reference/varnish/varnishstat.xml
deleted file mode 100644
index d6ce39da076b..000000000000
--- a/reference/varnish/varnishstat.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.varnishstat" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The VarnishStat class</title>
- <titleabbrev>VarnishStat</titleabbrev>
-
- <partintro>
-
-<!-- {{{ VarnishStat intro -->
-  <section xml:id="varnishstat.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="varnishstat.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>VarnishStat</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>VarnishStat</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.varnishstat')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.varnish.entities.varnishstat;
-
-</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/varnish/varnishstat/construct.xml b/reference/varnish/varnishstat/construct.xml
deleted file mode 100644
index a350dab9b819..000000000000
--- a/reference/varnish/varnishstat/construct.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishstat.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishStat::__construct</refname>
-  <refpurpose>VarnishStat constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>VarnishStat::__construct</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-       Configuration arguments. The possible keys are:
-<![CDATA[
-VARNISH_CONFIG_IDENT - local varnish instance ident path
-]]>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/varnishstat/getsnapshot.xml b/reference/varnish/varnishstat/getsnapshot.xml
deleted file mode 100644
index 34bd7028de06..000000000000
--- a/reference/varnish/varnishstat/getsnapshot.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="varnishstat.getsnapshot" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>VarnishStat::getSnapshot</refname>
-  <refpurpose>Get the current varnish instance statistics snapshot</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>VarnishStat::getSnapshot</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array with the varnish statistic snapshot. The array keys are identical to
-   that in the varnishstat tool.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/varnish/versions.xml b/reference/varnish/versions.xml
deleted file mode 100644
index 5d930004ca77..000000000000
--- a/reference/varnish/versions.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- VarnishAdmin class -->
- <function name='varnishadmin' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::__construct' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::connect' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::disconnect' from='PECL varnish &gt;= 1.0.0'/>
- <function name='varnishadmin::auth' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::getparams' from='PECL varnish &gt;= 0.4'/>
- <function name='varnishadmin::setparam' from='PECL varnish &gt;= 0.4'/>
- <function name='varnishadmin::stop' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::start' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::banurl' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::ban' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::isrunning' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishadmin::getpanic' from='PECL varnish &gt;= 0.4'/>
- <function name='varnishadmin::clearpanic' from='PECL varnish &gt;= 0.4'/>
- <function name='varnishadmin::sethost' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishadmin::setident' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishadmin::settimeout' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishadmin::setport' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishadmin::setsecret' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishadmin::setcompat' from='PECL varnish &gt;= 0.9.2'/>
-
- <!-- VarnishStat class -->
- <function name='varnishstat' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishstat::__construct' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishstat::getsnapshot' from='PECL varnish &gt;= 0.3'/>
-
- <!-- VarnishLog class-->
- <function name='varnishlog' from='PECL varnish &gt;= 0.6'/>
- <function name='varnishlog::__construct' from='PECL varnish &gt;= 0.6'/>
- <function name='varnishlog::getline' from='PECL varnish &gt;= 0.6'/>
- <function name='varnishlog::gettagname' from='PECL varnish &gt;= 0.6'/>
-
- <!-- VarnishException class -->
- <function name='varnishexception' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::__clone' from='PECL varnish &gt;= 0.8'/>
- <function name='varnishexception::__construct' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::getmessage' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::getcode' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::getfile' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::getline' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::gettrace' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::getprevious' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::gettraceasstring' from='PECL varnish &gt;= 0.3'/>
- <function name='varnishexception::__tostring' from='PECL varnish &gt;= 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/wddx/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/wddx/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/wddx/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/wddx/book.xml b/reference/wddx/book.xml
deleted file mode 100644
index a28344adfaab..000000000000
--- a/reference/wddx/book.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.wddx">
-  &reftitle.intro;
-  <warning>
-   <simpara>
-    This extension is <emphasis>DEPRECATED</emphasis> and <emphasis>UNBUNDLED</emphasis> as of PHP 7.4.0.
-   </simpara>
-  </warning>
-  <para>
-   These functions are intended for work with <link
-   xlink:href="&url.wddx;">WDDX</link>.
-  </para>
-  <warning>
-   <para>
-    Do not pass untrusted user input to <function>wddx_deserialize</function>.
-    Unserialization can result in code being loaded and executed due to object
-    instantiation and autoloading, and a malicious user may be able to exploit
-    this. Use a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) if
-    you need to pass serialized data to the user.
-   </para>
-  </warning>
- </preface>
- <!-- }}} -->
-
- &reference.wddx.setup;
- &reference.wddx.examples;
- &reference.wddx.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/wddx/configure.xml b/reference/wddx/configure.xml
deleted file mode 100644
index 8e8a0648f398..000000000000
--- a/reference/wddx/configure.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="wddx.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <section xml:id="wddx.installation.php74">
-  <title>PHP 7.4</title>
-  <para>
-   &pecl.moved-ver;7.4.0
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;wddx">&url.pecl.package;wddx</link>.
-  </para>
- </section>
-
- <section xml:id="wddx.installation.phplt74">
-  <title>PHP &lt; 7.4</title>
-  <para>
-   After installing the required expat library, compile PHP with
-   <option role="configure">--enable-wddx</option>, and use
-   <option role="configure">--with-libexpat-dir</option> for expat.
-  </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/wddx/examples.xml b/reference/wddx/examples.xml
deleted file mode 100644
index 8a595728ad10..000000000000
--- a/reference/wddx/examples.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="wddx.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <section xml:id="wddx.examples-serialize">
-  <title>wddx examples</title>
-  <para>
-   All the functions that serialize variables use the first
-   element of an array to determine whether the array is to be
-   serialized into an array or structure. If the first element has
-   string key, then it is serialized into a structure, otherwise,
-   into an array.
-  </para>
-  
-  <example>
-   <title>Serializing a single value with WDDX</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-echo wddx_serialize_value("PHP to WDDX packet example", "PHP packet");
-?>
-]]>
-   </programlisting>
-   <para>
-    This example will produce:
-   </para>
-   <screen>
-<![CDATA[
-<wddxPacket version='1.0'><header comment='PHP packet'/><data>
-<string>PHP to WDDX packet example</string></data></wddxPacket>
-]]>
-   </screen>
-  </example>
-
-  <example>
-   <title>Using incremental packets with WDDX</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$pi = 3.1415926;
-$packet_id = wddx_packet_start("PHP");
-wddx_add_vars($packet_id, "pi");
-
-/* Suppose $cities came from database */
-$cities = array("Austin", "Novato", "Seattle");
-wddx_add_vars($packet_id, "cities");
-
-$packet = wddx_packet_end($packet_id);
-echo $packet;
-?>
-]]>
-   </programlisting>
-   <para>
-    This example will produce:
-   </para>
-   <screen>
-<![CDATA[
-<wddxPacket version='1.0'><header comment='PHP'/><data><struct>
-<var name='pi'><number>3.1415926</number></var><var name='cities'>
-<array length='3'><string>Austin</string><string>Novato</string>
-<string>Seattle</string></array></var></struct></data></wddxPacket>
-]]>
-   </screen>
-  </example>
-
-  <note>
-   <para>
-    Strings should be encoded in UTF-8; to handle other encodings, convert
-    the string first using <function>mb_convert_encoding</function>,
-    <methodname>UConverter::transcode</methodname>, or <function>iconv</function>.
-   </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/wddx/functions/wddx-add-vars.xml b/reference/wddx/functions/wddx-add-vars.xml
deleted file mode 100644
index 6e935507b9a5..000000000000
--- a/reference/wddx/functions/wddx-add-vars.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-add-vars" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_add_vars</refname>
-  <refpurpose>Add variables to a WDDX packet with the specified ID</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wddx_add_vars</methodname>
-   <methodparam><type>resource</type><parameter>packet_id</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>var_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>var_names</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Serializes the passed variables and add the result to the given packet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   This function takes a variable number of parameters.
-   <variablelist>
-    <varlistentry>
-     <term><parameter>packet_id</parameter></term>
-     <listitem>
-      <para>
-       A WDDX packet, returned by <function>wddx_packet_start</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>var_name</parameter></term>
-     <listitem>
-      <para>
-       Can be either a string naming a variable or an array containing
-       strings naming the variables or another array, etc.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>var_names</parameter></term>
-     <listitem>
-      <para>
-      </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/wddx/functions/wddx-deserialize.xml b/reference/wddx/functions/wddx-deserialize.xml
deleted file mode 100644
index 79b516f4cb6a..000000000000
--- a/reference/wddx/functions/wddx-deserialize.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-deserialize" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_deserialize</refname>
-  <refpurpose>Unserializes a WDDX packet</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>wddx_deserialize</methodname>
-   <methodparam><type>string</type><parameter>packet</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Unserializes a WDDX <parameter>packet</parameter>.
-  </para>
-  <warning>
-   <para>
-    Do not pass untrusted user input to <function>wddx_deserialize</function>.
-    Unserialization can result in code being loaded and executed due to object
-    instantiation and autoloading, and a malicious user may be able to exploit
-    this. Use a safe, standard data interchange format such as JSON (via
-    <function>json_decode</function> and <function>json_encode</function>) if
-    you need to pass serialized data to the user.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>packet</parameter></term>
-     <listitem>
-      <para>
-       A WDDX packet, as a string or stream.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the deserialized value which can be a string, a number or an
-   array. Note that structures are deserialized into associative arrays.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wddx/functions/wddx-packet-end.xml b/reference/wddx/functions/wddx-packet-end.xml
deleted file mode 100644
index 6b82bde966e2..000000000000
--- a/reference/wddx/functions/wddx-packet-end.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-packet-end" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_packet_end</refname>
-  <refpurpose>Ends a WDDX packet with the specified ID</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>wddx_packet_end</methodname>
-   <methodparam><type>resource</type><parameter>packet_id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Ends and returns the given WDDX packet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>packet_id</parameter></term>
-     <listitem>
-      <para>
-       A WDDX packet, returned by <function>wddx_packet_start</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the string containing the WDDX packet.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wddx/functions/wddx-packet-start.xml b/reference/wddx/functions/wddx-packet-start.xml
deleted file mode 100644
index d79b2df426fe..000000000000
--- a/reference/wddx/functions/wddx-packet-start.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-packet-start" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_packet_start</refname>
-  <refpurpose>Starts a new WDDX packet with structure inside it</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>wddx_packet_start</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>comment</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Start a new WDDX packet for incremental addition of variables.
-   It automatically creates a structure definition inside the packet to
-   contain the variables.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-       An optional comment string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a packet ID for use in later functions, or &false; on error.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wddx/functions/wddx-serialize-value.xml b/reference/wddx/functions/wddx-serialize-value.xml
deleted file mode 100644
index 9162ef7f2055..000000000000
--- a/reference/wddx/functions/wddx-serialize-value.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-serialize-value" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_serialize_value</refname>
-  <refpurpose>Serialize a single value into a WDDX packet</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>wddx_serialize_value</methodname>
-   <methodparam><type>mixed</type><parameter>var</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>comment</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a WDDX packet from a single given value.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>var</parameter></term>
-     <listitem>
-      <para>
-       The value to be serialized
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>comment</parameter></term>
-     <listitem>
-      <para>
-       An optional comment string that appears in the packet header.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the WDDX packet, or &false; on error.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wddx/functions/wddx-serialize-vars.xml b/reference/wddx/functions/wddx-serialize-vars.xml
deleted file mode 100644
index fb5d2d90cbe4..000000000000
--- a/reference/wddx/functions/wddx-serialize-vars.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wddx-serialize-vars" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wddx_serialize_vars</refname>
-  <refpurpose>Serialize variables into a WDDX packet</refpurpose>
- </refnamediv>
- 
- <refsynopsisdiv>
-  &warn.removed.function-7-4-0;
- </refsynopsisdiv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>wddx_serialize_vars</methodname>
-   <methodparam><type>mixed</type><parameter>var_name</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>var_names</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Creates a WDDX packet with a structure that contains the serialized
-   representation of the passed variables.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   This function takes a variable number of parameters.
-   <variablelist>
-    <varlistentry>
-     <term><parameter>var_name</parameter></term>
-     <listitem>
-      <para>
-       Can be either a string naming a variable or an array containing
-       strings naming the variables or another array, etc.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>var_names</parameter></term>
-     <listitem>
-      <para>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the WDDX packet, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>wddx_serialize_vars</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$a = 1;
-$b = 5.5;
-$c = array("blue", "orange", "violet");
-$d = "colors";
-
-$clvars = array("c", "d");
-echo wddx_serialize_vars("a", "b", $clvars);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-<wddxPacket version='1.0'><header/><data><struct><var name='a'><number>1</number></var>
-<var name='b'><number>5.5</number></var><var name='c'><array length='3'>
-<string>blue</string><string>orange</string><string>violet</string></array></var>
-<var name='d'><string>colors</string></var></struct></data></wddxPacket>
-]]>
-    </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/wddx/reference.xml b/reference/wddx/reference.xml
deleted file mode 100644
index 88a4b2172ac4..000000000000
--- a/reference/wddx/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.wddx" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>WDDX &Functions;</title>
-
- &reference.wddx.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/wddx/setup.xml b/reference/wddx/setup.xml
deleted file mode 100644
index 1362f52cae1b..000000000000
--- a/reference/wddx/setup.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="wddx.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="wddx.requirements">
-  &reftitle.required;
-  &libxml.required;
-  <para>
-   In order to use WDDX, you will need to install the expat library
-   (which comes with Apache 1.3.7 or higher).
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.wddx.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="wddx.resources">
-  &reftitle.resources;
-  <para>
-   This extension defines a WDDX packet identifier returned by
-   <function>wddx_packet_start</function>.
-  </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/wddx/versions.xml b/reference/wddx/versions.xml
deleted file mode 100644
index 9aa08773f3c5..000000000000
--- a/reference/wddx/versions.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name="wddx_add_vars" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_deserialize" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_packet_end" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_packet_start" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_serialize_value" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_serialize_vars" from="PHP 4, PHP 5, PHP 7"/>
- <function name="wddx_unserialize" from="PHP 4, PHP 5, PHP 7"/>
-</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/win32service/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/win32service/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/win32service/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/win32service/book.xml b/reference/win32service/book.xml
deleted file mode 100644
index 6037111edc0b..000000000000
--- a/reference/win32service/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.win32service">
-  &reftitle.intro;
-  <para>
-   The win32service extension is a Windows specific extension that allows PHP
-   to communicate with the Service Control Manager to start, stop, register
-   and unregister services, and even allows your PHP scripts to run as a
-   service.
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.win32service.setup;
- &reference.win32service.constants;
- &reference.win32service.win32serviceexception;
- &reference.win32service.win32servicerightinfo;
- &reference.win32service.examples;
- &reference.win32service.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/win32service/constants.xml b/reference/win32service/constants.xml
deleted file mode 100644
index 7748b04af8c4..000000000000
--- a/reference/win32service/constants.xml
+++ /dev/null
@@ -1,1153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="win32service.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
-
-  <table xml:id="win32service.constants.servicetype">
-   <title>Win32Service Service Type Bitmasks</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-win32-own-process">
-      <entry><constant>WIN32_SERVICE_WIN32_OWN_PROCESS</constant></entry>
-      <entry><literal>0x00000010</literal></entry>
-      <entry>
-       The service runs in its own process.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-interactive-process">
-      <entry><constant>WIN32_SERVICE_INTERACTIVE_PROCESS</constant></entry>
-      <entry><literal>0x00000100</literal></entry>
-      <entry>
-       The service can interact with the desktop. This option is not available on Windows Vista or later.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-win32-own-process-interactive">
-      <entry><constant>WIN32_SERVICE_WIN32_OWN_PROCESS_INTERACTIVE</constant></entry>
-      <entry><literal>0x00000110</literal></entry>
-      <entry>
-       The service runs in its own process and can interact with the desktop. This option is not available on Windows Vista or later.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.servicestatus">
-   <title>Win32Service Service Status Constants</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-continue-pending">
-      <entry><constant>WIN32_SERVICE_CONTINUE_PENDING</constant></entry>
-      <entry><literal>0x00000005</literal></entry>
-      <entry>
-       The service continue is pending.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-pause-pending">
-      <entry><constant>WIN32_SERVICE_PAUSE_PENDING</constant></entry>
-      <entry><literal>0x00000006</literal></entry>
-      <entry>
-       The service pause is pending.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-paused">
-      <entry><constant>WIN32_SERVICE_PAUSED</constant></entry>
-      <entry><literal>0x00000007</literal></entry>
-      <entry>
-       The service is paused.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-running">
-      <entry><constant>WIN32_SERVICE_RUNNING</constant></entry>
-      <entry><literal>0x00000004</literal></entry>
-      <entry>
-       The service is running.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-start-pending">
-      <entry><constant>WIN32_SERVICE_START_PENDING</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       The service is starting.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-stop-pending">
-      <entry><constant>WIN32_SERVICE_STOP_PENDING</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       The service is stopping.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-stopped">
-      <entry><constant>WIN32_SERVICE_STOPPED</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       The service is not running.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.servicecontrol">
-   <title>Win32Service Service Control Message Constants</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-control-continue">
-      <entry><constant>WIN32_SERVICE_CONTROL_CONTINUE</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       Notifies a paused service that it should resume.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-deviceevent">
-      <entry><constant>WIN32_SERVICE_CONTROL_DEVICEEVENT</constant></entry>
-      <entry><literal>0x0000000B</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-hardwareprofilechange">
-      <entry><constant>WIN32_SERVICE_CONTROL_HARDWAREPROFILECHANGE</constant></entry>
-      <entry><literal>0x0000000C</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-interrogate">
-      <entry><constant>WIN32_SERVICE_CONTROL_INTERROGATE</constant></entry>
-      <entry><literal>0x00000004</literal></entry>
-      <entry>
-       Notifies a service that it should report its current status information
-       to the service control manager.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-netbindadd">
-      <entry><constant>WIN32_SERVICE_CONTROL_NETBINDADD</constant></entry>
-      <entry><literal>0x00000007</literal></entry>
-      <entry>
-       Notifies a network service that there is a new component for binding.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-netbinddisable">
-      <entry><constant>WIN32_SERVICE_CONTROL_NETBINDDISABLE</constant></entry>
-      <entry><literal>0x0000000A</literal></entry>
-      <entry>
-       Notifies a network service that one of its bindings has been disabled.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-netbindenable">
-      <entry><constant>WIN32_SERVICE_CONTROL_NETBINDENABLE</constant></entry>
-      <entry><literal>0x00000009</literal></entry>
-      <entry>
-       Notifies a network service that a disabled binding has been enabled.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-netbindremove">
-      <entry><constant>WIN32_SERVICE_CONTROL_NETBINDREMOVE</constant></entry>
-      <entry><literal>0x00000008</literal></entry>
-      <entry>
-       Notifies a network service that a component for binding has been removed.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-paramchange">
-      <entry><constant>WIN32_SERVICE_CONTROL_PARAMCHANGE</constant></entry>
-      <entry><literal>0x00000006</literal></entry>
-      <entry>
-       Notifies a service that its startup parameters have changed.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-pause">
-      <entry><constant>WIN32_SERVICE_CONTROL_PAUSE</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       Notifies a service that it should pause.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-powerevent">
-      <entry><constant>WIN32_SERVICE_CONTROL_POWEREVENT</constant></entry>
-      <entry><literal>0x0000000D</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-preshutdown">
-      <entry><constant>WIN32_SERVICE_CONTROL_PRESHUTDOWN</constant></entry>
-      <entry><literal>0x0000000F</literal></entry>
-      <entry>
-       Notifies a service that the system will be shutting down. A service that
-       handles this notification blocks system shutdown until the service stops
-       or the preshutdown time-out interval expires. This value is not supported
-       by Windows Server 2003 and Windows XP/2000.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-sessionchange">
-      <entry><constant>WIN32_SERVICE_CONTROL_SESSIONCHANGE</constant></entry>
-      <entry><literal>0x0000000E</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-shutdown">
-      <entry><constant>WIN32_SERVICE_CONTROL_SHUTDOWN</constant></entry>
-      <entry><literal>0x00000005</literal></entry>
-      <entry>
-       Notifies a service that the system is shutting down so the service can
-       perform cleanup tasks. If a service accepts this control code, it must
-       stop after it performs its cleanup tasks. After the SCM sends this
-       control code, it will not send other control codes to the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-control-stop">
-      <entry><constant>WIN32_SERVICE_CONTROL_STOP</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       Notifies a service that it should stop.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.controlsaccepted">
-   <title>Win32Service Service Control Message Accepted Bitmasks</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-accept-hardwareprofilechange">
-      <entry><constant>WIN32_SERVICE_ACCEPT_HARDWAREPROFILECHANGE</constant></entry>
-      <entry><literal>0x00000020</literal></entry>
-      <entry>
-        The service is notified when the computer's hardware profile has changed.
-        This enables the system to send 
-        <constant>WIN32_SERVICE_CONTROL_HARDWAREPROFILECHANGE</constant> 
-        notifications to the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-netbindchange">
-      <entry><constant>WIN32_SERVICE_ACCEPT_NETBINDCHANGE</constant></entry>
-      <entry><literal>0x00000010</literal></entry>
-      <entry>
-        The service is a network component that can accept changes in its 
-        binding without being stopped and restarted.
-        This control code allows the service to receive 
-        <constant>WIN32_SERVICE_CONTROL_NETBINDADD</constant>, 
-        <constant>WIN32_SERVICE_CONTROL_NETBINDREMOVE</constant>, 
-        <constant>WIN32_SERVICE_CONTROL_NETBINDENABLE</constant>, and 
-        <constant>WIN32_SERVICE_CONTROL_NETBINDDISABLE</constant> notifications.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-paramchange">
-      <entry><constant>WIN32_SERVICE_ACCEPT_PARAMCHANGE</constant></entry>
-      <entry><literal>0x00000008</literal></entry>
-      <entry>
-        The service can reread its startup parameters without being stopped and restarted.
-        This control code allows the service to receive 
-        <constant>WIN32_SERVICE_CONTROL_PARAMCHANGE</constant> notifications.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-pause-continue">
-      <entry><constant>WIN32_SERVICE_ACCEPT_PAUSE_CONTINUE</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       The service can be paused and continued. This control code allows the
-       service to receive <constant>WIN32_SERVICE_CONTROL_PAUSE</constant> and
-       <constant>WIN32_SERVICE_CONTROL_CONTINUE</constant> notifications.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-powerevent">
-      <entry><constant>WIN32_SERVICE_ACCEPT_POWEREVENT</constant></entry>
-      <entry><literal>0x00000040</literal></entry>
-      <entry>
-        The service is notified when the computer's power status has changed.
-        This enables the system to send 
-        <constant>WIN32_SERVICE_CONTROL_POWEREVENT</constant> notifications 
-        to the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-preshutdown">
-      <entry><constant>WIN32_SERVICE_ACCEPT_PRESHUTDOWN</constant></entry>
-      <entry><literal>0x00000100</literal></entry>
-      <entry>
-       The service can perform preshutdown tasks. This control code enables the
-       service to receive <constant>WIN32_SERVICE_CONTROL_PRESHUTDOWN</constant>
-       notifications. This value is not supported by Windows Server 2003 and
-       Windows XP/2000.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-sessionchange">
-      <entry><constant>WIN32_SERVICE_ACCEPT_SESSIONCHANGE</constant></entry>
-      <entry><literal>0x00000080</literal></entry>
-      <entry>
-        The service is notified when the computer's session status has changed.
-        This enables the system to send 
-        <constant>WIN32_SERVICE_CONTROL_SESSIONCHANGE</constant> notifications 
-        to the service.
-        Windows 2000:  This value is not supported
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-shutdown">
-      <entry><constant>WIN32_SERVICE_ACCEPT_SHUTDOWN</constant></entry>
-      <entry><literal>0x00000004</literal></entry>
-      <entry>
-       The service is notified when system shutdown occurs. This control code
-       allows the service to receive <constant>WIN32_SERVICE_CONTROL_SHUTDOWN</constant>
-       notifications.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-stop">
-      <entry><constant>WIN32_SERVICE_ACCEPT_STOP</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       The service can be stopped. This control code allows the service to
-       receive <constant>WIN32_SERVICE_CONTROL_STOP</constant> notifications.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-timechange">
-      <entry><constant>WIN32_SERVICE_ACCEPT_TIMECHANGE</constant></entry>
-      <entry><literal>0x00000200</literal></entry>
-      <entry>
-        The service is notified when the system time has changed.
-        This enables the system to send 
-        <constant>WIN32_SERVICE_CONTROL_TIMECHANGE</constant> notifications to the service.
-        Windows Server 2008, Windows Vista, Windows Server 2003, 
-        and Windows XP/2000:  This control code is not supported.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-accept-triggerevent">
-      <entry><constant>WIN32_SERVICE_ACCEPT_TRIGGEREVENT</constant></entry>
-      <entry><literal>0x00000400</literal></entry>
-      <entry>
-        The service is notified when an event for which the service has registered occurs.
-        This enables the system to send 
-        <constant>WIN32_SERVICE_CONTROL_TRIGGEREVENT</constant> notifications to the service.
-        Windows Server 2008, Windows Vista, Windows Server 2003, 
-        and Windows XP/2000:  This control code is not supported.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.servicestarttype">
-   <title>Win32Service Service Start Type Constants</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-boot-start">
-      <entry><constant>WIN32_SERVICE_BOOT_START</constant></entry>
-      <entry><literal>0x00000000</literal></entry>
-      <entry>
-       A device driver started by the system loader. This value is valid only for driver services.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-system-start">
-      <entry><constant>WIN32_SERVICE_SYSTEM_START</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       A device driver started by the IoInitSystem function. This value is valid only for driver services.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-auto-start">
-      <entry><constant>WIN32_SERVICE_AUTO_START</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       A service started automatically by the service control manager during
-       system startup.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-demand-start">
-      <entry><constant>WIN32_SERVICE_DEMAND_START</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       A service started by the service control manager when a process calls the
-       StartService function.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-disabled">
-      <entry><constant>WIN32_SERVICE_DISABLED</constant></entry>
-      <entry><literal>0x00000004</literal></entry>
-      <entry>
-       A service that cannot be started. Attempts to start the service result in
-       the error code <constant>WIN32_ERROR_SERVICE_DISABLED</constant>.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.errorcontrol">
-   <title>Win32Service Service Error Control Constants</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-error-ignore">
-      <entry><constant>WIN32_SERVICE_ERROR_IGNORE</constant></entry>
-      <entry><literal>0x00000000</literal></entry>
-      <entry>
-       The startup program ignores the error and continues the startup operation.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-error-normal">
-      <entry><constant>WIN32_SERVICE_ERROR_NORMAL</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       The startup program logs the error in the event log but continues the
-       startup operation.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-error-severe">
-      <entry><constant>WIN32_SERVICE_ERROR_SEVERE</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       The startup program logs the error in the event log.
-       If the last-known-good configuration is being started, the startup 
-       operation continues. Otherwise, the system is restarted with the 
-       last-known-good configuration.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-error-critical">
-      <entry><constant>WIN32_SERVICE_ERROR_CRITICAL</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       The startup program logs the error in the event log, if possible.
-       If the last-known-good configuration is being started, the startup 
-       operation fails. Otherwise, the system is restarted with the 
-       last-known good configuration.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.serviceflag">
-   <title>Win32Service Service Flag Constants</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-runs-in-system-process">
-      <entry><constant>WIN32_SERVICE_RUNS_IN_SYSTEM_PROCESS</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       The service runs in a system process that must always be running.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <note>
-   <para>
-    These constants are no longer in use as of Win32Service 1.0.0.
-   </para>
-  </note>
-  <table xml:id="win32service.constants.errors">
-   <title>Win32 Error Codes</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-error-access-denied">
-      <entry><constant>WIN32_ERROR_ACCESS_DENIED</constant></entry>
-      <entry><literal>0x00000005</literal></entry>
-      <entry>
-       The handle to the SCM database does not have the appropriate access rights.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-circular-dependency">
-      <entry><constant>WIN32_ERROR_CIRCULAR_DEPENDENCY</constant></entry>
-      <entry><literal>0x00000423</literal></entry>
-      <entry>
-       A circular service dependency was specified.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-database-does-not-exist">
-      <entry><constant>WIN32_ERROR_DATABASE_DOES_NOT_EXIST</constant></entry>
-      <entry><literal>0x00000429</literal></entry>
-      <entry>
-       The specified database does not exist.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-dependent-services-running">
-      <entry><constant>WIN32_ERROR_DEPENDENT_SERVICES_RUNNING</constant></entry>
-      <entry><literal>0x0000041B</literal></entry>
-      <entry>
-       The service cannot be stopped because other running services are dependent
-       on it.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-duplicate-service-name">
-      <entry><constant>WIN32_ERROR_DUPLICATE_SERVICE_NAME</constant></entry>
-      <entry><literal>0x00000436</literal></entry>
-      <entry>
-       The display name already exists in the service control manager database
-       either as a service name or as another display name.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-failed-service-controller-connect">
-      <entry><constant>WIN32_ERROR_FAILED_SERVICE_CONTROLLER_CONNECT</constant></entry>
-      <entry><literal>0x00000427</literal></entry>
-      <entry>
-       This error is returned if the program is being run as a console application
-       rather than as a service. If the program will be run as a console application
-       for debugging purposes, structure it such that service-specific code is not
-       called.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-insufficient-buffer">
-      <entry><constant>WIN32_ERROR_INSUFFICIENT_BUFFER</constant></entry>
-      <entry><literal>0x0000007A</literal></entry>
-      <entry>
-       The buffer is too small for the service status structure. Nothing was
-       written to the structure.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-data">
-      <entry><constant>WIN32_ERROR_INVALID_DATA</constant></entry>
-      <entry><literal>0x0000000D</literal></entry>
-      <entry>
-       The specified service status structure is invalid.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-handle">
-      <entry><constant>WIN32_ERROR_INVALID_HANDLE</constant></entry>
-      <entry><literal>0x00000006</literal></entry>
-      <entry>
-       The handle to the specified service control manager database is invalid.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-level">
-      <entry><constant>WIN32_ERROR_INVALID_LEVEL</constant></entry>
-      <entry><literal>0x0000007C</literal></entry>
-      <entry>
-       The InfoLevel parameter contains an unsupported value.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-name">
-      <entry><constant>WIN32_ERROR_INVALID_NAME</constant></entry>
-      <entry><literal>0x0000007B</literal></entry>
-      <entry>
-       The specified service name is invalid.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-parameter">
-      <entry><constant>WIN32_ERROR_INVALID_PARAMETER</constant></entry>
-      <entry><literal>0x00000057</literal></entry>
-      <entry>
-       A parameter that was specified is invalid.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-service-account">
-      <entry><constant>WIN32_ERROR_INVALID_SERVICE_ACCOUNT</constant></entry>
-      <entry><literal>0x00000421</literal></entry>
-      <entry>
-       The user account name specified in the <parameter>user</parameter>
-       parameter does not exist. See <function>win32_create_service</function>.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-invalid-service-control">
-      <entry><constant>WIN32_ERROR_INVALID_SERVICE_CONTROL</constant></entry>
-      <entry><literal>0x0000041C</literal></entry>
-      <entry>
-       The requested control code is not valid, or it is unacceptable to the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-path-not-found">
-      <entry><constant>WIN32_ERROR_PATH_NOT_FOUND</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       The service binary file could not be found.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-already-running">
-      <entry><constant>WIN32_ERROR_SERVICE_ALREADY_RUNNING</constant></entry>
-      <entry><literal>0x00000420</literal></entry>
-      <entry>
-       An instance of the service is already running.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-cannot-accept-ctrl">
-      <entry><constant>WIN32_ERROR_SERVICE_CANNOT_ACCEPT_CTRL</constant></entry>
-      <entry><literal>0x00000425</literal></entry>
-      <entry>
-       The requested control code cannot be sent to the service because the state
-       of the service is <constant>WIN32_SERVICE_STOPPED</constant>,
-       <constant>WIN32_SERVICE_START_PENDING</constant>, or
-       <constant>WIN32_SERVICE_STOP_PENDING</constant>.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-database-locked">
-      <entry><constant>WIN32_ERROR_SERVICE_DATABASE_LOCKED</constant></entry>
-      <entry><literal>0x0000041F</literal></entry>
-      <entry>
-       The database is locked.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-dependency-deleted">
-      <entry><constant>WIN32_ERROR_SERVICE_DEPENDENCY_DELETED</constant></entry>
-      <entry><literal>0x00000433</literal></entry>
-      <entry>
-       The service depends on a service that does not exist or has been marked
-       for deletion.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-dependency-fail">
-      <entry><constant>WIN32_ERROR_SERVICE_DEPENDENCY_FAIL</constant></entry>
-      <entry><literal>0x0000042C</literal></entry>
-      <entry>
-       The service depends on another service that has failed to start.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-disabled">
-      <entry><constant>WIN32_ERROR_SERVICE_DISABLED</constant></entry>
-      <entry><literal>0x00000422</literal></entry>
-      <entry>
-       The service has been disabled.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-does-not-exist">
-      <entry><constant>WIN32_ERROR_SERVICE_DOES_NOT_EXIST</constant></entry>
-      <entry><literal>0x00000424</literal></entry>
-      <entry>
-       The specified service does not exist as an installed service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-exists">
-      <entry><constant>WIN32_ERROR_SERVICE_EXISTS</constant></entry>
-      <entry><literal>0x00000431</literal></entry>
-      <entry>
-       The specified service already exists in this database.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-logon-failed">
-      <entry><constant>WIN32_ERROR_SERVICE_LOGON_FAILED</constant></entry>
-      <entry><literal>0x0000042D</literal></entry>
-      <entry>
-       The service did not start due to a logon failure. This error occurs if
-       the service is configured to run under an account that does not have the
-       "Log on as a service" right.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-marked-for-delete">
-      <entry><constant>WIN32_ERROR_SERVICE_MARKED_FOR_DELETE</constant></entry>
-      <entry><literal>0x00000430</literal></entry>
-      <entry>
-       The specified service has already been marked for deletion.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-no-thread">
-      <entry><constant>WIN32_ERROR_SERVICE_NO_THREAD</constant></entry>
-      <entry><literal>0x0000041E</literal></entry>
-      <entry>
-       A thread could not be created for the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-not-active">
-      <entry><constant>WIN32_ERROR_SERVICE_NOT_ACTIVE</constant></entry>
-      <entry><literal>0x00000426</literal></entry>
-      <entry>
-       The service has not been started.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-request-timeout">
-      <entry><constant>WIN32_ERROR_SERVICE_REQUEST_TIMEOUT</constant></entry>
-      <entry><literal>0x0000041D</literal></entry>
-      <entry>
-       The process for the service was started, but it did not call
-       StartServiceCtrlDispatcher, or the thread that called
-       StartServiceCtrlDispatcher may be blocked in a control handler function.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-shutdown-in-progress">
-      <entry><constant>WIN32_ERROR_SHUTDOWN_IN_PROGRESS</constant></entry>
-      <entry><literal>0x0000045B</literal></entry>
-      <entry>
-       The system is shutting down; this function cannot be called.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-error-service-specific-error">
-      <entry><constant>WIN32_ERROR_SERVICE_SPECIFIC_ERROR</constant></entry>
-      <entry><literal>0x0000042A</literal></entry>
-      <entry>
-       The service has returned a service-specific error code.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-no-error">
-      <entry><constant>WIN32_NO_ERROR</constant></entry>
-      <entry><literal>0x00000000</literal></entry>
-      <entry>
-       No error.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.basepriorities">
-   <title>Win32 Base Priority Classes</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-above-normal-priority-class">
-      <entry><constant>WIN32_ABOVE_NORMAL_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00008000</literal></entry>
-      <entry>
-       Process that has priority above WIN32_NORMAL_PRIORITY_CLASS but below
-       WIN32_HIGH_PRIORITY_CLASS.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-below-normal-priority-class">
-      <entry><constant>WIN32_BELOW_NORMAL_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00004000</literal></entry>
-      <entry>
-       Process that has priority above WIN32_IDLE_PRIORITY_CLASS but below
-       WIN32_NORMAL_PRIORITY_CLASS.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-high-priority-class">
-      <entry><constant>WIN32_HIGH_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00000080</literal></entry>
-      <entry>
-       Process that performs time-critical tasks that must be executed
-       immediately. The threads of the process preempt the threads of normal or
-       idle priority class processes. An example is the Task List, which must
-       respond quickly when called by the user, regardless of the load on the
-       operating system. Use extreme care when using the high-priority class,
-       because a high-priority class application can use nearly all available
-       CPU time.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-idle-priority-class">
-      <entry><constant>WIN32_IDLE_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00000040</literal></entry>
-      <entry>
-       Process whose threads run only when the system is idle. The threads of the
-       process are preempted by the threads of any process running in a higher
-       priority class. An example is a screen saver. The idle-priority class is
-       inherited by child processes.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-normal-priority-class">
-      <entry><constant>WIN32_NORMAL_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00000020</literal></entry>
-      <entry>
-       Process with no special scheduling needs.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-realtime-priority-class">
-      <entry><constant>WIN32_REALTIME_PRIORITY_CLASS</constant></entry>
-      <entry><literal>0x00000100</literal></entry>
-      <entry>
-       Process that has the highest possible priority. The threads of the
-       process preempt the threads of all other processes, including operating
-       system processes performing important tasks. For example, a real-time
-       process that executes for more than a very brief interval can cause disk
-       caches not to flush or cause the mouse to be unresponsive.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.recovery-action">
-   <title>Win32 Recovery action</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-sc-action-none">
-      <entry><constant>WIN32_SC_ACTION_NONE</constant></entry>
-      <entry><literal>0x00000000</literal></entry>
-      <entry>
-       No action.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-sc-action-restart">
-      <entry><constant>WIN32_SC_ACTION_RESTART</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-       Restart the service.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-sc-action-reboot">
-      <entry><constant>WIN32_SC_ACTION_REBOOT</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-       Restart the server.
-      </entry>
-     </row>
-     <row xml:id="constant.win32-sc-action-run-command">
-      <entry><constant>WIN32_SC_ACTION_RUN_COMMAND</constant></entry>
-      <entry><literal>0x00000003</literal></entry>
-      <entry>
-       Run a command.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.serviceinfos">
-   <title>Win32 Service informations</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-info-service">
-      <entry><constant>WIN32_INFO_SERVICE</constant></entry>
-      <entry>"service"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-display">
-      <entry><constant>WIN32_INFO_DISPLAY</constant></entry>
-      <entry>"display"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-user">
-      <entry><constant>WIN32_INFO_USER</constant></entry>
-      <entry>"user"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-password">
-      <entry><constant>WIN32_INFO_PASSWORD</constant></entry>
-      <entry>"password"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-path">
-      <entry><constant>WIN32_INFO_PATH</constant></entry>
-      <entry>"path"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-params">
-      <entry><constant>WIN32_INFO_PARAMS</constant></entry>
-      <entry>"params"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-description">
-      <entry><constant>WIN32_INFO_DESCRIPTION</constant></entry>
-      <entry>"description"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-info-start-type">
-      <entry><constant>WIN32_INFO_START_TYPE</constant></entry>
-      <entry>"start_type"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-load-order">
-      <entry><constant>WIN32_INFO_LOAD_ORDER</constant></entry>
-      <entry>"load_order"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-svc-type">
-      <entry><constant>WIN32_INFO_SVC_TYPE</constant></entry>
-      <entry>"svc_type"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-error-control">
-      <entry><constant>WIN32_INFO_ERROR_CONTROL</constant></entry>
-      <entry>"error_control"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-delayed-start">
-      <entry><constant>WIN32_INFO_DELAYED_START</constant></entry>
-      <entry>"delayed_start"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-base-priority">
-      <entry><constant>WIN32_INFO_BASE_PRIORITY</constant></entry>
-      <entry>"base_priority"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-dependencies">
-      <entry><constant>WIN32_INFO_DEPENDENCIES</constant></entry>
-      <entry>"dependencies"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-delay">
-      <entry><constant>WIN32_INFO_RECOVERY_DELAY</constant></entry>
-      <entry>"recovery_delay"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-action-1">
-      <entry><constant>WIN32_INFO_RECOVERY_ACTION_1</constant></entry>
-      <entry>"recovery_action_1"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-action-2">
-      <entry><constant>WIN32_INFO_RECOVERY_ACTION_2</constant></entry>
-      <entry>"recovery_action_2"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-action-3">
-      <entry><constant>WIN32_INFO_RECOVERY_ACTION_3</constant></entry>
-      <entry>"recovery_action_3"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-reset-period">
-      <entry><constant>WIN32_INFO_RECOVERY_RESET_PERIOD</constant></entry>
-      <entry>"recovery_reset_period"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-enabled">
-      <entry><constant>WIN32_INFO_RECOVERY_ENABLED</constant></entry>
-      <entry>"recovery_enabled"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-reboot-msg">
-      <entry><constant>WIN32_INFO_RECOVERY_REBOOT_MSG</constant></entry>
-      <entry>"recovery_reboot_msg"</entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.info-recovery-command">
-      <entry><constant>WIN32_INFO_RECOVERY_COMMAND</constant></entry>
-      <entry>"recovery_command"</entry>
-      <entry>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  <table xml:id="win32service.constants.rights">
-   <title>Win32 Service rights</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>Constant</entry>
-      <entry>Value</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row xml:id="constant.win32-service-all-access">
-      <entry><constant>WIN32_SERVICE_ALL_ACCESS</constant></entry>
-      <entry><literal>0x000F003F</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-change-config">
-      <entry><constant>WIN32_SERVICE_CHANGE_CONFIG</constant></entry>
-      <entry><literal>0x00000002</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-enumerate-dependents">
-      <entry><constant>WIN32_SERVICE_ENUMERATE_DEPENDENTS</constant></entry>
-      <entry><literal>0x00000008</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-interrogate">
-      <entry><constant>WIN32_SERVICE_INTERROGATE</constant></entry>
-      <entry><literal>0x00000080</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-pause-continue">
-      <entry><constant>WIN32_SERVICE_PAUSE_CONTINUE</constant></entry>
-      <entry><literal>0x00000040</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-query-config">
-      <entry><constant>WIN32_SERVICE_QUERY_CONFIG</constant></entry>
-      <entry><literal>0x00000001</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-query-status">
-      <entry><constant>WIN32_SERVICE_QUERY_STATUS</constant></entry>
-      <entry><literal>0x00000004</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-start">
-      <entry><constant>WIN32_SERVICE_START</constant></entry>
-      <entry><literal>0x00000010</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-stop">
-      <entry><constant>WIN32_SERVICE_STOP</constant></entry>
-      <entry><literal>0x00000020</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-service-user-defined-control">
-      <entry><constant>WIN32_SERVICE_USER_DEFINED_CONTROL</constant></entry>
-      <entry><literal>0x00000100</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-access-system-security">
-      <entry><constant>WIN32_ACCESS_SYSTEM_SECURITY</constant></entry>
-      <entry><literal>0x00001000</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-delete">
-      <entry><constant>WIN32_DELETE</constant></entry>
-      <entry><literal>0x00010000</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-read-control">
-      <entry><constant>WIN32_READ_CONTROL</constant></entry>
-      <entry><literal>0x00020000</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-write-dac">
-      <entry><constant>WIN32_WRITE_DAC</constant></entry>
-      <entry><literal>0x00040000</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-write-owner">
-      <entry><constant>WIN32_WRITE_OWNER</constant></entry>
-      <entry><literal>0x00080000</literal></entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-generic-read">
-      <entry><constant>WIN32_GENERIC_READ</constant></entry>
-      <entry>Include rights:
-       <constant>WIN32_STANDARD_RIGHTS_READ</constant>,
-       <constant>WIN32_SERVICE_QUERY_CONFIG</constant>,
-       <constant>WIN32_SERVICE_QUERY_STATUS</constant>,
-       <constant>WIN32_SERVICE_INTERROGATE</constant>,
-       <constant>WIN32_SERVICE_ENUMERATE_DEPENDENTS</constant>
-      </entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-generic-write">
-      <entry><constant>WIN32_GENERIC_WRITE</constant></entry>
-      <entry>Include rights:
-       <constant>WIN32_STANDARD_RIGHTS_WRITE</constant>,
-       <constant>WIN32_SERVICE_CHANGE_CONFIG</constant>
-      </entry>
-      <entry>
-      </entry>
-     </row>
-     <row xml:id="constant.win32-generic-execute">
-      <entry><constant>WIN32_GENERIC_EXECUTE</constant></entry>
-      <entry>Include rights:
-       <constant>WIN32_STANDARD_RIGHTS_EXECUTE</constant>,
-       <constant>WIN32_SERVICE_START</constant>,
-       <constant>WIN32_SERVICE_STOP</constant>,
-       <constant>WIN32_SERVICE_PAUSE_CONTINUE</constant>,
-       <constant>WIN32_SERVICE_USER_DEFINED_CONTROL</constant>
-      </entry>
-      <entry>
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-</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/win32service/examples.xml b/reference/win32service/examples.xml
deleted file mode 100644
index c50c8502a121..000000000000
--- a/reference/win32service/examples.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="win32service.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  <example>
-   <title>Registering a PHP script to run as a service</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-win32_create_service(array(
-    'service'     => 'dummyphp',                                           # the name of your service
-    'display'     => 'sample dummy PHP service',                           # short description
-    'description' => 'This is a dummy Windows service created using PHP.', # long description
-    'params'      => '"' . __FILE__ . '"  run',                            # path to the script and parameters
-));
-?>
-]]>
-   </programlisting>
-  </example>
- </para>
- <para>
-  <example>
-   <title>Unregistering a service</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-win32_delete_service('dummyphp');
-?>
-]]>
-   </programlisting>
-  </example>
- </para>
- <para>
-  <example>
-   <title>Running as a service</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-if ($argv[1] == 'run') {
-  win32_start_service_ctrl_dispatcher('dummyphp');
-
-  while (WIN32_SERVICE_CONTROL_STOP != win32_get_last_control_message()) {
-    # do your work here.
-    # try not to take up more than 30 seconds before going around the loop
-    # again
-  }
-}
-?>
-]]>
-   </programlisting>
-  </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/win32service/functions/win32-add-right-access-service.xml b/reference/win32service/functions/win32-add-right-access-service.xml
deleted file mode 100644
index e84d0afc7b66..000000000000
--- a/reference/win32service/functions/win32-add-right-access-service.xml
+++ /dev/null
@@ -1,122 +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.win32-add-right-access-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_add_right_access_service</refname>
-  <refpurpose>Add rights access for an username to the service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_add_right_access_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam><type>int</type><parameter>right</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Add the rights access for <parameter>username</parameter> on <parameter>servicename</parameter>
-   service. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to add rights access.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       Read the rights access for <parameter>username</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>right</parameter></term>
-     <listitem>
-      <para>
-       The rights allowed for <parameter>username</parameter>.
-       The <link linkend="win32service.constants.rights">service rights constants</link> can be used to define this value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name on which you want to create a service.
-       If omitted, it will use the local machine.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return a <classname>Win32Service\RightInfo</classname> object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>username</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_read_all_rights_access_service</function></member>
-    <member><function>win32_read_rights_access_service</function></member>
-    <member><function>win32_remove_right_access_service</function></member>
-    <member><link linkend="win32service.constants.rights">Win32 Rights constants</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/win32service/functions/win32-add-service-env-var.xml b/reference/win32service/functions/win32-add-service-env-var.xml
deleted file mode 100644
index 7e74e366a610..000000000000
--- a/reference/win32service/functions/win32-add-service-env-var.xml
+++ /dev/null
@@ -1,109 +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.win32-add-service-env-var" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_add_service_env_var</refname>
-  <refpurpose>Add a custom environment variables on service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_add_service_env_var</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>varname</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Add a custom environment variables <parameter>varname</parameter> on <parameter>servicename</parameter>
-   service. This function work only for the local computer. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to add environment variable.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>varname</parameter></term>
-     <listitem>
-      <para>
-       The environment variable name.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The environment variable value.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>varname</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_get_service_env_vars</function></member>
-    <member><function>win32_remove_service_env_var</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/win32service/functions/win32-continue-service.xml b/reference/win32service/functions/win32-continue-service.xml
deleted file mode 100644
index 1cbe70a502ee..000000000000
--- a/reference/win32service/functions/win32-continue-service.xml
+++ /dev/null
@@ -1,148 +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.win32-continue-service" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_continue_service</refname>
-  <refpurpose>Resumes a paused service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_continue_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  
-  <para>
-   Resumes a paused, named service. Requires administrative privileges or 
-   an account with appropriate rights set in the service's ACL.
-  </para>
-  
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       Optional machine name.  If omitted, the local machine is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   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="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.3.0</entry>
-       <entry>
-        This function does not longer require an administrator account if ACL is set for another account.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_start_service</function></member>
-    <member><function>win32_stop_service</function></member>
-    <member><function>win32_pause_service</function></member>
-    <member><function>win32_send_custom_control</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-create-service.xml b/reference/win32service/functions/win32-create-service.xml
deleted file mode 100644
index 8b0af1524520..000000000000
--- a/reference/win32service/functions/win32-create-service.xml
+++ /dev/null
@@ -1,517 +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.win32-create-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_create_service</refname>
-  <refpurpose>Creates a new service entry in the SCM database</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_create_service</methodname>
-   <methodparam><type>array</type><parameter>details</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Attempts to add a service into the SCM database. Administrative
-   privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>details</parameter></term>
-     <listitem>
-      <para>
-       An array of service details:
-       <variablelist>
-        <varlistentry>
-         <term><parameter>service</parameter></term>
-         <listitem>
-          <para>
-           The short name of the service.  This is the name that you
-           will use to control the service using the <literal>net</literal>
-           command.  The service must be unique (no two services can share the
-           same name), and, ideally, should avoid having spaces in the name.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>display</parameter></term>
-         <listitem>
-          <para>The display name of the service.  This is the name that you
-          will see in the Services Applet.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>description</parameter></term>
-         <listitem>
-          <para>The long description of the service.  This is the description
-          that you will see in the Services Applet.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>user</parameter></term>
-         <listitem>
-          <para>
-           The name of the user account under which you want the service to
-           run.  If omitted, the service will run as the LocalSystem account.
-           If the username is specified, you must also provide a password.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>password</parameter></term>
-         <listitem>
-          <para>
-           The password that corresponds to the <parameter>user</parameter>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>path</parameter></term>
-         <listitem>
-          <para>
-           The full path to the executable module that will be launched when
-           the service is started.  If omitted, the path to the current PHP
-           process will be used.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>params</parameter></term>
-         <listitem>
-          <para>
-           Command line parameters to pass to the service when it starts.
-           If you want to run a PHP script as the service, then the first
-           parameter should be the full path to the PHP script that you intend
-           to run. If the script name or path contains spaces, then wrap the
-           full path to the PHP script with <literal>"</literal>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>load_order</parameter></term>
-         <listitem>
-          <para>
-           Controls the load_order.  This is not yet fully supported.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>svc_type</parameter></term>
-         <listitem>
-          <para>
-           Sets the service type.  If omitted, the default value is
-           <constant>WIN32_SERVICE_WIN32_OWN_PROCESS</constant>.
-           Don't change this unless you know what you're doing.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>start_type</parameter></term>
-         <listitem>
-          <para>
-           Specifies how the service should be started.  The default is
-           <constant>WIN32_SERVICE_AUTO_START</constant> which means the
-           service will be launched when the machine starts up.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>error_control</parameter></term>
-         <listitem>
-          <para>
-           Informs the SCM what it should do when it detects a problem with
-           the service.  The default is
-           <constant>WIN32_SERVER_ERROR_IGNORE</constant>.  Changing this
-           value is not yet fully supported.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>delayed_start</parameter></term>
-         <listitem>
-          <para>
-           If <parameter>delayed_start</parameter> is set to &true;, then this
-           will inform the SCM that this service should be started after other
-           auto-start services are started plus a short delay.
-          </para>
-          <para>
-           Any service can be marked as a delayed auto-start service; however,
-           this setting has no effect unless the service's
-           <parameter>start_type</parameter> is
-           <constant>WIN32_SERVICE_AUTO_START</constant>.
-          </para>
-          <para>
-           This setting is only applicable on Windows Vista and Windows Server
-           2008 or greater.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>base_priority</parameter></term>
-         <listitem>
-          <para>
-           To reduce the impact on processor utilisation, it may be necessary
-           to set a base priority lower than normal.
-          </para>
-          <para>
-           The <parameter>base_priority</parameter> can be set to one of the
-           constants define in
-           <link linkend="win32service.constants.basepriorities">Win32 Base Priority Classes</link>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>dependencies</parameter></term>
-         <listitem>
-          <para>
-           To define the dependencies for your service, it may be necessary to set 
-           this parameter to the list of the services names in an array.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_delay</parameter></term>
-         <listitem>
-          <para>
-           This parameter defines the delay between the fail and the execution 
-           of recovery action. The value is in milliseconds.
-          </para>
-          <para>
-           The default value is 60000.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_action_1</parameter></term>
-         <listitem>
-          <para>
-           The action will be executed on first failure. The default value is 
-           <constant>WIN32_SC_ACTION_NONE</constant>.
-          </para>
-          <para>
-           The <parameter>recovery_action_1</parameter> can be set to one of the
-           constants defined in
-           <link linkend="win32service.constants.recovery-action">Win32 Recovery action</link>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_action_2</parameter></term>
-         <listitem>
-          <para>
-           The action will be executed on second failure. The default value is 
-           <constant>WIN32_SC_ACTION_NONE</constant>.
-          </para>
-          <para>
-           The <parameter>recovery_action_2</parameter> can be set to one of the
-           constants defined in
-           <link linkend="win32service.constants.recovery-action">Win32 Recovery action</link>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_action_3</parameter></term>
-         <listitem>
-          <para>
-           The action will be executed on next failures. The default value is 
-           <constant>WIN32_SC_ACTION_NONE</constant>.
-          </para>
-          <para>
-           The <parameter>recovery_action_3</parameter> can be set to one of the
-           constants defined in
-           <link linkend="win32service.constants.recovery-action">Win32 Recovery action</link>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_reset_period</parameter></term>
-         <listitem>
-          <para>
-           The failure count will be reset after the delay defined in the parameter. The delay is expirement in seconds.
-          </para>
-          <para>
-           The default value is <literal>86400</literal>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_enabled</parameter></term>
-         <listitem>
-          <para>
-           Set this parameter at &true; to enable the recovery settings, &false; 
-           to disable. 
-          </para>
-          <para>
-           The default value is &false;
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_reboot_msg</parameter></term>
-         <listitem>
-          <para>
-           Set this parameter to define the message saved into the Windows Event 
-           Log before the reboot. Used only if one action is set to 
-           <constant>WIN32_SC_ACTION_REBOOT</constant>.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><parameter>recovery_command</parameter></term>
-         <listitem>
-          <para>
-           Set this parameter to define the command executed when one action is defined on  
-           <constant>WIN32_SC_ACTION_RUN_COMMAND</constant>.
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name on which you want to create a service.
-       If omitted, it will use the local machine.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-   Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>path</parameter> parameter is missing or empty.
-  </para>
-  <para>
-   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
-   value of <parameter>start_type</parameter> parameter is wrong.
-  </para>
-  <para>
-   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
-   value of <parameter>base_priority</parameter> parameter  is wrong.
-  </para>
-  <para>
-   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
-   value of <parameter>recovery_action_1</parameter> parameter is wrong.
-  </para>
-  <para>
-   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
-   value of <parameter>recovery_action_3</parameter> parameter is wrong.
-  </para>
-  <para>
-   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 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;
-  <para>
-   <example>
-    <title>A <function>win32_create_service</function> example</title>
-    <para>
-     Create a service with the short name 'dummyphp'.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$x = win32_create_service(array(
-    'service'     => 'dummyphp',                                           // the name of your service
-    'display'     => 'sample dummy PHP service',                           // short description
-    'description' => 'This is a dummy Windows service created using PHP.', // long description
-    'params'      => '"' . __FILE__ . '"  run',                            // path to the script and parameters
-));
-debug_zval_dump($x);
-?>
-]]>
-     </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>A <function>win32_create_service</function> example with dependencies</title>
-    <para>
-     Create a service with the short name 'dummyphp' and dependencies.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$x = win32_create_service(array(
-    'service'      => 'dummyphp',                                           // the name of your service
-    'display'      => 'sample dummy PHP service',                           // short description
-    'description'  => 'This is a dummy Windows service created using PHP.', // long description
-    'params'       => '"' . __FILE__ . '"  run',                            // path to the script and parameters
-    'dependencies' => array("Netman"),                                      // The list of the dependencies 
-));
-debug_zval_dump($x);
-?>
-]]>
-     </programlisting>
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>A <function>win32_create_service</function> example with recovery</title>
-    <para>
-     Create a service with the short name 'dummyphp' and recovery settings.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$x = win32_create_service(array(
-    'service'               => 'dummyphp',                                           // the name of your service
-    'display'               => 'sample dummy PHP service',                           // short description
-    'description'           => 'This is a dummy Windows service created using PHP.', // long description
-    'params'                => '"' . __FILE__ . '"  run',                            // path to the script and parameters
-    'recovery_delay'        => 120000,                                               // Recovery action is executed after 2 minutes
-    'recovery_action_1'     => WIN32_SC_ACTION_RESTART,                              // On first failure, restart the service
-    'recovery_action_2'     => WIN32_SC_ACTION_RUN_COMMAND,                          // On second failure, execute the commmand
-    'recovery_action_3'     => WIN32_SC_ACTION_NONE,                                 // On other failure, do nothing
-    'recovery_reset_period' => 86400,                                                // Reset the fail counter after 1 day
-    'recovery_enabled'      => true,                                                 // Enable the recovery parameter
-    'recovery_reboot_msg'   => null,                                                 // Do not define a reboot message, it's not needed here
-    'recovery_command'      => "c:\clean-service.bat",                               // When the action is WIN32_SC_ACTION_RUN_COMMAND, execute this command
-));
-debug_zval_dump($x);
-?>
-]]>
-     </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_delete_service</function></member>
-    <member><link linkend="win32service.constants.basepriorities">Win32 Base Priority Classes</link></member>
-    <member><link linkend="win32service.constants.recovery-action">Win32 Recovery action</link></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-delete-service.xml b/reference/win32service/functions/win32-delete-service.xml
deleted file mode 100644
index 380ff42620fd..000000000000
--- a/reference/win32service/functions/win32-delete-service.xml
+++ /dev/null
@@ -1,167 +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.win32-delete-service" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_delete_service</refname>
-  <refpurpose>Deletes a service entry from the SCM database</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_delete_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Attempts to delete a service from the SCM database.  Administrative
-   privileges are required for this to succeed.
-  </para>
-  <para>
-   This function really just marks the service for deletion.  If other
-   processes (such as the Services Applet) are open, then the deletion will be
-   deferred until those applications are closed.  If a service is marked for
-   deletion, further attempts to delete it will fail, and attempts to create a
-   new service with that name will also fail.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name.  If omitted, the local machine will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-    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="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>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </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="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_create_service</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-get-last-control-message.xml b/reference/win32service/functions/win32-get-last-control-message.xml
deleted file mode 100644
index 473d8945e7b7..000000000000
--- a/reference/win32service/functions/win32-get-last-control-message.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.win32-get-last-control-message" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_get_last_control_message</refname>
-  <refpurpose>Returns the last control message that was sent to this service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>win32_get_last_control_message</methodname>
-   <void/>
-  </methodsynopsis>
-  
-  <para>
-   Returns the control code that was last sent to this service process.
-   When running as a service you should periodically check this to determine if
-   your service needs to stop running.
-  </para>
-  
-  <caution>
-   <para>
-    Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI 
-    this function is disabled.
-   </para>
-  </caution>
-  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a control constant which will be one of the
-   <link linkend="win32service.constants.servicecontrol">Win32Service Service Control Message Constants</link>:
-   <constant>WIN32_SERVICE_CONTROL_CONTINUE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_DEVICEEVENT</constant>,
-   <constant>WIN32_SERVICE_CONTROL_HARDWAREPROFILECHANGE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_INTERROGATE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_NETBINDADD</constant>,
-   <constant>WIN32_SERVICE_CONTROL_NETBINDDISABLE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_NETBINDENABLE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_NETBINDREMOVE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_PARAMCHANGE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_PAUSE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_POWEREVENT</constant>,
-   <constant>WIN32_SERVICE_CONTROL_PRESHUTDOWN</constant>,
-   <constant>WIN32_SERVICE_CONTROL_SESSIONCHANGE</constant>,
-   <constant>WIN32_SERVICE_CONTROL_SHUTDOWN</constant>,
-   <constant>WIN32_SERVICE_CONTROL_STOP</constant>.
-  </para>
-  <para>
-   If the value is between 128 and 255, the control code is custom.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-<constant>E_ERROR</constant> level error.
-  </para>
-   <para>
-    As of version 1.0.0, will throw a 
-    <classname>Win32ServiceException</classname> if SAPI is not 
-    <literal>"cli"</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>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 0.2.0</entry>
-       <entry>
-        This function works only in the <literal>"cli"</literal> SAPI.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_start_service_ctrl_dispatcher</function></member>
-    <member><function>win32_set_service_status</function></member>
-    <member><function>win32_set_service_exit_mode</function></member>
-    <member><function>win32_set_service_exit_code</function></member>
-    <member><link linkend="win32service.constants.servicecontrol">Win32Service Service Control Message Constants</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/win32service/functions/win32-get-service-env-vars.xml b/reference/win32service/functions/win32-get-service-env-vars.xml
deleted file mode 100644
index d435793a580f..000000000000
--- a/reference/win32service/functions/win32-get-service-env-vars.xml
+++ /dev/null
@@ -1,87 +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.win32-get-service-env-vars" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_get_service_env_vars</refname>
-  <refpurpose>Read all custom environment variables on service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>win32_get_service_env_vars</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Read all custom environment variables on <parameter>servicename</parameter>
-   service. This function work only for the local computer. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to read environment variables.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return an &array; with variable name in key and variable value in value.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   A <classname>ValueError</classname> is thrown if the
-   value of <parameter>service</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_add_service_env_var</function></member>
-    <member><function>win32_remove_service_env_var</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/win32service/functions/win32-pause-service.xml b/reference/win32service/functions/win32-pause-service.xml
deleted file mode 100644
index 9e3d1307880a..000000000000
--- a/reference/win32service/functions/win32-pause-service.xml
+++ /dev/null
@@ -1,150 +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.win32-pause-service" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_pause_service</refname>
-  <refpurpose>Pauses a service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_pause_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Pauses a named service. Requires administrative privileges or
-   an account with appropriate rights set in the service's ACL.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       Optional machine name.  If omitted, the local machine is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-    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="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.3.0</entry>
-       <entry>
-        This function does not longer require an administrator account if ACL is set for another account.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_start_service</function></member>
-    <member><function>win32_stop_service</function></member>
-    <member><function>win32_continue_service</function></member>
-    <member><function>win32_send_custom_control</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-query-service-status.xml b/reference/win32service/functions/win32-query-service-status.xml
deleted file mode 100644
index 1a58ac640d11..000000000000
--- a/reference/win32service/functions/win32-query-service-status.xml
+++ /dev/null
@@ -1,224 +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.win32-query-service-status" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_query_service_status</refname>
-  <refpurpose>Queries the status of a service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>win32_query_service_status</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Queries the current status for a service, returning an array of
-   information.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name.  If omitted, the local machine will be used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array consisting of the following information on success
-  </para>
-  <para>
-    Prior version 1.0.0&win32service.false.error;
-  </para>
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>ServiceType</parameter></term>
-     <listitem>
-      <para>
-       The dwServiceType. See <link linkend="win32service.constants.servicetype">Win32Service Service Type Bitmasks</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>CurrentState</parameter></term>
-     <listitem>
-      <para>
-       The dwCurrentState. See <link linkend="win32service.constants.servicestatus">Win32Service Service Status Constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ControlsAccepted</parameter></term>
-     <listitem>
-      <para>
-       Which service controls are accepted by the service. See <link linkend="win32service.constants.controlsaccepted">Win32Service Service Control Message Accepted Bitmasks</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>Win32ExitCode</parameter></term>
-     <listitem>
-      <simpara>
-       If the service exited, the return code from the process. This value is equal to 
-       <constant>WIN32_ERROR_SERVICE_SPECIFIC_ERROR</constant> 
-       if the exit mode is not graceful. See
-       <link linkend="win32service.constants.errors">Win32Service error codes</link> and 
-       <function>win32_set_service_exit_mode</function>
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ServiceSpecificExitCode</parameter></term>
-     <listitem>
-      <para>
-       If the service exited with an error condition, the service specific
-       code that is logged in the event log is visible here. This value is equal 
-       to the value defined by <function>win32_set_service_exit_code</function>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>CheckPoint</parameter></term>
-     <listitem>
-      <para>
-       If the service is shutting down, holds the current check point number.
-       This is used by the SCM as a kind of heart-beat to detect a wedged service
-       process.  The value of the check point is best interpreted in
-       conjunction with the WaitHint value.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>WaitHint</parameter></term>
-     <listitem>
-      <para>
-       If the service is shutting down it will set WaitHint to a checkpoint
-       value that will indicate 100% completion.  This can be used to
-       implement a progress indicator.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ProcessId</parameter></term>
-     <listitem>
-      <para>
-       The Windows process identifier. If 0, the process is not running.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ServiceFlags</parameter></term>
-     <listitem>
-      <para>
-       The dwServiceFlags. See <link linkend="win32service.constants.serviceflag">Win32Service Service Flag Constants</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
-
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-    A <classname>ValueError</classname> is thrown if the
-    value of <parameter>servicename</parameter> parameter is empty.
-  </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>array</type>, previously it was <type>mixed</type>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><link linkend="win32service.constants">Win32Service Predefined Constants</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/win32service/functions/win32-read-all-rights-access-service.xml b/reference/win32service/functions/win32-read-all-rights-access-service.xml
deleted file mode 100644
index 07681a7d30fc..000000000000
--- a/reference/win32service/functions/win32-read-all-rights-access-service.xml
+++ /dev/null
@@ -1,99 +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.win32-read-all-rights-access-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_read_all_rights_access_service</refname>
-  <refpurpose>Read all service rights access</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>win32_read_all_rights_access_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Read all rights access on <parameter>servicename</parameter>
-   service. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to read rights access.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name on which you want to create a service.
-       If omitted, it will use the local machine.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return an &array; of <classname>Win32Service\RightInfo</classname>
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   A <classname>ValueError</classname> is thrown if the
-   value of <parameter>service</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_read_rights_access_service</function></member>
-    <member><function>win32_add_right_access_service</function></member>
-    <member><function>win32_remove_right_access_service</function></member>
-    <member><link linkend="win32service.constants.rights">Win32 Rights constants</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/win32service/functions/win32-read-right-access-service.xml b/reference/win32service/functions/win32-read-right-access-service.xml
deleted file mode 100644
index 23da1a35dd1b..000000000000
--- a/reference/win32service/functions/win32-read-right-access-service.xml
+++ /dev/null
@@ -1,112 +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.win32-read-right-access-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_read_right_access_service</refname>
-  <refpurpose>Read the service rights access for an username</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>Win32Service\RightInfo</type><methodname>win32_read_right_access_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Read the rights access for <parameter>username</parameter> on <parameter>servicename</parameter>
-   service. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to read rights access.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       Read the rights access for <parameter>username</parameter>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name on which you want to create a service.
-       If omitted, it will use the local machine.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return a <classname>Win32Service\RightInfo</classname> object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>username</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_read_all_rights_access_service</function></member>
-    <member><function>win32_add_right_access_service</function></member>
-    <member><function>win32_remove_right_access_service</function></member>
-    <member><link linkend="win32service.constants.rights">Win32 Rights constants</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/win32service/functions/win32-remove-right-access-service.xml b/reference/win32service/functions/win32-remove-right-access-service.xml
deleted file mode 100644
index cf1fc520ff76..000000000000
--- a/reference/win32service/functions/win32-remove-right-access-service.xml
+++ /dev/null
@@ -1,111 +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.win32-remove-right-access-service" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_remove_right_access_service</refname>
-  <refpurpose>Remove the service rights access for an username</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_remove_right_access_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>username</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Remove the rights access for <parameter>username</parameter> on <parameter>servicename</parameter>
-   service. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to remove rights access.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>username</parameter></term>
-     <listitem>
-      <para>
-       Read the rights access for <parameter>username</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       The optional machine name on which you want to create a service.
-       If omitted, it will use the local machine.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>username</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_read_all_rights_access_service</function></member>
-    <member><function>win32_read_rights_access_service</function></member>
-    <member><function>win32_add_right_access_service</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/win32service/functions/win32-remove-service-env-var.xml b/reference/win32service/functions/win32-remove-service-env-var.xml
deleted file mode 100644
index 459feecd51e9..000000000000
--- a/reference/win32service/functions/win32-remove-service-env-var.xml
+++ /dev/null
@@ -1,100 +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.win32-remove-service-env-var" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_remove_service_env_var</refname>
-  <refpurpose>Remove a custom environment variables on service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_remove_service_env_var</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>varname</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Remove a custom environment variables <parameter>varname</parameter> on <parameter>servicename</parameter>
-   service. This function work only for the local computer. Administrative privileges are required for this to succeed.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The service name to remove environment variable.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>varname</parameter></term>
-     <listitem>
-      <para>
-       The environment variable name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   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
-   value of <parameter>varname</parameter> parameter is empty.
-  </para>
-  <para>
-   A <classname>Win32ServiceException</classname> is thrown on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_get_service_env_vars</function></member>
-    <member><function>win32_add_service_env_var</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/win32service/functions/win32-send-custom-control.xml b/reference/win32service/functions/win32-send-custom-control.xml
deleted file mode 100644
index c86677f54cfa..000000000000
--- a/reference/win32service/functions/win32-send-custom-control.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.win32-send-custom-control" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_send_custom_control</refname>
-  <refpurpose>Send a custom control to the service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>void</type><methodname>win32_send_custom_control</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam><type>int</type><parameter>control</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   
-   See <link xlink:href="&url.microsoft.controlservice;">Microsoft ControlService function</link> for more details
-  </para>
-  
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-   <varlistentry>
-    <term><parameter>control</parameter></term>
-    <listitem>
-     <para>
-      The custom contole value between 128 and 255.
-     </para>
-    </listitem>
-   </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       Optional machine name.  If omitted, the local machine is used.
-      </para>
-     </listitem>
-    </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the control value is not between 128 and 255, this function emits an
-   <constant>E_ERROR</constant> level error.
-  </para>
-  <para>
-    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
-    value of <parameter>control</parameter> parameter is not between 128 and 255.
-  </para>
-   <para>
-    A <classname>Win32ServiceException</classname> is thrown on 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>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>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-    <member><function>win32_start_service</function></member>
-    <member><function>win32_stop_service</function></member>
-    <member><function>win32_pause_service</function></member>
-    <member><function>win32_continue_service</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-set-service-exit-code.xml b/reference/win32service/functions/win32-set-service-exit-code.xml
deleted file mode 100644
index 166be1209acc..000000000000
--- a/reference/win32service/functions/win32-set-service-exit-code.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.win32-set-service-exit-code" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_set_service_exit_code</refname>
-  <refpurpose>Define or return the exit code for the current running service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>int</type><methodname>win32_set_service_exit_code</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>exitCode</parameter><initializer>1</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Change or return the exit code. The exit code is used only if the exit mode is not graceful. 
-   If the value is not zero, the recovery configuration can be used after 
-   service fail. See 
-   <link xlink:href="&url.microsoft.return.code;">Microsoft system error codes</link> 
-   for more details
-  </para>
-  
-  <caution>
-   <para>
-    This function work only in "cli" SAPI. On other SAPI 
-    this function is disabled.
-   </para>
-  </caution>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>exitCode</parameter></term>
-    <listitem>
-     <para>
-      The return code used on exit.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the current or old exit code.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
-  </para>
-   <para>
-    As of version 1.0.0, will throw a 
-    <classname>Win32ServiceException</classname> if SAPI is not 
-    <literal>"cli"</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>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>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-    <member><function>win32_start_service_ctrl_dispatcher</function></member>
-    <member><function>win32_set_service_status</function></member>
-    <member><function>win32_set_service_exit_mode</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/win32service/functions/win32-set-service-exit-mode.xml b/reference/win32service/functions/win32-set-service-exit-mode.xml
deleted file mode 100644
index 2618d713f0c9..000000000000
--- a/reference/win32service/functions/win32-set-service-exit-mode.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.win32-set-service-exit-mode" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_set_service_exit_mode</refname>
-  <refpurpose>Define or return the exit mode for the current running service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>win32_set_service_exit_mode</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>gracefulMode</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   If <parameter>gracefulMode</parameter> parameter is provided, the exit mode 
-is changed. When the exit mode is not graceful, the exit code used can be set
-with the <function>win32_set_service_exit_code</function> function.
-  </simpara>
-  
-  <caution>
-   <para>
-    This function work only in "cli" SAPI. On other SAPI 
-    this function is disabled.
-   </para>
-  </caution>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>gracefulMode</parameter></term>
-    <listitem>
-     <para>
-      &true; for exit graceful. &false; for exit with error.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the current or old exit mode.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
-  </para>
-
-   <para>
-    As of version 1.0.0, will throw a 
-    <classname>Win32ServiceException</classname> if SAPI is not 
-    <literal>"cli"</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>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>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-    <member><function>win32_start_service_ctrl_dispatcher</function></member>
-    <member><function>win32_set_service_status</function></member>
-    <member><function>win32_set_service_exit_code</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/win32service/functions/win32-set-service-pause-resume-state.xml b/reference/win32service/functions/win32-set-service-pause-resume-state.xml
deleted file mode 100644
index 5d31e740c33b..000000000000
--- a/reference/win32service/functions/win32-set-service-pause-resume-state.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.win32-set-service-pause-resume-state" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>win32_set_service_pause_resume_state</refname>
-  <refpurpose>Define or return the pause/resume capability for the current running service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description"><!-- {{{ -->
-  &reftitle.description;
-  <methodsynopsis role="procedural">
-   <type>bool</type><methodname>win32_set_service_pause_resume_state</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>state</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   If <parameter>state</parameter> parameter is provided, the pause/resume capability
-is changed.
-  </para>
-
-  <caution>
-   <para>
-    This function work only in "cli" SAPI and in the Windows service running context. On other SAPI
-    this function is disabled.
-   </para>
-  </caution>
- </refsect1><!-- }}} -->
-
- <refsect1 role="parameters"><!-- {{{ -->
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>state</parameter></term>
-    <listitem>
-     <para>
-      &true; for enable the service pause/resume capability. &false; for disable the service pause/resume capability.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1><!-- }}} -->
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the current or old pause/resume capability state.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an
-   <constant>E_ERROR</constant> level error.
-  </para>
-
-   <para>
-    As of version 1.0.0, will throw a
-    <classname>Win32ServiceException</classname> if SAPI is not
-    <literal>"cli"</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>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>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso"><!-- {{{ -->
-  &reftitle.seealso;
-  <simplelist>
-    <member><function>win32_start_service_ctrl_dispatcher</function></member>
-    <member><function>win32_set_service_status</function></member>
-    <member><function>win32_set_service_exit_code</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/win32service/functions/win32-set-service-status.xml b/reference/win32service/functions/win32-set-service-status.xml
deleted file mode 100644
index 99b3151d1c64..000000000000
--- a/reference/win32service/functions/win32-set-service-status.xml
+++ /dev/null
@@ -1,174 +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.win32-set-service-status" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_set_service_status</refname>
-  <refpurpose>Update the service status</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_set_service_status</methodname>
-   <methodparam><type>int</type><parameter>status</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>checkpoint</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Informs the SCM of the current status of a running service.
-   This call is only valid for a running service process.
-  </para>
-    
-  <caution>
-   <para>
-    Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI 
-    this function is disabled.
-   </para>
-  </caution>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>status</parameter></term>
-     <listitem>
-      <para>
-       The service status code, one of
-       <constant>WIN32_SERVICE_RUNNING</constant>,
-       <constant>WIN32_SERVICE_STOPPED</constant>,
-       <constant>WIN32_SERVICE_STOP_PENDING</constant>,
-       <constant>WIN32_SERVICE_START_PENDING</constant>,
-       <constant>WIN32_SERVICE_CONTINUE_PENDING</constant>,
-       <constant>WIN32_SERVICE_PAUSE_PENDING</constant>,
-       <constant>WIN32_SERVICE_PAUSED</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>checkpoint</parameter></term>
-     <listitem>
-      <para>
-       The checkpoint value the service increments periodically to report its
-       progress during a lengthy start, stop, pause, or continue operation.
-       For example, the service should increment this value as it completes
-       each step of its initialization when it is starting up.
-      </para>
-      <para>
-       The <parameter>checkpoint</parameter> is only valid when the
-       <parameter>status</parameter> is one of
-       <constant>WIN32_SERVICE_STOP_PENDING</constant>,
-       <constant>WIN32_SERVICE_START_PENDING</constant>,
-       <constant>WIN32_SERVICE_CONTINUE_PENDING</constant> or
-       <constant>WIN32_SERVICE_PAUSE_PENDING</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-<constant>E_ERROR</constant> level error.
-  </para>
-   <para>
-    As of version 1.0.0, will throw a 
-    <classname>Win32ServiceException</classname> if SAPI is not 
-    <literal>"cli"</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>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.2.0</entry>
-       <entry>
-        This function works only in the <literal>"cli"</literal> SAPI.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_start_service_ctrl_dispatcher</function></member>
-    <member><function>win32_get_last_control_message</function></member>
-    <member><function>win32_set_service_exit_mode</function></member>
-    <member><function>win32_set_service_exit_code</function></member>
-    <member><link linkend="win32service.constants.servicestatus">Win32Service Service Status Constants</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/win32service/functions/win32-start-service-ctrl-dispatcher.xml b/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
deleted file mode 100644
index 8110a9ee1078..000000000000
--- a/reference/win32service/functions/win32-start-service-ctrl-dispatcher.xml
+++ /dev/null
@@ -1,212 +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.win32-start-service-ctrl-dispatcher" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_start_service_ctrl_dispatcher</refname>
-  <refpurpose>Registers the script with the SCM, so that it can act as the service with the given name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_start_service_ctrl_dispatcher</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>gracefulMode</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   When launched via the Service Control Manager, a service process is
-   required to "check-in" with it to establish service monitoring and
-   communication facilities.  This function performs the check-in by spawning
-   a thread to handle the lower-level communication with the service control
-   manager.
-  </para>
-  <para>
-   Once started, the service process should do 2 things. The first is to tell
-   the Service Control Manager that the service is running. This is achieved
-   by calling <function>win32_set_service_status</function> with the
-   <constant>WIN32_SERVICE_RUNNING</constant> constant. If you need to perform
-   some lengthy process before the service is actually running, then you can
-   use the <constant>WIN32_SERVICE_START_PENDING</constant> constant. The
-   second is to continue to check-in with the service control manager so that
-   it can determine if it should terminate. This is achieved by periodically
-   calling <function>win32_get_last_control_message</function> and handling the
-   return code appropriately.
-  </para>
-
-  <caution>
-   <para>
-    Since version 0.2.0, this function work only in "cli" SAPI. On other SAPI 
-    this function is disabled.
-   </para>
-  </caution>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The short-name of the service, as registered by
-       <function>win32_create_service</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>gracefulMode</parameter></term>
-     <listitem>
-      <para>
-       &true; for exit graceful. &false; for exit with error. See 
-       <function>win32_set_service_exit_mode</function> for more details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Prior to version 1.0.0, if the SAPI is not <literal>"cli"</literal>, this function emits an 
-   <constant>E_ERROR</constant> level error.
-  </para>
-   <para>
-    As of version 1.0.0, will throw a 
-    <classname>Win32ServiceException</classname> if SAPI is not 
-    <literal>"cli"</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>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 <parameter>gracefulMode</parameter> has been added.
-       </entry>
-      </row>
-      <row>
-       <entry>PECL win32service 0.2.0</entry>
-       <entry>
-        This function works only in the <literal>"cli"</literal> SAPI.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </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="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_set_service_status</function></member>
-    <member><function>win32_get_last_control_message</function></member>
-    <member><function>win32_set_service_exit_mode</function></member>
-    <member><function>win32_set_service_exit_code</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-start-service.xml b/reference/win32service/functions/win32-start-service.xml
deleted file mode 100644
index 74c9dabf1612..000000000000
--- a/reference/win32service/functions/win32-start-service.xml
+++ /dev/null
@@ -1,148 +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.win32-start-service" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_start_service</refname>
-  <refpurpose>Starts a service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_start_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Attempts to start the named service. Requires administrative privileges or 
-   an account with appropriate rights set in the service's ACL.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       Optional machine name.  If omitted, the local machine is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   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="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.3.0</entry>
-       <entry>
-        This function does not longer require an administrator account if ACL is set for another account.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_stop_service</function></member>
-    <member><function>win32_pause_service</function></member>
-    <member><function>win32_continue_service</function></member>
-    <member><function>win32_send_custom_control</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/functions/win32-stop-service.xml b/reference/win32service/functions/win32-stop-service.xml
deleted file mode 100644
index 18b24139baa0..000000000000
--- a/reference/win32service/functions/win32-stop-service.xml
+++ /dev/null
@@ -1,148 +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.win32-stop-service" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>win32_stop_service</refname>
-  <refpurpose>Stops a service</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>win32_stop_service</methodname>
-   <methodparam><type>string</type><parameter>servicename</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>machine</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   Stops a named service. Requires administrative privileges or
-   an account with appropriate rights set in the service's ACL.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>servicename</parameter></term>
-     <listitem>
-      <para>
-       The short name of the service.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>machine</parameter></term>
-     <listitem>
-      <para>
-       Optional machine name.  If omitted, the local machine is used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
-  <para>
-    Prior to version 1.0.0, &win32service.noerror.false.error;
-  </para>
- </refsect1>
-
- <refsect1 role="errors"><!-- {{{ -->
-  &reftitle.errors;
-  <para>
-   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="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.3.0</entry>
-       <entry>
-        This function does not longer require an administrator account if ACL is set for another account.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1><!-- }}} -->
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>win32_start_service</function></member>
-    <member><function>win32_pause_service</function></member>
-    <member><function>win32_continue_service</function></member>
-    <member><function>win32_send_custom_control</function></member>
-    <member><link linkend="win32service.constants.errors">Win32 Error Codes</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/win32service/reference.xml b/reference/win32service/reference.xml
deleted file mode 100644
index 1a9eda1f00ee..000000000000
--- a/reference/win32service/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.win32service" xmlns="http://docbook.org/ns/docbook">
- <title>win32service &Functions;</title>
-
- &reference.win32service.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/win32service/rightinfo/construct.xml b/reference/win32service/rightinfo/construct.xml
deleted file mode 100644
index 757a8b660250..000000000000
--- a/reference/win32service/rightinfo/construct.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::__construct</refname>
-  <refpurpose>Create a new RightInfo (not used)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>private</modifier> <methodname>Win32Service\RightInfo::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   <classname>Win32Service\RightInfo</classname> objects are returned as the
-   result of <function>win32_read_right_access_service</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</function></member>
-   <member><function>Win32Service\RightInfo::getDomain</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/win32service/rightinfo/get-domain.xml b/reference/win32service/rightinfo/get-domain.xml
deleted file mode 100644
index bb47f9fa0693..000000000000
--- a/reference/win32service/rightinfo/get-domain.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.get-domain" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::getDomain</refname>
-  <refpurpose>Return the user's domain</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type> <methodname>Win32Service\RightInfo::getDomain</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return the user's domain.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the domain name or &null; if no domain found (local account or user GUID resolve fail).
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</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/win32service/rightinfo/get-full-username.xml b/reference/win32service/rightinfo/get-full-username.xml
deleted file mode 100644
index e5272637245b..000000000000
--- a/reference/win32service/rightinfo/get-full-username.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.get-full-username" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::getFullUsername</refname>
-  <refpurpose>Return the domain and username</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type> <methodname>Win32Service\RightInfo::getFullUsername</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return the domain and username separated by anti-slash <literal>\</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the domain and username. If the domain is &null;, returns only the username; returns &null; if no username is found.
-  </simpara>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</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/win32service/rightinfo/get-rights.xml b/reference/win32service/rightinfo/get-rights.xml
deleted file mode 100644
index 61792f8639e5..000000000000
--- a/reference/win32service/rightinfo/get-rights.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.get-rights" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::getRights</refname>
-  <refpurpose>Return the rights list</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>array</type> <methodname>Win32Service\RightInfo::getRights</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return the user's right list.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the user's right list.
-  </para>
-  <para>
-   The array index is the binary mask of right represented by the <link linkend="win32service.constants.rights">constants rights</link>.
-  </para>
-  <para>
-   The value is a string with the Windows constant name (without <literal>WIN32_</literal> prefix).
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</function></member>
-   <member><function>Win32Service\RightInfo::getDomain</function></member>
-   <member><link linkend="win32service.constants.rights">Win32 Rights constants</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/win32service/rightinfo/get-username.xml b/reference/win32service/rightinfo/get-username.xml
deleted file mode 100644
index ea60238f4d5a..000000000000
--- a/reference/win32service/rightinfo/get-username.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.get-username" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::getUsername</refname>
-  <refpurpose>Return the username</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type> <methodname>Win32Service\RightInfo::getUsername</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return the username.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return the username name or GUID if resolve fail.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getDomain</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/win32service/rightinfo/is-deny-access.xml b/reference/win32service/rightinfo/is-deny-access.xml
deleted file mode 100644
index 1368f5fed25d..000000000000
--- a/reference/win32service/rightinfo/is-deny-access.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.is-deny-access" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::isDenyAccess</refname>
-  <refpurpose>Return true if the RightInfo concerns deny access to the resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type> <methodname>Win32Service\RightInfo::isDenyAccess</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return &true; if the RightInfo concerns deny access to the resource, otherwise, it is &false;.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return &true; if the RightInfo concerns deny access to the resource, otherwise, it is &false;.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isGrantAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</function></member>
-   <member><function>Win32Service\RightInfo::getDomain</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/win32service/rightinfo/is-grant-access.xml b/reference/win32service/rightinfo/is-grant-access.xml
deleted file mode 100644
index b223967ea226..000000000000
--- a/reference/win32service/rightinfo/is-grant-access.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="win32service-rightinfo.is-grant-access" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Win32Service\RightInfo::isGrantAccess</refname>
-  <refpurpose>Return true if the RightInfo concern grants access to the resource</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>bool</type> <methodname>Win32Service\RightInfo::isGrantAccess</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Return &true; if the RightInfo concern grants access to the resource, &false; otherwise.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues"><!-- {{{ -->
-  &reftitle.returnvalues;
-  <para>
-   Return &true; if the RightInfo concern grants access to the resource, &false; otherwise.
-  </para>
- </refsect1><!-- }}} -->
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>Win32Service\RightInfo::__construct</function></member>
-   <member><function>Win32Service\RightInfo::getRights</function></member>
-   <member><function>Win32Service\RightInfo::isDenyAccess</function></member>
-   <member><function>Win32Service\RightInfo::getFullUsername</function></member>
-   <member><function>Win32Service\RightInfo::getUsername</function></member>
-   <member><function>Win32Service\RightInfo::getDomain</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/win32service/setup.xml b/reference/win32service/setup.xml
deleted file mode 100644
index 59ef1dbaccde..000000000000
--- a/reference/win32service/setup.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="win32service.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="win32service.requirements">
-  &reftitle.required;
-  <para>
-   The versions of Windows supported are the same as the Visual C++ redistributable package used to build PHP.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- <section xml:id="win32service.installation">
-  &reftitle.install;
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;win32service">&url.pecl.package;win32service</link>
-  </para>
- </section>
- <!-- }}} -->
-
- <section xml:id="win32service.security">
-  <title xmlns="http://docbook.org/ns/docbook">Security consideration</title>
-  <para>
-   This extension needs administrator privileges for some actions such as
-   <link linkend="function.win32-create-service">create</link>,
-   <link linkend="function.win32-delete-service">delete</link>,
-   <link linkend="function.win32-start-service">start</link>,
-   <link linkend="function.win32-stop-service">stop</link>,
-   <link linkend="function.win32-pause-service">pause</link> and
-   <link linkend="function.win32-continue-service">continue</link>.
-   This requirement can cause an elevation of privileges if the service
-   control is available from the web interface or remote control.
-  </para>
-  <para>
-   The ACL on the service can be set after adding it into SCM to delegate the
-   current administration tasks to a non administrator account or service account.
-  </para>
-  <para>
-   As of Win32Service 1.1.0, service rights can be managed with PHP. The actual ACLs can be read with
-   <function>win32_read_all_rights_access_service</function>, an access or deny right can be added with
-   <function>win32_add_right_access_service</function>, or an access right can be removed with
-   <function>win32_remove_right_access_service</function>.
-  </para>
-  <para>
-   It is recommended to update to Win32Service 1.1.0.
-   For further instructions to manage rights without the extension (or a version prior to 1.1.0), see the
-   <link xlink:href="&url.win32service.kb914392;">Microsoft Knowledge Base</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/win32service/versions.xml b/reference/win32service/versions.xml
deleted file mode 100644
index 02c53cf8f19d..000000000000
--- a/reference/win32service/versions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='win32-continue-service' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-create-service' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-delete-service' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-get-last-control-message' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-pause-service' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-query-service-status' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-send-custom-control' from='PECL win32service &gt;=0.4.0'/>
- <function name='win32-set-service-exit-code' from='PECL win32service &gt;=0.4.0'/>
- <function name='win32-set-service-exit-mode' from='PECL win32service &gt;=0.4.0'/>
- <function name='win32-set-service-status' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-start-service-ctrl-dispatcher' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-start-service' from='PECL win32service &gt;=0.1.0'/>
- <function name='win32-stop-service' from='PECL win32service &gt;=0.1.0'/>
- <function name="win32serviceexception" from="PECL win32service &gt;=1.0.0"/>
- <function name='win32-add-right-access-service' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-add-service-env-var' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-get-service-env-vars' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-read-all-rights-access-service' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-read-right-access-service' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-remove-right-access-service' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32-set-service-pause-resume-state' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::__construct' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::getdomain' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::getusername' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::getrights' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::isdenyaccess' from='PECL win32service &gt;=1.1.0'/>
- <function name='win32service\rightinfo::isgrantaccess' from='PECL win32service &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/win32service/win32serviceexception.xml b/reference/win32service/win32serviceexception.xml
deleted file mode 100644
index 57d56dd22ac9..000000000000
--- a/reference/win32service/win32serviceexception.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.win32serviceexception"
- role="exception"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Win32ServiceException class</title>
- <titleabbrev>Win32ServiceException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ win32serviceexception intro -->
-  <section xml:id="win32serviceexception.intro">
-   &reftitle.intro;
-   <para>
-    The exception replaces the old mechanism where the error value needed to be
-    compared to constants to detect which error was emitted. The Exception code
-    is equal to the value of the error value and the exception message is based
-    on the corresponding constant name.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="win32serviceexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Win32ServiceException</classname></ooclass>
-
-<!-- {{{ Exception synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Win32ServiceException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-<!-- Comment this section out if the exception does not contain any methods -->
-<!--
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.win32serviceexception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
--->
-<!-- If the exception extends another exception use this -->
-   <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>
-
- </partintro>
-
- <!-- If the exception has any methods you'd like to document use this
- &reference.extname.entities.classname;
- -->
-
-</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/win32service/win32servicerightinfo.xml b/reference/win32service/win32servicerightinfo.xml
deleted file mode 100644
index ed34c6f638a2..000000000000
--- a/reference/win32service/win32servicerightinfo.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.win32service-rightinfo"
- role="exception"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Win32Service\RightInfo class</title>
- <titleabbrev>Win32Service\RightInfo</titleabbrev>
-
- <partintro>
-
-<!-- {{{ win32serviceexception intro -->
-  <section xml:id="win32service-rightinfo.intro">
-   &reftitle.intro;
-   <para>
-    The <classname>Win32Service\RightInfo</classname> internal class encapsulates the result of <function>win32_read_right_access_service</function>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="win32service-rightinfo.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Win32Service\RightInfo</classname></ooclass>
-
-<!-- {{{ Exception synopsis -->
-    <classsynopsisinfo>
-     <modifier>final</modifier>
-     <ooclass>
-      <classname>Win32Service\RightInfo</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.win32service-rightinfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.win32service.entities.rightinfo;
-
-</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/wincache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/wincache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/wincache/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/wincache/book.xml b/reference/wincache/book.xml
deleted file mode 100644
index 1a631d93ed6c..000000000000
--- a/reference/wincache/book.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.wincache">
-  &reftitle.intro;
-  <para>
-   Windows Cache Extension for PHP is a PHP accelerator that is used to increase the speed of
-   PHP applications running on Windows and Windows Server. Once the Windows Cache Extension for
-   PHP is enabled and loaded by the PHP engine, PHP applications can take advantage of the
-   functionality without any code modifications.
-  </para>
-  <para>
-   The Windows Cache Extension includes 5 different types of caches. The following describes
-   the purpose of each cache type and the benefits it provides.
-  </para>
-  <itemizedlist>
-   <listitem>
-    <para>
-     <emphasis>PHP Opcode Cache</emphasis> - PHP is a script processing engine, which reads
-     an input stream of data that contains text and/or PHP instructions and produces another
-     stream of data, most commonly in the HTML format. This means that on a web server the
-     PHP engine reads, parses, compiles and executes a PHP script each time that it is requested
-     by a Web client. The reading, parsing and compilation operations put additional load on the
-     web server's CPU and file system and thus affect the overall performance of a PHP web application.
-     The PHP bytecode (opcode) cache is used to store the compiled script bytecode in shared memory so
-     that it can be re-used by PHP engine for subsequent executions of the same script.
-    </para>
-    <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.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <emphasis>File Cache</emphasis> - Even with the PHP opcode cache enabled, the PHP engine
-     has to accesses the script files on a file system. When PHP scripts are stored on a remote
-     UNC file share, the file operations introduce a significant performance overhead.
-     The Windows Cache Extension for PHP includes a file cache that is used to store the content
-     of the PHP script files in shared memory, which reduces the amount of file system operations
-     performed by PHP engine.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <emphasis>Resolve File Path Cache</emphasis> - PHP scripts very often include or operate
-     with files by using relative file paths. Every file path has to be normalized to
-     an absolute file path by the PHP engine. When a PHP application uses many PHP files and
-     accesses them by relative paths, the operation of resolving the paths may negatively
-     impact the application's performance. The Windows Cache Extension for PHP
-     provides a Resolve File Path cache, which is used to store the mappings between relative
-     and absolute file paths, thereby reducing the number of path resolutions that the
-     PHP engine has to perform.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <emphasis>User Cache (available since version 1.1.0)</emphasis> - PHP scripts can take advantage of
-     the shared memory cache by using the user cache API's. PHP objects and variables can be stored in the
-     user cache and then re-used on subsequent requests. This can be used to improve performance of PHP scripts
-     and to share the data across multiple PHP processes.
-    </para>
-   </listitem>
-   <listitem>
-    <para>
-     <emphasis>Session Handler (available since version 1.1.0)</emphasis> - The WinCache session handler can be used to
-     store the PHP session data in the shared memory cache. This avoids file system operations for reading
-     and writing session data, which improves performance when large amount of data is stored in PHP session.
-    </para>
-   </listitem>
-  </itemizedlist>
- </preface>
-
- &reference.wincache.setup;
- &reference.wincache.reference;
- &reference.wincache.win32build;
-
-</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/wincache/functions/wincache-fcache-fileinfo.xml b/reference/wincache/functions/wincache-fcache-fileinfo.xml
deleted file mode 100644
index f5136b4539b5..000000000000
--- a/reference/wincache/functions/wincache-fcache-fileinfo.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-fcache-fileinfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_fcache_fileinfo</refname>
-  <refpurpose>
-   Retrieves information about files cached in the file cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_fcache_fileinfo</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>summaryonly</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about file cache content and its usage.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>summaryonly</parameter></term>
-     <listitem>
-      <para>
-       Controls whether the returned array will contain information about individual cache entries 
-       along with the file cache summary.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of meta data about file cache &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>total_cache_uptime</literal> - total time in seconds that the file cache has been active
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_file_count</literal> - total number of files that are currently in the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_hit_count</literal> - number of times the files have been served from the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_miss_count</literal> - number of times the files have not been found in the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>file_entries</literal> - an array that contains the information about all the cached files:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <simpara>
-         <literal>file_name</literal> - absolute file name of the cached file
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>add_time</literal> - time in seconds since the file has been added to the file cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>use_time</literal> - time in seconds since the file has been accessed in the file cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>last_check</literal> - time in seconds since the file has been checked for modifications
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>hit_count</literal> - number of times the file has been served from the cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>file_size</literal> - size of the cached file in bytes
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_fcache_fileinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_fcache_fileinfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(   [total_cache_uptime] => 3234
-    [total_file_count] => 5
-    [total_hit_count] => 0
-    [total_miss_count] => 1
-    [file_entries] => Array
-        (
-            [1] => Array
-                (
-                    [file_name] => c:\inetpub\wwwroot\checkcache.php
-                    [add_time] => 1
-                    [use_time] => 0
-                    [last_check] => 1
-                    [hit_count] => 1
-                    [file_size] => 2435
-                )
-            [2] => Array (...iterates for each cached file)
-        )
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-fcache-meminfo.xml b/reference/wincache/functions/wincache-fcache-meminfo.xml
deleted file mode 100644
index 3af238a713fd..000000000000
--- a/reference/wincache/functions/wincache-fcache-meminfo.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-fcache-meminfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_fcache_meminfo</refname>
-  <refpurpose>
-   Retrieves information about file cache memory usage
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_fcache_meminfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   Array of meta data about file cache memory usage &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>memory_total</literal> - amount of memory in bytes allocated for the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_free</literal> - amount of free memory in bytes available for the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_used_blks</literal> - number of memory blocks used by the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_free_blks</literal> - number of free memory blocks available for the file cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_overhead</literal> - amount of memory in bytes used for the file cache internal structures
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_fcache_meminfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_fcache_meminfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [memory_total] => 134217728
-    [memory_free] => 131339120
-    [num_used_blks] => 361
-    [num_free_blks] => 3
-    [memory_overhead] => 5856
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-lock.xml b/reference/wincache/functions/wincache-lock.xml
deleted file mode 100644
index 10fd601643f8..000000000000
--- a/reference/wincache/functions/wincache-lock.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-lock" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_lock</refname>
-  <refpurpose>
-   Acquires an exclusive lock on a given key
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_lock</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>isglobal</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Obtains an exclusive lock on a given key. The execution of the current script will be blocked until the 
-   lock can be obtained. Once the lock is obtained, the other scripts that try to request the lock by using the same 
-   key will be blocked, until the current script releases the lock by using <function>wincache_unlock</function>.
-  </para>
-  <warning>
-   <simpara>
-    Using of the <function>wincache_lock</function> and <function>wincache_unlock</function> can cause deadlocks when 
-    executing PHP scripts in a multi-process environment like FastCGI. Do not use these functions unless you are 
-    absolutely sure you need to use them. For the majority of the operations on the user cache it is not necessary to
-    use these functions.
-   </simpara>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       Name of the key in the cache to get the lock on.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>isglobal</parameter></term>
-     <listitem>
-      <para>
-       Controls whether the scope of the lock is system-wide or local. Local locks are scoped to the application pool 
-       in IIS FastCGI case or to all php processes that have the same parent process 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>Using <function>wincache_lock</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$fp = fopen("/tmp/lock.txt", "r+");
-if (wincache_lock(“lock_txt_lock”)) { // do an exclusive lock
-    ftruncate($fp, 0); // truncate file
-    fwrite($fp, "Write something here\n");
-    wincache_unlock(“lock_txt_lock”); // release the lock
-} else {
-    echo "Couldn't get the lock!";
-}
-fclose($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_unlock</function></member>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_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/wincache/functions/wincache-ocache-fileinfo.xml b/reference/wincache/functions/wincache-ocache-fileinfo.xml
deleted file mode 100644
index 1dff02d61cee..000000000000
--- a/reference/wincache/functions/wincache-ocache-fileinfo.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ocache-fileinfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ocache_fileinfo</refname>
-  <refpurpose>
-   Retrieves information about files cached in the opcode cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_ocache_fileinfo</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>summaryonly</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about opcode cache content and its usage.
-  </para>
-  &warn.removed.function-7-0-0;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>summaryonly</parameter></term>
-     <listitem>
-      <para>
-       Controls whether the returned array will contain information about individual cache entries 
-       along with the opcode cache summary.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of meta data about opcode cache &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>total_cache_uptime</literal> - total time in seconds that the opcode cache has been active
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_file_count</literal> - total number of files that are currently in the opcode cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_hit_count</literal> - number of times the compiled opcode have been served from the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_miss_count</literal> - number of times the compiled opcode have not been found in the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>is_local_cache</literal> - true is the cache metadata is for a local cache instance, 
-       false if the metadata is for the global cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>file_entries</literal> - an array that contains the information about all the cached files:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <simpara>
-         <literal>file_name</literal> - absolute file name of the cached file
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>add_time</literal> - time in seconds since the file has been added to the opcode cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>use_time</literal> - time in seconds since the file has been accessed in the opcode cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>last_check</literal> - time in seconds since the file has been checked for modifications
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>hit_count</literal> - number of times the file has been served from the cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>function_count</literal> - number of functions in the cached file
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>class_count</literal> - number of classes in the cached file
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_ocache_fileinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_ocache_fileinfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [total_cache_uptime] => 17357
-    [total_file_count] => 121
-    [total_hit_count] => 36562
-    [total_miss_count] => 201
-    [file_entries] => Array
-        (
-            [1] => Array
-                (
-                    [file_name] => c:\inetpub\wwwroot\checkcache.php
-                    [add_time] => 17356
-                    [use_time] => 7
-                    [last_check] => 10
-                    [hit_count] => 454
-                    [function_count] => 0
-                    [class_count] => 1
-                )
-            [2] => Array (...iterates for each cached file)
-        )
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-ocache-meminfo.xml b/reference/wincache/functions/wincache-ocache-meminfo.xml
deleted file mode 100644
index 0406a32ba9cf..000000000000
--- a/reference/wincache/functions/wincache-ocache-meminfo.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ocache-meminfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ocache_meminfo</refname>
-  <refpurpose>
-   Retrieves information about opcode cache memory usage
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_ocache_meminfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   Array of meta data about opcode cache memory usage &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>memory_total</literal> - amount of memory in bytes allocated for the opcode cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_free</literal> - amount of free memory in bytes available for the opcode cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_used_blks</literal> - number of memory blocks used by the opcode cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_free_blks</literal> - number of free memory blocks available for the opcode cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_overhead</literal> - amount of memory in bytes used for the opcode cache internal structures
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  &warn.removed.function-7-0-0;
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_ocache_meminfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_ocache_meminfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [memory_total] => 134217728
-    [memory_free] => 112106972
-    [num_used_blks] => 15469
-    [num_free_blks] => 4
-    [memory_overhead] => 247600
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-refresh-if-changed.xml b/reference/wincache/functions/wincache-refresh-if-changed.xml
deleted file mode 100644
index a9151b4cec58..000000000000
--- a/reference/wincache/functions/wincache-refresh-if-changed.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-refresh-if-changed" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_refresh_if_changed</refname>
-  <refpurpose>
-   Refreshes the cache entries for the cached files
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_refresh_if_changed</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>files</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Refreshes the cache entries for the files, whose names were passed in the input argument. 
-   If no argument is specified then refreshes all the entries in the cache.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>files</parameter></term>
-     <listitem>
-      <para>
-       An array of file names for files that need to be refreshed. 
-       An absolute or relative file paths can be used.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   WinCache performs regular checks on the cached files to 
-   ensure that if any file has changed then the corresponding entry in the cache is 
-   updated. By default this check is performed every 30 seconds. If, for example, 
-   a PHP script updates another PHP script where the application's 
-   configuration settings are stored, then it may happen that after the 
-   configuration settings have been saved to a file, the application is still using 
-   old settings for some time until the cache is refreshed. In those cases it may be 
-   preferrable to refresh the cache right after the file has been changed. The 
-   following example shows how this can be done.
-   <example>
-    <title>A <function>wincache_refresh_if_changed</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php 
-$filename = 'C:\inetpub\wwwroot\config.php';
-$handle = fopen($filename, 'w+');
-if ($handle === FALSE) die('Failed to open file '.$filename.' for writing');
-fwrite($handle, '<?php $setting=something; ?>');
-fclose($handle);
-wincache_refresh_if_changed(array($filename));
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
-  <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_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/wincache/functions/wincache-rplist-fileinfo.xml b/reference/wincache/functions/wincache-rplist-fileinfo.xml
deleted file mode 100644
index 3bf66a9ac29a..000000000000
--- a/reference/wincache/functions/wincache-rplist-fileinfo.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-rplist-fileinfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_rplist_fileinfo</refname>
-  <refpurpose>
-   Retrieves information about resolve file path cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_rplist_fileinfo</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>summaryonly</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about cached mappings between relative file paths 
-   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>
-   Array of meta data about the resolve file path cache &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>total_file_count</literal> - total number of file path 
-       mappings stored in the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>rplist_entries</literal> - an array that contains the information about all 
-       the cached file paths:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <simpara>
-         <literal>resolve_path</literal> - path to a file
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>subkey_data</literal> - corresponding absolute path to a file
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_rplist_fileinfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_rplist_fileinfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [total_file_count] => 5
-    [rplist_entries] => Array
-        (
-            [1] => Array
-                (
-                    [resolve_path] => checkcache.php
-                    [subkey_data] => c:\inetpub\wwwroot|c:\inetpub\wwwroot\checkcache.php
-                )
-
-            [2] => Array (...iterates for each cached file)
-        )
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-rplist-meminfo.xml b/reference/wincache/functions/wincache-rplist-meminfo.xml
deleted file mode 100644
index 6e7d276f1935..000000000000
--- a/reference/wincache/functions/wincache-rplist-meminfo.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-rplist-meminfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_rplist_meminfo</refname>
-  <refpurpose>
-   Retrieves information about memory usage by the resolve file path cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_rplist_meminfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   Array of meta data that describes memory usage by resolve file path cache. &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>memory_total</literal> - amount of memory in bytes allocated for the resolve file path cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_free</literal> - amount of free memory in bytes available for the resolve file path cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_used_blks</literal> - number of memory blocks used by the resolve file path cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_free_blks</literal> - number of free memory blocks available for the resolve file path cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_overhead</literal> - amount of memory in bytes used for the internal structures of resolve file path cache
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_rplist_meminfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_rplist_meminfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [memory_total] => 9437184
-    [memory_free] => 9416744
-    [num_used_blks] => 23
-    [num_free_blks] => 1
-    [memory_overhead] => 416
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-scache-info.xml b/reference/wincache/functions/wincache-scache-info.xml
deleted file mode 100644
index 00de668e4a2a..000000000000
--- a/reference/wincache/functions/wincache-scache-info.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-scache-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_scache_info</refname>
-  <refpurpose>
-   Retrieves information about files cached in the session cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_scache_info</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>summaryonly</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about session cache content and its usage.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>summaryonly</parameter></term>
-     <listitem>
-      <para>
-       Controls whether the returned array will contain information about individual cache entries 
-       along with the session cache summary.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-  <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of meta data about session cache &return.falseforfailure;
-  </para>
-    <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>total_cache_uptime</literal> - total time in seconds that the session cache has been active
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_item_count</literal> - total number of elements that are currently in the session cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>is_local_cache</literal> - true is the cache metadata is for a local cache instance, 
-       false if the metadata is for the global cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_hit_count</literal> - number of times the data has been served from the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_miss_count</literal> - number of times the data has not been found in the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>scache_entries</literal> - an array that contains the information about all the cached items:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <simpara>
-         <literal>key_name</literal> - name of the key which is used to store the data
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>value_type</literal> - type of value stored by the key
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>use_time</literal> - time in seconds since the file has been accessed in the opcode cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>last_check</literal> - time in seconds since the file has been checked for modifications
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>ttl_seconds</literal> - time remaining for the data to live in the cache, 0 meaning infinite
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>age_seconds</literal> - time elapsed from the time data has been added in the cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>hitcount</literal> - number of times data has been served from the cache
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_scache_info</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_scache_info());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array
-(
-    [total_cache_uptime] => 17357
-    [total_file_count] => 121
-    [total_hit_count] => 36562
-    [total_miss_count] => 201
-    [scache_entries] => Array
-        (
-            [1] => Array
-                (
-                    [file_name] => c:\inetpub\wwwroot\checkcache.php
-                    [add_time] => 17356
-                    [use_time] => 7
-                    [last_check] => 10
-                    [hit_count] => 454
-                    [function_count] => 0
-                    [class_count] => 1
-                )
-            [2] => Array (...iterates for each cached file)
-        )
-)
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-scache-meminfo.xml b/reference/wincache/functions/wincache-scache-meminfo.xml
deleted file mode 100644
index b54d622d4e5a..000000000000
--- a/reference/wincache/functions/wincache-scache-meminfo.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-scache-meminfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_scache_meminfo</refname>
-  <refpurpose>
-   Retrieves information about session cache memory usage
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_scache_meminfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   Array of meta data about session cache memory usage &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>memory_total</literal> - amount of memory in bytes allocated for the session cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_free</literal> - amount of free memory in bytes available for the session cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_used_blks</literal> - number of memory blocks used by the session cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_free_blks</literal> - number of free memory blocks available for the session cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_overhead</literal> - amount of memory in bytes used for the session cache internal structures
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_scache_meminfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_scache_meminfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array 
-( 
-    [memory_total] => 5242880 
-    [memory_free] => 5215056 
-    [num_used_blks] => 6 
-    [num_free_blks] => 3 
-    [memory_overhead] => 176
-) 
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_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/wincache/functions/wincache-ucache-add.xml b/reference/wincache/functions/wincache-ucache-add.xml
deleted file mode 100644
index 6ac51d593c61..000000000000
--- a/reference/wincache/functions/wincache-ucache-add.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-add" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_add</refname>
-  <refpurpose>
-   Adds a variable in user cache only if variable does not already exist in the cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_add</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_add</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>unused</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a variable in user cache, only if this variable doesn't already exist in the cache. 
-   The added variable remains in the user cache unless its time to live expires or it is 
-   deleted by using <function>wincache_ucache_delete</function> or <function>wincache_ucache_clear</function> functions.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       Store the variable using this <parameter>key</parameter> name. If a variable with same key is already present the function
-       will fail and return &false;. <parameter>key</parameter> is case sensitive. To override the value even if 
-       <parameter>key</parameter> is present use <function>wincache_ucache_set</function> function instad. 
-       <parameter>key</parameter> can also take array of name => value pairs where names will be used as keys. 
-       This can be used to add multiple values in the cache in one operation, thus avoiding race condition.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value of a variable to store. <parameter>Value</parameter> supports all data types except resources, such as file handles.
-       This parameter is ignored if first argument is an array. A general guidance is to pass &null;
-       as <parameter>value</parameter> while using array as <parameter>key</parameter>. If <parameter>value</parameter> is an
-       object, or an array containing objects, then the objects will be serialized. See
-       <link linkend="object.sleep">__sleep()</link> for details on serializing objects.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>values</parameter></term>
-     <listitem>
-      <para>
-       Associative array of keys and values.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ttl</parameter></term>
-     <listitem>
-      <para>
-       Time for the variable to live in the cache in seconds. After the value specified in <parameter>ttl</parameter> has passed 
-       the stored variable will be deleted from the cache. This parameter takes a default value of <literal>0</literal> which means 
-       the variable will stay in the cache unless explicitly deleted by using <function>wincache_ucache_delete</function> 
-       or <function>wincache_ucache_clear</function> functions.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If <parameter>key</parameter> is string, the function returns &true; on success and &false; on failure.
-  </simpara>
-  <para>
-   If <parameter>key</parameter> is an array, the function returns:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      If all the name => value pairs in the array can be set, function returns an empty array;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-     If all the name => value pairs in the array cannot be set, function returns &false;;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      If some can be set while others cannot, function returns an array with name=>value pair for which the addition failed in the user cache.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>wincache_ucache_add</function> with <parameter>key</parameter> as a string</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-var_dump(wincache_ucache_add('foo', $bar));
-var_dump(wincache_ucache_add('foo', $bar));
-var_dump(wincache_ucache_get('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-string(3) "BAR" 
-]]>
-    </screen>    
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>wincache_ucache_add</function> with <parameter>key</parameter> as an array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$colors_array = array('green' => '5', 'Blue' => '6', 'yellow' => '7', 'cyan' => '8');
-var_dump(wincache_ucache_add($colors_array));
-var_dump(wincache_ucache_add($colors_array));
-var_dump(wincache_ucache_get('Blue'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(0) { } 
-array(4) { 
-  ["green"]=> int(-1) 
-  ["Blue"]=> int(-1) 
-  ["yellow"]=> int(-1) 
-  ["cyan"]=> int(-1) 
-} 
-string(1) "6"
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><link linkend="object.sleep">__sleep()</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/wincache/functions/wincache-ucache-cas.xml b/reference/wincache/functions/wincache-ucache-cas.xml
deleted file mode 100644
index 68045555697a..000000000000
--- a/reference/wincache/functions/wincache-ucache-cas.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-cas" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_cas</refname>
-  <refpurpose>
-   Compares the variable with old value and assigns new value to it
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_cas</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>int</type><parameter>old_value</parameter></methodparam>
-   <methodparam><type>int</type><parameter>new_value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Compares the variable associated with the <parameter>key</parameter> with <parameter>old_value</parameter> 
-   and if it matches then assigns the <parameter>new_value</parameter> to it.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that is used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>old_value</parameter></term>
-     <listitem>
-      <para>
-       Old value of the variable pointed by <parameter>key</parameter> in the user cache. 
-       The value should be of type <literal>long</literal>, otherwise the function returns 
-       &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_value</parameter></term>
-     <listitem>
-      <para>
-       New value which will get assigned to variable pointer by <parameter>key</parameter> if a 
-       match is found. The value should be of type <literal>long</literal>, otherwise 
-       the function returns &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_cas</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_set('counter', 2922);
-var_dump(wincache_ucache_cas('counter', 2922, 1));
-var_dump(wincache_ucache_get('counter'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true) 
-int(1)
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_inc</function></member>
-    <member><function>wincache_ucache_dec</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/wincache/functions/wincache-ucache-clear.xml b/reference/wincache/functions/wincache-ucache-clear.xml
deleted file mode 100644
index 1a3826a55665..000000000000
--- a/reference/wincache/functions/wincache-ucache-clear.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-clear" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_clear</refname>
-  <refpurpose>
-   Deletes entire content of the user cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_clear</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   <example>
-    <title>using <function>wincache_ucache_clear</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_set('green', 1);
-wincache_ucache_set('red', 2);
-wincache_ucache_set('orange', 4);
-wincache_ucache_set('blue', 8);
-wincache_ucache_set('cyan', 16);
-$array1 = array('green', 'red', 'orange', 'blue', 'cyan');
-var_dump(wincache_ucache_get($array1));
-var_dump(wincache_ucache_clear());
-var_dump(wincache_ucache_get($array1));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(5) { ["green"]=> int(1) 
-           ["red"]=> int(2) 
-           ["orange"]=> int(4) 
-           ["blue"]=> int(8) 
-           ["cyan"]=> int(16) } 
-bool(true) 
-bool(false) 
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_add</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_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/wincache/functions/wincache-ucache-dec.xml b/reference/wincache/functions/wincache-ucache-dec.xml
deleted file mode 100644
index 6c58a2d95ab1..000000000000
--- a/reference/wincache/functions/wincache-ucache-dec.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-dec" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_dec</refname>
-  <refpurpose>
-   Decrements the value associated with the key
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>wincache_ucache_dec</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>dec_by</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Decrements the value associated with the <parameter>key</parameter> by 1 or as specified 
-   by <parameter>dec_by</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that was used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dec_by</parameter></term>
-     <listitem>
-      <para>
-       The value by which the variable associated with the <parameter>key</parameter> will get decremented. 
-       If the argument is a floating point number it will be truncated to nearest integer. The variable 
-       associated with the <parameter>key</parameter> should be of type <literal>long</literal>, otherwise 
-       the function fails and returns &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>success</parameter></term>
-     <listitem>
-      <para>
-       Will be set to &true; on success and &false; on failure.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the decremented value on success and &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_dec</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_set('counter', 1);
-var_dump(wincache_ucache_dec('counter', 2923, $success));
-var_dump($success);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(2922) 
-bool(true)
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_inc</function></member>
-    <member><function>wincache_ucache_cas</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/wincache/functions/wincache-ucache-delete.xml b/reference/wincache/functions/wincache-ucache-delete.xml
deleted file mode 100644
index f88438023594..000000000000
--- a/reference/wincache/functions/wincache-ucache-delete.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-delete" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_delete</refname>
-  <refpurpose>
-   Deletes variables from the user cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_delete</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Deletes the elements in the user cache pointed by <parameter>key</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that was used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive. <parameter>key</parameter> can be an 
-       array of keys.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
-  <para>
-   If <parameter>key</parameter> is an array then the function returns &false; 
-   if every element of the array fails to get deleted from the user cache, otherwise returns an 
-   array which consists of all the keys that are deleted.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_delete</function> with <parameter>key</parameter> as a string</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_set('foo', 'bar');
-var_dump(wincache_ucache_delete('foo'));
-var_dump(wincache_ucache_exists('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-    </screen>    
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Using<function>wincache_ucache_delete</function> with <parameter>key</parameter> as an array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$array1 = array('green' => '5', 'blue' => '6', 'yellow' => '7', 'cyan' => '8');
-wincache_ucache_set($array1);
-$array2 = array('green', 'blue', 'yellow', 'cyan');
-var_dump(wincache_ucache_delete($array2));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) { [0]=> string(5) "green" 
-           [1]=> string(4) "blue"
-           [2]=> string(6) "yellow" 
-           [3]=> string(4) "cyan" } 
-]]>
-    </screen>    
-   </example>
-  </para>
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_delete</function> with <parameter>key</parameter> as an array where some elements cannot be deleted</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$array1 = array('green' => '5', 'blue' => '6', 'yellow' => '7', 'cyan' => '8');
-wincache_ucache_set($array1);
-$array2 = array('orange', 'red', 'yellow', 'cyan');
-var_dump(wincache_ucache_delete($array2));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(2) { [0]=> string(6) "yellow" 
-           [1]=> string(4) "cyan" }
-]]>
-    </screen>    
-   </example>
-  </para>  
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_add</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_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/wincache/functions/wincache-ucache-exists.xml b/reference/wincache/functions/wincache-ucache-exists.xml
deleted file mode 100644
index 0b8454915311..000000000000
--- a/reference/wincache/functions/wincache-ucache-exists.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-exists" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_exists</refname>
-  <refpurpose>
-   Checks if a variable exists in the user cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_exists</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Checks if a variable with the <parameter>key</parameter> exists in the user cache or not.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that was used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if variable with the <parameter>key</parameter> exitsts, 
-   otherwise returns &false;.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_exists</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-if (!wincache_ucache_exists('green'))
-    wincache_ucache_set('green', 1);
-var_dump(wincache_ucache_exists('green'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_add</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_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/wincache/functions/wincache-ucache-get.xml b/reference/wincache/functions/wincache-ucache-get.xml
deleted file mode 100644
index 88651f80dab1..000000000000
--- a/reference/wincache/functions/wincache-ucache-get.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-get" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_get</refname>
-  <refpurpose>
-   Gets a variable stored in the user cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>wincache_ucache_get</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Gets a variable stored in the user cache.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that was used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive. <parameter>key</parameter> can be an 
-       array of keys. In this case the return value will be an array of values of each element 
-       in the <parameter>key</parameter> array. If an object, or an array containing objects,
-       is returned, then the objects will be unserialized. See
-       <link linkend="object.wakeup">__wakeup()</link> for details on unserializing objects.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>success</parameter></term>
-     <listitem>
-      <para>
-       Will be set to &true; on success and &false; on failure.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If <parameter>key</parameter> is a string, the function returns the value of the variable stored with that key. 
-   The <parameter>success</parameter> is set to &true; on success and 
-   to &false; on failure.
-  </simpara>
-  <simpara>
-   The <parameter>key</parameter> is an array, the parameter <parameter>success</parameter> 
-   is always set to &true;. The returned array (name => value pairs) will 
-   contain only those name => value pairs for which the get operation in user cache was 
-   successful. If none of the keys in the key array finds a match in the user cache 
-   an empty array will be returned.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>wincache_ucache_get</function> with <parameter>key</parameter> as a string</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_add('color', 'blue');
-var_dump(wincache_ucache_get('color', $success));
-var_dump($success);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-string(4) "blue"
-bool(true)
-]]>
-    </screen>    
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>wincache_ucache_get</function> with <parameter>key</parameter> as an array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$array1 = array('green' => '5', 'Blue' => '6', 'yellow' => '7', 'cyan' => '8');
-wincache_ucache_set($array1);
-$array2 = array('green', 'Blue', 'yellow', 'cyan');
-var_dump(wincache_ucache_get($array2, $success));
-var_dump($success);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(4) { ["green"]=> string(1) "5" 
-           ["Blue"]=> string(1) "6" 
-           ["yellow"]=> string(1) "7" 
-           ["cyan"]=> string(1) "8" } 
-bool(true) 
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_add</function></member>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><link linkend="object.wakeup">__wakeup()</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/wincache/functions/wincache-ucache-inc.xml b/reference/wincache/functions/wincache-ucache-inc.xml
deleted file mode 100644
index 9d52ecfd72ca..000000000000
--- a/reference/wincache/functions/wincache-ucache-inc.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-inc" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_inc</refname>
-  <refpurpose>
-   Increments the value associated with the key
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>wincache_ucache_inc</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>inc_by</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter role="reference">success</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Increments the value associated with the <parameter>key</parameter> by 1 or as specified 
-   by <parameter>inc_by</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>key</parameter> that was used to store the variable in the cache. 
-       <parameter>key</parameter> is case sensitive.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>inc_by</parameter></term>
-     <listitem>
-      <para>
-       The value by which the variable associated with the <parameter>key</parameter> will get incremented. 
-       If the argument is a floating point number it will be truncated to nearest integer. The variable 
-       associated with the <parameter>key</parameter> should be of type <literal>long</literal>, otherwise 
-       the function fails and returns &false;.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>success</parameter></term>
-     <listitem>
-      <para>
-       Will be set to &true; on success and &false; on failure.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the incremented value on success and &false; on failure.
-  </simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_inc</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_set('counter', 1);
-var_dump(wincache_ucache_inc('counter', 2921, $success));
-var_dump($success);
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-int(2922) 
-bool(true)
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_dec</function></member>
-    <member><function>wincache_ucache_cas</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/wincache/functions/wincache-ucache-info.xml b/reference/wincache/functions/wincache-ucache-info.xml
deleted file mode 100644
index 0420be82f000..000000000000
--- a/reference/wincache/functions/wincache-ucache-info.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-info" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_info</refname>
-  <refpurpose>
-   Retrieves information about data stored in the user cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_ucache_info</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>summaryonly</parameter><initializer>&false;</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieves information about data stored in the user cache.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>summaryonly</parameter></term>
-     <listitem>
-      <para>
-       Controls whether the returned array will contain information about individual cache entries 
-       along with the user cache summary.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       The key of an entry in the user cache. If specified then the returned array will contain information 
-       only about that cache entry. If not specified and <parameter>summaryonly</parameter> is set to 
-       &false; then the returned array will contain information about all entries in the cache.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Array of meta data about user cache &return.falseforfailure;
-  </para>
-    <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>total_cache_uptime</literal> - total time in seconds that the user cache has been active
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_item_count</literal> - total number of elements that are currently in the user cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>is_local_cache</literal> - true is the cache metadata is for a local cache instance, 
-       false if the metadata is for the global cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_hit_count</literal> - number of times the data has been served from the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>total_miss_count</literal> - number of times the data has not been found in the cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <para>
-      <literal>ucache_entries</literal> - an array that contains the information about all the cached items:
-      <itemizedlist spacing="compact">
-       <listitem>
-        <simpara>
-         <literal>key_name</literal> - name of the key which is used to store the data
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>value_type</literal> - type of value stored by the key
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>use_time</literal> - time in seconds since the file has been accessed in the opcode cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>last_check</literal> - time in seconds since the file has been checked for modifications
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>is_session</literal> - indicates if the data is a session variable
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>ttl_seconds</literal> - time remaining for the data to live in the cache, 0 meaning infinite
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>age_seconds</literal> - time elapsed from the time data has been added in the cache
-        </simpara>
-       </listitem>
-       <listitem>
-        <simpara>
-         <literal>hitcount</literal> - number of times data has been served from the cache
-        </simpara>
-       </listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_ucache_info</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-wincache_ucache_get('green');
-wincache_ucache_set('green', 2922);
-wincache_ucache_get('green');
-wincache_ucache_get('green');
-wincache_ucache_get('green');
-print_r(wincache_ucache_info());
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array 
-( ["total_cache_uptime"] => int(0)
-  ["is_local_cache"] => bool(false)
-  ["total_item_count"] => int(1) 
-  ["total_hit_count"] => int(3) 
-  ["total_miss_count"] => int(1) 
-  ["ucache_entries"] => Array(1) 
-    ( [1] => Array(6)
-      ( 
-        ["key_name"] => string(5) "green"
-        ["value_type"] => string(4) "long" 
-        ["is_session"] => int(0) 
-        ["ttl_seconds"] => int(0)
-        ["age_seconds"] => int(0)
-        ["hitcount"] => int(3) 
-       ) 
-    ) 
-)
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
- 
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_ocache_meminfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-ucache-meminfo.xml b/reference/wincache/functions/wincache-ucache-meminfo.xml
deleted file mode 100644
index 82d406c2a6cf..000000000000
--- a/reference/wincache/functions/wincache-ucache-meminfo.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-meminfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_meminfo</refname>
-  <refpurpose>
-   Retrieves information about user cache memory usage
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>false</type></type><methodname>wincache_ucache_meminfo</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   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>
-   Array of meta data about user cache memory usage &return.falseforfailure;
-  </para>
-  <para>
-   The array returned by this function contains the following elements:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      <literal>memory_total</literal> - amount of memory in bytes allocated for the user cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_free</literal> - amount of free memory in bytes available for the user cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_used_blks</literal> - number of memory blocks used by the user cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>num_free_blks</literal> - number of free memory blocks available for the user cache
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      <literal>memory_overhead</literal> - amount of memory in bytes used for the user cache internal structures
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>wincache_ucache_meminfo</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<pre>
-<?php
-print_r(wincache_ucache_meminfo());
-?>
-</pre>
-
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-Array 
-( 
-    [memory_total] => 5242880 
-    [memory_free] => 5215056 
-    [num_used_blks] => 6 
-    [num_free_blks] => 3 
-    [memory_overhead] => 176
-) 
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_fcache_fileinfo</function></member>
-    <member><function>wincache_fcache_meminfo</function></member>
-    <member><function>wincache_ocache_fileinfo</function></member>
-    <member><function>wincache_rplist_fileinfo</function></member>
-    <member><function>wincache_rplist_meminfo</function></member>
-    <member><function>wincache_refresh_if_changed</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_info</function></member>
-    <member><function>wincache_scache_meminfo</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/wincache/functions/wincache-ucache-set.xml b/reference/wincache/functions/wincache-ucache-set.xml
deleted file mode 100644
index 3e38b75d139c..000000000000
--- a/reference/wincache/functions/wincache-ucache-set.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-ucache-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_ucache_set</refname>
-  <refpurpose>
-   Adds a variable in user cache and overwrites a variable if it already exists in the cache
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_set</methodname>
-   <methodparam><type>mixed</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_ucache_set</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>unused</parameter><initializer>NULL</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a variable in user cache. Overwrites a variable if it already exists in the cache. 
-   The added or updated variable remains in the user cache unless its time to live expires or it is 
-   deleted by using <function>wincache_ucache_delete</function> or <function>wincache_ucache_clear</function> functions.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       Store the variable using this <parameter>key</parameter> name. If a variable with same 
-       <parameter>key</parameter> is already present the function will overwrite the previous 
-       value with the new one. <parameter>key</parameter> is case sensitive. 
-       <parameter>key</parameter> can also take array of name => value pairs where names will be used as 
-       keys. This can be used to add multiple values in the cache in one operation, thus avoiding 
-       race condition.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value of a variable to store. <parameter>Value</parameter> supports all data types except resources, such as file handles.
-       This parameter is ignored if first argument is an array. A general guidance is to pass &null;
-       as <parameter>value</parameter> while using array as <parameter>key</parameter>. If <parameter>value</parameter> is an
-       object, or an array containing objects, then the objects will be serialized. See
-       <link linkend="object.sleep">__sleep()</link> for details on serializing objects.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>values</parameter></term>
-     <listitem>
-      <para>
-       Associative array of keys and values.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ttl</parameter></term>
-     <listitem>
-      <para>
-       Time for the variable to live in the cache in seconds. After the value specified in <parameter>ttl</parameter> has passed 
-       the stored variable will be deleted from the cache. This parameter takes a default value of <literal>0</literal> which means 
-       the variable will stay in the cache unless explicitly deleted by using <function>wincache_ucache_delete</function> 
-       or <function>wincache_ucache_clear</function> functions.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   If <parameter>key</parameter> is string, the function returns &true; on success and &false; on failure.
-  </simpara>
-  <para>
-   If <parameter>key</parameter> is an array, the function returns:
-   <itemizedlist spacing="compact">
-    <listitem>
-     <simpara>
-      If all the name => value pairs in the array can be set, function returns an empty array;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-     If all the name => value pairs in the array cannot be set, function returns &false;;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      If some can be set while others cannot, function returns an array with name=>value pair for which the addition failed in the user cache.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>wincache_ucache_set</function> with <parameter>key</parameter> as a string</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$bar = 'BAR';
-var_dump(wincache_ucache_set('foo', $bar));
-var_dump(wincache_ucache_get('foo'));
-$bar1 = 'BAR1';
-var_dump(wincache_ucache_set('foo', $bar1));
-var_dump(wincache_ucache_get('foo'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-bool(true)
-string(3) "BAR"
-bool(true)
-string(3) "BAR1"
-]]>
-    </screen>    
-   </example>
-  </para>
-  <para>
-   <example>
-    <title><function>wincache_ucache_set</function> with <parameter>key</parameter> as an array</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$colors_array = array('green' => '5', 'Blue' => '6', 'yellow' => '7', 'cyan' => '8');
-var_dump(wincache_ucache_set($colors_array));
-var_dump(wincache_ucache_set($colors_array));
-var_dump(wincache_ucache_get('Blue'));
-?>
-]]>
-    </programlisting>
-    &example.outputs;
-    <screen>
-<![CDATA[
-array(0) {}
-array(0) {}
-string(1) "6"
-]]>
-    </screen>    
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_ucache_add</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><link linkend="object.sleep">__sleep()</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/wincache/functions/wincache-unlock.xml b/reference/wincache/functions/wincache-unlock.xml
deleted file mode 100644
index 7b2ec9f31f6b..000000000000
--- a/reference/wincache/functions/wincache-unlock.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.wincache-unlock" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>wincache_unlock</refname>
-  <refpurpose>
-   Releases an exclusive lock on a given key
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>wincache_unlock</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Releases an exclusive lock that was obtained on a given key by using <function>wincache_lock</function>. 
-   If any other process was blocked waiting for the lock on this key, that process will be able to obtain 
-   the lock.
-  </para>
-  <warning>
-   <simpara>
-    Using of the <function>wincache_lock</function> and <function>wincache_unlock</function> can cause deadlocks when 
-    executing PHP scripts in a multi-process environment like FastCGI. Do not use these functions unless you are 
-    absolutely sure you need to use them. For the majority of the operations on the user cache it is not necessary to
-    use these functions.
-   </simpara>
-  </warning>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       Name of the key in the cache to release the lock on.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Using <function>wincache_unlock</function></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$fp = fopen("/tmp/lock.txt", "r+");
-if (wincache_lock(“lock_txt_lock”)) { // do an exclusive lock
-    ftruncate($fp, 0); // truncate file
-    fwrite($fp, "Write something here\n");
-    wincache_unlock(“lock_txt_lock”); // release the lock
-} else {
-    echo "Couldn't get the lock!";
-}
-fclose($fp);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>wincache_lock</function></member>
-    <member><function>wincache_ucache_set</function></member>
-    <member><function>wincache_ucache_get</function></member>
-    <member><function>wincache_ucache_delete</function></member>
-    <member><function>wincache_ucache_clear</function></member>
-    <member><function>wincache_ucache_exists</function></member>
-    <member><function>wincache_ucache_meminfo</function></member>
-    <member><function>wincache_ucache_info</function></member>
-    <member><function>wincache_scache_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/wincache/ini.xml b/reference/wincache/ini.xml
deleted file mode 100644
index 4125bcd7c818..000000000000
--- a/reference/wincache/ini.xml
+++ /dev/null
@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="wincache.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  The following table lists and explains the configuration settings 
-  provided by the WinCache extension:
- </para>
- <para>
-  <table>
-   <title>WinCache configuration options</title>
-   <tgroup cols="6">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>Minimum</entry>
-      <entry>Maximum</entry>
-      <entry>&Changeable;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><link linkend="ini.wincache.fcenabled">wincache.fcenabled</link></entry>
-      <entry>"1"</entry>
-      <entry>"0"</entry>
-      <entry>"1"</entry>      
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.fcenabledfilter">wincache.fcenabledfilter</link></entry>
-      <entry>"NULL"</entry>
-      <entry>"NULL"</entry>
-      <entry>"NULL"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.fcachesize">wincache.fcachesize</link></entry>
-      <entry>"24"</entry>
-      <entry>"5"</entry>
-      <entry>"255"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.fcndetect">wincache.fcndetect</link></entry>
-      <entry>"1"</entry>
-      <entry>"0"</entry>
-      <entry>"1"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.1.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.maxfilesize">wincache.maxfilesize</link></entry>
-      <entry>"256"</entry>
-      <entry>"10"</entry>
-      <entry>"2048"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.ocenabled">wincache.ocenabled</link></entry>
-      <entry>"1"</entry>
-      <entry>"0"</entry>
-      <entry>"1"</entry>      
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
-     </row> 
-     <row>
-      <entry><link linkend="ini.wincache.ocenabledfilter">wincache.ocenabledfilter</link></entry>
-      <entry>"NULL"</entry>
-      <entry>"NULL"</entry>
-      <entry>"NULL"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
-     </row>     
-     <row>
-      <entry><link linkend="ini.wincache.ocachesize">wincache.ocachesize</link></entry>
-      <entry>"96"</entry>
-      <entry>"15"</entry>
-      <entry>"255"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0. Removed as of 2.0.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.filecount">wincache.filecount</link></entry>
-      <entry>"4096"</entry>
-      <entry>"1024"</entry>
-      <entry>"16384"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.chkinterval">wincache.chkinterval</link></entry>
-      <entry>"30"</entry>
-      <entry>"0"</entry>
-      <entry>"300"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.ttlmax">wincache.ttlmax</link></entry>
-      <entry>"1200"</entry>
-      <entry>"0"</entry>
-      <entry>"7200"</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.enablecli">wincache.enablecli</link></entry>
-      <entry>0</entry>
-      <entry>0</entry>
-      <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.ignorelist">wincache.ignorelist</link></entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>      
-      <entry><constant>INI_ALL</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.namesalt">wincache.namesalt</link></entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.ucenabled">wincache.ucenabled</link></entry>
-      <entry>1</entry>
-      <entry>0</entry>
-      <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.1.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.ucachesize">wincache.ucachesize</link></entry>
-      <entry>8</entry>
-      <entry>5</entry>
-      <entry>85</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.1.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.scachesize">wincache.scachesize</link></entry>
-      <entry>8</entry>
-      <entry>5</entry>
-      <entry>85</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.1.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.rerouteini">wincache.rerouteini</link></entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.2.0. Removed as of 1.3.7</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.reroute_enabled">wincache.reroute_enabled</link></entry>
-      <entry>1</entry>
-      <entry>0</entry>
-      <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant>|<constant>INI_PERDIR</constant></entry>
-      <entry>Available as of WinCache 1.3.7</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.srwlocks">wincache.srwlocks</link></entry>
-      <entry>1</entry>
-      <entry>0</entry>
-      <entry>1</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.3.6.3. Removed as of 2.0.0.0</entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.wincache.filemapdir">wincache.filemapdir</link></entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>
-      <entry>NULL</entry>      
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry>Available as of WinCache 1.3.7.4</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
- 
- &ini.descriptions.title;
- 
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.wincache.fcenabled">
-    <term>
-     <parameter>wincache.fcenabled</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <simpara>Enables or disables the file cache functionality.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.fcenabledfilter">
-    <term>
-     <parameter>wincache.fcenabledfilter</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines a comma-separated list of IIS web site identifiers where file 
-      cache should be enabled or disabled. This setting works in conjunction 
-      with <literal>wincache.fcenabled</literal>: if <literal>wincache.fcenabled</literal> 
-      is set to 1, then the sites listed in the <literal>wincache.fcenabledfilter</literal>
-      will have the file cache turned off; if <literal>wincache.fcenabled</literal> 
-      is set to 0, then the sites listed in the <literal>wincache.fcenabledfilter</literal> 
-      will have the file cache turned on.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.fcachesize">
-    <term>
-     <parameter>wincache.fcachesize</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines the maximum memory size (in megabytes) that is allocated for the file cache. 
-      If the total size of all the cached files exceeds the value specified in this setting, 
-      then most stale files will be removed from the file cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.fcndetect">
-    <term>
-     <parameter>wincache.fcndetect</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <simpara>
-      Enables or disables the file change notification detection functionality. If file change 
-      notification is supported then it will be used to refresh the opcode and file cache entries
-      as soon as the corresponding files are modified on a file system. If file change notification 
-      is not supported, for example when using network file shares, then wincache will poll for 
-      file changes at regular time intervals specified by <literal>wincache.chkinterval</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.maxfilesize">
-    <term>
-     <parameter>wincache.maxfilesize</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines the maximum allowed size (in kilobytes) for a single file to be cached. 
-      If a file size exceeds the specified value, the file will not be cached. 
-      This setting applies to the file cache only.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ocenabled">
-    <term>
-     <parameter>wincache.ocenabled</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <warning xmlns="http://docbook.org/ns/docbook"><simpara>This option has been <emphasis>REMOVED</emphasis> as of 2.0.0.0</simpara></warning>
-     <simpara>Enables or disables the opcode cache functionality</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ocenabledfilter">
-    <term>
-     <parameter>wincache.ocenabledfilter</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <warning xmlns="http://docbook.org/ns/docbook"><simpara>This option has been <emphasis>REMOVED</emphasis> as of 2.0.0.0</simpara></warning>
-     <simpara>
-      Defines a comma-separated list of IIS web site identifiers where opcode 
-      cache should be enabled or disabled. This setting works in conjunction 
-      with <literal>wincache.ocenabled</literal>: if <literal>wincache.ocenabled</literal> 
-      is set to 1, then the sites listed in the <literal>wincache.ocenabledfilter</literal>
-      will have the opcode cache turned off; if <literal>wincache.ocenabled</literal> 
-      is set to 0, then the sites listed in the <literal>wincache.ocenabledfilter</literal> 
-      will have the opcode cache turned on.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ocachesize">
-    <term>
-     <parameter>wincache.ocachesize</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <warning xmlns="http://docbook.org/ns/docbook"><simpara>This option has been <emphasis>REMOVED</emphasis> as of 2.0.0.0</simpara></warning>
-     <simpara>
-      Defines the maximum memory size (in megabytes) that is allocated for the 
-      opcode cache. If the cached opcode size exceeds the specified value, 
-      then most stale opcode will be removed from the cache. Note that the opcode 
-      cache size must be at least 3 times bigger than file cache size. 
-      If that is not the case the opcode cache size will be automatically increased.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.filecount">
-    <term>
-     <parameter>wincache.filecount</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines how many files are expected to be cached by the extension, so that appropriate 
-      memory size is allocated at the startup time. If the number of files exceeds the specified 
-      value, the WinCache will re-allocate more memory as needed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.chkinterval">
-    <term>
-     <parameter>wincache.chkinterval</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines how often (in seconds) the extension checks for file changes in order 
-      to refresh the cache. Setting it to 0 will disable the refreshing of the cache. 
-      The file changes will not be reflected in the cache unless the cache entry for 
-      that file is removed by scavenger or IIS application pool is recycled or 
-      wincache_refresh_if_changed function is called.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ttlmax">
-    <term>
-     <parameter>wincache.ttlmax</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines the maximum time to live (in seconds) for a cached entry without being used. 
-      Setting it to 0 will disable the cache scavenger, so the cached entries will never
-      be removed from the cache during the lifetime of the IIS worker process.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.enablecli">
-    <term>
-     <parameter>wincache.enablecli</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines if caching is enabled when PHP is running in command line (CLI) mode.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ignorelist">
-    <term>
-     <parameter>wincache.ignorelist</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Defines a list of files that should not be cached by the extension. 
-      The files list is specified by using file names only, separated by 
-      the pipe symbol - "|".
-      <example>
-       <title><literal>wincache.ignorelist</literal> example</title>
-       <programlisting role="ini">
-<![CDATA[
-wincache.ignorelist = "index.php|misc.php|admin.php"
-]]>
-       </programlisting>
-      </example>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.namesalt">
-    <term>
-     <parameter>wincache.namesalt</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines a string that will be used when naming the extension 
-      specific objects that are stored in shared memory. This is used 
-      to avoid conflicts that may be caused if other applications within 
-      an IIS worker process tries to access shared memory. The length of 
-      the namesalt string cannot exceed 8 characters.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ucenabled">
-    <term>
-     <parameter>wincache.ucenabled</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <simpara>
-      Enables or disables the user cache functionality.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.ucachesize">
-    <term>
-     <parameter>wincache.ucachesize</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines the maximum memory size in megabytes that is allocated for the user cache. If the total 
-      size of variables stored in the user cache exceeds the specified value, then the most stale variables 
-      will be removed from the cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.scachesize">
-    <term>
-     <parameter>wincache.scachesize</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      Defines the maximum memory size in megabytes that is allocated for the session cache. If the total 
-      size of data stored in the session cache exceeds the specified value, then the most stale data 
-      will be removed from the cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.rerouteini">
-    <term>
-     <parameter>wincache.rerouteini</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <warning xmlns="http://docbook.org/ns/docbook"><simpara>
-      This option has been <emphasis>REMOVED</emphasis> as of 1.3.7.  See <literal>wincache.reroute_enabled</literal> for similar functionality as of 1.3.7.
-      </simpara></warning>
-     <simpara>
-      Specifies an absolute or a relateve path to the reroute.ini file that contains the list of PHP functions 
-      whose implementation should be replaced with the WinCache function equivalents. If a relative path is specified 
-      then it is assumed to be relative to the location of php-cgi.exe file.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.reroute_enabled">
-    <term>
-     <parameter>wincache.reroute_enabled</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <simpara>
-      Enables or disables the rerouting of certain file I/O functions through the file cache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.srwlocks">
-    <term>
-     <parameter>wincache.srwlocks</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <warning xmlns="http://docbook.org/ns/docbook"><simpara>This option has been <emphasis>REMOVED</emphasis> as of 2.0.0.0</simpara></warning>
-     <simpara>
-      Enables or disables the use of shared reader/writer locks.  Disabling is useful when troubleshooting deadlock conditions in WinCache.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.wincache.filemapdir">
-    <term>
-     <parameter>wincache.filemapdir</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <simpara>
-      Specifies an absolute path to a directory where WinCache will store the temporary files used for shared memory segments.
-     </simpara>
-     <simpara>
-      This directory must be on the local machine and not on a networked file system.
-     </simpara>
-     <simpara>
-      If the directory is not specified, WinCache will use the Windows System Page File for all shared memory segments.
-     </simpara>
-    </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/wincache/reference.xml b/reference/wincache/reference.xml
deleted file mode 100644
index eaeb30804734..000000000000
--- a/reference/wincache/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.wincache" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>WinCache &Functions;</title>
-
- &reference.wincache.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/wincache/setup.xml b/reference/wincache/setup.xml
deleted file mode 100644
index 3b80e64cc4f2..000000000000
--- a/reference/wincache/setup.xml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="wincache.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="wincache.requirements">
-  &reftitle.required;
-  <para>
-   The extension is currently supported only on the following configurations:
-  </para>
-  <simpara>Windows OS:</simpara>
-  <itemizedlist spacing="compact">
-   <listitem>
-    <simpara>Windows XP SP3 with IIS 5.1 and <link xlink:href="&url.iis.fastcgi.downloads;">FastCGI Extension</link></simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows Server 2003 with IIS 6.0 and <link xlink:href="&url.iis.fastcgi.downloads;">FastCGI Extension</link></simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows Vista SP1 with IIS 7.0 and FastCGI Module</simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows Server 2008 with IIS 7.0 and FastCGI Module</simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows 7 with IIS 7.5 and FastCGI Module</simpara>
-   </listitem>
-   <listitem>
-    <simpara>Windows Server 2008 R2 with IIS 7.5 and FastCGI Module</simpara>
-   </listitem>
-  </itemizedlist>
-  <simpara>PHP:</simpara>
-  <itemizedlist spacing="compact">
-   <listitem>
-    <simpara>PHP 5.2.X, Non-thread-safe build</simpara>
-   </listitem>
-   <listitem>
-    <simpara>PHP 5.3 X86, Non-thread-safe VC9 build</simpara>
-   </listitem>
-  </itemizedlist>
-  <note>
-   <simpara>
-    The WinCache Extension can only be used when IIS is configured to run PHP via FastCGI.
-   </simpara>
-  </note>
- </section>
- <section xml:id="wincache.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;wincache">&url.pecl.package;wincache</link>.
-  </para>
-  <para>
-   There are two packages for this extension: one package is for PHP versions 5.2.X,
-   and the other package is for PHP 5.3.X. Select the package that is appropriate for
-   the PHP version being used.
-  </para>
-  <para>
-   To install and enable the extension, follow these steps:
-  </para>
-  <procedure>
-   <step>
-    <simpara>
-     Unpack the package into some temporary location.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Copy the <filename>php_wincache.dll</filename> file into the PHP extensions folder.
-     Typically this folder is called "ext" and it is located in the same folder with all
-     PHP binary files. For example: <filename>C:\Program Files\PHP\ext</filename>.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Using a text editor, open the php.ini file, which is usually located in the
-     same folder where all PHP binary files are. For example:
-     <filename>C:\Program Files\PHP\php.ini</filename>.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Add the following line at the end of the php.ini file:
-     <literal>extension = php_wincache.dll</literal>.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Save and close the <filename>php.ini</filename> file.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Recycle the IIS Application Pools for PHP to pick up the configuration changes.
-     To check that the extension has been enabled, create a file called
-     <filename>phpinfo.php</filename> with a PHP code that calls
-     <link linkend="function.phpinfo">phpinfo</link> function.
-    </simpara>
-   </step>
-   <step>
-    <simpara>
-     Save the <filename>phpinfo.php</filename> file in the root folder of a
-     IIS web site that uses PHP, then open a browser and make a request to
-     http://localhost/phpinfo.php. Search within the returned web page
-     for a section called <literal>wincache</literal>. If the extension
-     is enabled, then the <link linkend="function.phpinfo">phpinfo</link>
-     output will list the configuration settings provided by the WinCache.
-    </simpara>
-   </step>
-  </procedure>
-  <note>
-   <simpara>
-    Do not forget to remove <filename>phpinfo.php</filename> file from the web
-    site's root folder after verifying that extension has been enabled.
-   </simpara>
-  </note>
- </section>
- &reference.wincache.ini;
-
- <section xml:id="wincache.stats">
-  <title>WinCache Statistics Script</title>
-  <para>
-   The installation package for WinCache includes a PHP script,
-   <filename>wincache.php</filename>, that can be used to obtain cache information
-   and statistics.
-  </para>
-  <para>
-   If the WinCache extension was installed via the Microsoft Web Platform Installer,
-   then this script is located in
-   <filename>%SystemDrive%\Program Files\IIS\Windows Cache for PHP\</filename>.
-   On a 64-bit version of the Windows Server operating system, the script is located in
-   <filename>%SystemDrive%\Program Files (x86)\IIS\Windows Cache for PHP</filename>.
-   If the extension was installed manually, then the <filename>wincache.php</filename>
-   will be located in the same folder from which the content of the installation package was extracted.
-  </para>
-  <para>
-   To use <filename>wincache.php</filename>, copy it into a root folder of a Web site or
-   into any subfolder. To protect the script, open it in any text editor and replace the values for
-   <emphasis>USERNAME</emphasis> and <emphasis>PASSWORD</emphasis> constants.
-   If any other IIS authentication is enabled on the server, then
-   follow the instructions in the comments:
-   <example>
-    <title>Authentication configuration for <filename>wincache.php</filename></title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * ======================== CONFIGURATION SETTINGS ==============================
- * If you do not want to use authentication for this page, set USE_AUTHENTICATION to 0.
- * If you use authentication then replace the default password.
- */
-define('USE_AUTHENTICATION', 1);
-define('USERNAME', 'wincache');
-define('PASSWORD', 'wincache');
-
-/**
- * The Basic PHP authentication will work only when IIS is configured to support
- * Anonymous Authentication' and nothing else. If IIS is configured to support/use
- * any other kind of authentication like Basic/Negotiate/Digest etc, this will not work.
- * In that case use the array below to define the names of users in your
- * domain/network/workgroup which you want to grant access to.
- */
-$user_allowed = array('DOMAIN\user1', 'DOMAIN\user2', 'DOMAIN\user3');
-
-/**
- * If the array contains string 'all', then all the users authenticated by IIS
- * will have access to the page. Uncomment the below line and comment above line
- * to grant access to all users who gets authenticated by IIS.
- */
-/* $user_allowed = array('all'); */
-
-/** ===================== END OF CONFIGURATION SETTINGS ========================== */
-?>
-]]>
-    </programlisting>
-   </example>
-   <note>
-    <simpara>
-     Always protect the <filename>wincache.php</filename> script by using either
-     the built-in authentication or the server's authentication mechanism.
-     Leaving this script unprotected may compromise the security of your
-     web application and web server.
-    </simpara>
-   </note>
-  </para>
- </section>
-  <section xml:id="wincache.sessionhandler">
-  <title>WinCache Session Handler</title>
-  <para>
-   The WinCache session handler (available since WinCache 1.1.0) can be used to configure PHP to store the session data in shared memory session cache.
-   Using shared memory instead of the default file session storage helps improve performance of PHP applications
-   that store large amount of data in session objects. Wincache session cache uses file-backed shared memory, which ensures
-   that the session data is not lost during recycling of IIS application pools.
-  </para>
-  <para>
-   To configure PHP to use WinCache session handler set the <filename>php.ini</filename> setting
-   <link linkend="ini.session.save-handler">session.save_handler</link> to <emphasis>wincache</emphasis>.
-   By default the Windows temporary file location is used for storing the
-   session data. To change the location of the session file use
-   <link linkend="ini.session.save-path">session.save_path</link> directive.
-   <example>
-    <title>Enabling WinCache session handler</title>
-    <programlisting role="php.ini">
-<![CDATA[
-session.save_handler = wincache
-session.save_path = C:\inetpub\temp\session\
-]]>
-    </programlisting>
-   </example>
-  </para>
- </section>
- <section xml:id="wincache.reroutes">
-  <title>WinCache Functions Reroutes</title>
-  <para>
-   <emphasis>NOTE:</emphasis> <link linkend="ini.wincache.rerouteini">wincache.rerouteini</link> was removed as of
-   WinCache 1.3.7.0.  It has been replaced with automatic function reroutes.  See:
-   <link linkend="ini.wincache.reroute_enabled">wincache.reroute_enabled</link>.
-  </para>
-  <para>
-   The WinCache functions reroutes (available since WinCache 1.2.0, removed since WinCache 1.3.7.0) can be used to replace built-in PHP functions with their equivalents
-   that are optimized for a particular purpose. WinCache extension includes Windows-optimized implementation of PHP file functions that
-   may improve performance of PHP applications in cases when PHP has to access files on network shares. The optimized implementation is
-   provided for the following functions:
-  </para>
-  <itemizedlist spacing="compact">
-   <listitem>
-    <simpara>
-     <link linkend="function.file-exists">file_exists</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.file-get-contents">file_get_contents</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.readfile">readfile</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.is-readable">is_readable</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.is-writable">is_writable</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.is-dir">is_dir</link>
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <link linkend="function.realpath">realpath</link>
-    </simpara>
-   </listitem>
-      <listitem>
-    <simpara>
-     <link linkend="function.filesize">filesize</link>
-    </simpara>
-   </listitem>
-  </itemizedlist>
-  <para>
-   To configure WinCache to use the functions reroutes use the file <filename>reroute.ini</filename> that is included in
-   WinCache installation package. Copy this file into the same directory where <filename>php.ini</filename>
-   file is located. After that add the wincache.rerouteini setting in <filename>php.ini</filename>
-   and specify an absolute or relative path to the <filename>reroute.ini</filename> file.
-   <example>
-    <title>Enabling WinCache functions reroutes</title>
-    <programlisting role="php.ini">
-<![CDATA[
-wincache.rerouteini = C:\PHP\reroute.ini
-]]>
-    </programlisting>
-   </example>
-  </para>
-  <note>
-   <simpara>
-    If WinCache functions reroutes are enabled it is recommended to increase the WinCache file cache size. This
-    can be done by using <link linkend="ini.wincache.fcachesize">wincache.fcachesize</link> setting.
-   </simpara>
-  </note>
-  <para>
-   The <filename>reroute.ini</filename> file contains the mappings between the native PHP functions and
-   their equivalents in WinCache. Each line in the file defines a mapping by using the following syntax:
-  </para>
-  <simpara>
-   <literal>&lt;PHP function name&gt;:[&lt;number of function parameters&gt;]=&lt;wincache function name&gt;</literal>
-  </simpara>
-  <para>
-   The example of the file is shown below. In this example the calls to PHP function <function>file_get_contents</function>
-   will be replaced with calls to <function>wincache_file_get_contents</function> only if the number of parameters passed to
-   the function is less than or equals to 2. Specifying the number of parameters is useful when replacement function
-   does not handle all the function's parameters.
-   <example>
-    <title>Reroute.ini file content</title>
-    <programlisting role="php.ini">
- <![CDATA[
-[FunctionRerouteList]
-file_exists=wincache_file_exists
-file_get_contents:2=wincache_file_get_contents
-readfile:2=wincache_readfile
-is_readable=wincache_is_readable
-is_writable=wincache_is_writable
-is_writeable=wincache_is_writable
-is_file=wincache_is_file
-is_dir=wincache_is_dir
-realpath=wincache_realpath
-filesize=wincache_filesize
-]]>
-    </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/wincache/versions.xml b/reference/wincache/versions.xml
deleted file mode 100644
index d75879822cc4..000000000000
--- a/reference/wincache/versions.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='wincache_fcache_fileinfo' from='PECL wincache &gt;= 1.0.0'/>
- <function name='wincache_fcache_meminfo' from='PECL wincache &gt;= 1.0.0'/>
- <function name='wincache_ocache_fileinfo' from='PECL wincache &gt;= 1.0.0' deprecated='PECL wincache = 2.0.0.0'/>
- <function name='wincache_ocache_meminfo' from='PECL wincache &gt;= 1.0.0' deprecated='PECL wincache = 2.0.0.0'/>
- <function name='wincache_rplist_fileinfo' from='PECL wincache &gt;= 1.0.0'/>
- <function name='wincache_rplist_meminfo' from='PECL wincache &gt;= 1.0.0'/>
- <function name='wincache_refresh_if_changed' from='PECL wincache &gt;= 1.0.0'/>
- <function name='wincache_ucache_add' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_set' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_get' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_clear' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_delete' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_exists' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_inc' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_dec' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_cas' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_info' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_ucache_meminfo' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_scache_info' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_scache_meminfo' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_lock' from='PECL wincache &gt;= 1.1.0'/>
- <function name='wincache_unlock' from='PECL wincache &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/wincache/win32build.xml b/reference/wincache/win32build.xml
deleted file mode 100644
index 4b16fdcaacd7..000000000000
--- a/reference/wincache/win32build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="wincache.win32build" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Building for Windows</title>
-  <section xml:id="wincache.win32build.prereq">
-   <title>Prerequisites</title>
-   <para>
-    Building WinCache extension will require:
-   </para>
-   <orderedlist spacing="compact">
-    <listitem>
-     <simpara>PHP source code</simpara>
-    </listitem>
-    <listitem>
-     <simpara>PHP build environment</simpara>
-    </listitem>
-    <listitem>
-     <simpara>WinCache source code</simpara>
-    </listitem>
-   </orderedlist>
-   <para>
-    For completing first two steps, follow the step-by-step guide for how 
-    to <link xlink:href="&url.php.win.build;">build PHP on Windows</link>.
-   </para>
-   <para>
-    For getting the WinCache source code follow the instructions described in 
-    <link linkend="install.pecl.downloads">Downloading PECL extensions</link>.
-   </para>
-  </section>
-  <section xml:id="wincache.win32build.building">
-   <title>Compiling and building</title>
-   <para>
-    The following steps describe how to compile and build WinCache on Windows OS:
-   </para>
-   <procedure>
-    <step>
-     <simpara>Open a command prompt which is used to build PHP</simpara>
-    </step>
-    <step>
-     <simpara>Go to the root folder where PHP sources are present</simpara>
-    </step>
-    <step>
-     <para>
-      Run the command:
-      <programlisting role="cmd">
-<![CDATA[
-cscript.exe win32\build\buildconf.js
-]]>
-      </programlisting>
-     </para>
-    </step>
-    <step>
-     <para>
-      Run the command:
-      <programlisting role="cmd">
-<![CDATA[
-configure.bat --help
-]]>
-      </programlisting>
-      The output will contain a new flag <literal>--enable-wincache</literal>.
-     </para>
-    </step>
-    <step>
-     <para>
-      Run the command:
-      <programlisting role="cmd">
-<![CDATA[
-configure.js [all options used to build PHP] --enable-wincache
-]]>
-      </programlisting>
-      <literal>--enable-wincache</literal> is the only extra option which is 
-      required to ensure that WinCache extension gets built properly. 
-      This option will build WinCache and will statically link it with PHP dll. 
-      To build WinCache extension as a stand-alone DLL use the option 
-      <literal>--enable-wincache=shared</literal>.
-     </para>
-    </step>
-    <step>
-     <para>
-      Run the command:
-      <programlisting role="cmd">
-<![CDATA[
-nmake
-]]>
-      </programlisting>
-     </para>
-    </step>
-   </procedure>
-  </section>
-  <section xml:id="wincache.win32build.verify">
-   <title>Verifying the build</title>
-   <para>
-    The following steps describe how to verify that WinCache has been built correctly:
-   </para>
-   <procedure>
-    <step>
-     <simpara>
-      Go to the folder where the PHP binaries are built
-     </simpara>
-    </step>
-    <step>
-     <para>
-      Run the command:
-      <programlisting role="cmd">
-<![CDATA[
-php.exe -n -d extension=php_wincache.dll -re wincache
-]]>
-      </programlisting>
-      If WinCache has been built properly, the output of this command will
-      list the INI directives and functions supported by WinCache.
-     </para>
-    </step>
-   </procedure>
-  </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/wkhtmltox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/wkhtmltox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/wkhtmltox/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/wkhtmltox/book.xml b/reference/wkhtmltox/book.xml
deleted file mode 100644
index 4a79d0cc5f3c..000000000000
--- a/reference/wkhtmltox/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<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>
-
- <preface xml:id="intro.wkhtmltox">
-  &reftitle.intro;
-  <para>
-  libwkhtmltox is an open source LGPLv3 library for rendering HTML into PDF and various image formats 
-  using the QtWebKit rendering engine.
-  </para>
- </preface>
-
- &reference.wkhtmltox.setup;
-
- &reference.wkhtmltox.wkhtmltox.pdf.converter;
- &reference.wkhtmltox.wkhtmltox.pdf.object;
-
- &reference.wkhtmltox.wkhtmltox.image.converter;
-</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/wkhtmltox/configure.xml b/reference/wkhtmltox/configure.xml
deleted file mode 100644
index 89005f44e28d..000000000000
--- a/reference/wkhtmltox/configure.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="wkhtmltox.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Use <option role="configure">--with-wkhtmltox[=DIR]</option> when compiling PHP.
- </para>
-
- <!--
- <para>
-  Windows users should include <filename>php_wkhtmltox.dll</filename> into &php.ini;
- </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/wkhtmltox/ini.xml b/reference/wkhtmltox/ini.xml
deleted file mode 100644
index fbdce8e2e311..000000000000
--- a/reference/wkhtmltox/ini.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="wkhtmltox.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-  <title>wkhtmltox &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.wkhtmltox.graphics">wkhtmltox.graphics</link></entry>
-    <entry>Off</entry>
-    <entry><constant>INI_SYSTEM</constant>|<constant>INI_PERDIR</constant></entry>
-    <entry>&gt;= 0.3.2</entry>
-   </row>
-  </tbody>
-  </tgroup>
-  </table>
-  &ini.php.constants;
- </para>
- 
- &ini.descriptions.title;
- 
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.wkhtmltox.graphics">
-    <term>
-     <parameter>wkhtmltox.graphics</parameter>
-     <type>bool</type>
-    </term>
-    <listitem>
-     <para>
-      Allow libwkhtmltox to use graphics.
-     </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/wkhtmltox/setup.xml b/reference/wkhtmltox/setup.xml
deleted file mode 100644
index 6cdba5992853..000000000000
--- a/reference/wkhtmltox/setup.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="wkhtmltox.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="wkhtmltox.requirements">
-  &reftitle.required;
-  <para>
-  libwkhtmltox source and binary releases are distributed at <link xlink:href="&url.wkhtmltopdf;">wkhtmltopdf.org</link>.
-  </para>
-  <caution>
-   <para>
-   Windows users need to take the additional step of adding <filename>wkhtmltox.dll</filename> to their <envar>PATH</envar>.
-   </para>
-  </caution>
- </section>
-
- <section xml:id="wkhtmltox.installation">
-  &reftitle.install;
-  <para>
-   The source code of this extension, and binaries for Windows are hosted by <link xlink:href="&url.git.hub;krakjoe/wkhtmltox">github</link>,
-  </para>
-  <para>
-   Fetching the source code and building the extension:
-   <screen>
-   <![CDATA[
-git clone https://github.com/krakjoe/wkhtmltox
-cd wkhtmltox
-phpize
-./configure --with-wkhtmltox=/path/to/wkhtmltox/installation
-make
-sudo make install
-   ]]>
-   </screen>
-  </para>
-  <para>
-  Fetching updates and rebuilding the extension:
-   <screen>
-   <![CDATA[
-cd wkhtmltox
-phpize --clean
-git pull origin master
-phpize
-./configure --with-wkhtmltox=/path/to/wkhtmltox/installation
-make
-sudo make install
-   ]]>
-   </screen>
-  </para>
- </section>
-
- &reference.wkhtmltox.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/wkhtmltox/versions.xml b/reference/wkhtmltox/versions.xml
deleted file mode 100644
index f6c0561a5b94..000000000000
--- a/reference/wkhtmltox/versions.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='wkhtmltox\pdf\converter' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\pdf\converter::__construct' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\pdf\converter::add' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\pdf\converter::convert' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\pdf\converter::getversion' from='wkhtmltox &gt;= 0.3.2'/>
-
- <function name='wkhtmltox\pdf\object' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\pdf\object::__construct' from='wkhtmltox &gt;= 0.1.0'/>
-
- <function name='wkhtmltox\image\converter' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\image\converter::__construct' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\image\converter::convert' from='wkhtmltox &gt;= 0.1.0'/>
- <function name='wkhtmltox\image\converter::getversion' from='wkhtmltox &gt;= 0.3.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/wkhtmltox/wkhtmltox.image.converter.xml b/reference/wkhtmltox/wkhtmltox.image.converter.xml
deleted file mode 100644
index 5b7c4474e9d2..000000000000
--- a/reference/wkhtmltox/wkhtmltox.image.converter.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.wkhtmltox-image-converter" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The wkhtmltox\Image\Converter class</title>
- <titleabbrev>wkhtmltox\Image\Converter</titleabbrev>
-
- <partintro>
-
-<!-- {{{ wkhtmltox\Image\Converter intro -->
-  <section xml:id="wkhtmltox-image-converter.intro">
-   &reftitle.intro;
-   <para>
-    Converts an HTML input into various image formats
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="wkhtmltox-image-converter.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>wkhtmltox\Image\Converter</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>wkhtmltox\Image\Converter</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-image-converter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-image-converter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.wkhtmltox.wkhtmltox.image.entities.converter;
-
-</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/wkhtmltox/wkhtmltox.pdf.converter.xml b/reference/wkhtmltox/wkhtmltox.pdf.converter.xml
deleted file mode 100644
index 8fdf42f543c5..000000000000
--- a/reference/wkhtmltox/wkhtmltox.pdf.converter.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.wkhtmltox-pdf-converter" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The wkhtmltox\PDF\Converter class</title>
- <titleabbrev>wkhtmltox\PDF\Converter</titleabbrev>
-
- <partintro>
-
-<!-- {{{ wkhtmltox\PDF\Converter intro -->
-  <section xml:id="wkhtmltox-pdf-converter.intro">
-   &reftitle.intro;
-   <para>
-    Converts an HTML input, or set of HTML inputs, into PDF output
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="wkhtmltox-pdf-converter.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>wkhtmltox\PDF\Converter</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>wkhtmltox\PDF\Converter</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-pdf-converter')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-pdf-converter')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.wkhtmltox.wkhtmltox.pdf.entities.converter;
-
-</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/wkhtmltox/wkhtmltox.pdf.object.xml b/reference/wkhtmltox/wkhtmltox.pdf.object.xml
deleted file mode 100644
index f27a3071835b..000000000000
--- a/reference/wkhtmltox/wkhtmltox.pdf.object.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.wkhtmltox-pdf-object" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The wkhtmltox\PDF\Object class</title>
- <titleabbrev>wkhtmltox\PDF\Object</titleabbrev>
-
- <partintro>
-
-<!-- {{{ wkhtmltox\PDF\Object intro -->
-  <section xml:id="wkhtmltox-pdf-object.intro">
-   &reftitle.intro;
-   <para>
-    Represents an HTML document, input to PDF converter
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="wkhtmltox-pdf-object.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>wkhtmltox\PDF\Object</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>wkhtmltox\PDF\Object</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">Constructor</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-pdf-object')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    
-   <!--
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.wkhtmltox-pdf-object')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   -->
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.wkhtmltox.wkhtmltox.pdf.entities.object;
-
-</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/wkhtmltox/wkhtmltox/image/converter/construct.xml b/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
deleted file mode 100644
index c865a7398e8f..000000000000
--- a/reference/wkhtmltox/wkhtmltox/image/converter/construct.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-image-converter.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <refnamediv>
-  <refname>wkhtmltox\Image\Converter::__construct</refname>
-  <refpurpose>Create a new Image converter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>wkhtmltox\Image\Converter::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>buffer</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>settings</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-  Creates an Image converter, optionally taking an input buffer and configuration settings
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <para>
-      HTML
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title></title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Name</entry>
-          <entry>Description</entry>
-          <entry>Values</entry>
-          <entry>Changelog</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>in</entry>
-          <entry>URL or path of the input file, if "-" stdin is used</entry>
-          <entry>/path/to/markup.html</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>out</entry>
-          <entry>path of output file, if "-" stdout is used, by default an internal buffer is used</entry>
-          <entry>/path/to/output.png</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>fmt</entry>
-          <entry>output format to use</entry>
-          <entry>
-           <table>
-            <title></title>
-            <tgroup cols="2">
-             <tbody>
-              <row>
-               <entry>""</entry>
-               <entry>default</entry>
-              </row>
-              <row>
-               <entry>jpg</entry>
-               <entry>output as JPEG</entry>
-              </row>
-              <row>
-               <entry>png</entry>
-               <entry>output as PNG</entry>
-              </row>
-              <row>
-               <entry>bmp</entry>
-               <entry>output as bitmap</entry>
-              </row>
-              <row>
-               <entry>svg</entry>
-               <entry>output as SVG</entry>
-              </row>
-             </tbody>
-            </tgroup>
-           </table>
-          </entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>transparent</entry>
-          <entry>when outputting a PNG or SVG, make the white background transparent</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>screenWidth</entry>
-          <entry>the with of the screen used to render in pixels</entry>
-          <entry>800</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>smartWidth</entry>
-          <entry>when true, screenWidth is expanded to the content width</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>quality</entry>
-          <entry>compression factor to use when outputting a JPEG image</entry>
-          <entry>94</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>crop.left</entry>
-          <entry>left/x coordinate of the window to capture in pixels</entry>
-          <entry>200</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>crop.top</entry>
-          <entry>top/y coordinate of the window to capture in pixels</entry>
-          <entry>200</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>crop.width</entry>
-          <entry>width of the window to capture in pixels</entry>
-          <entry>200</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>crop.height</entry>
-          <entry>height of the window to capture in pixels</entry>
-          <entry>200</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-           <entry>load.cookieJar</entry>
-           <entry>path of file used to load and store cookies</entry>
-           <entry>/tmp/cookies.txt</entry>
-           <entry>&gt;= 0.1.0</entry>
-         </row>
-         <xi:include xpointer="xpointer(
-          id('wkhtmltox-pdf-object.construct..settings.load.username') |
-          id('wkhtmltox-pdf-object.construct..settings.load.username')/following-sibling::*)"/>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/image/converter/convert.xml b/reference/wkhtmltox/wkhtmltox/image/converter/convert.xml
deleted file mode 100644
index 9551b82f3728..000000000000
--- a/reference/wkhtmltox/wkhtmltox/image/converter/convert.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-image-converter.convert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\Image\Converter::convert</refname>
-  <refpurpose>Perform Image conversion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>wkhtmltox\Image\Converter::convert</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Performs conversion of the input buffer
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Where the return value is used, it will be populated with the contents of the conversion buffer
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/image/converter/getversion.xml b/reference/wkhtmltox/wkhtmltox/image/converter/getversion.xml
deleted file mode 100644
index 94f331a70912..000000000000
--- a/reference/wkhtmltox/wkhtmltox/image/converter/getversion.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-image-converter.getversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\Image\Converter::getVersion</refname>
-  <refpurpose>Determine version of Converter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>wkhtmltox\Image\Converter::getVersion</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Determines the version of Converter as reported by libwkhtmltox
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a version string
-  </para>
-  <warning>
-   <para>
-    This is not yet implemented by libwkhtmltox
-   </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/pdf/converter/add.xml b/reference/wkhtmltox/wkhtmltox/pdf/converter/add.xml
deleted file mode 100644
index 5b5df64f1a57..000000000000
--- a/reference/wkhtmltox/wkhtmltox/pdf/converter/add.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-pdf-converter.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\PDF\Converter::add</refname>
-  <refpurpose>Add an object for conversion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>wkhtmltox\PDF\Converter::add</methodname>
-   <methodparam><type>wkhtmltox\PDF\Object</type><parameter>object</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-  Adds the given object to conversion
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>object</parameter></term>
-    <listitem>
-     <para>
-      The object to add
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <!--
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
- -->
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/pdf/converter/construct.xml b/reference/wkhtmltox/wkhtmltox/pdf/converter/construct.xml
deleted file mode 100644
index 2c50157feeb6..000000000000
--- a/reference/wkhtmltox/wkhtmltox/pdf/converter/construct.xml
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-pdf-converter.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\PDF\Converter::__construct</refname>
-  <refpurpose>Create a new PDF converter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>wkhtmltox\PDF\Converter::__construct</methodname>
-   <methodparam choice="opt"><type>array</type><parameter>settings</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-  Creates a PDF converter, using optional configuration settings
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title></title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Name</entry>
-          <entry>Description</entry>
-          <entry>Values</entry>
-          <entry>Changelog</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>size.pageSize</entry>
-          <entry>paper size of output document</entry>
-          <entry>A4</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>size.width</entry>
-          <entry>with of the output document</entry>
-          <entry>210mm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>size.height</entry>
-          <entry>height of the output document</entry>
-          <entry>297mm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>orientation</entry>
-          <entry>orientation of the output document</entry>
-          <entry>
-           <table>
-            <title></title>
-            <tgroup cols="1">
-             <tbody>
-              <row>
-               <entry>Landscape</entry>
-              </row>
-              <row>
-               <entry>Portrait</entry>
-              </row>
-             </tbody>
-            </tgroup>
-           </table>
-          </entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>colorMode</entry>
-          <entry>color mode of the output document</entry>
-          <entry>
-           <table>
-            <title></title>
-            <tgroup cols="1">
-             <tbody>
-              <row>
-               <entry>Color</entry>
-              </row>
-              <row>
-               <entry>Greyscale</entry>
-              </row>
-             </tbody>
-            </tgroup>
-           </table>
-          </entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>resolution</entry>
-          <entry>resolution of the output document</entry>
-          <entry>most likely has no effect</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>dpi</entry>
-          <entry>dpi to use while printing</entry>
-          <entry>80</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>pageOffset</entry>
-          <entry>integer added to page numbers generating headers, footers, and toc</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>copies</entry>
-          <entry></entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>collate</entry>
-          <entry>collate copies</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>outline</entry>
-          <entry>generate PDF outline</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>outlineDepth</entry>
-          <entry>maximum depth of outline</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>dumpOutline</entry>
-          <entry>path of file to dump outline XML</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>out</entry>
-          <entry>path of output file, if "-" stdout is used</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>documentTitle</entry>
-          <entry>title for the output document</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>useCompression</entry>
-          <entry>enable or disable lossless compression</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>margin.top</entry>
-          <entry>size of the top margin</entry>
-          <entry>2cm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>margin.bottom</entry>
-          <entry>size of the bottom margin</entry>
-          <entry>2cm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>margin.left</entry>
-          <entry>size of the left margin</entry>
-          <entry>2cm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>margin.right</entry>
-          <entry>size of the right margin</entry>
-          <entry>2cm</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>imageDPI</entry>
-          <entry>maximum DPI for images in the output document</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>imageQuality</entry>
-          <entry>the jpeg compression factor for images in the output document</entry>
-          <entry>94</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-           <entry>load.cookieJar</entry>
-           <entry>path of file used to load and store cookies</entry>
-           <entry>/tmp/cookies.txt</entry>
-           <entry>&gt;= 0.1.0</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/pdf/converter/convert.xml b/reference/wkhtmltox/wkhtmltox/pdf/converter/convert.xml
deleted file mode 100644
index 0b5d194366a1..000000000000
--- a/reference/wkhtmltox/wkhtmltox/pdf/converter/convert.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-pdf-converter.convert" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\PDF\Converter::convert</refname>
-  <refpurpose>Perform PDF conversion</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>wkhtmltox\PDF\Converter::convert</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Performs conversion of all previously added Objects
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Where the return value is used, it will be populated with the contents of the conversion buffer
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/wkhtmltox/wkhtmltox/pdf/converter/getversion.xml b/reference/wkhtmltox/wkhtmltox/pdf/converter/getversion.xml
deleted file mode 100644
index 34091e28554b..000000000000
--- a/reference/wkhtmltox/wkhtmltox/pdf/converter/getversion.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-pdf-converter.getversion" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\PDF\Converter::getVersion</refname>
-  <refpurpose>Determine version of Converter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>wkhtmltox\PDF\Converter::getVersion</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-  Determines the version of Converter as reported by libwkhtmltox
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a version 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/wkhtmltox/wkhtmltox/pdf/object/construct.xml b/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
deleted file mode 100644
index a2e01b4aefbd..000000000000
--- a/reference/wkhtmltox/wkhtmltox/pdf/object/construct.xml
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="wkhtmltox-pdf-object.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>wkhtmltox\PDF\Object::__construct</refname>
-  <refpurpose>Create a new PDF Object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>wkhtmltox\PDF\Object::__construct</methodname>
-   <methodparam><type>string</type><parameter>buffer</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>settings</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-  Creates a new PDF Object from the given buffer and optional configuration settings
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>buffer</parameter></term>
-    <listitem>
-     <para>
-      HTML
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>settings</parameter></term>
-    <listitem>
-     <para>
-      <table>
-       <title></title>
-       <tgroup cols="4">
-        <thead>
-         <row>
-          <entry>Name</entry>
-          <entry>Description</entry>
-          <entry>Values</entry>
-          <entry>Changelog</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>page</entry>
-          <entry>URL or path of the HTML to convert</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>useExternalLinks</entry>
-          <entry>set true to convert external links in the input into external PDF links in the output</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>useLocalLinks</entry>
-          <entry>set true to convert internal links in the input into internal PDF links in the output</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>produceForms</entry>
-          <entry>set true to turn HTML forms into PDF forms</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>replacements</entry>
-          <entry>undocumented</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>includeInOutline</entry>
-          <entry>set true to include sections from this object in the outline and toc</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>pagesCount</entry>
-          <entry>set true to make page count in toc inclusive of the number of pages in this object</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>tocXsl</entry>
-          <entry>set to style sheet to convert this object into a toc object</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.useDottedLines</entry>
-          <entry>set true to use dotted lines in toc</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.captionText</entry>
-          <entry>the caption text for toc</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.forwardLinks</entry>
-          <entry>set true to create links from toc to content</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.backLinks</entry>
-          <entry>set true to create links from content to toc</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.indentation</entry>
-          <entry>indentation for toc</entry>
-          <entry>2em</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>toc.fontScale</entry>
-          <entry>the factor to scale down the font at every toc level</entry>
-          <entry>0.8</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.fontSize</entry>
-          <entry>font size for use in header</entry>
-          <entry>13</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.fontName</entry>
-          <entry>name of font for use in header</entry>
-          <entry>times</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.left</entry>
-          <entry>text for left of header</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.center</entry>
-          <entry>text for center of header</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.right</entry>
-          <entry>text for right of header</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.line</entry>
-          <entry>enable or disable horizontal rule under header</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.spacing</entry>
-          <entry>space between header and content</entry>
-          <entry>1.8</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>header.htmlUrl</entry>
-          <entry>URL or path of HTML to use in header</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.fontSize</entry>
-          <entry>font size for use in footer</entry>
-          <entry>13</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.fontName</entry>
-          <entry>name of font for use in footer</entry>
-          <entry>times</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.left</entry>
-          <entry>text for left of footer</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.center</entry>
-          <entry>text for center of footer</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.right</entry>
-          <entry>text for right of footer</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.line</entry>
-          <entry>enable or disable horizontal rule under footer</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.spacing</entry>
-          <entry>space between footer and content</entry>
-          <entry>1.8</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>footer.htmlUrl</entry>
-          <entry>URL or path of HTML to use in footer</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row xml:id="wkhtmltox-pdf-object.construct..settings.load.username">
-          <entry>load.username</entry>
-          <entry>user name to use when loging into a website</entry>
-          <entry>bart</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.password</entry>
-          <entry>the password to used when logging into a website</entry>
-          <entry>elbarto</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.jsdelay</entry>
-          <entry>the amount of time in milliseconds to wait after a page is loaded until it is captured</entry>
-          <entry>1200</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.zoomFactor</entry>
-          <entry>how much zoom should be applied to the content</entry>
-          <entry>2.2</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.customHeaders</entry>
-          <entry>custom headers to send when requesting the main web page</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.repertCustomHeaders</entry>
-          <entry>set true to send with all requests</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.cookies</entry>
-          <entry>cookie string to send when requesting the main web page</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.post</entry>
-          <entry>post string to send when requesting the main web page</entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.blockLocalFileAccess</entry>
-          <entry>disallow local and piped files to access other local files</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.stopSlowScript</entry>
-          <entry>stop slow running javascript</entry>
-          <entry>boolean</entry>
-          <entry></entry>
-         </row>
-         <row>
-          <entry>load.debugJavascript</entry>
-          <entry>allow javascript to raise warnings</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.loadErrorHandling</entry>
-          <entry>set error handling strategy</entry>
-          <entry>
-            <table>
-             <title></title>
-             <tgroup cols="2">
-              <tbody>
-               <row>
-               <entry>abort</entry>
-               <entry>abort the convertion process</entry>
-               </row>
-               <row>
-               <entry>skip</entry>
-               <entry>do not add the object to the final output</entry>
-               </row>
-               <row>
-               <entry>ignore</entry>
-               <entry>try to add the object to the final output</entry>
-               </row>
-              </tbody>
-             </tgroup>
-            </table>
-           </entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>load.proxy</entry>
-          <entry></entry>
-          <entry></entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.background</entry>
-          <entry>include background image in output</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.loadImages</entry>
-          <entry>include images in output</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.enableJavascript</entry>
-          <entry>enable or disable javascript</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.enableIntelligentShrinking</entry>
-          <entry>enable to attempt to fit more content on page, only applies to PDF output</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.minimumFontSize</entry>
-          <entry>the minimum font size allowed</entry>
-          <entry>9</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.printMediaType</entry>
-          <entry>print content using print media type instead of screen media type</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.defaultEncoding</entry>
-          <entry>content to use where no encoding is specified</entry>
-          <entry>utf-8</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.userStyleSheet</entry>
-          <entry>URL or path to a user specified style sheet</entry>
-          <entry>/path/to/style.css</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-         <row>
-          <entry>web.enablePlugins</entry>
-          <entry>enable or disable NS plugins</entry>
-          <entry>boolean</entry>
-          <entry>&gt;= 0.1.0</entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
- -->
-
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xattr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xattr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xattr/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xattr/book.xml b/reference/xattr/book.xml
deleted file mode 100644
index 90c90de50f72..000000000000
--- a/reference/xattr/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.xattr">
-  &reftitle.intro;
-  <para>
-   The xattr extension allows for the manipulation of extended attributes on a filesystem.
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.xattr.setup;
- &reference.xattr.constants;
- &reference.xattr.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/xattr/configure.xml b/reference/xattr/configure.xml
deleted file mode 100644
index bf732dff79d0..000000000000
--- a/reference/xattr/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="xattr.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;xattr">&url.pecl.package;xattr</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/xattr/constants.xml b/reference/xattr/constants.xml
deleted file mode 100644
index c236636d96fc..000000000000
--- a/reference/xattr/constants.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="xattr.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.xattr-root">
-   <term>
-    <constant>XATTR_ROOT</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Set attribute in root (trusted) namespace. Requires root privileges.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xattr-dontfollow">
-   <term>
-    <constant>XATTR_DONTFOLLOW</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Do not follow the symbolic link but operate on symbolic link itself.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xattr-create">
-   <term>
-    <constant>XATTR_CREATE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Function will fail if extended attribute already exists.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xattr-replace">
-   <term>
-    <constant>XATTR_REPLACE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Function will fail if extended attribute doesn't exist.
-    </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:
--->
diff --git a/reference/xattr/functions/xattr-get.xml b/reference/xattr/functions/xattr-get.xml
deleted file mode 100644
index e0a0f41a5fc8..000000000000
--- a/reference/xattr/functions/xattr-get.xml
+++ /dev/null
@@ -1,126 +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.xattr-get" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xattr_get</refname>
-  <refpurpose>
-   Get an extended attribute
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>xattr_get</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function gets the value of an extended attribute of a file.
-  </para>
-  &xattr.namespace;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The file from which we get the attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The name of the attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <table>
-        <title>Supported xattr flags</title>
-        <tgroup cols="2">
-         <tbody>
-          <row>
-           <entry><constant>XATTR_DONTFOLLOW</constant></entry>
-           <entry>Do not follow the symbolic link but operate on symbolic link itself.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_ROOT</constant></entry>
-           <entry>Set attribute in root (trusted) namespace. Requires root privileges.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </table>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the value or &false; if the attribute doesn't 
-   exist. 
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Checks if system administrator has signed the file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = '/usr/local/sbin/some_binary';
-$signature = xattr_get($file, 'Root signature', XATTR_ROOT);
-
-/* ... check if $signature is valid ... */
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xattr_list</function></member>
-    <member><function>xattr_set</function></member>
-    <member><function>xattr_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/xattr/functions/xattr-list.xml b/reference/xattr/functions/xattr-list.xml
deleted file mode 100644
index ea22a9df1557..000000000000
--- a/reference/xattr/functions/xattr-list.xml
+++ /dev/null
@@ -1,123 +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.xattr-list" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xattr_list</refname>
-  <refpurpose>
-   Get a list of extended attributes
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>xattr_list</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This functions gets a list of names of extended attributes of a file. 
-  </para>
-  &xattr.namespace;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The path of the file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <table>
-        <title>Supported xattr flags</title>
-        <tgroup cols="2">
-         <tbody>
-          <row>
-           <entry><constant>XATTR_DONTFOLLOW</constant></entry>
-           <entry>Do not follow the symbolic link but operate on symbolic link itself.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_ROOT</constant></entry>
-           <entry>Set attribute in root (trusted) namespace. Requires root privileges.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </table>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This function returns an array with names of extended attributes. 
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Prints names of all extended attributes of file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = 'some_file';
-$root_attributes = xattr_list($file, XATTR_ROOT);
-$user_attributes = xattr_list($file);
-
-echo "Root attributes: \n";
-foreach ($root_attributes as $attr_name) {
-    printf("%s\n", $attr_name);
-}
-
-echo "\n User attributes: \n";
-foreach ($user_attributes as $attr_name) {
-    printf("%s\n", $attr_name);
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xattr_get</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/xattr/functions/xattr-remove.xml b/reference/xattr/functions/xattr-remove.xml
deleted file mode 100644
index 66aa1764463a..000000000000
--- a/reference/xattr/functions/xattr-remove.xml
+++ /dev/null
@@ -1,126 +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.xattr-remove" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xattr_remove</refname>
-  <refpurpose>
-   Remove an extended attribute
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xattr_remove</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function removes an extended attribute of a file.
-  </para>
-  &xattr.namespace;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The file from which we remove the attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The name of the attribute to remove.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <table>
-        <title>Supported xattr flags</title>
-        <tgroup cols="2">
-         <tbody>
-          <row>
-           <entry><constant>XATTR_DONTFOLLOW</constant></entry>
-           <entry>Do not follow the symbolic link but operate on symbolic link itself.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_ROOT</constant></entry>
-           <entry>Set attribute in root (trusted) namespace. Requires root privileges.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </table>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Removes all extended attributes of a file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = 'some_file';
-$attributes = xattr_list($file);
-
-foreach ($attributes as $attr_name) {
-    xattr_remove($file, $attr_name);
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xattr_list</function></member>
-    <member><function>xattr_set</function></member>
-    <member><function>xattr_get</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/xattr/functions/xattr-set.xml b/reference/xattr/functions/xattr-set.xml
deleted file mode 100644
index b554d3a83493..000000000000
--- a/reference/xattr/functions/xattr-set.xml
+++ /dev/null
@@ -1,146 +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.xattr-set" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xattr_set</refname>
-  <refpurpose>
-   Set an extended attribute
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xattr_set</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This function sets the value of an extended attribute of a file.
-  </para>
-  &xattr.namespace;
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The file in which we set the attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The name of the extended attribute. This attribute will be created if 
-       it doesn't exist or replaced otherwise. You can change this behaviour 
-       by using the <parameter>flags</parameter> parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the attribute.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <table>
-        <title>Supported xattr flags</title>
-        <tgroup cols="2">
-         <tbody>
-          <row>
-           <entry><constant>XATTR_CREATE</constant></entry>
-           <entry>Function will fail if extended attribute already exists.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_REPLACE</constant></entry>
-           <entry>Function will fail if extended attribute doesn't exist.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_DONTFOLLOW</constant></entry>
-           <entry>Do not follow the symbolic link but operate on symbolic link itself.</entry>
-          </row>
-          <row>
-           <entry><constant>XATTR_ROOT</constant></entry>
-           <entry>Set attribute in root (trusted) namespace. Requires root privileges.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </table>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Sets extended attributes on <filename>.wav</filename> file</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = 'my_favourite_song.wav';
-xattr_set($file, 'Artist', 'Someone');
-xattr_set($file, 'My ranking', 'Good');
-xattr_set($file, 'Listen count', '34');
-
-/* ... other code ... */
-
-printf("You've played this song %d times", xattr_get($file, 'Listen count')); 
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xattr_get</function></member>
-    <member><function>xattr_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/xattr/functions/xattr-supported.xml b/reference/xattr/functions/xattr-supported.xml
deleted file mode 100644
index 1e66dda17f51..000000000000
--- a/reference/xattr/functions/xattr-supported.xml
+++ /dev/null
@@ -1,117 +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.xattr-supported" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xattr_supported</refname>
-  <refpurpose>
-   Check if filesystem supports extended attributes
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xattr_supported</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This functions checks if the filesystem holding the given file supports 
-   extended attributes. Read access to the file is required.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       The path of the tested file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <table>
-        <title>Supported xattr flags</title>
-        <tgroup cols="2">
-         <tbody>
-          <row>
-           <entry><constant>XATTR_DONTFOLLOW</constant></entry>
-           <entry>Do not follow the symbolic link but operate on symbolic link itself.</entry>
-          </row>
-         </tbody>
-        </tgroup>
-       </table>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This function returns &true; if filesystem supports extended attributes,
-   &false; if it doesn't and &null; if it can't be determined (for example
-   wrong path or lack of permissions to file).
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xattr_supported</function> example</title>
-    <para>
-     The following code checks if we can use extended attributes.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$file = 'some_file';
-
-if (xattr_supported($file)) {
-    /* ... make use of some xattr_* functions ... */
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xattr_get</function></member>
-    <member><function>xattr_list</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/xattr/reference.xml b/reference/xattr/reference.xml
deleted file mode 100644
index e40a693a44ff..000000000000
--- a/reference/xattr/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.xattr" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>xattr &Functions;</title>
-
- &reference.xattr.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/xattr/setup.xml b/reference/xattr/setup.xml
deleted file mode 100644
index b7a42edca5d5..000000000000
--- a/reference/xattr/setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xattr.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="xattr.requirements">
-  &reftitle.required;
-  <para>
-   To use xattr, you will need libattr installed. It is available
-   at <link xlink:href="&url.xattr;">&url.xattr;</link>.
-  </para>
-  <note>
-   <para>
-    These functions only work on filesystems that support extended
-    attributes, and have them enabled at mount time. Some common
-    filesystems that support extended attributes are <literal>ext2</literal>, <literal>ext3</literal>,
-    <literal>reiserfs</literal>, <literal>jfs</literal>, and <literal>xfs</literal>.
-   </para>
-  </note>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.xattr.configure;
- <!-- }}} -->
-
-</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/xattr/versions.xml b/reference/xattr/versions.xml
deleted file mode 100644
index ba8b1c14a421..000000000000
--- a/reference/xattr/versions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='xattr_get' from='PECL xattr &gt;= 0.9.0'/>
- <function name='xattr_list' from='PECL xattr &gt;= 0.9.0'/>
- <function name='xattr_remove' from='PECL xattr &gt;= 0.9.0'/>
- <function name='xattr_set' from='PECL xattr &gt;= 0.9.0'/>
- <function name='xattr_supported' from='PECL xattr &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/xdiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xdiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xdiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xdiff/book.xml b/reference/xdiff/book.xml
deleted file mode 100644
index f2e785bb0d05..000000000000
--- a/reference/xdiff/book.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.xdiff">
-  &reftitle.intro;
-  <para>
-   xdiff extension enables you to create and apply patch files containing
-   differences between different revisions of files.
-  </para>
-  <para>
-   This extension supports two modes of operation - on strings and on files, as well
-   as two different patch formats - unified and binary. Unified patches are excellent
-   for text files as they are human-readable and easy to review. For binary files like
-   archives or images, binary patches will be adequate choice as they are binary safe and
-   handle non-printable characters well.
-  </para>
-  <para>
-   Starting from version 1.5.0 there are two different sets of functions for generating
-   binary patches. New functions - <function>xdiff_string_rabdiff</function> and 
-   <function>xdiff_file_rabdiff</function> generate output compatible with older functions
-   but are typically faster and generate smaller results. For more details about methods of
-   generating binary patches and differences between them, please check 
-   <link xlink:href="&url.xdiff;">libxdiff</link> website.
-  </para>
-  <para>
-   This extension uses libxdiff to implement these functions. Please see
-   <link xlink:href="&url.xdiff;">&url.xdiff;</link> for more information.
-  </para>
- </preface>
- <!-- }}} -->
- 
- &reference.xdiff.setup;
- &reference.xdiff.constants;
- &reference.xdiff.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/xdiff/configure.xml b/reference/xdiff/configure.xml
deleted file mode 100644
index d5460aa47fd4..000000000000
--- a/reference/xdiff/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="xdiff.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;xdiff">&url.pecl.package;xdiff</link>.
- </para>
- <para>
-  &pecl.windows.download.avail;
- </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/xdiff/constants.xml b/reference/xdiff/constants.xml
deleted file mode 100644
index 06bfed02b751..000000000000
--- a/reference/xdiff/constants.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="xdiff.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.xdiff-patch-normal">
-   <term>
-    <constant>XDIFF_PATCH_NORMAL</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This flag indicates that <function>xdiff_string_patch</function> and
-     <function>xdiff_file_patch</function> functions should create result by
-     applying patch to original content thus creating newer version of file. This is the default
-     mode of operation.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xdiff-patch-reverse">
-   <term>
-    <constant>XDIFF_PATCH_REVERSE</constant> 
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     This flag indicated that <function>xdiff_string_patch</function> and
-     <function>xdiff_file_patch</function> functions should create result by
-     reversing patch changed from newer content thus creating original version.
-    </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:
--->
diff --git a/reference/xdiff/functions/xdiff-file-bdiff-size.xml b/reference/xdiff/functions/xdiff-file-bdiff-size.xml
deleted file mode 100644
index 4242beafaa32..000000000000
--- a/reference/xdiff/functions/xdiff-file-bdiff-size.xml
+++ /dev/null
@@ -1,98 +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.xdiff-file-bdiff-size" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_bdiff_size</refname>
-  <refpurpose>Read a size of file created by applying a binary diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>xdiff_file_bdiff_size</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a size of a result file that would be created after applying binary patch from file
-   <parameter>file</parameter> to the original file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-       The path to the binary patch created by <function>xdiff_string_bdiff</function> or 
-       <function>xdiff_string_rabdiff</function> function.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the size of file that would be created.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_bdiff_size</function> example</title>
-    <para>
-     The following code applies reads a size of file that would be created
-     after applying a binary diff.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$length = xdiff_string_bdiff_size('file.bdiff');
-echo "Resulting file will be $length bytes long";
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_bdiff</function></member>
-    <member><function>xdiff_file_rabdiff</function></member>
-    <member><function>xdiff_file_bpatch</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/xdiff/functions/xdiff-file-bdiff.xml b/reference/xdiff/functions/xdiff-file-bdiff.xml
deleted file mode 100644
index 165614485468..000000000000
--- a/reference/xdiff/functions/xdiff-file-bdiff.xml
+++ /dev/null
@@ -1,127 +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.xdiff-file-bdiff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_bdiff</refname>
-  <refpurpose>Make binary diff of two files</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_bdiff</methodname>
-   <methodparam><type>string</type><parameter>old_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two files and stores the result in a patch file.
-   This function works with both text and binary files. Resulting patch
-   file can be later applied using <function>xdiff_file_bpatch</function>/<function>xdiff_string_bpatch</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the first file. This file acts as "old" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the second file. This file acts as "new" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting patch file. Resulting file contains differences
-       between "old" and "new" files. It is in binary format and is human-unreadable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_bdiff</function> example</title>
-    <para>
-     The following code makes binary diff of two archives.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'my_script_1.0.tgz';
-$new_version = 'my_script_1.1.tgz';
-
-xdiff_file_bdiff($old_version, $new_version, 'my_script.bdiff');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Both files will be loaded into memory so ensure that your memory_limit is
-    set high enough.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_bpatch</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/xdiff/functions/xdiff-file-bpatch.xml b/reference/xdiff/functions/xdiff-file-bpatch.xml
deleted file mode 100644
index 1a033b04b38d..000000000000
--- a/reference/xdiff/functions/xdiff-file-bpatch.xml
+++ /dev/null
@@ -1,135 +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.xdiff-file-bpatch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_bpatch</refname>
-  <refpurpose>Patch a file with a binary diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_bpatch</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a <parameter>file</parameter> with a binary
-   <parameter>patch</parameter> and stores the result in a file <parameter>dest</parameter>. 
-   This function accepts patches created both via <function>xdiff_file_bdiff</function> 
-   and <function>xdiff_file_rabdiff</function> functions or their string counterparts.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-       The original file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The binary patch file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting file.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_bpatch</function> example</title>
-    <para>
-     The following code applies binary diff to a file.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'archive-1.0.tgz';
-$patch = 'archive.bpatch';
-
-$result = xdiff_file_bpatch($old_version, $patch, 'archive-1.1.tgz');
-if ($result) {
-   echo "File patched";
-} else {
-   echo "File couldn't be patched";
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Both files (<parameter>file</parameter> and <parameter>patch</parameter>)
-    will be loaded into memory so ensure that your memory_limit is set high
-    enough.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_bdiff</function></member>
-    <member><function>xdiff_file_rabdiff</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/xdiff/functions/xdiff-file-diff-binary.xml b/reference/xdiff/functions/xdiff-file-diff-binary.xml
deleted file mode 100644
index 8e149e406f33..000000000000
--- a/reference/xdiff/functions/xdiff-file-diff-binary.xml
+++ /dev/null
@@ -1,131 +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.xdiff-file-diff-binary" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_diff_binary</refname>
-  <refpurpose>&Alias; <function>xdiff_file_bdiff</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_diff_binary</methodname>
-   <methodparam><type>string</type><parameter>old_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two files and stores the result in a patch file.
-   This function works with both text and binary files. Resulting patch
-   file can be later applied using <function>xdiff_file_bpatch</function>.
-  </para>
-  <para>
-   Starting with version 1.5.0 this function is an alias of <function>xdiff_file_bdiff</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the first file. This file acts as "old" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the second file. This file acts as "new" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting patch file. Resulting file contains differences
-       between "old" and "new" files. It is in binary format and is human-unreadable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_diff_binary</function> example</title>
-    <para>
-     The following code makes binary diff of two archives.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'my_script_1.0.tgz';
-$new_version = 'my_script_1.1.tgz';
-
-xdiff_file_diff_binary($old_version, $new_version, 'my_script.bdiff');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Both files will be loaded into memory so ensure that your memory_limit is
-    set high enough.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_bdiff</function></member>
-    <member><function>xdiff_file_bpatch</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/xdiff/functions/xdiff-file-diff.xml b/reference/xdiff/functions/xdiff-file-diff.xml
deleted file mode 100644
index 46ef12378a3b..000000000000
--- a/reference/xdiff/functions/xdiff-file-diff.xml
+++ /dev/null
@@ -1,148 +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.xdiff-file-diff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_diff</refname>
-  <refpurpose>Make unified diff of two files</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_diff</methodname>
-   <methodparam><type>string</type><parameter>old_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>context</parameter><initializer>3</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes an unified diff containing differences between <parameter>old_file</parameter> and
-   <parameter>new_file</parameter> and stores it in <parameter>dest</parameter> file. The
-   resulting file is human-readable. An optional <parameter>context</parameter> parameter
-   specifies how many lines of context should be added around each change.
-   Setting <parameter>minimal</parameter> parameter to true will result in outputting the shortest
-   patch file possible (can take a long time). 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the first file. This file acts as "old" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the second file. This file acts as "new" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting patch file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>context</parameter></term>
-     <listitem>
-      <para>
-       Indicates how many lines of context you want to include in diff
-       result.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>minimal</parameter></term>
-     <listitem>
-      <para>
-       Set this parameter to &true; if you want to minimalize size of the result
-       (can take a long time). 
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_diff</function> example</title>
-    <para>
-     The following code makes unified diff of two php files with context length of 2.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'my_script.php';
-$new_version = 'my_new_script.php';
-
-xdiff_file_diff($old_version, $new_version, 'my_script.diff', 2);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function doesn't work well with binary files. To make diff of binary
-    files use <function>xdiff_file_bdiff</function>/<function>xdiff_file_rabdiff</function> function.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_patch</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/xdiff/functions/xdiff-file-merge3.xml b/reference/xdiff/functions/xdiff-file-merge3.xml
deleted file mode 100644
index a53afc8c3aff..000000000000
--- a/reference/xdiff/functions/xdiff-file-merge3.xml
+++ /dev/null
@@ -1,131 +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.xdiff-file-merge3" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_merge3</refname>
-  <refpurpose>Merge 3 files into one</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>xdiff_file_merge3</methodname>
-   <methodparam><type>string</type><parameter>old_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file2</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges three files into one and stores the result in a file <parameter>dest</parameter>. 
-   The <parameter>old_file</parameter> is an original version while <parameter>new_file1</parameter>
-   and <parameter>new_file2</parameter> are modified versions of an original.   
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the first file. It acts as "old" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file1</parameter></term>
-     <listitem>
-      <para>
-       Path to the second file. It acts as modified version of <parameter>old_file</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file2</parameter></term>
-     <listitem>
-      <para>
-       Path to the third file. It acts as modified version of <parameter>old_file</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting file, containing merged changed from both <parameter>new_file1</parameter> and
-       <parameter>new_file2</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if merge was successful, string with rejected chunks if
-   it was not or &false; if an internal error happened.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_merge3</function> example</title>
-    <para>
-     The following code merges three files into one.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'original_script.php';
-$fix1 = 'script_with_fix1.php';
-$fix2 = 'script_with_fix2.php';
-
-$errors = xdiff_file_merge3($old_version, $fix1, $fix2, 'fixed_script.php');
-if (is_string($errors)) {
-    echo "Rejects:\n";
-    echo $errors;
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_merge3</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/xdiff/functions/xdiff-file-patch-binary.xml b/reference/xdiff/functions/xdiff-file-patch-binary.xml
deleted file mode 100644
index fb5b9fc3f480..000000000000
--- a/reference/xdiff/functions/xdiff-file-patch-binary.xml
+++ /dev/null
@@ -1,137 +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.xdiff-file-patch-binary" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_patch_binary</refname>
-  <refpurpose>&Alias; <function>xdiff_file_bpatch</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_patch_binary</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a <parameter>file</parameter> with a binary
-   <parameter>patch</parameter> and stores the result in a file <parameter>dest</parameter>. 
-   This function accepts patches created both via <function>xdiff_file_bdiff</function> 
-   or <function>xdiff_file_rabdiff</function> functions or their string counterparts.
-  </para> 
-  <para>
-   Starting with version 1.5.0 this function is an alias of <function>xdiff_file_bpatch</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-       The original file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The binary patch file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting file.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_patch_binary</function> example</title>
-    <para>
-     The following code applies binary diff to a file.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'archive-1.0.tgz';
-$patch = 'archive.bpatch';
-
-$result = xdiff_file_patch_binary($old_version, $patch, 'archive-1.1.tgz');
-if ($result) {
-   echo "File patched";
-} else {
-   echo "File couldn't be patched";
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Both files (<parameter>file</parameter> and <parameter>patch</parameter>)
-    will be loaded into memory so ensure that your memory_limit is set high
-    enough.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_patch_binary</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/xdiff/functions/xdiff-file-patch.xml b/reference/xdiff/functions/xdiff-file-patch.xml
deleted file mode 100644
index 59ed07ce9c31..000000000000
--- a/reference/xdiff/functions/xdiff-file-patch.xml
+++ /dev/null
@@ -1,160 +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.xdiff-file-patch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_file_patch</refname>
-  <refpurpose>Patch a file with an unified diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>xdiff_file_patch</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>DIFF_PATCH_NORMAL</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a <parameter>file</parameter> with a <parameter>patch</parameter> and stores the result in a file.
-   <parameter>patch</parameter> has to be an unified diff created by 
-   <function>xdiff_file_diff</function>/<function>xdiff_string_diff</function> function. 
-   An optional <parameter>flags</parameter> parameter specifies mode of operation.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>file</parameter></term>
-     <listitem>
-      <para>
-       The original file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The unified patch file. It has to be created using <function>xdiff_string_diff</function>, 
-       <function>xdiff_file_diff</function> functions or compatible tools.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       Can be either <constant>XDIFF_PATCH_NORMAL</constant> (default mode,
-       normal patch) or <constant>XDIFF_PATCH_REVERSE</constant> (reversed
-       patch).
-      </para>
-      <para>
-       Starting from version 1.5.0, you can also use binary OR to enable
-       <constant>XDIFF_PATCH_IGNORESPACE</constant> flag.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &false; if an internal error happened, string with rejected
-   chunks if patch couldn't be applied or &true; if patch has been successfully applied.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_patch</function> example</title>
-    <para>
-     The following code applies unified diff to a file.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'my_script-1.0.php';
-$patch = 'my_script.patch';
-
-$errors = xdiff_file_patch($old_version, $patch, 'my_script-1.1.php');
-if (is_string($errors)) {
-   echo "Rejects:\n";
-   echo $errors;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-   <example>
-    <title>Patch reversing example</title>
-    <para>
-     The following code reverses a patch.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$new_version = 'my_script-1.1.php';
-$patch = 'my_script.patch';
-
-$errors = xdiff_file_patch($new_version, $patch, 'my_script-1.0.php', XDIFF_PATCH_REVERSE);
-if (is_string($errors)) {
-   echo "Rejects:\n";
-   echo $errors;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_diff</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/xdiff/functions/xdiff-file-rabdiff.xml b/reference/xdiff/functions/xdiff-file-rabdiff.xml
deleted file mode 100644
index 11820b4b1efd..000000000000
--- a/reference/xdiff/functions/xdiff-file-rabdiff.xml
+++ /dev/null
@@ -1,133 +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.xdiff-file-rabdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xdiff_file_rabdiff</refname>
-  <refpurpose>Make binary diff of two files using the Rabin's polynomial fingerprinting algorithm</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xdiff_file_rabdiff</methodname>
-   <methodparam><type>string</type><parameter>old_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_file</parameter></methodparam>
-   <methodparam><type>string</type><parameter>dest</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two files and stores the result in a patch file.
-   The difference between this function and <function>xdiff_file_bdiff</function> is different
-   algorithm used which should result in faster execution and smaller diff produced.
-   This function works with both text and binary files. Resulting patch
-   file can be later applied using <function>xdiff_file_bpatch</function>/<function>xdiff_string_bpatch</function>.
-  </para>
-  <para>
-   For more details about differences between algorithm used please check <link xlink:href="&url.xdiff;">libxdiff</link> 
-   website.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the first file. This file acts as "old" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_file</parameter></term>
-     <listitem>
-      <para>
-       Path to the second file. This file acts as "new" file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>dest</parameter></term>
-     <listitem>
-      <para>
-       Path of the resulting patch file. Resulting file contains differences
-       between "old" and "new" files. It is in binary format and is human-unreadable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_file_rabdiff</function> example</title>
-    <para>
-     The following code makes binary diff of two archives.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_version = 'my_script_1.0.tgz';
-$new_version = 'my_script_1.1.tgz';
-
-xdiff_file_rabdiff($old_version, $new_version, 'my_script.bdiff');
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    Both files will be loaded into memory so ensure that your memory_limit is
-    set high enough.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_bpatch</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/xdiff/functions/xdiff-string-bdiff-size.xml b/reference/xdiff/functions/xdiff-string-bdiff-size.xml
deleted file mode 100644
index b2823f79e2ca..000000000000
--- a/reference/xdiff/functions/xdiff-string-bdiff-size.xml
+++ /dev/null
@@ -1,99 +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.xdiff-string-bdiff-size" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_bdiff_size</refname>
-  <refpurpose>Read a size of file created by applying a binary diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>xdiff_string_bdiff_size</methodname>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns a size of a result file that would be created after applying binary <parameter>patch</parameter> to
-   the original file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The binary patch created by <function>xdiff_string_bdiff</function> or 
-       <function>xdiff_string_rabdiff</function> function.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the size of file that would be created.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_string_bdiff_size</function> example</title>
-    <para>
-     The following code applies reads a size of file that would be created
-     after applying a binary diff.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$binary_patch = file_get_contents('file.bdiff');
-$length = xdiff_string_bdiff_size($binary_patch);
-echo "Resulting file will be $length bytes long";
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bdiff</function></member>
-    <member><function>xdiff_string_rabdiff</function></member>
-    <member><function>xdiff_string_bpatch</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/xdiff/functions/xdiff-string-bdiff.xml b/reference/xdiff/functions/xdiff-string-bdiff.xml
deleted file mode 100644
index 13655c3f3771..000000000000
--- a/reference/xdiff/functions/xdiff-string-bdiff.xml
+++ /dev/null
@@ -1,86 +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.xdiff-string-bdiff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_bdiff</refname>
-  <refpurpose>Make binary diff of two strings</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_bdiff</methodname>
-   <methodparam><type>string</type><parameter>old_data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two strings and returns the result.
-   This function works with both text and binary data. Resulting patch
-   can be later applied using <function>xdiff_string_bpatch</function>/<function>xdiff_file_bpatch</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_data</parameter></term>
-     <listitem>
-      <para>
-       First string with binary data. It acts as "old" data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data</parameter></term>
-     <listitem>
-      <para>
-       Second string with binary data. It acts as "new" data.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns string with binary diff containing differences between "old" and "new"
-   data or &false; if an internal error occurred.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bpatch</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/xdiff/functions/xdiff-string-bpatch.xml b/reference/xdiff/functions/xdiff-string-bpatch.xml
deleted file mode 100644
index eab04ad95147..000000000000
--- a/reference/xdiff/functions/xdiff-string-bpatch.xml
+++ /dev/null
@@ -1,86 +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.xdiff-string-bpatch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_bpatch</refname>
-  <refpurpose>Patch a string with a binary diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_bpatch</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a string <parameter>str</parameter> with a binary <parameter>patch</parameter>.
-   This function accepts patches created both via <function>xdiff_string_bdiff</function> 
-   and <function>xdiff_string_rabdiff</function> functions or their file counterparts.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       The original binary string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The binary patch string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the patched string, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bdiff</function></member>
-    <member><function>xdiff_string_rabdiff</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/xdiff/functions/xdiff-string-diff-binary.xml b/reference/xdiff/functions/xdiff-string-diff-binary.xml
deleted file mode 100644
index 30662d87aa21..000000000000
--- a/reference/xdiff/functions/xdiff-string-diff-binary.xml
+++ /dev/null
@@ -1,89 +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.xdiff-string-diff-binary" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_diff_binary</refname>
-  <refpurpose>&Alias; <function>xdiff_string_bdiff</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_bdiff</methodname>
-   <methodparam><type>string</type><parameter>old_data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two strings and returns the result.
-   This function works with both text and binary data. Resulting patch
-   can be later applied using <function>xdiff_string_bpatch</function>/<function>xdiff_file_bpatch</function>.
-  </para>
-  <para>
-   Starting with version 1.5.0 this function is an alias of <function>xdiff_string_bdiff</function>.
-  </para>  
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_data</parameter></term>
-     <listitem>
-      <para>
-       First string with binary data. It acts as "old" data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data</parameter></term>
-     <listitem>
-      <para>
-       Second string with binary data. It acts as "new" data.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns string with result or &false; if an internal error happened.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bdiff</function></member>
-    <member><function>xdiff_string_bpatch</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/xdiff/functions/xdiff-string-diff.xml b/reference/xdiff/functions/xdiff-string-diff.xml
deleted file mode 100644
index 78f210475939..000000000000
--- a/reference/xdiff/functions/xdiff-string-diff.xml
+++ /dev/null
@@ -1,143 +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.xdiff-string-diff" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_diff</refname>
-  <refpurpose>Make unified diff of two strings</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_diff</methodname>
-   <methodparam><type>string</type><parameter>old_data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>context</parameter><initializer>3</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>minimal</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes an unified diff containing differences between <parameter>old_data</parameter> string and
-   <parameter>new_data</parameter> string and returns it. The resulting diff is human-readable. 
-   An optional <parameter>context</parameter> parameter specifies how many lines of context should be
-   added around each change. Setting <parameter>minimal</parameter> parameter 
-   to true will result in outputting the shortest patch file possible (can take a long time). 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_data</parameter></term>
-     <listitem>
-      <para>
-       First string with data. It acts as "old" data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data</parameter></term>
-     <listitem>
-      <para>
-       Second string with data. It acts as "new" data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>context</parameter></term>
-     <listitem>
-      <para>
-       Indicates how many lines of context you want to include in the diff
-       result.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>minimal</parameter></term>
-     <listitem>
-      <para>
-       Set this parameter to &true; if you want to minimalize the size of the
-       result (can take a long time).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns string with resulting diff or &false; if an internal error happened.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_string_diff</function> example</title>
-    <para>
-     The following code makes unified diff of two articles.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_article = file_get_contents('./old_article.txt');
-$new_article = $_REQUEST['article']; /* Let's say that someone pasted a new article to html form */
-
-$diff = xdiff_string_diff($old_article, $new_article, 1);
-if (is_string($diff)) {
-    echo "Differences between two articles:\n";
-    echo $diff;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <note>
-   <para>
-    This function doesn't work well with binary strings. To make diff of binary
-    strings use <function>xdiff_string_bdiff</function>/<function>xdiff_string_rabdiff</function>.
-   </para>
-  </note>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_patch</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/xdiff/functions/xdiff-string-merge3.xml b/reference/xdiff/functions/xdiff-string-merge3.xml
deleted file mode 100644
index 628ad2a8847a..000000000000
--- a/reference/xdiff/functions/xdiff-string-merge3.xml
+++ /dev/null
@@ -1,106 +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.xdiff-string-merge3" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_merge3</refname>
-  <refpurpose>Merge 3 strings into one</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>xdiff_string_merge3</methodname>
-   <methodparam><type>string</type><parameter>old_data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data1</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data2</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Merges three strings into one and returns the result.
-   The <parameter>old_data</parameter> is an original version of data 
-   while <parameter>new_data1</parameter> and <parameter>new_data2</parameter> are modified 
-   versions of an original. An optional <parameter>error</parameter> is used to pass any
-   rejected parts during merging process.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_data</parameter></term>
-     <listitem>
-      <para>
-       First string with data. It acts as "old" data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data1</parameter></term>
-     <listitem>
-      <para>
-       Second string with data. It acts as modified version of <parameter>old_data</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data2</parameter></term>
-     <listitem>
-      <para>
-       Third string with data. It acts as modified version of <parameter>old_data</parameter>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>error</parameter></term>
-     <listitem>
-      <para>
-       If provided then rejected parts are stored inside this variable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the merged string, &false; if an internal error happened, or &true;
-   if merged string is empty.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_file_merge3</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/xdiff/functions/xdiff-string-patch-binary.xml b/reference/xdiff/functions/xdiff-string-patch-binary.xml
deleted file mode 100644
index fc9ee063365b..000000000000
--- a/reference/xdiff/functions/xdiff-string-patch-binary.xml
+++ /dev/null
@@ -1,90 +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.xdiff-string-patch-binary" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_patch_binary</refname>
-  <refpurpose>&Alias; <function>xdiff_string_bpatch</function></refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_patch_binary</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a string <parameter>str</parameter> with a binary <parameter>patch</parameter>.
-   This function accepts patches created both via <function>xdiff_string_bdiff</function> 
-   and <function>xdiff_string_rabdiff</function> functions or their file counterparts.
-  </para>
-  <para>
-   Starting with version 1.5.0 this function is an alias of <function>xdiff_string_bpatch</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       The original binary string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The binary patch string.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the patched string, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bpatch</function></member>
-    <member><function>xdiff_string_bdiff</function></member>
-    <member><function>xdiff_string_rabdiff</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/xdiff/functions/xdiff-string-patch.xml b/reference/xdiff/functions/xdiff-string-patch.xml
deleted file mode 100644
index da5fa517795b..000000000000
--- a/reference/xdiff/functions/xdiff-string-patch.xml
+++ /dev/null
@@ -1,146 +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.xdiff-string-patch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xdiff_string_patch</refname>
-  <refpurpose>Patch a string with an unified diff</refpurpose>
- </refnamediv>
- 
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xdiff_string_patch</methodname>
-   <methodparam><type>string</type><parameter>str</parameter></methodparam>
-   <methodparam><type>string</type><parameter>patch</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter role="reference">error</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Patches a <parameter>str</parameter> string with an unified patch in <parameter>patch</parameter> parameter 
-   and returns the result. <parameter>patch</parameter> has to be an unified diff created by 
-   <function>xdiff_file_diff</function>/<function>xdiff_string_diff</function> function. 
-   An optional <parameter>flags</parameter> parameter specifies mode of operation. Any
-   rejected parts of the patch will be stored inside <parameter>error</parameter> variable if 
-   it is provided.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>str</parameter></term>
-     <listitem>
-      <para>
-       The original string.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>patch</parameter></term>
-     <listitem>
-      <para>
-       The unified patch string. It has to be created using <function>xdiff_string_diff</function>, 
-       <function>xdiff_file_diff</function> functions or compatible tools.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       <parameter>flags</parameter> can be either
-       <constant>XDIFF_PATCH_NORMAL</constant> (default mode, normal patch)
-       or <constant>XDIFF_PATCH_REVERSE</constant> (reversed patch).
-      </para>
-      <para>
-       Starting from version 1.5.0, you can also use binary OR to enable
-       <constant>XDIFF_PATCH_IGNORESPACE</constant> flag.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>error</parameter></term>
-     <listitem>
-      <para>
-       If provided then rejected parts are stored inside this variable.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the patched string, or &false; on error.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>xdiff_string_patch</function> example</title>
-    <para>
-     The following code applies changes to some article.
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$old_article = file_get_contents('./old_article.txt');
-$diff = $_SERVER['patch']; /* Let's say that someone pasted a patch to html form */
-
-$errors = '';
-
-$new_article = xdiff_string_patch($old_article, $diff, XDIFF_PATCH_NORMAL, $errors);
-if (is_string($new_article)) {
-    echo "New article:\n";
-    echo $new_article;
-}
-
-if (strlen($errors)) {
-    echo "Rejects: \n";
-    echo $errors;
-}
-
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_diff</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/xdiff/functions/xdiff-string-rabdiff.xml b/reference/xdiff/functions/xdiff-string-rabdiff.xml
deleted file mode 100644
index becc073d7a24..000000000000
--- a/reference/xdiff/functions/xdiff-string-rabdiff.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xdiff-string-rabdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xdiff_string_rabdiff</refname>
-  <refpurpose>
-   Make a binary diff of two strings using the Rabin's polynomial fingerprinting algorithm
-  </refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>false</type></type><methodname>xdiff_string_rabdiff</methodname>
-   <methodparam><type>string</type><parameter>old_data</parameter></methodparam>
-   <methodparam><type>string</type><parameter>new_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Makes a binary diff of two strings using the Rabin's polynomial fingerprinting algorithm implemented by
-   <link xlink:href="&url.xdiff;">libxdiff</link>. Compared to
-   <function>xdiff_string_bdiff</function>, this algorithm generally produces smaller diffs and operates faster,
-   while remaining fully compatible with <function>xdiff_string_bpatch</function> and
-   <function>xdiff_file_bpatch</function> for applying patches.
-  </para>
-  <para>
-   This function can be used with both text and binary data. The resulting diff data can later be
-   applied to recreate the new version from the old one.
-  </para>
-  <para>
-   For further information about the algorithm, see the
-   <link xlink:href="https://www.xmailserver.org/xdiff-lib.html">libxdiff documentation</link>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>old_data</parameter></term>
-     <listitem>
-      <para>
-       The first string containing the "old" binary data.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>new_data</parameter></term>
-     <listitem>
-      <para>
-       The second string containing the "new" binary data.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a binary diff string containing the differences between the old and new data,&return.falseforfailure;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>Creation of a binary diff between two strings</title>
-    <programlisting role="php">
-     <![CDATA[
-<?php
-$old = file_get_contents('file_v1.txt');
-$new = file_get_contents('file_v2.txt');
-
-$diff = xdiff_string_rabdiff($old, $new);
-file_put_contents('patch.rdiff', $diff);
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xdiff_string_bdiff</function></member>
-    <member><function>xdiff_string_bpatch</function></member>
-    <member><function>xdiff_file_bpatch</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/xdiff/reference.xml b/reference/xdiff/reference.xml
deleted file mode 100644
index 277268b59f50..000000000000
--- a/reference/xdiff/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.xdiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>xdiff &Functions;</title>
-
- &reference.xdiff.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/xdiff/setup.xml b/reference/xdiff/setup.xml
deleted file mode 100644
index 633c3a66a5d8..000000000000
--- a/reference/xdiff/setup.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xdiff.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="xdiff.requirements">
-  &reftitle.required;
-  <para>
-   To use xdiff, you will need libxdiff installed, available
-   on the libxdiff homepage <link xlink:href="&url.xdiff;">&url.xdiff;</link>.
-  </para>
-  <note>
-   <para>
-    You'll need at least libxdiff 0.7 for these functions to be aware of memory_limit.
-   </para>
-  </note>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.xdiff.configure;
- <!-- }}} -->
-
-</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/xdiff/versions.xml b/reference/xdiff/versions.xml
deleted file mode 100644
index 40083b2e2bbc..000000000000
--- a/reference/xdiff/versions.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='xdiff_file_diff' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_file_diff_binary' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_file_merge3' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_file_patch' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_file_patch_binary' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_string_diff' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_string_diff_binary' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_string_merge3' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_string_patch' from='PECL xdiff &gt;= 0.2.0'/>
- <function name='xdiff_string_patch_binary' from='PECL xdiff &gt;= 0.2.0'/>
-
- <function name='xdiff_file_bdiff_size' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_file_bdiff' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_file_bpatch' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_file_rabdiff' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_string_bdiff_size' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_string_bdiff' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_string_bpatch' from='PECL xdiff &gt;= 1.5.0'/>
- <function name='xdiff_string_rabdiff' from='PECL xdiff &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/xhprof/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xhprof/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xhprof/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xhprof/book.xml b/reference/xhprof/book.xml
deleted file mode 100644
index 3dd17a123f64..000000000000
--- a/reference/xhprof/book.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.xhprof">
-  &reftitle.intro;
-  <para>
-   XHProf is a light-weight hierarchical and instrumentation based profiler. 
-   During the data collection phase, it keeps track of call counts and inclusive
-   metrics for arcs in the dynamic callgraph of a program. It computes exclusive
-   metrics in the reporting/post processing phase, such as wall (elapsed) time,
-   CPU time and memory usage. A functions profile can be broken down by callers 
-   or callees. XHProf handles recursive functions by detecting cycles in the
-   callgraph at data collection time itself and avoiding the cycles by giving unique
-   depth qualified names for the recursive invocations.
-  </para>
-  <para>
-   XHProf includes a simple HTML based user interface (written in PHP). The browser based
-   UI for viewing profiler results makes it easy to view results or to share results
-   with peers. A callgraph image view is also supported.
-  </para>
-  <para>
-   XHProf reports can often be helpful in understanding the structure of the code
-   being executed. The hierarchical nature of the reports can be used to determine,
-   for example, what chain of calls led to a particular function getting called.
-  </para>
-  <para>
-   XHProf supports ability to compare two runs (a.k.a. "diff" reports) or aggregate
-   data from multiple runs. Diff and aggregate reports, much like single run reports,
-   offer "flat" as well as "hierarchical" views of the profile.
-  </para>
-  <para>
-   Additional documentation can be found via the
-   <link xlink:href="&url.xhprof.docs.facebook;">facebook xhprof</link> website.
-  </para>
- </preface>
-
- &reference.xhprof.setup;
- &reference.xhprof.constants;
- &reference.xhprof.examples;
- &reference.xhprof.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/xhprof/configure.xml b/reference/xhprof/configure.xml
deleted file mode 100644
index 1702fc703df0..000000000000
--- a/reference/xhprof/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="xhprof.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;xhprof">&url.pecl.package;xhprof</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/xhprof/constants.xml b/reference/xhprof/constants.xml
deleted file mode 100644
index ba59dcd86362..000000000000
--- a/reference/xhprof/constants.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="xhprof.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.xhprof-flags-no-builtins">
-   <term>
-    <constant>XHPROF_FLAGS_NO_BUILTINS</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Used to skip all built-in (internal) functions.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xhprof-flags-cpu">
-   <term>
-    <constant>XHPROF_FLAGS_CPU</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Used to add <acronym>CPU</acronym> profiling information to the output.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.xhprof-flags-memory">
-   <term>
-    <constant>XHPROF_FLAGS_MEMORY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Used to add memory profiling information to the output.
-    </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/xhprof/examples.xml b/reference/xhprof/examples.xml
deleted file mode 100644
index f00295e62a1f..000000000000
--- a/reference/xhprof/examples.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xhprof.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Xhprof example with the optional GUI</title>
-  <para>
-   This example starts and stops the profiler, then uses the bundled
-   GUI interface to save and parse the results. In other words, the
-   code from the extension itself ends at the call to
-   <function>xhprof_disable</function>.
-  </para>
-  <programlisting role="php">
-<![CDATA[
-<?php
-xhprof_enable(XHPROF_FLAGS_CPU + XHPROF_FLAGS_MEMORY);
-
-for ($i = 0; $i <= 1000; $i++) {
-    $a = $i * $i;
-}
-
-$xhprof_data = xhprof_disable();
-
-$XHPROF_ROOT = "/tools/xhprof/";
-include_once $XHPROF_ROOT . "/xhprof_lib/utils/xhprof_lib.php";
-include_once $XHPROF_ROOT . "/xhprof_lib/utils/xhprof_runs.php";
-
-$xhprof_runs = new XHProfRuns_Default();
-$run_id = $xhprof_runs->save_run($xhprof_data, "xhprof_testing");
-
-echo "http://localhost/xhprof/xhprof_html/index.php?run={$run_id}&source=xhprof_testing\n";
-
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-http://localhost/xhprof/xhprof_html/index.php?run=t11_4bdf44d21121f&source=xhprof_testing
-]]>
-  </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/xhprof/functions/xhprof-disable.xml b/reference/xhprof/functions/xhprof-disable.xml
deleted file mode 100644
index 527c71fe0594..000000000000
--- a/reference/xhprof/functions/xhprof-disable.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.xhprof-disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xhprof_disable</refname>
-  <refpurpose>Stops xhprof profiler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>xhprof_disable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Stops the profiler, and returns xhprof data from the run.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An <type>array</type> of xhprof data, from the run.
-   Returns &null; if profiling is not enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>xhprof_disable</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-xhprof_enable();
-
-$foo = strlen("foo bar");
-
-$xhprof_data = xhprof_disable();
-
-print_r($xhprof_data);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [main()==>strlen] => Array
-        (
-            [ct] => 1
-            [wt] => 279
-        )
-
-    [main()==>xhprof_disable] => Array
-        (
-            [ct] => 1
-            [wt] => 9
-        )
-
-    [main()] => Array
-        (
-            [ct] => 1
-            [wt] => 610
-        )
-
-)
-]]>
-   </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/xhprof/functions/xhprof-enable.xml b/reference/xhprof/functions/xhprof-enable.xml
deleted file mode 100644
index fea835695b84..000000000000
--- a/reference/xhprof/functions/xhprof-enable.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.xhprof-enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xhprof_enable</refname>
-  <refpurpose>Start xhprof profiler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>xhprof_enable</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Start xhprof profiling.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       Optional flags to add additional information to the profiling. See the
-       <link linkend="xhprof.constants">XHprof constants</link> for further
-       information about these flags, e.g., <constant>XHPROF_FLAGS_MEMORY</constant>
-       to enable memory profiling.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       An <type>array</type> of optional options, namely, the
-       'ignored_functions' option to pass in functions to be ignored
-       during profiling.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &null;
-  </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 xhprof 0.9.2</entry>
-      <entry>
-       The optional <parameter>options</parameter> parameter was added.
-      </entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </informaltable>
- </refsect1><!-- }}} -->
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>xhprof_enable</function> examples</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// 1. elapsed time + memory + CPU profiling; and ignore built-in (internal) functions
-xhprof_enable(XHPROF_FLAGS_NO_BUILTINS | XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY);
-
-// 2. elapsed time profiling; ignore call_user_func* during profiling
-xhprof_enable(
-    0,
-    array('ignored_functions' =>  array('call_user_func',
-                                        'call_user_func_array')));
-                                       
-// 3. elapsed time + memory profiling; ignore call_user_func* during profiling
-xhprof_enable(
-    XHPROF_FLAGS_MEMORY,
-    array('ignored_functions' =>  array('call_user_func',
-                                        'call_user_func_array')));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>xhprof_disable</function></member>
-   <member><function>xhprof_sample_enable</function></member>
-   <member><function>memory_get_usage</function></member>
-   <member><function>getrusage</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/xhprof/functions/xhprof-sample-disable.xml b/reference/xhprof/functions/xhprof-sample-disable.xml
deleted file mode 100644
index f3de431883dd..000000000000
--- a/reference/xhprof/functions/xhprof-sample-disable.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.xhprof-sample-disable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xhprof_sample_disable</refname>
-  <refpurpose>Stops xhprof sample profiler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>array</type><type>null</type></type><methodname>xhprof_sample_disable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Stops the sample mode xhprof profiler, and returns the profile info.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   An <type>array</type> of xhprof sample data, from the run.
-   Returns &null; if profiling is not enabled.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>xhprof_sample_disable</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-xhprof_sample_enable();
-
-for ($i = 0; $i <= 10000; $i++) {
-    $a = strlen($i);
-    $b = $i * $a;
-    $c = rand();
-}
-
-$xhprof_data = xhprof_sample_disable();
-
-print_r($xhprof_data);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [1272935300.800000] => main()
-    [1272935300.900000] => main()
-)
-]]>
-   </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/xhprof/functions/xhprof-sample-enable.xml b/reference/xhprof/functions/xhprof-sample-enable.xml
deleted file mode 100644
index 143eaef6a05d..000000000000
--- a/reference/xhprof/functions/xhprof-sample-enable.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.xhprof-sample-enable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>xhprof_sample_enable</refname>
-  <refpurpose>Start XHProf profiling in sampling mode</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>xhprof_sample_enable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Starts profiling in sample mode, which is a lighter weight version
-   of <function>xhprof_enable</function>. The sampling interval is
-   0.1 seconds, and samples record the full function call stack. The
-   main use case is when lower overhead is required when doing
-   performance monitoring and diagnostics.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &null;
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>xhprof_sample_disable</function></member>
-   <member><function>xhprof_enable</function></member>
-   <member><function>memory_get_usage</function></member>
-   <member><function>getrusage</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/xhprof/ini.xml b/reference/xhprof/ini.xml
deleted file mode 100644
index 544dbff18adc..000000000000
--- a/reference/xhprof/ini.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="xhprof.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Xhprof &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.xhprof.output-dir">xhprof.output_dir</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <variablelist>
-  <varlistentry xml:id="ini.xhprof.output-dir">
-    <term>
-     <parameter>xhprof.output_dir</parameter>
-     <type>string</type>
-    </term>
-    <listitem>
-     <para>
-      Directory used by the default implementation of the iXHProfRuns
-      interface (namely, the XHProfRuns_Default class) for storing
-      XHProf runs. 
-     </para>
-    </listitem>
-   </varlistentry>
- </variablelist>
-</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/xhprof/reference.xml b/reference/xhprof/reference.xml
deleted file mode 100644
index 0f3413c5428d..000000000000
--- a/reference/xhprof/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.xhprof" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Xhprof &Functions;</title>
-
- &reference.xhprof.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/xhprof/setup.xml b/reference/xhprof/setup.xml
deleted file mode 100644
index 149f91441542..000000000000
--- a/reference/xhprof/setup.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xhprof.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="xhprof.requirements">
-  &reftitle.required;
-  <para>
-   Although not required, xhprof includes an interface that's written in PHP.
-   It's used to save and display the profiled data in a usable way, where viewing
-   is done via a web browser. So, a PHP enabled web server will likely make the
-   xhprof experience more useful.
-  </para>
-  <para>
-   There's also a fork of the GUI interface at
-   <link xlink:href="&url.xhprof.gui.fork1;">&url.xhprof.gui.fork1;</link>
-  </para>
- </section>
-
- &reference.xhprof.configure;
- &reference.xhprof.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/xhprof/versions.xml b/reference/xhprof/versions.xml
deleted file mode 100644
index 0d28153b63da..000000000000
--- a/reference/xhprof/versions.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='xhprof_enable' from='PECL xhprof &gt;= 0.9.0'/>
- <function name='xhprof_disable' from='PECL xhprof &gt;= 0.9.0'/>
- <function name='xhprof_sample_enable' from='PECL xhprof &gt;= 0.9.0'/>
- <function name='xhprof_sample_disable' from='PECL xhprof &gt;= 0.9.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/xlswriter/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xlswriter/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xlswriter/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xlswriter/book.xml b/reference/xlswriter/book.xml
deleted file mode 100644
index 2e110bb58ef9..000000000000
--- a/reference/xlswriter/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.xlswriter">
-  &reftitle.intro;
-  <para>
-    An efficient and fast xlsx file export extension.
-  </para>
- </preface>
- <!-- }}} -->
-
- &reference.xlswriter.setup;
- &reference.xlswriter.xlsx-kernel;
- &reference.xlswriter.xlsx-format;
-
-</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/xlswriter/configure.xml b/reference/xlswriter/configure.xml
deleted file mode 100644
index 8c5cf2b817f9..000000000000
--- a/reference/xlswriter/configure.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="xlswriter.installation" xmlns="http://docbook.org/ns/docbook">
- &reftitle.install;
- <para>
-  XML-RPC support in PHP is not enabled by default. You will need to
-  use the <option role="configure">--with-xmlrpc[=DIR]</option> configuration
-  option when compiling PHP to enable XML-RPC support.
- </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/xlswriter/setup.xml b/reference/xlswriter/setup.xml
deleted file mode 100644
index ad892596f1e7..000000000000
--- a/reference/xlswriter/setup.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xlswriter.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="xlswriter.requirements">
-  &reftitle.required;
-  <para>
-   XLSWriter requires PHP 7.0 and above.
-  </para>
- </section>
-
- <section xml:id="xlswriter.installation">
-  &reftitle.install;
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;xlswriter">&url.pecl.package;xlswriter</link>
-  </para>
- </section>
-
- <section xml:id="xlswriter.resources">
-  &reftitle.resources;
-  <para>
-   There is one resource used by the procedural version of the XLSWriter 
-   extension: returned by <function>fileName</function> or 
-   <classname>\Vtiful\Kernel\Format</classname>.
-  </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/xlswriter/versions.xml b/reference/xlswriter/versions.xml
deleted file mode 100644
index 8b167371fb7b..000000000000
--- a/reference/xlswriter/versions.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='Vtiful\Kernel\Excel'                from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::__construct'   from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::fileName'      from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::addSheet'      from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::constMemory'   from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::header'        from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::data'          from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::output'        from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::getHandle'     from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::autoFilter'    from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::insertText'    from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::insertImage'   from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::insertFormula' from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::mergeCells'    from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::setColumn'     from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Excel::setRow'        from='PECL xlswriter &gt;= 1.2.1'/>
-
- <function name='Vtiful\Kernel\Format'               from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Format::bold'         from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Format::italic'       from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Format::underline'    from='PECL xlswriter &gt;= 1.2.1'/>
- <function name='Vtiful\Kernel\Format::align'        from='PECL xlswriter &gt;= 1.2.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
--->
diff --git a/reference/xlswriter/xlsx-format.xml b/reference/xlswriter/xlsx-format.xml
deleted file mode 100644
index 4d135d0a8d42..000000000000
--- a/reference/xlswriter/xlsx-format.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.vtiful-kernel-format" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Vtiful\Kernel\Format class</title>
- <titleabbrev>Vtiful\Kernel\Format</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Class intro -->
-  <section xml:id="vtiful-kernel-format.intro">
-   &reftitle.intro;
-   <para>
-    Create a cell format object
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="vtiful-kernel-format.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Class Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Vtiful\Kernel\Format</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Vtiful\Kernel\Format</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-left">Vtiful\Kernel\Format::FORMAT_ALIGN_LEFT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-center">Vtiful\Kernel\Format::FORMAT_ALIGN_CENTER</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-right">Vtiful\Kernel\Format::FORMAT_ALIGN_RIGHT</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-fill">Vtiful\Kernel\Format::FORMAT_ALIGN_FILL</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-justify">Vtiful\Kernel\Format::FORMAT_ALIGN_JUSTIFY</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-center-across">Vtiful\Kernel\Format::FORMAT_ALIGN_CENTER_ACROSS</varname>
-     <initializer>6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-distributed">Vtiful\Kernel\Format::FORMAT_ALIGN_DISTRIBUTED</varname>
-     <initializer>7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-vertical-top">Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_TOP</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-vertical-bottom">Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_BOTTOM</varname>
-     <initializer>9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-vertical-center">Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_CENTER</varname>
-     <initializer>10</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-vertical-justify">Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_JUSTIFY</varname>
-     <initializer>11</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.format-align-vertical-distributed">Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_DISTRIBUTED</varname>
-     <initializer>12</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.underline-single">Vtiful\Kernel\Format::UNDERLINE_SINGLE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.underline-double">Vtiful\Kernel\Format::UNDERLINE_DOUBLE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.underline-single-accounting">Vtiful\Kernel\Format::UNDERLINE_SINGLE_ACCOUNTING</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="vtiful-kernel-format.constants.underline-double-accounting">Vtiful\Kernel\Format::UNDERLINE_DOUBLE_ACCOUNTING</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.vtiful-kernel-format')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Class constants -->
-  <section xml:id="vtiful-kernel-format.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-left">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_LEFT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-center">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_CENTER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-right">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_RIGHT</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-fill">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_FILL</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-justify">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_JUSTIFY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-center-across">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_CENTER_ACROSS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-distributed">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_DISTRIBUTED</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-vertical-top">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_TOP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-vertical-bottom">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_BOTTOM</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-vertical-center">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_CENTER</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-vertical-justify">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_JUSTIFY</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.format-align-vertical-distributed">
-     <term><constant>Vtiful\Kernel\Format::FORMAT_ALIGN_VERTICAL_DISTRIBUTED</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.underline-single">
-     <term><constant>Vtiful\Kernel\Format::UNDERLINE_SINGLE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.underline-double">
-     <term><constant>Vtiful\Kernel\Format::UNDERLINE_DOUBLE</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.underline-single-accounting">
-     <term><constant>Vtiful\Kernel\Format::UNDERLINE_SINGLE_ACCOUNTING</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="vtiful-kernel-format.constants.underline-double-accounting">
-     <term><constant>Vtiful\Kernel\Format::UNDERLINE_DOUBLE_ACCOUNTING</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.xlswriter.entities.xlsx-format;
-
-</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/xlswriter/xlsx-format/align.xml b/reference/xlswriter/xlsx-format/align.xml
deleted file mode 100644
index e8bcc69e9525..000000000000
--- a/reference/xlswriter/xlsx-format/align.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-format.align" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Format::align</refname>
-  <refpurpose>Vtiful\Kernel\Format align</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Format::align</methodname>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>style</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    set cell align
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>handle</parameter></term>
-    <listitem>
-     <para>
-      xlsx file handle
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>style</parameter></term>
-    <listitem>
-     <para>
-      <classname>Vtiful\Kernel\Format</classname> constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Resource
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Align style example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$alignStyle = $format->align(\Vtiful\Kernel\Format::FORMAT_ALIGN_LEFT)->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setColumn('A:A', 200, $alignStyle)
-    ->output();
-?>
-]]>
-   </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/xlswriter/xlsx-format/bold.xml b/reference/xlswriter/xlsx-format/bold.xml
deleted file mode 100644
index de42ce604147..000000000000
--- a/reference/xlswriter/xlsx-format/bold.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-format.bold" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Format::bold</refname>
-  <refpurpose>Vtiful\Kernel\Format bold</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Format::bold</methodname>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    <classname>Vtiful\Kernel\Format</classname> bold format
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>handle</parameter></term>
-    <listitem>
-     <para>
-      xlsx file handle
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Resource
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Bold style example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$boldStyle = $format->bold()->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setColumn('A:A', 200, $boldStyle)
-    ->output();
-?>
-]]>
-   </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/xlswriter/xlsx-format/italic.xml b/reference/xlswriter/xlsx-format/italic.xml
deleted file mode 100644
index 2d7dd07ca84b..000000000000
--- a/reference/xlswriter/xlsx-format/italic.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-format.italic" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Format::italic</refname>
-  <refpurpose>Vtiful\Kernel\Format italic</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Format::italic</methodname>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    <classname>Vtiful\Kernel\Format</classname> italic format
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>handle</parameter></term>
-    <listitem>
-     <para>
-      xlsx file handle
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Resource
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Italic style example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$italicStyle = $format->italic()->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setColumn('A:A', 200, $italicStyle)
-    ->output();
-?>
-]]>
-   </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/xlswriter/xlsx-format/underline.xml b/reference/xlswriter/xlsx-format/underline.xml
deleted file mode 100644
index c2be0fa9d1b6..000000000000
--- a/reference/xlswriter/xlsx-format/underline.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-format.underline" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Format::underline</refname>
-  <refpurpose>Vtiful\Kernel\Format underline</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Format::underline</methodname>
-   <methodparam><type>resource</type><parameter>handle</parameter></methodparam>
-   <methodparam><type>int</type><parameter>style</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    <classname>Vtiful\Kernel\Format</classname> underline format
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>handle</parameter></term>
-    <listitem>
-     <para>
-      xlsx file handle
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>style</parameter></term>
-    <listitem>
-     <para>
-      <classname>Vtiful\Kernel\Format</classname> constant
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-    Resource
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Underline style example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$underlineStyle = $format->underline(\Vtiful\Kernel\Format::UNDERLINE_SINGLE)->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setColumn('A:A', 200, $underlineStyle)
-    ->output();
-?>
-]]>
-   </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/xlswriter/xlsx-kernel.xml b/reference/xlswriter/xlsx-kernel.xml
deleted file mode 100644
index 9f4851fe4a9e..000000000000
--- a/reference/xlswriter/xlsx-kernel.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.vtiful-kernel-excel" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Vtiful\Kernel\Excel class</title>
- <titleabbrev>Vtiful\Kernel\Excel</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Vtiful\Kernel\Excel intro -->
-  <section xml:id="vtiful-kernel-excel.intro">
-   &reftitle.intro;
-   <para>
-    Create xlsx files and set cells and output xlsx files
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="vtiful-kernel-excel.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Vtiful\Kernel\Excel</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Vtiful\Kernel\Excel</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.vtiful-kernel-excel')/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.vtiful-kernel-excel')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.xlswriter.entities.xlsx-kernel;
-
-</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/xlswriter/xlsx-kernel/add-sheet.xml b/reference/xlswriter/xlsx-kernel/add-sheet.xml
deleted file mode 100644
index 014f0f94ef63..000000000000
--- a/reference/xlswriter/xlsx-kernel/add-sheet.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.addSheet" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::addSheet</refname>
-  <refpurpose>Vtiful\Kernel\Excel addSheet</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::addSheet</methodname>
-   <methodparam><type>string</type><parameter>sheetName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Create a new worksheet in the xlsx file.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>sheetName</parameter></term>
-    <listitem>
-     <para>
-      Worksheet name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet_one')
-    ->header(['name', 'age'])
-    ->data([
-        ['viest', 23],
-        ['wjx', 23]
-    ]);
-
-$file->addSheet('sheet_two')
-    ->header(['name', 'age'])
-    ->data([
-        ['james', 33],
-        ['king', 33]
-    ]);
-
-$file->output();
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/auto-filter.xml b/reference/xlswriter/xlsx-kernel/auto-filter.xml
deleted file mode 100644
index c41ed1d62d8f..000000000000
--- a/reference/xlswriter/xlsx-kernel/auto-filter.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.autoFilter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::autoFilter</refname>
-  <refpurpose>Vtiful\Kernel\Excel autoFilter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::autoFilter</methodname>
-   <methodparam><type>string</type><parameter>scope</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Add autofilter to a worksheet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>scope</parameter></term>
-    <listitem>
-     <para>
-      Cell start and end coordinate string.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('test.xlsx')
-        ->header(['name', 'age'])
-        ->data($data)
-        ->autoFilter('A1:B11')  // auto filter
-        ->output();
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/const-memory.xml b/reference/xlswriter/xlsx-kernel/const-memory.xml
deleted file mode 100644
index 78fb9179d53b..000000000000
--- a/reference/xlswriter/xlsx-kernel/const-memory.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.constMemory" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::constMemory</refname>
-  <refpurpose>Vtiful\Kernel\Excel constMemory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::constMemory</methodname>
-   <methodparam><type>string</type><parameter>fileName</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>sheetName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Write a large file with constant memory usage.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fileName</parameter></term>
-    <listitem>
-     <para>
-      XLSX file name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sheetName</parameter></term>
-    <listitem>
-     <para>
-      Worksheet name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-  'path' => '/home/viest'
-];
-
-$fileObject = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->constMemory('tutorial.xlsx', 'sheet');
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/construct.xml b/reference/xlswriter/xlsx-kernel/construct.xml
deleted file mode 100644
index f0348d5d3f38..000000000000
--- a/reference/xlswriter/xlsx-kernel/construct.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::__construct</refname>
-  <refpurpose>Vtiful\Kernel\Excel constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::__construct</methodname>
-   <methodparam><type>array</type><parameter>config</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-    <classname>Vtiful\Kernel\Excel</classname> constructor, create a class object.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>config</parameter></term>
-    <listitem>
-     <para>
-      XLSX file export configuration
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-  'path' => '/home/viest'
-];
-
-$excelObject = new \Vtiful\Kernel\Excel($config);
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/data.xml b/reference/xlswriter/xlsx-kernel/data.xml
deleted file mode 100644
index c02eec3978c2..000000000000
--- a/reference/xlswriter/xlsx-kernel/data.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::data</refname>
-  <refpurpose>Vtiful\Kernel\Excel data</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::data</methodname>
-   <methodparam><type>array</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Write a data in the worksheet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      worksheet data
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet_one')
-    ->header(['name', 'age'])
-    ->data([
-      ['viest', 23],
-      ['wjx', 23],
-    ]);
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/file-name.xml b/reference/xlswriter/xlsx-kernel/file-name.xml
deleted file mode 100644
index 9ab8497bd12f..000000000000
--- a/reference/xlswriter/xlsx-kernel/file-name.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.filename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::fileName</refname>
-  <refpurpose>Vtiful\Kernel\Excel fileName</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::fileName</methodname>
-   <methodparam><type>string</type><parameter>fileName</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>sheetName</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Create a brand new xlsx file and create a worksheet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>fileName</parameter></term>
-    <listitem>
-     <para>
-      XLSX file name
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>sheetName</parameter></term>
-    <listitem>
-     <para>
-      Worksheet name
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-  'path' => '/home/viest'
-];
-
-$fileObject = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet');
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/get-handle.xml b/reference/xlswriter/xlsx-kernel/get-handle.xml
deleted file mode 100644
index 7f4d6d10fd83..000000000000
--- a/reference/xlswriter/xlsx-kernel/get-handle.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.getHandle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::getHandle</refname>
-  <refpurpose>Vtiful\Kernel\Excel getHandle</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::getHandle</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Get the xlsx text resource handle.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Resource
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet_one')
-    ->header(['name', 'age']);
-
-$handle = $file->getHandle();
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/header.xml b/reference/xlswriter/xlsx-kernel/header.xml
deleted file mode 100644
index 6260f06faec7..000000000000
--- a/reference/xlswriter/xlsx-kernel/header.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.header" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::header</refname>
-  <refpurpose>Vtiful\Kernel\Excel header</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::header</methodname>
-   <methodparam><type>array</type><parameter>headerData</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Write a header in the worksheet.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>headerData</parameter></term>
-    <listitem>
-     <para>
-      worksheet header data
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet_one')
-    ->header(['name', 'age']);
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/insert-formula.xml b/reference/xlswriter/xlsx-kernel/insert-formula.xml
deleted file mode 100644
index a8f2aa2a4618..000000000000
--- a/reference/xlswriter/xlsx-kernel/insert-formula.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.insertFormula" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::insertFormula</refname>
-  <refpurpose>Vtiful\Kernel\Excel insertFormula</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::insertFormula</methodname>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam><type>int</type><parameter>column</parameter></methodparam>
-   <methodparam><type>string</type><parameter>formula</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Insert calculation formula.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <para>
-      cell row
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-    <listitem>
-     <para>
-      cell column
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>formula</parameter></term>
-    <listitem>
-     <para>
-      formula string
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-
-$file = $excel->fileName("free.xlsx")
-    ->header(['name', 'money']);
-
-for($index = 1; $index < 10; $index++) {
-    $file->insertText($index, 0, 'viest');
-    $file->insertText($index, 1, 10);
-}
-
-$file->insertText(12, 0, "Total");
-$file->insertFormula(12, 1, '=SUM(B2:B11)'); // insert formula
-
-$file->output();
-]]>
-   </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/xlswriter/xlsx-kernel/insert-image.xml b/reference/xlswriter/xlsx-kernel/insert-image.xml
deleted file mode 100644
index 783b72f3bc07..000000000000
--- a/reference/xlswriter/xlsx-kernel/insert-image.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.insertImage" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::insertImage</refname>
-  <refpurpose>Vtiful\Kernel\Excel insertImage</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::insertImage</methodname>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam><type>int</type><parameter>column</parameter></methodparam>
-   <methodparam><type>string</type><parameter>localImagePath</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Insert a local image into the cell.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <para>
-      cell row
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-    <listitem>
-     <para>
-      cell column
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>localImagePath</parameter></term>
-    <listitem>
-     <para>
-      local image path
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-
-$file = $excel->fileName("free.xlsx");
-
-$file->insertImage(5, 0, '/vagrant/ASW-G-66.jpg');
-
-$file->output();
-]]>
-   </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/xlswriter/xlsx-kernel/insert-text.xml b/reference/xlswriter/xlsx-kernel/insert-text.xml
deleted file mode 100644
index 3396c7b1ab6a..000000000000
--- a/reference/xlswriter/xlsx-kernel/insert-text.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.insertText" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::insertText</refname>
-  <refpurpose>Vtiful\Kernel\Excel insertText</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::insertText</methodname>
-   <methodparam><type>int</type><parameter>row</parameter></methodparam>
-   <methodparam><type>int</type><parameter>column</parameter></methodparam>
-   <methodparam><type class="union"><type>int</type><type>float</type><type>string</type></type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Write text in a cell.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>row</parameter></term>
-    <listitem>
-     <para>
-      cell row
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>column</parameter></term>
-    <listitem>
-     <para>
-      cell column
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      data to be written
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <para>
-      String format
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-
-$file = $excel->fileName("free.xlsx")
-    ->header(['name', 'money']);
-
-for ($index = 0; $index < 10; $index++) {
-    $file->insertText($index+1, 0, 'viest');
-    $file->insertText($index+1, 1, 10000, '#,##0');
-}
-
-$file->output();
-]]>
-   </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/xlswriter/xlsx-kernel/merge-cells.xml b/reference/xlswriter/xlsx-kernel/merge-cells.xml
deleted file mode 100644
index 5a60612f444b..000000000000
--- a/reference/xlswriter/xlsx-kernel/merge-cells.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.mergeCells" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::mergeCells</refname>
-  <refpurpose>Vtiful\Kernel\Excel mergeCells</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::mergeCells</methodname>
-   <methodparam><type>string</type><parameter>scope</parameter></methodparam>
-   <methodparam><type>string</type><parameter>data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Merge Cells.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>scope</parameter></term>
-    <listitem>
-     <para>
-      cell start and end coordinate strings
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>data</parameter></term>
-    <listitem>
-     <para>
-      string data
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-
-$excel->fileName("test.xlsx")
-        ->mergeCells('A1:C1', 'Merge cells')
-        ->output();
-]]>
-   </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/xlswriter/xlsx-kernel/output.xml b/reference/xlswriter/xlsx-kernel/output.xml
deleted file mode 100644
index 925ccee905a3..000000000000
--- a/reference/xlswriter/xlsx-kernel/output.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.output" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::output</refname>
-  <refpurpose>Vtiful\Kernel\Excel output</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::output</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Output xlsx file to disk.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   XLSX file path;
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$fileObject  = new \Vtiful\Kernel\Excel($config);
-
-$file = $fileObject->fileName('tutorial.xlsx', 'sheet_one')
-    ->header(['name', 'age'])
-    ->data([
-      ['viest', 23],
-      ['wjx', 23],
-    ]);
-    
-$path = $file->output();
-?>
-]]>
-   </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/xlswriter/xlsx-kernel/set-column.xml b/reference/xlswriter/xlsx-kernel/set-column.xml
deleted file mode 100644
index a870f8fd9f2e..000000000000
--- a/reference/xlswriter/xlsx-kernel/set-column.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.setColumn" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::setColumn</refname>
-  <refpurpose>Vtiful\Kernel\Excel setColumn</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::setColumn</methodname>
-   <methodparam><type>string</type><parameter>range</parameter></methodparam>
-   <methodparam><type>float</type><parameter>width</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set the format of the column.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>range</parameter></term>
-    <listitem>
-     <para>
-      cell start and end coordinate strings
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>width</parameter></term>
-    <listitem>
-     <para>
-      column width
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <para>
-      cell format resource
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>setColumn example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$boldStyle = $format->bold()->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setColumn('A:A', 200, $boldStyle)
-    ->output();
-]]>
-   </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/xlswriter/xlsx-kernel/set-row.xml b/reference/xlswriter/xlsx-kernel/set-row.xml
deleted file mode 100644
index 3c863f2a116a..000000000000
--- a/reference/xlswriter/xlsx-kernel/set-row.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="vtiful-kernel-excel.setRow" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Vtiful\Kernel\Excel::setRow</refname>
-  <refpurpose>Vtiful\Kernel\Excel setRow</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>Vtiful\Kernel\Excel::setRow</methodname>
-   <methodparam><type>string</type><parameter>range</parameter></methodparam>
-   <methodparam><type>float</type><parameter>height</parameter></methodparam>
-   <methodparam choice="opt"><type>resource</type><parameter>format</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Set the format of the row.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>range</parameter></term>
-    <listitem>
-     <para>
-      cell start and end coordinate strings
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>height</parameter></term>
-    <listitem>
-     <para>
-      row height
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format</parameter></term>
-    <listitem>
-     <para>
-      cell format resource
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   <classname>Vtiful\Kernel\Excel</classname> instance
-  </para>
- </refsect1>
-
-<refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>setRow example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = [
-    'path' => './tests'
-];
-
-$excel = new \Vtiful\Kernel\Excel($config);
-$excel->fileName('tutorial01.xlsx');
-
-$format = new \Vtiful\Kernel\Format($excel->getHandle());
-$boldStyle = $format->bold()->toResource();
-
-$excel->header(['name', 'age'])
-    ->data([['viest', 21]])
-    ->setRow('A1', 20, $boldStyle)
-    ->output();
-]]>
-   </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/xmldiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xmldiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xmldiff/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xmldiff/book.xml b/reference/xmldiff/book.xml
deleted file mode 100644
index e1419fb99ad8..000000000000
--- a/reference/xmldiff/book.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.xmldiff">
-  &reftitle.intro;
-  <para>
-   The extension is able to produce diffs of two XML documents and then to apply the difference to the source document. The diff is a XML document containing copy/insert/delete instruction nodes in human readable format. DOMDocument objects, local files and strings in memory can be processed.
-  </para>
- </preface>
-
- &reference.xmldiff.setup;
- <!-- &reference.xmldiff.examples; -->
- <!-- &reference.xmldiff.reference; -->
- &reference.xmldiff.xmldiff.base;
- &reference.xmldiff.xmldiff.dom;
- &reference.xmldiff.xmldiff.memory;
- &reference.xmldiff.xmldiff.file;
- &reference.xmldiff.xmldiff.exception;
-
-</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/xmldiff/configure.xml b/reference/xmldiff/configure.xml
deleted file mode 100644
index 837d62d456d2..000000000000
--- a/reference/xmldiff/configure.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="xmldiff.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <para>
-  Use <option role="configure">--with-xmldiff[=DIR]</option> when compiling PHP.
- </para>
-
- <para>
-  Windows users should include <filename>php_xmldiff.dll</filename> into &php.ini;
- </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/xmldiff/reference.xml b/reference/xmldiff/reference.xml
deleted file mode 100644
index 5f97d210aa62..000000000000
--- a/reference/xmldiff/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.xmldiff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Xmldiff &Functions;</title>
-
- <!-- &reference.xmldiff.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/xmldiff/setup.xml b/reference/xmldiff/setup.xml
deleted file mode 100644
index a534b0c8805a..000000000000
--- a/reference/xmldiff/setup.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xmldiff.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="xmldiff.requirements">
-  &reftitle.required;
-  <para>libdiffmark - version 0.10 is bundled with the extension. If diffmark is available from your system packages, its usage is strongly encouraged.</para>
-  <para>libxml extension</para>
-  <para>DOM extension</para>
- </section>
-
- <section xml:id="xmldiff.installation">
-  &reftitle.install;
-  <para>
-       &pecl.moved;
-  </para>
-  <para>
-    &pecl.info;
-  <link xlink:href="&url.pecl.package;xmldiff">&url.pecl.package;xmldiff</link>.
-  </para>
- </section>
-
- <!--
- <section xml:id="xmldiff.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/xmldiff/versions.xml b/reference/xmldiff/versions.xml
deleted file mode 100644
index 87ee4e1a59df..000000000000
--- a/reference/xmldiff/versions.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='xmldiff\base' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\base::__construct' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\base::diff' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\base::merge' from='PECL xmldiff &gt;= 0.8.0'/>
-
- <function name='xmldiff\dom' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\dom::diff' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\dom::merge' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\dom::__construct' from='PECL xmldiff &gt;= 0.8.0'/>
-
- <function name='xmldiff\file' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\file::diff' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\file::merge' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\file::__construct' from='PECL xmldiff &gt;= 0.8.0'/>
-
- <function name='xmldiff\memory' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\memory::diff' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\memory::merge' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\memory::__construct' from='PECL xmldiff &gt;= 0.8.0'/>
-
- <function name='xmldiff\exception' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::__clone' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::__construct' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::getmessage' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::getcode' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::getfile' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::getline' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::gettrace' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::getprevious' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::gettraceasstring' from='PECL xmldiff &gt;= 0.8.0'/>
- <function name='xmldiff\exception::__tostring' from='PECL xmldiff &gt;= 0.8.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/xmldiff/xmldiff-base/construct.xml b/reference/xmldiff/xmldiff-base/construct.xml
deleted file mode 100644
index b224308cd09e..000000000000
--- a/reference/xmldiff/xmldiff-base/construct.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-base.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\Base::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>XMLDiff\Base::__construct</methodname>
-   <methodparam><type>string</type><parameter>nsname</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-   Base constructor for all the worker classes in the xmldiff extension.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>nsname</parameter></term>
-    <listitem>
-     <para>
-      Custom namespace name for the diff document. The default namespace is http://www.locus.cz/diffmark and that's enough to avoid namespace conflicts. Use this parameter if you want to change it for some reason.
-     </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/xmldiff/xmldiff-base/diff.xml b/reference/xmldiff/xmldiff-base/diff.xml
deleted file mode 100644
index c8d7e9aba269..000000000000
--- a/reference/xmldiff/xmldiff-base/diff.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-base.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\Base::diff</refname>
-  <refpurpose>Produce diff of two XML documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>XMLDiff\Base::diff</methodname>
-   <methodparam><type>mixed</type><parameter>from</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>to</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Abstract diff method to be implemented by inheriting classes.
-  </para>
-  <para>
-   The basic purpose of this method is to produce diff of the two documents. The param order matters and will produce different output.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <para>
-      Source XML document. 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to</parameter></term>
-    <listitem>
-     <para>
-      Target XML document.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Implementation dependent.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-base/merge.xml b/reference/xmldiff/xmldiff-base/merge.xml
deleted file mode 100644
index ac122e472af2..000000000000
--- a/reference/xmldiff/xmldiff-base/merge.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-base.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\Base::merge</refname>
-  <refpurpose>Produce new XML document based on diff</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>mixed</type><methodname>XMLDiff\Base::merge</methodname>
-   <methodparam><type>mixed</type><parameter>src</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>diff</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Abstract merge method to be implemented by inheriting classes.
-  </para>
-  <para>
-   Basically the method purpose is to produce a new XML document based on the diff information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>src</parameter></term>
-    <listitem>
-     <para>
-      Source XML document. 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>diff</parameter></term>
-    <listitem>
-     <para>
-      Document produced by the diff method.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Implementation dependent.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-dom/diff.xml b/reference/xmldiff/xmldiff-dom/diff.xml
deleted file mode 100644
index 0b69101121fe..000000000000
--- a/reference/xmldiff/xmldiff-dom/diff.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-dom.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\DOM::diff</refname>
-  <refpurpose>Diff two DOMDocument objects</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>DOMDocument</type><methodname>XMLDiff\DOM::diff</methodname>
-   <methodparam><type>DOMDocument</type><parameter>from</parameter></methodparam>
-   <methodparam><type>DOMDocument</type><parameter>to</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Diff two DOMDocument instances and produce the new one containing the diff information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <para>
-      Source DOMDocument object.           
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to</parameter></term>
-    <listitem>
-     <para>
-      Target DOMDocument object.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   DOMDocument with the diff information 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-dom/merge.xml b/reference/xmldiff/xmldiff-dom/merge.xml
deleted file mode 100644
index 9e34e6d2fd47..000000000000
--- a/reference/xmldiff/xmldiff-dom/merge.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-dom.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\DOM::merge</refname>
-  <refpurpose>Produce merged DOMDocument</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>DOMDocument</type><methodname>XMLDiff\DOM::merge</methodname>
-   <methodparam><type>DOMDocument</type><parameter>src</parameter></methodparam>
-   <methodparam><type>DOMDocument</type><parameter>diff</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create new DOMDocument based on the diff.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>src</parameter></term>
-    <listitem>
-     <para>
-      Source DOMDocument object.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>diff</parameter></term>
-    <listitem>
-     <para>
-      DOMDocument object containing the diff information.      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Merged DOMDocument 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-file/diff.xml b/reference/xmldiff/xmldiff-file/diff.xml
deleted file mode 100644
index 35b95c9d91f4..000000000000
--- a/reference/xmldiff/xmldiff-file/diff.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-file.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\File::diff</refname>
-  <refpurpose>Diff two XML files</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>XMLDiff\File::diff</methodname>
-   <methodparam><type>string</type><parameter>from</parameter></methodparam>
-   <methodparam><type>string</type><parameter>to</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Diff two local XML files and produce string with the diff information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <para>
-      Path to the source document. 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to</parameter></term>
-    <listitem>
-     <para>
-      Path to the target document.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String with the XML document containing the diff information 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-file/merge.xml b/reference/xmldiff/xmldiff-file/merge.xml
deleted file mode 100644
index 86793b600687..000000000000
--- a/reference/xmldiff/xmldiff-file/merge.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-file.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\File::merge</refname>
-  <refpurpose>Produce merged XML document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>XMLDiff\File::merge</methodname>
-   <methodparam><type>string</type><parameter>src</parameter></methodparam>
-   <methodparam><type>string</type><parameter>diff</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create new XML document based on diffs and source document.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>src</parameter></term>
-    <listitem>
-     <para>
-      Path to the source XML document.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>diff</parameter></term>
-    <listitem>
-     <para>
-      Path to the XML document with the diff information.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String with the new XML document 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-memory/diff.xml b/reference/xmldiff/xmldiff-memory/diff.xml
deleted file mode 100644
index b2f791b0b3da..000000000000
--- a/reference/xmldiff/xmldiff-memory/diff.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-memory.diff" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\Memory::diff</refname>
-  <refpurpose>Diff two XML documents</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>XMLDiff\Memory::diff</methodname>
-   <methodparam><type>string</type><parameter>from</parameter></methodparam>
-   <methodparam><type>string</type><parameter>to</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Diff two strings containing XML documents and produce the diff information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>from</parameter></term>
-    <listitem>
-     <para>
-      Source XML document.     
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>to</parameter></term>
-    <listitem>
-     <para>
-      Target XML document.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String with the XML document containing the diff information 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff-memory/merge.xml b/reference/xmldiff/xmldiff-memory/merge.xml
deleted file mode 100644
index 31872fd44263..000000000000
--- a/reference/xmldiff/xmldiff-memory/merge.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="xmldiff-memory.merge" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>XMLDiff\Memory::merge</refname>
-  <refpurpose>Produce merged XML document</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>XMLDiff\Memory::merge</methodname>
-   <methodparam><type>string</type><parameter>src</parameter></methodparam>
-   <methodparam><type>string</type><parameter>diff</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Create new XML document based on diffs and source document.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>src</parameter></term>
-    <listitem>
-     <para>
-      Source XML document.      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>diff</parameter></term>
-    <listitem>
-     <para>
-      XML document containing diff information.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String with the new XML document 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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/xmldiff/xmldiff.base.xml b/reference/xmldiff/xmldiff.base.xml
deleted file mode 100644
index fd07c8d97e9f..000000000000
--- a/reference/xmldiff/xmldiff.base.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.xmldiff-base" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The XMLDiff\Base class</title>
- <titleabbrev>XMLDiff\Base</titleabbrev>
-
- <partintro>
-
-<!-- {{{ XMLDiff\Base intro -->
-  <section xml:id="xmldiff-base.intro">
-   &reftitle.intro;
-   <para>
-    Base abstract class for all the comparsion classes in the extension.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="xmldiff-base.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>XMLDiff\Base</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>XMLDiff\Base</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-base')/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.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.xmldiff.entities.xmldiff-base;
-
-</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/xmldiff/xmldiff.dom.xml b/reference/xmldiff/xmldiff.dom.xml
deleted file mode 100644
index 4699a3e7718e..000000000000
--- a/reference/xmldiff/xmldiff.dom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.xmldiff-dom" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The XMLDiff\DOM class</title>
- <titleabbrev>XMLDiff\DOM</titleabbrev>
-
- <partintro>
-
-<!-- {{{ XMLDiff\DOM intro -->
-  <section xml:id="xmldiff-dom.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="xmldiff-dom.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>XMLDiff\DOM</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>XMLDiff\DOM</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>XMLDiff\Base</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-dom')/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.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.xmldiff.entities.xmldiff-dom;
-
-</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/xmldiff/xmldiff.exception.xml b/reference/xmldiff/xmldiff.exception.xml
deleted file mode 100644
index bb0783cb7946..000000000000
--- a/reference/xmldiff/xmldiff.exception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.xmldiff-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The XMLDiff\Exception class</title>
- <titleabbrev>XMLDiff\Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ XMLDiff\Exception intro -->
-  <section xml:id="xmldiff-exception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="xmldiff-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>XMLDiff\Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>XMLDiff\Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/xmldiff/xmldiff.file.xml b/reference/xmldiff/xmldiff.file.xml
deleted file mode 100644
index c456968e8b6f..000000000000
--- a/reference/xmldiff/xmldiff.file.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.xmldiff-file" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The XMLDiff\File class</title>
- <titleabbrev>XMLDiff\File</titleabbrev>
-
- <partintro>
-
-<!-- {{{ XMLDiff\File intro -->
-  <section xml:id="xmldiff-file.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="xmldiff-file.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>XMLDiff\File</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>XMLDiff\File</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>XMLDiff\Base</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-file')/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.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.xmldiff.entities.xmldiff-file;
-
-</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/xmldiff/xmldiff.memory.xml b/reference/xmldiff/xmldiff.memory.xml
deleted file mode 100644
index dcfdbe028ad8..000000000000
--- a/reference/xmldiff/xmldiff.memory.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.xmldiff-memory" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The XMLDiff\Memory class</title>
- <titleabbrev>XMLDiff\Memory</titleabbrev>
-
- <partintro>
-
-<!-- {{{ XMLDiff\Memory intro -->
-  <section xml:id="xmldiff-memory.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="xmldiff-memory.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>XMLDiff\Memory</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>XMLDiff\Memory</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>XMLDiff\Base</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.xmldiff-memory')/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.xmldiff-base')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.xmldiff.entities.xmldiff-memory;
-
-</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/xmlrpc/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xmlrpc/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xmlrpc/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xmlrpc/book.xml b/reference/xmlrpc/book.xml
deleted file mode 100644
index 88a3901155ac..000000000000
--- a/reference/xmlrpc/book.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- State: deprecated -->
-
-<book xml:id="book.xmlrpc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <?phpdoc extension-membership="pecl" ?>
- <title>XML-RPC</title>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.xmlrpc">
-  &reftitle.intro;
-  <para>
-  These functions can be used to write XML-RPC servers and clients.
-  You can find more information about XML-RPC at
-  <link xlink:href="&url.xmlrpc;">&url.xmlrpc;</link>, and more
-  documentation on this extension and its functions at
-  <link xlink:href="&url.xmlrpc-epi;">&url.xmlrpc-epi;</link>.
- </para>
- &warn.experimental;
- </preface>
- <!-- }}} -->
-
- &reference.xmlrpc.setup;
- &reference.xmlrpc.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/xmlrpc/configure.xml b/reference/xmlrpc/configure.xml
deleted file mode 100644
index 34c79ef91c1a..000000000000
--- a/reference/xmlrpc/configure.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="xmlrpc.installation" xmlns="http://docbook.org/ns/docbook">
- &reftitle.install;
- <para>
-  XML-RPC support in PHP is not enabled by default. You will need to
-  use the <option role="configure">--with-xmlrpc[=DIR]</option> configuration
-  option when compiling PHP to enable XML-RPC support.
- </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/xmlrpc/functions/xmlrpc-decode-request.xml b/reference/xmlrpc/functions/xmlrpc-decode-request.xml
deleted file mode 100644
index 35d153150ff8..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-decode-request.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-decode-request" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_decode_request</refname>
-  <refpurpose>Decodes XML into native PHP types</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>xmlrpc_decode_request</methodname>
-   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-   <methodparam><type>string</type><parameter role="reference">method</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-decode.xml b/reference/xmlrpc/functions/xmlrpc-decode.xml
deleted file mode 100644
index ded1b7fd82c8..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-decode.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-decode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_decode</refname>
-  <refpurpose>Decodes XML into native PHP types</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>xmlrpc_decode</methodname>
-   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>encoding</parameter><initializer>"iso-8859-1"</initializer></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>xml</parameter></term>
-     <listitem>
-      <para>
-       XML response returned by XMLRPC method.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       Input encoding supported by iconv.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns either an array, or an integer, or a string, or a boolean according
-   to the response returned by the XMLRPC method.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   See example by <function>xmlrpc_encode_request</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xmlrpc_encode_request</function></member>
-    <member><function>xmlrpc_is_fault</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/xmlrpc/functions/xmlrpc-encode-request.xml b/reference/xmlrpc/functions/xmlrpc-encode-request.xml
deleted file mode 100644
index 751079d066ee..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-encode-request.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-encode-request" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_encode_request</refname>
-  <refpurpose>Generates XML for a method request</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xmlrpc_encode_request</methodname>
-   <methodparam><type>string</type><parameter>method</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>params</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>method</parameter></term>
-     <listitem>
-      <para>
-       Name of the method to call.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>params</parameter></term>
-     <listitem>
-      <para>
-       Method parameters compatible with method signature.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>output_options</parameter></term>
-     <listitem>
-      <para>
-       Array specifying output options may contain (default values are
-       emphasised):
-       <itemizedlist>
-        <listitem><para>output_type: php, <emphasis>xml</emphasis></para></listitem>
-        <listitem><para>verbosity: no_white_space, newlines_only, <emphasis>pretty</emphasis></para></listitem>
-        <listitem><para>escaping: cdata, <emphasis>non-ascii, non-print, markup</emphasis>
-          (may be a string with one value or an array with multiple values)</para></listitem>
-        <listitem><para>version: simple, <emphasis>xmlrpc</emphasis>, soap 1.1, auto</para></listitem>
-        <listitem><para>encoding: <emphasis>iso-8859-1</emphasis>, other character set supported by iconv</para></listitem>
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string containing the XML representation of the request.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>XMLRPC client functions example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$request = xmlrpc_encode_request("method", [1, 2, 3]);
-$context = stream_context_create([
-    'http' => [
-        'method'  => "POST",
-        'header'  => "Content-Type: text/xml",
-        'content' => $request,
-    ]
-]);
-$file = file_get_contents("http://www.example.com/xmlrpc", false, $context);
-$response = xmlrpc_decode($file);
-if ($response && xmlrpc_is_fault($response)) {
-    trigger_error("xmlrpc: $response[faultString] ($response[faultCode])");
-} else {
-    print_r($response);
-}
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>stream_context_create</function></member>
-    <member><function>file_get_contents</function></member>
-    <member><function>xmlrpc_decode</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/xmlrpc/functions/xmlrpc-encode.xml b/reference/xmlrpc/functions/xmlrpc-encode.xml
deleted file mode 100644
index 75d1b5489fe8..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-encode.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-encode" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_encode</refname>
-  <refpurpose>Generates XML for a PHP value</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xmlrpc_encode</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-get-type.xml b/reference/xmlrpc/functions/xmlrpc-get-type.xml
deleted file mode 100644
index 68c854794045..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-get-type.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-get-type" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_get_type</refname>
-  <refpurpose>Gets xmlrpc type for a PHP value</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xmlrpc_get_type</methodname>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
-  <para>
-   This function is especially useful for base64 and datetime strings.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       PHP value
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the XML-RPC type.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>XML-RPC type example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-echo xmlrpc_get_type(null) . "\n"; // base64
-echo xmlrpc_get_type(false) . "\n"; // boolean
-echo xmlrpc_get_type(1) . "\n"; // int
-echo xmlrpc_get_type(1.0) . "\n"; // double
-echo xmlrpc_get_type("") . "\n"; // string
-echo xmlrpc_get_type(array()) . "\n"; // array
-echo xmlrpc_get_type(new stdClass) . "\n"; // array
-echo xmlrpc_get_type(STDIN) . "\n"; // int
-?>
-]]>
-    </programlisting>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xmlrpc_set_type</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/xmlrpc/functions/xmlrpc-is-fault.xml b/reference/xmlrpc/functions/xmlrpc-is-fault.xml
deleted file mode 100644
index e56d15e6e9af..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-is-fault.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-is-fault" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_is_fault</refname>
-  <refpurpose>Determines if an array value represents an XMLRPC fault</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xmlrpc_is_fault</methodname>
-   <methodparam><type>array</type><parameter>arg</parameter></methodparam>
-  </methodsynopsis>
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>arg</parameter></term>
-     <listitem>
-      <para>
-       Array returned by <function>xmlrpc_decode</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- 
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the argument means fault, &false; otherwise. Fault
-   description is available in <literal>$arg["faultString"]</literal>, fault
-   code is in <literal>$arg["faultCode"]</literal>.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   See example by <function>xmlrpc_encode_request</function>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>xmlrpc_decode</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/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml b/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml
deleted file mode 100644
index adc0e37ab540..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-parse-method-descriptions.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-parse-method-descriptions" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_parse_method_descriptions</refname>
-  <refpurpose>Decodes XML into a list of method descriptions</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>xmlrpc_parse_method_descriptions</methodname>
-   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml b/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml
deleted file mode 100644
index 7355ecef955a..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-add-introspection-data.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-add-introspection-data" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_add_introspection_data</refname>
-  <refpurpose>Adds introspection documentation</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>xmlrpc_server_add_introspection_data</methodname>
-   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-   <methodparam><type>array</type><parameter>desc</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-server-call-method.xml b/reference/xmlrpc/functions/xmlrpc-server-call-method.xml
deleted file mode 100644
index bafb7ca3ed99..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-call-method.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-call-method" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_call_method</refname>
-  <refpurpose>Parses XML requests and call methods</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>xmlrpc_server_call_method</methodname>
-   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-   <methodparam><type>string</type><parameter>xml</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>user_data</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>output_options</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-server-create.xml b/reference/xmlrpc/functions/xmlrpc-server-create.xml
deleted file mode 100644
index 1fa8d5b90bce..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-create.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-create" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_create</refname>
-  <refpurpose>Creates an xmlrpc server</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>resource</type><methodname>xmlrpc_server_create</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/xmlrpc/functions/xmlrpc-server-destroy.xml b/reference/xmlrpc/functions/xmlrpc-server-destroy.xml
deleted file mode 100644
index d3ba8c629e34..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-destroy.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-destroy" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_destroy</refname>
-  <refpurpose>Destroys server resources</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xmlrpc_server_destroy</methodname>
-   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml b/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml
deleted file mode 100644
index 7c14b0fee5ac..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-register-introspection-callback.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-register-introspection-callback" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_register_introspection_callback</refname>
-  <refpurpose>Register a PHP function to generate documentation</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xmlrpc_server_register_introspection_callback</methodname>
-   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-server-register-method.xml b/reference/xmlrpc/functions/xmlrpc-server-register-method.xml
deleted file mode 100644
index d45f440931fb..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-server-register-method.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-server-register-method" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_server_register_method</refname>
-  <refpurpose>Register a PHP function to resource method matching method_name</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xmlrpc_server_register_method</methodname>
-   <methodparam><type>resource</type><parameter>server</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>function</parameter></methodparam>
-  </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/xmlrpc/functions/xmlrpc-set-type.xml b/reference/xmlrpc/functions/xmlrpc-set-type.xml
deleted file mode 100644
index c64a2b512b4b..000000000000
--- a/reference/xmlrpc/functions/xmlrpc-set-type.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.xmlrpc-set-type" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>xmlrpc_set_type</refname>
-  <refpurpose>Sets xmlrpc type, base64 or datetime, for a PHP string value</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>xmlrpc_set_type</methodname>
-   <methodparam><type>string</type><parameter role="reference">value</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets xmlrpc type, base64 or datetime, for a PHP string value.
-  </para>
-  &warn.experimental.func;
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       Value to set the type
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       'base64' or 'datetime'
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   If successful, <parameter>value</parameter> is converted to an object.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   Issues E_WARNING with type unsupported by XMLRPC.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>A <function>xmlrpc_set_type</function> example</title>
-    <para>
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$params = date("Ymd\TH:i:s", time());
-xmlrpc_set_type($params, 'datetime');
-echo xmlrpc_encode($params);
-
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen role="xml">
-<![CDATA[
-<?xml version="1.0" encoding="utf-8"?>
-<params>
-<param>
- <value>
-  <dateTime.iso8601>20090322T23:43:03</dateTime.iso8601>
- </value>
-</param>
-</params>
-]]>
-    </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/xmlrpc/reference.xml b/reference/xmlrpc/reference.xml
deleted file mode 100644
index d6ae6851eca6..000000000000
--- a/reference/xmlrpc/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.xmlrpc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>XML-RPC &Functions;</title>
-
-&reference.xmlrpc.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/xmlrpc/setup.xml b/reference/xmlrpc/setup.xml
deleted file mode 100644
index ecc711179009..000000000000
--- a/reference/xmlrpc/setup.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="xmlrpc.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="xmlrpc.requirements">
-  &reftitle.required;
-  &libxml.required;
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.xmlrpc.configure;
- <!-- }}} -->
-
- <!-- {{{ Resources -->
- <section xml:id="xmlrpc.resources">
-  &reftitle.resources;
-  <para>
-   This extension defines a XML-RPC server resource returned by
-   <function>xmlrpc_server_create</function>.
-  </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/xmlrpc/versions.xml b/reference/xmlrpc/versions.xml
deleted file mode 100644
index 7c4824bc8d73..000000000000
--- a/reference/xmlrpc/versions.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name="xmlrpc_decode" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_decode_request" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_encode" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_encode_request" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_get_type" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_is_fault" from="PHP 4 &gt;= 4.3.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_parse_method_descriptions" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_add_introspection_data" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_call_method" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_create" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_destroy" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_register_introspection_callback" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_server_register_method" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
- <function name="xmlrpc_set_type" from="PHP 4 &gt;= 4.1.0, PHP 5, PHP 7"/>
-</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/xpass/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/xpass/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/xpass/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/xpass/book.xml b/reference/xpass/book.xml
deleted file mode 100644
index 03b70aefa3ca..000000000000
--- a/reference/xpass/book.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<book xml:id="book.xpass" xmlns="http://docbook.org/ns/docbook">
- <?phpdoc extension-membership="pecl" ?>
- <title>Xpass</title>
- <titleabbrev>Xpass</titleabbrev>
-
- <preface xml:id="intro.xpass">
-  &reftitle.intro;
-  <simpara>
-   This extension provides password hashing algorithms used by Linux
-   distributions, using extended crypt library.
-  </simpara>
-  <simpara>
-   It also provides additional functions from libxcrypt missing in core PHP.
-  </simpara>
- </preface>
-
- &reference.xpass.setup;
- &reference.xpass.constants;
- &reference.xpass.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/xpass/constants.xml b/reference/xpass/constants.xml
deleted file mode 100644
index fe9989e0cb40..000000000000
--- a/reference/xpass/constants.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<appendix xml:id="xpass.constants" xmlns="http://docbook.org/ns/docbook">
- &reftitle.constants;
- &extension.constants;
-
- <simpara>
-  Xpass extension provides various set of constants.
-  Hash methods (<constant>CRYPT_PREFIX_<replaceable>*</replaceable></constant>) for
-  <function>crypt_gensalt</function> prefix parameter.
-  Error codes (<constant>CRYPT_SALT_<replaceable>*</replaceable></constant>) returned by
-  <function>crypt_checksalt</function>.
-  Password algorithms (<constant>PASSWORD_<replaceable>*</replaceable></constant>) for
-  <function>password_hash</function> algo parameter.
- </simpara>
-
- <variablelist xml:id="xpass.constants.algo">
-  <title>Hashing methods</title>
-  <varlistentry xml:id="constant.crypt-prefix-std-des">
-   <term>
-    <constant>CRYPT_PREFIX_STD_DES</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The original hashing method from Unix V7, based on the DES block cipher.
-     Because DES is cheap on modern hardware,
-     because there are only <literal>4096</literal> possible salts and 2**56 distinct passphrases,
-     which it truncates to 8 characters,
-     it is feasible to discover any passphrase hashed with this method.
-     It should only be used when supporting old operating systems that support
-     no other hash generation algorithm, due to how weak DES hashes are.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-ext-des">
-   <term>
-    <constant>CRYPT_PREFIX_EXT_DES</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     An extension of traditional DES, which eliminates the length limit,
-     increases the salt size, and makes the time cost tunable.
-     It originates with BSDI BSD/OS and is also available on at least NetBSD,
-     OpenBSD, and FreeBSD due to the use of David Burren's FreeSec library.
-     It is much better than traditional DES and bigcrypt,
-     but still should not be used for new hashes.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-md5">
-   <term>
-    <constant>CRYPT_PREFIX_MD5</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A hash based on the MD5 algorithm, originally developed by Poul-Henning Kamp for FreeBSD.
-     Supported on most free Unixes and newer versions of Solaris.
-     Not as weak as the DES-based hashes below,
-     but MD5 is so cheap on modern hardware that it should not be used for new hashes.
-     Processing cost is not adjustable.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-blowfish">
-   <term>
-    <constant>CRYPT_PREFIX_BLOWFISH</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A hash based on the Blowfish block cipher, modified to have an extra-expensive key schedule.
-     Originally developed by Niels Provos and David Mazieres for OpenBSD and also supported on recent
-     versions of FreeBSD and NetBSD, on Solaris 10 and newer, and on several GNU/*/Linux distributions.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-sha256">
-   <term>
-    <constant>CRYPT_PREFIX_SHA256</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A hash based on SHA-2 with 256-bit output, originally developed by Ulrich Drepper for GNU libc.
-     Supported on Linux but not common elsewhere.
-     Acceptable for new hashes.
-     The default processing cost parameter is <literal>5000</literal>,
-     which is too low for modern hardware.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-sha512">
-   <term>
-    <constant>CRYPT_PREFIX_SHA512</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A hash based on SHA-2 with 512-bit output, originally developed by Ulrich Drepper for GNU libc.
-     Supported on Linux but not common elsewhere.
-     Acceptable for new hashes.
-     The default processing cost parameter is <literal>5000</literal>,
-     which is too low for modern hardware.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-scrypt">
-   <term>
-    <constant>CRYPT_PREFIX_SCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Scrypt is a password-based key derivation function created by Colin Percival,
-     originally for the Tarsnap online backup service.
-     The algorithm was specifically designed to make it costly to perform
-     large-scale custom hardware attacks by requiring large amounts of memory.
-     In 2016, the scrypt algorithm was published by IETF as RFC 7914.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-gost-yescrypt">
-   <term>
-    <constant>CRYPT_PREFIX_GOST_YESCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Gost-yescrypt uses the output from yescrypt as an input message to HMAC with the
-     GOST R 34.11-2012 (Streebog) hash function with a 256-bit digest.
-     Thus, yescrypt's cryptographic properties are superseded by those of the GOST hash function.
-     This hashing method is useful in applications that need modern passphrase hashing,
-     but have to rely on GOST algorithms.
-     The GOST R 34.11-2012 (Streebog) hash function has been published by the IETF as RFC 6986.
-     Acceptable for new hashes where required.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-yescrypt">
-   <term>
-    <constant>CRYPT_PREFIX_YESCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Yescrypt is a scalable passphrase hashing scheme designed by Solar Designer,
-     which is based on Colin Percival's scrypt.
-     While yescrypt's strength against password guessing attacks comes from its algorithm design,
-     its cryptographic security is guaranteed by its use of SHA-256 on the outer layer.
-     The SHA-256 hash function has been published by NIST in FIPS PUB 180-2
-     (and its subsequent revisions such as FIPS PUB 180-4) and by the IETF as RFC 4634
-     (and subsequently RFC 6234).
-     Recommended for new hashes.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-sm3crypt">
-   <term>
-    <constant>CRYPT_PREFIX_SM3CRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A hash based on the ShangMi 3 hash function with 256-bit output,
-     that uses the same design as sha256crypt and/or sha512crypt.
-     Supported on EulerOS, Kylin, openEuler, and openKylin, but not common
-     elsewhere. Acceptable for new hashes where required. The default
-     processing cost parameter is 5000, which is too low for modern hardware.
-    </simpara>
-    <simpara>
-     Available as of 1.2.0 with libcxcrypt &gt;= 4.5.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-prefix-sm3-yescrypt">
-   <term>
-    <constant>CRYPT_PREFIX_SM3_YESCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Sm3-yescrypt uses the output from yescrypt as an input message to HMAC
-     with the ShangMi 3 hash function with a 256-bit digest. Thus, yescrypt's
-     cryptographic properties are superseded by those of the ShangMi 3 hash
-     function. This hashing method is useful in applications that need modern
-     passphrase hashing, but have to rely on algorithms approved by the Chinese
-     Office of State Commercial Cryptography Administration (OSCCA). The ShangMi
-     3 hash function has been published in Part 3: "Dedicated hash-functions"
-     of the ISO/IEC 10118-3:2018. Acceptable for new hashes where required.
-    </simpara>
-    <simpara>
-     Available as of 1.2.0 with libcxcrypt &gt;= 4.5.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="xpass.constants.error">
-  <title>Error codes</title>
-  <varlistentry xml:id="constant.crypt-salt-ok">
-   <term>
-    <constant>CRYPT_SALT_OK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     No error.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-salt-invalid">
-   <term>
-    <constant>CRYPT_SALT_INVALID</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Unknown hashing method or invalid parameters.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-salt-method-disabled">
-   <term>
-    <constant>CRYPT_SALT_METHOD_DISABLED</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Hashing method is no longer allowed to be used.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-salt-method-legacy">
-   <term>
-    <constant>CRYPT_SALT_METHOD_LEGACY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Hashing method is no longer considered strong enough.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.crypt-salt-too-cheap">
-   <term>
-    <constant>CRYPT_SALT_TOO_CHEAP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Cost parameters are considered too cheap.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="xpass.constants.password">
-  <title>Password algorithms</title>
-  <varlistentry xml:id="constant.password-sha512">
-   <term>
-    <constant>PASSWORD_SHA512</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <constant>PASSWORD_SHA512</constant> is used to create new password
-     hashes using the <constant>CRYPT_PREFIX_SHA512</constant> algorithm.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.password-yescrypt">
-   <term>
-    <constant>PASSWORD_YESCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <constant>PASSWORD_YESCRYPT</constant> is used to create new password
-     hashes using the <constant>CRYPT_PREFIX_YESCRYPT</constant> algorithm.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.password-sm3crypt">
-   <term>
-    <constant>PASSWORD_SM3CRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <constant>PASSWORD_SM3CRYPT</constant> is used to create new password
-     hashes using the <constant>CRYPT_PREFIX_SM3CRYPT</constant> algorithm.
-    </simpara>
-    <simpara>
-     Available as of 1.2.0 with libcxcrypt &gt;= 4.5.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.password-sm3-yescrypt">
-   <term>
-    <constant>PASSWORD_SM3_YESCRYPT</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <constant>PASSWORD_SM3_YESCRYPT</constant> is used to create new password
-     hashes using the <constant>CRYPT_PREFIX_SM3_YESCRYPT</constant> algorithm.
-    </simpara>
-    <simpara>
-     Available as of 1.2.0 with libcxcrypt &gt;= 4.5.0.
-    </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/xpass/functions/crypt-checksalt.xml b/reference/xpass/functions/crypt-checksalt.xml
deleted file mode 100644
index 729de799630a..000000000000
--- a/reference/xpass/functions/crypt-checksalt.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.crypt-checksalt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>crypt_checksalt</refname>
-  <refpurpose>Validate a crypt setting string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>null</type></type><methodname>crypt_checksalt</methodname>
-   <methodparam><type>string</type><parameter>salt</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Checks the salt string against the system configuration and reports whether
-   the hashing method and parameters it specifies are acceptable.
-   It is intended to be used to determine whether the user's passphrase should
-   be re-hashed using the currently preferred hashing method.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>salt</parameter></term>
-    <listitem>
-     <simpara>
-      Salt string to check.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns one of the
-   <constant>CRYPT_SALT_<replaceable>*</replaceable></constant>
-   as an <type>int</type>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>crypt_checksalt</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Generate a salt for a legacy method
-$salt = crypt_gensalt(CRYPT_PREFIX_STD_DES);
-// Check the salt
-$test = crypt_checksalt($salt);
-var_dump($test === CRYPT_SALT_METHOD_LEGACY);
-
-// Generate a salt for default method
-$salt = crypt_gensalt();
-// Check the salt
-$test = crypt_checksalt($salt);
-var_dump($test === CRYPT_SALT_OK);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>crypt_gensalt</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/xpass/functions/crypt-gensalt.xml b/reference/xpass/functions/crypt-gensalt.xml
deleted file mode 100644
index fa837c031a5d..000000000000
--- a/reference/xpass/functions/crypt-gensalt.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.crypt-gensalt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>crypt_gensalt</refname>
-  <refpurpose>Compile a string for use as the salt argument to crypt</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>null</type></type><methodname>crypt_gensalt</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>count</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Compile a string for use as the salt argument to <function>crypt</function>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>prefix</parameter></term>
-    <listitem>
-     <simpara>
-      Hashing method.
-      One of the <constant>CRYPT_PREFIX_<replaceable>*</replaceable></constant> constant.
-      If &null;, the best available hashing method will be selected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>count</parameter></term>
-    <listitem>
-     <simpara>
-      Controls the processing cost of the hash;
-      the valid range and exact meaning of count depend on the hashing method,
-      but larger numbers correspond to more costly hashes in
-      terms of CPU time and possibly memory usage.
-      If count is <literal>0</literal>, a low default cost will be selected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string with the setting, or &null; in case of an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>crypt_gensalt</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// Generate the salt
-$salt = crypt_gensalt(CRYPT_PREFIX_BLOWFISH);
-// Hash the password
-$hash = crypt("secret", $salt);
-// Check the hash
-$test = hash_equals(crypt("secret", $hash), $hash);
-var_dump($salt, $hash, $test);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(29) "$2y$05$GcPykP.Am8C1.dGamdpwW."
-string(60) "$2y$05$GcPykP.Am8C1.dGamdpwW.1RR.7uicWvJPZfJfCEizZHqVWwuaJLm"
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>crypt_preferred_method</function></member>
-   <member><function>crypt</function></member>
-   <member><function>hash_equals</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/xpass/functions/crypt-preferred-method.xml b/reference/xpass/functions/crypt-preferred-method.xml
deleted file mode 100644
index 319480e2c23e..000000000000
--- a/reference/xpass/functions/crypt-preferred-method.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.crypt-preferred-method" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>crypt_preferred_method</refname>
-  <refpurpose>Get the prefix of the preferred hash method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type class="union"><type>string</type><type>null</type></type><methodname>crypt_preferred_method</methodname>
-   <void/>
-  </methodsynopsis>
-  <simpara>
-   Get the prefix of the preferred hash method.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns a string with the prefix, or &null; in case of an error.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A <function>crypt_preferred_method</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(crypt_preferred_method());
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-string(3) "$y$"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><function>crypt_gensalt</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/xpass/reference.xml b/reference/xpass/reference.xml
deleted file mode 100644
index b27e0f960cad..000000000000
--- a/reference/xpass/reference.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.xpass" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Xpass &Functions;</title>
-
- &reference.xpass.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/xpass/setup.xml b/reference/xpass/setup.xml
deleted file mode 100644
index 6346f87dcb51..000000000000
--- a/reference/xpass/setup.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<chapter xml:id="xpass.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="xpass.requirements">
-  &reftitle.required;
-  <simpara>
-   This extension requires
-   <link xlink:href="&url.libxcrypt;">libxcrypt</link>
-   version 4.4 or higher.
-  </simpara>
- </section>
-
- <section xml:id="xpass.installation">
-  <title>Installation via PECL</title>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;xpass">&url.pecl.package;xpass</link>.
-  </simpara>
- </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/xpass/versions.xml b/reference/xpass/versions.xml
deleted file mode 100644
index 83dc31ab11af..000000000000
--- a/reference/xpass/versions.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='crypt_gensalt' from='PECL xpass &gt;= 1.1.0'/>
- <function name='crypt_preferred_method' from='PECL xpass &gt;= 1.1.0'/>
- <function name='crypt_checksalt' from='PECL xpass &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/yac/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yac/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yac/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yac/book.xml b/reference/yac/book.xml
deleted file mode 100644
index eb137f716dcf..000000000000
--- a/reference/yac/book.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.yac">
-  &reftitle.intro;
-  <simpara>
-   Yac (Yet Another Cache) is a lock-free, shared memory user data cache,
-   and can be used to replace APC or local memcached.
-  </simpara>
-  <simpara>
-   Yac stores data in shared memory, which makes it visible to every PHP
-   worker of the same machine without any inter-process communication.
-   Instead of locking, Yac relies on atomic slot updates plus a few
-   collision probes, so a cache miss never blocks a request, and a
-   concurrent write can at worst cause a failed store or a missed read
-   that the caller can simply retry.
-  </simpara>
-  <simpara>
-   With no locks and no inter-process communication in the access
-   path, a read is essentially a hash lookup in shared memory. As a
-   result, Yac is extremely fast, with microsecond-level read
-   latency, and its throughput can scale with the number of
-   workers as long as writes are spread across keys; see the
-   <link xlink:href="&url.git.hub;laruence/yac/blob/master/README.md#benchmarks">benchmarks</link>.
-  </simpara>
-  <simpara>
-   Because Yac trades correctness guarantees for speed and throughput,
-   it is best suited for data that is expensive to produce but easy to
-   recreate: page fragments, configuration snapshots, small service
-   responses, and other local caches. It should not be used as the
-   authoritative store for irreplaceable data.
-  </simpara>
-  <simpara>
-   As of yac 2.4.0, small scalar values —
-   <constant>NULL</constant>, booleans, most integers (those that fit in
-   60 signed bits on 64-bit builds), strings of up to 7 bytes and empty
-   arrays — are stored directly inside the hash slot
-   instead of in a separate value block ("embedded values"), which
-   removes the value-memory allocation and block copy on every access
-   and significantly improves performance while reducing memory usage.
-   Version 2.4.0 also switched the compression backend from FastLZ to
-   LZ4, making compressed reads several times faster.
-  </simpara>
-  <note>
-   <simpara>
-    Shared memory is only visible within one machine. To share a cache
-    across several servers, use a network cache such as Memcached or
-    Redis instead.
-   </simpara>
-  </note>
- </preface>
-
- &reference.yac.setup;
- &reference.yac.memory;
- &reference.yac.constants;
- <!-- &reference.yac.examples; -->
- &reference.yac.yac;
-
-</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/yac/constants.xml b/reference/yac/constants.xml
deleted file mode 100644
index 279d23bcde75..000000000000
--- a/reference/yac/constants.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="yac.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.yac-version">
-    <term>
-     <constant>YAC_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The version of the extension as a string.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-max-key-len">
-    <term>
-     <constant>YAC_MAX_KEY_LEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum length of a key in bytes: 48. An instance prefix counts
-      against this limit.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-max-value-raw-len">
-    <term>
-     <constant>YAC_MAX_VALUE_RAW_LEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum length of a value before serialization, in bytes:
-      67,108,863 (<literal>(1 &lt;&lt; 26) - 1</literal>). Larger values
-      are rejected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-max-raw-compressed-len">
-    <term>
-     <constant>YAC_MAX_RAW_COMPRESSED_LEN</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Maximum size of a stored entry, in bytes: 1,048,576 (1M). Values
-      that do not fit even after compression are rejected.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-serializer-php">
-    <term>
-     <constant>YAC_SERIALIZER_PHP</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use the PHP serialize format as serializer (the default).
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-serializer-json">
-    <term>
-     <constant>YAC_SERIALIZER_JSON</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use JSON as the serializer. Requires the extension to be built with
-      <option role="configure">--enable-json</option>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-serializer-igbinary">
-    <term>
-     <constant>YAC_SERIALIZER_IGBINARY</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use igbinary as the serializer. Requires the extension to be built
-      with <option role="configure">--enable-igbinary</option>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-serializer-msgpack">
-    <term>
-     <constant>YAC_SERIALIZER_MSGPACK</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Use msgpack as the serializer. Requires the extension to be built
-      with <option role="configure">--enable-msgpack</option>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yac-serializer">
-    <term>
-     <constant>YAC_SERIALIZER</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-       The serializer currently used by the extension.
-     </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/yac/ini.xml b/reference/yac/ini.xml
deleted file mode 100644
index cbf54bbd01d1..000000000000
--- a/reference/yac/ini.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yac.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Yac &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.yac.compress-threshold">yac.compress_threshold</link></entry>
-      <entry>4K</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.debug">yac.debug</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.enable">yac.enable</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.enable-cli">yac.enable_cli</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link></entry>
-      <entry>8M</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.serializer">yac.serializer</link></entry>
-      <entry>php</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yac.values-memory-size">yac.values_memory_size</link></entry>
-      <entry>64M</entry>
-      <entry><constant>INI_SYSTEM</constant></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.yac.compress-threshold">
-     <term>
-      <parameter>yac.compress_threshold</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Serialized values larger than this number of bytes are
-       compressed (with LZ4, since Yac 2.4.0) before being stored.
-       Values above the <literal>1M</literal> stored entry limit
-       (<constant>YAC_MAX_RAW_COMPRESSED_LEN</constant>) are always
-       compressed regardless of this setting, because they cannot be
-       stored uncompressed. The default of <literal>4K</literal>
-       enables compression; <literal>-1</literal> disables it for
-       values below the stored entry limit, and other positive values
-       are clamped to the
-       <literal>1024</literal>..<literal>1M</literal> range.
-       Compressing large values saves shared memory at the cost of
-       some CPU on both store and retrieve.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.debug">
-     <term>
-      <parameter>yac.debug</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Reserved for debugging. As of Yac 2.4.0 this directive is
-       registered but has no effect.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.enable">
-     <term>
-      <parameter>yac.enable</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Whether Yac is enabled. If disabled, creating a
-       <classname>Yac</classname> instance throws an exception.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.enable-cli">
-     <term>
-      <parameter>yac.enable_cli</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Whether Yac is enabled when running under the
-       <literal>CLI</literal> SAPI. It is disabled by default because
-       command line scripts usually start and stop immediately, and the
-       shared memory segment would be created for nothing.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.keys-memory-size">
-     <term>
-      <parameter>yac.keys_memory_size</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       Amount of shared memory for the table of keys. It caps how many
-       entries can exist at once — the default of
-       <literal>8M</literal> gives around 65,536 entries. Raise this
-       when the hit rate drops and <literal>kicks</literal> climb; see
-       <xref linkend="yac.memory-management"/> for how a full table
-       behaves and when that actually matters.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.values-memory-size">
-     <term>
-      <parameter>yac.values_memory_size</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       Amount of shared memory for storing values. Values are allocated
-       in a bump allocator over segments of 4M each; when no segment has
-       room for a new value, an allocator cursor wraps and the oldest
-       values are silently overwritten ("recycled"). Their reads then
-       degrade to misses, detected by an integrity guard. Enlarge this
-       if <literal>recycles</literal> climb while slots still have room,
-       or enable <link linkend="ini.yac.compress-threshold">yac.compress_threshold</link>
-       to shrink large payloads. See <xref linkend="yac.memory-management"/>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yac.serializer">
-     <term>
-      <parameter>yac.serializer</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       Serializer used to turn arbitrary PHP values into bytes before
-       storing them. Allowed values are <literal>php</literal> (the
-       default), <literal>json</literal>, <literal>igbinary</literal> and
-       <literal>msgpack</literal>. The latter three require the extension
-       to be built with the corresponding support. Binary serializers such
-       as <literal>igbinary</literal> and <literal>msgpack</literal> are
-       typically faster and produce smaller payloads than
-       <literal>php</literal>.
-      </simpara>
-     </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/yac/memory.xml b/reference/yac/memory.xml
deleted file mode 100644
index fce411d067f6..000000000000
--- a/reference/yac/memory.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yac.memory-management" xmlns="http://docbook.org/ns/docbook">
- <title>Memory Management</title>
-
- <simpara>
-  Yac keeps its data in two independent shared-memory pools, configured
-  with
-  <link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link>
-  and
-  <link linkend="ini.yac.values-memory-size">yac.values_memory_size</link>.
-  They fill up and free up in different ways, so it helps to know which
-  pool a symptom belongs to before touching either knob.
- </simpara>
-
- <section xml:id="yac.memory-layout" annotations="chunk:false">
-  <title>What Each Pool Holds</title>
-  <simpara>
-   The two pools store different halves of an entry. The key pool holds
-   the keys: one slot per cached key, carrying the key itself (up to 48
-   bytes) together with its hash, TTL, hit count and last-access time;
-   the value is only referenced through a pointer to the value pool. The
-   value pool holds the values: every stored value occupies one block of
-   serialized bytes — the compressed form when the entry went through
-   <link linkend="ini.yac.compress-threshold">yac.compress_threshold</link>.
-  </simpara>
-  <simpara>
-   The one exception is embedded values: tiny scalars — &null;,
-   &true;, &false;, most integers (those that fit in 60 signed bits on
-   64-bit builds), strings of up to 7 bytes and empty arrays — are
-   stored directly inside the slot, in the pointer that would otherwise
-   reference a block. Such values occupy no space in the value pool at
-   all; only their key does.
-  </simpara>
-  <para>
-   As a rough sizing guide:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      the key pool holds around 8,000 keys per MB, so size
-      <link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link>
-      as the number of distinct keys divided by 8,000 per MB, rounded up
-      — the default <literal>8M</literal> holds around 64,000 keys;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      the value pool must hold every value that may still be read, so
-      size
-      <link linkend="ini.yac.values-memory-size">yac.values_memory_size</link>
-      as the number of live values times their average serialized size
-      (after compression), and allow roughly twice that: the pool is a
-      ring, and a value only dies once the allocator cursor comes back
-      around to overwrite it.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-   Embedded values occupy a slot like any other entry, but consume no
-   space in the value pool, so leave them out of the second calculation.
-  </para>
- </section>
-
- <section xml:id="yac.memory-keys" annotations="chunk:false">
-  <title>The key pool (slots)</title>
-  <simpara>
-   <link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link>
-   holds a fixed-size table of slots — the default of
-   <literal>8M</literal> gives around 65,536 slots. Each
-   stored key occupies exactly one slot, so this pool caps the number
-   of entries that can exist at once; unlike the value pool, slots are
-   never individually freed. An expired slot — one past its TTL, or the
-   tombstone left by <methodname>Yac::delete</methodname> — is recycled
-   for free when a new key needs it. Only when all four candidate slots
-   of a probe path hold live entries is one of them evicted to make
-   room — one <literal>kick</literal> (the
-   <literal>kicks</literal> counter of <methodname>Yac::info</methodname>).
-  </simpara>
-  <para>
-   The eviction picks among the four live candidates of the colliding
-   probe path only:
-   <itemizedlist>
-    <listitem>
-     <simpara>
-      the least recently used one (the oldest
-      <literal>atime</literal>) is evicted;
-     </simpara>
-    </listitem>
-    <listitem>
-     <simpara>
-      on a tie the least-hit entry, then the earliest probe position.
-     </simpara>
-    </listitem>
-   </itemizedlist>
-  </para>
-  <simpara>
-   A common point of confusion: <literal>slots_used</literal> reaching
-   <literal>slots_size</literal> is <emphasis>not</emphasis> an error
-   condition. A cache whose working set of keys is larger than the slot
-   table simply runs at 100% occupancy from then on, evicting and
-   re-inserting as needed. The only thing that says whether the key
-   pool is sized correctly is the hit rate
-   (<literal>hits / (hits + miss)</literal>, computed over the deltas
-   between two <methodname>Yac::info</methodname> snapshots rather than
-   the lifetime average). A high <literal>kicks</literal> count on its
-   own means nothing is wrong — the key distribution is simply not
-   uniform and some probe paths collide more than others. Only when the
-   hit rate <emphasis>and</emphasis> <literal>kicks</literal> are both
-   bad is the table too small for the key set, and the remedy is a
-   bigger <link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link>.
-  </simpara>
-  <simpara>
-   A second consequence of slots never being freed: entries with no TTL
-   (<literal>ttl = 0</literal>) that are never read again keep occupying
-   a slot until an eviction happens to pick them. If an application
-   stores large amounts of such one-shot data, give those entries a TTL
-   so they expire and can be recycled without displacing live entries,
-   or size the key pool for the full key set.
-  </simpara>
- </section>
-
- <section xml:id="yac.memory-values" annotations="chunk:false">
-  <title>The value pool (segments)</title>
-  <simpara>
-   <link linkend="ini.yac.values-memory-size">yac.values_memory_size</link>
-   is split into segments of 4M each, managed as rings: writes advance a
-   per-segment cursor and space is never freed per entry. When an
-   allocation no longer fits, the cursor wraps back to the start of a
-   segment — one <literal>recycle</literal> (the
-   <literal>recycles</literal> counter of
-   <methodname>Yac::info</methodname>). A recycle does not invalidate
-   the segment at once: overwritten values stay readable until the
-   wrapped cursor actually overwrites them, at which point their reads
-   fail the integrity guard and turn into misses.
-  </simpara>
-  <simpara>
-   Two sizes matter for this pool: the total
-   <link linkend="ini.yac.values-memory-size">yac.values_memory_size</link>
-   must hold the working set of live values, and a single entry can
-   hold at most 1 MB as stored
-   (<constant>YAC_MAX_RAW_COMPRESSED_LEN</constant>). Values larger
-   than that are therefore always compressed before being stored; a
-   value that cannot shrink below 1 MB — most often because it is
-   random data — is rejected and bumps the
-   <literal>fails</literal> counter. The absolute size limit on the
-   value itself is much higher: serialized values above 64 MB
-   (<constant>YAC_MAX_VALUE_RAW_LEN</constant>, that is
-   <literal>(1 &lt;&lt; 26) - 1</literal> bytes) are rejected
-   outright.
-  </simpara>
- </section>
-
- <section xml:id="yac.memory-tuning" annotations="chunk:false">
-  <title>Sizing and what to watch</title>
-  <simpara>
-   Start with the defaults and watch the counters of
-   <methodname>Yac::info</methodname> — they accumulate from
-   <literal>start_time</literal>, so compare two snapshots taken some
-   time apart:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     hit rate healthy (say &gt;= 90%): the cache is fine; nothing to do,
-     whatever the other counters show;
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     hit rate low and <literal>kicks</literal> climbing: the key pool is
-     too small for the key set — live entries get evicted before they are
-     re-read. Raise
-     <link linkend="ini.yac.keys-memory-size">yac.keys_memory_size</link>;
-    </simpara>
-   </listitem>
-   <listitem>
-    <para>
-     <literal>recycles</literal> frequent: this is a real problem, not a
-     benign counter. A recycle means the value allocator has wrapped and is
-     about to overwrite entries — anything overwritten dies before it could
-     be re-read, so the bytes spent storing it were wasted and the hit rate
-     suffers. The value pool is too small for the volume of live data. In
-     order of impact:
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        give entries a TTL. Values written with <literal>ttl = 0</literal>
-        stay live forever, so they keep occupying the pool and force the
-        cursor to wrap sooner. A TTL bounds how long each entry may live,
-        shrinking the live working set the pool has to hold;
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        raise
-        <link linkend="ini.yac.values-memory-size">yac.values_memory_size</link>
-        so the pool holds the whole live value set (remember to budget
-        roughly twice the live footprint — a value only dies once the
-        cursor comes back around to overwrite it);
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        store less per entry: lower
-        <link linkend="ini.yac.compress-threshold">yac.compress_threshold</link>
-        if it is set above the <literal>1024</literal> minimum, so large
-        payloads are compressed, and trim values that do not need to be
-        cached in full;
-       </simpara>
-      </listitem>
-     </itemizedlist>
-    </para>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>fails</literal> growing: values that could not be stored,
-     most often a single value larger than the 1 MB stored-size limit
-     even after compression — split the value.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </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/yac/setup.xml b/reference/yac/setup.xml
deleted file mode 100644
index 4defe5047af7..000000000000
--- a/reference/yac/setup.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yac.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="yac.requirements">
-  &reftitle.required;
-  <simpara>
-   No external library is required.
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- <section xml:id="yac.installation">
-  &reftitle.install;
-  <simpara>
-   Yac can be installed in one of three ways: via PECL, via PIE, or
-   by building it from source.
-  </simpara>
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;yac">&url.pecl.package;yac</link>.
-  </simpara>
-  <simpara>
-   &pecl.windows.download.avail;
-  </simpara>
-  <example>
-   <title>Installing Yac with PECL</title>
-   <programlisting role="shell">
-<![CDATA[
-pecl install yac
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   As of Yac 2.3.2, the extension can be installed with
-   &link.pie;, the PHP Installer for Extensions, by running the
-   following on the command line.
-  </simpara>
-  <example>
-   <title>Installing Yac with PIE</title>
-   <programlisting role="shell">
-<![CDATA[
-pie install laruence/yac
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   Optional serializers can be enabled at install time:
-  </simpara>
-  <example>
-   <title>Installing Yac with PIE and a serializer</title>
-   <programlisting role="shell">
-<![CDATA[
-pie install laruence/yac --enable-json
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The source code is hosted on
-   <link xlink:href="&url.git.hub;laruence/yac">GitHub</link>. To
-   build the extension from source, run the following on the command
-   line, replacing the paths with those of the local PHP
-   installation.
-  </simpara>
-  <example>
-   <title>Building Yac from source</title>
-   <programlisting role="shell">
-<![CDATA[
-/path/to/phpize
-./configure --with-php-config=/path/to/php-config
-make && make install
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The following <literal>configure</literal> options are available:
-  </simpara>
-  <simpara>
-   Values are compressed with LZ4 before being stored. The LZ4
-   compression backend was introduced in Yac 2.4.0, replacing the
-   earlier FastLZ. By default, Yac uses the LZ4 copy bundled with the
-   extension; no extra flag is needed. To link against the system LZ4
-   library instead, use the
-   <option role="configure">--with-system-lz4</option> switch, which
-   requires the <literal>lz4.h</literal> header and
-   <literal>liblz4</literal> to be installed.
-  </simpara>
-  <simpara>
-   Alternative serializers can be compiled in with
-   <option role="configure">--enable-json</option>,
-   <option role="configure">--enable-msgpack</option> or
-   <option role="configure">--enable-igbinary</option>, which register the
-   corresponding extension as an optional dependency. The serializer used at
-   runtime is selected with the
-   <link linkend="ini.yac.serializer">yac.serializer</link> ini directive.
-  </simpara>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.yac.ini;
- <!-- }}} -->
-
- <section xml:id="yac.resources">
-  &reftitle.resources;
-  <simpara>
-   This extension does not define any resources.
-  </simpara>
- </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/yac/versions.xml b/reference/yac/versions.xml
deleted file mode 100644
index afb0258b6387..000000000000
--- a/reference/yac/versions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='yac' from='PECL yac &gt;= 1.0.0'/>
- <!-- 2.4.0: embedded values, compression backend switched to LZ4,
-      Yac::info start_time and per-entry hits; see RELEASE_NOTES -->
- <function name='yac::__construct' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::add' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::add key' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::add value' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::add ttl' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::set' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::set key' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::set value' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::set ttl' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::__set' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::get' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::get key' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::get cas' from='PECL yac &gt;= 1.0.0, &lt;= 2.3.1'/>
- <function name='yac::get default' from='PECL yac &gt;= 2.4.0'/>
- <function name='yac::__get' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::delete' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::delete key' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::delete delay' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::flush' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::info' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::dump' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::dump limit' from='PECL yac &gt;= 1.0.0'/>
- <function name='yac::dump offset' from='PECL yac &gt;= 2.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
--->
diff --git a/reference/yac/yac.xml b/reference/yac/yac.xml
deleted file mode 100644
index fe96750dda71..000000000000
--- a/reference/yac/yac.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yac" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yac class</title>
- <titleabbrev>Yac</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yac intro -->
-  <section xml:id="yac.intro">
-   &reftitle.intro;
-   <simpara>
-    The <classname>Yac</classname> class is the interface to the cache.
-    Every instance on the same host is a lightweight handle to one
-    shared cache: all instances read and write the same entries, and
-    creating one does no allocation beyond the handle itself.
-   </simpara>
-   <simpara>
-    The optional prefix passed to
-    <methodname>Yac::__construct</methodname> is prepended to every
-    key, so several instances (or applications) can share one cache
-    without their keys colliding. Besides the classic cache operations
-    (<methodname>Yac::add</methodname>,
-    <methodname>Yac::set</methodname>,
-    <methodname>Yac::get</methodname>,
-    <methodname>Yac::delete</methodname> and
-    <methodname>Yac::flush</methodname>), the class provides
-    <methodname>Yac::info</methodname> and
-    <methodname>Yac::dump</methodname> for inspecting the cache, and
-    overloads property access so that reading or writing an object
-    property reads or writes a cache entry.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yac.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yac</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yac</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yac.props.prefix">_prefix</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yac')/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.yac')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yac properties -->
-  <section xml:id="yac.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yac.props.prefix">
-     <term><varname>_prefix</varname></term>
-     <listitem>
-      <simpara>
-       The key prefix set through
-       <methodname>Yac::__construct</methodname>. It is prepended to
-       every key used with the instance; no separator is inserted, so
-       include one in the prefix when needed. The prefix may not exceed
-       <constant>YAC_MAX_KEY_LEN</constant> (48) bytes.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yac.entities.yac;
-
-</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/yac/yac/add.xml b/reference/yac/yac/add.xml
deleted file mode 100644
index 8da46466dc8e..000000000000
--- a/reference/yac/yac/add.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::add</refname>
-  <refpurpose>Store a value without overwriting an existing one</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::add</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::add</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stores a value in the cache. Unlike <methodname>Yac::set</methodname>,
-   it does not overwrite an existing entry that is still valid; the store
-   is rejected in that case.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>string</type> key, or an <type>array</type> of
-      <literal>key =&gt; value</literal> pairs to store in one call.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to store. Every PHP type except <type>resource</type> can
-      be stored. Only used in the single-key form; when
-      <parameter>key</parameter> is an array, this argument is instead the
-      optional <parameter>ttl</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      Time to live in seconds. <literal>0</literal> means the entry never
-      expires by time.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, &false; on failure. A store is also rejected
-   (returning &false;) when the key already exists and has not expired.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::add</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-var_dump($yac->add("foo", "bar"));          // bool(true)
-var_dump($yac->add("foo", "baz"));          // bool(false): "foo" already exists
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Adding an entry with a TTL</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// ttl in seconds; 0 (the default) means the entry never expires
-$yac->add("short-lived", "value", 5);
-sleep(6);
-var_dump($yac->get("short-lived"));        // bool(false): expired
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Adding multiple entries at once</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// store several key => value pairs with one call, with a ttl
-$yac->add(array("a" => 1, "b" => 2), 60);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::set</methodname></member>
-    <member><methodname>Yac::get</methodname></member>
-    <member><methodname>Yac::delete</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/yac/yac/construct.xml b/reference/yac/yac/construct.xml
deleted file mode 100644
index 87b4a3e6d589..000000000000
--- a/reference/yac/yac/construct.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::__construct</refname>
-  <refpurpose>Constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yac::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>prefix</parameter><initializer>""</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates a new <classname>Yac</classname> instance. The optional
-   <parameter>prefix</parameter> is prepended to every key this instance stores,
-   which lets several applications or caches on the same machine use
-   overlapping key names without colliding.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>prefix</parameter></term>
-    <listitem>
-     <simpara>
-      A key prefix, up to 48 bytes (<constant>YAC_MAX_KEY_LEN</constant>).
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Throws an <exceptionname>Exception</exceptionname> if the cache is disabled
-   (<literal>yac.enable=0</literal>), or if <parameter>prefix</parameter> is
-   longer than 48 bytes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-
-$other = new Yac("app2_");
-var_dump($other->get("foo"));    // bool(false): different namespace
-$other->set("foo", "baz");       // stored as "app2_foo"
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::set</methodname></member>
-    <member><methodname>Yac::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/yac/yac/delete.xml b/reference/yac/yac/delete.xml
deleted file mode 100644
index 524a958f4e1c..000000000000
--- a/reference/yac/yac/delete.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::delete</refname>
-  <refpurpose>Remove items from cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::delete</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>delay</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Removes one or more items from the cache.
-  </simpara>
-  <note>
-   <simpara>
-    Deletion is implemented by marking the entry expired rather than
-    clearing its slot: the entry immediately stops being readable, but
-    the slot stays occupied until the same key is stored again or a
-    later write reclaims the slot. As a result, the used-slot count
-    reported by <methodname>Yac::info</methodname> does not decrease
-    after a deletion, and <methodname>Yac::dump</methodname> still
-    lists the deleted entry until its slot is recycled; a non-zero
-    <literal>ttl</literal> in the past marks a deleted or expired
-    entry, so when inspecting the output of
-    <methodname>Yac::dump</methodname>, such entries have to be
-    filtered out by the caller.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>string</type> key, or an <type>array</type> of keys to be
-      removed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>delay</parameter></term>
-    <listitem>
-     <simpara>
-      Number of seconds before the item becomes invalid. When omitted or
-      <literal>0</literal>, the item is invalidated immediately. A positive
-      value keeps the item readable for that many seconds before it
-      expires.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; if the key was not present in
-   the cache. Because a deletion only marks the entry expired, a key
-   that was deleted but not yet overwritten still counts as present:
-   deleting the same key again returns &true;.
-  </simpara>
-  <simpara>
-   When an <type>array</type> of keys is given, &true; is returned
-   only if every key was present; if any key is missing, &false; is
-   returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::delete</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-
-var_dump($yac->delete("foo"));      // bool(true): marked expired
-var_dump($yac->get("foo"));         // bool(false): a miss from now on
-var_dump($yac->delete("foo"));      // bool(true) again: the slot has not
-                                     // been overwritten yet
-var_dump($yac->delete("never"));    // bool(false): was never stored
-
-// a deletion does not free the slot: slots_used does not drop, and
-// the expired entry still shows up in the dump
-var_dump($yac->info()["slots_used"]); // int(1)
-print_r($yac->dump());                // "foo" is still listed; its ttl
-                                       // is in the past
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Delayed deletion</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// keep the entry readable for 60 more seconds before it expires
-$yac->set("tmp", "value");
-var_dump($yac->delete("tmp", 60));    // bool(true)
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Deleting multiple keys at once</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("tmp", "value");
-
-// returns true only when every key was present
-var_dump($yac->delete(array("tmp", "nope"))); // bool(false): "nope" missing
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::set</methodname></member>
-    <member><methodname>Yac::flush</methodname></member>
-    <member><methodname>Yac::info</methodname></member>
-    <member><methodname>Yac::dump</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/yac/yac/dump.xml b/reference/yac/yac/dump.xml
deleted file mode 100644
index 68b3843b335f..000000000000
--- a/reference/yac/yac/dump.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.dump" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::dump</refname>
-  <refpurpose>Dump cache entries for inspection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yac::dump</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>limit</parameter><initializer>100</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>offset</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Dumps metadata of the entries currently stored in the cache. The
-   values themselves are not returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>limit</parameter></term>
-    <listitem>
-     <simpara>
-      Maximum number of entries to return.
-     </simpara>
-     <simpara>
-      Passing <literal>-1</literal> as <parameter>limit</parameter> dumps
-      every entry the cache currently holds. Note that building the
-      full list may use a considerable amount of memory for a large
-      cache; when memory matters, page through the entries with
-      <parameter>limit</parameter> and <parameter>offset</parameter> instead.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>offset</parameter></term>
-    <listitem>
-     <simpara>
-      Number of entries to skip before collecting. This parameter
-      is available as of PECL yac 2.4.0; earlier versions always
-      start from the first entry. Combined with
-      <parameter>limit</parameter>, it can be used to page through a
-      cache that holds more entries than one call may return.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> with one element per dumped entry. Each element
-   is itself an array describing the entry:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><literal>index</literal></term>
-    <listitem><simpara>
-     The slot index of the entry in the hash table.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>hash</literal></term>
-    <listitem><simpara>
-     The 64-bit hash of the key, used for slot probing.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>crc</literal></term>
-    <listitem><simpara>
-     The CRC32 checksum of the stored value, used to detect torn reads.
-     <literal>0</literal> for embedded entries, which have no value block.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>ttl</literal></term>
-    <listitem><simpara>
-     The expiration timestamp (Unix time). <literal>0</literal> means the
-     entry never expires by time. Note that
-     <methodname>Yac::delete</methodname> only marks an entry expired, so
-     deleted entries can still show up in the dump; a non-zero
-     <literal>ttl</literal> in the past indicates an expired or deleted
-     entry.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>k_len</literal></term>
-    <listitem><simpara>
-     The length of the key, in bytes.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>v_len</literal></term>
-    <listitem><simpara>
-     The length of the value, in bytes. For compressed entries this is the
-     length of the <emphasis>original</emphasis> value before compression
-     (as of yac 2.4.0; earlier versions reported the stored, compressed
-     length).
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>c_len</literal></term>
-    <listitem><simpara>
-     Only present for compressed entries (as of yac 2.4.0): the length of
-     the compressed payload actually stored in shared memory, in bytes.
-     Comparing <literal>c_len</literal> with <literal>v_len</literal> shows
-     how much compression saves per entry.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>size</literal></term>
-    <listitem><simpara>
-     The allocated size of the value block in shared memory, in bytes.
-     <literal>0</literal> for embedded entries.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>atime</literal></term>
-    <listitem><simpara>
-     The last access time (Unix time), updated on each successful
-     <methodname>Yac::get</methodname>. When the cache is full, the entry
-     with the oldest <literal>atime</literal> among the candidate slots is
-     evicted first (as of yac 2.4.0).
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>hits</literal></term>
-    <listitem><simpara>
-     A per-entry hit counter, bumped on each successful
-     <methodname>Yac::get</methodname> and reset when the entry is
-     overwritten by a new <methodname>Yac::set</methodname> or
-     <methodname>Yac::add</methodname> (as of yac 2.4.0).
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>embedded</literal></term>
-    <listitem><simpara>
-     Whether the value is stored directly inside the slot instead of in a
-     separate value block (as of yac 2.4.0). Small values —
-     <constant>NULL</constant>, booleans, small integers, strings of up to
-     7 bytes and empty arrays — are embedded this way and allocate no value
-     memory at all; for them <literal>crc</literal> and
-     <literal>size</literal> are reported as <literal>0</literal>.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>key</literal></term>
-    <listitem><simpara>
-     The cache key, without any instance prefix.
-    </simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::dump</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-$yac->set("baz", "qux");
-
-print_r($yac->dump());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [index] => 12345
-            [hash] => 14463105906481965911
-            [crc] => 0
-            [ttl] => 0
-            [k_len] => 3
-            [v_len] => 3
-            [size] => 0
-            [atime] => 1725955200
-            [hits] => 0
-            [embedded] => 1
-            [key] => foo
-        )
-
-    [1] => Array
-        (
-            [index] => 12987
-            [hash] => 15132029420525657053
-            [crc] => 0
-            [ttl] => 0
-            [k_len] => 3
-            [v_len] => 3
-            [size] => 0
-            [atime] => 1725955200
-            [hits] => 0
-            [embedded] => 1
-            [key] => baz
-        )
-
-)
-]]>
-   </screen>
-   <simpara>
-    Entries are listed in slot order, not in the order they were stored.
-    Embedded entries (short scalars kept inside the slot itself) have
-    <literal>crc</literal> and <literal>size</literal> set to zero; entries
-    stored in a separate value block carry their checksum and block size,
-    and compressed entries additionally carry <literal>c_len</literal>.
-   </simpara>
-  </example>
-  <example>
-   <title>Paging through a large cache</title>
-   <simpara>
-    <parameter>limit</parameter> bounds how many entries a single call returns,
-    and <parameter>offset</parameter> skips that many entries before collecting,
-    so the two can be combined to page through a cache that holds more
-    entries than one call may return.
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// fill the cache with 250 entries
-for ($i = 0; $i < 250; $i++) {
-    $yac->set("key$i", $i);
-}
-
-$page_size = 100;
-$page_num  = 2;
-
-// skip the first 100 entries and return the next 100 (page 2)
-$page = $yac->dump($page_size, $page_size * ($page_num - 1));
-
-var_dump(count($page));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(100)
-]]>
-   </screen>
-   <simpara>
-    Fewer entries than requested are returned when the cache holds fewer
-    entries than the requested page covers, and an empty array is returned
-    once the offset points past the last occupied slot.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::info</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/yac/yac/flush.xml b/reference/yac/yac/flush.xml
deleted file mode 100644
index 8204479396c2..000000000000
--- a/reference/yac/yac/flush.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.flush" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::flush</refname>
-  <refpurpose>Flush the cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::flush</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Removes all cached values. Because the cache is shared by every
-    process of the same machine, this empties the cache globally; the
-    key prefix given to <methodname>Yac::__construct</methodname> does
-    not limit what gets flushed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::flush</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-
-$other = new Yac("app2_");
-$other->set("baz", "qux");
-
-// flush empties the whole cache: entries of every instance,
-// regardless of the prefix used when they were stored
-$yac->flush();
-
-var_dump($yac->get("foo"));   // bool(false)
-var_dump($other->get("baz")); // bool(false)
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::delete</methodname></member>
-    <member><methodname>Yac::info</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/yac/yac/get.xml b/reference/yac/yac/get.xml
deleted file mode 100644
index fd8cd0548de4..000000000000
--- a/reference/yac/yac/get.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::get</refname>
-  <refpurpose>Retrieve values from cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yac::get</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-    Retrieve values from cache
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>string</type> key, or an <type>array</type> of keys.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-     <simpara>
-      The value to return when the requested key (or keys) is not
-      present in the cache, available as of yac 2.4.0. When omitted, a
-      miss returns &false;.
-     </simpara>
-     <note>
-      <simpara>
-       Before yac 2.4.0, this argument slot held a by-reference
-       <literal>$cas</literal> token rather than a default value. Code
-       that passed or relied on that token must be updated when
-       upgrading to 2.4.0.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   For a <type>string</type> key, returns the cached value on a hit,
-   otherwise the <parameter>default</parameter> (or &false; when no default
-   was given).
-  </simpara>
-  <simpara>
-   For an <type>array</type> of keys, returns an array containing the
-   found values indexed by their keys. Keys that are not present in
-   the cache are omitted from the result as of yac 2.4.0, or filled
-   with the <parameter>default</parameter> when one was given; before
-   2.4.0, a &false; placeholder was inserted for every missing key.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-$yac->set("foo", "bar");
-var_dump($yac->get("foo"));                 // string(3) "bar"
-var_dump($yac->get("missing"));             // bool(false): a miss
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Telling a stored false apart from a miss</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// a miss and a stored false are indistinguishable without a default;
-// a sentinel default (available as of yac 2.4.0) tells them apart
-$yac->set("flag", false);
-var_dump($yac->get("flag"));                // bool(false): the stored value
-var_dump($yac->get("missing", false));      // bool(false): a miss, same shape
-var_dump($yac->get("flag", "__NONE__"));    // bool(false): the stored value
-var_dump($yac->get("missing", "__NONE__")); // string(8) "__NONE__": a miss
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Getting multiple keys at once</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-$yac->set("foo", "bar");
-$yac->set("foo2", "bar2");
-
-// with an array of keys, only the found keys are present in the result
-var_dump($yac->get(array("foo", "foo2", "missing")));
-// array(2) { ["foo"]=> string(3) "bar" ["foo2"]=> string(4) "bar2" }
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::set</methodname></member>
-    <member><methodname>Yac::__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/yac/yac/getter.xml b/reference/yac/yac/getter.xml
deleted file mode 100644
index 524758760392..000000000000
--- a/reference/yac/yac/getter.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.getter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::__get</refname>
-  <refpurpose>Retrieve a value using property syntax</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yac::__get</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves a value from the cache, invoked when reading a property of a
-   <classname>Yac</classname> instance: <literal>$yac->foo</literal> is
-   equivalent to <literal>$yac->get("foo")</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The property name, used as the cache key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The cached value on a hit, &null; when the key is not present in the
-   cache.
-  </simpara>
-  <note>
-   <simpara>
-    Unlike <methodname>Yac::get</methodname>, property syntax cannot
-    distinguish a stored &null; from a missing key, and only supports
-    single keys.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::__get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-
-var_dump($yac->foo);       // string(3) "bar"
-var_dump($yac->missing);   // NULL
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::get</methodname></member>
-    <member><methodname>Yac::__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/yac/yac/info.xml b/reference/yac/yac/info.xml
deleted file mode 100644
index 572c5fc14f4d..000000000000
--- a/reference/yac/yac/info.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::info</refname>
-  <refpurpose>Status of cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yac::info</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-    Get status of cache system
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns an <type>array</type> with the following keys:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term><literal>memory_size</literal></term>
-    <listitem><simpara>
-     Total shared memory in use, in bytes: the slot table plus the value
-     blocks.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>slots_memory_size</literal></term>
-    <listitem><simpara>
-     Memory reserved for the hash slot table, in bytes.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>values_memory_size</literal></term>
-    <listitem><simpara>
-     Memory reserved for the stored values, in bytes.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>segment_size</literal></term>
-    <listitem><simpara>
-     Size of one value memory segment, in bytes.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>segment_num</literal></term>
-    <listitem><simpara>
-     Number of value memory segments.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>miss</literal></term>
-    <listitem><simpara>
-     Number of cache misses: lookups that found nothing or an expired
-     entry.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>hits</literal></term>
-    <listitem><simpara>
-     Number of cache hits: successful lookups.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>fails</literal></term>
-    <listitem><simpara>
-     Number of failed stores: stores that could not allocate a value
-     block.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>kicks</literal></term>
-    <listitem><simpara>
-     Number of evictions: how often an existing entry had to be evicted
-     because the candidate slot path was full.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>recycles</literal></term>
-    <listitem><simpara>
-     Number of times the allocator reached the end of a segment and
-     wrapped around to its beginning.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>start_time</literal></term>
-    <listitem><simpara>
-     The Unix timestamp at which the shared memory cache was initialized.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>slots_size</literal></term>
-    <listitem><simpara>
-     Total number of hash slots.
-    </simpara></listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><literal>slots_used</literal></term>
-    <listitem><simpara>
-     Number of hash slots currently occupied.
-    </simpara></listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::info</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-$yac->set("foo", "bar");
-
-print_r($yac->info());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [memory_size] => 75497472
-    [slots_memory_size] => 8388608
-    [values_memory_size] => 67108864
-    [segment_size] => 4194304
-    [segment_num] => 16
-    [miss] => 0
-    [hits] => 0
-    [fails] => 0
-    [kicks] => 0
-    [recycles] => 0
-    [start_time] => 1725955200
-    [slots_size] => 65536
-    [slots_used] => 1
-)
-]]>
-   </screen>
-   <simpara>
-    The hit ratio can be computed as <literal>hits / (hits + miss)</literal>;
-    a growing <literal>kicks</literal> or <literal>fails</literal> counter
-    indicates that the cache is under memory pressure.
-   </simpara>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::dump</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/yac/yac/set.xml b/reference/yac/yac/set.xml
deleted file mode 100644
index c6d50eb6b02d..000000000000
--- a/reference/yac/yac/set.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::set</refname>
-  <refpurpose>Store a value into the cache</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::set</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yac::set</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>ttl</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stores a value in the cache. If the key already exists, the existing
-   entry is overwritten, regardless of whether it has expired.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>string</type> key, or an <type>array</type> of
-      <literal>key =&gt; value</literal> pairs to store in one call.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to store. Every PHP type except <type>resource</type> can
-      be stored. Only used in the single-key form; when
-      <parameter>key</parameter> is an array, this argument is instead the
-      optional <parameter>ttl</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>ttl</parameter></term>
-    <listitem>
-     <simpara>
-      Time to live in seconds. <literal>0</literal> means the entry never
-      expires by time.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, &false; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-$yac->set("foo", "bar");                    // store a single value
-$yac->set("foo", "baz");                    // overwrite the existing entry
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Setting an entry with a TTL</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// ttl in seconds: the entry expires after 5 seconds
-$yac->set("short-lived", "value", 5);
-sleep(6);
-var_dump($yac->get("short-lived"));        // bool(false): expired
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Setting multiple entries at once</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-// store several key => value pairs with one call
-$yac->set(array("a" => 1, "b" => 2));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::add</methodname></member>
-    <member><methodname>Yac::get</methodname></member>
-    <member><methodname>Yac::__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/yac/yac/setter.xml b/reference/yac/yac/setter.xml
deleted file mode 100644
index 55227798d11a..000000000000
--- a/reference/yac/yac/setter.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yac.setter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yac::__set</refname>
-  <refpurpose>Store a value using property syntax</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yac::__set</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Stores a value in the cache, invoked when writing a property of a
-   <classname>Yac</classname> instance: <literal>$yac->foo = "bar"</literal>
-   is equivalent to <literal>$yac->set("foo", "bar")</literal>, with no
-   ttl.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-     <simpara>
-      The property name, used as the cache key.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The value to store. Every PHP type except <type>resource</type> can
-      be stored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the stored value.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yac::__set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$yac = new Yac();
-
-$yac->foo = "bar";          // stored without a ttl
-var_dump($yac->get("foo")); // string(3) "bar"
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yac::set</methodname></member>
-    <member><methodname>Yac::__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/yaconf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yaconf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yaconf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yaconf/book.xml b/reference/yaconf/book.xml
deleted file mode 100644
index d968aafa7a96..000000000000
--- a/reference/yaconf/book.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.yaconf">
-  &reftitle.intro;
-  <simpara>
-   <literal>Yet Another Configurations Container</literal>
-   (<acronym>Yaconf</acronym>) is a configuration container. It parses
-   <literal>INI</literal> files when PHP starts up and keeps the result
-   in persistent memory for the whole PHP lifecycle, so every retrieval
-   is a fast hash lookup with no file I/O and no per-request parsing.
-  </simpara>
-  <simpara>
-   Yaconf stores all configurations as interned strings or immutable
-   arrays. They are not refcounted, so retrieving a configuration from
-   Yaconf is effectively zero-copy. Since Yaconf 1.2.0, the whole parsed
-   configuration tree is additionally compacted into a single contiguous
-   block, which lowers memory overhead and improves cache locality.
-  </simpara>
-  <simpara>
-   The parsed configuration lives in persistent memory shared by all
-   PHP-FPM workers through copy-on-write: until a configuration file
-   changes, the workers share the same physical memory pages no matter
-   how many of them are running.
-  </simpara>
-  <simpara>
-   Yaconf supports sections and section inheritance in INI files. On
-   non-ZTS builds it also reloads the files automatically when they
-   change; on ZTS (thread-safe) builds, configurations are loaded at
-   startup and a restart is required to pick up changes.
-  </simpara>
-  <simpara>
-   Since Yaconf 1.2.0, sub-directories of the configured directory are
-   loaded recursively (up to 16 levels deep) and addressed with the
-   directory name as a key level: for example,
-   <literal>Yaconf::get("users.database.master")</literal> reads the
-   <literal>master</literal> key from the file
-   <filename>database.ini</filename> placed in the
-   <filename>users/</filename> sub-directory.
-  </simpara>
-  <simpara>
-   Storing sensitive configurations outside the web tree also lowers
-   the attack surface. Configuration files under the web root can be
-   retrieved by an attacker, for example through a file disclosure
-   vulnerability. With Yaconf, the <filename>.ini</filename> files can
-   instead be placed in a directory readable only by root, such as
-   <filename>/etc/yaconf</filename>: the PHP-FPM master loads the
-   configurations when the service starts, while the forked workers —
-   which run under an unprivileged user and are the ones executing
-   web requests — do not need, and are not given, access to that
-   directory.
-  </simpara>
-  <simpara>
-   Yaconf requires PHP 7.0 or greater.
-  </simpara>
- </preface>
-
- &reference.yaconf.setup;
- &reference.yaconf.yaconf;
-
-</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/yaconf/configure.xml b/reference/yaconf/configure.xml
deleted file mode 100644
index 956afad8ef94..000000000000
--- a/reference/yaconf/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yaconf.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;yaconf">&url.pecl.package;yaconf</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/yaconf/ini.xml b/reference/yaconf/ini.xml
deleted file mode 100644
index 420d19f5badd..000000000000
--- a/reference/yaconf/ini.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yaconf.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Yaconf &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.yaconf.directory">yaconf.directory</link></entry>
-      <entry><literal>""</literal></entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaconf.check-delay">yaconf.check_delay</link></entry>
-      <entry><literal>300</literal></entry>
-      <entry><constant>INI_SYSTEM</constant></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.yaconf.directory">
-     <term>
-      <parameter>yaconf.directory</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       The directory where all INI configuration files are placed. Only
-       files with the <filename>.ini</filename> extension are loaded.
-       Sub-directories are loaded recursively (up to 16 levels deep);
-       each one acts as a key level, so a file
-       <filename>database.ini</filename> placed in the
-       <filename>users/</filename> sub-directory is addressed as
-       <literal>"users.database"</literal>. Available since Yaconf
-       1.2.0; before that only files directly in the directory were
-       loaded.
-      </simpara>
-      <simpara>
-       The examples below assume the following
-       <filename>database.ini</filename> placed in the configured
-       directory, alongside a <filename>features.ini</filename> that
-       carries per-feature settings.
-      </simpara>
-      <example>
-       <title>INI file syntax</title>
-       <programlisting role="ini">
-<![CDATA[
-; database.ini
-name=production                        ; scalar value
-version=PHP_VERSION                    ; PHP constants are resolved
-connection_string=${DATABASE_URL}      ; environment variables are resolved
-options.max_connections=50             ; nested hash key
-options.timeout=30
-
-; array entries, both notations are equivalent
-replicas.0=replica-1.example.com
-replicas[]=replica-2.example.com
-]]>
-       </programlisting>
-      </example>
-      <example>
-       <title>INI sections example</title>
-       <programlisting role="ini">
-<![CDATA[
-; features.ini
-[default]
-cache_enabled=on
-rate_limit=100
-
-; the "premium" section inherits every key from "default" and
-; overrides the ones it redefines
-[premium:default]
-rate_limit=1000
-]]>
-       </programlisting>
-      </example>
-     </listitem>
-   </varlistentry>
-   <varlistentry xml:id="ini.yaconf.check-delay">
-     <term>
-      <parameter>yaconf.check_delay</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       The interval, in seconds, at which Yaconf checks whether any
-       loaded INI file has changed and reloads the changed ones (the
-       change is detected by comparing directory modification times).
-       Setting it to <literal>0</literal> makes Yaconf check on every
-       request.
-      </simpara>
-      <note>
-       <simpara>
-        This directive is only registered in non-ZTS builds. On ZTS
-        (thread-safe) builds configurations are loaded at startup and
-        automatic reloading is not available; restart PHP to pick up
-        changes.
-       </simpara>
-      </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/yaconf/setup.xml b/reference/yaconf/setup.xml
deleted file mode 100644
index 9a9d5d6d8d64..000000000000
--- a/reference/yaconf/setup.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaconf.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="yaconf.requirements">
-  &reftitle.required;
-  <para>
-   Yaconf requires PHP 7.0 and above.
-  </para>
- </section>
-
- <section xml:id="yaconf.installation">
-  &reftitle.install;
-  <simpara>
-   Yaconf can be installed in one of three ways: via PECL, via PIE,
-   or by building it from source.
-  </simpara>
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;yaconf">&url.pecl.package;yaconf</link>.
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </para>
-  <example>
-   <title>Installing Yaconf with PECL</title>
-   <programlisting role="shell">
-<![CDATA[
-pecl install yaconf
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   Since Yaconf 1.2.0, the extension can be installed with
-   &link.pie;, the PHP Installer for Extensions, by running the
-   following on the command line.
-  </simpara>
-  <example>
-   <title>Installing Yaconf with PIE</title>
-   <programlisting role="shell">
-<![CDATA[
-pie install laruence/yaconf
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The source code is hosted on
-   <link xlink:href="&url.git.hub;laruence/yaconf">GitHub</link>. To
-   build the extension from source, run the following on the command
-   line, replacing the paths with those of the local PHP
-   installation.
-  </simpara>
-  <example>
-   <title>Building Yaconf from source</title>
-   <programlisting role="shell">
-<![CDATA[
-/path/to/phpize
-./configure --with-php-config=/path/to/php-config
-make && make install
-]]>
-   </programlisting>
-  </example>
- </section>
-
- &reference.yaconf.ini;
-
- <section xml:id="yaconf.resources">
-  &reftitle.resources;
-  <para>
-
-  </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/yaconf/versions.xml b/reference/yaconf/versions.xml
deleted file mode 100644
index be012b6fd8a3..000000000000
--- a/reference/yaconf/versions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Classes and Methods -->
-
- <function name='yaconf' from='PECL yaconf &gt;= 1.0.0'/>
- <function name='yaconf::get' from='PECL yaconf &gt;= 1.0.0'/>
- <function name='yaconf::has' from='PECL yaconf &gt;= 1.0.0'/>
- <function name='yaconf::__debug_info' from='PECL yaconf &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/yaconf/yaconf.xml b/reference/yaconf/yaconf.xml
deleted file mode 100644
index 1192bed93b67..000000000000
--- a/reference/yaconf/yaconf.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaconf" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaconf class</title>
- <titleabbrev>Yaconf</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaconf intro -->
-  <section xml:id="yaconf.intro">
-   &reftitle.intro;
-   <simpara>
-    Yaconf is a configurations container,
-    it parses INI files, stores the result in
-    PHP when PHP is started, the result lives 
-    with the whole PHP lifecycle.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaconf.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaconf</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaconf</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaconf')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yaconf.entities.yaconf;
-
-</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/yaconf/yaconf/debuginfo.xml b/reference/yaconf/yaconf/debuginfo.xml
deleted file mode 100644
index 834810185cf0..000000000000
--- a/reference/yaconf/yaconf/debuginfo.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaconf.debug-info" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaconf::__debug_info</refname>
-  <refpurpose>Inspect how a configuration value is stored</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>Yaconf::__debug_info</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns debugging information about the value stored under
-   <parameter>name</parameter>: the memory address of the stored value
-   and whether the value still lives inside Yaconf's compacted storage
-   block.
-  </simpara>
-  <warning>
-   <simpara>
-    This method exists solely for Yaconf's own test suite, which
-    uses it to verify that the extension is working correctly.
-    Do not use it in production code, and do not rely on the
-    format of its output: the returned array may change at any
-    time.
-   </simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The configuration name to inspect, using the same dot notation as
-      <methodname>Yaconf::get</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An <type>array</type> with four entries when the configuration
-   exists, &null; otherwise:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <literal>key</literal> — the name that was looked up.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>address</literal> — the memory address of the stored
-     value. Values are stored as interned strings or immutable arrays,
-     so this address stays constant until the configuration is
-     reloaded.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>val</literal> — the stored value itself.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <literal>changed</literal> — &false; while the value's data still
-     lives inside the compacted storage block, meaning the operating
-     system has not had to copy the page (copy-on-write still applies);
-     &true; when the value has been re-allocated outside the block.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaconf::__debug_info</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// assuming app.ini contains name="shop"
-var_dump(Yaconf::__debug_info("app.name"));
-/*
-array(4) {
-  ["key"]=>
-  string(8) "app.name"
-  ["address"]=>
-  string(14) "0x7f8b1c0a3d20"
-  ["val"]=>
-  string(4) "shop"
-  ["changed"]=>
-  bool(false)
-}
-*/
-
-var_dump(Yaconf::__debug_info("app.missing")); // NULL
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaconf::get</methodname></member>
-    <member><methodname>Yaconf::has</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/yaconf/yaconf/get.xml b/reference/yaconf/yaconf/get.xml
deleted file mode 100644
index 9cbbd4e062f0..000000000000
--- a/reference/yaconf/yaconf/get.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaconf.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaconf::get</refname>
-  <refpurpose>Retrieve a configuration value by name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>Yaconf::get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Retrieves the configuration value stored under
-   <parameter>name</parameter>. Names use dot notation to traverse
-   nested keys: <literal>"app"</literal> addresses the whole parsed
-   <filename>app.ini</filename> file,
-   <literal>"app.name"</literal> a key inside it, and since Yaconf
-   1.2.0 <literal>"users.database.master"</literal> a key in the
-   file <filename>database.ini</filename> placed in the
-   <filename>users/</filename> sub-directory. The dot notation
-   supports up to 64 levels of nesting.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The configuration name to look up, using dot notation to
-      traverse nested keys, for example
-      <literal>"app.name"</literal>, <literal>"app.features.1"</literal>
-      or, since Yaconf 1.2.0, <literal>"users.database.master"</literal>
-      for files in sub-directories.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-     <simpara>
-      The value to return when <parameter>name</parameter> is not
-      found. When omitted, &null; is returned.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The stored configuration value, a <type>string</type> or an
-   <type>array</type>, when <parameter>name</parameter> exists;
-   otherwise the <parameter>default</parameter> (or &null; when no
-   default was given).
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   The examples below assume the following two files placed in the
-   directory configured with <literal>yaconf.directory</literal>.
-  </simpara>
-  <programlisting role="ini">
-<![CDATA[
-; app.ini
-name="shop"                     ; scalar value
-debug=0                         ; number
-features[]="checkout"           ; array entries, both notations
-features.1="wishlist"
-]]>
-  </programlisting>
-  <programlisting role="ini">
-<![CDATA[
-; users/database.ini, in a sub-directory (Yaconf 1.2.0+)
-master="192.168.0.10"
-replica="192.168.0.20"
-]]>
-  </programlisting>
-  <example>
-   <title><methodname>Yaconf::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// fetch a whole parsed file as an array
-var_dump(Yaconf::get("app"));
-
-// dot notation traverses nested keys
-var_dump(Yaconf::get("app.name"));           // string(4) "shop"
-var_dump(Yaconf::get("app.features.1"));     // string(8) "wishlist"
-
-// since 1.2.0: files in sub-directories are namespaced by the
-// directory name
-var_dump(Yaconf::get("users.database.master")); // string(12) "192.168.0.10"
-
-// when the key is missing, the default is returned
-var_dump(Yaconf::get("app.missing"));             // NULL
-var_dump(Yaconf::get("app.missing", "fallback")); // string(8) "fallback"
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaconf::has</methodname></member>
-    <member><methodname>Yaconf::__debug_info</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/yaconf/yaconf/has.xml b/reference/yaconf/yaconf/has.xml
deleted file mode 100644
index 8a77ab7974ff..000000000000
--- a/reference/yaconf/yaconf/has.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaconf.has" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaconf::has</refname>
-  <refpurpose>Check whether a configuration value exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Yaconf::has</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Determines whether a configuration value exists under
-   <parameter>name</parameter>, which uses the same dot notation as
-   <methodname>Yaconf::get</methodname>: for example, <literal>"app.name"</literal>
-   or, since Yaconf 1.2.0, <literal>"users.database.master"</literal> for
-   files in sub-directories.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The configuration name to look up, using dot notation to
-      traverse nested keys, for example <literal>"app.name"</literal>
-      or <literal>"users.database.master"</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; if a configuration value exists at
-   <parameter>name</parameter>, &false; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <simpara>
-   The examples below assume an <filename>app.ini</filename> placed
-   in the directory configured with <literal>yaconf.directory</literal>,
-   holding the keys <literal>name="shop"</literal> and
-   <literal>debug=0</literal>.
-  </simpara>
-  <example>
-   <title><methodname>Yaconf::has</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-var_dump(Yaconf::has("app.name"));     // bool(true)
-var_dump(Yaconf::has("app.missing"));  // bool(false)
-
-// useful to distinguish a stored empty value from a missing key,
-// where Yaconf::get() would return the same default for both
-if (Yaconf::has("app.debug")) {
-    $debug = (bool) Yaconf::get("app.debug");
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaconf::get</methodname></member>
-    <member><methodname>Yaconf::__debug_info</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/yaf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yaf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yaf/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yaf/appconfig.xml b/reference/yaf/appconfig.xml
deleted file mode 100644
index 6ebd14ddef67..000000000000
--- a/reference/yaf/appconfig.xml
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaf.appconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title xmlns="http://docbook.org/ns/docbook">Application Configuration</title>
- <para>
-  You should give an array of config or an ini config file(see
-  <classname>Yaf_Config_Ini</classname>) path to
-  <methodname>Yaf_Application::__construct</methodname>. 
- </para>
- <para>
-  Yaf will merge the application configurations and user configurations
-  automatically. The application configurations have prefix "yaf." or
-  "application.". If both "yaf." and "application." exist, "application."
-  will be accepted preferentially.
-  <example>
-   <title>An PHP array example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$configs = array(
-    "application" => array(
-        "directory" => dirname(__FILE__),
-        "dispatcher" => array(
-            "catchException" => 0,
-        ),
-        "view" => array(
-            "ext" => "phtml",
-        ),
-    ),
-);
-
-$app = new Yaf_Application($configs);
-
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>An ini file example</title>
-   <programlisting role="ini">
-<![CDATA[
-[yaf]
-yaf.directory = APPLICATION_PATH "/application"
-yaf.dispatcher.catchException = 0
-
-[product : yaf]
-; user configuration list here
-]]>
-   </programlisting>
-  </example>
-  <tip>
-   <simpara>
-    When the configuration grows large, <classname>Yaf_Config_Ini</classname>,
-    which parses the ini file on every request, becomes noticeable overhead.
-    <link xlink:href="&url.pecl.package;yaconf">Yaconf</link> parses all ini
-    files under one directory only once at PHP startup and keeps the parsed
-    values in shared memory. Set
-    <literal>yaconf.directory</literal> to the folder holding the
-    configuration, and pass the returned array to
-    <methodname>Yaf_Application::__construct</methodname>:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// in php.ini: yaconf.directory = /path/to/app/conf
-$app = new Yaf_Application(Yaconf::get("application"));
-?>
-]]>
-   </programlisting>
-   <simpara>
-    A file that contains <literal>[section]</literal> headers is exposed as
-    one entry per section (inheritance, e.g.
-    <literal>[product : yaf]</literal>, already resolved). Retrieve a single
-    section with a dot,
-    <literal>Yaconf::get("application.product")</literal>, and pass that
-    array instead; its keys are exactly the merged entries of that section.
-   </simpara>
-  </tip>
-  </para>
-  <para>
-  <table>
-   <title>Yaf Application Config</title>
-   <tgroup cols="3">
-    <thead>
-     <row>
-      <entry>&Name;</entry>
-      <entry>&Default;</entry>
-      <entry>&Changelog;</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry>application.directory</entry>
-      <entry></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.ext</entry>
-      <entry>"php"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.view.ext</entry>
-      <entry>"phtml"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.modules</entry>
-      <entry>"index"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.library</entry>
-      <entry>application.directory . "/library"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.library.directory</entry>
-      <entry>application.directory . "/library"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.library.namespace</entry>
-      <entry>""</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.bootstrap</entry>
-      <entry>application.directory . "/Bootstrap" . application.ext</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.baseUri</entry>
-      <entry>""</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.defaultRoute</entry>
-      <entry></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.throwException</entry>
-      <entry>1</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.catchException</entry>
-      <entry>0</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.defaultModule</entry>
-      <entry>"index"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.defaultController</entry>
-      <entry>"index"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.dispatcher.defaultAction</entry>
-      <entry>"index"</entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry>application.system</entry>
-      <entry></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="configuration.yaf.directory">
-     <term>
-      <parameter>application.directory</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The directory of the application, that is the folder which contains the
-       "controllers", "views", "models", "plugins" folders.
-      </para>
-      <para>
-       <note>
-        <simpara>
-            This config entry is the only one which doesn't has a default value.
-            You should always define it manually.
-        </simpara>
-       </note>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.ext">
-     <term>
-      <parameter>application.ext</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The file ext of the PHP script, used in class autoloading(
-       <classname>Yaf_Loader</classname>).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.view.ext">
-     <term>
-      <parameter>application.view.ext</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The file ext of the view template scripts.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.modules">
-     <term>
-      <parameter>application.modules</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       A comma-separated list of the registered modules, used in the route
-       process, especially while there are more than three segments in the PATH_INFO, 
-      </para>
-      <para>
-       Yaf need a way to find out whether the first segment is a module name or not.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.library">
-     <term>
-      <parameter>application.library</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The local library directory, see <classname>Yaf_Loader</classname> and
-       <link linkend="ini.yaf.library">yaf.library</link>.
-       </para>
-       <note>
-        <simpara>
-            After Yaf 2.1.6, this config entry can be an array. The library path
-            will try to use the items setted in <link 
-            linkend="configuration.yaf.library.directory">application.library.directory</link>
-        </simpara>
-       </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.library.directory">
-     <term>
-      <parameter>application.library.directory</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Alias of <link
-        linkend="configuration.yaf.library">application.library</link>. Introduced
-       in Yaf 2.1.6
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.library.namespace">
-     <term>
-      <parameter>application.library.namespace</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       A comma-separated prefix of local library namespace.
-      </para>
-      <para>
-       Introduced in Yaf 2.1.6
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.bootstrap">
-     <term>
-      <parameter>application.bootstrap</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       A absolute path of the Bootstrap class script.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.baseuri">
-     <term>
-      <parameter>application.baseUri</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Used to remove a fixed prefix of request uri in route process. 
-       Take a example, comes a request with request uri
-       "/prefix/controller/action". if you set application.baseUri to
-       "/prefix", then only "/controller/action" will take as the PATH_INFO in
-       route process.
-      </para>
-      <para>
-       In generally, there is no need to set this value. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.throwexception">
-     <term>
-      <parameter>application.dispatcher.throwException</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-        If it set to On, Yaf will throw an exception while some error occurring.
-        See also <methodname>Yaf_Dispatcher::throwException</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.catchexception">
-     <term>
-      <parameter>application.dispatcher.catchException</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <para>
-       If it set to On, Yaf will forward to Error controller/Action while
-       there is an unhandled exception. See also
-       <methodname>Yaf_Dispatcher::catchException</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.defaulRoute">
-     <term>
-      <parameter>application.dispatcher.defaultRoute</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The default Route, if it is not specificed, Static route will be used
-       as default. See:
-       <methodname>Yaf_Router::addRoute</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.defaultmodule">
-     <term>
-      <parameter>application.dispatcher.defaultModule</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The default module name, see also
-       <methodname>Yaf_Dispatcher::setDefaultModule</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.defaultcontroller">
-     <term>
-      <parameter>application.dispatcher.defaultController</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The default controller name, see also
-       <methodname>Yaf_Dispatcher::setDefaultController</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="configuration.yaf.dispatcher.defaultaction">
-     <term>
-      <parameter>application.dispatcher.defaultAction</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       The default action name, see also
-       <methodname>Yaf_Dispatcher::setDefaultAction</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="configuration.yaf.system">
-     <term>
-      <parameter>application.system</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <para>
-       Set yaf runtime configure in application.ini, like:
-       <link linkend="ini.yaf.lowcase-path">application.system.lowcase_path</link>
-       <note>
-        <simpara>
-        only those <constant>INI_ALL</constant> configures can be set in this way
-       </simpara>
-       </note>
-      </para>
-     </listitem>
-    </varlistentry>
-
-  </variablelist>
- </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/yaf/book.xml b/reference/yaf/book.xml
deleted file mode 100644
index 39a1e3af3ada..000000000000
--- a/reference/yaf/book.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.yaf">
-  &reftitle.intro;
-  <simpara>
-   The <literal>Yet Another Framework</literal>
-   (<acronym>Yaf</acronym>) extension is a PHP framework that is used to
-   develop web applications.
-  </simpara>
-  <simpara>
-   Unlike typical PHP frameworks, Yaf is written in C and compiled as an
-   extension: the framework classes, the autoloader, the router and the
-   dispatch loop all run in compiled code, so the per-request framework
-   overhead is measured in microseconds rather than milliseconds, and there
-   are no framework PHP files to load. It is designed for high-traffic
-   applications where bootstrap cost matters, and for long-lived service
-   runtimes (such as Swoole) where each request needs a clean dispatch
-   cycle.
-  </simpara>
-  <simpara>
-   Yaf implements the classical <acronym>MVC</acronym> architecture with a
-   single entry script, a configuration file with environment sections,
-   bootstrap hooks, a plugin system with seven dispatch hooks, six built-in
-   route types, a PSR-0 style autoloader
-   (<classname>Yaf_Loader</classname>) and a lightweight PHP template view
-   (<classname>Yaf_View_Simple</classname>).
-  </simpara>
-  <simpara>
-   A simple Yaf benchmark can be found at
-   <link xlink:href="&url.yaf.benchmarks;">Yaf Performance</link>. For a
-   quick start guide, please refer to the
-   <link linkend="yaf.tutorials">Tutorials</link> section.
-  </simpara>
-  <note>
-   <simpara>
-    Yaf requires PHP 7.0 or newer (the master branch of its source
-    repository); a php5 branch supports PHP 5.2 and newer.
-   </simpara>
-  </note>
- </preface>
-
- &reference.yaf.setup;
- &reference.yaf.constants;
- &reference.yaf.tutorials;
- &reference.yaf.appconfig;
- &reference.yaf.yaf-application;
- &reference.yaf.yaf-bootstrap-abstract;
- &reference.yaf.yaf-dispatcher;
- &reference.yaf.yaf-config-abstract;
- &reference.yaf.yaf-config-ini;
- &reference.yaf.yaf-config-simple;
- &reference.yaf.yaf-controller-abstract;
- &reference.yaf.yaf-action-abstract;
- &reference.yaf.yaf-view-interface;
- &reference.yaf.yaf-view-simple;
- &reference.yaf.yaf-loader;
- &reference.yaf.yaf-plugin-abstract;
- &reference.yaf.yaf-registry;
- &reference.yaf.yaf-request-abstract;
- &reference.yaf.yaf-request-http;
- &reference.yaf.yaf-request-simple;
- &reference.yaf.yaf-response-abstract;
- &reference.yaf.yaf-response-cli;
- &reference.yaf.yaf-response-http;
- &reference.yaf.yaf-route-interface;
- &reference.yaf.yaf-route-map;
- &reference.yaf.yaf-route-regex;
- &reference.yaf.yaf-route-rewrite;
- &reference.yaf.yaf-router;
- &reference.yaf.yaf-route-simple;
- &reference.yaf.yaf-route-static;
- &reference.yaf.yaf-route-supervar;
- &reference.yaf.yaf-session;
- &reference.yaf.yaf-exception;
- &reference.yaf.yaf-exception-typeerror;
- &reference.yaf.yaf-exception-startuperror;
- &reference.yaf.yaf-exception-dispatchfailed;     
- &reference.yaf.yaf-exception-routerfailed;
- &reference.yaf.yaf-exception-loadfailed;       
- &reference.yaf.yaf-exception-loadfailed-module;
- &reference.yaf.yaf-exception-loadfailed-controller;
- &reference.yaf.yaf-exception-loadfailed-action;  
- &reference.yaf.yaf-exception-loadfailed-view;  
-
-</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/yaf/configure.xml b/reference/yaf/configure.xml
deleted file mode 100644
index 031b9c7d4395..000000000000
--- a/reference/yaf/configure.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yaf.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;yaf">&url.pecl.package;yaf</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/yaf/constants.xml b/reference/yaf/constants.xml
deleted file mode 100644
index 113e9e06e703..000000000000
--- a/reference/yaf/constants.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="yaf.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <simpara>
-  When an error occurs during startup, routing, dispatching or
-  autoloading, Yaf either throws a subclass of
-  <exceptionname>Yaf_Exception</exceptionname> whose exception code is one of the
-  <literal>YAF_ERR_*</literal> constants, or triggers a PHP error of the
-  corresponding type — see
-  <methodname>Yaf_Dispatcher::throwException</methodname> and
-  <methodname>Yaf_Application::getLastErrorNo</methodname>.
- </simpara>
- <para>
-  <variablelist>
-   <varlistentry xml:id="constant.yaf-version">
-    <term>
-     <constant>YAF_VERSION</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The version of the loaded Yaf extension, e.g.
-      <literal>"3.3.8"</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-environ">
-    <term>
-     <constant>YAF_ENVIRON</constant>
-     (<type>string</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The value of the
-      <link linkend="ini.yaf.environ">yaf.environ</link>
-      directive at the time the extension was started, used by
-      <classname>Yaf_Application</classname> to select the configuration
-      section. Defaults to <literal>"product"</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-startup-failed">
-    <term>
-     <constant>YAF_ERR_STARTUP_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Startup failure, value <literal>512</literal>. Thrown as a
-      <exceptionname>Yaf_Exception_StartupError</exceptionname> when
-      <classname>Yaf_Application</classname> could not be started, e.g. the
-      application directory is missing or the configuration is invalid.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-route-failed">
-    <term>
-     <constant>YAF_ERR_ROUTE_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Routing failure, value <literal>513</literal>. Thrown as a
-      <classname>Yaf_Exception_RouterFailed</classname> when no route was
-      able to route the request.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-dispatch-failed">
-    <term>
-     <constant>YAF_ERR_DISPATCH_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Dispatch failure, value <literal>514</literal>. Thrown as a
-      <classname>Yaf_Exception_DispatchFailed</classname> when the request
-      could not be dispatched, e.g. when the
-      <link linkend="ini.yaf.forward-limit">yaf.forward_limit</link> is
-      exceeded.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-notfound-module">
-    <term>
-     <constant>YAF_ERR_NOTFOUND_MODULE</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The module could not be found, value <literal>515</literal>. Thrown
-      as a <classname>Yaf_Exception_LoadFailed_Module</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-notfound-controller">
-    <term>
-     <constant>YAF_ERR_NOTFOUND_CONTROLLER</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The controller could not be found, value <literal>516</literal>.
-      Thrown as a
-      <classname>Yaf_Exception_LoadFailed_Controller</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-notfound-action">
-    <term>
-     <constant>YAF_ERR_NOTFOUND_ACTION</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The action could not be found, value <literal>517</literal>. Thrown
-      as a <classname>Yaf_Exception_LoadFailed_Action</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-notfound-view">
-    <term>
-     <constant>YAF_ERR_NOTFOUND_VIEW</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      The view script could not be found, value <literal>518</literal>.
-      Thrown as a <classname>Yaf_Exception_LoadFailed_View</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-call-failed">
-    <term>
-     <constant>YAF_ERR_CALL_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Calling a method failed, value <literal>519</literal>. Used when an
-      action method or another callable could not be invoked.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-autoload-failed">
-    <term>
-     <constant>YAF_ERR_AUTOLOAD_FAILED</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Autoloading failed, value <literal>520</literal>. Triggered by
-      <classname>Yaf_Loader</classname> when the file for a class cannot
-      be loaded, e.g. the resolved path is too long.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-type-error">
-    <term>
-     <constant>YAF_ERR_TYPE_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      A type error occurred, value <literal>521</literal>. Thrown as a
-      <exceptionname>Yaf_Exception_TypeError</exceptionname> when an argument or a
-      class definition has an unexpected type, e.g. a controller that is
-      not a class extending
-      <classname>Yaf_Controller_Abstract</classname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry xml:id="constant.yaf-err-access-error">
-    <term>
-     <constant>YAF_ERR_ACCESS_ERROR</constant>
-     (<type>int</type>)
-    </term>
-    <listitem>
-     <simpara>
-      Access is not allowed, value <literal>522</literal>. Used, for
-      example, when attempting to call an action method that is not
-      public.
-     </simpara>
-     <simpara>
-      (Available since Yaf 3.2.0.)
-     </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/yaf/ini.xml b/reference/yaf/ini.xml
deleted file mode 100644
index ce4624f2f99a..000000000000
--- a/reference/yaf/ini.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yaf.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Yaf &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.yaf.library">yaf.library</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.environ">yaf.environ</link></entry>
-      <entry>"product"</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.forward-limit">yaf.forward_limit</link></entry>
-      <entry>5</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.use-namespace">yaf.use_namespace</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.action-prefer">yaf.action_prefer</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.lowcase-path">yaf.lowcase_path</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.use-spl-autoload">yaf.use_spl_autoload</link></entry>
-      <entry>0</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.name-suffix">yaf.name_suffix</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yaf.name-separator">yaf.name_separator</link></entry>
-      <entry>""</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <note>
-   <simpara>
-    The <literal>yaf.cache_config</literal> directive existed in Yaf 2.x,
-    where it cached the parsed result of the INI configuration file within
-    the PHP process. It was removed in Yaf 3.0.0 and is no longer
-    recognized.
-   </simpara>
-  </note>
- </para>
-
- <para>
-  <variablelist>
-   <varlistentry xml:id="ini.yaf.library">
-     <term>
-      <parameter>yaf.library</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       The global library directory. <classname>Yaf_Loader</classname>
-       searches this directory for classes that can not be found in the
-       application's local library (see
-       <link linkend="configuration.yaf.library">application.library</link>).
-      </simpara>
-      <simpara>
-       See also <methodname>Yaf_Loader::getLibraryPath</methodname> and
-       <methodname>Yaf_Loader::setLibraryPath</methodname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.environ">
-     <term>
-      <parameter>yaf.environ</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       The environment name, <literal>"product"</literal> by default. It is
-       used by <classname>Yaf_Application</classname> to pick the section of
-       the INI configuration file (its first constructor argument) that
-       becomes the application configuration.
-      </simpara>
-      <simpara>
-       For example, if this value is <literal>"product"</literal>, Yaf will
-       use the section named <literal>[product]</literal> in the INI
-       configuration file as the final configuration of the
-       <classname>Yaf_Application</classname>. The environment name can also
-       be overridden per application by passing the second constructor
-       argument to <methodname>Yaf_Application::__construct</methodname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.forward-limit">
-     <term>
-      <parameter>yaf.forward_limit</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       The maximum number of times
-       <methodname>Yaf_Controller_Abstract::forward</methodname> can be
-       chained in a single request, <literal>5</literal> by default.
-      </simpara>
-      <simpara>
-       This is a protection against recursive
-       <methodname>Yaf_Controller_Abstract::forward</methodname> loops; when
-       the limit is exceeded, a <classname>Yaf_Exception_DispatchFailed</classname>
-       is thrown. Non-positive values are clamped to the default.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.use-namespace">
-     <term>
-      <parameter>yaf.use_namespace</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       When enabled, all classes declared by Yaf are named in namespace
-       style:
-      </simpara>
-      <screen>
-<![CDATA[
-Yaf_Route_Rewrite => \Yaf\Route\Rewrite
-Yaf_Request_Http  => \Yaf\Request\Http
-]]>
-      </screen>
-      <simpara>
-       There is an exception for classes whose last component is a reserved
-       keyword of PHP and thus cannot be used as a class name; such classes
-       keep the underscore in their last component:
-      </simpara>
-      <screen>
-<![CDATA[
-Yaf_Controller_Abstract => \Yaf\Controller_Abstract
-Yaf_Route_Static        => \Yaf\Route_Static
-]]>
-      </screen>
-      <note>
-       <simpara>
-        Only one of the two naming styles is registered when the extension
-        starts, so this directive must be set before the extension is
-        loaded; it can not be toggled per request in any meaningful way.
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.action-prefer">
-     <term>
-      <parameter>yaf.action_prefer</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       When there is only one part in the <literal>PATH_INFO</literal>,
-       decides whether it should be considered as a controller name or as an
-       action name.
-      </simpara>
-      <simpara>
-       If this configure is on, the single segment is considered as an
-       action name, and the controller name falls back to the default
-       controller; otherwise it is considered as a controller name.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.lowcase-path">
-     <term>
-      <parameter>yaf.lowcase_path</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Whether to lowercase all path components during class autoloading.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.use-spl-autoload">
-     <term>
-      <parameter>yaf.use_spl_autoload</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       When this value is on, if <classname>Yaf_Loader</classname> can not
-       find a class, it will return &false;, giving other autoload functions
-       a chance to be called.
-      </simpara>
-      <simpara>
-       When this value is off (the default), if
-       <classname>Yaf_Loader</classname> can not find a class, it will
-       return &true;, and the class autoloading fails immediately:
-       <methodname>Yaf_Loader::autoload</methodname> always returns &true;
-       in that mode.
-      </simpara>
-      <note>
-       <simpara>
-        Yaf registers its loader during the instantiation of a
-        <classname>Yaf_Application</classname>, so any other autoloaders
-        registered before the instantiation will be called before
-        <methodname>Yaf_Loader::autoload</methodname>.
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.name-suffix">
-     <term>
-      <parameter>yaf.name_suffix</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       When this is on (the default), <classname>Yaf_Loader</classname>
-       identifies an MVC class by its suffix to decide whether it is a
-       controller or an action class: <literal>IndexController</literal>,
-       <literal>IndexAction</literal>.
-      </simpara>
-      <simpara>
-       When this is off, <classname>Yaf_Loader</classname> looks at the
-       prefix of the class name instead:
-       <literal>Controller_Index</literal>, <literal>Action_Index</literal>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yaf.name-separator">
-     <term>
-      <parameter>yaf.name_separator</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       When this is not empty, <classname>Yaf_Loader</classname> identifies
-       MVC classes by this separator instead of the underscore that
-       separates the name and the MVC suffix.
-      </simpara>
-      <simpara>
-       For example, when this value is <literal>"_"</literal> and
-       <link linkend="ini.yaf.name-suffix">yaf.name_suffix</link> is on,
-       <classname>Yaf_Loader</classname> will take
-       <literal>Index_Controller</literal> as a controller class, while
-       <literal>IndexController</literal> is considered a normal class.
-       When it is empty (the default), the underscore is used.
-      </simpara>
-     </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/yaf/setup.xml b/reference/yaf/setup.xml
deleted file mode 100644
index d0ad3fbbe596..000000000000
--- a/reference/yaf/setup.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaf.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Installation -->
- <section xml:id="yaf.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;yaf">&url.pecl.package;yaf</link>.
-  </para>
-  <para>
-   Yaf has no external dependencies. Install it with:
-   <screen>
-<![CDATA[
-$ pecl install yaf
-]]>
-   </screen>
-   As of 3.3.8, Yaf can also be installed with &link.pie;, the PHP
-   Installer for Extensions:
-   <screen>
-<![CDATA[
-$ pie install laruence/yaf
-]]>
-   </screen>
-  </para>
-  <para>
-   The source code is hosted on
-   <link xlink:href="&url.git.hub;laruence/yaf">GitHub</link>. To build the
-   extension from source:
-   <screen>
-<![CDATA[
-$ git clone https://github.com/laruence/yaf.git
-$ cd yaf
-$ phpize
-$ ./configure --enable-yaf
-$ make && make install
-]]>
-   </screen>
-   and load it by adding the following line to the
-   <filename>php.ini</filename>:
-   <screen>
-<![CDATA[
-extension=yaf.so
-]]>
-   </screen>
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.yaf.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/yaf/tutorials.xml b/reference/yaf/tutorials.xml
deleted file mode 100644
index a1ce857edc09..000000000000
--- a/reference/yaf/tutorials.xml
+++ /dev/null
@@ -1,414 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaf.tutorials" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
-
- <section xml:id="yaf.tutorials.quickstart">
-  <title>Quick Start</title>
-
- <example>
-  <title>A classic Application directory layout</title>
-  <screen>
-<![CDATA[
-- .htaccess           // Rewrite rules
-+ public/
-  | - index.php       // Application entry
-  | + css/
-  | + js/
-  | + img/
-+ conf/
-  | - application.ini // Application config
-- application/
-  - Bootstrap.php     // Bootstrap
-  + controllers/
-     - Index.php      // Default controller
-  + views/
-     |+ index/
-        - index.phtml // View template for default action
-  + library/          // Libraries
-  + models/           // Models
-  + plugins/          // Plugins
-]]>
-  </screen>
-  <simpara>
-   Set the web server <literal>DocumentRoot</literal> to the
-   <filename>public</filename> directory, so that only the public
-   assets are accessible from the web.
-  </simpara>
- </example>
-
- <example>
-  <title>A multi-module Application directory layout</title>
-  <screen>
-<![CDATA[
-+ public/
-+ conf/
-+ application/
-  + modules/
-    + Index/       //default module
-      + controllers/
-      + views/
-    + Admin/       //another module
-      + controllers/
-      + views/
-  + library/
-  + models/
-  + plugins/
-  - Bootstrap.php
-]]>
-  </screen>
-  <simpara>
-   In a multi-module application, each module has its own
-   <literal>controllers</literal> and <literal>views</literal> directory
-   under <literal>application/modules/&lt;ModuleName&gt;/</literal>. The
-   registered modules are declared in
-   <link linkend="configuration.yaf.modules">application.modules</link>.
-  </simpara>
- </example>
-
- <example>
-  <title>Entry</title>
-  <simpara>
-   <filename>index.php</filename> in the public directory is the only way
-   into the application, you should rewrite all requests to it (you can
-   use <filename>.htaccess</filename> in Apache + mod_php, or the
-   equivalent in your web server, see below).
-  </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-define("APPLICATION_PATH",  dirname(dirname(__FILE__)));
-
-$app  = new Yaf_Application(APPLICATION_PATH . "/conf/application.ini");
-$app->bootstrap() //call bootstrap methods defined in Bootstrap.php
- ->run();
-?>
-]]>
-   </programlisting>
- </example>
-
- <example>
-  <title>Rewrite rule</title>
-  <screen>
-<![CDATA[
-#for apache (.htaccess)
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule .* index.php
-
-#for nginx
-server {
-  listen 80;
-  server_name domain.com;
-  root   document_root;
-  index  index.php index.html index.htm;
-
-  location / {
-    try_files $uri $uri/ /index.php?$args;
-  }
-}
-
-#for lighttpd
-$HTTP["host"] =~ "(www.)?domain.com$" {
-  url.rewrite = (
-     "^/(.+)/?$"  => "/index.php/$1",
-  )
-}
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Bootstrap</title>
-  <simpara>
-   Any method of the <classname>Bootstrap</classname> class whose name
-   begins with <literal>_init</literal> is automatically called, in
-   definition order, by
-   <methodname>Yaf_Application::bootstrap</methodname>. Each such method
-   receives the <classname>Yaf_Dispatcher</classname> instance as its
-   argument. Methods with other names are not called automatically.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initConfig(Yaf_Dispatcher $dispatcher)
-    {
-        // called first
-    }
-
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        // called second
-    }
-
-    public function _initRoute(Yaf_Dispatcher $dispatcher)
-    {
-        // called third
-    }
-}
-?>
-]]>
-  </programlisting>
- </example>
-
- <example>
-  <title>Application config</title>
-  <simpara>
-   <filename>application.ini</filename> is the application configuration
-   file. Constants defined in <filename>index.php</filename> can be used
-   in it, and sections can inherit from one another.
-  </simpara>
-   <programlisting role="ini">
-<![CDATA[
-[yaf]
-;APPLICATION_PATH is the constant defined in index.php
-application.directory=APPLICATION_PATH "/application/"
-
-;product section inherit from yaf section
-[product:yaf]
-foo=bar
-]]>
-   </programlisting>
- </example>
-
- <example>
-  <title>Application config as a PHP array</title>
-  <simpara>
-   Besides an INI configuration file, a plain PHP array can also be passed
-   to <methodname>Yaf_Application::__construct</methodname> as the
-   configuration.
-  </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => APPLICATION_PATH . "/application/",
-    ),
-);
-
-$app = new Yaf_Application($config);
-?>
-]]>
-   </programlisting>
- </example>
-
- <example>
-  <title>Default controller</title>
-  <simpara>
-   In Yaf, the default controller is named
-   <classname>IndexController</classname>:
-  </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    // default action name
-    public function indexAction()
-    {
-        $this->getView()->content = "Hello World";
-    }
-}
-?>
-]]>
-   </programlisting>
- </example>
-
- <example>
-  <title>Default view template</title>
-  <simpara>
-   The view script for the default controller/action is
-   <filename>application/views/index/index.phtml</filename>. Yaf provides
-   a small view engine called <classname>Yaf_View_Simple</classname>,
-   whose templates are plain PHP scripts.
-  </simpara>
-   <programlisting role="php">
-<![CDATA[
-<html>
- <head>
-   <title>Hello World</title>
- </head>
- <body>
-   <?php echo $content;?>
- </body>
-</html>
-]]>
-   </programlisting>
- </example>
-
- <example>
-  <title>Run the Application</title>
-  <simpara>
-   Point the browser at the configured domain
-   (e.g. <literal>http://www.example.com</literal>) and the response
-   will look like:
-  </simpara>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-<html>
- <head>
-   <title>Hello World</title>
- </head>
- <body>
-   hello world
- </body>
-</html>
-]]>
-  </screen>
-  <note>
-   <simpara>
-    The minimal example above can also be generated with the Yaf code
-    generator (<filename>tools/cg/yaf_cg</filename>), which ships with
-    the <link xlink:href="&url.git.hub;laruence/yaf/tree/master/tools/cg">Yaf
-    source repository</link>:
-   </simpara>
-   <screen>
-<![CDATA[
-$ cd tools/cg
-$ ./yaf_cg -d output_directory [-a application_name] [--namespace]
-]]>
-   </screen>
-   <simpara>
-    <filename>yaf_cg</filename> generates a more complete, commented
-    skeleton than the one shown in this tutorial: a
-    <filename>public/</filename> entry with rewrite rules, a Bootstrap
-    with configuration, plugin and custom-route setup, an example
-    model, an error controller and view templates. It is a good
-    starting point for a real application.
-   </simpara>
-  </note>
- </example>
-
- </section>
-
- <section xml:id="yaf.tutorials.routes">
-  <title>Custom Routes</title>
-
- <example>
-  <title>Custom routes</title>
-  <simpara>
-   Besides the default <classname>Yaf_Route_Static</classname> route,
-   custom routes can be registered on the
-   <classname>Yaf_Router</classname> route stack, usually in a
-   <literal>_initRoute</literal> method of the Bootstrap, using
-   <methodname>Yaf_Router::addRoute</methodname>. Routes can also be
-   declared in configuration files and loaded with
-   <methodname>Yaf_Router::addConfig</methodname>.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRoute(Yaf_Dispatcher $dispatcher)
-    {
-        $router = $dispatcher->getRouter();
-
-        // /user/123 -> controller=user, action=index, id=123
-        $router->addRoute("user", new Yaf_Route_Rewrite(
-            "/user/:id",
-            array("controller" => "user", "action" => "index")
-        ));
-    }
-}
-?>
-]]>
-  </programlisting>
- </example>
-
- </section>
-
- <section xml:id="yaf.tutorials.plugins">
-  <title>Plugins</title>
-
- <example>
-  <title>Plugins</title>
-  <simpara>
-   A plugin hooks into the dispatch cycle by extending
-   <classname>Yaf_Plugin_Abstract</classname> and overriding one or more
-   of its six hook methods, then is registered on the dispatcher with
-   <methodname>Yaf_Dispatcher::registerPlugin</methodname>, typically in
-   the Bootstrap:
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-class UserPlugin extends Yaf_Plugin_Abstract
-{
-    public function routerStartup(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // before routing: inspect or rewrite the raw request URI
-    }
-
-    public function routerShutdown(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // after routing: module/controller/action are known, good for per-route access control
-    }
-
-    public function dispatchLoopStartup(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // before the dispatch loop: one-time setup shared by all dispatches
-    }
-
-    public function preDispatch(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // before each dispatch: filter parameters or redirect before the action runs
-    }
-
-    public function postDispatch(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // after each dispatch: decorate the response or the rendered view
-    }
-
-    public function dispatchLoopShutdown(
-        Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // after the dispatch loop: final cleanup, logging or flushing
-    }
-}
-
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new UserPlugin());
-    }
-}
-?>
-]]>
-  </programlisting>
- </example>
-
- </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/yaf/versions.xml b/reference/yaf/versions.xml
deleted file mode 100644
index 4a407519b6ef..000000000000
--- a/reference/yaf/versions.xml
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
-
- <function name='yaf_application' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::run' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::execute' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::app' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::getinstance' from='Yaf &gt;=2.2.0'/>
- <function name='yaf_application::environ' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::bootstrap' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::getconfig' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::getmodules' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::getdispatcher' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_application::getlasterrorno' from='Yaf &gt;=2.1.2'/>
- <function name='yaf_application::getlasterrormsg' from='Yaf &gt;=2.1.2'/>
- <function name='yaf_application::clearlasterror' from='Yaf &gt;=2.1.2'/>
- <function name='yaf_application::setappdirectory' from='Yaf &gt;=2.1.4'/>
- <function name='yaf_application::getappdirectory' from='Yaf &gt;=2.1.4'/>
- <function name='yaf_application::__destruct' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_dispatcher' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::enableview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::disableview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::initview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setresponse' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_dispatcher::getapplication' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::getrouter' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::getrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::getresponse' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::seterrorhandler' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setdefaultmodule' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setdefaultcontroller' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::setdefaultaction' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::getdefaultmodule' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_dispatcher::getdefaultcontroller' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_dispatcher::getdefaultaction' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_dispatcher::returnresponse' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::autorender' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::flushinstantly' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::getinstance' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::dispatch' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::throwexception' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::catchexception' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_dispatcher::registerplugin' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_loader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::autoload' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::getinstance' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::registerlocalnamespace' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::registernamespace' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_loader::getlocalnamespace' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::getnamespaces' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_loader::getnamespacepath' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_loader::clearlocalnamespace' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::islocalname' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::import' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_loader::setlibrarypath' from='Yaf &gt;=2.1.4'/>
- <function name='yaf_loader::getlibrarypath' from='Yaf &gt;=2.1.4'/>
-
- <function name='yaf_request_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isget' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::ispost' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isput' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isdelete' from='Yaf &gt;=3.0.5'/>
- <function name='yaf_request_abstract::ispatch' from='Yaf &gt;=3.0.5'/>
- <function name='yaf_request_abstract::ishead' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isoptions' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::iscli' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isxmlhttprequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getserver' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getenv' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getquery' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::getrequest' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::getpost' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::getcookie' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::getraw' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::getfiles' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::get' from='Yaf &gt;=3.2.2'/>
- <function name='yaf_request_abstract::setparam' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getparam' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::clearparams' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_request_abstract::getparams' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getexception' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getmodulename' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getcontrollername' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getactionname' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setmodulename' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setcontrollername' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setactionname' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getmethod' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getlanguage' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setbaseuri' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getbaseuri' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::getrequesturi' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setrequesturi' from='Yaf &gt;=2.1.0'/>
- <function name='yaf_request_abstract::isdispatched' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setdispatched' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::isrouted' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_abstract::setrouted' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_request_http' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getquery' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getpost' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getcookie' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getfiles' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::getraw' from='Yaf &gt;=3.0.7'/>
- <function name='yaf_request_http::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_http::isxmlhttprequest' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_request_simple' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::getquery' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::getrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::getpost' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::getcookie' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::getfiles' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_request_simple::isxmlhttprequest' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_response_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::__destruct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::__tostring' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::setbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::appendbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::prependbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::clearbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::getbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::setheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::setallheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::getheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::clearheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::setredirect' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_abstract::response' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_response_http' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::__destruct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::__tostring' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::setbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::appendbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::prependbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::clearbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::getbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::setheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::setallheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::getheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::clearheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::setredirect' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_http::response' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_response_cli' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::__destruct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::__tostring' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::setbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::appendbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::prependbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::clearbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::getbody' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::setheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::setallheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::getheader' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::clearheaders' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::setredirect' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_response_cli::response' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_controller_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::render' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::display' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getresponse' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getname' from='Yaf &gt;=3.2.0'/>
- <function name='yaf_controller_abstract::getmodulename' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::initview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::setviewpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getviewpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::forward' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::redirect' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getinvokeargs' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::getinvokearg' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::init' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_controller_abstract::__construct' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_action_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::execute' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getcontroller' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getcontrollername' from='Yaf &gt;=3.3.7'/>
- <function name='yaf_action_abstract::render' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::display' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getrequest' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getresponse' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getmodulename' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::initview' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::setviewpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getviewpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::forward' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::redirect' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getinvokeargs' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::getinvokearg' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_action_abstract::__construct' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_config_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_abstract::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_abstract::set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_abstract::readonly' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_abstract::toarray' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_config_ini' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::__isset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::count' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::rewind' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::current' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::next' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::valid' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::key' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::toarray' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::readonly' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::offsetunset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::offsetget' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::offsetexists' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::offsetset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::__get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_ini::__set' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_config_simple' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::__isset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::count' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::offsetunset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::rewind' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::current' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::next' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::valid' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::key' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::readonly' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::toarray' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::__set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::__get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::offsetget' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::offsetexists' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_config_simple::offsetset' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_view_interface' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_interface::assign' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_interface::clear' from='Yaf &gt;=2.1.11'/>
- <function name='yaf_view_interface::display' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_interface::render' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_interface::setscriptpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_interface::getscriptpath' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_view_simple' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::__isset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::assign' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::render' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::eval' from='Yaf &gt;=2.2.0'/>
- <function name='yaf_view_simple::clear' from='Yaf &gt;=2.2.0'/>
- <function name='yaf_view_simple::display' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::assignref' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::setscriptpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::getscriptpath' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::__get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::__set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_view_simple::set' from='Yaf &gt;=2.2.0'/>
-
- <function name='yaf_router' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::addroute' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::addconfig' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::getroute' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::getroutes' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_router::getcurrentroute' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_route_interface' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_interface::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_interface::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_static' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_static::match' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_static::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_static::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_simple' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_simple::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_simple::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_simple::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_supervar' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_supervar::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_supervar::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_supervar::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_rewrite' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_rewrite::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_rewrite::match' from='Yaf &gt;=3.3.8'/>
- <function name='yaf_route_rewrite::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_rewrite::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_regex' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_regex::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_regex::match' from='Yaf &gt;=3.3.8'/>
- <function name='yaf_route_regex::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_regex::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_route_map' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_map::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_map::route' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_route_map::assemble' from='Yaf &gt;=2.3.0'/>
-
- <function name='yaf_plugin_abstract' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::routerstartup' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::routershutdown' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::dispatchloopstartup' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::dispatchloopshutdown' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::predispatch' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::postdispatch' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_plugin_abstract::preresponse' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_registry' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_registry::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_registry::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_registry::has' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_registry::set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_registry::del' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_session' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::getinstance' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::start' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::has' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::del' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::clear' from='Yaf &gt;=2.3.0'/>
- <function name='yaf_session::count' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::rewind' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::next' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::current' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::key' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::valid' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::offsetget' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::offsetset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::offsetexists' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::offsetunset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::__get' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::__isset' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::__set' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_session::__unset' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::getprevious' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::getmessage' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::getcode' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::getfile' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::getline' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::gettrace' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::gettraceasstring' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception::__tostring' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_startuperror' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_startuperror::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_startuperror::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_routerfailed' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_routerfailed::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_routerfailed::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_dispatchfailed' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_dispatchfailed::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_dispatchfailed::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_loadfailed' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_loadfailed_module' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_module::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_module::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_loadfailed_controller' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_controller::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_controller::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_loadfailed_action' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_action::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_action::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_loadfailed_view' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_view::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_loadfailed_view::getprevious' from='Yaf &gt;=1.0.0'/>
-
- <function name='yaf_exception_typeerror' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_typeerror::__construct' from='Yaf &gt;=1.0.0'/>
- <function name='yaf_exception_typeerror::getprevious' from='Yaf &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/yaf/yaf-action-abstract.xml b/reference/yaf/yaf-action-abstract.xml
deleted file mode 100644
index 32401e8bd414..000000000000
--- a/reference/yaf/yaf-action-abstract.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-action-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Action_Abstract class</title>
- <titleabbrev>Yaf_Action_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Action_Abstract intro -->
-  <section xml:id="yaf-action-abstract.intro">
-   &reftitle.intro;
-   <simpara>
-    An action can be defined in a separate file in Yaf (see
-    <classname>Yaf_Controller_Abstract</classname>). That is, an action
-    method can also be a <classname>Yaf_Action_Abstract</classname> class.
-   </simpara>
-   <para>
-    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>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-action-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Action_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Action_Abstract</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Controller_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-action-abstract.props.controller">_controller</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-action-abstract')/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.yaf-controller-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Action_Abstract properties -->
-  <section xml:id="yaf-action-abstract.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-action-abstract.props.controller">
-     <term><varname>_controller</varname></term>
-     <listitem>
-      <simpara>
-       The controller instance that owns this action, retrievable with
-       <methodname>Yaf_Action_Abstract::getController</methodname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-action-abstract;
-
-</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/yaf/yaf-application.xml b/reference/yaf/yaf-application.xml
deleted file mode 100644
index 3ee8c83fa34f..000000000000
--- a/reference/yaf/yaf-application.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-application" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Application class</title>
- <titleabbrev>Yaf_Application</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Application intro -->
-  <section xml:id="yaf-application.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Application</classname> provides a bootstrapping facility
-    for applications which provides reusable resources, common- and
-    module-based bootstrap classes and dependency checking.
-   </simpara>
-   <note>
-    <simpara>
-     <classname>Yaf_Application</classname> implements the singleton
-     pattern, and <classname>Yaf_Application</classname> can not be
-     serialized or unserialized, which will cause problems when you try
-     to use PHPUnit to write some test cases for Yaf.
-    </simpara>
-    <simpara>
-     You may use the <literal>@backupGlobals</literal> annotation of
-     PHPUnit to control the backup and restore operations for global
-     variables, thus solving this problem.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-application.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Application</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Yaf_Application</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.config">config</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.dispatcher">dispatcher</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <modifier>static</modifier>
-     <varname linkend="yaf-application.props.app">_app</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.modules">_modules</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.running">_running</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.environ">_environ</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.err-no">_err_no</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-application.props.err-msg">_err_msg</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-application')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-application')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Yaf_Application properties -->
-  <section xml:id="yaf-application.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-application.props.config">
-     <term><varname>config</varname></term>
-     <listitem>
-      <simpara>The application configuration object.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.dispatcher">
-     <term><varname>dispatcher</varname></term>
-     <listitem>
-      <simpara>The <classname>Yaf_Dispatcher</classname> instance used by
-       this application.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.app">
-     <term><varname>_app</varname></term>
-     <listitem>
-      <simpara>Static reference to the single running application
-       instance.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.modules">
-     <term><varname>_modules</varname></term>
-     <listitem>
-      <simpara>The list of registered module names, parsed from
-       <link linkend="configuration.yaf.modules">application.modules</link>.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.running">
-     <term><varname>_running</varname></term>
-     <listitem>
-      <simpara>Whether the application is currently running.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.environ">
-     <term><varname>_environ</varname></term>
-     <listitem>
-      <simpara>The environment name of the application, defaults to
-       <literal>"product"</literal>.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.err-no">
-     <term><varname>_err_no</varname></term>
-     <listitem>
-      <simpara>The code of the last error, one of the
-       <link linkend="yaf.constants">YAF_ERR_*</link> constants.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-application.props.err-msg">
-     <term><varname>_err_msg</varname></term>
-     <listitem>
-      <simpara>The message of the last error.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-application;
-
-</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/yaf/yaf-bootstrap-abstract.xml b/reference/yaf/yaf-bootstrap-abstract.xml
deleted file mode 100644
index 1c8fde97b21f..000000000000
--- a/reference/yaf/yaf-bootstrap-abstract.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-bootstrap-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Bootstrap_Abstract class</title>
- <titleabbrev>Yaf_Bootstrap_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Bootstrap_Abstract intro -->
-  <section xml:id="yaf-bootstrap-abstract.intro">
-   &reftitle.intro;
-   <para>
-     Bootstrap is a mechanism used to do some initial config before a
-     Application run.
-   </para>
-   <para>
-     User may define their own Bootstrap class by inheriting
-     <classname>Yaf_Bootstrap_Abstract</classname>
-   </para>
-   <para>
-     Any method declared in Bootstrap class with leading "_init", will be
-     called by <methodname>Yaf_Application::bootstrap</methodname> one by one 
-     according to their defined order. 
-   </para>
-  </section>
-<!-- }}} -->
-
- <section role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Bootstrap example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-   /* bootstrap class should be defined under ./application/Bootstrap.php */
-   class Bootstrap extends Yaf_Bootstrap_Abstract {
-        public function _initConfig(Yaf_Dispatcher $dispatcher) {
-            var_dump(__METHOD__);
-        }
-        public function _initPlugin(Yaf_Dispatcher $dispatcher) {
-            var_dump(__METHOD__);
-        }
-   }
-
-   $config = array(
-       "application" => array(
-           "directory" => dirname(__FILE__) . "/application/",
-       ),
-   );
- 
-   $app = new Yaf_Application($config);
-   $app->bootstrap();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(22) "Bootstrap::_initConfig"
-string(22) "Bootstrap::_initPlugin"
-]]>
-   </screen>
-  </example>
- </section>
-
-  <section xml:id="yaf-bootstrap-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Bootstrap_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>Yaf_Bootstrap_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
-</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/yaf/yaf-config-abstract.xml b/reference/yaf/yaf-config-abstract.xml
deleted file mode 100644
index 291d66e50a09..000000000000
--- a/reference/yaf/yaf-config-abstract.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-config-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Config_Abstract class</title>
- <titleabbrev>Yaf_Config_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Config_Abstract intro -->
-  <section xml:id="yaf-config-abstract.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Config_Abstract</classname> is the base class of the
-    configuration adapters. It provides a uniform way to access a set of
-    configuration values through nested property syntax
-    (<literal>$config->section->key</literal>), array access and
-    iteration. Concrete implementations are
-    <classname>Yaf_Config_Ini</classname> (read-only, INI files with
-    section inheritance) and <classname>Yaf_Config_Simple</classname>
-    (PHP arrays, mutable).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-config-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Config_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>Yaf_Config_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-config-abstract.props.config">_config</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-config-abstract.props.readonly">_readonly</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Config_Abstract properties -->
-  <section xml:id="yaf-config-abstract.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-config-abstract.props.config">
-     <term><varname>_config</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-config-abstract.props.readonly">
-     <term><varname>_readonly</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-config-abstract;
-
-</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/yaf/yaf-config-ini.xml b/reference/yaf/yaf-config-ini.xml
deleted file mode 100644
index 2a0a98dd8a5a..000000000000
--- a/reference/yaf/yaf-config-ini.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-config-ini" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Config_Ini class</title>
- <titleabbrev>Yaf_Config_Ini</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Config_Ini intro -->
-  <section xml:id="yaf-config-ini.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Config_Ini</classname> enables developers to store
-    configuration data in a familiar INI format and read it in the
-    application by using nested object property syntax. The INI format is
-    specialized to provide both the ability to have a hierarchy of
-    configuration data keys and inheritance between configuration data
-    sections. Configuration data hierarchies are supported by separating
-    the keys with the dot or period character ("<literal>.</literal>"). A
-    section may extend or inherit from another section by following the
-    section name with a colon character ("<literal>:</literal>") and the
-    name of the section from which data are to be inherited.
-   </simpara>
-   <note>
-    <simpara>
-     <classname>Yaf_Config_Ini</classname> utilizes the
-     <function>parse_ini_file</function> PHP function. Please review this
-     documentation to be aware of its specific behaviors, which propagate
-     to <classname>Yaf_Config_Ini</classname>, such as how the special
-     values of "&true;", "&false;", "yes", "no", and "&null;" are handled.
-    </simpara>
-   </note>
-   <tip>
-    <simpara>
-     <classname>Yaf_Config_Ini</classname> parses the configuration file
-     on every request. If an application manages a large amount of
-     (mostly static) configuration, consider the
-     <link linkend="book.yaconf">Yaconf</link> extension instead: it keeps
-     configuration in shared memory across the whole PHP lifecycle, so it
-     is parsed only once and can be accessed much more efficiently.
-     Yaconf understands the very same INI syntax — keys separated by dots,
-     and inheritance between sections through
-     "<literal>[section : parent]</literal>" — so the existing
-     <filename>application.ini</filename> can be served by Yaconf as-is;
-     only the way it is passed to
-     <methodname>Yaf_Application::__construct</methodname> changes (see the
-     tip in <link linkend="yaf.appconfig">Application
-     Configuration</link>).
-    </simpara>
-   </tip>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-config-ini.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Config_Ini</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Config_Ini</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Config_Abstract</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-ini')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-ini')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Config_Ini properties -->
-  <section xml:id="yaf-config-ini.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-config-ini.props.config">
-     <term><varname>_config</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-config-ini.props.readonly">
-     <term><varname>_readonly</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- <section role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Config_Ini</function>example</title>
-   <para>
-    This example illustrates a basic use of Yaf_Config_Ini for loading
-    configuration data from an INI file. In this example there are
-    configuration data for both a production system and for a staging system.
-    Because the staging system configuration data are very similar to those
-    for production, the staging section inherits from the production section.
-    In this case, the decision is arbitrary and could have been written
-    conversely, with the production section inheriting from the staging
-    section, though this may not be the case for more complex situations.
-    Suppose, then, that the following configuration data are contained in
-    /path/to/config.ini:
-   </para>
-   <programlisting role="ini">
-<![CDATA[
-; Production site configuration data
-[production]
-webhost                  = www.example.com
-database.adapter         = pdo_mysql
-database.params.host     = db.example.com
-database.params.username = dbuser
-database.params.password = secret
-database.params.dbname   = dbname
- 
-; Staging site configuration data inherits from production and
-; overrides values as necessary
-[staging : production]
-database.params.host     = dev.example.com
-database.params.username = devuser
-database.params.password = devsecret
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Ini('/path/to/config.ini', 'staging');
- 
-var_dump($config->database->params->host); 
-var_dump($config->database->params->dbname);
-var_dump($config->get("database.params.username"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(15) "dev.example.com"
-string(6) "dbname"
-string(7) "devuser"
-]]>
-   </screen>
-  </example>
-  </section>
-
- </partintro>
-
- &reference.yaf.entities.yaf-config-ini;
-
-</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/yaf/yaf-config-simple.xml b/reference/yaf/yaf-config-simple.xml
deleted file mode 100644
index 5f6f0d22ff9b..000000000000
--- a/reference/yaf/yaf-config-simple.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-config-simple" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Config_Simple class</title>
- <titleabbrev>Yaf_Config_Simple</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Config_Simple intro -->
-  <section xml:id="yaf-config-simple.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Config_Simple</classname> is a configuration adapter
-    backed by a PHP array (or, optionally, an INI file). In contrast to
-    <classname>Yaf_Config_Ini</classname> it is mutable by default:
-    values can be changed at runtime, which makes it suitable both for
-    programmatically built configuration and for configuration that
-    needs to be adjusted during the request.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-config-simple.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Config_Simple</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Config_Simple</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Config_Abstract</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-config-simple.props.readonly">_readonly</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-config-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Config_Simple properties -->
-  <section xml:id="yaf-config-simple.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-config-simple.props.config">
-     <term><varname>_config</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-config-simple.props.readonly">
-     <term><varname>_readonly</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-config-simple;
-
-</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/yaf/yaf-controller-abstract.xml b/reference/yaf/yaf-controller-abstract.xml
deleted file mode 100644
index 8d7c89e99bbf..000000000000
--- a/reference/yaf/yaf-controller-abstract.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-controller-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Controller_Abstract class</title>
- <titleabbrev>Yaf_Controller_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Controller_Abstract intro -->
-  <section xml:id="yaf-controller-abstract.intro">
-   &reftitle.intro;
-   <para>
-    <classname>Yaf_Controller_Abstract</classname> is the heart of Yaf's 
-    system. MVC stands for Model-View-Controller and is a design pattern 
-    targeted at separating application logic from display logic.
-   </para>
-   <para>
-    Every custom controller shall inherit
-    <classname>Yaf_Controller_Abstract</classname>.
-   </para>
-   <simpara>
-    Since <methodname>Yaf_Controller_Abstract::__construct</methodname> is
-    called by Yaf with no arguments,
-    <classname>Yaf_Controller_Abstract</classname> provides an alternative
-    constructor-like hook:
-    <methodname>Yaf_Controller_Abstract::init</methodname>.
-   </simpara>
-   <para>
-    If you have defined a init() method in your custom controller, it will be
-    called as long as the controller was instantiated.
-   </para>
-   <para>
-    Action may have arguments, when a request coming, if there are the same
-    name variable in the request parameters(see
-    <methodname>Yaf_Request_Abstract::getParam</methodname>) after routed, 
-    Yaf will pass them to the action method
-    (see <methodname>Yaf_Action_Abstract::execute</methodname>).
-    <note>
-     <simpara>
-      These arguments are directly fetched without filtering, it should be 
-      carefully processed before use them.
-     </simpara>
-    </note>
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-controller-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Controller_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>abstract</modifier>
-      <classname>Yaf_Controller_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.actions">actions</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.module">_module</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.name">_name</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.request">_request</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.response">_response</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.invoke-args">_invoke_args</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-controller-abstract.props.view">_view</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-controller-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-controller-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Controller_Abstract properties -->
-  <section xml:id="yaf-controller-abstract.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-controller-abstract.props.actions">
-     <term><varname>actions</varname></term>
-     <listitem>
-      <para>
-      You can also define an action method in a separate PHP script by using
-      this property and <classname>Yaf_Action_Abstract</classname>.
-      <example>
-       <title>define action in a separate file</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract {
-    protected $actions = array(
-        /** now dummyAction is defined in a separate file */
-        "dummy" => "actions/Dummy_action.php",
-    );
-
-    /* action method may have arguments */
-    public function indexAction($name, $id) {
-       /* $name and $id are unsafe raw data */
-       assert($name == $this->getRequest()->getParam("name"));
-       assert($id   == $this->_request->getParam("id"));
-    }
-}
-?>
-]]>
-        </programlisting>
-      </example>
-      <example>
-       <title>Dummy_action.php</title>
-        <programlisting role="php">
-<![CDATA[
-<?php
-class DummyAction extends Yaf_Action_Abstract {
-    /* an action class shall define this method as the entry point */
-    public function execute() {
-    }
-}
-?>
-]]>
-        </programlisting>
-      </example>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.module">
-     <term><varname>_module</varname></term>
-     <listitem>
-      <simpara>
-        The name of the module the controller belongs to.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.name">
-     <term><varname>_name</varname></term>
-     <listitem>
-      <simpara>
-        The name of the controller.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.request">
-     <term><varname>_request</varname></term>
-     <listitem>
-      <simpara>
-      The current <classname>Yaf_Request_Abstract</classname> object.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.response">
-     <term><varname>_response</varname></term>
-     <listitem>
-      <simpara>
-      The current <classname>Yaf_Response_Abstract</classname> object.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.invoke-args">
-     <term><varname>_invoke_args</varname></term>
-     <listitem>
-      <simpara>
-      The invocation arguments passed to the action through
-      <methodname>Yaf_Controller_Abstract::forward</methodname>, as an
-      array keyed by argument name.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-controller-abstract.props.view">
-     <term><varname>_view</varname></term>
-     <listitem>
-      <simpara>
-      The <classname>Yaf_View_Interface</classname> object used to render
-      views.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-controller-abstract;
-
-</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/yaf/yaf-dispatcher.xml b/reference/yaf/yaf-dispatcher.xml
deleted file mode 100644
index 1106bdfe3ee1..000000000000
--- a/reference/yaf/yaf-dispatcher.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-dispatcher" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Dispatcher class</title>
- <titleabbrev>Yaf_Dispatcher</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Dispatcher intro -->
-  <section xml:id="yaf-dispatcher.intro">
-   &reftitle.intro;
-   <para>
-    <classname>Yaf_Dispatcher</classname> purpose is to initialize 
-    the request environment, route the incoming request, and then dispatch
-    any discovered actions; it aggregates any responses and returns them 
-    when the process is complete.
-   </para>
-   <para>
-    <classname>Yaf_Dispatcher</classname> also implements the Singleton pattern, 
-    meaning only a single instance of it may be available at any given time. This
-    allows it to also act as a registry on which the other objects in the
-    dispatch process may draw.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-dispatcher.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Dispatcher</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <modifier>final</modifier>
-      <classname>Yaf_Dispatcher</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.router">_router</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.view">_view</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.request">_request</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.plugins">_plugins</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <modifier>static</modifier>
-     <varname linkend="yaf-dispatcher.props.instance">_instance</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.auto-render">_auto_render</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.return-response">_return_response</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.instantly-flush">_instantly_flush</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.default-module">_default_module</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.default-controller">_default_controller</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-dispatcher.props.default-action">_default_action</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-dispatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-dispatcher')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Dispatcher properties -->
-  <section xml:id="yaf-dispatcher.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-dispatcher.props.router">
-     <term><varname>_router</varname></term>
-     <listitem>
-      <simpara>The <classname>Yaf_Router</classname> instance used by the
-       dispatcher to route requests.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.view">
-     <term><varname>_view</varname></term>
-     <listitem>
-      <simpara>The <classname>Yaf_View_Interface</classname> implementation
-       used to render views, lazily initialized on first dispatch.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.request">
-     <term><varname>_request</varname></term>
-     <listitem>
-      <simpara>The request object being dispatched.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.plugins">
-     <term><varname>_plugins</varname></term>
-     <listitem>
-      <simpara>The list of plugins registered with
-       <methodname>Yaf_Dispatcher::registerPlugin</methodname>.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.instance">
-     <term><varname>_instance</varname></term>
-     <listitem>
-      <simpara>Static reference to the single dispatcher
-       instance.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.auto-render">
-     <term><varname>_auto_render</varname></term>
-     <listitem>
-      <simpara>Whether the dispatcher automatically renders the view after
-       dispatching. Defaults to &true;.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.return-response">
-     <term><varname>_return_response</varname></term>
-     <listitem>
-      <simpara>Whether <methodname>Yaf_Application::run</methodname> returns
-       the response object instead of sending it directly. Defaults to
-       &false;.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.instantly-flush">
-     <term><varname>_instantly_flush</varname></term>
-     <listitem>
-      <simpara>Whether the response body is flushed immediately when it is
-       set. Defaults to &true;.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.default-module">
-     <term><varname>_default_module</varname></term>
-     <listitem>
-      <simpara>The default module name, from the
-       <link linkend="configuration.yaf.dispatcher.defaultmodule">application.dispatcher.defaultModule</link>
-       configuration entry.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.default-controller">
-     <term><varname>_default_controller</varname></term>
-     <listitem>
-      <simpara>The default controller name, from the
-       <link linkend="configuration.yaf.dispatcher.defaultcontroller">application.dispatcher.defaultController</link>
-       configuration entry.</simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-dispatcher.props.default-action">
-     <term><varname>_default_action</varname></term>
-     <listitem>
-      <simpara>The default action name, from the
-       <link linkend="configuration.yaf.dispatcher.defaultaction">application.dispatcher.defaultAction</link>
-       configuration entry.</simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-dispatcher;
-
-</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/yaf/yaf-exception-dispatchfailed.xml b/reference/yaf/yaf-exception-dispatchfailed.xml
deleted file mode 100644
index c6eecbdb8c97..000000000000
--- a/reference/yaf/yaf-exception-dispatchfailed.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-dispatchfailed" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_DispatchFailed class</title>
- <titleabbrev>Yaf_Exception_DispatchFailed</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_DispatchFailed intro -->
-  <section xml:id="yaf-exception-dispatchfailed.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_DispatchFailed</classname> is thrown when the
-    dispatcher fails to dispatch the routed request to a controller action.
-    Its error code is <literal>514</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-dispatchfailed.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_DispatchFailed</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_DispatchFailed</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_DispatchFailed properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-loadfailed-action.xml b/reference/yaf/yaf-exception-loadfailed-action.xml
deleted file mode 100644
index 46d6a9722328..000000000000
--- a/reference/yaf/yaf-exception-loadfailed-action.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-loadfailed-action" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_LoadFailed_Action class</title>
- <titleabbrev>Yaf_Exception_LoadFailed_Action</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_LoadFailed_Action intro -->
-  <section xml:id="yaf-exception-loadfailed-action.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_LoadFailed_Action</classname> is thrown when the
-    requested action cannot be found or loaded. Its error code is
-    <literal>517</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-loadfailed-action.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_LoadFailed_Action</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_LoadFailed_Action</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception_LoadFailed</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_LoadFailed_Action properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-loadfailed-controller.xml b/reference/yaf/yaf-exception-loadfailed-controller.xml
deleted file mode 100644
index ec5e454d4800..000000000000
--- a/reference/yaf/yaf-exception-loadfailed-controller.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-loadfailed-controller" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_LoadFailed_Controller class</title>
- <titleabbrev>Yaf_Exception_LoadFailed_Controller</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_LoadFailed_Controller intro -->
-  <section xml:id="yaf-exception-loadfailed-controller.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_LoadFailed_Controller</classname> is thrown when
-    the requested controller cannot be found or loaded. Its error code is
-    <literal>516</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-loadfailed-controller.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_LoadFailed_Controller</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_LoadFailed_Controller</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception_LoadFailed</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_LoadFailed_Controller properties -->
-<!-- }}} -->
-
- </partintro>
-
-</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/yaf/yaf-exception-loadfailed-module.xml b/reference/yaf/yaf-exception-loadfailed-module.xml
deleted file mode 100644
index 4fb6a37a82d9..000000000000
--- a/reference/yaf/yaf-exception-loadfailed-module.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-loadfailed-module" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_LoadFailed_Module class</title>
- <titleabbrev>Yaf_Exception_LoadFailed_Module</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_LoadFailed_Module intro -->
-  <section xml:id="yaf-exception-loadfailed-module.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_LoadFailed_Module</classname> is thrown when the
-    requested module cannot be found or loaded. Its error code is
-    <literal>515</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-loadfailed-module.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_LoadFailed_Module</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_LoadFailed_Module</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception_LoadFailed</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_LoadFailed_Module properties -->
-<!-- }}} -->
-
- </partintro>
-
-</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/yaf/yaf-exception-loadfailed-view.xml b/reference/yaf/yaf-exception-loadfailed-view.xml
deleted file mode 100644
index d02fe0035cbb..000000000000
--- a/reference/yaf/yaf-exception-loadfailed-view.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-loadfailed-view" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_LoadFailed_View class</title>
- <titleabbrev>Yaf_Exception_LoadFailed_View</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_LoadFailed_View intro -->
-  <section xml:id="yaf-exception-loadfailed-view.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_LoadFailed_View</classname> is thrown when the
-    requested view (template) script cannot be found or loaded. Its error code
-    is <literal>518</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-loadfailed-view.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_LoadFailed_View</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_LoadFailed_View</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception_LoadFailed</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_LoadFailed_View properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-loadfailed.xml b/reference/yaf/yaf-exception-loadfailed.xml
deleted file mode 100644
index dbe3eb762d66..000000000000
--- a/reference/yaf/yaf-exception-loadfailed.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-loadfailed" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_LoadFailed class</title>
- <titleabbrev>Yaf_Exception_LoadFailed</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_LoadFailed intro -->
-  <section xml:id="yaf-exception-loadfailed.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_LoadFailed</classname> is thrown when the loader
-    fails to load a required script. Its error code is
-    <literal>520</literal>. The more specific failures are represented by
-    its subclasses <classname>Yaf_Exception_LoadFailed_Module</classname>,
-    <classname>Yaf_Exception_LoadFailed_Controller</classname>,
-    <classname>Yaf_Exception_LoadFailed_Action</classname> and
-    <classname>Yaf_Exception_LoadFailed_View</classname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-loadfailed.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_LoadFailed</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_LoadFailed</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_LoadFailed properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-routerfailed.xml b/reference/yaf/yaf-exception-routerfailed.xml
deleted file mode 100644
index 846c845b9416..000000000000
--- a/reference/yaf/yaf-exception-routerfailed.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-routerfailed" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_RouterFailed class</title>
- <titleabbrev>Yaf_Exception_RouterFailed</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_RouterFailed intro -->
-  <section xml:id="yaf-exception-routerfailed.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Exception_RouterFailed</classname> is thrown when routing
-    fails, for instance when no registered route matches the incoming request.
-    Its error code is <literal>513</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-routerfailed.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_RouterFailed</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_RouterFailed</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_RouterFailed properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-startuperror.xml b/reference/yaf/yaf-exception-startuperror.xml
deleted file mode 100644
index a13ce6f6ba23..000000000000
--- a/reference/yaf/yaf-exception-startuperror.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-startuperror" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_StartupError class</title>
- <titleabbrev>Yaf_Exception_StartupError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_StartupError intro -->
-  <section xml:id="yaf-exception-startuperror.intro">
-   &reftitle.intro;
-   <simpara>
-    <exceptionname>Yaf_Exception_StartupError</exceptionname> is thrown when the
-    application fails to start up, i.e. when an error occurs during the
-    initialization of <classname>Yaf_Application</classname> before routing
-    begins. Its error code is <literal>512</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-startuperror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_StartupError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_StartupError</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_StartupError properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception-typeerror.xml b/reference/yaf/yaf-exception-typeerror.xml
deleted file mode 100644
index e53f4382c95d..000000000000
--- a/reference/yaf/yaf-exception-typeerror.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception-typeerror" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception_TypeError class</title>
- <titleabbrev>Yaf_Exception_TypeError</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception_TypeError intro -->
-  <section xml:id="yaf-exception-typeerror.intro">
-   &reftitle.intro;
-   <simpara>
-    <exceptionname>Yaf_Exception_TypeError</exceptionname> is thrown when an argument
-    passed to a Yaf method is of an unexpected type or an invalid value.
-    Its error code is <literal>521</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception-typeerror.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception_TypeError</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception_TypeError</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Exception_TypeError properties -->
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-exception.xml b/reference/yaf/yaf-exception.xml
deleted file mode 100644
index 5c3a1fad0ad9..000000000000
--- a/reference/yaf/yaf-exception.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-exception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Exception class</title>
- <titleabbrev>Yaf_Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Exception intro -->
-  <section xml:id="yaf-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    <exceptionname>Yaf_Exception</exceptionname> is the base class of all exceptions
-    thrown by Yaf. Every other Yaf exception class extends it.
-   </simpara>
-   <simpara>
-    It extends <exceptionname>RuntimeException</exceptionname> when the SPL extension is
-    loaded, and the built-in <exceptionname>Exception</exceptionname> otherwise.
-    Exceptions raised by Yaf carry an error code that identifies the type of
-    failure.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Exception</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Exception</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>RuntimeException</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.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <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>
-
-  
- </partintro>
-
- &reference.yaf.entities.yaf-exception;
-
-</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/yaf/yaf-loader.xml b/reference/yaf/yaf-loader.xml
deleted file mode 100644
index a45d73818a0a..000000000000
--- a/reference/yaf/yaf-loader.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-loader" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Loader class</title>
- <titleabbrev>Yaf_Loader</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Loader intro -->
-  <section xml:id="yaf-loader.intro">
-   &reftitle.intro;
-   <para>
-    <classname>Yaf_Loader</classname> introduces a comprehensive autoloading
-    solution for Yaf.
-   </para>
-   <para>
-    The first time an instance of <classname>Yaf_Application</classname> is retrieved, 
-    <classname>Yaf_Loader</classname> will instance a singleton, and registers itself with
-    spl_autoload.  You retrieve an instance using the <methodname>Yaf_Loader::getInstance</methodname>
-   </para>
-   <para>
-    <classname>Yaf_Loader</classname> attempt to load a class only one shot, if
-    failed, depend on <link
-     linkend="ini.yaf.use-spl-autoload">yaf.use_spl_autoload</link>, if this
-    config is On <methodname>Yaf_Loader::autoload</methodname> will return 
-    &false;, thus give the chance to other autoload function. if it is Off 
-    (by default), <methodname>Yaf_Loader::autoload</methodname> will return 
-    &true;, and more important is that a very useful warning will be triggered 
-    (very useful to find out why a class could not be loaded). 
-    <note>
-     <simpara>
-      Please keep yaf.use_spl_autoload Off unless there is some library have
-      their own autoload mechanism and impossible to rewrite it.
-     </simpara>
-    </note>
-   </para>
-   <para>
-    By default, <classname>Yaf_Loader</classname> assume all library (class
-    defined script) store in the <link linkend="ini.yaf.library">global library 
-     directory</link>, which is defined in the php.ini(yaf.library).
-   </para>
-
-   <para>
-    If you want <classname>Yaf_Loader</classname> search some
-    classes(libraries) in the <link linkend="yaf-loader.props.library">local class
-     directory</link>(which is defined in application.ini, and by default,
-    it is <link
-     linkend="configuration.yaf.directory">application.directory</link> . "/library"), 
-    you should register the class prefix using the
-    <methodname>Yaf_Loader::registerLocalNameSpace</methodname>
-   </para>
-
-   <para>
-    Let's see some examples(assuming APPLICATION_PATH is <link
-     linkend="configuration.yaf.directory">application.directory</link>):
-    <example>
-     <title>Config example</title>
-      <programlisting role="shell">
-<![CDATA[
-// Assuming the following configure in php.ini:
-yaf.library = "/global_dir"
-
-//Assuming the following configure in application.ini
-application.library = APPLICATION_PATH "/library"
-]]>
-     </programlisting>
-    </example>
-
-    Assuming the following local name space is registered:
-    <example>
-     <title>Register localnamespace</title>
-     <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract{
-     public function _initLoader($dispatcher) {
-          Yaf_Loader::getInstance()->registerLocalNameSpace(array("Foo", "Bar"));
-     }
-}
-?>
-]]>
-     </programlisting>
-    </example>
-
-   Then the autoload examples:
-    <example>
-     <title>Load class example</title>
-      <programlisting role="shell">
-<![CDATA[
-class Foo_Bar_Test =>
-  // APPLICATION_PATH/library/Foo/Bar/Test.php
-  
-class GLO_Name  =>
-  // /global_dir/Glo/Name.php
- 
-class BarNon_Test
-  // /global_dir/Barnon/Test.php
-]]>
-      </programlisting>
-    </example>
-
-   <example>
-    <title>Load namespace class example</title>
-    <programlisting role="shell">
-<![CDATA[
-class \Foo\Bar\Dummy =>
-   // APPLICATION_PATH/library/Foo/Bar/Dummy.php
-
-class \FooBar\Bar\Dummy =>
-   // /global_dir/FooBar/Bar/Dummy.php
-]]>
-    </programlisting> 
-   </example>
-  </para>
-
-  <para>
-    You may noticed that all the folder with the first letter capitalized, you can make them
-    lowercase by set <link linkend="ini.yaf.lowcase-path">yaf.lowcase_path</link> = On in php.ini
-  </para>
-
-  <para>
-   <classname>Yaf_Loader</classname> is also designed to load the MVC classes,
-   and the rule is:
-   <example>
-    <title>MVC class loading example</title>
-    <programlisting role="shell">
-<![CDATA[
-Controller Classes =>
-// APPLICATION_PATH/controllers/
-
-Model Classes =>
-// APPLICATION_PATH/models/
-
-Plugin Classes =>
-// APPLICATION_PATH/plugins/
-]]>
-    </programlisting>
-   </example>
-
-   Yaf identify a class's suffix(this is by default, you can also change to
-   the prefix by change the configure <link
-    linkend="ini.yaf.name-suffix">yaf.name_suffix</link>) to decide whether it
-   is a MVC class:
-   <example>
-    <title>MVC class distinctions</title>
-   <programlisting role="shell">
-<![CDATA[
-Controller Classes =>
-    // ***Controller
-
-Model Classes =>
-    // ***Model
-
-Plugin Classes =>
-    // ***Plugin
-]]>
-   </programlisting>
-  </example>
-
-   some examples:
-   <example>
-    <title>MVC loading example</title>
-    <programlisting role="shell">
-<![CDATA[
-class IndexController
-    // APPLICATION_PATH/controllers/Index.php
-
-class DataModel =>
-   // APPLICATION_PATH/models/Data.php
-
-class DummyPlugin =>
-  // APPLICATION_PATH/plugins/Dummy.php
-
-class A_B_TestModel =>
-  // APPLICATION_PATH/models/A/B/Test.php
-]]>
-    </programlisting>
-  </example>
-
-  <note>
-   <simpara>
-    As of 2.1.18, Yaf supports Controllers autoloading for user script side,
-    (which means the autoloading triggered by user php script, eg: access a
-    controller static property in Bootstrap or Plugins),
-    but autoloader only try to locate controller class script under the default
-    module folder, which is "APPLICATION_PATH/controllers/".
-   </simpara>
-  </note>
-   also, the directory will be affected by <link linkend="ini.yaf.lowcase-path">yaf.lowcase_path</link>.
-  </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-loader.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Loader</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Loader</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-loader.props.local-ns">_local_ns</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-loader.props.library">_library</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-loader.props.global-library">_global_library</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>static</modifier>
-     <varname linkend="yaf-loader.props.instance">_instance</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-loader')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-loader')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Loader properties -->
-  <section xml:id="yaf-loader.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-loader.props.local-ns">
-     <term><varname>_local_ns</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-loader.props.library">
-     <term><varname>_library</varname></term>
-     <listitem>
-      <para>
-       By default, this value is <link
-        linkend="configuration.yaf.directory">application.directory</link> . "/library", 
-       you can change this either in the application.ini(application.library) or call to
-      <methodname>Yaf_Loader::setLibraryPath</methodname>
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-loader.props.global-library">
-     <term><varname>_global_library</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-loader.props.instance">
-     <term><varname>_instance</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
- 
-
- &reference.yaf.entities.yaf-loader;
-
-</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/yaf/yaf-plugin-abstract.xml b/reference/yaf/yaf-plugin-abstract.xml
deleted file mode 100644
index 75eb7a837237..000000000000
--- a/reference/yaf/yaf-plugin-abstract.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-plugin-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Plugin_Abstract class</title>
- <titleabbrev>Yaf_Plugin_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Plugin_Abstract intro -->
-  <section xml:id="yaf-plugin-abstract.intro">
-   &reftitle.intro;
-   <simpara>
-    Plugins allow for easy extensibility and customization of the
-    framework. A plugin is a class extending
-    <classname>Yaf_Plugin_Abstract</classname> that overrides one or more
-    hook methods, which are called automatically at fixed points of the
-    dispatch cycle: before and after routing, before and after the
-    dispatch loop, and before and after each single dispatch.
-   </simpara>
-   <simpara>
-    A plugin is attached to the dispatcher with
-    <methodname>Yaf_Dispatcher::registerPlugin</methodname>, typically in
-    the Bootstrap; after registration, all the hook methods the plugin
-    implements are called at the proper time, each receiving the current
-    <classname>Yaf_Request_Abstract</classname> and
-    <classname>Yaf_Response_Abstract</classname> instances.
-   </simpara>
-  </section>
-<!-- }}} -->
-
- <section role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Plugin example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-   /* bootstrap class should be defined under ./application/Bootstrap.php */
-   class Bootstrap extends Yaf_Bootstrap_Abstract {
-        public function _initPlugin(Yaf_Dispatcher $dispatcher) {
-            /* register a plugin */
-            $dispatcher->registerPlugin(new TestPlugin());
-        }
-   }
-
-   /* plugin class should be placed under ./application/plugins/ */
-   class TestPlugin extends Yaf_Plugin_Abstract {
-        public function routerStartup(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            /* before router 
-               in this hook,  user can do some url rewrite */
-            var_dump("routerStartup");
-        }
-        public function routerShutdown(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            /* router complete 
-               in this hook, user can do login check */
-            var_dump("routerShutdown");
-        }
-        public function dispatchLoopStartup(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            var_dump("dispatchLoopStartup");
-        }
-        public function preDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            var_dump("preDispatch");
-        }
-        public function postDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            var_dump("postDispatch");
-        }
-        public function dispatchLoopShutdown(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-            /* final hook
-               in this hook user can do logging or implement layout */
-            var_dump("dispatchLoopShutdown");
-        }
-   }
-
-   Class IndexController extends Yaf_Controller_Abstract {
-        public function indexAction() {
-            return FALSE; //prevent rendering
-        }
-   }
-
-   $config = array(
-       "application" => array(
-           "directory" => dirname(__FILE__) . "/application/",
-       ),
-   );
- 
-   $app = new Yaf_Application($config);
-   $app->bootstrap()->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(13) "routerStartup"
-string(14) "routerShutdown"
-string(19) "dispatchLoopStartup"
-string(11) "preDispatch"
-string(12) "postDispatch"
-string(20) "dispatchLoopShutdown"
-]]>
-   </screen>
-  </example>
- </section>
-
-
-  <section xml:id="yaf-plugin-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Plugin_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Plugin_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-plugin-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yaf.entities.yaf-plugin-abstract;
-
-</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/yaf/yaf-registry.xml b/reference/yaf/yaf-registry.xml
deleted file mode 100644
index b87b998f3499..000000000000
--- a/reference/yaf/yaf-registry.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-registry" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Registry class</title>
- <titleabbrev>Yaf_Registry</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Registry intro -->
-  <section xml:id="yaf-registry.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Registry</classname> is a global key-value store. All of
-    its methods are static, which makes it universally accessible, and
-    provides the ability to get or set any custom data from anywhere in
-    your code as necessary.
-   </simpara>
-   <simpara>
-    It is typically used to hold objects initialized in the Bootstrap
-    (a database connection, a logger, shared configuration) so that
-    controllers, actions and plugins can retrieve them without passing
-    them around.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-registry.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Registry</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Registry</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>static</modifier>
-     <varname linkend="yaf-registry.props.instance">_instance</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-registry.props.entries">_entries</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-registry')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-registry')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Registry properties -->
-  <section xml:id="yaf-registry.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-registry.props.instance">
-     <term><varname>_instance</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-registry.props.entries">
-     <term><varname>_entries</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-registry;
-
-</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/yaf/yaf-request-abstract.xml b/reference/yaf/yaf-request-abstract.xml
deleted file mode 100644
index 169fab2ccb82..000000000000
--- a/reference/yaf/yaf-request-abstract.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-request-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Request_Abstract class</title>
- <titleabbrev>Yaf_Request_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Request_Abstract intro -->
-  <section xml:id="yaf-request-abstract.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Request_Abstract</classname> is the base class of the
-    request objects. It encapsulates the request environment: the module,
-    controller and action resolved by routing, the request parameters,
-    and accessors for the superglobals (query string, POST, cookie,
-    server, environment and uploaded files).
-   </simpara>
-   <simpara>
-    Two concrete implementations are provided:
-    <classname>Yaf_Request_Http</classname>, initialized from an actual
-    web request, and <classname>Yaf_Request_Simple</classname>, a
-    synthetic request used in tests and CLI scripts.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-request-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Request_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Request_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="yaf-request-abstract.constants.scheme-http">Yaf_Request_Abstract::SCHEME_HTTP</varname>
-     <initializer>http</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="yaf-request-abstract.constants.scheme-https">Yaf_Request_Abstract::SCHEME_HTTPS</varname>
-     <initializer>https</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="yaf-request-abstract.props.module">module</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="yaf-request-abstract.props.controller">controller</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="yaf-request-abstract.props.action">action</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <varname linkend="yaf-request-abstract.props.method">method</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.params">params</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.language">language</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.exception">_exception</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.base-uri">_base_uri</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.uri">uri</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.dispatched">dispatched</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-request-abstract.props.routed">routed</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Yaf_Request_Abstract properties -->
-  <section xml:id="yaf-request-abstract.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-request-abstract.props.module">
-     <term><varname>module</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.controller">
-     <term><varname>controller</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.method">
-     <term><varname>method</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.params">
-     <term><varname>params</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.language">
-     <term><varname>language</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.exception">
-     <term><varname>_exception</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.base-uri">
-     <term><varname>_base_uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.uri">
-     <term><varname>uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.dispatched">
-     <term><varname>dispatched</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-abstract.props.routed">
-     <term><varname>routed</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ Yaf_Request_Abstract constants -->
-  <section xml:id="yaf-request-abstract.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="yaf-request-abstract.constants.scheme-http">
-     <term><constant>Yaf_Request_Abstract::SCHEME_HTTP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="yaf-request-abstract.constants.scheme-https">
-     <term><constant>Yaf_Request_Abstract::SCHEME_HTTPS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-request-abstract;
-
-</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/yaf/yaf-request-http.xml b/reference/yaf/yaf-request-http.xml
deleted file mode 100644
index 503619397bf8..000000000000
--- a/reference/yaf/yaf-request-http.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-request-http" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Request_Http class</title>
- <titleabbrev>Yaf_Request_Http</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Request_Http intro -->
-  <section xml:id="yaf-request-http.intro">
-   &reftitle.intro;
-   <para>
-    Any request from client is initialized as a
-    <classname>Yaf_Request_Http</classname>.
-    you can get the request information like, uri query and 
-    post parameters via methods of this class.
-    <note>
-     <simpara>
-      For security, $_GET/$_POST are readonly in Yaf, which means
-      if you set a value to these global variables, you can not get it from
-      <methodname>Yaf_Request_Http::getQuery</methodname> or
-      <methodname>Yaf_Request_Http::getPost</methodname>. 
-     </simpara>
-     <simpara>
-      But there do is some usage need such feature, like unit testing. thus
-      Yaf can be built with --enable-yaf-debug, which will allow Yaf read the
-      value user set via script.
-     </simpara>
-     <simpara>
-      in such case, Yaf will throw a E_STRICT warning to remind you about
-      that:  Strict Standards: you are running yaf in debug mode
-     </simpara>
-    </note>
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-request-http.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Request_Http</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Request_Http</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Request_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-http')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Request_Http properties -->
-  <section xml:id="yaf-request-http.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-request-http.props.module">
-     <term><varname>module</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.controller">
-     <term><varname>controller</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.method">
-     <term><varname>method</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.params">
-     <term><varname>params</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.language">
-     <term><varname>language</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.exception">
-     <term><varname>_exception</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.base-uri">
-     <term><varname>_base_uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.uri">
-     <term><varname>uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.dispatched">
-     <term><varname>dispatched</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-http.props.routed">
-     <term><varname>routed</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-request-http;
-
-</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/yaf/yaf-request-simple.xml b/reference/yaf/yaf-request-simple.xml
deleted file mode 100644
index ba7ebb97af0a..000000000000
--- a/reference/yaf/yaf-request-simple.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-request-simple" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Request_Simple class</title>
- <titleabbrev>Yaf_Request_Simple</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Request_Simple intro -->
-  <section xml:id="yaf-request-simple.intro">
-   &reftitle.intro;
-   <para>
-    <classname>Yaf_Request_Simple</classname> is particularlly used for test
-    puporse. ie. simulate some espacial request under CLI mode.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-request-simple.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Request_Simple</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Request_Simple</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Request_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="yaf-request-simple.constants.scheme-http">Yaf_Request_Simple::SCHEME_HTTP</varname>
-     <initializer>http</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname linkend="yaf-request-simple.constants.scheme-https">Yaf_Request_Simple::SCHEME_HTTPS</varname>
-     <initializer>https</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-request-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Yaf_Request_Simple properties -->
-  <section xml:id="yaf-request-simple.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-request-simple.props.module">
-     <term><varname>module</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.controller">
-     <term><varname>controller</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.method">
-     <term><varname>method</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.params">
-     <term><varname>params</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.language">
-     <term><varname>language</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.exception">
-     <term><varname>_exception</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.base-uri">
-     <term><varname>_base_uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.uri">
-     <term><varname>uri</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.dispatched">
-     <term><varname>dispatched</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-request-simple.props.routed">
-     <term><varname>routed</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
-<!-- {{{ Yaf_Request_Simple constants -->
-  <section xml:id="yaf-request-simple.constants">
-   &reftitle.constants;
-   <variablelist>
-
-    <varlistentry xml:id="yaf-request-simple.constants.scheme-http">
-     <term><constant>Yaf_Request_Simple::SCHEME_HTTP</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry xml:id="yaf-request-simple.constants.scheme-https">
-     <term><constant>Yaf_Request_Simple::SCHEME_HTTPS</constant></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-request-simple;
-
-</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/yaf/yaf-response-abstract.xml b/reference/yaf/yaf-response-abstract.xml
deleted file mode 100644
index ef6ce61a3cff..000000000000
--- a/reference/yaf/yaf-response-abstract.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-response-abstract" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Response_Abstract class</title>
- <titleabbrev>Yaf_Response_Abstract</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Response_Abstract intro -->
-  <section xml:id="yaf-response-abstract.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Response_Abstract</classname> is the base class of the
-    response object, which carries the headers and the content blocks to
-    be sent to the client. It is instantiated by
-    <classname>Yaf_Dispatcher</classname>; use
-    <methodname>Yaf_Dispatcher::getResponse</methodname> to access it,
-    typically inside controllers, actions or plugins.
-   </simpara>
-   <simpara>
-    The concrete subclasses are <classname>Yaf_Response_Http</classname>
-    (used in web SAPIs, which actually sends HTTP headers) and
-    <classname>Yaf_Response_Cli</classname> (used on the command line).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-response-abstract.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Response_Abstract</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Response_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>string</type>
-     <varname>Yaf_Response_Abstract::DEFAULT_BODY</varname>
-     <initializer>"content"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-response-abstract.props.header">_header</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-response-abstract.props.body">_body</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-response-abstract.props.sendheader">_sendheader</varname>
-    </fieldsynopsis>
-
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-
-<!-- {{{ Yaf_Response_Abstract properties -->
-  <section xml:id="yaf-response-abstract.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-response-abstract.props.header">
-     <term><varname>_header</varname></term>
-     <listitem>
-      <simpara>
-       The HTTP headers set so far, as an array of header name/value
-       pairs. Only meaningful for
-       <classname>Yaf_Response_Http</classname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-abstract.props.body">
-     <term><varname>_body</varname></term>
-     <listitem>
-      <simpara>
-       The content blocks, keyed by the content key (by default
-       <literal>content</literal>, i.e.
-       <literal>Yaf_Response_Abstract::DEFAULT_BODY</literal>).
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-abstract.props.sendheader">
-     <term><varname>_sendheader</varname></term>
-     <listitem>
-      <simpara>
-       Whether headers should be sent together with the content. In
-       <classname>Yaf_Response_Http</classname> it also tracks whether the
-       headers have been sent already.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-response-abstract;
-
-</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/yaf/yaf-response-cli.xml b/reference/yaf/yaf-response-cli.xml
deleted file mode 100644
index d7167dad303e..000000000000
--- a/reference/yaf/yaf-response-cli.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-response-cli" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Response_Cli class</title>
- <titleabbrev>Yaf_Response_Cli</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Response_Cli intro -->
-  <section xml:id="yaf-response-cli.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Response_Cli</classname> is the response adapter used
-    for command-line (CLI) requests. Unlike its HTTP counterpart, it does
-    not send headers, but simply accumulates the response body and
-    outputs it directly when the dispatch cycle completes.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-response-cli.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Response_Cli</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Response_Cli</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Response_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Response_Cli properties -->
-  <section xml:id="yaf-response-cli.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-response-cli.props.header">
-     <term><varname>_header</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-cli.props.body">
-     <term><varname>_body</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-cli.props.sendheader">
-     <term><varname>_sendheader</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-response-http.xml b/reference/yaf/yaf-response-http.xml
deleted file mode 100644
index bbac5a396350..000000000000
--- a/reference/yaf/yaf-response-http.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-response-http" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Response_Http class</title>
- <titleabbrev>Yaf_Response_Http</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Response_Http intro -->
-  <section xml:id="yaf-response-http.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Response_Http</classname> is the response adapter used
-    for web requests. It accumulates the headers and body set during the
-    dispatch cycle and sends them to the client when the dispatch
-    completes, unless
-    <methodname>Yaf_Dispatcher::returnResponse</methodname> is enabled.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-response-http.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Response_Http</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Response_Http</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Response_Abstract</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-response-http.props.sendheader">_sendheader</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-response-http.props.response-code">_response_code</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-response-abstract')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Response_Http properties -->
-  <section xml:id="yaf-response-http.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-response-http.props.header">
-     <term><varname>_header</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-http.props.body">
-     <term><varname>_body</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-http.props.sendheader">
-     <term><varname>_sendheader</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-response-http.props.response-code">
-     <term><varname>_response_code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/yaf/yaf-route-interface.xml b/reference/yaf/yaf-route-interface.xml
deleted file mode 100644
index 5ba5a83e0cf0..000000000000
--- a/reference/yaf/yaf-route-interface.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-interface" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Interface class</title>
- <titleabbrev>Yaf_Route_Interface</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Interface intro -->
-  <section xml:id="yaf-route-interface.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Interface</classname> defines the contract every
-    route must implement: <methodname>Yaf_Route_Interface::route</methodname>,
-    which inspects the request and claims it by setting the module,
-    controller and action (and optionally request parameters), and
-    <methodname>Yaf_Route_Interface::assemble</methodname>, which builds a
-    URL from route info.
-   </simpara>
-   <simpara>
-    Implement this interface to define a custom route, and register it on
-    the router with <methodname>Yaf_Router::addRoute</methodname>. The
-    built-in route classes
-    (<classname>Yaf_Route_Static</classname>,
-    <classname>Yaf_Route_Simple</classname>,
-    <classname>Yaf_Route_Supervar</classname>,
-    <classname>Yaf_Route_Rewrite</classname>,
-    <classname>Yaf_Route_Regex</classname> and
-    <classname>Yaf_Route_Map</classname>) all implement it.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-interface.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Interface</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Interface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-interface;
-
-</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/yaf/yaf-route-map.xml b/reference/yaf/yaf-route-map.xml
deleted file mode 100644
index e964c197f3de..000000000000
--- a/reference/yaf/yaf-route-map.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-map" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Map class</title>
- <titleabbrev>Yaf_Route_Map</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Map intro -->
-  <section xml:id="yaf-route-map.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Map</classname> is a built-in route that converts
-    the whole URI endpoint (that part of the URI which comes after the
-    base URI: see <methodname>Yaf_Request_Abstract::setBaseUri</methodname>)
-    into a single controller name or action name, depending on the
-    first argument passed to
-    <methodname>Yaf_Route_Map::__construct</methodname>. The path
-    segments are joined with underscores:
-   </simpara>
-   <simplelist>
-    <member><literal>A</literal> => <literal>A</literal></member>
-    <member><literal>A/B/C</literal> => <literal>A_B_C</literal></member>
-    <member><literal>A/B/C/D/E</literal> => <literal>A_B_C_D_E</literal></member>
-   </simplelist>
-   <simpara>
-    When the mapping goes to a controller name, its first letter is
-    uppercased.
-   </simpara>
-   <simpara>
-    If the second argument of
-    <methodname>Yaf_Route_Map::__construct</methodname> is specified, only
-    the part of the URI before the delimiter is used for routing, while
-    the part after it is parsed as request parameters (see the example
-    section of <methodname>Yaf_Route_Map::__construct</methodname>).
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-map.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Map</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Map</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Route_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-map.props.ctl-router">_ctl_router</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-map.props.delimiter">_delimiter</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-map')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-map')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Route_Map properties -->
-  <section xml:id="yaf-route-map.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-route-map.props.ctl-router">
-     <term><varname>_ctl_router</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-map.props.delimiter">
-     <term><varname>_delimiter</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-map;
-
-</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/yaf/yaf-route-regex.xml b/reference/yaf/yaf-route-regex.xml
deleted file mode 100644
index 25a75bd5944d..000000000000
--- a/reference/yaf/yaf-route-regex.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-regex" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Regex class</title>
- <titleabbrev>Yaf_Route_Regex</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Regex intro -->
-  <section xml:id="yaf-route-regex.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Regex</classname> is the most flexible route among
-    the Yaf built-in routes: it matches the request URI against a regular
-    expression. When the pattern matches, the default module, controller and
-    action are used, and the captured subpatterns are assigned to request
-    parameters through a numeric map.
-   </simpara>
-   <simpara>
-    It is similar to <classname>Yaf_Route_Rewrite</classname>, but instead
-    of a human-friendly pattern it takes a full PCRE pattern, which makes
-    it able to express matching rules that the other built-in routes
-    cannot.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-regex.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Regex</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Regex</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Route_Interface</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Route_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-regex.props.route">_route</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-regex.props.default">_default</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-regex.props.maps">_maps</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-regex.props.verify">_verify</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-regex')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-regex')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Route_Regex properties -->
-  <section xml:id="yaf-route-regex.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-route-regex.props.route">
-     <term><varname>_route</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-regex.props.default">
-     <term><varname>_default</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-regex.props.maps">
-     <term><varname>_maps</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-regex.props.verify">
-     <term><varname>_verify</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-regex;
-
-</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/yaf/yaf-route-rewrite.xml b/reference/yaf/yaf-route-rewrite.xml
deleted file mode 100644
index 44abffb3029a..000000000000
--- a/reference/yaf/yaf-route-rewrite.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-rewrite" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Rewrite class</title>
- <titleabbrev>Yaf_Route_Rewrite</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Rewrite intro -->
-  <section xml:id="yaf-route-rewrite.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Rewrite</classname> is a built-in route that maps
-    a fixed path pattern to a module, controller and action. The pattern
-    may contain named placeholders (<literal>:name</literal>, whose value
-    is set as a request parameter) and a trailing <literal>*</literal>
-    wildcard that captures the remaining segments as key/value pairs.
-   </simpara>
-   <simpara>
-    For usage, please see the example section of
-    <methodname>Yaf_Route_Rewrite::__construct</methodname>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-rewrite.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Rewrite</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Rewrite</classname>
-     </ooclass>
-     
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Yaf_Route_Interface</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Route_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-rewrite.props.route">_route</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-rewrite.props.default">_default</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-rewrite.props.verify">_verify</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-rewrite')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-rewrite')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-    
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Route_Rewrite properties -->
-  <section xml:id="yaf-route-rewrite.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-route-rewrite.props.route">
-     <term><varname>_route</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-rewrite.props.default">
-     <term><varname>_default</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-rewrite.props.verify">
-     <term><varname>_verify</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-rewrite;
-
-</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/yaf/yaf-route-simple.xml b/reference/yaf/yaf-route-simple.xml
deleted file mode 100644
index a2d2fe8a0287..000000000000
--- a/reference/yaf/yaf-route-simple.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-simple" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Simple class</title>
- <titleabbrev>Yaf_Route_Simple</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Simple intro -->
-  <section xml:id="yaf-route-simple.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Simple</classname> resolves the route info from
-    the query string. All you need to do is tell
-    <classname>Yaf_Route_Simple</classname> which key in
-    <literal>$_GET</literal> is the module, which key is the controller,
-    and which key is the action.
-   </simpara>
-   <simpara>
-    <methodname>Yaf_Route_Simple::route</methodname> claims the request
-    (returns &true;) as soon as at least one of those keys is present in
-    the query string, so routes registered after it in the stack will not
-    be tried for such a request. It only passes (returns &false;) when
-    none of the configured keys appear.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-simple.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Simple</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Simple</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Route_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-simple.props.controller">controller</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-simple.props.module">module</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-simple.props.action">action</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Route_Simple properties -->
-  <section xml:id="yaf-route-simple.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-route-simple.props.controller">
-     <term><varname>controller</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-simple.props.module">
-     <term><varname>module</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-route-simple.props.action">
-     <term><varname>action</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-simple;
-
-</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/yaf/yaf-route-static.xml b/reference/yaf/yaf-route-static.xml
deleted file mode 100644
index d3d336460cf5..000000000000
--- a/reference/yaf/yaf-route-static.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-static" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Static class</title>
- <titleabbrev>Yaf_Route_Static</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Static intro -->
-  <section xml:id="yaf-route-static.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Static</classname> is the default route of
-    <classname>Yaf_Router</classname>: it parses the URI path as
-    <literal>/module/controller/action</literal> segments and is designed
-    to handle most routing needs out of the box.
-   </simpara>
-   <note>
-    <simpara>
-     It is unnecessary to instantiate a
-     <classname>Yaf_Route_Static</classname>, or to add it to the route
-     stack of <classname>Yaf_Router</classname>: there is always one
-     present in the stack, and it is always tried last.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-static.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Static</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Static</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Router</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-static')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-static;
-
-</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/yaf/yaf-route-supervar.xml b/reference/yaf/yaf-route-supervar.xml
deleted file mode 100644
index 7110a258d523..000000000000
--- a/reference/yaf/yaf-route-supervar.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-route-supervar" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Route_Supervar class</title>
- <titleabbrev>Yaf_Route_Supervar</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Route_Supervar intro -->
-  <section xml:id="yaf-route-supervar.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Route_Supervar</classname> is a built-in route that
-    resolves the request target from a single GET parameter (the
-    supervar). The value of that parameter is parsed the same way as
-    <literal>PATH_INFO</literal>, so a request such as
-    <literal>/?r=/user/list</literal> maps to controller
-    <literal>user</literal> and action <literal>list</literal> when the
-    supervar name is <literal>r</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-route-supervar.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Route_Supervar</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Route_Supervar</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_Route_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-route-supervar.props.var-name">_var_name</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-supervar')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-route-supervar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Route_Supervar properties -->
-  <section xml:id="yaf-route-supervar.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-route-supervar.props.var-name">
-     <term><varname>_var_name</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-route-supervar;
-
-</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/yaf/yaf-router.xml b/reference/yaf/yaf-router.xml
deleted file mode 100644
index 4437fda41bb3..000000000000
--- a/reference/yaf/yaf-router.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-router" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Router class</title>
- <titleabbrev>Yaf_Router</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Router intro -->
-  <section xml:id="yaf-router.intro">
-   &reftitle.intro;
-   <para>
-   <classname>Yaf_Router</classname> is the standard framework router. Routing is
-   the process of taking a URI endpoint (that part of the URI which comes
-   after the base URI: see <methodname>Yaf_Request_Abstract::setBaseUri</methodname>)
-   and decomposing it into parameters to determine which module, controller, and
-   action of that controller should receive the request. This values of the module,
-   controller, action and other parameters are packaged into a
-   <classname>Yaf_Request_Abstract</classname> object which is then processed by
-   <classname>Yaf_Dispatcher</classname>. Routing occurs only once: when the request
-   is initially received and before the first controller is dispatched.
-
-   <classname>Yaf_Router</classname> is designed to allow for mod_rewrite-like
-   functionality using pure PHP structures. It is very loosely based on Ruby
-   on Rails routing and does not require any prior knowledge of webserver URL
-   rewriting. It is designed to work with a single Apache mod_rewrite rule
-   (one of):
-   <example>
-    <title>Rewrite rule for Apache</title>
-   <programlisting role="conf">
-<![CDATA[
-RewriteEngine on
-RewriteRule !\.(js|ico|gif|jpg|png|css|html)$ index.php
-]]>
-   </programlisting>
-   </example>
-   or (preferred):
-   <example>
-   <title>Rewrite rule for Apache</title>
-   <programlisting role="conf">
-<![CDATA[
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} -s [OR]
-RewriteCond %{REQUEST_FILENAME} -l [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^.*$ - [NC,L]
-RewriteRule ^.*$ index.php [NC,L]
-]]>
-   </programlisting>
-  </example>
-   If using Lighttpd, the following rewrite rule is valid:
-   <example>
-    <title>Rewrite rule for Lighttpd</title>
-   <programlisting role="conf">
-<![CDATA[
-url.rewrite-once = (
-  ".*\?(.*)$" => "/index.php?$1",
-  ".*\.(js|ico|gif|jpg|png|css|html)$" => "$0",
-  "" => "/index.php"
-)
-]]>
-   </programlisting>
-  </example>
-   If using Nginx, use the following rewrite rule:
-   <example>
-    <title>Rewrite rule for Nginx</title>
-   <programlisting role="conf">
-<![CDATA[
-server {
-  listen ****;
-  server_name  yourdomain.com;
-  root   document_root;
-  index  index.php index.html;
-
-  if (!-e $request_filename) {
-    rewrite ^/(.*)  /index.php/$1 last;
-  }
-}
-]]>
-   </programlisting>
-  </example>
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-router.default">
-   <title>Default route</title>
-   <para>
-    <classname>Yaf_Router</classname> comes preconfigured with a default route
-    <classname>Yaf_Route_Static</classname>, which will match URIs in the shape of 
-    controller/action. Additionally, a module name may be specified as the first
-    path element, allowing URIs of the form module/controller/action. Finally, 
-    it will also match any additional parameters appended to the URI by default 
-    - controller/action/var1/value1/var2/value2.
-    <note>
-     <simpara>
-      Module name must be defined in config, considering application.module="Index,Foo,Bar",
-      in this case, only index, foo and bar can be considered as a module name.
-      if doesn't config, there is only one module named "Index". 
-     </simpara>
-    </note>
-   </para>
-
-   <para>
-   Some examples of how such routes are matched:
-   <example>
-    <title><classname>Yaf_Route_Static</classname>(default route)example</title>
-   <programlisting role="conf">
-<![CDATA[
-// Assuming the following configure:
-$conf = array(
-   "application" => array(
-      "modules" => "Index,Blog",
-   ),
-);
-
-Controller only:
-http://example/news
-    controller == news
-Action only(when defined yaf.action_prefer=1 in php.ini)
-    action  == news
- 
-Invalid module maps to controller name:
-http://example/foo
-    controller == foo
- 
-Module + controller:
-http://example/blog/archive
-    module     == blog
-    controller == archive
- 
-Module + controller + action:
-http://example/blog/archive/list
-    module     == blog
-    controller == archive
-    action     == list
- 
-Module + controller + action + params:
-http://example/blog/archive/list/sort/alpha/date/desc
-    module     == blog
-    controller == archive
-    action     == list
-    sort       == alpha
-    date       == desc
-]]>
-   </programlisting>
-  </example>
-
-  </para>
-  </section>
-
-  <section xml:id="yaf-router.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Router</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Router</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-router.props.routes">_routes</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-router.props.current">_current</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-router')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-router')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Router properties -->
-  <section xml:id="yaf-router.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-router.props.routes">
-     <term><varname>_routes</varname></term>
-     <listitem>
-      <para>
-      registered routes stack
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-router.props.current">
-     <term><varname>_current</varname></term>
-     <listitem>
-      <para>
-       after routing phase, this indicated the name of which route
-       is used to route current request.
-
-       you can get this name by
-       <methodname>Yaf_Router::getCurrentRoute</methodname>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-router;
-
-</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/yaf/yaf-session.xml b/reference/yaf/yaf-session.xml
deleted file mode 100644
index 2f43b69af177..000000000000
--- a/reference/yaf/yaf-session.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-session" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_Session class</title>
- <titleabbrev>Yaf_Session</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_Session intro -->
-  <section xml:id="yaf-session.intro">
-   &reftitle.intro;
-   <simpara>
-    <classname>Yaf_Session</classname> is a namespaced wrapper around
-    PHP's native session support. It is accessed as a singleton through
-    <methodname>Yaf_Session::getInstance</methodname> and works directly
-    on <literal>$_SESSION</literal>: session data written through one
-    interface is visible in the other.
-   </simpara>
-   <simpara>
-    Session entries can be accessed and manipulated through property
-    syntax, method calls (<methodname>Yaf_Session::get</methodname>,
-    <methodname>Yaf_Session::set</methodname>,
-    <methodname>Yaf_Session::del</methodname>,
-    <methodname>Yaf_Session::has</methodname>), array access
-    (<literal>ArrayAccess</literal>), iteration
-    (<literal>Iterator</literal>) and <literal>count()</literal>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-session.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_Session</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_Session</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>ArrayAccess</interfacename>
-     </oointerface>
-
-     <oointerface>
-      <interfacename>Countable</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <modifier>static</modifier>
-     <varname linkend="yaf-session.props.instance">_instance</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-session.props.session">_session</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-session.props.started">_started</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-session')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-session')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_Session properties -->
-  <section xml:id="yaf-session.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-session.props.instance">
-     <term><varname>_instance</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-session.props.session">
-     <term><varname>_session</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-session.props.started">
-     <term><varname>_started</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-session;
-
-</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/yaf/yaf-view-interface.xml b/reference/yaf/yaf-view-interface.xml
deleted file mode 100644
index 7874a365b145..000000000000
--- a/reference/yaf/yaf-view-interface.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-view-interface" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_View_Interface class</title>
- <titleabbrev>Yaf_View_Interface</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_View_Interface intro -->
-  <section xml:id="yaf-view-interface.intro">
-   &reftitle.intro;
-   <para>
-    Yaf provides a ability for developers to use custom view engine instead
-    of built-in engine which is <classname>Yaf_View_Simple</classname>. There 
-    is a example to explain how to do this, please see
-    <methodname>Yaf_Dispatcher::setView</methodname>.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-view-interface.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_View_Interface</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_View_Interface</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-view-interface')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yaf.entities.yaf-view-interface;
-
-</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/yaf/yaf-view-simple.xml b/reference/yaf/yaf-view-simple.xml
deleted file mode 100644
index ca7bbf5befec..000000000000
--- a/reference/yaf/yaf-view-simple.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yaf-view-simple" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yaf_View_Simple class</title>
- <titleabbrev>Yaf_View_Simple</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yaf_View_Simple intro -->
-  <section xml:id="yaf-view-simple.intro">
-   &reftitle.intro;
-   <para>
-     <classname>Yaf_View_Simple</classname> is the built-in template engine in
-     Yaf, it is a simple but fast template engine, and only support PHP script
-     template.
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yaf-view-simple.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Yaf_View_Simple</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Yaf_View_Simple</classname>
-     </ooclass>
-     
-     <oointerface>
-      <interfacename>Yaf_View_Interface</interfacename>
-     </oointerface>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-view-simple.props.tpl-vars">_tpl_vars</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <varname linkend="yaf-view-simple.props.tpl-dir">_tpl_dir</varname>
-    </fieldsynopsis>
-
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-view-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[not(@role='procedural')])" />
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yaf-view-simple')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-  
-<!-- {{{ Yaf_View_Simple properties -->
-  <section xml:id="yaf-view-simple.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yaf-view-simple.props.tpl-vars">
-     <term><varname>_tpl_vars</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yaf-view-simple.props.tpl-dir">
-     <term><varname>_tpl_dir</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.yaf.entities.yaf-view-simple;
-
-</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/yaf/yaf_action_abstract/execute.xml b/reference/yaf/yaf_action_abstract/execute.xml
deleted file mode 100644
index 3987f9a211d6..000000000000
--- a/reference/yaf/yaf_action_abstract/execute.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-action-abstract.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Action_Abstract::execute</refname>
-  <refpurpose>Action entry point</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier><type>mixed</type><methodname>Yaf_Action_Abstract::execute</methodname>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   user should always define this method for an action, this is the entry point
-   of an action.
-   <methodname>Yaf_Action_Abstract::execute</methodname> may have arguments.
-   <note>
-    <simpara>
-     The value retrieved from the request is not safe. you should do some
-     filtering work before you use it.
-    </simpara>
-   </note>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The return value of the action method is not used by Yaf; output is
-   written directly or collected by the view engine.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Action_Abstract::execute</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/** 
- * A controller example
- */
-class ProductController extends Yaf_Controller_Abstract {
-      protected $actions = array(
-          "index" => "actions/Index.php",
-      );
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>Yaf_Action_Abstract::execute</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/** 
- * ListAction
- */
-class ListAction extends Yaf_Action_Abstract {
-     public function execute ($name, $id) {
-         assert($name == $this->getRequest()->getParam("name"));
-         assert($id   == $this->getRequest()->getParam("id"));
-     }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/**
- * Now assuming we are using the Yaf_Route_Static route 
- * for request: http://yourdomain/product/list/name/yaf/id/22
- * will result:
- */
- bool(true)
- bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getParam</methodname></member>
-   <member><methodname>Yaf_Controller_Abstract::forward</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/yaf/yaf_action_abstract/getcontroller.xml b/reference/yaf/yaf_action_abstract/getcontroller.xml
deleted file mode 100644
index 8743e177d64f..000000000000
--- a/reference/yaf/yaf_action_abstract/getcontroller.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-action-abstract.getcontroller" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Action_Abstract::getController</refname>
-  <refpurpose>Retrieve controller object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier><type linkend="class.yaf-controller-abstract" class="union"><type>Yaf_Controller_Abstract</type><type>null</type></type><methodname>Yaf_Action_Abstract::getController</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieves the controller that owns this action.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_Controller_Abstract</classname> instance, or &null;
-   if no controller is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Action_Abstract::getController</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ListAction extends Yaf_Action_Abstract
-{
-    public function execute() {
-        // the controller that owns this action
-        $controller = $this->getController();
-        var_dump($controller instanceof Yaf_Controller_Abstract);
-
-        // e.g. to reach its view engine
-        $controller->getView()->assign("products", array("yaf", "php"));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Action_Abstract::getControllerName</methodname></member>
-    <member><classname>Yaf_Controller_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_action_abstract/getcontrollername.xml b/reference/yaf/yaf_action_abstract/getcontrollername.xml
deleted file mode 100644
index 3057c3e4cf65..000000000000
--- a/reference/yaf/yaf_action_abstract/getcontrollername.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 327672 $ -->
-
-<refentry xml:id="yaf-controller-abstract.getcontrollername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Action_Abstract::getControllerName</refname>
-  <refpurpose>Get controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Action_Abstract::getControllerName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the controller that owns this action.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The controller name as a &string;, or &null; if it is not set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Action_Abstract::getControllerName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ListAction extends Yaf_Action_Abstract
-{
-    public function execute() {
-        // the name of the controller that owns this action,
-        // e.g. "Product" for a ProductController
-        var_dump($this->getControllerName());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "Product"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Action_Abstract::getController</methodname></member>
-    <member><methodname>Yaf_Controller_Abstract::getName</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/yaf/yaf_application/app.xml b/reference/yaf/yaf_application/app.xml
deleted file mode 100644
index dea56d9cf047..000000000000
--- a/reference/yaf/yaf_application/app.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.app" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::app</refname>
-  <refpurpose>Retrieve an Application instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>Yaf_Application</type><type>null</type></type><methodname>Yaf_Application::app</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Application</classname> instance.
-   Alternatively, <methodname>Yaf_Dispatcher::getApplication</methodname>
-   can also be used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Application</classname> instance, or &null; if no
-   application has been initialized yet.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Application::app</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* index.php, the application entry */
-$config = new Yaf_Config_Ini(__DIR__ . "/conf/application.ini", "product");
-$application = new Yaf_Application($config);
-$application->bootstrap()->run();
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Retrieving the application instance elsewhere</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        /* Yaf_Application::app() is an alias of getInstance() */
-        $app = Yaf_Application::app();
-
-        var_dump($app->environ());
-        var_dump(Yaf_Application::getInstance() === $app);
-
-        return false;
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "product"
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::getApplication</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/yaf/yaf_application/bootstrap.xml b/reference/yaf/yaf_application/bootstrap.xml
deleted file mode 100644
index cd5fe13baf7a..000000000000
--- a/reference/yaf/yaf_application/bootstrap.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.bootstrap" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::bootstrap</refname>
-  <refpurpose>Call bootstrap</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Application</type><type>false</type></type><methodname>Yaf_Application::bootstrap</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Run a Bootstrap. All the public methods of the Bootstrap class whose
-   name starts with <literal>_init</literal> are called in declaration
-   order, each receiving the <classname>Yaf_Dispatcher</classname>
-   instance as its only argument.
-  </simpara>
-  <simpara>
-   The Bootstrap class must be named <literal>Bootstrap</literal> and
-   extend <classname>Yaf_Bootstrap_Abstract</classname>. If it is not
-   already defined, it is loaded from
-   <filename>Bootstrap.php</filename> in the application directory; the
-   <literal>application.bootstrap</literal> configuration entry overrides
-   its location.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Application</classname> object itself on
-   success, or &false; on failure (for instance if the Bootstrap class
-   could not be loaded, or if an uncaught exception was thrown by one of
-   the <literal>_init*</literal> methods).
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Triggers a <constant>YAF_ERR_TYPE_ERROR</constant> error if the found
-   class is not a subclass of
-   <classname>Yaf_Bootstrap_Abstract</classname>, or an
-   <constant>E_WARNING</constant> if the bootstrap file or the
-   <literal>Bootstrap</literal> class cannot be found.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A Bootstrap example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * This file should be under APPLICATION_PATH . "/application/" (which was
- * defined in the config passed to Yaf_Application), and named
- * Bootstrap.php, so the Yaf_Application can find it.
- */
-class Bootstrap extends Yaf_Bootstrap_Abstract {
-    public function _initConfig(Yaf_Dispatcher $dispatcher) {
-        echo "1st called\n";
-    }
-
-    public function _initPlugin(Yaf_Dispatcher $dispatcher) {
-        echo "2nd called\n";
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>Yaf_Application::bootstrap</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-defined('APPLICATION_PATH') // APPLICATION_PATH will be used in the ini config file
-    || define('APPLICATION_PATH', __DIR__);
-
-$application = new Yaf_Application(APPLICATION_PATH.'/conf/application.ini');
-$application->bootstrap();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-1st called
-2nd called
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>Yaf_Bootstrap_Abstract</classname></member>
-    <member><methodname>Yaf_Application::run</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/yaf/yaf_application/clearlasterror.xml b/reference/yaf/yaf_application/clearlasterror.xml
deleted file mode 100644
index ce098c77f335..000000000000
--- a/reference/yaf/yaf_application/clearlasterror.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.clearlasterror" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::clearLastError</refname>
-  <refpurpose>Clear the last error info</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Application</type><type>null</type></type><methodname>Yaf_Application::clearLastError</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Clear the code and message of the last error, resetting them to
-   <literal>0</literal> and an empty string. This is useful in error
-   handlers, where a handled error should not be reported again.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Application</classname> object itself on
-   success, or &null; if the application is not properly initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::clearLastError</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function error_handler($errno, $errstr, $errfile, $errline) {
-   Yaf_Application::app()->clearLastError();
-   var_dump(Yaf_Application::app()->getLastErrorNo());
-}
-
-$config = array(
- "application" => array(
-   "directory" => "/tmp/notexists",
-     "dispatcher" => array(
-       "throwException" => 0, //trigger error instead of throwing an exception when an error occurs
-      ),
-  ),
-);
-
-$app = new Yaf_Application($config);
-$app->getDispatcher()->setErrorHandler("error_handler", E_RECOVERABLE_ERROR);
-$app->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(0)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::getLastErrorNo</methodname></member>
-    <member><methodname>Yaf_Application::getLastErrorMsg</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/yaf/yaf_application/construct.xml b/reference/yaf/yaf_application/construct.xml
deleted file mode 100644
index 99f47d24c0cd..000000000000
--- a/reference/yaf/yaf_application/construct.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::__construct</refname>
-  <refpurpose>Yaf_Application constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Application::__construct</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>config</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>environ</parameter><initializer>null</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Instantiate a <classname>Yaf_Application</classname>. The constructor
-   also initializes the singleton application, the
-   <classname>Yaf_Loader</classname> and the
-   <classname>Yaf_Dispatcher</classname>, so it must be called before any
-   of those are used.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>config</parameter></term>
-    <listitem>
-     <simpara>
-      An INI configuration file path, or a configuration array.
-     </simpara>
-     <simpara>
-      If it is an INI configuration file, there should be a section named
-      as the one defined by
-      <link linkend="ini.yaf.environ">yaf.environ</link>, which is
-      <literal>"product"</literal> by default.
-     </simpara>
-     <simpara>
-      The application configuration entries (and their default values) are
-      documented in
-      <link linkend="yaf.appconfig">Application Configuration</link>:
-     </simpara>
-     <para>
-      <example>
-       <title>An ini config file example</title>
-       <programlisting role="ini" xml:id="yaf.application.ini">
-<![CDATA[
-[product]
-;this one should always be defined, and has no default value
-application.directory=APPLICATION_PATH
-
-;following configs have default values, you may not need to define them
-application.library = APPLICATION_PATH . "/library"
-application.dispatcher.throwException=1
-application.dispatcher.catchException=1
-
-application.baseUri=""
-
-;the php script ext name
-application.ext=php
-
-;the view template ext name
-application.view.ext=phtml
-
-application.dispatcher.defaultModule=Index
-application.dispatcher.defaultController=Index
-application.dispatcher.defaultAction=index
-
-;defined modules
-application.modules=Index
-]]>
-       </programlisting>
-      </example>
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>environ</parameter></term>
-    <listitem>
-     <simpara>
-      Which section will be loaded as the final configuration. If it is
-      not given, the value of the
-      <link linkend="ini.yaf.environ">yaf.environ</link> directive is
-      used.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Throws a <exceptionname>Yaf_Exception_StartupError</exceptionname> exception
-   (or triggers a <constant>YAF_ERR_STARTUP_FAILED</constant> error, when
-   <methodname>Yaf_Dispatcher::throwException</methodname> is off) if a
-   <classname>Yaf_Application</classname> has already been instantiated,
-   or if the configuration is invalid.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-defined('APPLICATION_PATH')                  // APPLICATION_PATH will be used in the ini config file
-    || define('APPLICATION_PATH', __DIR__);
-
-$application = new Yaf_Application(APPLICATION_PATH.'/conf/application.ini');
-$application->bootstrap()->run();
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>Yaf_Application::__construct</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-$application->bootstrap()->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>Yaf_Config_Ini</classname></member>
-    <member><link linkend="yaf.appconfig">Application Configuration</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/yaf/yaf_application/environ.xml b/reference/yaf/yaf_application/environ.xml
deleted file mode 100644
index 5760f197c20d..000000000000
--- a/reference/yaf/yaf_application/environ.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.environ" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::environ</refname>
-  <refpurpose>Retrieve the environment</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Application::environ</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the environment name of the application, which is defined by
-   the <link linkend="ini.yaf.environ">yaf.environ</link> directive (or
-   the <parameter>environ</parameter> constructor parameter), and defaults to
-   <literal>"product"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The environment name of the application.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::environ</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-print_r($application->environ());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-product
-]]>
-   </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/yaf/yaf_application/execute.xml b/reference/yaf/yaf_application/execute.xml
deleted file mode 100644
index 692e645e9359..000000000000
--- a/reference/yaf/yaf_application/execute.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.execute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::execute</refname>
-  <refpurpose>Execute a callback</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Application::execute</methodname>
-   <methodparam><type>callable</type><parameter>callback</parameter></methodparam>
-   <methodparam rep="repeat"><type>mixed</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Execute a callback. This method is typically used to run Yaf in a
-   cron job or other CLI script, so that the script can reuse the
-   autoloader and the bootstrap mechanism.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      A valid callback to execute.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>args</parameter></term>
-    <listitem>
-     <simpara>
-      Optional parameters passed to the callback.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns whatever the callback returns, or &false; if calling the
-   callback failed.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::execute</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function main($argc, $argv) {
-    var_dump($argc);
-    var_dump($argv);
-}
-
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-$application->execute("main", $argc, $argv);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(2)
-array(2) {
-  [0]=>
-  string(11) "execute.php"
-  [1]=>
-  string(3) "arg"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::bootstrap</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/yaf/yaf_application/getappdirectory.xml b/reference/yaf/yaf_application/getappdirectory.xml
deleted file mode 100644
index 9b589b811c2b..000000000000
--- a/reference/yaf/yaf_application/getappdirectory.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getappdirectory" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getAppDirectory</refname>
-  <refpurpose>Get the application directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Application::getAppDirectory</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the application directory, under which Yaf looks for controllers,
-   views and modules. It is set by the
-   <literal>application.directory</literal> configuration entry, or by
-   <methodname>Yaf_Application::setAppDirectory</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The absolute path of the application directory, or &null; if the
-   application is not properly initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Application::getAppDirectory</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* conf/application.ini:
-   application.directory = APPLICATION_PATH "/application"
-*/
-$app = new Yaf_Application(
-    new Yaf_Config_Ini(APPLICATION_PATH . "/conf/application.ini", "product")
-);
-
-var_dump($app->getAppDirectory());
-var_dump(Yaf_Application::app()->getAppDirectory());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(31) "/var/www/html/myapp/application"
-string(31) "/var/www/html/myapp/application"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::setAppDirectory</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/yaf/yaf_application/getconfig.xml b/reference/yaf/yaf_application/getconfig.xml
deleted file mode 100644
index 90370684b211..000000000000
--- a/reference/yaf/yaf_application/getconfig.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getConfig</refname>
-  <refpurpose>Retrieve the config instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Config_Abstract</type><type>null</type></type><methodname>Yaf_Application::getConfig</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Config_Abstract</classname> instance
-   holding the application configuration passed to the constructor.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_Config_Abstract</classname> instance (a
-   <classname>Yaf_Config_Simple</classname> object when an array is
-   passed to the constructor, a
-   <classname>Yaf_Config_Ini</classname> object when an INI file is
-   passed), or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::getConfig</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-print_r($application->getConfig());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Yaf_Config_Simple Object
-(
-    [_config:protected] => Array
-        (
-            [application] => Array
-                (
-                    [directory] => /home/laruence/local/www/htdocs/application
-                )
-
-        )
-
-    [_readonly:protected] => 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/yaf/yaf_application/getdispatcher.xml b/reference/yaf/yaf_application/getdispatcher.xml
deleted file mode 100644
index 6afffd4b9685..000000000000
--- a/reference/yaf/yaf_application/getdispatcher.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getdispatcher" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getDispatcher</refname>
-  <refpurpose>Get Yaf_Dispatcher instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Application::getDispatcher</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Dispatcher</classname> instance used by
-   this application.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Dispatcher</classname> instance, or &null; if the
-   application is not properly initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::getDispatcher</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-print_r($application->getDispatcher());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Yaf_Dispatcher Object
-(
-    [_router:protected] => Yaf_Router Object
-        (
-            [_routes:protected] => Array
-                (
-                    [_default] => Yaf_Route_Static Object
-                        (
-                        )
-
-                )
-
-            [_current:protected] => 
-        )
-
-    [_view:protected] => 
-    [_request:protected] => Yaf_Request_Http Object
-        (
-            [method] => Cli
-        )
-
-    [_plugins:protected] => Array
-        (
-        )
-
-    [_auto_render:protected] => 1
-    [_return_response:protected] => 
-    [_instantly_flush:protected] => 1
-    [_default_module:protected] => Index
-    [_default_controller:protected] => Index
-    [_default_action:protected] => index
-)
-]]>
-   </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/yaf/yaf_application/getlasterrormsg.xml b/reference/yaf/yaf_application/getlasterrormsg.xml
deleted file mode 100644
index de62ba287e87..000000000000
--- a/reference/yaf/yaf_application/getlasterrormsg.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getlasterrormsg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getLastErrorMsg</refname>
-  <refpurpose>Get message of the last occurred error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Application::getLastErrorMsg</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the message of the last error that occurred during dispatching.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The error message of the last occurred error, an empty string if no
-   error occurred yet, or &null; if the application is not properly
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::getLastErrorMsg</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function error_handler($errno, $errstr, $errfile, $errline) {
-   var_dump(Yaf_Application::app()->getLastErrorMsg());
-}
-
-$config = array(
- "application" => array(
-   "directory" => "/tmp/notexists",
-     "dispatcher" => array(
-       "throwException" => 0, //trigger error instead of throwing an exception when an error occurs
-      ),
-  ),
-);
-
-$app = new Yaf_Application($config);
-$app->getDispatcher()->setErrorHandler("error_handler", E_RECOVERABLE_ERROR);
-$app->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(69) "Could not find controller script /tmp/notexists/controllers/Index.php"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::getLastErrorNo</methodname></member>
-    <member><methodname>Yaf_Application::clearLastError</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/yaf/yaf_application/getlasterrorno.xml b/reference/yaf/yaf_application/getlasterrorno.xml
deleted file mode 100644
index cc3645eae1fa..000000000000
--- a/reference/yaf/yaf_application/getlasterrorno.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getlasterrorno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getLastErrorNo</refname>
-  <refpurpose>Get code of the last occurred error</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>int</type><type>null</type></type><methodname>Yaf_Application::getLastErrorNo</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the code of the last error that occurred during dispatching, one
-   of the <link linkend="yaf.constants">YAF_ERR_*</link> constants.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The error code of the last occurred error, <literal>0</literal> if no
-   error occurred yet, or &null; if the application is not properly
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::getLastErrorNo</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function error_handler($errno, $errstr, $errfile, $errline) {
-   var_dump(Yaf_Application::app()->getLastErrorNo());
-   var_dump(Yaf_Application::app()->getLastErrorNo() == YAF_ERR_NOTFOUND_CONTROLLER);
-}
-
-$config = array(
-  "application" => array(
-   "directory" => "/tmp/notexists",
-     "dispatcher" => array(
-       "throwException" => 0, //trigger error instead of throwing an exception when an error occurs
-      ),
-  ),
-);
-
-$app = new Yaf_Application($config);
-$app->getDispatcher()->setErrorHandler("error_handler", E_RECOVERABLE_ERROR);
-$app->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(516)
-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/yaf/yaf_application/getmodules.xml b/reference/yaf/yaf_application/getmodules.xml
deleted file mode 100644
index 74447507d631..000000000000
--- a/reference/yaf/yaf_application/getmodules.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.getmodules" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::getModules</refname>
-  <refpurpose>Get defined module names</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>Yaf_Application::getModules</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the module names defined in the
-   <link linkend="configuration.yaf.modules">application.modules</link>
-   configuration entry. If none is defined, there will always be a
-   single module named <literal>"Index"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array of module names, or &null; if the application is not
-   properly initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::getModules</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    "application" => array(
-        "directory" => realpath(dirname(__FILE__)) . "/application",
-    ),
-);
-
-/** Yaf_Application */
-$application = new Yaf_Application($config);
-print_r($application->getModules());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [0] => Index
-)
-]]>
-   </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/yaf/yaf_application/run.xml b/reference/yaf/yaf_application/run.xml
deleted file mode 100644
index 33c973794d83..000000000000
--- a/reference/yaf/yaf_application/run.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.run" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::run</refname>
-  <refpurpose>Start Yaf_Application</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type></type><methodname>Yaf_Application::run</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Run a <classname>Yaf_Application</classname>, let the
-   <classname>Yaf_Application</classname> accept a request, route this
-   request, dispatch to controller/action and render a response. Finally,
-   return the response to the client.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Response_Abstract</classname> object on
-   success, or &false; on failure (for instance if the application is
-   already running).
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Triggers a <constant>YAF_ERR_STARTUP_FAILED</constant> error if the
-   application was already started.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Application::run</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-defined('APPLICATION_PATH')
-    || define('APPLICATION_PATH', __DIR__);
-
-$application = new Yaf_Application(APPLICATION_PATH.'/conf/application.ini');
-$application->bootstrap()->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::bootstrap</methodname></member>
-    <member><methodname>Yaf_Dispatcher::dispatch</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/yaf/yaf_application/setappdirectory.xml b/reference/yaf/yaf_application/setappdirectory.xml
deleted file mode 100644
index 03013012da64..000000000000
--- a/reference/yaf/yaf_application/setappdirectory.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-application.setappdirectory" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Application::setAppDirectory</refname>
-  <refpurpose>Change the application directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Application</type><type>null</type><type>false</type></type><methodname>Yaf_Application::setAppDirectory</methodname>
-   <methodparam><type>string</type><parameter>directory</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change the application directory, under which Yaf looks for
-   controllers, views and modules. The new directory must be an absolute
-   path.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>directory</parameter></term>
-    <listitem>
-     <simpara>
-      The absolute path of the new application directory.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Application</classname> object itself on
-   success, &false; if <parameter>directory</parameter> is empty or not an
-   absolute path, or &null; if the application is not properly
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Application::setAppDirectory</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = Yaf_Application::app();
-
-/* returns the application itself on success, for chaining */
-var_dump($app->setAppDirectory("/srv/legacy/mvc/app"));
-var_dump($app->getAppDirectory());
-
-/* an empty or relative path is rejected */
-var_dump($app->setAppDirectory(""));
-var_dump($app->setAppDirectory("relative/path"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Yaf_Application)#1 (0) {
-}
-string(20) "/srv/legacy/mvc/app"
-bool(false)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::getAppDirectory</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/yaf/yaf_config_abstract/get.xml b/reference/yaf/yaf_config_abstract/get.xml
deleted file mode 100644
index 8d9b72ecd9ba..000000000000
--- a/reference/yaf/yaf_config_abstract/get.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-abstract.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Abstract::get</refname>
-<refpurpose>Retrieve a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Abstract::get</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a configuration value by name. If <parameter>name</parameter> is omitted or &null;, the configuration object itself is returned, which can be used to iterate over all values.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key. Dot notation (e.g. <literal>database.host</literal>) may be used to access nested values.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value associated with <parameter>name</parameter>. Array values are wrapped in a <classname>Yaf_Config_Abstract</classname> object. Returns &null; if the key does not exist, or the configuration object itself when <parameter>name</parameter> is &null;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Abstract::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * database.host = "localhost"
- * database.port = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-echo $config->get('database.host'), "\n";
-
-$simple = new Yaf_Config_Simple([
-    'database' => ['host' => '127.0.0.1'],
-]);
-
-// Array values are exposed as Yaf_Config_Abstract instances
-echo $simple->get('database')->host, "\n";
-
-var_dump($config->get('missing.key'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-localhost
-127.0.0.1
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Abstract::set</methodname></member>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::get</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/yaf/yaf_config_abstract/readonly.xml b/reference/yaf/yaf_config_abstract/readonly.xml
deleted file mode 100644
index 05fdeed6ea6b..000000000000
--- a/reference/yaf/yaf_config_abstract/readonly.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-abstract.readonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Abstract::readonly</refname>
-<refpurpose>Check if configuration is read-only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Abstract::readonly</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the configuration is read-only. This method is abstract and must be implemented by subclasses.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the configuration is read-only, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Abstract::readonly</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$ini = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-var_dump($ini->readonly()); // Yaf_Config_Ini is always read-only
-
-$writable = new Yaf_Config_Simple(['env' => 'development']);
-var_dump($writable->readonly());
-
-$frozen = new Yaf_Config_Simple(['env' => 'development'], true);
-var_dump($frozen->readonly());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Abstract::set</methodname></member>
-   <member><methodname>Yaf_Config_Ini::readonly</methodname></member>
-   <member><methodname>Yaf_Config_Simple::readonly</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/yaf/yaf_config_abstract/set.xml b/reference/yaf/yaf_config_abstract/set.xml
deleted file mode 100644
index 6b9cdc49e205..000000000000
--- a/reference/yaf/yaf_config_abstract/set.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-abstract.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Abstract::set</refname>
-<refpurpose>Set a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Abstract::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets a configuration value. This method is abstract and must be implemented by subclasses. Read-only configurations will reject modifications.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure (e.g. when the configuration is read-only).</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Abstract::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple(['env' => 'development']);
-var_dump($config->set('env', 'production'));
-echo $config->env, "\n";
-
-// Read-only implementations reject the modification
-$ini = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-var_dump($ini->set('env', 'production'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-production
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Abstract::get</methodname></member>
-   <member><methodname>Yaf_Config_Abstract::readonly</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/yaf/yaf_config_abstract/toarray.xml b/reference/yaf/yaf_config_abstract/toarray.xml
deleted file mode 100644
index 7e9509243636..000000000000
--- a/reference/yaf/yaf_config_abstract/toarray.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-abstract.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Abstract::toArray</refname>
-<refpurpose>Export configuration as array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yaf_Config_Abstract::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the entire configuration as a plain PHP array.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The configuration data as an array, or &null; if no configuration data is loaded.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Abstract::toArray</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-print_r($config->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [application] => Array
-        (
-            [name] => MyApp
-        )
-
-    [database] => Array
-        (
-            [host] => localhost
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Abstract::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::toArray</methodname></member>
-   <member><methodname>Yaf_Config_Simple::toArray</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/yaf/yaf_config_ini/construct.xml b/reference/yaf/yaf_config_ini/construct.xml
deleted file mode 100644
index 0f55a37f35e6..000000000000
--- a/reference/yaf/yaf_config_ini/construct.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::__construct</refname>
-<refpurpose>Constructor of Yaf_Config_Ini</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier><methodname>Yaf_Config_Ini::__construct</methodname>
-   <methodparam><type>mixed</type><parameter>config_file</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>section</parameter><initializer>NULL</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>Creates a new <classname>Yaf_Config_Ini</classname> instance from an INI file or an array. The resulting configuration is always read-only.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>config_file</parameter></term>
-    <listitem>
-<simpara>The path to an INI file, or an array of configuration values.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>section</parameter></term>
-    <listitem>
-<simpara>The INI section name to load. If omitted, all sections are loaded.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- *
- * [production : common]
- * log.level        = "warning"
- */
-
-// Load only the "production" section, which inherits from "common"
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'production');
-
-echo $config->application->name, "\n";
-echo $config->database->host, "\n";
-echo $config->log->level, "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MyApp
-localhost
-warning
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::set</methodname></member>
-   <member><methodname>Yaf_Config_Ini::readonly</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/yaf/yaf_config_ini/count.xml b/reference/yaf/yaf_config_ini/count.xml
deleted file mode 100644
index 1e0e86aed843..000000000000
--- a/reference/yaf/yaf_config_ini/count.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::count</refname>
-<refpurpose>Count configuration entries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Yaf_Config_Ini::count</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the number of top-level configuration entries.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The number of top-level entries as an integer.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::count</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Only the top-level entries ("application" and "database") are counted
-var_dump(count($config));
-var_dump($config->count());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(2)
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::toArray</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/yaf/yaf_config_ini/current.xml b/reference/yaf/yaf_config_ini/current.xml
deleted file mode 100644
index 8eecd38f3f7a..000000000000
--- a/reference/yaf/yaf_config_ini/current.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::current</refname>
-<refpurpose>Get current entry value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Ini::current</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the value of the current configuration entry during iteration. Array values are wrapped in a <classname>Yaf_Config_Abstract</classname> object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value of the current entry, or &false; if the position is invalid.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::current</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * version          = "1.0"
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-$config->rewind();
-while ($config->valid()) {
-    $value = $config->current();
-    if ($value instanceof Yaf_Config_Abstract) {
-        echo $config->key(), " => <config section>\n";
-    } else {
-        echo $config->key(), " => ", $value, "\n";
-    }
-    $config->next();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application => <config section>
-version => 1.0
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::key</methodname></member>
-   <member><methodname>Yaf_Config_Ini::next</methodname></member>
-   <member><methodname>Yaf_Config_Ini::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Ini::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_ini/get.xml b/reference/yaf/yaf_config_ini/get.xml
deleted file mode 100644
index 7eee71a0a695..000000000000
--- a/reference/yaf/yaf_config_ini/get.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::get</refname>
-<refpurpose>Retrieve a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Ini::get</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a configuration value by name. Dot notation (e.g. <literal>database.host</literal>) can be used to access nested values. If <parameter>name</parameter> is omitted or &null;, the configuration object itself is returned.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key, optionally using dot notation for nested access.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value associated with <parameter>name</parameter>. Array values are wrapped in a <classname>Yaf_Config_Ini</classname> object. Returns &null; if the key does not exist, or the configuration object itself when <parameter>name</parameter> is &null;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Dot notation for nested access
-echo $config->get('database.host'), "\n";
-
-// Array values are wrapped in a Yaf_Config_Ini object
-echo $config->get('database')->port, "\n";
-
-// No argument: the configuration object itself is returned
-echo $config->get()->application->name, "\n";
-
-var_dump($config->get('missing.key'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-localhost
-3306
-MyApp
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::set</methodname></member>
-   <member><methodname>Yaf_Config_Ini::toArray</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/yaf/yaf_config_ini/isset.xml b/reference/yaf/yaf_config_ini/isset.xml
deleted file mode 100644
index 7c5a825a1236..000000000000
--- a/reference/yaf/yaf_config_ini/isset.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::__isset</refname>
-<refpurpose>Check if a key exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Ini::__isset</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a configuration key exists. This method is invoked when <literal>isset()</literal> is used on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::__isset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-var_dump(isset($config->database));
-var_dump($config->__isset('database'));
-var_dump(isset($config->cache));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::offsetExists</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/yaf/yaf_config_ini/key.xml b/reference/yaf/yaf_config_ini/key.xml
deleted file mode 100644
index 86b998be5bd3..000000000000
--- a/reference/yaf/yaf_config_ini/key.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::key</refname>
-<refpurpose>Get current entry key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Ini::key</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the key of the current configuration entry during iteration.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The key of the current entry (string or integer), or &false; if the position is invalid.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::key</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * version          = "1.0"
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-for ($config->rewind(); $config->valid(); $config->next()) {
-    echo $config->key(), "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application
-version
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::current</methodname></member>
-   <member><methodname>Yaf_Config_Ini::next</methodname></member>
-   <member><methodname>Yaf_Config_Ini::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Ini::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_ini/next.xml b/reference/yaf/yaf_config_ini/next.xml
deleted file mode 100644
index 50ebbb282ec5..000000000000
--- a/reference/yaf/yaf_config_ini/next.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::next</refname>
-<refpurpose>Advance to next entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Ini::next</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Moves the internal iterator to the next configuration entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::next</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * version          = "1.0"
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-$config->rewind();
-echo $config->key(), "\n";
-
-$config->next();
-echo $config->key(), "\n";
-
-$config->next(); // past the last entry
-var_dump($config->valid());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application
-version
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::current</methodname></member>
-   <member><methodname>Yaf_Config_Ini::key</methodname></member>
-   <member><methodname>Yaf_Config_Ini::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Ini::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_ini/offsetexists.xml b/reference/yaf/yaf_config_ini/offsetexists.xml
deleted file mode 100644
index 6fb1503ea9a1..000000000000
--- a/reference/yaf/yaf_config_ini/offsetexists.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::offsetExists</refname>
-<refpurpose>Check if a key exists (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Ini::offsetExists</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a configuration key exists. This method is an alias of <methodname>Yaf_Config_Ini::__isset</methodname> and is called when <literal>isset()</literal> is used with array syntax on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::offsetExists</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-var_dump(isset($config['database']));
-var_dump($config->offsetExists('database'));
-var_dump(isset($config['cache']));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::__isset</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/yaf/yaf_config_ini/offsetget.xml b/reference/yaf/yaf_config_ini/offsetget.xml
deleted file mode 100644
index ca3822d4c47a..000000000000
--- a/reference/yaf/yaf_config_ini/offsetget.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::offsetGet</refname>
-<refpurpose>Get a value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Ini::offsetGet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a configuration value by key. This method is an alias of <methodname>Yaf_Config_Ini::get</methodname> and is called when array syntax is used to read a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to retrieve.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value associated with <parameter>name</parameter>, or &null; if the key does not exist.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::offsetGet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-echo $config['application.name'], "\n"; // dot notation, as in get()
-echo $config['database']['host'], "\n"; // nested access
-var_dump($config['cache.enable']);      // missing key
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MyApp
-localhost
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::offsetSet</methodname></member>
-   <member><methodname>Yaf_Config_Ini::offsetUnset</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/yaf/yaf_config_ini/offsetset.xml b/reference/yaf/yaf_config_ini/offsetset.xml
deleted file mode 100644
index 03fcc4c652d5..000000000000
--- a/reference/yaf/yaf_config_ini/offsetset.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::offsetSet</refname>
-<refpurpose>Set a configuration value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Ini::offsetSet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Attempts to set a configuration value using array syntax. This method is an alias of <methodname>Yaf_Config_Ini::set</methodname>. Since <classname>Yaf_Config_Ini</classname> is always read-only, it always fails and emits a warning.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned. A warning is emitted, because <classname>Yaf_Config_Ini</classname> is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::offsetSet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Yaf_Config_Ini is read-only: a warning is emitted and the value is kept
-$config['database.host'] = '192.0.2.10';
-
-echo $config['database.host'], "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-localhost
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::set</methodname></member>
-   <member><methodname>Yaf_Config_Ini::offsetGet</methodname></member>
-   <member><methodname>Yaf_Config_Ini::readonly</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/yaf/yaf_config_ini/offsetunset.xml b/reference/yaf/yaf_config_ini/offsetunset.xml
deleted file mode 100644
index d9c432aed47b..000000000000
--- a/reference/yaf/yaf_config_ini/offsetunset.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::offsetUnset</refname>
-<refpurpose>Remove a key (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Ini::offsetUnset</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes a configuration entry by key. This method is called when <literal>unset()</literal> is used with array syntax on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to remove.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned. A warning is emitted if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::offsetUnset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Yaf_Config_Ini is read-only: a warning is emitted, nothing is removed
-unset($config['database']);
-
-var_dump(isset($config['database']));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::offsetGet</methodname></member>
-   <member><methodname>Yaf_Config_Ini::offsetSet</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/yaf/yaf_config_ini/readonly.xml b/reference/yaf/yaf_config_ini/readonly.xml
deleted file mode 100644
index ac7439d288fb..000000000000
--- a/reference/yaf/yaf_config_ini/readonly.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.readonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::readonly</refname>
-<refpurpose>Check if configuration is read-only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Ini::readonly</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the configuration is read-only. <classname>Yaf_Config_Ini</classname> is always read-only.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::readonly</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Yaf_Config_Ini is always read-only
-var_dump($config->readonly());
-
-// Attempts to write are rejected (and a warning is emitted)
-var_dump($config->set('version', '2.0'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::set</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/yaf/yaf_config_ini/rewind.xml b/reference/yaf/yaf_config_ini/rewind.xml
deleted file mode 100644
index cc937b8bdd8b..000000000000
--- a/reference/yaf/yaf_config_ini/rewind.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::rewind</refname>
-<refpurpose>Reset iterator to first entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Ini::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Rewinds the internal iterator to the first configuration entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::rewind</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * version          = "1.0"
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-$config->next();
-echo $config->key(), "\n";
-
-$config->rewind();
-echo $config->key(), "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-version
-application
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::current</methodname></member>
-   <member><methodname>Yaf_Config_Ini::key</methodname></member>
-   <member><methodname>Yaf_Config_Ini::next</methodname></member>
-   <member><methodname>Yaf_Config_Ini::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_ini/set.xml b/reference/yaf/yaf_config_ini/set.xml
deleted file mode 100644
index 54b08f2d0699..000000000000
--- a/reference/yaf/yaf_config_ini/set.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::set</refname>
-<refpurpose>Set a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Ini::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Attempts to set a configuration value. Since <classname>Yaf_Config_Ini</classname> is always read-only, this method always fails and emits a warning.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &false; and emits a warning, because <classname>Yaf_Config_Ini</classname> is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-// Read-only: the assignment always fails, and a warning is emitted
-var_dump($config->set('database.host', '192.0.2.10'));
-
-echo $config->get('database.host'), "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-localhost
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</methodname></member>
-   <member><methodname>Yaf_Config_Ini::readonly</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/yaf/yaf_config_ini/toarray.xml b/reference/yaf/yaf_config_ini/toarray.xml
deleted file mode 100644
index 813719b7e0ce..000000000000
--- a/reference/yaf/yaf_config_ini/toarray.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::toArray</refname>
-<refpurpose>Export configuration as array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yaf_Config_Ini::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the entire configuration as a plain PHP array.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The configuration data as an array.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::toArray</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * database.host    = "localhost"
- * database.port    = 3306
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-print_r($config->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [application] => Array
-        (
-            [name] => MyApp
-        )
-
-    [database] => Array
-        (
-            [host] => localhost
-            [port] => 3306
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::get</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/yaf/yaf_config_ini/valid.xml b/reference/yaf/yaf_config_ini/valid.xml
deleted file mode 100644
index 4a43508bc203..000000000000
--- a/reference/yaf/yaf_config_ini/valid.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-ini.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Ini::valid</refname>
-<refpurpose>Check if current position is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Ini::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the current iterator position is valid.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the current position is valid, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Ini::valid</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Assume /etc/myapp/application.ini contains:
- * [common]
- * application.name = "MyApp"
- * version          = "1.0"
- */
-$config = new Yaf_Config_Ini('/etc/myapp/application.ini', 'common');
-
-$config->rewind();
-var_dump($config->valid());
-
-$config->next();
-var_dump($config->valid());
-
-$config->next(); // past the last entry
-var_dump($config->valid());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Ini::current</methodname></member>
-   <member><methodname>Yaf_Config_Ini::key</methodname></member>
-   <member><methodname>Yaf_Config_Ini::next</methodname></member>
-   <member><methodname>Yaf_Config_Ini::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_simple/construct.xml b/reference/yaf/yaf_config_simple/construct.xml
deleted file mode 100644
index 64edf87b4c71..000000000000
--- a/reference/yaf/yaf_config_simple/construct.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::__construct</refname>
-<refpurpose>Constructor of Yaf_Config_Simple</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier><methodname>Yaf_Config_Simple::__construct</methodname>
-   <methodparam><type>array</type><parameter>values</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>readonly</parameter><initializer>false</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>Creates a new <classname>Yaf_Config_Simple</classname> instance from an array of configuration values.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>values</parameter></term>
-    <listitem>
-<simpara>An array of configuration values.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>readonly</parameter></term>
-    <listitem>
-<simpara>Whether the configuration should be read-only. Defaults to &false; (writable).</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp', 'env' => 'production'],
-    'database'    => ['host' => 'localhost', 'port' => 3306],
-]);
-
-echo $config->application->name, "\n";
-echo $config->database->host, "\n";
-
-// The optional second argument makes the configuration read-only
-$frozen = new Yaf_Config_Simple(['env' => 'testing'], true);
-var_dump($frozen->readonly());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MyApp
-localhost
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::set</methodname></member>
-   <member><methodname>Yaf_Config_Simple::readonly</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/yaf/yaf_config_simple/count.xml b/reference/yaf/yaf_config_simple/count.xml
deleted file mode 100644
index 60be74b492f2..000000000000
--- a/reference/yaf/yaf_config_simple/count.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::count</refname>
-<refpurpose>Count configuration entries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Yaf_Config_Simple::count</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the number of top-level configuration entries.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The number of top-level entries as an integer.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::count</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-// Only the top-level entries ("application" and "database") are counted
-var_dump(count($config));
-var_dump($config->count());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(2)
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::toArray</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/yaf/yaf_config_simple/current.xml b/reference/yaf/yaf_config_simple/current.xml
deleted file mode 100644
index 82f3ddf16f0f..000000000000
--- a/reference/yaf/yaf_config_simple/current.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::current</refname>
-<refpurpose>Get current entry value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Simple::current</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the value of the current configuration entry during iteration. Array values are wrapped in a <classname>Yaf_Config_Abstract</classname> object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value of the current entry, or &false; if the position is invalid.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::current</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'version'     => '1.0',
-]);
-
-$config->rewind();
-while ($config->valid()) {
-    $value = $config->current();
-    if ($value instanceof Yaf_Config_Abstract) {
-        echo $config->key(), " => <config node>\n";
-    } else {
-        echo $config->key(), " => ", $value, "\n";
-    }
-    $config->next();
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application => <config node>
-version => 1.0
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::key</methodname></member>
-   <member><methodname>Yaf_Config_Simple::next</methodname></member>
-   <member><methodname>Yaf_Config_Simple::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Simple::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_simple/get.xml b/reference/yaf/yaf_config_simple/get.xml
deleted file mode 100644
index 9347124f3f8d..000000000000
--- a/reference/yaf/yaf_config_simple/get.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::get</refname>
-<refpurpose>Retrieve a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Simple::get</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a configuration value by name. If <parameter>name</parameter> is omitted or &null;, the configuration object itself is returned.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to retrieve.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value associated with <parameter>name</parameter>. Array values are wrapped in a <classname>Yaf_Config_Simple</classname> object. Returns &null; if the key does not exist, or the configuration object itself when <parameter>name</parameter> is &null;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-// Array values are wrapped in a Yaf_Config_Simple object
-echo $config->get('database')->host, "\n";
-echo $config->get('application')->name, "\n";
-var_dump($config->get('missing'));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-localhost
-MyApp
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::set</methodname></member>
-   <member><methodname>Yaf_Config_Simple::toArray</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/yaf/yaf_config_simple/isset.xml b/reference/yaf/yaf_config_simple/isset.xml
deleted file mode 100644
index b03bf29d004b..000000000000
--- a/reference/yaf/yaf_config_simple/isset.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::__isset</refname>
-<refpurpose>Check if a key exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Simple::__isset</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a configuration key exists. This method is invoked when <literal>isset()</literal> is used on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::__isset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-var_dump(isset($config->application));
-var_dump($config->__isset('application'));
-var_dump(isset($config->cache));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetExists</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/yaf/yaf_config_simple/key.xml b/reference/yaf/yaf_config_simple/key.xml
deleted file mode 100644
index e625055c7024..000000000000
--- a/reference/yaf/yaf_config_simple/key.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::key</refname>
-<refpurpose>Get current entry key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Simple::key</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the key of the current configuration entry during iteration.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The key of the current entry (string or integer), or &false; if the position is invalid.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::key</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-for ($config->rewind(); $config->valid(); $config->next()) {
-    echo $config->key(), "\n";
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application
-database
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::current</methodname></member>
-   <member><methodname>Yaf_Config_Simple::next</methodname></member>
-   <member><methodname>Yaf_Config_Simple::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Simple::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_simple/next.xml b/reference/yaf/yaf_config_simple/next.xml
deleted file mode 100644
index 4218a7cfaba5..000000000000
--- a/reference/yaf/yaf_config_simple/next.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::next</refname>
-<refpurpose>Advance to next entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Simple::next</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Moves the internal iterator to the next configuration entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::next</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-$config->rewind();
-echo $config->key(), "\n";
-
-$config->next();
-echo $config->key(), "\n";
-
-$config->next(); // past the last entry
-var_dump($config->valid());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-application
-database
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::current</methodname></member>
-   <member><methodname>Yaf_Config_Simple::key</methodname></member>
-   <member><methodname>Yaf_Config_Simple::rewind</methodname></member>
-   <member><methodname>Yaf_Config_Simple::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_simple/offsetexists.xml b/reference/yaf/yaf_config_simple/offsetexists.xml
deleted file mode 100644
index 867163afa12d..000000000000
--- a/reference/yaf/yaf_config_simple/offsetexists.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::offsetExists</refname>
-<refpurpose>Check if a key exists (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Simple::offsetExists</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a configuration key exists. This method is an alias of <methodname>Yaf_Config_Simple::__isset</methodname> and is called when <literal>isset()</literal> is used with array syntax on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::offsetExists</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-var_dump(isset($config['database']));
-var_dump($config->offsetExists('database'));
-var_dump(isset($config['cache']));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::__isset</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/yaf/yaf_config_simple/offsetget.xml b/reference/yaf/yaf_config_simple/offsetget.xml
deleted file mode 100644
index fea8b064ca48..000000000000
--- a/reference/yaf/yaf_config_simple/offsetget.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::offsetGet</refname>
-<refpurpose>Get a value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Config_Simple::offsetGet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a configuration value by key. This method is an alias of <methodname>Yaf_Config_Simple::get</methodname> and is called when array syntax is used to read a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to retrieve.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value associated with <parameter>name</parameter>, or &null; if the key does not exist.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::offsetGet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-// Array values are wrapped in a Yaf_Config_Simple object
-echo $config['application']->name, "\n";
-echo $config['database']['host'], "\n";
-var_dump($config['missing']);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-MyApp
-localhost
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetSet</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetUnset</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/yaf/yaf_config_simple/offsetset.xml b/reference/yaf/yaf_config_simple/offsetset.xml
deleted file mode 100644
index 42b5a58c52d1..000000000000
--- a/reference/yaf/yaf_config_simple/offsetset.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::offsetSet</refname>
-<refpurpose>Set a configuration value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Simple::offsetSet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets a configuration value using array syntax. This method is an alias of <methodname>Yaf_Config_Simple::set</methodname>. The assignment fails silently if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned. The assignment fails if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::offsetSet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple(['env' => 'development']);
-
-// Writable by default
-$config['env'] = 'production';
-$config['cache'] = ['enable' => true];
-echo $config['env'], "\n";
-var_dump($config['cache']['enable']);
-
-// Assignments to a read-only configuration fail silently
-$frozen = new Yaf_Config_Simple(['env' => 'development'], true);
-$frozen['env'] = 'production';
-echo $frozen['env'], "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-production
-bool(true)
-development
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::set</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetGet</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetUnset</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/yaf/yaf_config_simple/offsetunset.xml b/reference/yaf/yaf_config_simple/offsetunset.xml
deleted file mode 100644
index d5b1a0e52eb1..000000000000
--- a/reference/yaf/yaf_config_simple/offsetunset.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::offsetUnset</refname>
-<refpurpose>Remove a key (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Simple::offsetUnset</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes a configuration entry by key. This method is called when <literal>unset()</literal> is used with array syntax on a configuration object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to remove.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned. A warning is emitted if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::offsetUnset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'cache' => ['enable' => true],
-    'env'   => 'development',
-]);
-
-unset($config['cache']);
-var_dump(isset($config['cache']));
-
-// Read-only configurations cannot be modified: a warning is emitted
-$frozen = new Yaf_Config_Simple(['env' => 'development'], true);
-unset($frozen['env']);
-var_dump(isset($frozen['env']));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::offsetGet</methodname></member>
-   <member><methodname>Yaf_Config_Simple::offsetSet</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/yaf/yaf_config_simple/readonly.xml b/reference/yaf/yaf_config_simple/readonly.xml
deleted file mode 100644
index 5f02a3a3745a..000000000000
--- a/reference/yaf/yaf_config_simple/readonly.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.readonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::readonly</refname>
-<refpurpose>Check if configuration is read-only</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Simple::readonly</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the configuration is read-only, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::readonly</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$writable = new Yaf_Config_Simple(['env' => 'development']);
-var_dump($writable->readonly());
-
-$frozen = new Yaf_Config_Simple(['env' => 'development'], true);
-var_dump($frozen->readonly());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::set</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/yaf/yaf_config_simple/rewind.xml b/reference/yaf/yaf_config_simple/rewind.xml
deleted file mode 100644
index 9fbdfe7803df..000000000000
--- a/reference/yaf/yaf_config_simple/rewind.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::rewind</refname>
-<refpurpose>Reset iterator to first entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Config_Simple::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Rewinds the internal iterator to the first configuration entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::rewind</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-$config->next();
-echo $config->key(), "\n";
-
-$config->rewind();
-echo $config->key(), "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-database
-application
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::current</methodname></member>
-   <member><methodname>Yaf_Config_Simple::key</methodname></member>
-   <member><methodname>Yaf_Config_Simple::next</methodname></member>
-   <member><methodname>Yaf_Config_Simple::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_config_simple/set.xml b/reference/yaf/yaf_config_simple/set.xml
deleted file mode 100644
index 9890e1f8a7c2..000000000000
--- a/reference/yaf/yaf_config_simple/set.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::set</refname>
-<refpurpose>Set a configuration value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Simple::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets a configuration value. Fails and returns &false; if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The configuration key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; if the configuration is read-only.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple(['env' => 'development']);
-
-var_dump($config->set('env', 'production'));
-echo $config->env, "\n";
-
-// Read-only configurations reject the modification
-$frozen = new Yaf_Config_Simple(['env' => 'development'], true);
-var_dump($frozen->set('env', 'production'));
-echo $frozen->env, "\n";
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-production
-bool(false)
-development
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</methodname></member>
-   <member><methodname>Yaf_Config_Simple::readonly</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/yaf/yaf_config_simple/toarray.xml b/reference/yaf/yaf_config_simple/toarray.xml
deleted file mode 100644
index 56b723dcbec0..000000000000
--- a/reference/yaf/yaf_config_simple/toarray.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.toarray" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::toArray</refname>
-<refpurpose>Export configuration as array</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yaf_Config_Simple::toArray</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the entire configuration as a plain PHP array.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The configuration data as an array.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::toArray</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost', 'port' => 3306],
-]);
-
-print_r($config->toArray());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [application] => Array
-        (
-            [name] => MyApp
-        )
-
-    [database] => Array
-        (
-            [host] => localhost
-            [port] => 3306
-        )
-
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::get</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/yaf/yaf_config_simple/valid.xml b/reference/yaf/yaf_config_simple/valid.xml
deleted file mode 100644
index b1ee3160050b..000000000000
--- a/reference/yaf/yaf_config_simple/valid.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-config-simple.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Config_Simple::valid</refname>
-<refpurpose>Check if current position is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Config_Simple::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the current iterator position is valid.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the current position is valid, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Config_Simple::valid</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = new Yaf_Config_Simple([
-    'application' => ['name' => 'MyApp'],
-    'database'    => ['host' => 'localhost'],
-]);
-
-$config->rewind();
-var_dump($config->valid());
-
-$config->next();
-var_dump($config->valid());
-
-$config->next(); // past the last entry
-var_dump($config->valid());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Config_Simple::current</methodname></member>
-   <member><methodname>Yaf_Config_Simple::key</methodname></member>
-   <member><methodname>Yaf_Config_Simple::next</methodname></member>
-   <member><methodname>Yaf_Config_Simple::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_controller_abstract/construct.xml b/reference/yaf/yaf_controller_abstract/construct.xml
deleted file mode 100644
index c2bfb7d08206..000000000000
--- a/reference/yaf/yaf_controller_abstract/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::__construct</refname>
-  <refpurpose>Constructor of Yaf_Controller_Abstract</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Controller_Abstract::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>
-   <methodname>Yaf_Controller_Abstract::__construct</methodname> is
-   called by Yaf when a controller object is created during dispatching.
-   It takes no arguments, and users should not call it directly. Since
-   it is not intended to be overridden with custom logic,
-   <methodname>Yaf_Controller_Abstract::init</methodname> is provided as
-   the userland initialization hook instead.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No value is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    // __construct() is called by Yaf_Dispatcher when the controller
-    // is instantiated during dispatching, and should be neither
-    // called manually nor overridden. Define init() instead:
-
-    public function init() {
-        // by the time init() runs, the dispatcher has already wired
-        // up the controller: the request, response and view engine
-        // are all available
-        var_dump($this->getRequest() instanceof Yaf_Request_Abstract);
-        var_dump($this->getResponse() instanceof Yaf_Response_Abstract);
-        var_dump($this->getView() instanceof Yaf_View_Interface);
-    }
-
-    public function indexAction() {
-        // ...
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::init</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/yaf/yaf_controller_abstract/display.xml b/reference/yaf/yaf_controller_abstract/display.xml
deleted file mode 100644
index c42019d2c45b..000000000000
--- a/reference/yaf/yaf_controller_abstract/display.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.display" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::display</refname>
-  <refpurpose>Render and display a view</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Controller_Abstract::display</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Renders the view script <parameter>tpl</parameter> and sends the
-   result directly, unlike
-   <methodname>Yaf_Controller_Abstract::render</methodname>,
-   which returns the rendered output instead. Auto-rendering
-   of the default action template is controlled by
-   <methodname>Yaf_Dispatcher::autoRender</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-     <simpara>
-      The view script name, relative to the view path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameters</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array of variables to export to the
-      view script for this rendering, overriding those
-      assigned through the view engine.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::display</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function listAction() {
-        // render product/list.phtml and send the result directly
-        // to the client, exporting $products to this rendering
-        $this->display("product/list.phtml", array(
-            "products" => array("yaf", "php"),
-        ));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Template example</title>
-   <programlisting role="php">
-<![CDATA[
-<!-- application/views/product/list.phtml -->
-<ul>
-<?php foreach ($products as $product) { ?>
-    <li><?php echo $product; ?></li>
-<?php } ?>
-</ul>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-<ul>
-    <li>yaf</li>
-    <li>php</li>
-</ul>
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::render</methodname></member>
-    <member><methodname>Yaf_Dispatcher::autoRender</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/yaf/yaf_controller_abstract/forward.xml b/reference/yaf/yaf_controller_abstract/forward.xml
deleted file mode 100644
index 713c7e22575f..000000000000
--- a/reference/yaf/yaf_controller_abstract/forward.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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>Forward the current request to another action</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Controller_Abstract::forward</methodname>
-   <methodparam><type>string</type><parameter>action</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></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 class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></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>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Forward the current request to another action. The target is
-   determined from the number and types of the arguments:
-  </simpara>
-  <simplelist>
-   <member><parameter>action</parameter> only: forward to another action of the current controller.</member>
-   <member><parameter>controller</parameter> and <parameter>action</parameter>: forward to another controller.</member>
-   <member><parameter>module</parameter>, <parameter>controller</parameter> and <parameter>action</parameter>: forward to another module.</member>
-   <member>The optional <parameter>parameters</parameter> array carries invocation arguments retrievable with <methodname>Yaf_Request_Abstract::getParam</methodname>.</member>
-  </simplelist>
-  <note>
-   <simpara>
-    This method does not switch to the destination action immediately;
-    the switch takes place after the current flow finishes. To hand over
-    control right away, return from the current action method (returning
-    &false; also tells Yaf not to auto-render the current view).
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>module</parameter></term>
-    <listitem>
-     <simpara>
-      The destination module name. If the current module is given, it is
-      used as is.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>controller</parameter></term>
-    <listitem>
-     <simpara>
-      The destination controller name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>action</parameter></term>
-    <listitem>
-     <simpara>
-      The destination action name.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameters</parameter></term>
-    <listitem>
-     <simpara>
-      Invocation arguments for the destination action, retrievable
-      with <methodname>Yaf_Request_Abstract::getParam</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Controller_Abstract::forward</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        $logined = $_SESSION["login"];
-        if (!$logined) {
-            $this->forward("login", array("from" => "Index")); // forward to the login action
-            return false; // this is important, it ends the current flow
-                          // and tells Yaf not to auto-render
-        }
-
-        // other processes
-    }
-
-    public function loginAction() {
-        echo "login, redirected from ", $this->_request->getParam("from") , " action";
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-   login, redirected from Index action
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_controller_abstract/getinvokearg.xml b/reference/yaf/yaf_controller_abstract/getinvokearg.xml
deleted file mode 100644
index 16ec1415ddf4..000000000000
--- a/reference/yaf/yaf_controller_abstract/getinvokearg.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getinvokearg" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getInvokeArg</refname>
-  <refpurpose>Retrieve one action invocation argument</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getInvokeArg</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns a single invocation argument of the current action, given its
-   name. Invocation arguments are passed to the action through
-   <methodname>Yaf_Controller_Abstract::forward</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the invocation argument to retrieve.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The argument value, or &null; if it does not exist.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getInvokeArg</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class UserController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // forward to the profile action of this controller,
-        // carrying invocation arguments
-        $this->forward("profile", array("name" => "laruence"));
-        return false; // ends the current flow
-    }
-
-    public function profileAction() {
-        // retrieve one invocation argument by name
-        var_dump($this->getInvokeArg("name"));
-        var_dump($this->getInvokeArg("missing"));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(8) "laruence"
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getInvokeArgs</methodname></member>
-    <member><methodname>Yaf_Controller_Abstract::forward</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/yaf/yaf_controller_abstract/getinvokeargs.xml b/reference/yaf/yaf_controller_abstract/getinvokeargs.xml
deleted file mode 100644
index 6bdf99468463..000000000000
--- a/reference/yaf/yaf_controller_abstract/getinvokeargs.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getinvokeargs" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getInvokeArgs</refname>
-  <refpurpose>Retrieve all action invocation arguments</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getInvokeArgs</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns all invocation arguments of the current action, as an array
-   keyed by argument name. Invocation arguments are passed to the action
-   through <methodname>Yaf_Controller_Abstract::forward</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An array of invocation arguments, or &null; if none were given.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getInvokeArgs</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        $this->forward("list", array("category" => "book", "page" => 2));
-        return false; // ends the current flow
-    }
-
-    public function listAction() {
-        // all invocation arguments of the current action
-        var_dump($this->getInvokeArgs());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["category"]=>
-  string(4) "book"
-  ["page"]=>
-  int(2)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getInvokeArg</methodname></member>
-    <member><methodname>Yaf_Controller_Abstract::forward</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/yaf/yaf_controller_abstract/getmodulename.xml b/reference/yaf/yaf_controller_abstract/getmodulename.xml
deleted file mode 100644
index 970fe6c67bad..000000000000
--- a/reference/yaf/yaf_controller_abstract/getmodulename.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getmodulename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getModuleName</refname>
-  <refpurpose>Get module name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getModuleName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the module the controller belongs to.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The module name as a &string;, or &null; if it is not set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getModuleName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // assuming the request was dispatched to the
-        // default "Index" module
-        var_dump($this->getModuleName());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Index"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getName</methodname></member>
-    <member><methodname>Yaf_Request_Abstract::getModuleName</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/yaf/yaf_controller_abstract/getname.xml b/reference/yaf/yaf_controller_abstract/getname.xml
deleted file mode 100644
index b797b63ec219..000000000000
--- a/reference/yaf/yaf_controller_abstract/getname.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getName</refname>
-  <refpurpose>Get controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the name of the controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The controller name as a &string;, or &null; if it is not set.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // the controller name, without the "Controller" suffix
-        var_dump($this->getName());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "Product"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getModuleName</methodname></member>
-    <member><methodname>Yaf_Request_Abstract::getControllerName</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/yaf/yaf_controller_abstract/getrequest.xml b/reference/yaf/yaf_controller_abstract/getrequest.xml
deleted file mode 100644
index 4e35024c34e3..000000000000
--- a/reference/yaf/yaf_controller_abstract/getrequest.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getrequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getRequest</refname>
-  <refpurpose>Retrieve current request object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getRequest</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>Yaf_Request_Abstract</classname> instance associated with this controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_Request_Abstract</classname> instance, or &null; if no request is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getRequest</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        $request = $this->getRequest();
-        var_dump($request->getModuleName());
-        var_dump($request->getControllerName());
-        var_dump($request->getActionName());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Index"
-string(5) "Index"
-string(5) "index"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getResponse</methodname></member>
-    <member><classname>Yaf_Request_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_controller_abstract/getresponse.xml b/reference/yaf/yaf_controller_abstract/getresponse.xml
deleted file mode 100644
index 7b053c8df84e..000000000000
--- a/reference/yaf/yaf_controller_abstract/getresponse.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getResponse</refname>
-  <refpurpose>Retrieve current response object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the <classname>Yaf_Response_Abstract</classname> instance associated with this controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_Response_Abstract</classname> instance, or &null; if no response is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getResponse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function apiAction() {
-        // build the answer ourselves, no template needed
-        Yaf_Dispatcher::getInstance()->disableView();
-
-        $response = $this->getResponse();
-        $response->setHeader("Content-Type", "application/json");
-        $response->setBody(json_encode(array("name" => "yaf")));
-        // Yaf sends the body after the dispatch loop finishes
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getRequest</methodname></member>
-    <member><classname>Yaf_Response_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_controller_abstract/getview.xml b/reference/yaf/yaf_controller_abstract/getview.xml
deleted file mode 100644
index c5d56705ab62..000000000000
--- a/reference/yaf/yaf_controller_abstract/getview.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getView</refname>
-  <refpurpose>Retrieve the view engine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_View_Interface</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getView</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the view engine bound to this controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_View_Interface</classname> instance, or &null; if no view engine is available.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getView</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        $view = $this->getView();
-
-        // export $products to the template product/index.phtml
-        $view->assign("products", array("yaf", "php"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::initView</methodname></member>
-    <member><classname>Yaf_View_Interface</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_controller_abstract/getviewpath.xml b/reference/yaf/yaf_controller_abstract/getviewpath.xml
deleted file mode 100644
index 21157781bf65..000000000000
--- a/reference/yaf/yaf_controller_abstract/getviewpath.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.getviewpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::getViewpath</refname>
-  <refpurpose>Get the view path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Controller_Abstract::getViewpath</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the template directory used by the view engine bound to this controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The view template directory as a &string;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::getViewpath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // the template directory used by the view engine,
-        // e.g. "/var/www/html/application/views"
-        var_dump($this->getViewpath());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(31) "/var/www/html/application/views"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::setViewpath</methodname></member>
-    <member><methodname>Yaf_Controller_Abstract::initView</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/yaf/yaf_controller_abstract/init.xml b/reference/yaf/yaf_controller_abstract/init.xml
deleted file mode 100644
index 1202b245c15e..000000000000
--- a/reference/yaf/yaf_controller_abstract/init.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.init" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::init</refname>
-  <refpurpose>Controller initializer</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Controller_Abstract::init</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   <methodname>Yaf_Controller_Abstract::__construct</methodname> is not
-   meant to be overridden with custom logic, so
-   <methodname>Yaf_Controller_Abstract::init</methodname> is provided as
-   the userland initialization hook. If it is defined in a controller, it
-   is called right after the controller object is instantiated.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No value is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::init</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    // init() is called right after the controller is instantiated,
-    // before any action is dispatched
-    public function init() {
-        $this->getView()->assign("sitename", "Yaf Tutorial");
-    }
-
-    public function indexAction() {
-        // ...
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Controller_Abstract::__construct</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/yaf/yaf_controller_abstract/initview.xml b/reference/yaf/yaf_controller_abstract/initview.xml
deleted file mode 100644
index 416a3952fe83..000000000000
--- a/reference/yaf/yaf_controller_abstract/initview.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.initview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::initView</refname>
-  <refpurpose>Initialize the view and return it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_View_Interface</type><type>null</type></type><methodname>Yaf_Controller_Abstract::initView</methodname>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the view engine bound to this controller. The view engine is
-   initialized by the <classname>Yaf_Dispatcher</classname> during
-   dispatching, using the template path set for the current controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options passed to the view engine, see
-      <methodname>Yaf_View_Simple::__construct</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_View_Interface</classname> instance on success, or
-   &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::initView</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // fetch the view engine bound to this controller, initialized
-        // with its template path, e.g. application/views/;
-        // options would be forwarded to the view engine, see
-        // Yaf_View_Simple::__construct()
-        $view = $this->initView();
-        $view->assign("products", array("yaf", "php"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getView</methodname></member>
-    <member><classname>Yaf_View_Interface</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_controller_abstract/redirect.xml b/reference/yaf/yaf_controller_abstract/redirect.xml
deleted file mode 100644
index c4fb3fe8e9d6..000000000000
--- a/reference/yaf/yaf_controller_abstract/redirect.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.redirect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::redirect</refname>
-  <refpurpose>Redirect to a URL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Controller_Abstract::redirect</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Redirects the client to another URL by sending a
-   <literal>Location</literal> header (HTTP status 302).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-     <simpara>
-      The URL to redirect to.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::redirect</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AccountController extends Yaf_Controller_Abstract
-{
-    public function loginAction() {
-        if (!$this->getRequest()->getParam("user")) {
-            // send a Location header with HTTP status 302
-            $this->redirect("http://www.example.com/account/login/");
-            return false; // skip auto-rendering
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::forward</methodname></member>
-    <member><methodname>Yaf_Response_Abstract::setRedirect</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/yaf/yaf_controller_abstract/render.xml b/reference/yaf/yaf_controller_abstract/render.xml
deleted file mode 100644
index 7d30e3beabe4..000000000000
--- a/reference/yaf/yaf_controller_abstract/render.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.render" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::render</refname>
-  <refpurpose>Render view template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>protected</modifier> <type class="union"><type>string</type><type>bool</type><type>null</type></type><methodname>Yaf_Controller_Abstract::render</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Renders the view script <parameter>tpl</parameter> and returns the
-   output, unlike
-   <methodname>Yaf_Controller_Abstract::display</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-     <simpara>
-      The view script name, relative to the view path.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameters</parameter></term>
-    <listitem>
-     <simpara>
-      An associative array of variables to export to the view
-      script for this rendering.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The rendered output as a &string; on success, or &false; on
-   failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::render</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function indexAction() {
-        // do not auto-render the default template
-        Yaf_Dispatcher::getInstance()->disableView();
-
-        // render product/index.phtml and return the output
-        // instead of sending it directly (as display() would)
-        $html = $this->render("product/index.phtml", array(
-            "products" => array("yaf", "php"),
-        ));
-
-        // post-process and set it as the response body
-        $this->getResponse()->setBody($html);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::display</methodname></member>
-    <member><methodname>Yaf_Dispatcher::autoRender</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/yaf/yaf_controller_abstract/setviewpath.xml b/reference/yaf/yaf_controller_abstract/setviewpath.xml
deleted file mode 100644
index d8c402532345..000000000000
--- a/reference/yaf/yaf_controller_abstract/setviewpath.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-controller-abstract.setviewpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Controller_Abstract::setViewpath</refname>
-  <refpurpose>Set the view path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Controller_Abstract::setViewpath</methodname>
-   <methodparam><type>string</type><parameter>view_directory</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets the template directory of the view engine bound to this
-   controller.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>view_directory</parameter></term>
-    <listitem>
-     <simpara>
-      The directory that holds the view templates.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; on success, or &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Controller_Abstract::setViewpath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function init() {
-        // from now on templates of this controller are looked up
-        // under application/themes/dark/views/
-        $this->setViewpath(APPLICATION_PATH . "/themes/dark/views");
-    }
-
-    public function indexAction() {
-        // renders application/themes/dark/views/product/index.phtml
-        $this->display("product/index.phtml");
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Controller_Abstract::getViewpath</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/yaf/yaf_dispatcher/autorender.xml b/reference/yaf/yaf_dispatcher/autorender.xml
deleted file mode 100644
index 632e8f88faae..000000000000
--- a/reference/yaf/yaf_dispatcher/autorender.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.autorender" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::autoRender</refname>
-  <refpurpose>Switch on/off autorendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>bool</type></type><methodname>Yaf_Dispatcher::autoRender</methodname>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>flag</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   <classname>Yaf_Dispatcher</classname> will render the view
-   automatically after dispatching an incoming request. You can prevent
-   the rendering by calling this method with
-   <parameter>flag</parameter> &false;.
-  </simpara>
-  <note>
-   <simpara>
-    You can also simply return &false; in an action to prevent the
-    auto-rendering of that action only.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Whether to enable auto-rendering.
-     </simpara>
-     <note>
-      <simpara>
-       Since Yaf 2.2.0, if this parameter is not given, the current state
-       is returned instead.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself when
-   <parameter>flag</parameter> is given, or a &boolean; indicating whether
-   auto-rendering is enabled when it is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Dispatcher::autoRender</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract {
-     /* init method will be called as soon as a controller is initialized */
-     public function init() {
-         if ($this->getRequest()->isXmlHttpRequest()) {
-             //do not call render for ajax request
-             //we will output a json string
-             Yaf_Dispatcher::getInstance()->autoRender(FALSE);
-         }
-     }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::flushInstantly</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/yaf/yaf_dispatcher/catchexception.xml b/reference/yaf/yaf_dispatcher/catchexception.xml
deleted file mode 100644
index c46bd8d574d8..000000000000
--- a/reference/yaf/yaf_dispatcher/catchexception.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.catchexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::catchException</refname>
-  <refpurpose>Switch on/off exception catching</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>bool</type></type><methodname>Yaf_Dispatcher::catchException</methodname>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>flag</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   While
-   <link linkend="configuration.yaf.dispatcher.throwexception">application.dispatcher.throwException</link>
-   is on (which can also be enabled by calling
-   <methodname>Yaf_Dispatcher::throwException</methodname>), Yaf throws
-   exceptions when errors occur instead of triggering errors.
-  </simpara>
-  <simpara>
-   If exception catching is additionally enabled via this method (or via
-   <link linkend="configuration.yaf.dispatcher.catchexception">application.dispatcher.catchException</link>),
-   all uncaught exceptions are caught and dispatched to
-   <literal>ErrorController::error</literal>, if one is defined.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Whether Yaf should catch uncaught exceptions and dispatch them to
-      <literal>ErrorController::error</literal>.
-     </simpara>
-     <note>
-      <simpara>
-       Since Yaf 2.2.0, if this parameter is not given, the current state
-       is returned instead.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself when
-   <parameter>flag</parameter> is given, or a &boolean; indicating whether
-   exception catching is enabled when it is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Dispatcher::catchException</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* if you defined an ErrorController like following */
-class ErrorController extends Yaf_Controller_Abstract {
-     /**
-      * you can also call Yaf_Request_Abstract::getException to get the
-      * uncaught exception.
-      */
-     public function errorAction($exception) {
-        /* an error occurred */
-        switch ($exception->getCode()) {
-            case YAF_ERR_NOTFOUND_MODULE:
-            case YAF_ERR_NOTFOUND_CONTROLLER:
-            case YAF_ERR_NOTFOUND_ACTION:
-            case YAF_ERR_NOTFOUND_VIEW:
-                echo 404, ":", $exception->getMessage();
-                break;
-            default :
-                $message = $exception->getMessage();
-                echo 0, ":", $exception->getMessage();
-                break;
-        }
-     }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* now if some error occurs, assuming accessing a non-existent controller
-   (or you can throw an exception yourself): */
-404:Could not find controller script **/application/controllers/No-exists-controller.php
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::throwException</methodname></member>
-    <member><methodname>Yaf_Dispatcher::setErrorHandler</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/yaf/yaf_dispatcher/construct.xml b/reference/yaf/yaf_dispatcher/construct.xml
deleted file mode 100644
index dd9e3331cecd..000000000000
--- a/reference/yaf/yaf_dispatcher/construct.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::__construct</refname>
-  <refpurpose>Yaf_Dispatcher constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>Yaf_Dispatcher::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>
-   <classname>Yaf_Dispatcher</classname> implements the singleton pattern,
-   so the constructor is private. Use
-   <methodname>Yaf_Dispatcher::getInstance</methodname> to retrieve the
-   dispatcher instance, which is created by
-   <classname>Yaf_Application</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   &return.void;
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><classname>Yaf_Dispatcher</classname> is a singleton</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// Yaf_Dispatcher implements the singleton pattern, so its constructor is
-// private. Retrieve the instance with Yaf_Dispatcher::getInstance()
-// instead of calling `new`.
-$dispatcher = Yaf_Dispatcher::getInstance();
-
-var_dump($dispatcher instanceof Yaf_Dispatcher);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::getInstance</methodname></member>
-    <member><methodname>Yaf_Application::getDispatcher</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/yaf/yaf_dispatcher/disableview.xml b/reference/yaf/yaf_dispatcher/disableview.xml
deleted file mode 100644
index 92d375d925d5..000000000000
--- a/reference/yaf/yaf_dispatcher/disableview.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.disableview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::disableView</refname>
-  <refpurpose>Disable view rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::disableView</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Turn off view rendering. This is typically used for actions that
-   generate their own output, such as actions returning JSON data.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::disableView</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// Turn off view rendering globally, every action is expected to produce
-// its output itself (e.g. a JSON API service).
-Yaf_Dispatcher::getInstance()->disableView();
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::enableView</methodname></member>
-    <member><methodname>Yaf_Dispatcher::autoRender</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/yaf/yaf_dispatcher/dispatch.xml b/reference/yaf/yaf_dispatcher/dispatch.xml
deleted file mode 100644
index 73e8caf67002..000000000000
--- a/reference/yaf/yaf_dispatcher/dispatch.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.dispatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::dispatch</refname>
-  <refpurpose>Dispatch a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::dispatch</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   This method does the heavy work of the
-   <classname>Yaf_Dispatcher</classname>. It takes a request object.
-  </simpara>
-  <para>
-   The dispatch process has three distinct events:
-   <simplelist>
-    <member>Routing</member>
-    <member>Dispatching</member>
-    <member>Response</member>
-   </simplelist>
-   Routing takes place exactly once, using the values in the request object
-   when <methodname>Yaf_Dispatcher::dispatch</methodname> 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
-   <classname>Yaf_Dispatcher</classname> returns a response.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Yaf_Request_Abstract</classname> instance to dispatch.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Response_Abstract</classname> instance on success,
-   &false; on failure, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::dispatch</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-$app->bootstrap();
-
-// Build a request pointing at ProductController::detailAction and
-// dispatch it manually.
-$request = new Yaf_Request_Http("/product/detail/id/42");
-
-$response = Yaf_Dispatcher::getInstance()->dispatch($request);
-
-if ($response instanceof Yaf_Response_Abstract) {
-    $response->response();
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::run</methodname></member>
-    <member><classname>Yaf_Plugin_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/enableview.xml b/reference/yaf/yaf_dispatcher/enableview.xml
deleted file mode 100644
index 2422d2d28e6f..000000000000
--- a/reference/yaf/yaf_dispatcher/enableview.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.enableview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::enableView</refname>
-  <refpurpose>Enable view rendering</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::enableView</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Turn on view rendering. This is the opposite of
-   <methodname>Yaf_Dispatcher::disableView</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::enableView</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiPlugin extends Yaf_Plugin_Abstract
-{
-    public function routerStartup(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        $dispatcher = Yaf_Dispatcher::getInstance();
-
-        if ($request->getModuleName() === "Api") {
-            // API actions emit JSON themselves, no view rendering wanted
-            $dispatcher->disableView();
-        } else {
-            $dispatcher->enableView();
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::disableView</methodname></member>
-    <member><methodname>Yaf_Dispatcher::autoRender</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/yaf/yaf_dispatcher/flushinstantly.xml b/reference/yaf/yaf_dispatcher/flushinstantly.xml
deleted file mode 100644
index faf7ff0cfbdd..000000000000
--- a/reference/yaf/yaf_dispatcher/flushinstantly.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.flushinstantly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::flushInstantly</refname>
-  <refpurpose>Switch on/off the instant flushing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>bool</type></type><methodname>Yaf_Dispatcher::flushInstantly</methodname>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>flag</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Switch on/off instant flushing. When enabled (the default), the
-   response body is flushed to the client immediately once it is set by
-   <methodname>Yaf_Response_Abstract::setBody</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Whether to flush the response body instantly.
-     </simpara>
-     <note>
-      <simpara>
-       Since Yaf 2.2.0, if this parameter is not given, the current state
-       is returned instead.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself when
-   <parameter>flag</parameter> is given, or a &boolean; indicating the current
-   state when it is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::flushInstantly</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-$dispatcher = Yaf_Dispatcher::getInstance();
-
-// Do not flush the response body to the client as soon as it is set
-$dispatcher->flushInstantly(false);
-
-// Since Yaf 2.2.0, calling it without arguments queries the current state
-var_dump($dispatcher->flushInstantly());
-
-$app->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::returnResponse</methodname></member>
-    <member><methodname>Yaf_Response_Abstract::setBody</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/yaf/yaf_dispatcher/getapplication.xml b/reference/yaf/yaf_dispatcher/getapplication.xml
deleted file mode 100644
index 4e6bea404922..000000000000
--- a/reference/yaf/yaf_dispatcher/getapplication.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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>Retrieve the application</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Application</type><type>null</type></type><methodname>Yaf_Dispatcher::getApplication</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Application</classname> instance. Same as
-   <methodname>Yaf_Application::app</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Application</classname> instance, or &null; if no
-   application has been initialized yet.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getApplication</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-var_dump(Yaf_Dispatcher::getInstance()->getApplication() === Yaf_Application::app());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::app</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/yaf/yaf_dispatcher/getdefaultaction.xml b/reference/yaf/yaf_dispatcher/getdefaultaction.xml
deleted file mode 100644
index 07efa99d7ee0..000000000000
--- a/reference/yaf/yaf_dispatcher/getdefaultaction.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getdefaultaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getDefaultAction</refname>
-  <refpurpose>Retrieve the default action name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Dispatcher::getDefaultAction</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the default action name, which is used when an action name can not
-   be extracted from the request URI. Defaults to
-   <literal>"index"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The default action name, or &null; if the application is not
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getDefaultAction</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-$dispatcher = Yaf_Dispatcher::getInstance();
-
-var_dump($dispatcher->getDefaultAction());
-
-$dispatcher->setDefaultAction("main");
-var_dump($dispatcher->getDefaultAction());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "index"
-string(4) "main"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultAction</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/yaf/yaf_dispatcher/getdefaultcontroller.xml b/reference/yaf/yaf_dispatcher/getdefaultcontroller.xml
deleted file mode 100644
index d637e3cffc30..000000000000
--- a/reference/yaf/yaf_dispatcher/getdefaultcontroller.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getdefaultcontroller" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getDefaultController</refname>
-  <refpurpose>Retrieve the default controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Dispatcher::getDefaultController</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the default controller name, which is used when a controller name
-   can not be extracted from the request URI. Defaults to
-   <literal>"Index"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The default controller name, or &null; if the application is not
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getDefaultController</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-var_dump(Yaf_Dispatcher::getInstance()->getDefaultController());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Index"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultController</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/yaf/yaf_dispatcher/getdefaultmodule.xml b/reference/yaf/yaf_dispatcher/getdefaultmodule.xml
deleted file mode 100644
index c83338a5c199..000000000000
--- a/reference/yaf/yaf_dispatcher/getdefaultmodule.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getdefaultmodule" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getDefaultModule</refname>
-  <refpurpose>Retrieve the default module name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Dispatcher::getDefaultModule</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Get the default module name, which is used when a module name can not
-   be extracted from the request URI. Defaults to
-   <literal>"Index"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The default module name, or &null; if the application is not
-   initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getDefaultModule</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-var_dump(Yaf_Dispatcher::getInstance()->getDefaultModule());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Index"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultModule</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/yaf/yaf_dispatcher/getinstance.xml b/reference/yaf/yaf_dispatcher/getinstance.xml
deleted file mode 100644
index 071a16e1c5d5..000000000000
--- a/reference/yaf/yaf_dispatcher/getinstance.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getinstance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getInstance</refname>
-  <refpurpose>Retrieve the dispatcher instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::getInstance</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the single <classname>Yaf_Dispatcher</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Dispatcher</classname> instance, or &null; if no
-   <classname>Yaf_Application</classname> has been initialized yet.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getInstance</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-$dispatcher = Yaf_Dispatcher::getInstance();
-
-var_dump($dispatcher === Yaf_Dispatcher::getInstance());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::getDispatcher</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/yaf/yaf_dispatcher/getrequest.xml b/reference/yaf/yaf_dispatcher/getrequest.xml
deleted file mode 100644
index be73071cd914..000000000000
--- a/reference/yaf/yaf_dispatcher/getrequest.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getrequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getRequest</refname>
-  <refpurpose>Retrieve the request instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Dispatcher::getRequest</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the request object held by the dispatcher.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Request_Abstract</classname> instance, or &null; if
-   the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getRequest</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = Yaf_Dispatcher::getInstance()->getRequest();
-
-        // The dispatcher holds the very same request object that is
-        // passed to the controller
-        var_dump($request === $this->getRequest());
-
-        return false;
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setRequest</methodname></member>
-    <member><classname>Yaf_Request_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/getresponse.xml b/reference/yaf/yaf_dispatcher/getresponse.xml
deleted file mode 100644
index 0e32e05e6e0b..000000000000
--- a/reference/yaf/yaf_dispatcher/getresponse.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getResponse</refname>
-  <refpurpose>Get the response object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>null</type></type><methodname>Yaf_Dispatcher::getResponse</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Response_Abstract</classname> instance used
-   by the dispatcher.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Response_Abstract</classname> instance, or &null; if
-   the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getResponse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class CharsetPlugin extends Yaf_Plugin_Abstract
-{
-    public function preDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        // Same response object as the one held by the dispatcher
-        Yaf_Dispatcher::getInstance()->getResponse()->setHeader(
-            "Content-Type", "text/html; charset=utf-8"
-        );
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setResponse</methodname></member>
-    <member><classname>Yaf_Response_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/getrouter.xml b/reference/yaf/yaf_dispatcher/getrouter.xml
deleted file mode 100644
index 8b1273492f97..000000000000
--- a/reference/yaf/yaf_dispatcher/getrouter.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.getrouter" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::getRouter</refname>
-  <refpurpose>Retrieve router instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Router</type><type>null</type></type><methodname>Yaf_Dispatcher::getRouter</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Retrieve the <classname>Yaf_Router</classname> instance used by the
-   dispatcher to route requests.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The <classname>Yaf_Router</classname> instance, or &null; if the
-   application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::getRouter</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRoute(Yaf_Dispatcher $dispatcher)
-    {
-        $router = $dispatcher->getRouter();
-
-        // Route /product/42 to ProductController::detailAction
-        $router->addRoute("product", new Yaf_Route_Rewrite(
-            "product/:id",
-            array("controller" => "product", "action" => "detail")
-        ));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>Yaf_Router</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/initview.xml b/reference/yaf/yaf_dispatcher/initview.xml
deleted file mode 100644
index dc6bbc7290ae..000000000000
--- a/reference/yaf/yaf_dispatcher/initview.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.initview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::initView</refname>
-  <refpurpose>Initialize view and return it</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_View_Interface</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::initView</methodname>
-   <methodparam><type>string</type><parameter>templates_dir</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Initialize and return a <classname>Yaf_View_Simple</classname> instance
-   bound to the dispatcher, using the given template directory.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>templates_dir</parameter></term>
-    <listitem>
-     <simpara>
-      The directory that holds the view templates.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      Options passed to the view engine, see
-      <methodname>Yaf_View_Simple::__construct</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A <classname>Yaf_View_Interface</classname> instance on success, or
-   &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::initView</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-$view = Yaf_Dispatcher::getInstance()->initView(
-    dirname(__FILE__) . "/application/views",
-    array("tpl_suffix" => ".html")
-);
-
-$view->assign("title", "Home");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setView</methodname></member>
-    <member><classname>Yaf_View_Simple</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/registerplugin.xml b/reference/yaf/yaf_dispatcher/registerplugin.xml
deleted file mode 100644
index c7090cef1415..000000000000
--- a/reference/yaf/yaf_dispatcher/registerplugin.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.registerplugin" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::registerPlugin</refname>
-  <refpurpose>Register a plugin</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::registerPlugin</methodname>
-   <methodparam><type>Yaf_Plugin_Abstract</type><parameter>plugin</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Register a plugin (see <classname>Yaf_Plugin_Abstract</classname>).
-   Generally, plugins are registered in Bootstrap (see
-   <classname>Yaf_Bootstrap_Abstract</classname>).
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>plugin</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Yaf_Plugin_Abstract</classname> instance.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &false; / &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Dispatcher::registerPlugin</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract {
-  public function _initPlugin(Yaf_Dispatcher $dispatcher) {
-    /**
-    * Yaf assumes plugin scripts under [application.directory] .  "/plugins" 
-    * for this case, it will be:
-    * [application.directory] . "/plugins/" . "User" . [application.ext]
-    */ 
-    $user = new UserPlugin();
-    $dispatcher->registerPlugin($user);
-  }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>Yaf_Plugin_Abstract</classname></member>
-    <member><classname>Yaf_Bootstrap_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/returnresponse.xml b/reference/yaf/yaf_dispatcher/returnresponse.xml
deleted file mode 100644
index 074e0d056940..000000000000
--- a/reference/yaf/yaf_dispatcher/returnresponse.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.returnresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::returnResponse</refname>
-  <refpurpose>Switch on/off returning the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>bool</type></type><methodname>Yaf_Dispatcher::returnResponse</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>flag</parameter><initializer>false</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Switch whether
-   <methodname>Yaf_Application::run</methodname> returns the response
-   object instead of sending it to the client directly. When enabled,
-   <literal>$response = $app->run()</literal> gives you the
-   <classname>Yaf_Response_Abstract</classname> instance so it can be
-   further manipulated. Available since Yaf 3.2.2.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Whether to return the response instead of sending it.
-     </simpara>
-     <note>
-      <simpara>
-       If this parameter is not given, the current state is returned
-       instead.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself when
-   <parameter>flag</parameter> is given, or a &boolean; indicating the current
-   state when it is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::returnResponse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-Yaf_Dispatcher::getInstance()->returnResponse(true);
-
-// $app->run() now returns the response instead of flushing it
-$response = $app->run();
-
-$response->setHeader("X-Generator", "Yaf");
-$response->response();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Application::run</methodname></member>
-    <member><classname>Yaf_Response_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/setdefaultaction.xml b/reference/yaf/yaf_dispatcher/setdefaultaction.xml
deleted file mode 100644
index 6323b823d57a..000000000000
--- a/reference/yaf/yaf_dispatcher/setdefaultaction.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setdefaultaction" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setDefaultAction</refname>
-  <refpurpose>Change default action name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::setDefaultAction</methodname>
-   <methodparam><type>string</type><parameter>action</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change the action name which is used when an action name can not be
-   extracted from the request URI. The name is normalized to lowercase.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>action</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the action.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &false; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setDefaultAction</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// Requests without an action part are now routed to "main" instead of
-// "index", e.g. /user maps to UserController::mainAction
-Yaf_Dispatcher::getInstance()->setDefaultAction("main");
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultModule</methodname></member>
-    <member><methodname>Yaf_Dispatcher::setDefaultController</methodname></member>
-    <member><methodname>Yaf_Dispatcher::getDefaultAction</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/yaf/yaf_dispatcher/setdefaultcontroller.xml b/reference/yaf/yaf_dispatcher/setdefaultcontroller.xml
deleted file mode 100644
index a4a92c2baa5e..000000000000
--- a/reference/yaf/yaf_dispatcher/setdefaultcontroller.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setdefaultcontroller" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setDefaultController</refname>
-  <refpurpose>Change default controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::setDefaultController</methodname>
-   <methodparam><type>string</type><parameter>controller</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change the controller name which is used when a controller name can not
-   be extracted from the request URI. The name is normalized to
-   capitalize the first letter.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>controller</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the controller.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &false; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setDefaultController</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// Requests without a controller part now go to HomeController, the name
-// is normalized to capitalize the first letter
-Yaf_Dispatcher::getInstance()->setDefaultController("home");
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultModule</methodname></member>
-    <member><methodname>Yaf_Dispatcher::setDefaultAction</methodname></member>
-    <member><methodname>Yaf_Dispatcher::getDefaultController</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/yaf/yaf_dispatcher/setdefaultmodule.xml b/reference/yaf/yaf_dispatcher/setdefaultmodule.xml
deleted file mode 100644
index de6feeb8a1a3..000000000000
--- a/reference/yaf/yaf_dispatcher/setdefaultmodule.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setdefaultmodule" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setDefaultModule</refname>
-  <refpurpose>Change default module name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::setDefaultModule</methodname>
-   <methodparam><type>string</type><parameter>module</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Change the module name which is used when a module name can not be
-   extracted from the request URI. The module must be a registered one,
-   see <methodname>Yaf_Application::getModules</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>module</parameter></term>
-    <listitem>
-     <simpara>
-      The name of a registered module.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, &false; if the given module is not registered (and a
-   <constant>YAF_ERR_TYPE_ERROR</constant> is triggered) or if the
-   application is not initialized, or &null; otherwise.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Triggers a <constant>YAF_ERR_TYPE_ERROR</constant> error if
-   <parameter>module</parameter> is not a registered module name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setDefaultModule</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// "Home" must be a registered module, e.g. via
-// application.modules = "Index,Home,Admin" in conf/application.ini
-Yaf_Dispatcher::getInstance()->setDefaultModule("Home");
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::setDefaultController</methodname></member>
-    <member><methodname>Yaf_Dispatcher::setDefaultAction</methodname></member>
-    <member><methodname>Yaf_Dispatcher::getDefaultModule</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/yaf/yaf_dispatcher/seterrorhandler.xml b/reference/yaf/yaf_dispatcher/seterrorhandler.xml
deleted file mode 100644
index c003418de820..000000000000
--- a/reference/yaf/yaf_dispatcher/seterrorhandler.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.seterrorhandler" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setErrorHandler</refname>
-  <refpurpose>Set error handler</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type><type>false</type></type><methodname>Yaf_Dispatcher::setErrorHandler</methodname>
-   <methodparam><type>mixed</type><parameter>callback</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>error_types</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set an error handler for Yaf. When
-   <link linkend="configuration.yaf.dispatcher.throwexception">application.dispatcher.throwException</link>
-   is off, Yaf triggers catchable errors when unexpected errors occur.
-  </simpara>
-  <simpara>
-   This method is a wrapper of <function>set_error_handler</function>;
-   the handler is called whenever such an error is raised.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      A callable callback, with the same semantics as the callback passed
-      to <function>set_error_handler</function>.     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_types</parameter></term>
-    <listitem>
-     <simpara>
-      The error types to handle, same as the
-      <parameter>error_levels</parameter> parameter of
-      <function>set_error_handler</function>. Defaults to handling all error types.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, &false; if calling <function>set_error_handler</function> failed,
-   or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setErrorHandler</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-Yaf_Dispatcher::getInstance()->setErrorHandler(function ($errno, $errstr) {
-    // Route errors to ErrorController::errorAction
-    $request = Yaf_Dispatcher::getInstance()->getRequest();
-    $request->setControllerName("Error");
-    $request->setActionName("error");
-});
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::throwException</methodname></member>
-    <member><methodname>Yaf_Application::getLastErrorNo</methodname></member>
-    <member><methodname>Yaf_Application::getLastErrorMsg</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/yaf/yaf_dispatcher/setrequest.xml b/reference/yaf/yaf_dispatcher/setrequest.xml
deleted file mode 100644
index 4f3b7090775a..000000000000
--- a/reference/yaf/yaf_dispatcher/setrequest.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setrequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setRequest</refname>
-  <refpurpose>Set the request object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::setRequest</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set the request object used by the dispatcher. This allows using a
-   custom request implementation instead of the built-in
-   <classname>Yaf_Request_Http</classname> or
-   <classname>Yaf_Request_Simple</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Yaf_Request_Abstract</classname> instance.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setRequest</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-// Run the application from a cron job:
-// $ php cron.php index/index/cleanup
-$request = new Yaf_Request_Simple("CLI");
-
-Yaf_Dispatcher::getInstance()->setRequest($request);
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::getRequest</methodname></member>
-    <member><classname>Yaf_Request_Abstract</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/setresponse.xml b/reference/yaf/yaf_dispatcher/setresponse.xml
deleted file mode 100644
index de36b8d4af3e..000000000000
--- a/reference/yaf/yaf_dispatcher/setresponse.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setResponse</refname>
-  <refpurpose>Set the response object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::setResponse</methodname>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Set the response object used by the dispatcher. This allows using a
-   custom response implementation instead of the built-in ones.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-     <simpara>
-      A <classname>Yaf_Response_Abstract</classname> instance.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Dispatcher::setResponse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiResponse extends Yaf_Response_Http
-{
-    public function response()
-    {
-        header("Content-Type: application/json");
-        parent::response();
-    }
-}
-
-$app = new Yaf_Application(dirname(__FILE__) . "/conf/application.ini");
-
-Yaf_Dispatcher::getInstance()->setResponse(new ApiResponse());
-
-$app->run();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::getResponse</methodname></member>
-    <member><methodname>Yaf_Dispatcher::setRequest</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/yaf/yaf_dispatcher/setview.xml b/reference/yaf/yaf_dispatcher/setview.xml
deleted file mode 100644
index e44932cbfd29..000000000000
--- a/reference/yaf/yaf_dispatcher/setview.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.setview" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::setView</refname>
-  <refpurpose>Set a custom view engine</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>null</type></type><methodname>Yaf_Dispatcher::setView</methodname>
-   <methodparam><type>Yaf_View_Interface</type><parameter>view</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-     This method provides a solution if you want use a custom view
-     engine instead of <classname>Yaf_View_Simple</classname>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>view</parameter></term>
-    <listitem>
-     <para>
-       A <classname>Yaf_View_Interface</classname> instance
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself on
-   success, or &null; if the application is not initialized.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>A custom View engine example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-require "/path/to/smarty/Smarty.class.php";
-
-class Smarty_Adapter implements Yaf_View_Interface
-{
-    /**
-     * Smarty object
-     * @var Smarty
-     */
-    public $_smarty;
- 
-    /**
-     * Constructor
-     *
-     * @param string $tmplPath
-     * @param array $extraParams
-     * @return void
-     */
-    public function __construct($tmplPath = null, $extraParams = array()) {
-        $this->_smarty = new Smarty;
- 
-        if (null !== $tmplPath) {
-            $this->setScriptPath($tmplPath);
-        }
- 
-        foreach ($extraParams as $key => $value) {
-            $this->_smarty->$key = $value;
-        }
-    }
- 
-    /**
-     * Set the path to the templates
-     *
-     * @param string $path The directory to set as the path.
-     * @return void
-     */
-    public function setScriptPath($path)
-    {
-        if (is_readable($path)) {
-            $this->_smarty->template_dir = $path;
-            return;
-        }
- 
-        throw new Exception('Invalid path provided');
-    }
- 
-    /**
-     * Assign a variable to the template
-     *
-     * @param string $key The variable name.
-     * @param mixed $val The variable value.
-     * @return void
-     */
-    public function __set($key, $val)
-    {
-        $this->_smarty->assign($key, $val);
-    }
- 
-    /**
-     * Allows testing with empty() and isset() to work
-     *
-     * @param string $key
-     * @return boolean
-     */
-    public function __isset($key)
-    {
-        return (null !== $this->_smarty->get_template_vars($key));
-    }
- 
-    /**
-     * Allows unset() on object properties to work
-     *
-     * @param string $key
-     * @return void
-     */
-    public function __unset($key)
-    {
-        $this->_smarty->clear_assign($key);
-    }
- 
-    /**
-     * Assign variables to the template
-     *
-     * Allows setting a specific key to the specified value, OR passing
-     * an array of key => value pairs to set en masse.
-     *
-     * @see __set()
-     * @param string|array $spec The assignment strategy to use (key or
-     * array of key => value pairs)
-     * @param mixed $value (Optional) If assigning a named variable,
-     * use this as the value.
-     * @return void
-     */
-    public function assign($spec, $value = null) {
-        if (is_array($spec)) {
-            $this->_smarty->assign($spec);
-            return;
-        }
- 
-        $this->_smarty->assign($spec, $value);
-    }
- 
-    /**
-     * Clear all assigned variables
-     *
-     * Clears all variables assigned to Yaf_View either via
-     * {@link assign()} or property overloading
-     * ({@link __get()}/{@link __set()}).
-     *
-     * @return void
-     */
-    public function clearVars() {
-        $this->_smarty->clear_all_assign();
-    }
- 
-    /**
-     * Processes a template and returns the output.
-     *
-     * @param string $name The template to process.
-     * @return string The output.
-     */
-    public function render($name, $value = NULL) {
-        return $this->_smarty->fetch($name);
-    }
-
-    public function display($name, $value = NULL) {
-        echo $this->_smarty->fetch($name);
-    }
-
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>Yaf_Dispatcher::setView</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract {
-
-    /**
-     * there are some config for smarty in the config:
-     *
-     * smarty.left_delimiter   = "{{"
-     * smarty.right_delimiter  = "}}"
-     * smarty.template_dir     = APPLICATION_PATH "/views/scripts/"
-     * smarty.compile_dir      = APPLICATION_PATH "/views/templates_c/"
-     * smarty.cache_dir        = APPLICATION_PATH "/views/templates_d/"
-     *
-     */
-    public function _initConfig() {
-        $config = Yaf_Application::app()->getConfig();
-        Yaf_Registry::set("config", $config);
-    }
-
-    public function _initLocalName() {
-        /** we put class Smarty_Adapter under the local library directory */
-        Yaf_Loader::getInstance()->registerLocalNamespace('Smarty');
-    }
-
-    public function _initSmarty(Yaf_Dispatcher $dispatcher) {
-        $smarty = new Smarty_Adapter(null, Yaf_Registry::get("config")->get("smarty"));
-        $dispatcher->setView($smarty);
-        /* now the Smarty view engine become the default view engine of Yaf */
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><classname>Yaf_View_Interface</classname></member>
-    <member><classname>Yaf_View_Simple</classname></member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_dispatcher/throwexception.xml b/reference/yaf/yaf_dispatcher/throwexception.xml
deleted file mode 100644
index 1bd36b77d379..000000000000
--- a/reference/yaf/yaf_dispatcher/throwexception.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-dispatcher.throwexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Dispatcher::throwException</refname>
-  <refpurpose>Switch on/off exception throwing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Dispatcher</type><type>bool</type></type><methodname>Yaf_Dispatcher::throwException</methodname>
-   <methodparam choice="opt"><type class="union"><type>bool</type><type>null</type></type><parameter>flag</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Switch on/off exception throwing when an unexpected error occurs. When
-   this is on, Yaf throws exceptions instead of triggering catchable
-   errors.
-  </simpara>
-  <simpara>
-   You can also use
-   <link linkend="configuration.yaf.dispatcher.throwexception">application.dispatcher.throwException</link>
-   to achieve the same purpose.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-     <simpara>
-      Whether Yaf should throw exceptions on errors.
-     </simpara>
-     <note>
-      <simpara>
-       Since Yaf 2.2.0, if this parameter is not given, the current state
-       is returned instead.
-      </simpara>
-     </note>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the <classname>Yaf_Dispatcher</classname> object itself when
-   <parameter>flag</parameter> is given, or a &boolean; indicating whether
-   exception throwing is enabled when it is not.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Dispatcher::throwException</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    'application' => array(
-        'directory' => dirname(__FILE__),
-    ),
-);
-$app = new Yaf_Application($config);
-
-$app->getDispatcher()->throwException(true);
-
-try {
-    $app->run();
-} catch (Yaf_Exception $e) {
-    var_dump($e->getMessage());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(59) "Could not find controller script /tmp/controllers/Index.php"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><function>Yaf_Dispatcher::throwException</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$config = array(
-    'application' => array(
-        'directory' => dirname(__FILE__),
-    ),
-);
-$app = new Yaf_Application($config);
-
-$app->getDispatcher()->throwException(false);
-
-$app->run();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Catchable fatal error:  Yaf_Application::run(): Could not find controller script /tmp/controllers/Index.php in /tmp/1.php on line 12
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yaf_Dispatcher::catchException</methodname></member>
-    <member><exceptionname>Yaf_Exception</exceptionname></member>
-   </simplelist>
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_exception/construct.xml b/reference/yaf/yaf_exception/construct.xml
deleted file mode 100644
index d8927e5ee59e..000000000000
--- a/reference/yaf/yaf_exception/construct.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-exception.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Exception::__construct</refname>
-<refpurpose>Construct a Yaf exception</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_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>
-  </constructorsynopsis>
-  <simpara>Constructs a new <exceptionname>Yaf_Exception</exceptionname>. The <parameter>code</parameter> carries the Yaf error code that identifies the type of failure, and is exposed via <methodname>Exception::getCode</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>message</parameter></term>
-    <listitem>
-<simpara>The exception message.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>code</parameter></term>
-    <listitem>
-<simpara>The Yaf error code.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>No value is returned.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Exception::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-throw new Yaf_Exception(
-    "Failed to find the controller 'Product'",
-    YAF_ERR_NOTFOUND_CONTROLLER /* 516 */
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error:  Uncaught Yaf_Exception: Failed to find the controller 'Product' in /path/to/index.php:2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><exceptionname>Yaf_Exception</exceptionname></member>
-   <member><methodname>Yaf_Exception::getPrevious</methodname></member>
-   <member><classname>Yaf_Exception_RouterFailed</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/yaf/yaf_exception/getprevious.xml b/reference/yaf/yaf_exception/getprevious.xml
deleted file mode 100644
index 35e8f181a78f..000000000000
--- a/reference/yaf/yaf_exception/getprevious.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-exception.getprevious" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Exception::getPrevious</refname>
-<refpurpose>Retrieve the previous exception</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Throwable</type><methodname>Yaf_Exception::getPrevious</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>This method is inherited from the base <exceptionname>Throwable</exceptionname> hierarchy and returns the exception that was chained as the previous one, if any.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>Returns the previous <exceptionname>Throwable</exceptionname> if available, &null; otherwise.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Exception::getPrevious</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-try {
-    $previous = new RuntimeException("Failed to open view script", 1024);
-    throw new Yaf_Exception(
-        "Failed to dispatch the request",
-        YAF_ERR_DISPATCH_FAILED,
-        $previous
-    );
-} catch (Yaf_Exception $e) {
-    var_dump($e->getCode());
-    $prev = $e->getPrevious();
-    var_dump(get_class($prev));
-    var_dump($prev->getMessage());
-    var_dump($prev->getCode());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(514)
-string(16) "RuntimeException"
-string(26) "Failed to open view script"
-int(1024)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Exception::__construct</methodname></member>
-   <member><exceptionname>Yaf_Exception</exceptionname></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/yaf/yaf_loader/autoload.xml b/reference/yaf/yaf_loader/autoload.xml
deleted file mode 100644
index c92741acb5a6..000000000000
--- a/reference/yaf/yaf_loader/autoload.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.autoload" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::autoload</refname>
-<refpurpose>Autoload a class</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Loader::autoload</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Load a class by its name. The class name is converted to a file path: underscores and namespace separators become directory separators.</simpara>
-  <simpara>MVC classes (classes whose names contain <literal>_Controller</literal>, <literal>_Action</literal> or <literal>_Plugin</literal>) are looked up under the application directory, while other classes are looked up in the library directories: the local library for locally registered class prefixes, otherwise the global library.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-<simpara>The class name to load.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::autoload</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/*
- * autoload() is normally invoked implicitly by the engine
- * whenever an undefined class is referenced, but it can also
- * be called explicitly to force loading of a class file.
- */
-$loader = Yaf_Loader::getInstance("/var/www/shop/application/library");
-
-/* looks up /var/www/shop/application/library/Catalog/PriceService.php */
-$loader->autoload("Catalog_PriceService");
-
-/* MVC classes are looked up under the application directory */
-$loader->autoload("ProductController");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::import</methodname></member>
-   <member><methodname>Yaf_Loader::registerLocalNamespace</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/yaf/yaf_loader/clearlocalnamespace.xml b/reference/yaf/yaf_loader/clearlocalnamespace.xml
deleted file mode 100644
index 4f5d9ef26ceb..000000000000
--- a/reference/yaf/yaf_loader/clearlocalnamespace.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.clearlocalnamespace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::clearLocalNamespace</refname>
-<refpurpose>Clear registered namespaces</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Loader::clearLocalNamespace</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Clear all registered local namespaces.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::clearLocalNamespace</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-
-$loader->registerLocalNamespace(array("Models", "Services"));
-var_dump(count($loader->getLocalNamespace()));
-
-$loader->clearLocalNamespace();
-var_dump(count($loader->getLocalNamespace()));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(2)
-int(0)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::registerLocalNamespace</methodname></member>
-   <member><methodname>Yaf_Loader::getLocalNamespace</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/yaf/yaf_loader/construct.xml b/reference/yaf/yaf_loader/construct.xml
deleted file mode 100644
index 486fd6e1adbb..000000000000
--- a/reference/yaf/yaf_loader/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::__construct</refname>
-<refpurpose>The constructor is private</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier> <methodname>Yaf_Loader::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>Constructs a new loader. The constructor is private; <classname>Yaf_Loader</classname> is a singleton. Use <methodname>Yaf_Loader::getInstance</methodname> to obtain the instance.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Obtaining the <classname>Yaf_Loader</classname> singleton</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(__DIR__ . "/conf/application.ini");
-
-/* the constructor is private; use getInstance() instead */
-$loader = Yaf_Loader::getInstance();
-var_dump($loader instanceof Yaf_Loader);
-
-/* instantiating directly raises an Error */
-try {
-    $loader = new Yaf_Loader();
-} catch (Error $e) {
-    echo $e->getMessage(), PHP_EOL;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-Call to private Yaf_Loader::__construct() from global scope
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::getInstance</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/yaf/yaf_loader/getinstance.xml b/reference/yaf/yaf_loader/getinstance.xml
deleted file mode 100644
index 8705899fe78f..000000000000
--- a/reference/yaf/yaf_loader/getinstance.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.getinstance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::getInstance</refname>
-<refpurpose>Retrieve the Yaf_Loader instance</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public static</modifier> <type class="union"><type>Yaf_Loader</type><type>false</type></type><methodname>Yaf_Loader::getInstance</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>local_library_path</parameter><initializer>null</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>global_library_path</parameter><initializer>null</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieve the singleton <classname>Yaf_Loader</classname> instance.</simpara>
-  <simpara>If the library paths are given, they are applied to the existing instance.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>local_library_path</parameter></term>
-    <listitem>
-<simpara>The local library directory, usually the same as the <literal>application.library.directory</literal> ini setting.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>global_library_path</parameter></term>
-    <listitem>
-<simpara>The global library directory. If not given, the local one is used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The <classname>Yaf_Loader</classname> instance, or &false; if the loader has not been initialized (which is normally done by <classname>Yaf_Application</classname>).</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::getInstance</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app = new Yaf_Application(__DIR__ . "/conf/application.ini");
-
-/* Yaf_Application has initialized the loader, so the
- * singleton instance is available now */
-$loader = Yaf_Loader::getInstance();
-$loader->registerNamespace("Vendor", APPLICATION_PATH . "/library/Vendor");
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><methodname>Yaf_Loader::getInstance</methodname> before initialization</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* no Yaf_Application has been created yet */
-var_dump(Yaf_Loader::getInstance());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::setLibraryPath</methodname></member>
-   <member><methodname>Yaf_Loader::getLibraryPath</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/yaf/yaf_loader/getlibrarypath.xml b/reference/yaf/yaf_loader/getlibrarypath.xml
deleted file mode 100644
index 27e4d2315326..000000000000
--- a/reference/yaf/yaf_loader/getlibrarypath.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.getlibrarypath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::getLibraryPath</refname>
-<refpurpose>Retrieve the library path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Loader::getLibraryPath</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>is_global</parameter><initializer>false</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieve the library directory.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>is_global</parameter></term>
-    <listitem>
-<simpara>Whether to retrieve the global library directory instead of the local one.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The library directory as a string, or an empty string when the global library directory is requested but not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::getLibraryPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$loader = Yaf_Loader::getInstance(
-    "/var/www/shop/application/library",
-    "/usr/local/share/yaf/library"
-);
-
-/* the local library directory */
-echo $loader->getLibraryPath(), PHP_EOL;
-
-/* the global library directory */
-echo $loader->getLibraryPath(true), PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/var/www/shop/application/library
-/usr/local/share/yaf/library
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::setLibraryPath</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/yaf/yaf_loader/getlocalnamespace.xml b/reference/yaf/yaf_loader/getlocalnamespace.xml
deleted file mode 100644
index 396a2da8efb8..000000000000
--- a/reference/yaf/yaf_loader/getlocalnamespace.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.getlocalnamespace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::getLocalNamespace</refname>
-<refpurpose>Retrieve registered namespaces</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yaf_Loader::getLocalNamespace</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve all registered local namespaces and their paths.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>An array of the registered local namespaces, keyed by the namespace prefix, or an empty array if none are registered.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::getLocalNamespace</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-
-$loader->registerLocalNamespace("Models");
-$loader->registerLocalNamespace("Vendor", APPLICATION_PATH . "/library/Vendor");
-
-print_r($loader->getLocalNamespace());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Array
-(
-    [Models] => /var/www/shop/application/library
-    [Vendor] => /var/www/shop/application/library/Vendor
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::registerLocalNamespace</methodname></member>
-   <member><methodname>Yaf_Loader::clearLocalNamespace</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/yaf/yaf_loader/getnamespacepath.xml b/reference/yaf/yaf_loader/getnamespacepath.xml
deleted file mode 100644
index d2002ef70447..000000000000
--- a/reference/yaf/yaf_loader/getnamespacepath.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.getnamespacepath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::getNamespacePath</refname>
-<refpurpose>Retrieve the library path of a class</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Loader::getNamespacePath</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieve the library directory a class would be looked up in.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-<simpara>The class name whose library directory is requested.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The local library directory if the class belongs to a registered local namespace, otherwise the global library directory (falling back to the local one when the global one is not set).</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::getNamespacePath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-
-$loader->registerLocalNamespace("Models");
-$loader->setLibraryPath("/usr/local/share/yaf/library", true);
-
-/* "Models" is a registered local namespace */
-echo $loader->getNamespacePath("Models_Product"), PHP_EOL;
-
-/* other classes fall back to the global library directory */
-echo $loader->getNamespacePath("Vendor_Payment"), PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/var/www/shop/application/library
-/usr/local/share/yaf/library
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::isLocalName</methodname></member>
-   <member><methodname>Yaf_Loader::getLibraryPath</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/yaf/yaf_loader/getnamespaces.xml b/reference/yaf/yaf_loader/getnamespaces.xml
deleted file mode 100644
index 5f28ba566dc2..000000000000
--- a/reference/yaf/yaf_loader/getnamespaces.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.getnamespaces" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::getNamespaces</refname>
-<refpurpose>Alias of getLocalNamespace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>Yaf_Loader::getNamespaces</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Alias of <methodname>Yaf_Loader::getLocalNamespace</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>An array of the registered local namespaces, keyed by the namespace prefix, or an empty array if none are registered.</simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::getNamespaces</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-$loader->registerLocalNamespace(array("Models", "Services"));
-
-/* getNamespaces() is an alias of getLocalNamespace() */
-var_dump($loader->getNamespaces() === $loader->getLocalNamespace());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::getLocalNamespace</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/yaf/yaf_loader/import.xml b/reference/yaf/yaf_loader/import.xml
deleted file mode 100644
index f2b279dcc2af..000000000000
--- a/reference/yaf/yaf_loader/import.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.import" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::import</refname>
-<refpurpose>Load a PHP script</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public static</modifier> <type>bool</type><methodname>Yaf_Loader::import</methodname>
-   <methodparam><type>string</type><parameter>file</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Load a PHP script file once. If the file is not an absolute path, it is looked up under the local library directory.</simpara>
-  <simpara>A file is only included once; calling <methodname>Yaf_Loader::import</methodname> again with the same file returns &true; without re-including it.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>file</parameter></term>
-    <listitem>
-<simpara>The file to load.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success (including when the file was already loaded), or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::import</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initHelpers()
-    {
-        /* a relative path is looked up under the library
-         * directory, i.e. APPLICATION_PATH/library/functions/format.php */
-        Yaf_Loader::import("functions/format.php");
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>A file is imported only once</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* an absolute path is used as-is */
-Yaf_Loader::import("/var/www/shop/application/library/Legacy/csv_export.php");
-
-/* importing the same file again does nothing and returns true */
-var_dump(
-    Yaf_Loader::import("/var/www/shop/application/library/Legacy/csv_export.php")
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::autoload</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/yaf/yaf_loader/islocalname.xml b/reference/yaf/yaf_loader/islocalname.xml
deleted file mode 100644
index 9ce617be1d00..000000000000
--- a/reference/yaf/yaf_loader/islocalname.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.islocalname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::isLocalName</refname>
-<refpurpose>Whether a class is local</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Loader::isLocalName</methodname>
-   <methodparam><type>string</type><parameter>class_name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Determine whether a class name should be looked up in the local library directory, i.e. whether its prefix belongs to a registered local namespace.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>class_name</parameter></term>
-    <listitem>
-<simpara>The class name to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the class name belongs to a registered local namespace, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::isLocalName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-$loader->registerLocalNamespace(array("Models", "Services"));
-
-var_dump($loader->isLocalName("Models_Product"));
-var_dump($loader->isLocalName("Vendor_Session"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::registerLocalNamespace</methodname></member>
-   <member><methodname>Yaf_Loader::getNamespacePath</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/yaf/yaf_loader/registerlocalnamespace.xml b/reference/yaf/yaf_loader/registerlocalnamespace.xml
deleted file mode 100644
index 1b855fdffe1d..000000000000
--- a/reference/yaf/yaf_loader/registerlocalnamespace.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.registerlocalnamespace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::registerLocalNamespace</refname>
-<refpurpose>Register local namespace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Loader</type><type>false</type></type><methodname>Yaf_Loader::registerLocalNamespace</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>namespace</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>path</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Register a local namespace. Classes whose prefix belongs to a local namespace are looked up under the given path (or the local library directory when no path is given) instead of the global one.</simpara>
-  <simpara>This lets you place your own classes into the local library directory, while shared classes live in the global library directory (see the <literal>yaf.library</literal> ini setting).</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>namespace</parameter></term>
-    <listitem>
-<simpara>A namespace prefix string, or an array of prefix/path pairs (when the value is a path string) or prefix strings.</simpara>
-<simpara>A prefix only matches at an underscore or backslash boundary: registering <literal>Models</literal> makes <literal>Models_User</literal> and <literal>Models</literal> itself local, but not <literal>ModelsUser</literal>. A leading backslash is ignored, and a class name written with backslashes is looked up as if they were underscores.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-<simpara>The directory to look up the namespace in. If not given, the local library directory is used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the loader instance itself on success, or &false; if an invalid parameter is provided.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::registerLocalNamespace</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initLoader()
-    {
-        $loader = Yaf_Loader::getInstance();
-
-        /* Models_User is now looked up in
-         * APPLICATION_PATH/library/Models/User.php */
-        $loader->registerLocalNamespace("Models");
-
-        /* register several prefixes at once, each with its
-         * own lookup directory */
-        $loader->registerLocalNamespace(array(
-            "Services" => APPLICATION_PATH . "/services",
-            "Vendor"   => APPLICATION_PATH . "/vendor",
-        ));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::getLocalNamespace</methodname></member>
-   <member><methodname>Yaf_Loader::clearLocalNamespace</methodname></member>
-   <member><methodname>Yaf_Loader::isLocalName</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/yaf/yaf_loader/registernamespace.xml b/reference/yaf/yaf_loader/registernamespace.xml
deleted file mode 100644
index 310691e0787a..000000000000
--- a/reference/yaf/yaf_loader/registernamespace.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.registernamespace" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::registerNamespace</refname>
-<refpurpose>Alias of registerLocalNamespace</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Loader</type><type>false</type></type><methodname>Yaf_Loader::registerNamespace</methodname>
-   <methodparam><type class="union"><type>string</type><type>array</type></type><parameter>namespace</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>path</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Alias of <methodname>Yaf_Loader::registerLocalNamespace</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>namespace</parameter></term>
-    <listitem>
-<simpara>A namespace prefix string, or an array of prefix/path pairs (when the value is a path string) or prefix strings.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-<simpara>The directory to look up the namespace in. If not given, the local library directory is used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the loader instance itself on success, or &false; if an invalid parameter is provided.</simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::registerNamespace</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initLoader()
-    {
-        /* registerNamespace() is an alias of registerLocalNamespace() */
-        Yaf_Loader::getInstance()->registerNamespace(
-            "Vendor",
-            APPLICATION_PATH . "/library/Vendor"
-        );
-    }
-}
-
-/* new Vendor_Payment_Gateway() is now looked up in
- * APPLICATION_PATH/library/Vendor/Payment/Gateway.php */
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::registerLocalNamespace</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/yaf/yaf_loader/setlibrarypath.xml b/reference/yaf/yaf_loader/setlibrarypath.xml
deleted file mode 100644
index c746f3245cdb..000000000000
--- a/reference/yaf/yaf_loader/setlibrarypath.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-loader.setlibrarypath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Loader::setLibraryPath</refname>
-<refpurpose>Change the library path</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Yaf_Loader</type><methodname>Yaf_Loader::setLibraryPath</methodname>
-   <methodparam><type>string</type><parameter>library_path</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_global</parameter><initializer>false</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Change the library directory.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>library_path</parameter></term>
-    <listitem>
-<simpara>The new library directory.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>is_global</parameter></term>
-    <listitem>
-<simpara>Whether to change the global library directory instead of the local one.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the loader instance itself.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Loader::setLibraryPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$app    = new Yaf_Application(__DIR__ . "/conf/application.ini");
-$loader = Yaf_Loader::getInstance();
-
-/* change the local library directory */
-$loader->setLibraryPath("/var/www/shop/application/library");
-
-/* change the global library directory */
-$loader->setLibraryPath("/usr/local/share/yaf/library", true);
-
-echo $loader->getLibraryPath(), PHP_EOL;
-echo $loader->getLibraryPath(true), PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/var/www/shop/application/library
-/usr/local/share/yaf/library
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Loader::getLibraryPath</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/yaf/yaf_plugin_abstract/dispatchloopshutdown.xml b/reference/yaf/yaf_plugin_abstract/dispatchloopshutdown.xml
deleted file mode 100644
index 0844a5d001f5..000000000000
--- a/reference/yaf/yaf_plugin_abstract/dispatchloopshutdown.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.dispatchloopshutdown" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::dispatchLoopShutdown</refname>
-<refpurpose>Hook after dispatch loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered once, after the dispatch loop has finished and all actions have been executed, but before the response is sent to the client. It is usually used for logging or cleanup.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AccessLogPlugin extends Yaf_Plugin_Abstract
-{
-    public function dispatchLoopShutdown(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* last hook before the response is sent: write an
-         * access log entry */
-        error_log(sprintf(
-            "[%s] %s dispatched to %s/%s",
-            date("c"),
-            $request->getRequestUri(),
-            $request->getControllerName(),
-            $request->getActionName()
-        ));
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new AccessLogPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_plugin_abstract/dispatchloopstartup.xml b/reference/yaf/yaf_plugin_abstract/dispatchloopstartup.xml
deleted file mode 100644
index 7de52b0561aa..000000000000
--- a/reference/yaf/yaf_plugin_abstract/dispatchloopstartup.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.dispatchloopstartup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::dispatchLoopStartup</refname>
-<refpurpose>Hook before dispatch loop</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered once, right before the dispatch loop starts and the view engine is initialized.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class BenchmarkPlugin extends Yaf_Plugin_Abstract
-{
-    public function dispatchLoopStartup(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* the view engine is not initialized yet, so this hook is a
-         * good place to start request-wide bookkeeping */
-        Yaf_Registry::set("request_start", microtime(true));
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new BenchmarkPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_plugin_abstract/postdispatch.xml b/reference/yaf/yaf_plugin_abstract/postdispatch.xml
deleted file mode 100644
index c9b007fa76c6..000000000000
--- a/reference/yaf/yaf_plugin_abstract/postdispatch.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.postdispatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::postDispatch</refname>
-<refpurpose>Hook after each dispatch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::postDispatch</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered after each dispatch iteration finishes, i.e. after the action has been executed. Like <methodname>Yaf_Plugin_Abstract::preDispatch</methodname>, it may be called more than once per request.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::postDispatch</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class BenchmarkPlugin extends Yaf_Plugin_Abstract
-{
-    public function postDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* the action has been executed: append some debug
-         * information to the response body */
-        $elapsed = microtime(true) - Yaf_Registry::get("request_start");
-        $response->appendBody(sprintf(
-            "\n<!-- rendered in %.3f seconds -->",
-            $elapsed
-        ));
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new BenchmarkPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_plugin_abstract/predispatch.xml b/reference/yaf/yaf_plugin_abstract/predispatch.xml
deleted file mode 100644
index bad608e93813..000000000000
--- a/reference/yaf/yaf_plugin_abstract/predispatch.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.predispatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::preDispatch</refname>
-<refpurpose>Hook before each dispatch</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::preDispatch</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered before each dispatch iteration in the dispatch loop. A dispatch loop may run several iterations, so this hook may be called more than once per request.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::preDispatch</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class LayoutPlugin extends Yaf_Plugin_Abstract
-{
-    public function preDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* pick the template directory based on the module, right
-         * before the action is dispatched */
-        $view = Yaf_Dispatcher::getInstance()->getView();
-        if ($request->getModuleName() == "Admin") {
-            $view->setScriptPath(APPLICATION_PATH . "/modules/admin/views");
-        }
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new LayoutPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_plugin_abstract/preresponse.xml b/reference/yaf/yaf_plugin_abstract/preresponse.xml
deleted file mode 100644
index bc5c706f1931..000000000000
--- a/reference/yaf/yaf_plugin_abstract/preresponse.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.preresponse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::preResponse</refname>
-<refpurpose>Hook before the response is sent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::preResponse</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is intended to be triggered before the response is sent to the client.</simpara>
-  <warning>
-   <simpara>As of this version this hook is never called: it is registered on <classname>Yaf_Plugin_Abstract</classname> but not wired into the dispatch flow. Overriding it has no effect.</simpara>
-  </warning>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::preResponse</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MinifyPlugin extends Yaf_Plugin_Abstract
-{
-    public function preResponse(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* meant to minify the body right before it is sent; note
-         * that, as of this version, this hook is never actually
-         * called */
-        $response->setBody(
-            preg_replace("/>\s+</", "><", $response->getBody())
-        );
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new MinifyPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</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/yaf/yaf_plugin_abstract/routershutdown.xml b/reference/yaf/yaf_plugin_abstract/routershutdown.xml
deleted file mode 100644
index 59fa7a19c701..000000000000
--- a/reference/yaf/yaf_plugin_abstract/routershutdown.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.routershutdown" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::routerShutdown</refname>
-<refpurpose>Hook after routing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered after the routing process has finished and the controller and action names have been resolved, but before the dispatch loop starts. It is usually used for access control checks such as a login check, because the target controller and action are already known.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AuthPlugin extends Yaf_Plugin_Abstract
-{
-    public function routerShutdown(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* routing is done, so the target controller and action are
-         * known: check whether the user may access them */
-        $public = array("Index" => array("index"), "User" => array("login"));
-
-        $controller = $request->getControllerName();
-        $action = $request->getActionName();
-
-        if (isset($public[$controller]) && in_array($action, $public[$controller])) {
-            return;
-        }
-
-        if (!Yaf_Session::getInstance()->has("login")) {
-            $response->setRedirect("/user/login");
-            $request->setDispatched(true); // do not dispatch the request
-        }
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new AuthPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_plugin_abstract/routerstartup.xml b/reference/yaf/yaf_plugin_abstract/routerstartup.xml
deleted file mode 100644
index 37a42be80654..000000000000
--- a/reference/yaf/yaf_plugin_abstract/routerstartup.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-plugin-abstract.routerstartup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Plugin_Abstract::routerStartup</refname>
-<refpurpose>Hook before routing</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Plugin_Abstract::routerStartup</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-   <methodparam><type>Yaf_Response_Abstract</type><parameter>response</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>This hook is triggered right before the request is routed. It is the earliest hook in the dispatch flow, so it is usually used for URL rewriting or for routing decisions that must happen before <classname>Yaf_Router::route</classname> runs.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance being dispatched.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Response_Abstract</classname> instance.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Plugin_Abstract::routerStartup</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class RewritePlugin extends Yaf_Plugin_Abstract
-{
-    public function routerStartup(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        /* rewrite "/about" style URIs to "/page/about" before
-         * routing runs */
-        $uri = $request->getRequestUri();
-        if (preg_match("#^/[a-z]+$#", $uri)) {
-            $request->setRequestUri("/page" . $uri);
-        }
-    }
-}
-
-/* plugins are registered in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initPlugin(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->registerPlugin(new RewritePlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Plugin_Abstract::routerShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopStartup</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::postDispatch</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::dispatchLoopShutdown</methodname></member>
-   <member><methodname>Yaf_Plugin_Abstract::preResponse</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/yaf/yaf_registry/construct.xml b/reference/yaf/yaf_registry/construct.xml
deleted file mode 100644
index 199dfa01f73e..000000000000
--- a/reference/yaf/yaf_registry/construct.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-registry.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Registry::__construct</refname>
-<refpurpose>Constructor of Yaf_Registry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier><methodname>Yaf_Registry::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>The constructor is private: <classname>Yaf_Registry</classname> implements the singleton pattern and cannot be instantiated directly. Use the static methods to read and write registry entries.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Registry::__construct</methodname> example</title>
-   <simpara>
-    The constructor is private, so direct instantiation is rejected:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$registry = new Yaf_Registry();
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-PHP Fatal error:  Uncaught Error: Call to private Yaf_Registry::__construct() from invalid context
-]]>
-   </screen>
-  </example>
-  <example>
-   <title>Using <classname>Yaf_Registry</classname> through its static methods</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-Yaf_Registry::set("version", Yaf_Application::app()->getConfig()->application->version);
-var_dump(Yaf_Registry::get("version"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "1.0.0.1"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Registry::set</methodname></member>
-   <member><methodname>Yaf_Registry::get</methodname></member>
-   <member><methodname>Yaf_Registry::has</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/yaf/yaf_registry/del.xml b/reference/yaf/yaf_registry/del.xml
deleted file mode 100644
index 333a4a92ea9b..000000000000
--- a/reference/yaf/yaf_registry/del.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-registry.del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Registry::del</refname>
-<refpurpose>Remove an item from registry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Yaf_Registry::del</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes an entry from the registry. Removing a name that does not exist is silently accepted.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the registry entry.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Registry::del</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-Yaf_Registry::set("redis", new Redis());
-var_dump(Yaf_Registry::has("redis"));
-
-var_dump(Yaf_Registry::del("redis"));
-var_dump(Yaf_Registry::has("redis"));
-
-/* deleting a missing entry is silently accepted */
-var_dump(Yaf_Registry::del("redis"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Registry::get</methodname></member>
-   <member><methodname>Yaf_Registry::set</methodname></member>
-   <member><methodname>Yaf_Registry::has</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/yaf/yaf_registry/get.xml b/reference/yaf/yaf_registry/get.xml
deleted file mode 100644
index 612410f584c5..000000000000
--- a/reference/yaf/yaf_registry/get.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-registry.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Registry::get</refname>
-<refpurpose>Retrieve an item from registry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>mixed</type><methodname>Yaf_Registry::get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a value from the registry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the registry entry.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value stored under <parameter>name</parameter>, or &null; if there is no entry with that name.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Registry::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $redis = Yaf_Registry::get("redis");
-        if ($redis === null) {
-            throw new Exception("the redis connection is not registered");
-        }
-
-        $this->getView()->assign("visits", $redis->get("site:visits"));
-
-        return true;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Registry::set</methodname></member>
-   <member><methodname>Yaf_Registry::has</methodname></member>
-   <member><methodname>Yaf_Registry::del</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/yaf/yaf_registry/has.xml b/reference/yaf/yaf_registry/has.xml
deleted file mode 100644
index 2be4b215de47..000000000000
--- a/reference/yaf/yaf_registry/has.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-registry.has" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Registry::has</refname>
-<refpurpose>Check whether an item exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Yaf_Registry::has</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a value exists in the registry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the registry entry.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if an entry with the given name exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Registry::has</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRedis(Yaf_Dispatcher $dispatcher)
-    {
-        /* skip the work if a previous bootstrap pass already did it */
-        if (Yaf_Registry::has("redis")) {
-            return;
-        }
-
-        $config = Yaf_Application::app()->getConfig()->redis;
-
-        $redis = new Redis();
-        $redis->connect($config->host, $config->port);
-
-        Yaf_Registry::set("redis", $redis);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Registry::get</methodname></member>
-   <member><methodname>Yaf_Registry::set</methodname></member>
-   <member><methodname>Yaf_Registry::del</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/yaf/yaf_registry/set.xml b/reference/yaf/yaf_registry/set.xml
deleted file mode 100644
index 81ed220562cb..000000000000
--- a/reference/yaf/yaf_registry/set.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-registry.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Registry::set</refname>
-<refpurpose>Add an item into registry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Yaf_Registry::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Stores a value in the registry. Setting an already existing name overwrites its previous value.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the registry entry.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to store; it may be of any type, including objects.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Registry::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRedis(Yaf_Dispatcher $dispatcher)
-    {
-        $config = Yaf_Application::app()->getConfig()->redis;
-
-        $redis = new Redis();
-        $redis->connect($config->host, $config->port);
-
-        /* the connection is now available to the whole application */
-        Yaf_Registry::set("redis", $redis);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Registry::get</methodname></member>
-   <member><methodname>Yaf_Registry::has</methodname></member>
-   <member><methodname>Yaf_Registry::del</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/yaf/yaf_request_abstract/clearparams.xml b/reference/yaf/yaf_request_abstract/clearparams.xml
deleted file mode 100644
index 8c58159d6601..000000000000
--- a/reference/yaf/yaf_request_abstract/clearparams.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.clearparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::clearParams</refname>
-<refpurpose>Remove all parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Request_Abstract::clearParams</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Remove all parameters set by the router, or by <methodname>Yaf_Request_Abstract::setParam</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the request object itself.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::clearParams</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        $request->setParam("referrer", "newsletter");
-        var_dump($request->getParam("referrer"));
-
-        $request->clearParams();
-        var_dump($request->getParam("referrer"));
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(10) "newsletter"
-NULL]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParams</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/yaf/yaf_request_abstract/get.xml b/reference/yaf/yaf_request_abstract/get.xml
deleted file mode 100644
index bce533038a30..000000000000
--- a/reference/yaf/yaf_request_abstract/get.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::get</refname>
-<refpurpose>Retrieve a variable from the request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::get</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from the request. The search order is: request parameters set by <methodname>Yaf_Request_Abstract::setParam</methodname>, then POST, GET, COOKIE, SERVER.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value if found, or <parameter>default</parameter> if it was provided, &null; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class SearchController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        // Assuming the request is /search?keyword=yaf&page=2
-        $keyword = $request->get("keyword");
-        $page    = (int) $request->get("page", 1);
-        $sort    = $request->get("sort", "relevance");
-
-        var_dump($keyword, $page, $sort);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "yaf"
-int(2)
-string(9) "relevance"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getactionname.xml b/reference/yaf/yaf_request_abstract/getactionname.xml
deleted file mode 100644
index c9d2a7694abe..000000000000
--- a/reference/yaf/yaf_request_abstract/getactionname.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getactionname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getActionName</refname>
-<refpurpose>Retrieve the action name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getActionName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the action name</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The action name, or &null; if not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getActionName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        // Assuming the request is /product/view/id/17
-        var_dump($this->getRequest()->getActionName());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(4) "view"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getActionName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setActionName</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/yaf/yaf_request_abstract/getbaseuri.xml b/reference/yaf/yaf_request_abstract/getbaseuri.xml
deleted file mode 100644
index 930ed9e8dd93..000000000000
--- a/reference/yaf/yaf_request_abstract/getbaseuri.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getbaseuri" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getBaseUri</refname>
-<refpurpose>Retrieve the base URI</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getBaseUri</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the base URI</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The base URI, or an empty string if not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getBaseUri</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        // Assuming the application is served under /myapp,
-        // and the request is /myapp/product/view
-        var_dump($request->getBaseUri());
-        var_dump($request->getRequestUri());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(6) "/myapp"
-string(19) "/myapp/product/view"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setBaseUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequestUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setRequestUri</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/yaf/yaf_request_abstract/getcontrollername.xml b/reference/yaf/yaf_request_abstract/getcontrollername.xml
deleted file mode 100644
index 195390369fa0..000000000000
--- a/reference/yaf/yaf_request_abstract/getcontrollername.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getcontrollername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getControllerName</refname>
-<refpurpose>Retrieve the controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getControllerName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the controller name</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The controller name, or &null; if not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getControllerName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        // Assuming the request is /product/view/id/17
-        var_dump($this->getRequest()->getControllerName());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "Product"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getActionName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setActionName</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/yaf/yaf_request_abstract/getcookie.xml b/reference/yaf/yaf_request_abstract/getcookie.xml
deleted file mode 100644
index 4a55becf2c55..000000000000
--- a/reference/yaf/yaf_request_abstract/getcookie.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getcookie" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getCookie</refname>
-<refpurpose>Fetch a COOKIE variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getCookie</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from $_COOKIE.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name. If omitted, the whole array is returned.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The cookie value, or <parameter>default</parameter> if it is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getCookie</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class UserController extends Yaf_Controller_Abstract
-{
-    public function profileAction()
-    {
-        $request = $this->getRequest();
-
-        $theme     = $request->getCookie("theme", "light");
-        $sessionId = $request->getCookie("sid");
-
-        var_dump($theme, $sessionId);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(4) "dark"
-string(8) "1f2a3b4c"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getenv.xml b/reference/yaf/yaf_request_abstract/getenv.xml
deleted file mode 100644
index 26f31904d711..000000000000
--- a/reference/yaf/yaf_request_abstract/getenv.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getenv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getEnv</refname>
-<refpurpose>Retrieve an ENV variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getEnv</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a ENV variable.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The variable value, or <parameter>default</parameter> if it is not found.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getEnv</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the process runs with APPLICATION_ENV=development
-        $env = $this->getRequest()->getEnv("APPLICATION_ENV", "production");
-
-        var_dump($env);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(11) "development"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getexception.xml b/reference/yaf/yaf_request_abstract/getexception.xml
deleted file mode 100644
index f09d3650a498..000000000000
--- a/reference/yaf/yaf_request_abstract/getexception.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getexception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Abstract::getException</refname>
-  <refpurpose>Retrieve the exception</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Exception</type><type>null</type></type><methodname>Yaf_Request_Abstract::getException</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the exception caught during dispatching.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>The <exceptionname>Exception</exceptionname> caught during dispatching, or &null; if none.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getException</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// In the bootstrap, enable exception catching so that any exception
-// thrown during dispatching is forwarded to the error action
-Yaf_Dispatcher::getInstance()->catchException(true);
-
-class ErrorController extends Yaf_Controller_Abstract
-{
-    public function errorAction($exception)
-    {
-        var_dump($this->getRequest()->getException() === $exception);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Dispatcher::catchException</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/yaf/yaf_request_abstract/getfiles.xml b/reference/yaf/yaf_request_abstract/getfiles.xml
deleted file mode 100644
index 12970cd6bd4e..000000000000
--- a/reference/yaf/yaf_request_abstract/getfiles.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getfiles" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getFiles</refname>
-<refpurpose>Fetch uploaded files</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getFiles</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from $_FILES.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name. If omitted, the whole array is returned.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The uploaded files array, or <parameter>default</parameter> if it is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getFiles</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class UploadController extends Yaf_Controller_Abstract
-{
-    public function saveAction()
-    {
-        $file = $this->getRequest()->getFiles("avatar");
-
-        if (is_array($file) && $file["error"] === UPLOAD_ERR_OK) {
-            move_uploaded_file(
-                $file["tmp_name"],
-                "/var/www/uploads/" . basename($file["name"])
-            );
-        }
-    }
-}
-?>]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getFiles</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class UploadController extends Yaf_Controller_Abstract
-{
-    public function saveAction()
-    {
-        // Assuming a file was uploaded with the form field name "avatar"
-        var_dump($this->getRequest()->getFiles("avatar"));
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(5) {
-  ["name"]=>
-  string(9) "photo.jpg"
-  ["type"]=>
-  string(10) "image/jpeg"
-  ["tmp_name"]=>
-  string(14) "/tmp/phpXvBXqZ"
-  ["error"]=>
-  int(0)
-  ["size"]=>
-  int(12455)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getlanguage.xml b/reference/yaf/yaf_request_abstract/getlanguage.xml
deleted file mode 100644
index 193f0f5bae3a..000000000000
--- a/reference/yaf/yaf_request_abstract/getlanguage.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<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 the client's preferred language</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getLanguage</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the client's preferred language</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The preferred language string, or &null; if it cannot be determined.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getLanguage</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the client sends "Accept-Language: zh-CN"
-        $language = $this->getRequest()->getLanguage();
-
-        var_dump($language);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "zh-CN"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getServer</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getEnv</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/yaf/yaf_request_abstract/getmethod.xml b/reference/yaf/yaf_request_abstract/getmethod.xml
deleted file mode 100644
index d1168c0d25b1..000000000000
--- a/reference/yaf/yaf_request_abstract/getmethod.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getmethod" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getMethod</refname>
-<refpurpose>Retrieve the request method</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getMethod</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the request method</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The request method as a string, e.g. GET, POST, PUT, DELETE.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getMethod</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class OrderController extends Yaf_Controller_Abstract
-{
-    public function saveAction()
-    {
-        $request = $this->getRequest();
-
-        // Assuming the request was sent with POST /order/save
-        var_dump($request->getMethod());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(4) "POST"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/getmodulename.xml b/reference/yaf/yaf_request_abstract/getmodulename.xml
deleted file mode 100644
index 8f69fd89e241..000000000000
--- a/reference/yaf/yaf_request_abstract/getmodulename.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getmodulename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getModuleName</refname>
-<refpurpose>Retrieve the module name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getModuleName</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the module name</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The module name, or &null; if not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getModuleName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        // Assuming the request is /admin/product/view/id/17
-        var_dump($this->getRequest()->getModuleName());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Admin"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getActionName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setActionName</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/yaf/yaf_request_abstract/getparam.xml b/reference/yaf/yaf_request_abstract/getparam.xml
deleted file mode 100644
index 5f5ae333c1e7..000000000000
--- a/reference/yaf/yaf_request_abstract/getparam.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getParam</refname>
-<refpurpose>Retrieve a parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getParam</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a parameter (a named routing/action parameter) from the request.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The parameter name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the parameter is not set.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The parameter value, or <parameter>default</parameter> if it was provided, &null; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getParam</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        $request = $this->getRequest();
-
-        // Assuming the request is /product/view/id/17
-        $id       = (int) $request->getParam("id");
-        $referrer = $request->getParam("referrer", "direct");
-
-        var_dump($id, $referrer);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(17)
-string(6) "direct"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParams</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::clearParams</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::get</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/yaf/yaf_request_abstract/getparams.xml b/reference/yaf/yaf_request_abstract/getparams.xml
deleted file mode 100644
index b116dcdfdf9a..000000000000
--- a/reference/yaf/yaf_request_abstract/getparams.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getparams" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getParams</refname>
-<refpurpose>Retrieve all parameters</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>array</type><type>null</type></type><methodname>Yaf_Request_Abstract::getParams</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieves all parameters from the request.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>An array of all parameters, or &null; if none are set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getParams</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        // Assuming the request is /product/view/id/17/sort/price
-        var_dump($this->getRequest()->getParams());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["id"]=>
-  string(2) "17"
-  ["sort"]=>
-  string(5) "price"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::clearParams</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/yaf/yaf_request_abstract/getpost.xml b/reference/yaf/yaf_request_abstract/getpost.xml
deleted file mode 100644
index 1b4a1fe94442..000000000000
--- a/reference/yaf/yaf_request_abstract/getpost.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getpost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getPost</refname>
-<refpurpose>Fetch a POST parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getPost</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from $_POST.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name. If omitted, the whole array is returned.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The POST parameter value, or <parameter>default</parameter> if it is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getPost</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class LoginController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the form was submitted with POST /login
-        if ($this->getRequest()->isPost()) {
-            $username = $this->getRequest()->getPost("username");
-            $remember = $this->getRequest()->getPost("remember", "no");
-
-            var_dump($username, $remember);
-        }
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(8) "laruence"
-string(3) "yes"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getquery.xml b/reference/yaf/yaf_request_abstract/getquery.xml
deleted file mode 100644
index 60500d6b846c..000000000000
--- a/reference/yaf/yaf_request_abstract/getquery.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getquery" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getQuery</refname>
-<refpurpose>Fetch a query parameter</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getQuery</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from $_GET.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name. If omitted, the whole array is returned.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The query parameter value, or <parameter>default</parameter> if it is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getQuery</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class SearchController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the request is /search?keyword=yaf&page=2
-        $keyword = $this->getRequest()->getQuery("keyword");
-        $page    = (int) $this->getRequest()->getQuery("page", 1);
-
-        var_dump($keyword, $page);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "yaf"
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getraw.xml b/reference/yaf/yaf_request_abstract/getraw.xml
deleted file mode 100644
index 65c856cd7428..000000000000
--- a/reference/yaf/yaf_request_abstract/getraw.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getraw" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getRaw</refname>
-<refpurpose>Retrieve the raw request body</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getRaw</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieves the raw request body.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The raw request body as a string, or &null; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getRaw</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiController extends Yaf_Controller_Abstract
-{
-    public function createAction()
-    {
-        // Assuming the client POSTs '{"name":"yaf","version":3}'
-        $raw  = $this->getRequest()->getRaw();
-        $data = json_decode($raw, true);
-
-        var_dump($data);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  ["name"]=>
-  string(3) "yaf"
-  ["version"]=>
-  int(3)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getrequest.xml b/reference/yaf/yaf_request_abstract/getrequest.xml
deleted file mode 100644
index 82c0716c93eb..000000000000
--- a/reference/yaf/yaf_request_abstract/getrequest.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getrequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getRequest</refname>
-<refpurpose>Fetch a REQUEST variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getRequest</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a variable from $_REQUEST.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name. If omitted, the whole array is returned.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The $_REQUEST variable value, or <parameter>default</parameter> if it is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getRequest</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class SearchController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the request is /search?keyword=yaf
-        $keyword = $this->getRequest()->getRequest("keyword");
-        $source  = $this->getRequest()->getRequest("source", "web");
-
-        var_dump($keyword, $source);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "yaf"
-string(3) "web"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/getrequesturi.xml b/reference/yaf/yaf_request_abstract/getrequesturi.xml
deleted file mode 100644
index a8719ed31fce..000000000000
--- a/reference/yaf/yaf_request_abstract/getrequesturi.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getrequesturi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getRequestUri</refname>
-<refpurpose>Retrieve the request URI</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>null</type></type><methodname>Yaf_Request_Abstract::getRequestUri</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Retrieve the request URI</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The request URI, or an empty string if not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getRequestUri</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the request is /product/view/id/17
-        var_dump($this->getRequest()->getRequestUri());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(19) "/product/view/id/17"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setRequestUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getBaseUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setBaseUri</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/yaf/yaf_request_abstract/getserver.xml b/reference/yaf/yaf_request_abstract/getserver.xml
deleted file mode 100644
index 12c25b698145..000000000000
--- a/reference/yaf/yaf_request_abstract/getserver.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.getserver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::getServer</refname>
-<refpurpose>Retrieve a SERVER variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Request_Abstract::getServer</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>default</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a SERVER variable.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The variable name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>default</parameter></term>
-    <listitem>
-<simpara>The value to return if the variable is not found.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The variable value, or <parameter>default</parameter> if it is not found.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::getServer</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        $host     = $request->getServer("HTTP_HOST");
-        $protocol = $request->getServer("SERVER_PROTOCOL", "HTTP/1.1");
-
-        var_dump($host, $protocol);
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(15) "www.example.com"
-string(8) "HTTP/1.1"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getQuery</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequest</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getCookie</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getFiles</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_request_abstract/iscli.xml b/reference/yaf/yaf_request_abstract/iscli.xml
deleted file mode 100644
index 4f934fbef476..000000000000
--- a/reference/yaf/yaf_request_abstract/iscli.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.iscli" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isCli</refname>
-<refpurpose>Determine if the request is a CLI request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isCli</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the CLI method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request was made on the command line, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isCli</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// cron.php, executed with "php cron.php" from a crontab
-$request = new Yaf_Request_Simple("CLI", "Index", "Cron", "Cleanup");
-
-var_dump($request->isCli());
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/isdelete.xml b/reference/yaf/yaf_request_abstract/isdelete.xml
deleted file mode 100644
index dabb35c564ee..000000000000
--- a/reference/yaf/yaf_request_abstract/isdelete.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isdelete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isDelete</refname>
-<refpurpose>Determine if the request is a DELETE request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isDelete</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the DELETE method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is DELETE, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isDelete</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class CommentController extends Yaf_Controller_Abstract
-{
-    public function removeAction()
-    {
-        // Assuming the request was sent with DELETE /comment/remove/id/12
-        var_dump($this->getRequest()->isDelete());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/isdispatched.xml b/reference/yaf/yaf_request_abstract/isdispatched.xml
deleted file mode 100644
index d66078ad9ad8..000000000000
--- a/reference/yaf/yaf_request_abstract/isdispatched.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isdispatched" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isDispatched</refname>
-<refpurpose>Determine if the request is dispatched</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isDispatched</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Determine whether the request has been dispatched.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request has been dispatched, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isDispatched</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Stop the dispatch loop, no further action will be dispatched
-        $this->getRequest()->setDispatched();
-
-        var_dump($this->getRequest()->isDispatched());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Dispatcher::dispatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setDispatched</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/yaf/yaf_request_abstract/isget.xml b/reference/yaf/yaf_request_abstract/isget.xml
deleted file mode 100644
index 12da3e29a8d5..000000000000
--- a/reference/yaf/yaf_request_abstract/isget.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isGet</refname>
-<refpurpose>Determine if the request is a GET request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isGet</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the GET method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is GET, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isGet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        // Assuming the request was sent with GET /index
-        var_dump($request->isGet(), $request->isPost());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/ishead.xml b/reference/yaf/yaf_request_abstract/ishead.xml
deleted file mode 100644
index 012585462351..000000000000
--- a/reference/yaf/yaf_request_abstract/ishead.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.ishead" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isHead</refname>
-<refpurpose>Determine if the request is a HEAD request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isHead</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the HEAD method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is HEAD, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isHead</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class FeedController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the request was sent with HEAD /feed
-        if ($this->getRequest()->isHead()) {
-            // Headers only, skip rendering the body
-            return false;
-        }
-    }
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/isoptions.xml b/reference/yaf/yaf_request_abstract/isoptions.xml
deleted file mode 100644
index 6751ecb722e2..000000000000
--- a/reference/yaf/yaf_request_abstract/isoptions.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isoptions" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isOptions</refname>
-<refpurpose>Determine if the request is a OPTIONS request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isOptions</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the OPTIONS method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is OPTIONS, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isOptions</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiController extends Yaf_Controller_Abstract
-{
-    public function corsAction()
-    {
-        // Assuming the browser sends a CORS preflight request
-        if ($this->getRequest()->isOptions()) {
-            $this->getResponse()
-                 ->setHeader("Allow", "GET, POST, OPTIONS")
-                 ->setBody("");
-            return false;
-        }
-    }
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/ispatch.xml b/reference/yaf/yaf_request_abstract/ispatch.xml
deleted file mode 100644
index 3fe9a08ecbc2..000000000000
--- a/reference/yaf/yaf_request_abstract/ispatch.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.ispatch" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isPatch</refname>
-<refpurpose>Determine if the request is a PATCH request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isPatch</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the PATCH method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is PATCH, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isPatch</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProfileController extends Yaf_Controller_Abstract
-{
-    public function updateAction()
-    {
-        // Assuming the request was sent with PATCH /profile/update
-        var_dump($this->getRequest()->isPatch());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/ispost.xml b/reference/yaf/yaf_request_abstract/ispost.xml
deleted file mode 100644
index 8e4748511442..000000000000
--- a/reference/yaf/yaf_request_abstract/ispost.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.ispost" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isPost</refname>
-<refpurpose>Determine if the request is a POST request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isPost</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the POST method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is POST, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isPost</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class LoginController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // Assuming the form was submitted with POST /login
-        var_dump($this->getRequest()->isPost());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/isput.xml b/reference/yaf/yaf_request_abstract/isput.xml
deleted file mode 100644
index a216537c395a..000000000000
--- a/reference/yaf/yaf_request_abstract/isput.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isput" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isPut</refname>
-<refpurpose>Determine if the request is a PUT request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isPut</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request was sent with the PUT method.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request method is PUT, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isPut</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class DocumentController extends Yaf_Controller_Abstract
-{
-    public function saveAction()
-    {
-        // Assuming the request was sent with PUT /document/save/id/17
-        if ($this->getRequest()->isPut()) {
-            $payload = $this->getRequest()->getRaw();
-        }
-
-        var_dump($this->getRequest()->isPut());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isXmlHttpRequest</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/yaf/yaf_request_abstract/isrouted.xml b/reference/yaf/yaf_request_abstract/isrouted.xml
deleted file mode 100644
index 9522faff6d15..000000000000
--- a/reference/yaf/yaf_request_abstract/isrouted.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isrouted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isRouted</refname>
-<refpurpose>Determine if the request has been routed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isRouted</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Determine whether the request has been routed.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request has been routed, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isRouted</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiRouter extends Yaf_Route_Interface
-{
-    public function route(Yaf_Request_Abstract $request)
-    {
-        // Skip if another router already routed this request
-        if ($request->isRouted()) {
-            return false;
-        }
-
-        if (0 === strpos($request->getRequestUri(), "/api/")) {
-            $request->setControllerName("Api")
-                    ->setActionName("handle");
-            return true;
-        }
-
-        return false;
-    }
-
-    public function assemble(array $info, array $query = null) {}
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::route</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setRouted</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/yaf/yaf_request_abstract/isxmlhttprequest.xml b/reference/yaf/yaf_request_abstract/isxmlhttprequest.xml
deleted file mode 100644
index 14413a1b1dee..000000000000
--- a/reference/yaf/yaf_request_abstract/isxmlhttprequest.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.isxmlhttprequest" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::isXmlHttpRequest</refname>
-<refpurpose>Determine if the request is an Ajax request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Request_Abstract::isXmlHttpRequest</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the request is an Ajax request by inspecting the HTTP_X_REQUESTED_WITH request header.</simpara>
-  <note>
-   <simpara>
-    <classname>Yaf_Request_Simple</classname> overrides this method and always
-    returns &false;, since command-line requests are never Ajax requests.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request is an Ajax request (the <literal>X-Requested-With</literal> header equals <literal>XMLHttpRequest</literal>), &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::isXmlHttpRequest</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function viewAction()
-    {
-        // Assuming the request carries "X-Requested-With: XMLHttpRequest"
-        if ($this->getRequest()->isXmlHttpRequest()) {
-            $this->getResponse()
-                 ->setHeader("Content-Type", "application/json")
-                 ->setBody(json_encode(["id" => 17, "name" => "Yaf in Action"]));
-            return false;
-        }
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-{"id":17,"name":"Yaf in Action"}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isGet</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPost</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPut</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isHead</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isOptions</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isDelete</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isPatch</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::isCli</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/yaf/yaf_request_abstract/setactionname.xml b/reference/yaf/yaf_request_abstract/setactionname.xml
deleted file mode 100644
index 56979ebd955c..000000000000
--- a/reference/yaf/yaf_request_abstract/setactionname.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setactionname" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Abstract::setActionName</refname>
-  <refpurpose>Set action name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Request_Abstract::setActionName</methodname>
-   <methodparam><type>string</type><parameter>action</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>format_name</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>
-   set action name to request, this is usually used by custom router to set route result action name.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>action</parameter></term>
-    <listitem>
-     <para>
-      &string;, action name, it should in lower case style, like "index" or "foo_bar" 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format_name</parameter></term>
-    <listitem>
-     <para>
-      this is introduced in Yaf 3.2.0, by default Yaf will format the name into lower case style,
-      if this is set to &false; , Yaf will set the original name to request.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the request object itself on success, or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setActionName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class RestRouter extends Yaf_Route_Interface
-{
-    public function route(Yaf_Request_Abstract $request)
-    {
-        // Route any /api request to ApiController::ordersAction
-        if (0 === strpos($request->getRequestUri(), "/api")) {
-            $request->setControllerName("Api")
-                    ->setActionName("orders");
-            return true;
-        }
-
-        return false;
-    }
-
-    public function assemble(array $info, array $query = null) {}
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getActionName</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/yaf/yaf_request_abstract/setbaseuri.xml b/reference/yaf/yaf_request_abstract/setbaseuri.xml
deleted file mode 100644
index 5b89e96d09bb..000000000000
--- a/reference/yaf/yaf_request_abstract/setbaseuri.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setbaseuri" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Abstract::setBaseUri</refname>
-  <refpurpose>Set base URI</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>false</type></type><methodname>Yaf_Request_Abstract::setBaseUri</methodname>
-   <methodparam><type>string</type><parameter>uir</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Set base URI, base URI is used when doing routing, in routing phase request
-   URI is used to route a request,  while base URI is used to skip the
-   leading part(base URI) of request URI.
-
-   That is, if comes a request with request URI a/b/c, then if you set base
-   URI to "a/b", only "/c" will be used in routing phase.
-   <note>
-    <simpara>
-     generally, you don't need to set this, Yaf will determine it automatically.
-    </simpara>
-   </note>
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uir</parameter></term>
-    <listitem>
-     <para>
-       base URI
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>Returns the request object itself on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setBaseUri</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$request = new Yaf_Request_Simple("GET", "Index", "Product", "View");
-
-// The application lives under /myapp,
-// requests come in as /myapp/product/view
-$request->setBaseUri("/myapp");
-$request->setRequestUri("/myapp/product/view");
-
-var_dump($request->getBaseUri());
-var_dump($request->getRequestUri());
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(6) "/myapp"
-string(19) "/myapp/product/view"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getBaseUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setRequestUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequestUri</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/yaf/yaf_request_abstract/setcontrollername.xml b/reference/yaf/yaf_request_abstract/setcontrollername.xml
deleted file mode 100644
index 2ec75e96d7c6..000000000000
--- a/reference/yaf/yaf_request_abstract/setcontrollername.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setcontrollername" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Abstract::setControllerName</refname>
-  <refpurpose>Set controller name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Request_Abstract::setControllerName</methodname>
-   <methodparam><type>string</type><parameter>controller</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>format_name</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-    set controller name to request, this is usually used by custom router to set route result controller name.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>controller</parameter></term>
-    <listitem>
-     <para>
-      &string;, controller name, this should be in camel style, like "Index" or "Foo_Bar" 
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format_name</parameter></term>
-    <listitem>
-     <para>
-      this is introduced in Yaf 3.2.0, by default Yaf will format the name into camel mode,
-      if this is set to &false; , Yaf will set the original name to request.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the request object itself on success, or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setControllerName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class RestRouter extends Yaf_Route_Interface
-{
-    public function route(Yaf_Request_Abstract $request)
-    {
-        if (0 === strpos($request->getRequestUri(), "/api")) {
-            // Names are formatted to camel style by default,
-            // so "order_item" becomes "Order_Item"
-            $request->setControllerName("order_item")
-                    ->setActionName("list");
-            return true;
-        }
-
-        return false;
-    }
-
-    public function assemble(array $info, array $query = null) {}
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setModuleName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setActionName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getControllerName</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/yaf/yaf_request_abstract/setdispatched.xml b/reference/yaf/yaf_request_abstract/setdispatched.xml
deleted file mode 100644
index 52959429e048..000000000000
--- a/reference/yaf/yaf_request_abstract/setdispatched.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setdispatched" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::setDispatched</refname>
-<refpurpose>Mark the request as dispatched</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Yaf_Request_Abstract</type><methodname>Yaf_Request_Abstract::setDispatched</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>flag</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Mark the request as dispatched</simpara>
-  <simpara>This is called by the dispatcher after an action is executed; it stops the dispatch loop. It can be called manually, e.g. to skip the remaining dispatch iterations.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-<simpara>The state to set. Defaults to &true;.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the request object itself.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setDispatched</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AuthPlugin extends Yaf_Plugin_Abstract
-{
-    public function preDispatch(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response)
-    {
-        if (empty($_SESSION["user_id"])) {
-            // Skip the requested action and redirect to the login page
-            $request->setDispatched();
-            $response->setRedirect("/account/login");
-        }
-    }
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isDispatched</methodname></member>
-   <member><methodname>Yaf_Dispatcher::dispatch</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/yaf/yaf_request_abstract/setmodulename.xml b/reference/yaf/yaf_request_abstract/setmodulename.xml
deleted file mode 100644
index 17b5c630587b..000000000000
--- a/reference/yaf/yaf_request_abstract/setmodulename.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setmodulename" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Abstract::setModuleName</refname>
-  <refpurpose>Set module name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>null</type></type><methodname>Yaf_Request_Abstract::setModuleName</methodname>
-   <methodparam><type>string</type><parameter>module</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>format_name</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-    set module name to request, this is usually used by custom router to set route result module name.
-  </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>module</parameter></term>
-    <listitem>
-     <para>
-      &string; module name, it should be in camel style, like "Index" or "Foo_Bar"   
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>format_name</parameter></term>
-    <listitem>
-     <para>
-      this is introduced in Yaf 3.2.0, by default Yaf will format the name into camel mode,
-      if this is set to &false; , Yaf will set the original name to request.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the request object itself on success, or &null; on failure.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setModuleName</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AdminRouter extends Yaf_Route_Interface
-{
-    public function route(Yaf_Request_Abstract $request)
-    {
-        // Serve everything under /admin from the Admin module
-        if (0 === strpos($request->getRequestUri(), "/admin")) {
-            $request->setModuleName("Admin")
-                    ->setControllerName("Dashboard")
-                    ->setActionName("index");
-            return true;
-        }
-
-        return false;
-    }
-
-    public function assemble(array $info, array $query = null) {}
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::setControllerName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setActionName</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getModuleName</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/yaf/yaf_request_abstract/setparam.xml b/reference/yaf/yaf_request_abstract/setparam.xml
deleted file mode 100644
index fe16ce1b3ccf..000000000000
--- a/reference/yaf/yaf_request_abstract/setparam.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setparam" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::setParam</refname>
-<refpurpose>Set a parameter to the request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Request_Abstract</type><type>bool</type><type>null</type></type><methodname>Yaf_Request_Abstract::setParam</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Set a parameter to the request, which can be retrieved by <methodname>Yaf_Request_Abstract::getParam</methodname>.</simpara>
-  <simpara>If called with a single array argument, every key/value pair is set as a parameter.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The parameter name, or an array of key/value pairs.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The parameter value. Required unless <parameter>name</parameter> is an array.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the request object itself on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setParam</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $request = $this->getRequest();
-
-        $request->setParam("referrer", "newsletter");
-        $request->setParam(["source" => "email", "campaign" => "spring"]);
-
-        var_dump($request->getParam("referrer"));
-        var_dump($request->getParams());
-    }
-}
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(10) "newsletter"
-array(3) {
-  ["referrer"]=>
-  string(10) "newsletter"
-  ["source"]=>
-  string(5) "email"
-  ["campaign"]=>
-  string(6) "spring"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getParam</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParams</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::clearParams</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/yaf/yaf_request_abstract/setrequesturi.xml b/reference/yaf/yaf_request_abstract/setrequesturi.xml
deleted file mode 100644
index ecf22fc185b4..000000000000
--- a/reference/yaf/yaf_request_abstract/setrequesturi.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setrequesturi" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::setRequestUri</refname>
-<refpurpose>Set the request URI</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Yaf_Request_Abstract</type><methodname>Yaf_Request_Abstract::setRequestUri</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Set the request URI, overriding the one detected from the environment.</simpara>
-  <simpara>This is useful when dispatching manually, e.g. in tests, with a URI that differs from the real one.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-<simpara>The request URI to set.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the request object itself.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setRequestUri</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$request = new Yaf_Request_Simple("CLI", "Index", "Index", "Index");
-
-// Dispatch manually against a URI that differs from the real one
-$request->setRequestUri("/product/view/id/17");
-
-var_dump($request->getRequestUri());
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(19) "/product/view/id/17"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::getRequestUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setBaseUri</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getBaseUri</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/yaf/yaf_request_abstract/setrouted.xml b/reference/yaf/yaf_request_abstract/setrouted.xml
deleted file mode 100644
index c52a86e5846a..000000000000
--- a/reference/yaf/yaf_request_abstract/setrouted.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-abstract.setrouted" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Request_Abstract::setRouted</refname>
-<refpurpose>Mark the request as routed</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>final</modifier> <modifier>public</modifier> <type>Yaf_Request_Abstract</type><methodname>Yaf_Request_Abstract::setRouted</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>flag</parameter><initializer>true</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Mark the request as routed</simpara>
-  <simpara>This is called by the router once routing has succeeded. Calling it manually can prevent custom routers from being run afterwards.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>flag</parameter></term>
-    <listitem>
-<simpara>The state to set. Defaults to &true;.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the request object itself.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Abstract::setRouted</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiRouter extends Yaf_Route_Interface
-{
-    public function route(Yaf_Request_Abstract $request)
-    {
-        if (0 !== strpos($request->getRequestUri(), "/api/")) {
-            return false;
-        }
-
-        $request->setControllerName("Api")
-                ->setActionName("handle");
-
-        // Prevent routers registered after this one from running
-        $request->setRouted();
-
-        return true;
-    }
-
-    public function assemble(array $info, array $query = null) {}
-}
-?>]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Request_Abstract::isRouted</methodname></member>
-   <member><methodname>Yaf_Router::route</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/yaf/yaf_request_http/construct.xml b/reference/yaf/yaf_request_http/construct.xml
deleted file mode 100644
index ea12844ed490..000000000000
--- a/reference/yaf/yaf_request_http/construct.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-http.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Http::__construct</refname>
-  <refpurpose>Constructor of Yaf_Request_Http</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Request_Http::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>request_uri</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>base_uri</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Http::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Build a http request explicitly with an URI and a base URI.
- *
- * If the request URI is omitted, it is retrieved from the usual
- * $_SERVER variables ($_SERVER["PATH_INFO"], $_SERVER["REQUEST_URI"], ...).
- */
-$request = new Yaf_Request_Http("/product/detail/id/10", "/product");
-
-var_dump($request->getMethod());
-var_dump($request->getRequestUri());
-var_dump($request->getBaseUri());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "GET"
-string(21) "/product/detail/id/10"
-string(8) "/product"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>Yaf_Request_Simple</classname></member>
-   <member><methodname>Yaf_Request_Abstract::getMethod</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getRequestUri</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/yaf/yaf_request_simple/construct.xml b/reference/yaf/yaf_request_simple/construct.xml
deleted file mode 100644
index 9f5bad6775a9..000000000000
--- a/reference/yaf/yaf_request_simple/construct.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-request-simple.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Request_Simple::__construct</refname>
-  <refpurpose>Constructor of Yaf_Request_Simple</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Request_Simple::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>module</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>controller</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>action</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>params</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-  </para>
-
-  &warn.undocumented.func;
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Request_Simple::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * In a CLI script, build a request that skips the routing
- * process by giving the MVC names directly.
- */
-$request = new Yaf_Request_Simple(
-    "CLI",            // method
-    "Index",          // module
-    "Product",        // controller
-    "detail",         // action
-    array("id" => 10) // request parameters
-);
-
-var_dump($request->isRouted()); /* requests with MVC names are pre-routed */
-var_dump($request->getModuleName());
-var_dump($request->getControllerName());
-var_dump($request->getActionName());
-var_dump($request->getParam("id"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(5) "Index"
-string(7) "Product"
-string(6) "detail"
-int(10)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>Yaf_Request_Http</classname></member>
-   <member><methodname>Yaf_Request_Abstract::isRouted</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::getParam</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/yaf/yaf_response_abstract/appendbody.xml b/reference/yaf/yaf_response_abstract/appendbody.xml
deleted file mode 100644
index 88b87a98176f..000000000000
--- a/reference/yaf/yaf_response_abstract/appendbody.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.appendbody" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::appendBody</refname>
-<refpurpose>Append to the response body</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type><type>null</type></type><methodname>Yaf_Response_Abstract::appendBody</methodname>
-   <methodparam><type>string</type><parameter>body</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Append to the response body</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>body</parameter></term>
-    <listitem>
-<simpara>The content string.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-<simpara>the content key. If not specified, <literal>Yaf_Response_Abstract::DEFAULT_BODY</literal> will be used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the response object itself on success, or &false; on failure.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Response_Abstract::appendBody</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("Hello")->appendBody(" World");
-
-echo $response;
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Hello World]]>
-   </screen>
-  </example>
- </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>
-   <member><methodname>Yaf_Response_Abstract::clearBody</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/yaf/yaf_response_abstract/clearbody.xml b/reference/yaf/yaf_response_abstract/clearbody.xml
deleted file mode 100644
index 59ad3e5a7363..000000000000
--- a/reference/yaf/yaf_response_abstract/clearbody.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.clearbody" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::clearBody</refname>
-<refpurpose>Discard all existing response bodies</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type><type>null</type></type><methodname>Yaf_Response_Abstract::clearBody</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Discard all existing response bodies.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-<simpara>The content key. If specified, only that content block is cleared; otherwise, all content blocks are cleared.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the response object itself on success, or &null; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::clearBody</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $response = $this->getResponse();
-
-        $response->setBody("Hello", "intro");
-        $response->setBody("World");
-
-        $response->clearBody("intro"); // drop only the "intro" block
-        var_dump($response->getBody(null));
-
-        $response->clearBody(); // drop every body block
-        var_dump($response->getBody(null));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(1) {
-  ["content"]=>
-  string(5) "World"
-}
-array(0) {
-}]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::appendBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::prependBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::getBody</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/yaf/yaf_response_abstract/clearheaders.xml b/reference/yaf/yaf_response_abstract/clearheaders.xml
deleted file mode 100644
index 6a872ea4a620..000000000000
--- a/reference/yaf/yaf_response_abstract/clearheaders.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.clearheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::clearHeaders</refname>
-<refpurpose>Remove all response headers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type><type>null</type></type><methodname>Yaf_Response_Abstract::clearHeaders</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Remove all HTTP response headers that have been set.</simpara>
-  <note><simpara>This method is only fully implemented in the <classname>Yaf_Response_Http</classname> subclass. In the abstract class it is a stub.</simpara></note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the response object itself on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::clearHeaders</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $response = $this->getResponse();
-
-        $response->setHeader("Content-Type", "application/json");
-        $response->clearHeaders();
-
-        var_dump($response->getHeader()); // array(0) { }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::getHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::setAllHeaders</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/yaf/yaf_response_abstract/construct.xml b/reference/yaf/yaf_response_abstract/construct.xml
deleted file mode 100644
index 6bb4e1f40b56..000000000000
--- a/reference/yaf/yaf_response_abstract/construct.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Response_Abstract::__construct</refname>
-  <refpurpose>Construct a response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Response_Abstract::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>
-   Construct a response object. The constructor takes no arguments; the
-   concrete subclasses like <classname>Yaf_Response_Http</classname> and
-   <classname>Yaf_Response_Cli</classname> initialize their own defaults
-   (an HTTP response starts with the <literal>200</literal> response code,
-   for example).
-  </simpara>
-  <note>
-   <simpara>
-    Usually a response object does not need to be constructed manually:
-    <methodname>Yaf_Dispatcher::getResponse</methodname> returns the one
-    created by the dispatcher.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   No value is returned.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* usually there is no need to construct a response manually:
- * the dispatcher creates one and hands it out */
-$response = Yaf_Dispatcher::getInstance()->getResponse();
-
-/* constructing directly is mostly useful in tests */
-$response = new Yaf_Response_Http();
-$response->setBody("Hello World");
-
-echo $response;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Hello World]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Dispatcher::getResponse</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::response</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/yaf/yaf_response_abstract/getbody.xml b/reference/yaf/yaf_response_abstract/getbody.xml
deleted file mode 100644
index affc0a048b33..000000000000
--- a/reference/yaf/yaf_response_abstract/getbody.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.getbody" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::getBody</refname>
-<refpurpose>Retrieve a response body block</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Response_Abstract::getBody</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieve the content of a response body block.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-<simpara>The content key. If not specified, the DEFAULT_BODY block is used; pass &null; to get all content blocks as an array.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The content string, or an array of all content blocks when <parameter>key</parameter> is &null;. Returns an empty string if the block is not set.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Response_Abstract::getBody</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("Hello")->setBody(" World", "footer");
-
-var_dump($response->getBody());
-var_dump($response->getBody(Yaf_Response_Abstract::DEFAULT_BODY));
-var_dump($response->getBody("footer"));
-var_dump($response->getBody(NULL));
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(5) "Hello"
-string(5) "Hello"
-string(6) " World"
-array(2) {
-  ["content"]=>
-  string(5) "Hello"
-  ["footer"]=>
-  string(6) " World"
-}]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::appendBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::prependBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearBody</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/yaf/yaf_response_abstract/getheader.xml b/reference/yaf/yaf_response_abstract/getheader.xml
deleted file mode 100644
index 696b29d5abe1..000000000000
--- a/reference/yaf/yaf_response_abstract/getheader.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.getheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::getHeader</refname>
-<refpurpose>Retrieve an HTTP response header</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>string</type><type>array</type><type>null</type></type><methodname>Yaf_Response_Abstract::getHeader</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieve an HTTP response header.</simpara>
-  <note><simpara>This method is only fully implemented in the <classname>Yaf_Response_Http</classname> subclass. In the abstract class it is a stub.</simpara></note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The header name. If omitted, all headers are returned as an array.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The header value as a string, or an array of all headers when the name is omitted. Returns &null; if the requested header is not set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::getHeader</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $response = $this->getResponse();
-        $response->setHeader("Content-Type", "application/json");
-
-        var_dump($response->getHeader("Content-Type"));
-        var_dump($response->getHeader()); // all headers
-        var_dump($response->getHeader("X-Missing"));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(16) "application/json"
-array(1) {
-  ["Content-Type"]=>
-  string(16) "application/json"
-}
-NULL]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearHeaders</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::setAllHeaders</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/yaf/yaf_response_abstract/prependbody.xml b/reference/yaf/yaf_response_abstract/prependbody.xml
deleted file mode 100644
index 18d308fd9b07..000000000000
--- a/reference/yaf/yaf_response_abstract/prependbody.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.prependbody" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::prependBody</refname>
-<refpurpose>Prepend to the response body</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type><type>null</type></type><methodname>Yaf_Response_Abstract::prependBody</methodname>
-   <methodparam><type>string</type><parameter>body</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Prepend to the response body</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>body</parameter></term>
-    <listitem>
-<simpara>The content string.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-<simpara>the content key. If not specified, <literal>Yaf_Response_Abstract::DEFAULT_BODY</literal> will be used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the response object itself on success, or &false; on failure.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Response_Abstract::prependBody</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("World")->prependBody("Hello ");
-
-echo $response;
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Hello World]]>
-   </screen>
-  </example>
- </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::appendBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearBody</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/yaf/yaf_response_abstract/response.xml b/reference/yaf/yaf_response_abstract/response.xml
deleted file mode 100644
index c94bbf68abde..000000000000
--- a/reference/yaf/yaf_response_abstract/response.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.response" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::response</refname>
-<refpurpose>Send the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Response_Abstract::response</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Send the response: the headers and all body blocks, in order.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &null; on failure.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Response_Abstract::response</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("Hello")->setBody(" World", "footer");
-
-$response->response();
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Hello World]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearBody</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/yaf/yaf_response_abstract/setallheaders.xml b/reference/yaf/yaf_response_abstract/setallheaders.xml
deleted file mode 100644
index 913a60828c5b..000000000000
--- a/reference/yaf/yaf_response_abstract/setallheaders.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.setallheaders" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::setAllHeaders</refname>
-<refpurpose>Set all HTTP response headers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Response_Abstract::setAllHeaders</methodname>
-   <methodparam><type>array</type><parameter>headers</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Set all HTTP response headers at once.</simpara>
-  <note><simpara>This method is only fully implemented in the <classname>Yaf_Response_Http</classname> subclass. In the abstract class it is a stub.</simpara></note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>headers</parameter></term>
-    <listitem>
-<simpara>An array of header name/value pairs. Any existing header with the same name is replaced.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::setAllHeaders</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $this->getResponse()->setAllHeaders(array(
-            "Content-Type"  => "application/json; charset=utf-8",
-            "Cache-Control" => "no-cache",
-            "X-Request-Id"  => "7f3c2d91",
-        ));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::setHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::getHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearHeaders</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/yaf/yaf_response_abstract/setbody.xml b/reference/yaf/yaf_response_abstract/setbody.xml
deleted file mode 100644
index 461dedbe2c91..000000000000
--- a/reference/yaf/yaf_response_abstract/setbody.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.setbody" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::setBody</refname>
-<refpurpose>Set content to the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>Yaf_Response_Abstract</type><type>false</type><type>null</type></type><methodname>Yaf_Response_Abstract::setBody</methodname>
-   <methodparam><type>string</type><parameter>body</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Set content to the response</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>body</parameter></term>
-    <listitem>
-<simpara>The content string.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>key</parameter></term>
-    <listitem>
-<simpara>the content key. If not specified, <literal>Yaf_Response_Abstract::DEFAULT_BODY</literal> will be used.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the response object itself on success, or &false; on failure.</simpara>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Response_Abstract::setBody</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("Hello")->setBody(" World", "footer");
-
-print_r($response);
-echo $response;
-?>]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Yaf_Response_Http Object
-(
-    [_header:protected] => Array
-        (
-        )
-
-    [_body:protected] => Array
-        (
-            [content] => Hello
-            [footer] =>  World
-        )
-
-    [_sendheader:protected] => 1
-    [_response_code:protected] => 200
-)
-Hello World]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::getBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::appendBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::prependBody</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearBody</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/yaf/yaf_response_abstract/setheader.xml b/reference/yaf/yaf_response_abstract/setheader.xml
deleted file mode 100644
index e89bf60db686..000000000000
--- a/reference/yaf/yaf_response_abstract/setheader.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.setheader" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::setHeader</refname>
-<refpurpose>Set an HTTP response header</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Response_Abstract::setHeader</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>replace</parameter><initializer>false</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>response_code</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Set an HTTP response header.</simpara>
-  <note><simpara>This method is only fully implemented in the <classname>Yaf_Response_Http</classname> subclass. In the abstract class it is a stub.</simpara></note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The header name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The header value.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>replace</parameter></term>
-    <listitem>
-<simpara>Whether to replace any existing header with the same name. If &false;, the new value is appended to the existing one, separated by a comma. Note that, although the declared default is &false;, the current implementation replaces the existing header when this parameter is omitted.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>response_code</parameter></term>
-    <listitem>
-<simpara>If non-zero, the HTTP response code to set on the response.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::setHeader</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $response = $this->getResponse();
-
-        $response->setHeader("Content-Type", "application/json");
-
-        /* send a 401 and ask for credentials */
-        $response->setHeader("WWW-Authenticate", 'Basic realm="Member Area"', true, 401);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Response_Abstract::getHeader</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::clearHeaders</methodname></member>
-   <member><methodname>Yaf_Response_Abstract::setAllHeaders</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/yaf/yaf_response_abstract/setredirect.xml b/reference/yaf/yaf_response_abstract/setredirect.xml
deleted file mode 100644
index 2bbd5632ac7a..000000000000
--- a/reference/yaf/yaf_response_abstract/setredirect.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.setredirect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Response_Abstract::setRedirect</refname>
-<refpurpose>Redirect to another URL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Response_Abstract::setRedirect</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Redirect the client to another URL (sends a Location header).</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>url</parameter></term>
-    <listitem>
-<simpara>The URL to redirect to.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &null; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::setRedirect</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class AccountController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        if (!Yaf_Session::getInstance()->has("login")) {
-            /* send a Location header pointing to the login page */
-            $this->getResponse()->setRedirect("/account/login");
-            return false; // nothing to render here
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Controller_Abstract::redirect</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/yaf/yaf_response_abstract/tostring.xml b/reference/yaf/yaf_response_abstract/tostring.xml
deleted file mode 100644
index 0a75e6809845..000000000000
--- a/reference/yaf/yaf_response_abstract/tostring.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-response-abstract.tostring" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Response_Abstract::__toString</refname>
-  <refpurpose>Retrieve all bodys as string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>private</modifier> <type>string</type><methodname>Yaf_Response_Abstract::__toString</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns all body blocks of the response, concatenated into a single
-   string in the order in which they were added. This is what is output
-   when a response object is used in a string context.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The response body as a string.
-  </simpara>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Response_Abstract::__toString</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$response = new Yaf_Response_Http();
-
-$response->setBody("Hello")->setBody(" World", "footer");
-
-/* using the response in a string context renders all body blocks */
-echo $response;
-var_dump((string) $response);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Hello World
-string(11) "Hello World"]]>
-   </screen>
-  </example>
- </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::response</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/yaf/yaf_route_interface/assemble.xml b/reference/yaf/yaf_route_interface/assemble.xml
deleted file mode 100644
index 182492026246..000000000000
--- a/reference/yaf/yaf_route_interface/assemble.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-interface.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Interface::assemble</refname>
-  <refpurpose>Assemble a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Interface::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   this method returns a url according to the argument info, and append
-   query strings to the url according to the argument query.
-  </para>
-  <para>
-   a route should implement this method according to its own route rules, and
-   do a reverse progress.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-     
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Interface::assemble</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class RewriteRoute implements Yaf_Route_Interface {
-
-    private $_match;
-    private $_route;
-
-    public function __construct(string $match, array $route) {
-        $this->_match = $match;
-        $this->_route = $route;
-    }
-
-    public function route(Yaf_Request_Abstract $request): bool {
-        if (!preg_match($this->_match, $request->getRequestUri(), $matches)) {
-            return false;
-        }
-
-        foreach ($this->_route as $key => $value) {
-            if (is_string($value) && ':' === $value[0]) {
-                $value = $matches[substr($value, 1)];
-            }
-            $request->setParam($key, $value);
-        }
-        $request->setRouted();
-
-        return true;
-    }
-
-    /* reverse the route rules back into a URL */
-    public function assemble(array $info, ?array $query = null): string {
-        $url = "/product";
-        if (isset($info[':name'])) {
-            $url .= "/" . $info[':name'];
-        }
-
-        if (!empty($query)) {
-            $url .= "?" . http_build_query($query);
-        }
-
-        return $url;
-    }
-}
-
-$router = new Yaf_Router();
-$router->addRoute("custom",
-    new RewriteRoute("#^/product#", array("controller" => "product"))
-);
-
-var_dump($router->getRoute("custom")->assemble(
-    array(':name' => 'book'),
-    array('page' => 2)
-));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(20) "/product/book?page=2"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Interface::route</methodname></member>
-   <member><methodname>Yaf_Route_Rewrite::assemble</methodname></member>
-   <member><methodname>Yaf_Route_Map::assemble</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/yaf/yaf_route_interface/route.xml b/reference/yaf/yaf_route_interface/route.xml
deleted file mode 100644
index cc11950a5d32..000000000000
--- a/reference/yaf/yaf_route_interface/route.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-interface.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Interface::route</refname>
-  <refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Interface::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    <methodname>Yaf_Route_Interface::route</methodname> is the only method
-    that a custom route should implement.
-    <note>
-     <simpara>
-      since of 2.3.0, there is another method should also be implemented,
-      see <methodname>Yaf_Route_Interface::assemble</methodname>.
-     </simpara>
-    </note>
-  </para>
-  <para>
-    if this method return &true;, then the route process will be end. otherwise,
-    <classname>Yaf_Router</classname> will call next route in the route stack
-    to route request.
-  </para>
-
-  <para>
-    This method would set the route result to the parameter request, by
-    calling <methodname>Yaf_Request_Abstract::setControllerName</methodname>,
-    <methodname>Yaf_Request_Abstract::setActionName</methodname> and
-    <methodname>Yaf_Request_Abstract::setModuleName</methodname>.
-   </para>
-
-   <para>
-    This method should also call
-    <methodname>Yaf_Request_Abstract::setRouted</methodname> to make the
-    request routed at last.
-   </para>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <para>
-       A <classname>Yaf_Request_Abstract</classname> instance.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Interface::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ApiRoute implements Yaf_Route_Interface {
-
-    private $_prefix;
-
-    public function __construct(string $prefix) {
-        $this->_prefix = $prefix;
-    }
-
-    public function route(Yaf_Request_Abstract $request): bool {
-        $uri = $request->getRequestUri();
-        if (0 !== strpos($uri, $this->_prefix)) {
-            /* not our business, let the router try the next route */
-            return false;
-        }
-
-        /* parse the URI "/api/user/list" into controller/action */
-        $segments = explode("/", ltrim(substr($uri, strlen($this->_prefix)), "/"));
-        $controller = isset($segments[0]) ? ucfirst($segments[0]) : NULL;
-        $action = isset($segments[1]) ? $segments[1] : NULL;
-
-        if (empty($controller)) {
-            return false;
-        }
-
-        $request->setModuleName("index");
-        $request->setControllerName($controller);
-        $request->setActionName($action);
-        $request->setRouted(); /* the route process ends here */
-
-        return true;
-    }
-
-    public function assemble(array $info, ?array $query = null): string {
-        $uri = $this->_prefix . "/" . strtolower($info[':c']);
-        if (isset($info[':a'])) {
-            $uri .= "/" . $info[':a'];
-        }
-
-        if (!empty($query)) {
-            $uri .= "?" . http_build_query($query);
-        }
-
-        return $uri;
-    }
-}
-
-/**
- * register the custom route
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute("api", new ApiRoute("/api"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* http://yourdomain.com/api/user/list
- * routes to the following values:
- */
-array(
-  "module"     => "index",
-  "controller" => "User",
-  "action"     => "list",
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Interface::assemble</methodname></member>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Request_Abstract::setRouted</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/yaf/yaf_route_map/assemble.xml b/reference/yaf/yaf_route_map/assemble.xml
deleted file mode 100644
index 835a69d14ed7..000000000000
--- a/reference/yaf/yaf_route_map/assemble.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-map.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Map::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Map::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Yaf_Route_Map::assemble</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Map();
-
-$router->addRoute("map", $route);
-
-var_dump($router->getRoute('map')->assemble(
-                        array(
-                                ':c' => 'foo_bar'
-                        ),
-                        array(
-                                'tkey1' => 'tval1',
-                                'tkey2' => 'tval2'
-                        )
-                   )
-);
-
-$route = new Yaf_Route_Map(true, '_');
-$router->addRoute("map", $route);
-
-var_dump($router->getRoute('map')->assemble(
-                        array(
-                                ':a' => 'foo_bar'
-                        ),
-                        array(
-                                'tkey1' => 'tval1',
-                                'tkey2' => 'tval2'
-                        )
-                   )
-);
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(%d) "/foo/bar?tkey1=tval1&tkey2=tval2"
-string(%d) "/foo/bar/_/tkey1/tval1/tkey2/tval2"
-]]>
-   </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/yaf/yaf_route_map/construct.xml b/reference/yaf/yaf_route_map/construct.xml
deleted file mode 100644
index 42eed1b40052..000000000000
--- a/reference/yaf/yaf_route_map/construct.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-map.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Map::__construct</refname>
-<refpurpose>Construct a map route</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier><methodname>Yaf_Route_Map::__construct</methodname>
-   <methodparam choice="opt"><type>bool</type><parameter>controller_prefer</parameter><initializer>false</initializer></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>delimiter</parameter><initializer>''</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>Construct a map route. A map route maps the whole URI to a controller name or an action name.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>controller_prefer</parameter></term>
-    <listitem>
-<simpara>Whether to map the URI to a controller name. If &false;, the URI is mapped to an action name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>delimiter</parameter></term>
-    <listitem>
-<simpara>The delimiter used to separate the mapped name from the request parameters in the URI. If it occurs as a path segment preceded by a slash, everything after it is parsed as request parameters instead of being part of the mapped name. If empty, no such splitting happens during routing.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><classname>Yaf_Route_Map</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Add a map route to the Yaf_Router route stack
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute("name",
-    new Yaf_Route_Map());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/product/foo/bar
- * the request will carry the following values:
- */
-array(
-  "action" => "product_foo_bar",
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Map</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Add a map route with a delimiter to the Yaf_Router route stack
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute("name",
-    new Yaf_Route_Map(true, "_"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/user/list/_/foo/22
- * the request will carry the following values:
- */
-array(
-    "controller" => "User_List",
-)
-
-/**
- * and request parameters:
- */
-array(
-  "foo" => "22",
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Map</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Add a map route to the route stack by calling addConfig
- */
-$config = array(
-    "name" => array(
-       "type"             => "map", // Yaf_Route_Map route
-       "controllerPrefer" => FALSE,
-       "delimiter"        => "#!",
-    ),
-);
-Yaf_Dispatcher::getInstance()->getRouter()->addConfig(
-    new Yaf_Config_Simple($config));
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Map::route</methodname></member>
-   <member><methodname>Yaf_Route_Map::assemble</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/yaf/yaf_route_map/route.xml b/reference/yaf/yaf_route_map/route.xml
deleted file mode 100644
index 0866e6cadb74..000000000000
--- a/reference/yaf/yaf_route_map/route.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-map.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Map::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Map::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request by mapping the whole URI to a controller name or an action name: the path segments of the URI are joined with underscores to form the name.</simpara>
-  <simpara>When the route was constructed with the controller prefer flag on, the result is set as the controller name, otherwise as the action name.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &true;. Note that the map route claims the request even when the URI is empty, in which case no name is set.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Map::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$request = new Yaf_Request_Simple("CLI");
-$request->setRequestUri("/product/foo/bar");
-
-$route = new Yaf_Route_Map();
-var_dump($route->route($request));
-var_dump($request->getActionName());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(15) "product_foo_bar"
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><methodname>Yaf_Route_Map::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$request = new Yaf_Request_Simple("CLI");
-$request->setRequestUri("/user/list/_/foo/22");
-
-$route = new Yaf_Route_Map(true, "_");
-var_dump($route->route($request));
-var_dump($request->getControllerName());
-var_dump($request->getParam("foo"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(9) "User_List"
-string(2) "22"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Map::__construct</methodname></member>
-   <member><methodname>Yaf_Route_Map::assemble</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/yaf/yaf_route_regex/assemble.xml b/reference/yaf/yaf_route_regex/assemble.xml
deleted file mode 100644
index 367b48995284..000000000000
--- a/reference/yaf/yaf_route_regex/assemble.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-regex.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Regex::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <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>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &string; on success or &null; on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Route_Regex::assemble</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Regex(
-            "#^/product/([^/]+)/([^/])+#",
-            array(
-                'controller' => "product",  //route to product controller,
-                ),
-            array(),
-            array(),
-            '/:m/:c/:a'
-        );
-
-$router->addRoute("regex", $route);
-
-var_dump($router->getRoute('regex')->assemble(
-            array(
-                ':m' => 'module',
-                ':c' => 'controller',
-                ':a' => 'action'
-                ),
-            array(
-                'tkey1' => 'tval1',
-                'tkey2' =>
-                'tval2'
-                )
-            )
-        );
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(49) "/module/controller/action?tkey1=tval1&tkey2=tval2"
-]]>
-   </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/yaf/yaf_route_regex/construct.xml b/reference/yaf/yaf_route_regex/construct.xml
deleted file mode 100644
index 64a7c68d0df4..000000000000
--- a/reference/yaf/yaf_route_regex/construct.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-regex.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Regex::__construct</refname>
-  <refpurpose>Yaf_Route_Regex constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Route_Regex::__construct</methodname>
-   <methodparam><type>string</type><parameter>match</parameter></methodparam>
-   <methodparam><type>array</type><parameter>route</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>map</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>verify</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>reverse</parameter><initializer>&null;</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Constructs a <classname>Yaf_Route_Regex</classname> route, which routes a
-   request URI matching a regular expression to a module, controller and action.
-  </simpara>
-
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>match</parameter></term>
-    <listitem>
-     <simpara>
-      A complete regular expression pattern, used to match the request URI.
-      When it does not match, <methodname>Yaf_Route_Regex::route</methodname>
-      returns &false; and the router moves on to the next route.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>route</parameter></term>
-    <listitem>
-     <simpara>
-      When the pattern matches the request URI, this &array; determines the
-      module, controller and action to route to.
-     </simpara>
-     <simpara>
-      Each of the three entries is optional; when one is not given, the
-      default is used. An entry whose value starts with <literal>:</literal>
-      is resolved against the parameters produced by
-      <parameter>map</parameter>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>map</parameter></term>
-    <listitem>
-     <simpara>
-      An &array; mapping capture group indexes to parameter names. Only the
-      captures listed here become request parameters; a numeric capture that
-      is not listed is discarded.
-     </simpara>
-     <simpara>
-      Named capture groups are always added under their own name and do not
-      need to be listed.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>verify</parameter></term>
-    <listitem>
-     <simpara>
-      Accepted and stored on the route, but not used: the current
-      implementation never consults it while routing.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>reverse</parameter></term>
-    <listitem>
-     <para>
-      A &string;, used to assemble URL, see
-      <methodname>Yaf_Route_Regex::assemble</methodname>.
-      <note>
-       <simpara>
-        This parameter is introduced in 2.3.0
-       </simpara>
-      </note>
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><classname>Yaf_Route_Regex</classname> via <methodname>Yaf_Router::addRoute</methodname></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/**
- * Add a regex route to the Yaf_Router route stack
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute(
-    "name",
-    new Yaf_Route_Regex(
-        "#^/product/([^/]+)/([^/]+)#", // match a URI leading "/product"
-        array(
-            'controller' => "product", // route to the product controller
-        ),
-        array(
-            1 => "name", // $request->getParam("name") holds the first capture
-            2 => "id",   // and $request->getParam("id") the second
-        )
-    )
-);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Regex</classname> using a capture as the controller name</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/**
- * Use a capture as the controller name
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute(
-    "name",
-    new Yaf_Route_Regex(
-        "#^/product/([^/]+)/([^/]+)#i", // match a URI leading "/product"
-        array(
-            'controller' => ":name", // the "name" capture (see map) becomes the controller
-        ),
-        array(
-            1 => "name", // $request->getParam("name") holds the first capture
-            2 => "id",   // and $request->getParam("id") the second
-        )
-    )
-);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Regex</classname> using a named capture group</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/**
- * Use a named capture group as the controller name
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute(
-    "name",
-    new Yaf_Route_Regex(
-        "#^/product/(?<name>[^/]+)/([^/]+)#i", // match a URI leading "/product"
-        array(
-            'controller' => ":name", // the "name" capture becomes the controller
-        ),
-        array(
-            2 => "id", // group 1 is named, only group 2 needs a map entry
-        )
-    )
-);
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Regex</classname> via <methodname>Yaf_Router::addConfig</methodname></title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-/**
- * Add a regex route to the Yaf_Router route stack through a config array
- */
-$config = array(
-    "name" => array(
-        "type"  => "regex",          // a Yaf_Route_Regex route
-        "match" => "#(.*)#",         // match any request URI
-        "route" => array(
-            'controller' => "product", // route to the product controller
-            'action'     => "dummy",   // and to the dummy action
-        ),
-        "map" => array(
-            1 => "uri", // $request->getParam("uri") holds the matched URI
-        ),
-    ),
-);
-
-Yaf_Dispatcher::getInstance()->getRouter()->addConfig(
-    new Yaf_Config_Simple($config)
-);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Regex::route</methodname></member>
-   <member><methodname>Yaf_Route_Regex::assemble</methodname></member>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Router::addConfig</methodname></member>
-   <member><classname>Yaf_Route_Static</classname></member>
-   <member><classname>Yaf_Route_Supervar</classname></member>
-   <member><classname>Yaf_Route_Simple</classname></member>
-   <member><classname>Yaf_Route_Rewrite</classname></member>
-   <member><classname>Yaf_Route_Map</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/yaf/yaf_route_regex/route.xml b/reference/yaf/yaf_route_regex/route.xml
deleted file mode 100644
index 3c2f35965254..000000000000
--- a/reference/yaf/yaf_route_regex/route.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-regex.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Regex::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Regex::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request with a regular expression: the URI is matched against the pattern given to the constructor, and the route result (the module, controller and action) is taken from the captured variables, mapped by the map parameter.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the URI matches, &false; otherwise, which makes the router try the next route.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Regex::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* assume the request URI is "/product/php-book" */
-$request = new Yaf_Request_Http("/product/php-book");
-
-$route = new Yaf_Route_Regex(
-    "#^/product/([^/]+)/?$#", // match a URI leading "/product"
-    array(
-        'controller' => "product", // route to the product controller
-    ),
-    array(
-        1 => "name", // $request->getParam("name") will be "php-book"
-    )
-);
-
-var_dump($route->route($request));
-
-var_dump($request->getControllerName());
-var_dump($request->getParam("name"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(7) "product"
-string(8) "php-book"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Regex::__construct</methodname></member>
-   <member><methodname>Yaf_Route_Regex::match</methodname></member>
-   <member><methodname>Yaf_Route_Regex::assemble</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/yaf/yaf_route_rewrite/assemble.xml b/reference/yaf/yaf_route_rewrite/assemble.xml
deleted file mode 100644
index 3e4c6f491479..000000000000
--- a/reference/yaf/yaf_route_rewrite/assemble.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-rewrite.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Rewrite::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Rewrite::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &string;.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Route_Rewrite::assemble</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Rewrite(
-                "/product/:name/:id/*",
-                array(
-                        'controller' => "product",
-                ),
-                array()
-);
-
-$router->addRoute("rewrite", $route);
-
-var_dump($router->getRoute('rewrite')->assemble(
-                        array(
-                                ':name' => 'foo',
-                                ':id' => 'bar',
-                                ':tmpkey1' => 'tmpval1'
-                        ),
-                        array(
-                                'tkey1' => 'tval1',
-                                'tkey2' => 'tval2'
-                             )
-                        )
-);
-
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(57) "/product/foo/bar/tmpkey1/tmpval1/?tkey1=tval1&tkey2=tval2"
-]]>
-   </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/yaf/yaf_route_rewrite/construct.xml b/reference/yaf/yaf_route_rewrite/construct.xml
deleted file mode 100644
index ce2725f8501c..000000000000
--- a/reference/yaf/yaf_route_rewrite/construct.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-rewrite.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Rewrite::__construct</refname>
-  <refpurpose>Yaf_Route_Rewrite constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Route_Rewrite::__construct</methodname>
-   <methodparam><type>string</type><parameter>match</parameter></methodparam>
-   <methodparam><type>array</type><parameter>route</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>verify</parameter></methodparam>
-  </constructorsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>match</parameter></term>
-    <listitem>
-     <para>
-       A pattern, will be used to match a request uri, if
-       it doesn't match, <classname>Yaf_Route_Rewrite</classname> will return
-       &false;.
-     </para>
-     <para>
-      You can use :name style to name segments matched, and use * to match
-      the rest of the URL segments.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>route</parameter></term>
-    <listitem>
-     <para>
-      When the match pattern matches the request uri,
-      <classname>Yaf_Route_Rewrite</classname> will use this to decide which
-      module/controller/action is the destination.
-     </para>
-     <para>
-      Either of module/controller/action in this array is optional, if you don't assign a
-      specific value, it will be routed to default.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>verify</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><classname>Yaf_Route_Rewrite</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-   /**
-    * Add a rewrite route to Yaf_Router route stack
-    */
-    Yaf_Dispatcher::getInstance()->getRouter()->addRoute("name",
-        new Yaf_Route_Rewrite(
-           "/product/:name/:id/*", //match request uri leading "/product"
-           array(
-               'controller' => "product",  //route to product controller,
-           ),
-        )
-    );
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/product/foo/22/foo/bar
- * route will result in following values:
- */
-array(
-  "controller" => "product",
-  "module"     => "index", //(default)
-  "action"     => "index", //(default)
-)
-
-/**
- * and request parameters:
- */
-array(
-  "name" => "foo",
-  "id"   => 22,
-  "foo"  => bar
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Rewrite</classname> example</title>
-   <programlisting role="php">
-<![CDATA[
-    <?php
-   /**
-    * Add a rewrite route to Yaf_Router route stack by calling addconfig
-    */
-    $config = array(
-        "name" => array(
-           "type"  => "rewrite",        //Yaf_Route_Rewrite route
-           "match" => "/user-list/:id", //match only /user/list/?/
-           "route" => array(
-               'controller' => "user",  //route to user controller,
-               'action'     => "list",  //route to list action
-           ),
-        ),
-    );
-    Yaf_Dispatcher::getInstance()->getRouter()->addConfig(
-        new Yaf_Config_Simple($config));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/user-list/22
- * route will result in following values:
- */
-array(
-  "controller" => "user",
-  "action"     => "list",
-  "module"     => "index", //(default)
-)
-
-/**
- * and request parameters:
- */
-array(
-  "id"   => 22,
-)
-]]>
-   </screen>
-  </example>
-  <example>
-   <title><classname>Yaf_Route_Rewrite</classname> (as of 2.3.0) example</title>
-   <programlisting role="php">
-<![CDATA[
-    <?php
-   /**
-    * Add a rewrite route use match result as m/c/a name
-    */
-    $config = array(
-        "name" => array(
-           "type"  => "rewrite",        
-           "match" => "/user-list/:a/:id", //match only /user-list/*
-           "route" => array(
-               'controller' => "user",   //route to user controller,
-               'action'     => ":a",     //route to :a action
-           ),
-        ),
-    );
-    Yaf_Dispatcher::getInstance()->getRouter()->addConfig(
-        new Yaf_Config_Simple($config));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/user-list/list/22
- * route will result in following values:
- */
-array(
-  "controller" => "user",
-  "action"     => "list",
-  "module"     => "index", //(default)
-)
-
-/**
- * and request parameters:
- */
-array(
-  "id"   => 22,
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Router::addConfig</methodname></member>
-   <member><classname>Yaf_Route_Static</classname></member>
-   <member><classname>Yaf_Route_Supervar</classname></member>
-   <member><classname>Yaf_Route_Simple</classname></member>
-   <member><classname>Yaf_Route_Regex</classname></member>
-   <member><classname>Yaf_Route_Map</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/yaf/yaf_route_rewrite/route.xml b/reference/yaf/yaf_route_rewrite/route.xml
deleted file mode 100644
index f8e4cdd432e3..000000000000
--- a/reference/yaf/yaf_route_rewrite/route.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-rewrite.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Rewrite::route</refname>
-  <refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Rewrite::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request by matching the URI against the match pattern given to the constructor. When it matches, the module, controller and action are taken from the route array, where a value starting with a colon is resolved from the matched variables.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-     <simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>Returns &true; if the URI matches, &false; otherwise, which makes the router try the next route.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Rewrite::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* assume the request URI is "/product/php-book" */
-$request = new Yaf_Request_Http("/product/php-book");
-
-$route = new Yaf_Route_Rewrite(
-    "/product/:name",             // match a URI leading "/product"
-    array(
-        'controller' => "product", // route to the product controller
-    ),
-    array()                        // no default values
-);
-
-var_dump($route->route($request));
-
-var_dump($request->getControllerName());
-var_dump($request->getParam("name"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(7) "product"
-string(8) "php-book"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Rewrite::__construct</methodname></member>
-   <member><methodname>Yaf_Route_Rewrite::match</methodname></member>
-   <member><methodname>Yaf_Route_Rewrite::assemble</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/yaf/yaf_route_simple/assemble.xml b/reference/yaf/yaf_route_simple/assemble.xml
deleted file mode 100644
index 6d9c973a65cc..000000000000
--- a/reference/yaf/yaf_route_simple/assemble.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-simple.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Simple::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Simple::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <title><function>Yaf_Route_Simple::assemble</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Simple('m', 'c', 'a');
-
-$router->addRoute("simple", $route);
-
-var_dump($router->getRoute('simple')->assemble(
-            array(
-                ':a' => 'yafaction',
-                'tkey' => 'tval',
-                ':c' => 'yafcontroller',
-                ':m' => 'yafmodule'
-                ),
-            array(
-                'tkey1' => 'tval1',
-                'tkey2' => 'tval2'
-                )
-            ));
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(64) "?m=yafmodule&c=yafcontroller&a=yafaction&tkey1=tval1&tkey2=tval2"
-]]>
-   </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/yaf/yaf_route_simple/construct.xml b/reference/yaf/yaf_route_simple/construct.xml
deleted file mode 100644
index c6b23631474c..000000000000
--- a/reference/yaf/yaf_route_simple/construct.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-simple.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Simple::__construct</refname>
-  <refpurpose>Construct a simple route</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Route_Simple::__construct</methodname>
-   <methodparam><type>string</type><parameter>module_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>controller_name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>action_name</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>Construct a simple route. A simple route reads the module, controller and action names from the query variables named as the three arguments. For example, with the constructor arguments <literal>module</literal>, <literal>controller</literal> and <literal>action</literal>, the route matches a request like <literal>/?module=foo&amp;controller=bar&amp;action=list</literal>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>module_name</parameter></term>
-    <listitem>
-     <simpara>The name of the query variable that carries the module name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>controller_name</parameter></term>
-    <listitem>
-     <simpara>The name of the query variable that carries the controller name.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>action_name</parameter></term>
-    <listitem>
-     <simpara>The name of the query variable that carries the action name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Simple::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Add a simple route to the Yaf_Router route stack.
- *
- * The route matches requests like:
- * http://yourdomain.com/index.php?m=main&c=product&a=detail
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute("simple",
-    new Yaf_Route_Simple("m", "c", "a")
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* http://yourdomain.com/index.php?m=main&c=product&a=detail
- * routes to the following values:
- */
-array(
-  "module"     => "main",
-  "controller" => "product",
-  "action"     => "detail",
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Simple::route</methodname></member>
-   <member><methodname>Yaf_Route_Simple::assemble</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/yaf/yaf_route_simple/route.xml b/reference/yaf/yaf_route_simple/route.xml
deleted file mode 100644
index c982cc233a71..000000000000
--- a/reference/yaf/yaf_route_simple/route.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-simple.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Simple::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Simple::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request with query parameters: the module, controller and action names are retrieved from the query variables named as the ones given to the constructor.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if any of the three query variables is present, &false; otherwise, which makes the router try the next route.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Simple::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* assume the request was made with
- * http://yourdomain.com/index.php?m=main&c=product&a=detail */
-$request = new Yaf_Request_Http("/index.php");
-
-$route = new Yaf_Route_Simple("m", "c", "a");
-var_dump($route->route($request));
-
-var_dump($request->getModuleName());
-var_dump($request->getControllerName());
-var_dump($request->getActionName());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(4) "main"
-string(7) "product"
-string(6) "detail"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Simple::__construct</methodname></member>
-   <member><methodname>Yaf_Route_Simple::assemble</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/yaf/yaf_route_static/assemble.xml b/reference/yaf/yaf_route_static/assemble.xml
deleted file mode 100644
index 93d8572add35..000000000000
--- a/reference/yaf/yaf_route_static/assemble.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-static.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Static::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Static::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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_Static::assemble</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Static();
-
-$router->addRoute("static", $route);
-
-var_dump($router->getRoute('static')->assemble(
-            array(
-                ':a' => 'yafaction',
-                'tkey' => 'tval',
-                ':c' => 'yafcontroller',
-                ':m' => 'yafmodule'
-            ),
-        )
-);
-
-var_dump($router->getRoute('static')->assemble(
-            array(
-                ':a' => 'yafaction',
-                'tkey' => 'tval',
-                ':c' => 'yafcontroller',
-                ':m' => 'yafmodule'
-            ),
-            array(
-                'tkey1' => 'tval1',
-                'tkey2' => 'tval2'
-            )
-        )
-);
-
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(%d) "/yafmodule/yafcontroller/yafaction"
-string(%d) "/yafmodule/yafcontroller/yafaction?tkey1=tval1&tkey2=tval2"
-]]>
-   </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/yaf/yaf_route_static/match.xml b/reference/yaf/yaf_route_static/match.xml
deleted file mode 100644
index d8df87809c44..000000000000
--- a/reference/yaf/yaf_route_static/match.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-static.match" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Static::match</refname>
-<refpurpose>Whether the route matches a URI</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Static::match</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Determine whether the static route matches a URI. Since the static route matches any URI, this method always returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-<simpara>The URI to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Static::match</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$route = new Yaf_Route_Static();
-
-/* the static route matches any URI */
-var_dump($route->match("/product/detail/id/10"));
-var_dump($route->match("/"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Static::route</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/yaf/yaf_route_static/route.xml b/reference/yaf/yaf_route_static/route.xml
deleted file mode 100644
index 628d0ab92214..000000000000
--- a/reference/yaf/yaf_route_static/route.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-static.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Static::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Static::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request according to the PATH_INFO style URI: the first path segment is treated as the module name only if it is one of the registered modules, otherwise the segments are mapped to the controller and the action in order. The remaining segments become request parameters.</simpara>
-  <simpara>For example, with no module named <literal>foo</literal>, <literal>/foo/bar/age/10</literal> routes to the controller <literal>Foo</literal>, the action <literal>bar</literal>, with a parameter <literal>age</literal> of <literal>10</literal>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Always returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Static::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$request = new Yaf_Request_Http("/product/detail/id/10");
-
-/* the static route is the default route of Yaf_Router,
- * registered under the name "_default" */
-$route = Yaf_Dispatcher::getInstance()->getRouter()->getRoute("_default");
-var_dump($route->route($request));
-
-var_dump($request->getControllerName());
-var_dump($request->getActionName());
-var_dump($request->getParam("id"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(7) "product"
-string(6) "detail"
-string(2) "10"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Static::match</methodname></member>
-   <member><methodname>Yaf_Route_Static::assemble</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/yaf/yaf_route_supervar/assemble.xml b/reference/yaf/yaf_route_supervar/assemble.xml
deleted file mode 100644
index 696c1b375889..000000000000
--- a/reference/yaf/yaf_route_supervar/assemble.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-supervar.assemble" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Route_Supervar::assemble</refname>
-  <refpurpose>Assemble a url</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Route_Supervar::assemble</methodname>
-   <methodparam><type>array</type><parameter>info</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Assemble a url.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>info</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>query</parameter></term>
-    <listitem>
-     <para>
-      
-     </para>
-    </listitem>
-   </varlistentry>
-  </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>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$router = new Yaf_Router();
-
-$route  = new Yaf_Route_Supervar('r');
-
-$router->addRoute("supervar", $route);
-
-var_dump($router->getRoute('supervar')->assemble(
-        array(
-              ':a' => 'yafaction',
-              'tkey' => 'tval',
-              ':c' => 'yafcontroller',
-              ':m' => 'yafmodule'
-        ),
-        array(
-              'tkey1' => 'tval1',
-              'tkey2' => 'tval2'
-        )
-));
-
-try {
-var_dump($router->getRoute('supervar')->assemble(
-        array(
-              ':a' => 'yafaction',
-              'tkey' => 'tval',
-              ':m' => 'yafmodule'
-        ),
-        array(
-              'tkey1' => 'tval1',
-              'tkey2' => 'tval2',
-              1 => array(),
-        )
-));
-} catch (Exception $e) {
-    var_dump($e->getMessage());
-}
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(%d) "?r=/yafmodule/yafcontroller/yafaction&tkey1=tval1&tkey2=tval2"
-string(%d) "You need to specify the controller by ':c'"
-]]>
-   </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/yaf/yaf_route_supervar/construct.xml b/reference/yaf/yaf_route_supervar/construct.xml
deleted file mode 100644
index b317c0eeb5aa..000000000000
--- a/reference/yaf/yaf_route_supervar/construct.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-supervar.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Supervar::__construct</refname>
-<refpurpose>Construct a supervar route</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier><methodname>Yaf_Route_Supervar::__construct</methodname>
-   <methodparam><type>string</type><parameter>supervar_name</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>Construct a supervar route. A supervar route expects a query variable to carry a PATH_INFO style URI.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>supervar_name</parameter></term>
-    <listitem>
-<simpara>The name of the query variable that carries the URI.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Supervar::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Add a supervar route to the Yaf_Router route stack.
- *
- * The URI is expected in the query variable named below,
- * e.g. http://yourdomain.com/index.php?_url=/product/detail/id/10
- */
-Yaf_Dispatcher::getInstance()->getRouter()->addRoute("supervar",
-    new Yaf_Route_Supervar("_url")
-);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* http://yourdomain.com/index.php?_url=/product/detail/id/10
- * routes to the following values:
- */
-array(
-  "controller" => "product",
-  "module"     => "index", //(default)
-  "action"     => "detail", //(default)
-)
-
-/**
- * and request parameters:
- */
-array(
-  "id" => 10
-)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Supervar::route</methodname></member>
-   <member><methodname>Yaf_Route_Supervar::assemble</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/yaf/yaf_route_supervar/route.xml b/reference/yaf/yaf_route_supervar/route.xml
deleted file mode 100644
index b6dee0f8009b..000000000000
--- a/reference/yaf/yaf_route_supervar/route.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-route-supervar.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Route_Supervar::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Route_Supervar::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request with a super variable: the query variable named as the one given to the constructor is expected to carry a PATH_INFO style URI, which is then parsed like <classname>Yaf_Route_Static</classname> does.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the variable is present and holds a string, &false; otherwise, which makes the router try the next route.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Route_Supervar::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* assume the request was made with
- * http://yourdomain.com/index.php?_url=/product/detail/id/10 */
-$request = new Yaf_Request_Http("/index.php");
-
-$route = new Yaf_Route_Supervar("_url");
-var_dump($route->route($request));
-
-var_dump($request->getControllerName());
-var_dump($request->getActionName());
-var_dump($request->getParam("id"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-string(7) "product"
-string(6) "detail"
-string(2) "10"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Route_Supervar::__construct</methodname></member>
-   <member><methodname>Yaf_Route_Supervar::assemble</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/yaf/yaf_router/addconfig.xml b/reference/yaf/yaf_router/addconfig.xml
deleted file mode 100644
index e3706d8fb740..000000000000
--- a/reference/yaf/yaf_router/addconfig.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.addconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::addConfig</refname>
-  <refpurpose>Add config-defined routes into Router</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Router::addConfig</methodname>
-   <methodparam><type>Yaf_Config_Abstract</type><parameter>config</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    Add routes defined by configs into
-    <classname>Yaf_Router</classname>'s route stack
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-     An <classname>Yaf_Config_Abstract</classname> instance, which should
-     contains one or more valid route configs
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>application.ini</function>example</title>
-   <programlisting role="ini">
-    <![CDATA[
-;the order is very important, the prior one will be called first
-
-;a rewrite route match request /product/*/*
-routes.route_name.type="rewrite"
-routes.route_name.match="/product/:name/:value"
-routes.route_name.route.controller=product
-routes.route_name.route.action=info
-
-;a regex route match request /list/*/*
-routes.route_name1.type="regex"
-routes.route_name1.match="#^list/([^/]*)/([^/]*)#"
-routes.route_name1.route.controller=Index
-routes.route_name1.route.action=action
-routes.route_name1.map.1=name
-routes.route_name1.map.2=value
-
-;a simple route match /**?c=controller&a=action&m=module
-routes.route_name2.type="simple"
-routes.route_name2.controller=c
-routes.route_name2.module=m
-routes.route_name2.action=a
-
-;a simple router match /**?r=PATH_INFO
-routes.route_name3.type="supervar"
-routes.route_name3.varname=r
-
-;a map route match any request to controller
-routes.route_name4.type="map"
-routes.route_name4.controllerPrefer=TRUE
-routes.route_namer.delimiter="#!"
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title><function>Yaf_Dispatcher::autoConfig</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract{
-    public function _initConfig() {
-        $config = Yaf_Application::app()->getConfig();
-        Yaf_Registry::set("config", $config);
-    }
-
-    public function _initRoute(Yaf_Dispatcher $dispatcher) {
-        $router = $dispatcher->getRouter();
-        /**
-         * we can add some pre-defined routes in application.ini
-         */
-        $router->addConfig(Yaf_Registry::get("config")->routes);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><classname>Yaf_Route_Static</classname></member>
-   <member><classname>Yaf_Route_Supervar</classname></member>
-   <member><classname>Yaf_Route_Simple</classname></member>
-   <member><classname>Yaf_Route_Regex</classname></member>
-   <member><classname>Yaf_Route_Rewrite</classname></member>
-   <member><classname>Yaf_Route_Map</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/yaf/yaf_router/addroute.xml b/reference/yaf/yaf_router/addroute.xml
deleted file mode 100644
index c89e23f4f156..000000000000
--- a/reference/yaf/yaf_router/addroute.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.addroute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::addRoute</refname>
-  <refpurpose>Add new Route into Router</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Router::addRoute</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>Yaf_Route_Abstract</type><parameter>route</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-    defaultly, Yaf_Router using a <classname>Yaf_Route_Static</classname> as its defualt route. you
-    can add new routes into router's route stack by calling this method.
-  </para>
-  <para>
-    the newer route will be called before the older(route stack), and if the newer router return
-    &true;, the router process will be end. otherwise, the older one will be
-    called.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yaf_Dispatcher::autoRender</function>example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract{
-    public function _initConfig() {
-        $config = Yaf_Application::app()->getConfig();
-        Yaf_Registry::set("config", $config);
-    }
-
-    public function _initRoute(Yaf_Dispatcher $dispatcher) {
-        $router = $dispatcher->getRouter();
-        /**
-         * we can add some pre-defined routes in application.ini
-         */
-        $router->addConfig(Yaf_Registry::get("config")->routes);
-        /**
-         * add a Rewrite route, then for a request uri: 
-         * http://example.com/product/list/22/foo
-         * will be matched by this route, and result:
-         *
-         *  [module] => 
-         *  [controller] => product
-         *  [action] => info
-         *  [method] => GET
-         *  [params:protected] => Array
-         *      (
-         *          [id] => 22
-         *          [name] => foo
-         *      )
-         * 
-         */
-        $route  = new Yaf_Route_Rewrite(
-            "/product/list/:id/:name",
-            array(
-                "controller" => "product",
-                "action"     => "info",
-            )
-        ); 
-        
-        $router->addRoute('dummy', $route);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::addConfig</methodname></member>
-   <member><classname>Yaf_Route_Static</classname></member>
-   <member><classname>Yaf_Route_Supervar</classname></member>
-   <member><classname>Yaf_Route_Simple</classname></member>
-   <member><classname>Yaf_Route_Regex</classname></member>
-   <member><classname>Yaf_Route_Rewrite</classname></member>
-   <member><classname>Yaf_Route_Map</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/yaf/yaf_router/construct.xml b/reference/yaf/yaf_router/construct.xml
deleted file mode 100644
index 7b3dbecb3af9..000000000000
--- a/reference/yaf/yaf_router/construct.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::__construct</refname>
-  <refpurpose>Yaf_Router constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier> <methodname>Yaf_Router::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Router::__construct</methodname> example</title>
-   <simpara>
-    In normal usage the router is not constructed manually, it is owned by
-    the dispatcher:
-   </simpara>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* in index.php or a plugin, obtain the router from the dispatcher */
-$router = Yaf_Dispatcher::getInstance()->getRouter();
-var_dump($router);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Yaf_Router)#4 (1) {
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Dispatcher::getRouter</methodname></member>
-   <member><methodname>Yaf_Router::addRoute</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/yaf/yaf_router/getcurrentroute.xml b/reference/yaf/yaf_router/getcurrentroute.xml
deleted file mode 100644
index 2d6a3adf5efa..000000000000
--- a/reference/yaf/yaf_router/getcurrentroute.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.getcurrentroute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::getCurrentRoute</refname>
-  <refpurpose>Get the effective route name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_Router::getCurrentRoute</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Get the name of the route which is effective in the route process.
-   <note>
-    <simpara>
-     You should call this method after the route process finished, since
-     before that, this method will always return &null;.
-    </simpara>
-   </note>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   String, the name of the effective route.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Register some routes in Bootstrap</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract{
-    public function _initConfig() {
-        $config = Yaf_Application::app()->getConfig();
-        Yaf_Registry::set("config", $config);
-    }
-
-    public function _initRoute(Yaf_Dispatcher $dispatcher) {
-        $router = $dispatcher->getRouter();
-        $rewrite_route  = new Yaf_Route_Rewrite(
-            "/product/list/:page",
-            array(
-                "controller" => "product",
-                "action"     => "list",
-            )
-        ); 
-
-        $regex_route  = new Yaf_Route_Rewrite(
-            "#^/product/info/(\d+)",
-            array(
-                "controller" => "product",
-                "action"     => "info",
-            )
-        ); 
-        
-        $router->addRoute('rewrite', $rewrite_route)->addRoute('regex', $regex_route);
-    } 
-
-    /**
-     * register plugin 
-     */
-    public function __initPlugins(Yaf_Dispatcher $dispatcher) {
-        $dispatcher->registerPlugin(new DummyPlugin());
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>plugin Dummy.php (under <link
-     linkend="configuration.yaf.directory">application.directory</link>/plugins)</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class DummyPlugin extends Yaf_Plugin_Abstract {
-    public function routerShutdown(Yaf_Request_Abstract $request, Yaf_Response_Abstract $response) {
-         var_dump(Yaf_Dispatcher::getInstance()->getRouter()->getCurrentRoute());
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* for http://yourdomain.com/product/list/1
- * DummyPlugin will output:
- */
-string(7) "rewrite"
-
-/* for http://yourdomain.com/product/info/34
- * DummyPlugin will output:
- */
-string(5) "regex"
-
-/* for other request URI
- * DummyPlugin will output:
- */
-string(8) "_default"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>Yaf_Bootstrap_Abstract</classname></member>
-   <member><classname>Yaf_Plugin_Abstract</classname></member>
-   <member><methodname>Yaf_Router::addRoute</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/yaf/yaf_router/getroute.xml b/reference/yaf/yaf_router/getroute.xml
deleted file mode 100644
index 1207bf4c926b..000000000000
--- a/reference/yaf/yaf_router/getroute.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.getroute" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::getRoute</refname>
-  <refpurpose>Retrieve a route by name</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Yaf_Route_Interface</type><methodname>Yaf_Router::getRoute</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Retrieve a route by name, see also
-   <methodname>Yaf_Router::getCurrentRoute</methodname>
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Router::getRoute</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRoutes(Yaf_Dispatcher $dispatcher)
-    {
-        $router = $dispatcher->getRouter();
-
-        $router->addRoute("rewrite", new Yaf_Route_Rewrite(
-            "/product/:id",
-            ["controller" => "product", "action" => "detail"]
-        ));
-
-        /* check what was registered under a given name */
-        var_dump($router->getRoute("rewrite"));
-
-        /* an unknown name returns NULL */
-        var_dump($router->getRoute("unknown"));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-object(Yaf_Route_Rewrite)#7 (0) {
-}
-NULL
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>Yaf_Bootstrap_Abstract</classname></member>
-   <member><classname>Yaf_Plugin_Abstract</classname></member>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Router::getCurrentRoute</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/yaf/yaf_router/getroutes.xml b/reference/yaf/yaf_router/getroutes.xml
deleted file mode 100644
index d90808895c24..000000000000
--- a/reference/yaf/yaf_router/getroutes.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.getroutes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yaf_Router::getRoutes</refname>
-  <refpurpose>Retrieve registered routes</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Router::getRoutes</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Retrieve registered routes
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Router::getRoutes</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRoutes(Yaf_Dispatcher $dispatcher)
-    {
-        $router = $dispatcher->getRouter();
-
-        $router->addRoute("rewrite", new Yaf_Route_Rewrite(
-            "/product/:id",
-            ["controller" => "product", "action" => "detail"]
-        ));
-
-        /* besides the custom one, the built-in "_default" route is
-           also part of the route table */
-        var_dump(array_keys($router->getRoutes()));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(2) {
-  [0]=>
-  string(8) "_default"
-  [1]=>
-  string(7) "rewrite"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::getRoute</methodname></member>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Dispatcher::getRouter</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/yaf/yaf_router/route.xml b/reference/yaf/yaf_router/route.xml
deleted file mode 100644
index e49c96113471..000000000000
--- a/reference/yaf/yaf_router/route.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-router.route" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Router::route</refname>
-<refpurpose>Route a request</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yaf_Router::route</methodname>
-   <methodparam><type>Yaf_Request_Abstract</type><parameter>request</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Route the request with the registered routes.</simpara>
-  <simpara>Routes are tried in reverse order of registration. The first route that claims the request wins; the request is then marked as routed (see <methodname>Yaf_Request_Abstract::setRouted</methodname>) and the name of the winning route is recorded, which can be retrieved via <methodname>Yaf_Router::getCurrentRoute</methodname>.</simpara>
-  <simpara>The default route, registered as <literal>_default</literal>, is <classname>Yaf_Route_Static</classname> unless a custom default route is configured.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>request</parameter></term>
-    <listitem>
-<simpara>The <classname>Yaf_Request_Abstract</classname> instance to route.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the request has been routed, or &false; if no route matched (e.g. a malformed URI), which makes the dispatcher stop.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Router::route</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initRoute(Yaf_Dispatcher $dispatcher)
-    {
-        $router = $dispatcher->getRouter();
-
-        $router->addRoute("rewrite", new Yaf_Route_Rewrite(
-            "/product/:id",
-            ["controller" => "product", "action" => "detail"]
-        ));
-
-        /* route a hand-built request, e.g. in a unit test */
-        $request = new Yaf_Request_Simple("CLI", null, "index.php",
-            "/product/123", null);
-
-        if ($router->route($request)) {
-            var_dump($router->getCurrentRoute());
-            var_dump($request->getControllerName());
-            var_dump($request->getActionName());
-            var_dump($request->getParam("id"));
-        } else {
-            /* no route matched */
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(7) "rewrite"
-string(7) "product"
-string(6) "detail"
-string(3) "123"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Router::addRoute</methodname></member>
-   <member><methodname>Yaf_Router::getCurrentRoute</methodname></member>
-   <member><methodname>Yaf_Dispatcher::dispatch</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/yaf/yaf_session/construct.xml b/reference/yaf/yaf_session/construct.xml
deleted file mode 100644
index 1313c48ee2aa..000000000000
--- a/reference/yaf/yaf_session/construct.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::__construct</refname>
-<refpurpose>Constructor of Yaf_Session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>private</modifier><methodname>Yaf_Session::__construct</methodname>
-   <void />
-  </constructorsynopsis>
-  <simpara>The constructor is private: <classname>Yaf_Session</classname> implements the singleton pattern and cannot be instantiated directly. Use <methodname>Yaf_Session::getInstance</methodname> to obtain the session instance.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// The constructor is private, so Yaf_Session cannot be
-// instantiated with "new". Access it through the singleton:
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-echo $session->get("user_id");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::getInstance</methodname></member>
-   <member><methodname>Yaf_Session::start</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/yaf/yaf_session/count.xml b/reference/yaf/yaf_session/count.xml
deleted file mode 100644
index d399e0c9ad08..000000000000
--- a/reference/yaf/yaf_session/count.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::count</refname>
-<refpurpose>Count session entries</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>Yaf_Session::count</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the number of entries in the session.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The number of session entries as an integer.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::count</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-$session->set("cart_items", 3);
-
-var_dump(count($session));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(2)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::has</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/yaf/yaf_session/current.xml b/reference/yaf/yaf_session/current.xml
deleted file mode 100644
index e7b99b2010fb..000000000000
--- a/reference/yaf/yaf_session/current.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.current" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::current</refname>
-<refpurpose>Get current session entry value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Session::current</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the value of the current session entry during iteration.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value of the current session entry.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::current</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-$session->set("is_vip", true);
-
-foreach ($session as $key => $value) {
-    // Yaf_Session::current() yields each value while iterating
-    echo "$key => ";
-    var_dump($value);
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-user_id => int(42)
-is_vip => bool(true)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::key</methodname></member>
-   <member><methodname>Yaf_Session::next</methodname></member>
-   <member><methodname>Yaf_Session::rewind</methodname></member>
-   <member><methodname>Yaf_Session::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_session/del.xml b/reference/yaf/yaf_session/del.xml
deleted file mode 100644
index 01e12b7033f0..000000000000
--- a/reference/yaf/yaf_session/del.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.del" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::del</refname>
-<refpurpose>Remove a session key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::del</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes a session key and its value.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to remove.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::del</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class VerifyController extends Yaf_Controller_Abstract
-{
-    public function captchaAction()
-    {
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        $expected = $session->get("captcha_code");
-
-        // one-time code: remove it right after use
-        $session->del("captcha_code");
-
-        if ($expected === null
-            || $this->getRequest()->getPost("code") !== $expected) {
-            echo "invalid captcha";
-        }
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::set</methodname></member>
-   <member><methodname>Yaf_Session::has</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/yaf/yaf_session/get.xml b/reference/yaf/yaf_session/get.xml
deleted file mode 100644
index 90b9af4b8fbf..000000000000
--- a/reference/yaf/yaf_session/get.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::get</refname>
-<refpurpose>Get a session value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Session::get</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a session value by name. If <parameter>name</parameter> is omitted or &null;, the entire session array is returned.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to retrieve, or &null; to get all session data.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The session value, or &null; if the key does not exist. When <parameter>name</parameter> is &null;, the full session array is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProfileController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        $userId = $session->get("user_id");
-        if ($userId === null) {
-            return $this->redirect("/account/login");
-        }
-
-        echo "welcome back, user #", $userId;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::set</methodname></member>
-   <member><methodname>Yaf_Session::has</methodname></member>
-   <member><methodname>Yaf_Session::del</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/yaf/yaf_session/getinstance.xml b/reference/yaf/yaf_session/getinstance.xml
deleted file mode 100644
index 61c17f6c5d2f..000000000000
--- a/reference/yaf/yaf_session/getinstance.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.getinstance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::getInstance</refname>
-<refpurpose>Get the session singleton</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <modifier>static</modifier> <type>Yaf_Session</type><methodname>Yaf_Session::getInstance</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the singleton <classname>Yaf_Session</classname> instance, creating it if necessary. The session is started automatically on first access.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The <classname>Yaf_Session</classname> singleton instance, or &null; if the session could not be started.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::getInstance</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-$session->set("user_id", 42);
-
-// ... later, elsewhere in the application
-$same = Yaf_Session::getInstance();
-
-var_dump($same === $session);
-var_dump($same->get("user_id"));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-int(42)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::start</methodname></member>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::set</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/yaf/yaf_session/has.xml b/reference/yaf/yaf_session/has.xml
deleted file mode 100644
index e490fb4b9859..000000000000
--- a/reference/yaf/yaf_session/has.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.has" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::has</refname>
-<refpurpose>Check if a session key exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::has</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a session key exists.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::has</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class BaseController extends Yaf_Controller_Abstract
-{
-    public function requireLogin()
-    {
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        if (!$session->has("user_id")) {
-            $this->redirect("/account/login");
-            return false;
-        }
-
-        return true;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::set</methodname></member>
-   <member><methodname>Yaf_Session::del</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/yaf/yaf_session/isset.xml b/reference/yaf/yaf_session/isset.xml
deleted file mode 100644
index 98783d84c121..000000000000
--- a/reference/yaf/yaf_session/isset.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::__isset</refname>
-<refpurpose>Check if a session key exists</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::__isset</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a session key exists. This method is an alias of <methodname>Yaf_Session::has</methodname> and is called when <literal>isset()</literal> is used on a session object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::__isset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->user_id = 42;
-
-var_dump(isset($session->user_id));
-var_dump(isset($session->user_name));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::has</methodname></member>
-   <member><methodname>Yaf_Session::get</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/yaf/yaf_session/key.xml b/reference/yaf/yaf_session/key.xml
deleted file mode 100644
index f70ba13d72f2..000000000000
--- a/reference/yaf/yaf_session/key.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.key" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::key</refname>
-<refpurpose>Get current session entry key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Session::key</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Returns the key of the current session entry during iteration.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The key of the current session entry.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::key</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-$session->set("lang", "en");
-
-for ($session->rewind(); $session->valid(); $session->next()) {
-    echo $session->key(), " => ", var_export($session->current(), true), PHP_EOL;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-user_id => 42
-lang => 'en'
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::current</methodname></member>
-   <member><methodname>Yaf_Session::next</methodname></member>
-   <member><methodname>Yaf_Session::rewind</methodname></member>
-   <member><methodname>Yaf_Session::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_session/next.xml b/reference/yaf/yaf_session/next.xml
deleted file mode 100644
index db836d5b15e8..000000000000
--- a/reference/yaf/yaf_session/next.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::next</refname>
-<refpurpose>Advance to next session entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Session::next</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Moves the internal iterator to the next session entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::next</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-$session->set("lang", "en");
-
-$session->rewind();
-echo $session->key(), PHP_EOL;
-
-$session->next();
-echo $session->key(), PHP_EOL;
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-user_id
-lang
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::current</methodname></member>
-   <member><methodname>Yaf_Session::key</methodname></member>
-   <member><methodname>Yaf_Session::rewind</methodname></member>
-   <member><methodname>Yaf_Session::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_session/offsetexists.xml b/reference/yaf/yaf_session/offsetexists.xml
deleted file mode 100644
index 272be8986d6b..000000000000
--- a/reference/yaf/yaf_session/offsetexists.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.offsetexists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::offsetExists</refname>
-<refpurpose>Check if a session key exists (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::offsetExists</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a session key exists. This method is an alias of <methodname>Yaf_Session::has</methodname> and is called when <literal>isset()</literal> is used with array syntax.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the key exists, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::offsetExists</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session["user_id"] = 42;
-
-var_dump(isset($session["user_id"]));
-var_dump(isset($session["user_name"]));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::has</methodname></member>
-   <member><methodname>Yaf_Session::offsetGet</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/yaf/yaf_session/offsetget.xml b/reference/yaf/yaf_session/offsetget.xml
deleted file mode 100644
index 9a6b8cc1f52b..000000000000
--- a/reference/yaf/yaf_session/offsetget.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.offsetget" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::offsetGet</refname>
-<refpurpose>Get a session value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_Session::offsetGet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Retrieves a session value by key. This method is an alias of <methodname>Yaf_Session::get</methodname> and is called when array syntax is used to read a session object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to retrieve.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The session value, or &null; if the key does not exist.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::offsetGet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        // reading with array syntax calls offsetGet()
-        $userId = $session["user_id"];
-        if ($userId === null) {
-            return $this->redirect("/account/login");
-        }
-
-        echo "logged in as user #", $userId;
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::offsetSet</methodname></member>
-   <member><methodname>Yaf_Session::offsetUnset</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/yaf/yaf_session/offsetset.xml b/reference/yaf/yaf_session/offsetset.xml
deleted file mode 100644
index afba0f1f78db..000000000000
--- a/reference/yaf/yaf_session/offsetset.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.offsetset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::offsetSet</refname>
-<refpurpose>Set a session value (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Session::offsetSet</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets a session value. This method is called when array syntax is used to write to a session object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to store.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::offsetSet</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class LoginController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // ... verify the credentials against the database
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        // writing with array syntax calls offsetSet()
-        $session["user_id"] = $user->getId();
-        $session["login_time"] = time();
-
-        return $this->redirect("/dashboard");
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::set</methodname></member>
-   <member><methodname>Yaf_Session::offsetGet</methodname></member>
-   <member><methodname>Yaf_Session::offsetUnset</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/yaf/yaf_session/offsetunset.xml b/reference/yaf/yaf_session/offsetunset.xml
deleted file mode 100644
index e31ae852de09..000000000000
--- a/reference/yaf/yaf_session/offsetunset.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.offsetunset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::offsetUnset</refname>
-<refpurpose>Remove a session key (ArrayAccess)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Session::offsetUnset</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes a session key and its value. This method is called when <literal>unset()</literal> is used with array syntax on a session object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to remove.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::offsetUnset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session["captcha_code"] = "8X2Q";
-
-// ... after verifying the captcha, drop the one-time code
-unset($session["captcha_code"]);
-
-var_dump(isset($session["captcha_code"]));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::del</methodname></member>
-   <member><methodname>Yaf_Session::offsetGet</methodname></member>
-   <member><methodname>Yaf_Session::offsetSet</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/yaf/yaf_session/rewind.xml b/reference/yaf/yaf_session/rewind.xml
deleted file mode 100644
index 86d7988a6fdf..000000000000
--- a/reference/yaf/yaf_session/rewind.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::rewind</refname>
-<refpurpose>Reset session iterator to first entry</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Session::rewind</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Rewinds the internal iterator to the first session entry.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::rewind</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-$session->set("lang", "en");
-
-foreach ($session as $key => $value) {
-    echo "$key => $value", PHP_EOL;
-}
-
-// a new foreach implicitly calls rewind() again
-foreach ($session as $key => $value) {
-    echo "$key => $value", PHP_EOL;
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-user_id => 42
-lang => en
-user_id => 42
-lang => en
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::current</methodname></member>
-   <member><methodname>Yaf_Session::key</methodname></member>
-   <member><methodname>Yaf_Session::next</methodname></member>
-   <member><methodname>Yaf_Session::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_session/set.xml b/reference/yaf/yaf_session/set.xml
deleted file mode 100644
index 5ec443a8604e..000000000000
--- a/reference/yaf/yaf_session/set.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::set</refname>
-<refpurpose>Set a session value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets a session value.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to set.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to store.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class LoginController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        // ... verify the credentials against the database
-        $session = Yaf_Session::getInstance();
-        $session->start();
-
-        $session->set("user_id", $user->getId());
-        $session->set("login_time", time());
-
-        return $this->redirect("/dashboard");
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::get</methodname></member>
-   <member><methodname>Yaf_Session::has</methodname></member>
-   <member><methodname>Yaf_Session::del</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/yaf/yaf_session/start.xml b/reference/yaf/yaf_session/start.xml
deleted file mode 100644
index 39f3199b3da5..000000000000
--- a/reference/yaf/yaf_session/start.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.start" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::start</refname>
-<refpurpose>Start the session</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Yaf_Session</type><methodname>Yaf_Session::start</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Starts the session if it has not been started yet. This calls PHP's native session start mechanism. Calling this method multiple times is safe.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the <classname>Yaf_Session</classname> instance.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::start</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-// typically done once per request, e.g. in a bootstrap
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-echo $session->get("user_id");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::getInstance</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/yaf/yaf_session/unset.xml b/reference/yaf/yaf_session/unset.xml
deleted file mode 100644
index 7ac0196b8336..000000000000
--- a/reference/yaf/yaf_session/unset.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.unset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::__unset</refname>
-<refpurpose>Remove a session key</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_Session::__unset</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Removes a session key and its value. This method is called when <literal>unset()</literal> is used on a session object property.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The session key to remove.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::__unset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->user_id = 42;
-
-// ... when the user logs out
-unset($session->user_id);
-
-var_dump(isset($session->user_id));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::del</methodname></member>
-   <member><methodname>Yaf_Session::offsetUnset</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/yaf/yaf_session/valid.xml b/reference/yaf/yaf_session/valid.xml
deleted file mode 100644
index 92a4bd7b107a..000000000000
--- a/reference/yaf/yaf_session/valid.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-session.valid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_Session::valid</refname>
-<refpurpose>Check if current session position is valid</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_Session::valid</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Checks whether the current session iterator position is valid.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if the current position is valid, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_Session::valid</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$session = Yaf_Session::getInstance();
-$session->start();
-
-$session->set("user_id", 42);
-
-$session->rewind();
-var_dump($session->valid());
-
-$session->next();
-// past the last entry, the position is no longer valid
-var_dump($session->valid());
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_Session::current</methodname></member>
-   <member><methodname>Yaf_Session::key</methodname></member>
-   <member><methodname>Yaf_Session::next</methodname></member>
-   <member><methodname>Yaf_Session::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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaf/yaf_view_interface/assign.xml b/reference/yaf/yaf_view_interface/assign.xml
deleted file mode 100644
index 6e83a921c741..000000000000
--- a/reference/yaf/yaf_view_interface/assign.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-interface.assign" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Interface::assign</refname>
-<refpurpose>Assign a variable to the view</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Interface::assign</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>value</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Assigns a variable to the view. Assigned variables are available to the template under their names.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name under which the variable becomes available to the template.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The return value is defined by the concrete implementation. <classname>Yaf_View_Simple</classname>, the default view engine, returns the view instance.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Interface::assign</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyView implements Yaf_View_Interface
-{
-    private $tpl_dir;
-    private $vars = array();
-
-    public function __construct($template_dir, $options = null)
-    {
-        $this->tpl_dir = $template_dir;
-    }
-
-    public function assign($name, $value = null)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
-
-    public function display($tpl, $tpl_vars = null)
-    {
-        echo $this->render($tpl, $tpl_vars);
-        return true;
-    }
-
-    public function render($tpl, $tpl_vars = null)
-    {
-        extract($this->vars);
-        if ($tpl_vars !== null) {
-            extract($tpl_vars);
-        }
-        ob_start();
-        include $this->tpl_dir . "/" . $tpl;
-        return ob_get_clean();
-    }
-
-    public function setScriptPath($template_dir)
-    {
-        $this->tpl_dir = $template_dir;
-        return $this;
-    }
-
-    public function getScriptPath()
-    {
-        return $this->tpl_dir;
-    }
-}
-
-/* plug the custom view engine into the dispatcher in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initView(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->setView(new MyView(APPLICATION_PATH . "/views"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Interface::display</methodname></member>
-   <member><methodname>Yaf_View_Interface::render</methodname></member>
-   <member><methodname>Yaf_View_Interface::setScriptPath</methodname></member>
-   <member><methodname>Yaf_View_Interface::getScriptPath</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/yaf/yaf_view_interface/display.xml b/reference/yaf/yaf_view_interface/display.xml
deleted file mode 100644
index 57baf2f195d5..000000000000
--- a/reference/yaf/yaf_view_interface/display.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-interface.display" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Interface::display</refname>
-<refpurpose>Render and emit a template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Interface::display</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tpl_vars</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Renders a template and emits the result directly to the output.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-<simpara>The path to the template, relative to the template directory.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>tpl_vars</parameter></term>
-    <listitem>
-<simpara>Optional variables to assign for this template only; they override assigned variables with the same name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Interface::display</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyView implements Yaf_View_Interface
-{
-    private $tpl_dir;
-    private $vars = array();
-
-    public function __construct($template_dir, $options = null)
-    {
-        $this->tpl_dir = $template_dir;
-    }
-
-    public function assign($name, $value = null)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
-
-    public function display($tpl, $tpl_vars = null)
-    {
-        echo $this->render($tpl, $tpl_vars);
-        return true;
-    }
-
-    public function render($tpl, $tpl_vars = null)
-    {
-        extract($this->vars);
-        if ($tpl_vars !== null) {
-            extract($tpl_vars);
-        }
-        ob_start();
-        include $this->tpl_dir . "/" . $tpl;
-        return ob_get_clean();
-    }
-
-    public function setScriptPath($template_dir)
-    {
-        $this->tpl_dir = $template_dir;
-        return $this;
-    }
-
-    public function getScriptPath()
-    {
-        return $this->tpl_dir;
-    }
-}
-
-/* plug the custom view engine into the dispatcher in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initView(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->setView(new MyView(APPLICATION_PATH . "/views"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Interface::render</methodname></member>
-   <member><methodname>Yaf_View_Interface::assign</methodname></member>
-   <member><methodname>Yaf_View_Interface::setScriptPath</methodname></member>
-   <member><methodname>Yaf_View_Interface::getScriptPath</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/yaf/yaf_view_interface/getscriptpath.xml b/reference/yaf/yaf_view_interface/getscriptpath.xml
deleted file mode 100644
index 665ca773c610..000000000000
--- a/reference/yaf/yaf_view_interface/getscriptpath.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-interface.getscriptpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Interface::getScriptPath</refname>
-<refpurpose>Get the template directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Yaf_View_Interface::getScriptPath</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Gets the directory in which templates are looked up.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The template directory as a string, or &null; if it has not been set yet.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Interface::getScriptPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyView implements Yaf_View_Interface
-{
-    private $tpl_dir;
-    private $vars = array();
-
-    public function __construct($template_dir, $options = null)
-    {
-        $this->tpl_dir = $template_dir;
-    }
-
-    public function assign($name, $value = null)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
-
-    public function display($tpl, $tpl_vars = null)
-    {
-        echo $this->render($tpl, $tpl_vars);
-        return true;
-    }
-
-    public function render($tpl, $tpl_vars = null)
-    {
-        extract($this->vars);
-        if ($tpl_vars !== null) {
-            extract($tpl_vars);
-        }
-        ob_start();
-        include $this->tpl_dir . "/" . $tpl;
-        return ob_get_clean();
-    }
-
-    public function setScriptPath($template_dir)
-    {
-        $this->tpl_dir = $template_dir;
-        return $this;
-    }
-
-    public function getScriptPath()
-    {
-        return $this->tpl_dir;
-    }
-}
-
-/* plug the custom view engine into the dispatcher in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initView(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->setView(new MyView(APPLICATION_PATH . "/views"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Interface::setScriptPath</methodname></member>
-   <member><methodname>Yaf_View_Interface::render</methodname></member>
-   <member><methodname>Yaf_View_Interface::display</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/yaf/yaf_view_interface/render.xml b/reference/yaf/yaf_view_interface/render.xml
deleted file mode 100644
index 0b1a387f0b49..000000000000
--- a/reference/yaf/yaf_view_interface/render.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-interface.render" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Interface::render</refname>
-<refpurpose>Render a template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>string</type><methodname>Yaf_View_Interface::render</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>tpl_vars</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Renders a template and returns the result as a string instead of emitting it.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-<simpara>The path to the template, relative to the template directory.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>tpl_vars</parameter></term>
-    <listitem>
-<simpara>Optional variables to assign for this template only; they override assigned variables with the same name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The rendered result as a string, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Interface::render</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyView implements Yaf_View_Interface
-{
-    private $tpl_dir;
-    private $vars = array();
-
-    public function __construct($template_dir, $options = null)
-    {
-        $this->tpl_dir = $template_dir;
-    }
-
-    public function assign($name, $value = null)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
-
-    public function display($tpl, $tpl_vars = null)
-    {
-        echo $this->render($tpl, $tpl_vars);
-        return true;
-    }
-
-    public function render($tpl, $tpl_vars = null)
-    {
-        extract($this->vars);
-        if ($tpl_vars !== null) {
-            extract($tpl_vars);
-        }
-        ob_start();
-        include $this->tpl_dir . "/" . $tpl;
-        return ob_get_clean();
-    }
-
-    public function setScriptPath($template_dir)
-    {
-        $this->tpl_dir = $template_dir;
-        return $this;
-    }
-
-    public function getScriptPath()
-    {
-        return $this->tpl_dir;
-    }
-}
-
-/* plug the custom view engine into the dispatcher in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initView(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->setView(new MyView(APPLICATION_PATH . "/views"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Interface::display</methodname></member>
-   <member><methodname>Yaf_View_Interface::assign</methodname></member>
-   <member><methodname>Yaf_View_Interface::setScriptPath</methodname></member>
-   <member><methodname>Yaf_View_Interface::getScriptPath</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/yaf/yaf_view_interface/setscriptpath.xml b/reference/yaf/yaf_view_interface/setscriptpath.xml
deleted file mode 100644
index f12c5150b2d5..000000000000
--- a/reference/yaf/yaf_view_interface/setscriptpath.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-interface.setscriptpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Interface::setScriptPath</refname>
-<refpurpose>Set the template directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>Yaf_View_Interface</type><methodname>Yaf_View_Interface::setScriptPath</methodname>
-   <methodparam><type>string</type><parameter>template_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets the directory in which templates are looked up.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>template_dir</parameter></term>
-    <listitem>
-<simpara>The directory where the template scripts are stored.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the view instance, or &false; if <parameter>template_dir</parameter> is not an absolute path.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Interface::setScriptPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class MyView implements Yaf_View_Interface
-{
-    private $tpl_dir;
-    private $vars = array();
-
-    public function __construct($template_dir, $options = null)
-    {
-        $this->tpl_dir = $template_dir;
-    }
-
-    public function assign($name, $value = null)
-    {
-        $this->vars[$name] = $value;
-        return true;
-    }
-
-    public function display($tpl, $tpl_vars = null)
-    {
-        echo $this->render($tpl, $tpl_vars);
-        return true;
-    }
-
-    public function render($tpl, $tpl_vars = null)
-    {
-        extract($this->vars);
-        if ($tpl_vars !== null) {
-            extract($tpl_vars);
-        }
-        ob_start();
-        include $this->tpl_dir . "/" . $tpl;
-        return ob_get_clean();
-    }
-
-    public function setScriptPath($template_dir)
-    {
-        $this->tpl_dir = $template_dir;
-        return $this;
-    }
-
-    public function getScriptPath()
-    {
-        return $this->tpl_dir;
-    }
-}
-
-/* plug the custom view engine into the dispatcher in the bootstrap */
-class Bootstrap extends Yaf_Bootstrap_Abstract
-{
-    public function _initView(Yaf_Dispatcher $dispatcher)
-    {
-        $dispatcher->setView(new MyView(APPLICATION_PATH . "/views"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Interface::getScriptPath</methodname></member>
-   <member><methodname>Yaf_View_Interface::render</methodname></member>
-   <member><methodname>Yaf_View_Interface::display</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/yaf/yaf_view_simple/assign.xml b/reference/yaf/yaf_view_simple/assign.xml
deleted file mode 100644
index c794ac877f74..000000000000
--- a/reference/yaf/yaf_view_simple/assign.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.assign" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::assign</refname>
-<refpurpose>Assign a variable to the view</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Simple::assign</methodname>
-   <methodparam><type>mixed</type><parameter>name</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>value</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Assigns a variable to the view. Assigned variables are available to the template under their names.
-   When called with a single array argument, every key/value pair is assigned, with the keys becoming the variable names.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name under which the variable becomes available to the template, or an array of variables to assign.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::assign</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $this->getView()->assign("foo", "bar");
-        $this->_view->assign(array("key" => "value", "name" => "value"));
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Template example</title>
-   <programlisting role="php">
-<![CDATA[
-<html>
- <head>
-  <title><?php echo $foo; ?></title>
- </head>
- <body>
-  <?php
-    foreach ($this->_tpl_vars as $name => $value) {
-        echo $$name; // or echo $this->_tpl_vars[$name];
-    }
-  ?>
- </body>
-</html>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assignRef</methodname></member>
-   <member><methodname>Yaf_View_Simple::clear</methodname></member>
-   <member><methodname>Yaf_View_Simple::get</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/yaf/yaf_view_simple/assignref.xml b/reference/yaf/yaf_view_simple/assignref.xml
deleted file mode 100644
index 8f4b32b94da7..000000000000
--- a/reference/yaf/yaf_view_simple/assignref.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.assignref" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::assignRef</refname>
-<refpurpose>Alias of Yaf_View_Simple::assign</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Simple::assignRef</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Assigns a variable to the view by reference. Unlike <methodname>Yaf_View_Simple::assign</methodname>, the value is passed by reference, so later changes to the caller's variable become visible to the template.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name under which the variable becomes available to the template.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::assignRef</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $value = "bar";
-        $this->getView()->assignRef("foo", $value);
-
-        /* later changes to $value are visible in the template,
-         * because the variable was assigned by reference */
-        $value = "changed";
-
-        //prevent the auto-render
-        Yaf_Dispatcher::getInstance()->autoRender(false);
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Template example</title>
-   <programlisting role="php">
-<![CDATA[
-<html>
- <head>
-  <title><?php echo $foo; ?></title>
- </head>
- <body>
- </body>
-</html>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/* accessing the index controller will result: */
-changed
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assign</methodname></member>
-   <member><methodname>Yaf_View_Simple::clear</methodname></member>
-   <member><methodname>Yaf_View_Simple::get</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/yaf/yaf_view_simple/clear.xml b/reference/yaf/yaf_view_simple/clear.xml
deleted file mode 100644
index 81d1842f328e..000000000000
--- a/reference/yaf/yaf_view_simple/clear.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::clear</refname>
-<refpurpose>Remove an assigned variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Simple::clear</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Removes an assigned variable from the view.
-   When called without an argument, all assigned variables are removed.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the variable to remove, or omitted/&null; to remove all assigned variables.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true;.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::clear</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $this->getView()->clear("foo")->clear("bar"); // clear "foo" and "bar"
-        $this->_view->clear(); // clear all assigned variables
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assign</methodname></member>
-   <member><methodname>Yaf_View_Simple::get</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/yaf/yaf_view_simple/construct.xml b/reference/yaf/yaf_view_simple/construct.xml
deleted file mode 100644
index a749d8c2f857..000000000000
--- a/reference/yaf/yaf_view_simple/construct.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::__construct</refname>
-<refpurpose>Constructor of Yaf_View_Simple</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis>
-   <modifier>public</modifier><methodname>Yaf_View_Simple::__construct</methodname>
-   <methodparam><type>string</type><parameter>template_dir</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>options</parameter><initializer>NULL</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara><classname>Yaf_View_Simple</classname> is the default and only view engine Yaf supports out of the box. An instance is created automatically by the <classname>Yaf_Dispatcher</classname> when the application starts; instantiating it directly is only needed to render templates outside of the dispatch flow.</simpara>
-  <simpara>The <parameter>template_dir</parameter> argument must point to an existing directory containing the view scripts; it becomes the script path of the view and can later be changed with <methodname>Yaf_View_Simple::setScriptPath</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>template_dir</parameter></term>
-    <listitem>
-<simpara>The directory where the template scripts are stored.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-<simpara>Optional view options as an array. Reserved for custom view engine implementations; the built-in engine accepts but does not use it.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-define("TEMPLATE_DIRECTORY", APPLICATION_PATH . '/views');
-$view = new Yaf_View_Simple(TEMPLATE_DIRECTORY);
-$view->assign("name", "world");
-echo $view->render("greeting.phtml");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::render</methodname></member>
-   <member><methodname>Yaf_View_Simple::display</methodname></member>
-   <member><methodname>Yaf_View_Simple::setScriptPath</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/yaf/yaf_view_simple/display.xml b/reference/yaf/yaf_view_simple/display.xml
deleted file mode 100644
index 898c5afb9841..000000000000
--- a/reference/yaf/yaf_view_simple/display.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.display" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::display</refname>
-<refpurpose>Render and store a template in the response</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Simple::display</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>vars</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Renders a template and appends the result to the <classname>Yaf_Response_Abstract</classname> body.</simpara>
-   <note>
-   <simpara>Unlike <methodname>Yaf_View_Simple::render</methodname>, the result is not returned but stored in the response, and <classname>Yaf_Application</classname> sends it when the response is emitted.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-<simpara>The path to the template, relative to the template directory set by <methodname>Yaf_View_Simple::setScriptPath</methodname> or <literal>application.view.directory</literal>.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vars</parameter></term>
-    <listitem>
-<simpara>Optional variables to assign for this template only; they override assigned variables with the same name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; on success, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::display</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $this->getView()->assign("title", "My Homepage");
-
-        /* render index/index.phtml and store the result
-         * in the response body */
-        $this->getView()->display("index/index.phtml");
-
-        return false; // we rendered ourselves, skip auto-rendering
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Template example</title>
-   <programlisting role="php">
-<![CDATA[
-<html>
- <head>
-  <title><?php echo $title; ?></title>
- </head>
-</html>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::render</methodname></member>
-   <member><methodname>Yaf_View_Simple::assign</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/yaf/yaf_view_simple/eval.xml b/reference/yaf/yaf_view_simple/eval.xml
deleted file mode 100644
index aa9674994d9d..000000000000
--- a/reference/yaf/yaf_view_simple/eval.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.eval" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::eval</refname>
-<refpurpose>Render a template string</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_View_Simple::eval</methodname>
-   <methodparam><type>string</type><parameter>tpl_content</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>vars</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Renders a template given as a string and returns the result.</simpara>
-   <note>
-   <simpara>Since no template file is involved, the template directory is not consulted.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl_content</parameter></term>
-    <listitem>
-<simpara>The template content as a string.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vars</parameter></term>
-    <listitem>
-<simpara>Optional variables to assign for this render; they override assigned variables with the same name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The rendered result as a string, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::eval</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $template = "<h1><?php echo htmlspecialchars($title); ?></h1>";
-
-        /* render the template string without touching the filesystem */
-        $html = $this->getView()->eval($template, array("title" => "Breaking News"));
-
-        $this->getResponse()->setBody($html);
-        return false; // skip auto-rendering
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-<h1>Breaking News</h1>]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::render</methodname></member>
-   <member><methodname>Yaf_View_Simple::display</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/yaf/yaf_view_simple/get.xml b/reference/yaf/yaf_view_simple/get.xml
deleted file mode 100644
index 9be4ce9f0801..000000000000
--- a/reference/yaf/yaf_view_simple/get.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::get</refname>
-<refpurpose>Get an assigned variable</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>Yaf_View_Simple::get</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>name</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Gets a variable previously assigned to the view.
-   When called without an argument, all assigned variables are returned.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the variable to retrieve, or omitted/&null; to retrieve all assigned variables.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The value assigned under <parameter>name</parameter>, or &null; if there is no variable with that name. When called without an argument, an array of all assigned variables is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::get</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $view = $this->getView();
-        $view->assign("foo", "bar");
-
-        var_dump($view->get("foo"));
-        var_dump($view->get()); // all assigned variables
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(3) "bar"
-array(1) {
-  ["foo"]=>
-  string(3) "bar"
-}]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assign</methodname></member>
-   <member><methodname>Yaf_View_Simple::clear</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/yaf/yaf_view_simple/getscriptpath.xml b/reference/yaf/yaf_view_simple/getscriptpath.xml
deleted file mode 100644
index fd7190331e2e..000000000000
--- a/reference/yaf/yaf_view_simple/getscriptpath.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.getscriptpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::getScriptPath</refname>
-<refpurpose>Get the template directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_View_Simple::getScriptPath</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>Gets the directory in which templates are looked up.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The template directory as a string, or &null; if it has not been set yet.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::getScriptPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        /* the directory in which templates are looked up,
-         * usually application.view.directory */
-        echo $this->getView()->getScriptPath();
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-/var/www/html/application/views]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::setScriptPath</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/yaf/yaf_view_simple/isset.xml b/reference/yaf/yaf_view_simple/isset.xml
deleted file mode 100644
index ecc0ade1c2c5..000000000000
--- a/reference/yaf/yaf_view_simple/isset.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.isset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::__isset</refname>
-<refpurpose>Check whether a variable is assigned</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>Yaf_View_Simple::__isset</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Checks whether a variable is assigned to the view. This method is called when <literal>isset()</literal> is used on a view object.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name of the variable to check.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns &true; if a variable is assigned under <parameter>name</parameter>, &false; otherwise.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::__isset</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $view = $this->getView();
-        $view->assign("title", "Welcome");
-
-        var_dump(isset($view->title));
-        var_dump(isset($view->unknown));
-    }
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-bool(true)
-bool(false)]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assign</methodname></member>
-   <member><methodname>Yaf_View_Simple::get</methodname></member>
-   <member><methodname>Yaf_View_Simple::clear</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/yaf/yaf_view_simple/render.xml b/reference/yaf/yaf_view_simple/render.xml
deleted file mode 100644
index bd850e64e7ae..000000000000
--- a/reference/yaf/yaf_view_simple/render.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.render" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::render</refname>
-<refpurpose>Render a template</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>Yaf_View_Simple::render</methodname>
-   <methodparam><type>string</type><parameter>tpl</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>vars</parameter><initializer>NULL</initializer></methodparam>
-  </methodsynopsis>
-  <simpara>Renders a template and returns the result as a string. The template is included as a plain PHP script, so any PHP code in it is executed, and assigned variables are available under their names.</simpara>
-   <note>
-   <simpara>Unlike <methodname>Yaf_View_Simple::display</methodname>, the result is returned instead of being appended to the <classname>Yaf_Response_Abstract</classname> body.</simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>tpl</parameter></term>
-    <listitem>
-<simpara>The path to the template, relative to the template directory set by <methodname>Yaf_View_Simple::setScriptPath</methodname> or <literal>application.view.directory</literal>.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>vars</parameter></term>
-    <listitem>
-<simpara>Optional variables to assign for this render; they override assigned variables with the same name.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>The rendered result as a string, or &false; on failure.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::render</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class ProductController extends Yaf_Controller_Abstract
-{
-    public function detailAction()
-    {
-        /* render the template and post-process the result */
-        $html = $this->getView()->render("product/detail.phtml", array(
-            "name"  => "Yaf in Action",
-            "price" => "29.90",
-        ));
-
-        $this->getResponse()->setBody($html);
-        return false; // skip auto-rendering
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Template example</title>
-   <programlisting role="php">
-<![CDATA[
-<h1><?php echo $name; ?></h1>
-<p>Price: <?php echo $price; ?> EUR</p>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-<h1>Yaf in Action</h1>
-<p>Price: 29.90 EUR</p>]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::display</methodname></member>
-   <member><methodname>Yaf_View_Simple::eval</methodname></member>
-   <member><methodname>Yaf_View_Simple::assign</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/yaf/yaf_view_simple/set.xml b/reference/yaf/yaf_view_simple/set.xml
deleted file mode 100644
index 93264ea8ce81..000000000000
--- a/reference/yaf/yaf_view_simple/set.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::__set</refname>
-<refpurpose>Assign a variable via property write</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>Yaf_View_Simple::__set</methodname>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Assigns a variable to the view. This method is called when writing to a property of a view object, and behaves the same as <methodname>Yaf_View_Simple::assign</methodname>.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-<simpara>The name under which the variable becomes available to the template.</simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-<simpara>The value to assign.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>No value is returned.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::__set</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        $this->getView()->foo = "bar"; // same as assign("foo", "bar");
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::assign</methodname></member>
-   <member><methodname>Yaf_View_Simple::get</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/yaf/yaf_view_simple/setscriptpath.xml b/reference/yaf/yaf_view_simple/setscriptpath.xml
deleted file mode 100644
index 40f657ee1cc7..000000000000
--- a/reference/yaf/yaf_view_simple/setscriptpath.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yaf-view-simple.setscriptpath" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-<refname>Yaf_View_Simple::setScriptPath</refname>
-<refpurpose>Set the template directory</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>Yaf_View_Simple</type><methodname>Yaf_View_Simple::setScriptPath</methodname>
-   <methodparam><type>string</type><parameter>template_dir</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>Sets the directory in which templates are looked up.</simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>template_dir</parameter></term>
-    <listitem>
-<simpara>The directory where the template scripts are stored.</simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-<simpara>Returns the view instance, or &false; if <parameter>template_dir</parameter> is not an absolute path.</simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yaf_View_Simple::setScriptPath</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class IndexController extends Yaf_Controller_Abstract
-{
-    public function indexAction()
-    {
-        /* render templates from another directory */
-        $this->getView()->setScriptPath(APPLICATION_PATH . "/modules/admin/views");
-
-        $this->getView()->display("dashboard/index.phtml");
-
-        return false; // we rendered ourselves, skip auto-rendering
-    }
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yaf_View_Simple::getScriptPath</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/yaml/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yaml/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yaml/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yaml/book.xml b/reference/yaml/book.xml
deleted file mode 100644
index da77f301f0f1..000000000000
--- a/reference/yaml/book.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.yaml">
-  &reftitle.intro;
-  <para>
-   This extension implements the <link xlink:href="&url.yaml;">YAML Ain't
-   Markup Language (YAML)</link> data serialization standard. Parsing and
-   emiting are handled by the <link xlink:href="&url.yaml.libyaml;">LibYAML
-   library</link>.
-  </para>
- </preface>
- <!-- }}} -->
-
- &reference.yaml.setup;
- &reference.yaml.constants;
- &reference.yaml.examples;
- &reference.yaml.callbacks;
- &reference.yaml.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/yaml/callbacks.xml b/reference/yaml/callbacks.xml
deleted file mode 100644
index 17dc0ffbf96d..000000000000
--- a/reference/yaml/callbacks.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ --> 
-
-<chapter xml:id="yaml.callbacks" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Callbacks</title>
-
- <section xml:id="yaml.callbacks.parse">
-  <title>Parse callbacks</title>
-  <para>
-   Parse <type>callable</type>s are invoked by
-   <function>yaml_parse</function>, <function>yaml_parse_file</function> or
-   <function>yaml_parse_url</function> functions when a registered YAML tag is
-   encountered. The callback is passed the tagged entity's value, the tag, and
-   flags indicating the scalar entity style. The callback must return the data
-   that the YAML parser should emit for this entity.
-  </para>
-  <example>
-   <title>Parse callback example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/**
- * Parsing callback for yaml tag.
- * @param mixed $value Data from yaml file
- * @param string $tag Tag that triggered callback
- * @param int $flags Scalar entity style (see YAML_*_SCALAR_STYLE)
- * @return mixed Value that YAML parser should emit for the given value
- */
-function tag_callback ($value, $tag, $flags) {
-  var_dump(func_get_args()); // debugging
-  return "Hello {$value}";
-}
-
-$yaml = <<<YAML
-greeting: !example/hello World
-YAML;
-
-$result = yaml_parse($yaml, 0, $ndocs, array(
-    '!example/hello' => 'tag_callback',
-  ));
-
-var_dump($result);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-array(3) {
-  [0]=>
-  string(5) "World"
-  [1]=>
-  string(14) "!example/hello"
-  [2]=>
-  int(1)
-}
-array(1) {
-  ["greeting"]=>
-  string(11) "Hello World"
-}
-]]>
-   </screen>
-  </example>
- </section>
-
- <section xml:id="yaml.callbacks.emit">
-  <title>Emit callbacks</title>
-  <para>
-   Emit callbacks are invoked when an instance of a registered class is
-   emitted by <function>yaml_emit</function> or
-   <function>yaml_emit_file</function>. The callback is passed the object to
-   be emitted. The callback must return an array having two keys:
-   &quot;<literal>tag</literal>&quot; and &quot;<literal>data</literal>&quot;.
-   The value associated with the &quot;<literal>tag</literal>&quot; key must
-   be a string to be used as the YAML tag in the output. The value associated
-   with the &quot;<literal>data</literal>&quot; key will be encoded as YAML
-   and emitted in place of the intercepted object.
-  </para>
-  <example>
-   <title>Emit callback example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class EmitExample {
-  public $data;    // data may be in any pecl/yaml suitable type
-
-  public function __construct ($d) {
-    $this->data = $d;
-  }
-
-  /**
-   * Yaml emit callback function, referred on yaml_emit call by class name.
-   *
-   * Expected to return an array with 2 values:
-   *   - 'tag': custom tag for this serialization
-   *   - 'data': value to convert to yaml (array, string, bool, number)
-   *
-   * @param object $obj Object to be emitted
-   * @return array Tag and surrogate data to emit
-   */
-  public static function yamlEmit (EmitExample $obj) {
-    return array(
-      'tag' => '!example/emit',
-      'data' => $obj->data,
-    );
-  }
-}
-
-$emit_callbacks = array(
-  'EmitExample' => array('EmitExample', 'yamlEmit')
-);
-
-$t = new EmitExample(array('a','b','c'));
-$yaml = yaml_emit(
-  array(
-    'example' => $t,
-  ),
-  YAML_ANY_ENCODING,
-  YAML_ANY_BREAK,
-  $emit_callbacks
-);
-var_dump($yaml);
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(43) "---
-example: !example/emit
-- a
-- b
-- c
-...
-"
-]]>
-   </screen>
-  </example>
- </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/yaml/constants.xml b/reference/yaml/constants.xml
deleted file mode 100644
index 9d48769cd492..000000000000
--- a/reference/yaml/constants.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="yaml.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <para>
- </para>
-
- <variablelist xml:id="yaml.constants.style">
-  <title>Scalar entity styles usable by <function>yaml_parse</function>
-   callback methods.</title>
-  <varlistentry xml:id="constant.yaml-any-scalar-style">
-   <term>
-    <constant>YAML_ANY_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-plain-scalar-style">
-   <term>
-    <constant>YAML_PLAIN_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-single-quoted-scalar-style">
-   <term>
-    <constant>YAML_SINGLE_QUOTED_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-double-quoted-scalar-style">
-   <term>
-    <constant>YAML_DOUBLE_QUOTED_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-literal-scalar-style">
-   <term>
-    <constant>YAML_LITERAL_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-folded-scalar-style">
-   <term>
-    <constant>YAML_FOLDED_SCALAR_STYLE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="yaml.constants.tag">
-  <title>Common tags usable by <function>yaml_parse</function>
-   callback methods.</title>
-  <varlistentry xml:id="constant.yaml-null-tag">
-   <term>
-    <constant>YAML_NULL_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:null"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-bool-tag">
-   <term>
-    <constant>YAML_BOOL_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:bool"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-str-tag">
-   <term>
-    <constant>YAML_STR_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:str"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-int-tag">
-   <term>
-    <constant>YAML_INT_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:int"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-float-tag">
-   <term>
-    <constant>YAML_FLOAT_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:float"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-timestamp-tag">
-   <term>
-    <constant>YAML_TIMESTAMP_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:timestamp"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-seq-tag">
-   <term>
-    <constant>YAML_SEQ_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:seq"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-map-tag">
-   <term>
-    <constant>YAML_MAP_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "tag:yaml.org,2002:map"
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-php-tag">
-   <term>
-    <constant>YAML_PHP_TAG</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     "!php/object"
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="yaml.constants.encoding">
-  <title>Encoding types for <function>yaml_emit</function></title>
-  <varlistentry xml:id="constant.yaml-any-encoding">
-   <term>
-    <constant>YAML_ANY_ENCODING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Let the emitter choose an encoding.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-utf8-encoding">
-   <term>
-    <constant>YAML_UTF8_ENCODING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Encode as UTF8.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-utf16le-encoding">
-   <term>
-    <constant>YAML_UTF16LE_ENCODING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Encode as UTF16LE.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-utf16be-encoding">
-   <term>
-    <constant>YAML_UTF16BE_ENCODING</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Encode as UTF16BE.
-    </simpara>
-   </listitem>
-  </varlistentry>
- </variablelist>
-
- <variablelist xml:id="yaml.constants.break">
-  <title>Linebreak types for <function>yaml_emit</function></title>
-  <varlistentry xml:id="constant.yaml-any-break">
-   <term>
-    <constant>YAML_ANY_BREAK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Let emitter choose linebreak character.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-cr-break">
-   <term>
-    <constant>YAML_CR_BREAK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <literal>\r</literal> as break character (Mac style).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-ln-break">
-   <term>
-    <constant>YAML_LN_BREAK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <literal>\n</literal> as break character (Unix style).
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yaml-crln-break">
-   <term>
-    <constant>YAML_CRLN_BREAK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Use <literal>\r\n</literal> as break character (DOS style).
-    </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/yaml/examples.xml b/reference/yaml/examples.xml
deleted file mode 100644
index e74d3b90c504..000000000000
--- a/reference/yaml/examples.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaml.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <example>
-  <title>Yaml Example</title>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$addr = array(
-    "given" => "Chris",
-    "family"=> "Dumars",
-    "address"=> array(
-        "lines"=> "458 Walkman Dr.
-        Suite #292",
-        "city"=> "Royal Oak",
-        "state"=> "MI",
-        "postal"=> 48046,
-      ),
-  );
-$invoice = array (
-    "invoice"=> 34843,
-    "date"=> "2001-01-23",
-    "bill-to"=> $addr,
-    "ship-to"=> $addr,
-    "product"=> array(
-        array(
-            "sku"=> "BL394D",
-            "quantity"=> 4,
-            "description"=> "Basketball",
-            "price"=> 450,
-          ),
-        array(
-            "sku"=> "BL4438H",
-            "quantity"=> 1,
-            "description"=> "Super Hoop",
-            "price"=> 2392,
-          ),
-      ),
-    "tax"=> 251.42,
-    "total"=> 4443.52,
-    "comments"=> "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.",
-    );
-
-// generate a YAML representation of the invoice
-$yaml = yaml_emit($invoice);
-var_dump($yaml);
-
-// convert the YAML back into a PHP variable
-$parsed = yaml_parse($yaml);
-
-// check that roundtrip conversion produced an equivalent structure
-var_dump($parsed == $invoice);
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-string(631) "---
-invoice: 34843
-date: "2001-01-23"
-bill-to:
-  given: Chris
-  family: Dumars
-  address:
-    lines: |-
-      458 Walkman Dr.
-              Suite #292
-    city: Royal Oak
-    state: MI
-    postal: 48046
-ship-to:
-  given: Chris
-  family: Dumars
-  address:
-    lines: |-
-      458 Walkman Dr.
-              Suite #292
-    city: Royal Oak
-    state: MI
-    postal: 48046
-product:
-- sku: BL394D
-  quantity: 4
-  description: Basketball
-  price: 450
-- sku: BL4438H
-  quantity: 1
-  description: Super Hoop
-  price: 2392
-tax: 251.420000
-total: 4443.520000
-comments: Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.
-...
-"
-bool(true)
-]]>
-  </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/yaml/functions/yaml-emit-file.xml b/reference/yaml/functions/yaml-emit-file.xml
deleted file mode 100644
index 84cab8c84d9c..000000000000
--- a/reference/yaml/functions/yaml-emit-file.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.yaml-emit-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaml_emit_file</refname>
-  <refpurpose>Send the YAML representation of a value to a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaml_emit_file</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Generate a YAML representation of the provided <parameter>data</parameter>
-   in the <parameter>filename</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       Path to the file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>data</parameter> being encoded. Can be any type except
-       a <type>resource</type>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       Output character encoding chosen from
-       <constant>YAML_ANY_ENCODING</constant>,
-       <constant>YAML_UTF8_ENCODING</constant>,
-       <constant>YAML_UTF16LE_ENCODING</constant>,
-       <constant>YAML_UTF16BE_ENCODING</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>linebreak</parameter></term>
-     <listitem>
-      <para>
-       Output linebreak style chosen from
-       <constant>YAML_ANY_BREAK</constant>,
-       <constant>YAML_CR_BREAK</constant>,
-       <constant>YAML_LN_BREAK</constant>,
-       <constant>YAML_CRLN_BREAK</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callbacks</parameter></term>
-     <listitem>
-      <para>
-       Content handlers for emitting YAML nodes. Associative <type>array</type>
-       of classname =&gt; <type>callable</type> mappings. See
-       <link linkend="yaml.callbacks.emit">emit callbacks</link> for more
-       details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  Returns &true; on 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>PECL yaml 1.1.0</entry>
-       <entry>
-        The <parameter>callbacks</parameter> parameter was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaml_emit</function></member>
-    <member><function>yaml_parse</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/yaml/functions/yaml-emit.xml b/reference/yaml/functions/yaml-emit.xml
deleted file mode 100644
index eef9a03e882a..000000000000
--- a/reference/yaml/functions/yaml-emit.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.yaml-emit" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaml_emit</refname>
-  <refpurpose>Returns the YAML representation of a value</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>yaml_emit</methodname>
-   <methodparam><type>mixed</type><parameter>data</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>encoding</parameter><initializer>YAML_ANY_ENCODING</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>linebreak</parameter><initializer>YAML_ANY_BREAK</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Generate a YAML representation of the provided <parameter>data</parameter>.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>data</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>data</parameter> being encoded. Can be any type except
-       a <type>resource</type>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>encoding</parameter></term>
-     <listitem>
-      <para>
-       Output character encoding chosen from
-       <constant>YAML_ANY_ENCODING</constant>,
-       <constant>YAML_UTF8_ENCODING</constant>,
-       <constant>YAML_UTF16LE_ENCODING</constant>,
-       <constant>YAML_UTF16BE_ENCODING</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>linebreak</parameter></term>
-     <listitem>
-      <para>
-       Output linebreak style chosen from
-       <constant>YAML_ANY_BREAK</constant>,
-       <constant>YAML_CR_BREAK</constant>,
-       <constant>YAML_LN_BREAK</constant>,
-       <constant>YAML_CRLN_BREAK</constant>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callbacks</parameter></term>
-     <listitem>
-      <para>
-       Content handlers for emitting YAML nodes. Associative <type>array</type>
-       of classname =&gt; <type>callable</type> mappings. See
-       <link linkend="yaml.callbacks.emit">emit callbacks</link> for more
-       details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a YAML encoded <type>string</type> on 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>PECL yaml 1.1.0</entry>
-       <entry>
-        The <parameter>callbacks</parameter> parameter was added.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </informaltable>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>yaml_emit</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$addr = array(
-    "given" => "Chris",
-    "family"=> "Dumars",
-    "address"=> array(
-        "lines"=> "458 Walkman Dr.
-        Suite #292",
-        "city"=> "Royal Oak",
-        "state"=> "MI",
-        "postal"=> 48046,
-      ),
-  );
-$invoice = array (
-    "invoice"=> 34843,
-    "date"=> 980208000,
-    "bill-to"=> $addr,
-    "ship-to"=> $addr,
-    "product"=> array(
-        array(
-            "sku"=> "BL394D",
-            "quantity"=> 4,
-            "description"=> "Basketball",
-            "price"=> 450,
-          ),
-        array(
-            "sku"=> "BL4438H",
-            "quantity"=> 1,
-            "description"=> "Super Hoop",
-            "price"=> 2392,
-          ),
-      ),
-    "tax"=> 251.42,
-    "total"=> 4443.52,
-    "comments"=> "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.",
-  );
-var_dump(yaml_emit($invoice));
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-string(628) "---
-invoice: 34843
-date: 980208000
-bill-to:
-  given: Chris
-  family: Dumars
-  address:
-    lines: |-
-      458 Walkman Dr.
-              Suite #292
-    city: Royal Oak
-    state: MI
-    postal: 48046
-ship-to:
-  given: Chris
-  family: Dumars
-  address:
-    lines: |-
-      458 Walkman Dr.
-              Suite #292
-    city: Royal Oak
-    state: MI
-    postal: 48046
-product:
-- sku: BL394D
-  quantity: 4
-  description: Basketball
-  price: 450
-- sku: BL4438H
-  quantity: 1
-  description: Super Hoop
-  price: 2392
-tax: 251.420000
-total: 4443.520000
-comments: Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.
-...
-"
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaml_emit_file</function></member>
-    <member><function>yaml_parse</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/yaml/functions/yaml-parse-file.xml b/reference/yaml/functions/yaml-parse-file.xml
deleted file mode 100644
index a4897ac8edd7..000000000000
--- a/reference/yaml/functions/yaml-parse-file.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.yaml-parse-file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaml_parse_file</refname>
-  <refpurpose>Parse a YAML stream from a file</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>yaml_parse_file</methodname>
-   <methodparam><type>string</type><parameter>filename</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Convert all or part of a YAML document stream read from a file to a PHP variable.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>filename</parameter></term>
-     <listitem>
-      <para>
-       Path to the file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pos</parameter></term>
-     <listitem>
-      <para>
-       Document to extract from stream (<literal>-1</literal> for all
-       documents, <literal>0</literal> for first document, ...).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ndocs</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>ndocs</parameter> is provided, then it is filled with the
-       number of documents found in stream.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callbacks</parameter></term>
-     <listitem>
-      <para>
-       Content handlers for YAML nodes. Associative <type>array</type> of YAML
-       tag =&gt; <type>callable</type> mappings. See
-       <link linkend="yaml.callbacks.parse">parse callbacks</link> for more
-       details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the value encoded in <parameter>filename</parameter> in the appropriate
-   PHP type.
-  </simpara>
-  <simpara>
-   On failure, a string containing an error message is returned.
-  </simpara>
-  <simpara>
-   If <parameter>pos</parameter> is <literal>-1</literal>, an <type>array</type>
-   will be returned with one entry for each document found in the stream.
-</simpara>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    Processing untrusted user input with <function>yaml_parse_file</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
-    nodes using the <literal>!php/object</literal> tag. This behavior can be
-    disabled by using the <literal>yaml.decode_php</literal> ini setting.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaml_parse</function></member>
-    <member><function>yaml_parse_url</function></member>
-    <member><function>yaml_emit</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/yaml/functions/yaml-parse-url.xml b/reference/yaml/functions/yaml-parse-url.xml
deleted file mode 100644
index 1d05f9f73bbf..000000000000
--- a/reference/yaml/functions/yaml-parse-url.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.yaml-parse-url" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaml_parse_url</refname>
-  <refpurpose>Parse a Yaml stream from a URL</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>yaml_parse_url</methodname>
-   <methodparam><type>string</type><parameter>url</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Convert all or part of a YAML document stream read from a URL to a PHP variable.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>url</parameter></term>
-     <listitem>
-      <para>
-       <parameter>url</parameter> should be of the form "scheme://...". PHP
-       will search for a protocol handler (also known as a wrapper) for that
-       scheme. If no wrappers for that protocol are registered, PHP will emit
-       a notice to help you track potential problems in your script and then
-       continue as though filename specifies a regular file.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pos</parameter></term>
-     <listitem>
-      <para>
-       Document to extract from stream (<literal>-1</literal> for all
-       documents, <literal>0</literal> for first document, ...).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ndocs</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>ndocs</parameter> is provided, then it is filled with the
-       number of documents found in stream.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callbacks</parameter></term>
-     <listitem>
-      <para>
-       Content handlers for YAML nodes. Associative <type>array</type> of YAML
-       tag =&gt; <type>callable</type> mappings. See
-       <link linkend="yaml.callbacks.parse">parse callbacks</link> for more details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value encoded in <parameter>url</parameter> in appropriate
-   PHP type&return.falseforfailure;. If <parameter>pos</parameter> is
-   <literal>-1</literal> an <type>array</type> will be returned with one entry
-   for each document found in the stream.
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    Processing untrusted user input with <function>yaml_parse_url</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
-    nodes using the <literal>!php/object</literal> tag. This behavior can be
-    disabled by using the <literal>yaml.decode_php</literal> ini setting.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaml_parse</function></member>
-    <member><function>yaml_parse_file</function></member>
-    <member><function>yaml_emit</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/yaml/functions/yaml-parse.xml b/reference/yaml/functions/yaml-parse.xml
deleted file mode 100644
index 2b50be4c679d..000000000000
--- a/reference/yaml/functions/yaml-parse.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="function.yaml-parse" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaml_parse</refname>
-  <refpurpose>Parse a YAML stream</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>yaml_parse</methodname>
-   <methodparam><type>string</type><parameter>input</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>pos</parameter><initializer>0</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter role="reference">ndocs</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>callbacks</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Convert all or part of a YAML document stream to a PHP variable.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>input</parameter></term>
-     <listitem>
-      <para>
-       The <type>string</type> to parse as a YAML document stream.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pos</parameter></term>
-     <listitem>
-      <para>
-       Document to extract from stream (<literal>-1</literal> for all
-       documents, <literal>0</literal> for first document, ...).
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>ndocs</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>ndocs</parameter> is provided, then it is filled with the
-       number of documents found in stream.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>callbacks</parameter></term>
-     <listitem>
-      <para>
-       Content handlers for YAML nodes. Associative <type>array</type> of YAML
-       tag =&gt; <type>callable</type> mappings. See
-       <link linkend="yaml.callbacks.parse">parse callbacks</link> for more
-       details.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value encoded in <parameter>input</parameter> in appropriate
-   PHP type&return.falseforfailure;. If <parameter>pos</parameter> is <literal>-1</literal> an
-   <type>array</type> will be returned with one entry for each document found
-   in the stream.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title><function>yaml_parse</function> example</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-$yaml = <<<EOD
----
-invoice: 34843
-date: "2001-01-23"
-bill-to: &id001
-  given: Chris
-  family: Dumars
-  address:
-    lines: |-
-      458 Walkman Dr.
-              Suite #292
-    city: Royal Oak
-    state: MI
-    postal: 48046
-ship-to: *id001
-product:
-- sku: BL394D
-  quantity: 4
-  description: Basketball
-  price: 450
-- sku: BL4438H
-  quantity: 1
-  description: Super Hoop
-  price: 2392
-tax: 251.420000
-total: 4443.520000
-comments: Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.
-...
-EOD;
-
-$parsed = yaml_parse($yaml);
-var_dump($parsed);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-array(8) {
-  ["invoice"]=>
-  int(34843)
-  ["date"]=>
-  string(10) "2001-01-23"
-  ["bill-to"]=>
-  &array(3) {
-    ["given"]=>
-    string(5) "Chris"
-    ["family"]=>
-    string(6) "Dumars"
-    ["address"]=>
-    array(4) {
-      ["lines"]=>
-      string(34) "458 Walkman Dr.
-        Suite #292"
-      ["city"]=>
-      string(9) "Royal Oak"
-      ["state"]=>
-      string(2) "MI"
-      ["postal"]=>
-      int(48046)
-    }
-  }
-  ["ship-to"]=>
-  &array(3) {
-    ["given"]=>
-    string(5) "Chris"
-    ["family"]=>
-    string(6) "Dumars"
-    ["address"]=>
-    array(4) {
-      ["lines"]=>
-      string(34) "458 Walkman Dr.
-        Suite #292"
-      ["city"]=>
-      string(9) "Royal Oak"
-      ["state"]=>
-      string(2) "MI"
-      ["postal"]=>
-      int(48046)
-    }
-  }
-  ["product"]=>
-  array(2) {
-    [0]=>
-    array(4) {
-      ["sku"]=>
-      string(6) "BL394D"
-      ["quantity"]=>
-      int(4)
-      ["description"]=>
-      string(10) "Basketball"
-      ["price"]=>
-      int(450)
-    }
-    [1]=>
-    array(4) {
-      ["sku"]=>
-      string(7) "BL4438H"
-      ["quantity"]=>
-      int(1)
-      ["description"]=>
-      string(10) "Super Hoop"
-      ["price"]=>
-      int(2392)
-    }
-  }
-  ["tax"]=>
-  float(251.42)
-  ["total"]=>
-  float(4443.52)
-  ["comments"]=>
-  string(68) "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338."
-}
-]]>
-    </screen>
-   </example>
-  </para>
- </refsect1>
-
- <refsect1 role="notes">
-  &reftitle.notes;
-  <warning>
-   <para>
-    Processing untrusted user input with <function>yaml_parse</function>
-    is dangerous if the use of <function>unserialize</function> is enabled for
-    nodes using the <literal>!php/object</literal> tag. This behavior can be
-    disabled by using the <literal>yaml.decode_php</literal> ini setting.
-   </para>
-  </warning>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaml_parse_file</function></member>
-    <member><function>yaml_parse_url</function></member>
-    <member><function>yaml_emit</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/yaml/ini.xml b/reference/yaml/ini.xml
deleted file mode 100644
index f9ee5172b9c2..000000000000
--- a/reference/yaml/ini.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yaml.configuration" xmlns="http://docbook.org/ns/docbook">
-  &reftitle.runtime;
-  &extension.runtime;
-  <para>
-    <table>
-      <title>Yaml &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.yaml.decode-binary">yaml.decode_binary</link></entry>
-            <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
-            <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-          </row>
-          <row>
-            <entry><link linkend="ini.yaml.decode-php">yaml.decode_php</link></entry>
-            <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
-            <entry>Added in 1.2.0, before 2.0.0 the default was 1</entry>
-          </row>
-          <row>
-            <entry><link linkend="ini.yaml.decode-timestamp">yaml.decode_timestamp</link></entry>
-            <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
-            <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-          </row>
-          <row>
-            <entry><link linkend="ini.yaml.output-canonical">yaml.output_canonical</link></entry>
-            <entry>0</entry>
-            <entry><constant>INI_ALL</constant></entry>
-            <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-          </row>
-          <row>
-            <entry><link linkend="ini.yaml.output-indent">yaml.output_indent</link></entry>
-            <entry>2</entry>
-            <entry><constant>INI_ALL</constant></entry>
-            <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-          </row>
-          <row>
-            <entry><link linkend="ini.yaml.output-width">yaml.output_width</link></entry>
-            <entry>80</entry>
-            <entry><constant>INI_ALL</constant></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.yaml.decode-binary">
-        <term>
-          <parameter>yaml.decode_binary</parameter>
-          <type>bool</type>
-        </term>
-        <listitem>
-          <para>
-            Off by default, but can be set to on to cause base64 binary encoded entities which have the explicit tag "tag:yaml.org,2002:binary" to be decoded.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry xml:id="ini.yaml.decode-php">
-        <term>
-          <parameter>yaml.decode_php</parameter>
-          <type>bool</type>
-        </term>
-        <listitem>
-          <para>
-            Off by default, but can be set to on to cause serialized php objects which have the explicit tag "!php/object" to be unserialized.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry xml:id="ini.yaml.decode-timestamp">
-        <term>
-          <parameter>yaml.decode_timestamp</parameter>
-          <type>int</type>
-        </term>
-        <listitem>
-          <para>
-            Controls the decoding of both implicit and explicit "tag:yaml.org,2002:timestamp" scalars in the YAML document stream. The default setting of <literal>0</literal> will not apply any decoding. A setting of <literal>1</literal> will use <function>strtotime</function> to parse the timestamp value as a Unix timestamp. A setting of <literal>2</literal> will use <function>date_create</function> to parse the timestamp value as <type>DateTime</type> object.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry xml:id="ini.yaml.output-canonical">
-        <term>
-          <parameter>yaml.output_canonical</parameter>
-          <type>bool</type>
-        </term>
-        <listitem>
-          <para>
-            Off by default, but can be set to on to cause canonical form output.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry xml:id="ini.yaml.output-indent">
-        <term>
-          <parameter>yaml.output_indent</parameter>
-          <type>int</type>
-        </term>
-        <listitem>
-          <para>
-            Number of spaces to indent sections. Value should be between
-            <literal>1</literal> and <literal>10</literal>.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry xml:id="ini.yaml.output-width">
-        <term>
-          <parameter>yaml.output_width</parameter>
-          <type>int</type>
-        </term>
-        <listitem>
-          <para>
-            Set the preferred line width. <literal>-1</literal> means unlimited.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </para>
-</section>
diff --git a/reference/yaml/reference.xml b/reference/yaml/reference.xml
deleted file mode 100644
index bb2bbaee02d4..000000000000
--- a/reference/yaml/reference.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.yaml" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Yaml &Functions;</title>
-
- &reference.yaml.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/yaml/setup.xml b/reference/yaml/setup.xml
deleted file mode 100644
index 00400ab304f6..000000000000
--- a/reference/yaml/setup.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaml.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="yaml.requirements">
-  &reftitle.required;
-  <para>
-   This extension requires the <link xlink:href="&url.yaml.libyaml;">LibYAML C
-   library</link> version 0.1.0 or higher to be installed.
-  </para>
- </section>
-
- <section xml:id="yaml.installation">
-  &reftitle.install;
-  <para>
-   &pecl.moved;
-  </para>
-  <para>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;yaml">&url.pecl.package;yaml</link>.
-  </para>
- </section>
-
- <!-- {{{ Configuration -->
- &reference.yaml.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/yaml/versions.xml b/reference/yaml/versions.xml
deleted file mode 100644
index 056396f8a9f3..000000000000
--- a/reference/yaml/versions.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <!-- Functions -->
- <function name='yaml_parse' from='PECL yaml &gt;= 0.4.0'/>
- <function name='yaml_parse_file' from='PECL yaml &gt;= 0.4.0'/>
- <function name='yaml_parse_url' from='PECL yaml &gt;= 0.4.0'/>
- <function name='yaml_emit' from='PECL yaml &gt;= 0.5.0'/>
- <function name='yaml_emit_file' from='PECL yaml &gt;= 0.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/yar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yar/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yar/book.xml b/reference/yar/book.xml
deleted file mode 100644
index 9aef1a42aa73..000000000000
--- a/reference/yar/book.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <preface xml:id="intro.yar">
-  &reftitle.intro;
-  <simpara>
-   Yar (Yet another RPC framework) is a light, concurrent RPC framework
-   which aims to provide a simple and easy way to do communication
-   between PHP applications. It can also issue multiple calls to remote
-   services concurrently.
-  </simpara>
-  <simpara>
-   Yar is a native PHP extension rather than a userland library. It uses
-   a compact binary protocol over HTTP, HTTPS or TCP and ships with three
-   built-in packagers (<literal>php</literal>, <literal>json</literal>
-   and, when built with <option role="configure">--enable-msgpack</option>,
-   <literal>msgpack</literal>), so no extra packages or proxy processes
-   are required.
-  </simpara>
-  <simpara>
-   The protocol is language agnostic, so services can be consumed by any
-   language; see <link linkend="yar.protocol">The Yar Protocol</link> for
-   the details.
-  </simpara>
- </preface>
-
- &reference.yar.protocol;
- &reference.yar.setup;
- &reference.yar.constants;
- &reference.yar.examples;
- &reference.yar.yar-server;
- &reference.yar.yar-client;
- &reference.yar.yar-concurrent-client;
- &reference.yar.yar-server-exception;
- &reference.yar.yar-server-output-exception;
- &reference.yar.yar-server-packager-exception;
- &reference.yar.yar-server-protocol-exception;
- &reference.yar.yar-server-request-exception;
-
- &reference.yar.yar-client-exception;
- &reference.yar.yar-client-packager-exception;
- &reference.yar.yar-client-protocol-exception;
- &reference.yar.yar-client-transport-exception;
-
-</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/yar/configure.xml b/reference/yar/configure.xml
deleted file mode 100644
index 66cc871b6625..000000000000
--- a/reference/yar/configure.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yar.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.install;
-
- <simpara>
-  &pecl.info;
-  <link xlink:href="&url.pecl.package;yar">&url.pecl.package;yar</link>
- </simpara>
-
-</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/yar/constants.xml b/reference/yar/constants.xml
deleted file mode 100644
index 0a09192440b1..000000000000
--- a/reference/yar/constants.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<appendix xml:id="yar.constants" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.constants;
- &extension.constants;
- <variablelist>
-  <varlistentry xml:id="constant.yar-version">
-   <term>
-    <constant>YAR_VERSION</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The version of the Yar extension, e.g.
-     <literal>"2.4.0"</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-has-msgpack">
-   <term>
-    <constant>YAR_HAS_MSGPACK</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     <literal>1</literal> when Yar was built with
-     <option role="configure">--enable-msgpack</option>, otherwise
-     <literal>0</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-client-protocol-http">
-   <term>
-    <constant>YAR_CLIENT_PROTOCOL_HTTP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Identifies the HTTP protocol, exposed through the read-only
-     <varname>_protocol</varname> property of
-     <classname>Yar_Client</classname>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-client-protocol-tcp">
-   <term>
-    <constant>YAR_CLIENT_PROTOCOL_TCP</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Identifies the TCP protocol, exposed through the read-only
-     <varname>_protocol</varname> property of
-     <classname>Yar_Client</classname>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-client-protocol-unix">
-   <term>
-    <constant>YAR_CLIENT_PROTOCOL_UNIX</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Identifies the Unix socket protocol, exposed through the read-only
-     <varname>_protocol</varname> property of
-     <classname>Yar_Client</classname>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-packager">
-   <term>
-    <constant>YAR_OPT_PACKAGER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to override the
-     <link linkend="ini.yar.packager">yar.packager</link> directive
-     for a single client. The value must be one of
-     <literal>php</literal>, <literal>json</literal> or
-     <literal>msgpack</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-persistent">
-   <term>
-    <constant>YAR_OPT_PERSISTENT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to enable persistent connections. When set to a
-     truthy value, HTTP keep-alive is used so that repeated calls to
-     the same server reuse the connection for the rest of the PHP
-     request lifecycle.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-timeout">
-   <term>
-    <constant>YAR_OPT_TIMEOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to override the
-     <link linkend="ini.yar.timeout">yar.timeout</link> directive, in
-     milliseconds.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-connect-timeout">
-   <term>
-    <constant>YAR_OPT_CONNECT_TIMEOUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to override the
-     <link linkend="ini.yar.connect-timeout">yar.connect_timeout</link>
-     directive, in milliseconds.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-header">
-   <term>
-    <constant>YAR_OPT_HEADER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to add custom HTTP headers. The value must be an
-     array of strings like
-     <literal>"X-Custom: value"</literal>. Only effective with the
-     HTTP and HTTPS protocols. Available as of Yar 2.0.4.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-resolve">
-   <term>
-    <constant>YAR_OPT_RESOLVE</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to override hostname resolution for HTTP calls. The
-     value must be an array of strings in the format
-     <literal>HOST:PORT:ADDRESS</literal>, following the curl
-     <constant>CURLOPT_RESOLVE</constant> syntax. Requires libcurl
-     &gt;= 7.21.3. Available as of Yar 2.1.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-proxy">
-   <term>
-    <constant>YAR_OPT_PROXY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option to route HTTP calls through an HTTP proxy. The value
-     must be a string such as <literal>127.0.0.1:8888</literal>.
-     Available as of Yar 2.2.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-provider">
-   <term>
-    <constant>YAR_OPT_PROVIDER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option carrying the provider identity sent with every
-     request. The value must be a string of at most 32 bytes, which is
-     passed to the server-side <literal>__auth</literal> magic method.
-     Available as of Yar 2.3.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-opt-token">
-   <term>
-    <constant>YAR_OPT_TOKEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     Client option carrying the authentication token sent with every
-     request. The value must be a string of at most 32 bytes, which is
-     passed to the server-side <literal>__auth</literal> magic method.
-     Available as of Yar 2.3.0.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-packager-php">
-   <term>
-    <constant>YAR_PACKAGER_PHP</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The identifier of the <literal>php</literal> packager,
-     <literal>"PHP"</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-packager-json">
-   <term>
-    <constant>YAR_PACKAGER_JSON</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The identifier of the <literal>json</literal> packager,
-     <literal>"JSON"</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-packager-msgpack">
-   <term>
-    <constant>YAR_PACKAGER_MSGPACK</constant>
-    (<type>string</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The identifier of the <literal>msgpack</literal> packager,
-     <literal>"MSGPACK"</literal>.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-okey">
-   <term>
-    <constant>YAR_ERR_OKEY</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     No error; the request was processed successfully.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-packager">
-   <term>
-    <constant>YAR_ERR_PACKAGER</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A packager error, e.g. a body that could not be unpacked.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-protocol">
-   <term>
-    <constant>YAR_ERR_PROTOCOL</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A protocol error, e.g. a malformed Yar header.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-request">
-   <term>
-    <constant>YAR_ERR_REQUEST</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A request error, e.g. a call to an undefined or non-public
-     method.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-output">
-   <term>
-    <constant>YAR_ERR_OUTPUT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     An output error, e.g. the server could not start its output
-     buffer.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-transport">
-   <term>
-    <constant>YAR_ERR_TRANSPORT</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     A transport error, e.g. a connection failure or timeout.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-exception">
-   <term>
-    <constant>YAR_ERR_EXCEPTION</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The remote service threw an exception while processing the
-     request.
-    </simpara>
-   </listitem>
-  </varlistentry>
-  <varlistentry xml:id="constant.yar-err-forbidden">
-   <term>
-    <constant>YAR_ERR_FORBIDDEN</constant>
-    (<type>int</type>)
-   </term>
-   <listitem>
-    <simpara>
-     The request was rejected by the server's authentication
-     (see the <literal>provider</literal> and
-     <literal>token</literal> fields of the
-     <link linkend="yar.protocol">Yar protocol header</link>).
-    </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/yar/examples.xml b/reference/yar/examples.xml
deleted file mode 100644
index 42a99ca59fe7..000000000000
--- a/reference/yar/examples.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yar.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <simpara>
-  The examples below walk through a complete service: a server that
-  exposes a few arithmetic methods, a synchronous client that calls
-  them, a client that fans several calls out concurrently, and a
-  client that talks to a server over TCP.
- </simpara>
-
- <example>
-  <title>Yar Server Example</title>
-  <simpara>
-   A Yar service is just a regular PHP class wrapped by
-   <classname>Yar_Server</classname>. Every public method of the
-   object becomes an RPC endpoint; protected and private methods, as
-   well as methods whose names start with an underscore, stay hidden
-   from clients. The doc comments of the public methods are collected
-   and shown on the service information page.
-  </simpara>
-  <simpara>
-   RPC requests arrive as HTTP POST requests carrying a binary Yar
-   protocol payload, so the script is usually mapped to a URI on a
-   regular web server.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-/* assume this page can be accessed by http://api.example.com/operator.php */
-
-class Operator {
-
-    /**
-     * Add two operands
-     * @param integer
-     * @return integer
-     */
-    public function add($a, $b) {
-        return $this->_add($a, $b);
-    }
-
-    /**
-     * Sub
-     */
-    public function sub($a, $b) {
-        return $a - $b;
-    }
-
-    /**
-     * Mul
-     */
-    public function mul($a, $b) {
-        return $a * $b;
-    }
-
-    /**
-     * Protected methods will not be exposed
-     * @param integer
-     * @return integer
-     */
-    protected function _add($a, $b) {
-        return $a + $b;
-    }
-}
-
-$server = new Yar_Server(new Operator());
-$server->handle();
-?>
-]]>
-  </programlisting>
- </example>
-
- <example>
-  <title>Access the server in browser (GET request)</title>
-  <simpara>
-   When a GET request is issued to the service URI — for instance by
-   opening it in a browser — Yar does not perform an RPC call but
-   renders an information page listing every public method of the
-   executor object together with its doc comment. This is controlled
-   by the <link linkend="ini.yar.expose-info">yar.expose_info</link>
-   directive; when it is off, a GET request fails instead.
-  </simpara>
-  &example.outputs.similar;
-  <mediaobject>
-   <alt>Yar Server Info</alt>
-   <imageobject>
-    <imagedata fileref="en/reference/yar/image/yar.png" scalefit="1" width="700px" />
-   </imageobject>
-  </mediaobject>
- </example>
-
- <example>
-  <title>Yar Client Example</title>
-  <simpara>
-   A <classname>Yar_Client</classname> is bound to a single service
-   address. Calling any undefined method on it is transparently turned
-   into a synchronous RPC call, so remote methods look and feel like
-   local ones; <methodname>Yar_Client::call</methodname> does the same
-   thing explicitly by name.
-  </simpara>
-  <simpara>
-   Protected methods are not exposed: calling one fails with a
-   <exceptionname>Yar_Client_Exception</exceptionname> whose code is
-   <constant>YAR_ERR_REQUEST</constant>.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-/* call directly */
-var_dump($client->add(1, 2));
-
-/* call via call() */
-var_dump($client->call("add", array(3, 2)));
-
-/* _add cannot be called: it is not public */
-var_dump($client->_add(1, 2));
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-int(3)
-int(5)
-PHP Fatal error:  Uncaught Yar_Client_Exception: call to undefined api Operator::_add() in *
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Yar Concurrent Client Example</title>
-  <simpara>
-   Instead of calling services one after another,
-   <classname>Yar_Concurrent_Client</classname> registers several calls
-   first and then dispatches them all at once with
-   <methodname>Yar_Concurrent_Client::loop</methodname>. The responses
-   are passed to the callback in the order they arrive, not in the
-   order the calls were registered.
-  </simpara>
-  <simpara>
-   Right after all requests have been sent, the callback is invoked
-   once with &null; arguments so that the caller knows no further
-   request is pending; the example below checks for this notification.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-function callback($ret, $callinfo) {
-    if ($callinfo == NULL) {
-        /* all requests are sent, waiting for the responses */
-        return;
-    }
-    echo $callinfo['method'], " result: ", $ret, "\n";
-}
-
-function error_callback($type, $error, $callinfo) {
-    error_log("[$type] $error");
-}
-
-/* register async calls to remote services */
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "add", array(1, 2), "callback");
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "sub", array(2, 1), "callback");
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "mul", array(2, 2), "callback");
-
-/* send all requests and wait for the responses */
-Yar_Concurrent_Client::loop("callback", "error_callback");
-?>
-]]>
-  </programlisting>
-  &example.outputs.similar;
-  <screen>
-<![CDATA[
-mul result: 4
-sub result: 1
-add result: 3
-]]>
-  </screen>
- </example>
-
- <example>
-  <title>Yar TCP Client Example</title>
-  <simpara>
-   Besides HTTP, <classname>Yar_Client</classname> can talk to Yar
-   compatible servers over TCP or Unix sockets, for example a service
-   implemented with the
-   <link xlink:href="&url.git.hub;laruence/yar-c">Yar C framework</link>,
-   which serves the same binary Yar protocol that the PHP server uses.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("tcp://127.0.0.1:8600");
-
-var_dump($client->add(1, 2));
-?>
-]]>
-  </programlisting>
- </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/yar/image/yar.png b/reference/yar/image/yar.png
deleted file mode 100644
index 8c4708e02e9c..000000000000
Binary files a/reference/yar/image/yar.png and /dev/null differ
diff --git a/reference/yar/ini.xml b/reference/yar/ini.xml
deleted file mode 100644
index 297fec1c0637..000000000000
--- a/reference/yar/ini.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="yar.configuration" xmlns="http://docbook.org/ns/docbook">
- &reftitle.runtime;
- &extension.runtime;
- <para>
-  <table>
-   <title>Yar &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.yar.connect-timeout">yar.connect_timeout</link></entry>
-      <entry>1000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.content-type">yar.content_type</link></entry>
-      <entry>application/octet-stream</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.debug">yar.debug</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.expose-info">yar.expose_info</link></entry>
-      <entry>On</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.packager">yar.packager</link></entry>
-      <entry>php</entry>
-      <entry><constant>INI_PERDIR</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.ssl-verify">yar.ssl_verify</link></entry>
-      <entry>Off</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry><!-- leave empty, this will be filled by an automatic script --></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.yar.timeout">yar.timeout</link></entry>
-      <entry>5000</entry>
-      <entry><constant>INI_ALL</constant></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.yar.connect-timeout">
-     <term>
-      <parameter>yar.connect_timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Connect timeout in milliseconds for HTTP calls issued through
-       <classname>Yar_Client</classname> and
-       <classname>Yar_Concurrent_Client</classname>.
-      </simpara>
-      <note>
-       <simpara>
-        This value is interpreted in milliseconds. Prior to Yar 1.2.1 it
-        was measured in seconds (the default was
-        <literal>1</literal>).
-       </simpara>
-      </note>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.content-type">
-     <term>
-      <parameter>yar.content_type</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       The value of the <literal>Content-Type</literal> response header
-       sent by <classname>Yar_Server</classname>. Yar speaks a binary
-       protocol, so the default is
-       <literal>application/octet-stream</literal>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.debug">
-     <term>
-      <parameter>yar.debug</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <simpara>
-       Enables debug mode. When on, Yar emits
-       <constant>E_WARNING</constant> messages with protocol-level
-       details for every request and response, prefixed with
-       <literal>[Debug Yar_Server]</literal> or
-       <literal>[Debug Yar_Client]</literal> and a timestamp.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.expose-info">
-     <term>
-      <parameter>yar.expose_info</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <simpara>
-       Whether <methodname>Yar_Server::handle</methodname> outputs the
-       service information page for non-POST (usually GET) requests.
-       When this directive is off, such requests throw a
-       <exceptionname>Yar_Server_Exception</exceptionname> instead.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.packager">
-     <term>
-      <parameter>yar.packager</parameter>
-      <type>string</type>
-     </term>
-     <listitem>
-      <simpara>
-       The default packager used to serialize request and response
-       bodies. Valid values are <literal>php</literal> (PHP
-       serialization), <literal>json</literal>, and
-       <literal>msgpack</literal> (only when Yar was built with
-       <option role="configure">--enable-msgpack</option>).
-      </simpara>
-      <simpara>
-       When Yar is built with msgpack support, the default becomes
-       <literal>msgpack</literal>.
-      </simpara>
-      <simpara>
-       This value can be overridden per client with the
-       <constant>YAR_OPT_PACKAGER</constant> option.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.ssl-verify">
-     <term>
-      <parameter>yar.ssl_verify</parameter>
-      <type>bool</type>
-     </term>
-     <listitem>
-      <simpara>
-       Whether to verify the TLS certificate of HTTPS servers. When on,
-       the curl transport sets
-       <constant>CURLOPT_SSL_VERIFYPEER</constant> and
-       <constant>CURLOPT_SSL_VERIFYHOST</constant>, and requests to
-       servers with invalid certificates fail. Off by default for
-       backward compatibility. Available as of Yar 2.4.0.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="ini.yar.timeout">
-     <term>
-      <parameter>yar.timeout</parameter>
-      <type>int</type>
-     </term>
-     <listitem>
-      <simpara>
-       Timeout in milliseconds for RPC calls issued by
-       <classname>Yar_Client</classname> and
-       <classname>Yar_Concurrent_Client</classname>.
-      </simpara>
-     </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/yar/protocol.xml b/reference/yar/protocol.xml
deleted file mode 100644
index 2a6ca03e8e94..000000000000
--- a/reference/yar/protocol.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yar.protocol" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>The Yar Protocol</title>
- <simpara>
-  Yar does not rely on a schema or IDL file: everything is exchanged on
-  the wire as plain bytes. Any language that can read and write bytes
-  can speak to a Yar service, without installing any framework at all —
-  build one fixed-size binary header and a serialized request body,
-  send them to the service URI, and parse the reply.
- </simpara>
- <simpara>
-  A message consists of a fixed-size header of 82 bytes followed by a
-  body. The header is laid out exactly like the following C structure,
-  packed with no padding, and is written to the wire field after field
-  in declaration order:
- </simpara>
- <programlisting role="c">
-<![CDATA[
-typedef struct _yar_header {
-    uint32_t       id;            /* transaction id */
-    uint16_t       version;       /* protocol version, currently always 0 */
-    uint32_t       magic_num;     /* must be 0x80DFEC60 */
-    uint32_t       reserved;
-    unsigned char  provider[32];  /* request from whom (authentication) */
-    unsigned char  token[32];     /* request token (authentication) */
-    uint32_t       body_len;      /* length of the whole body, including
-                                     the packager identifier */
-} __attribute__ ((packed)) yar_header_t;
-]]>
- </programlisting>
- <simpara>
-  The <literal>id</literal>, <literal>magic_num</literal>,
-  <literal>reserved</literal> and <literal>body_len</literal> fields
-  are stored in network byte order (big-endian); the remaining fields
-  are raw bytes.
- </simpara>
- <simpara>
-  The body starts with an 8-byte packager identifier —
-  <literal>PHP</literal>, <literal>JSON</literal> or
-  <literal>MSGPACK</literal>, zero-padded — telling the receiver how
-  the remainder was encoded, followed by the serialized content itself.
- </simpara>
- <itemizedlist>
-  <listitem>
-   <simpara>
-    The request body decodes to an array with the keys
-    <literal>i</literal> (the transaction id), <literal>m</literal>
-    (the method being called) and <literal>p</literal> (the list of
-    parameters).
-   </simpara>
-  </listitem>
-  <listitem>
-   <simpara>
-    The response body decodes to an array with the keys
-    <literal>i</literal> (the transaction id), <literal>s</literal>
-    (the status, one of the <literal>YAR_ERR_*</literal> codes),
-    <literal>r</literal> (the return value), <literal>o</literal> (any
-    output the service method produced) and <literal>e</literal> (the
-    error or exception, when the call failed).
-   </simpara>
-  </listitem>
- </itemizedlist>
- <simpara>
-  Over HTTP the message is sent as the body of a POST request, with
-  the response arriving as the body of the reply; over TCP or Unix
-  sockets it is written directly on the stream.
- </simpara>
- <example>
-  <title>Calling a Yar service without the extension</title>
-  <simpara>
-   The following self-contained script builds a valid Yar request for
-   the <literal>php</literal> packager with nothing but standard
-   sockets, sends it to a service URI, and prints the decoded
-   response. Running it against the
-   <classname>Operator</classname> service from the
-   <link linkend="yar.examples">examples</link> prints
-   <literal>int(3)</literal>.
-  </simpara>
-  <programlisting role="php">
-<![CDATA[
-<?php
-
-$uri = "http://api.example.com/operator.php";
-
-/* 1. the body: packager identifier + serialized request */
-$serialized = serialize(array("i" => 1, "m" => "add", "p" => array(1, 2)));
-$body = str_pad("PHP", 8, "\0") . $serialized;
-
-/* 2. the header: 82 bytes, multi-byte integers in network byte order */
-$header = pack("N", 1)                    /* id */
-        . pack("v", 0)                    /* version */
-        . pack("N", 0x80DFEC60)           /* magic number */
-        . pack("N", 0)                    /* reserved */
-        . str_pad("", 32, "\0")           /* provider */
-        . str_pad("", 32, "\0")           /* token */
-        . pack("N", strlen($body));       /* body length */
-
-/* 3. send it as the body of a POST request */
-$stream = stream_context_create(array("http" => array(
-    "method"  => "POST",
-    "header"  => "Content-Type: application/octet-stream\r\n",
-    "content" => $header . $body,
-)));
-$reply = file_get_contents($uri, false, $stream);
-
-/* 4. parse the reply: 82-byte header, then the response body */
-$response = unserialize(substr($reply, 82 + 8));
-var_dump($response["r"]);
-?>
-]]>
-  </programlisting>
- </example>
- <simpara>
-  A more complete client implementation in plain PHP, which also
-  decodes the response header and supports concurrent calls, lives in
-  the <literal>tools/</literal> directory of the
-  <link xlink:href="&url.git.hub;laruence/yar">Yar source
-  repository</link>.
- </simpara>
-</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/yar/setup.xml b/reference/yar/setup.xml
deleted file mode 100644
index deb2031c1bf8..000000000000
--- a/reference/yar/setup.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yar.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="yar.requirements">
-  &reftitle.required;
-  <simpara>
-   The cURL library is required for the HTTP and HTTPS transports. The
-   TCP transport is implemented with plain sockets and needs no extra
-   library.
-  </simpara>
-  <simpara>
-   The <link linkend="book.json">JSON</link> extension is required,
-   which is bundled with PHP and always available as of PHP 8.0.0.
-  </simpara>
-  <simpara>
-   To use the <literal>msgpack</literal> packager, the
-   <link xlink:href="&url.pecl.package;msgpack">msgpack</link> extension
-   must be installed and Yar must be built with the
-   <option role="configure">--enable-msgpack</option> configure option.
-  </simpara>
- </section>
-
- <!-- {{{ Installation -->
- <section xml:id="yar.installation">
-  &reftitle.install;
-  <simpara>
-   Yar can be installed in one of three ways: via PECL, via PIE, or
-   by building it from source.
-  </simpara>
-  <simpara>
-   &pecl.moved;
-  </simpara>
-  <simpara>
-   &pecl.info;
-   <link xlink:href="&url.pecl.package;yar">&url.pecl.package;yar</link>.
-  </simpara>
-  <simpara>
-   &pecl.windows.download.avail;
-  </simpara>
-  <example>
-   <title>Installing Yar with PECL</title>
-   <programlisting role="shell">
-<![CDATA[
-pecl install yar
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   As of Yar 2.4.0, the extension can be installed with
-   &link.pie;, the PHP Installer for Extensions, by running the
-   following on the command line.
-  </simpara>
-  <example>
-   <title>Installing Yar with PIE</title>
-   <programlisting role="shell">
-<![CDATA[
-pie install laruence/yar
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The msgpack packager can be enabled at install time:
-  </simpara>
-  <example>
-   <title>Installing Yar with PIE and msgpack</title>
-   <programlisting role="shell">
-<![CDATA[
-pie install laruence/yar --enable-msgpack
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The source code is hosted on
-   <link xlink:href="&url.git.hub;laruence/yar">GitHub</link>. To
-   build the extension from source, run the following on the command
-   line, replacing the paths with those of the local PHP
-   installation.
-  </simpara>
-  <example>
-   <title>Building Yar from source</title>
-   <programlisting role="shell">
-<![CDATA[
-/path/to/phpize
-./configure --with-php-config=/path/to/php-config
-make && make install
-]]>
-   </programlisting>
-  </example>
-  <simpara>
-   The following <literal>configure</literal> options are available:
-  </simpara>
-  <variablelist>
-   <varlistentry>
-    <term>
-     <option role="configure">--with-curl</option>
-    </term>
-    <listitem>
-     <simpara>
-      Location of the cURL installation, if it is not found in the
-      default include paths.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <option role="configure">--enable-msgpack</option>
-    </term>
-    <listitem>
-     <simpara>
-      Enables the <literal>msgpack</literal> packager and makes the
-      <literal>msgpack</literal> extension an optional dependency. When
-      Yar is built with this option, the default value of
-      <link linkend="ini.yar.packager">yar.packager</link> becomes
-      <literal>msgpack</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term>
-     <option role="configure">--enable-epoll</option>
-    </term>
-    <listitem>
-     <simpara>
-      Uses Linux <literal>epoll</literal> instead of
-      <literal>select()</literal> for I/O multiplexing, available as of
-      Yar 2.1.2. This can improve
-      <classname>Yar_Concurrent_Client</classname> performance under
-      high concurrency. It only takes effect on Linux; on other
-      platforms it is silently ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
- &reference.yar.ini;
- <!-- }}} -->
-
- <section xml:id="yar.resources">
-  &reftitle.resources;
-  <simpara>
-   This extension does not define any resources.
-  </simpara>
- </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/yar/versions.xml b/reference/yar/versions.xml
deleted file mode 100644
index 9319614bc56e..000000000000
--- a/reference/yar/versions.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
- <function name='yar_server::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server::handle' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client::call' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client::setopt' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client::getopt' from='PECL yar &gt;= 1.1.0'/>
- <function name='yar_concurrent_client::call' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_concurrent_client::loop' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_concurrent_client::reset' from='PECL yar &gt;= 1.2.4'/>
- <function name='yar_server_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_request_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_protocol_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_packager_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_server_output_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_transport_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_packager_exception::__tostring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::gettype' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::__clone' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::__construct' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::getmessage' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::getcode' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::getfile' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::getline' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::gettrace' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::getprevious' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::gettraceasstring' from='PECL yar &gt;= 1.0.0'/>
- <function name='yar_client_protocol_exception::__tostring' from='PECL yar &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/yar/yar-client-exception.xml b/reference/yar/yar-client-exception.xml
deleted file mode 100644
index f32f4cde6cd7..000000000000
--- a/reference/yar/yar-client-exception.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-client-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Client_Exception class</title>
- <titleabbrev>Yar_Client_Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yar_Client_Exception intro -->
-  <section xml:id="yar-client-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Base class of the exceptions thrown when a request fails before,
-    during or after reaching the remote service: a subclass is thrown
-    depending on where the failure occurred. The exception code is one of
-    the <literal>YAR_ERR_*</literal> constants.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yar-client-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Client_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-
-    <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:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yar.entities.yar-client-exception;
-
-</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/yar/yar-client-packager-exception.xml b/reference/yar/yar-client-packager-exception.xml
deleted file mode 100644
index 3c5fe3ae4a12..000000000000
--- a/reference/yar/yar-client-packager-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-client-packager-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Client_Packager_Exception class</title>
- <titleabbrev>Yar_Client_Packager_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-client-packager-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the response body cannot be unpacked with the requested packager (exception code <constant>YAR_ERR_PACKAGER</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-client-packager-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Client_Packager_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Client_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-client-protocol-exception.xml b/reference/yar/yar-client-protocol-exception.xml
deleted file mode 100644
index 6020b8001000..000000000000
--- a/reference/yar/yar-client-protocol-exception.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-client-protocol-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Client_Protocol_Exception class</title>
- <titleabbrev>Yar_Client_Protocol_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-client-protocol-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the response from the RPC service violates the Yar protocol, for example an unsupported protocol address or a malformed response header (exception code <constant>YAR_ERR_PROTOCOL</constant>).
-   </simpara>
-   <simpara>
-    As of Yar 2.4.0 this also includes a response whose transaction id
-    does not match the id of the request it answers. The client validates
-    the <literal>i</literal> field of each response; a response carrying
-    a different, non-zero transaction id (for example one misrouted by a
-    proxy) is rejected. Responses with a zero or missing transaction id
-    are still accepted for backward compatibility with older servers.
-   </simpara>
-  </section>
-
-  <section xml:id="yar-client-protocol-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Client_Protocol_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Client_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-client-transport-exception.xml b/reference/yar/yar-client-transport-exception.xml
deleted file mode 100644
index 8b5679d6a235..000000000000
--- a/reference/yar/yar-client-transport-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-client-transport-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Client_Transport_Exception class</title>
- <titleabbrev>Yar_Client_Transport_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-client-transport-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the connection to the RPC service fails: connection refused, timeout, or an empty response (exception code <constant>YAR_ERR_TRANSPORT</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-client-transport-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Client_Transport_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Client_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-client.xml b/reference/yar/yar-client.xml
deleted file mode 100644
index dca6d9d6393c..000000000000
--- a/reference/yar/yar-client.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Client class</title>
- <titleabbrev>Yar_Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yar_Client intro -->
-  <section xml:id="yar-client.intro">
-   &reftitle.intro;
-   <simpara>
-    The client side of the Yar RPC framework. A client is bound to a
-    single service address; invoking any undefined method on it issues a
-    remote call with that method name and the given arguments.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yar-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Yar_Client</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>int</type>
-     <varname linkend="yar-client.props.protocol">_protocol</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="yar-client.props.uri">_uri</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type class="union"><type>array</type><type>null</type></type>
-     <varname linkend="yar-client.props.options">_options</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>bool</type>
-     <varname linkend="yar-client.props.running">_running</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Yar_Client'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Client'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Yar_Client properties -->
-  <section xml:id="yar-client.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yar-client.props.protocol">
-     <term><varname>_protocol</varname></term>
-     <listitem>
-      <simpara>
-       Read-only. The protocol derived from the service address: one of
-       <constant>YAR_CLIENT_PROTOCOL_HTTP</constant>,
-       <constant>YAR_CLIENT_PROTOCOL_TCP</constant> or
-       <constant>YAR_CLIENT_PROTOCOL_UNIX</constant>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yar-client.props.uri">
-     <term><varname>_uri</varname></term>
-     <listitem>
-      <simpara>
-       Read-only. The service address the client was created with.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yar-client.props.options">
-     <term><varname>_options</varname></term>
-     <listitem>
-      <simpara>
-       Read-only. An &array; of the options set on this client, keyed by
-       the <literal>YAR_OPT_*</literal> constants, or &null; if none were
-       set.
-      </simpara>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="yar-client.props.running">
-     <term><varname>_running</varname></term>
-     <listitem>
-      <simpara>
-       Read-only. Whether a call issued by this client is currently in
-       progress.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.yar.entities.yar-client;
-
-</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/yar/yar-concurrent-client.xml b/reference/yar/yar-concurrent-client.xml
deleted file mode 100644
index d484d1c54204..000000000000
--- a/reference/yar/yar-concurrent-client.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-concurrent-client" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Concurrent_Client class</title>
- <titleabbrev>Yar_Concurrent_Client</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yar_Concurrent_Client intro -->
-  <section xml:id="yar-concurrent-client.intro">
-   &reftitle.intro;
-   <simpara>
-    A static helper that batches remote RPC calls. Calls registered with
-    <methodname>Yar_Concurrent_Client::call</methodname> are not sent
-    immediately; they are all dispatched together, in parallel, by
-    <methodname>Yar_Concurrent_Client::loop</methodname>.
-   </simpara>
-   <simpara>
-    The class is meant for applications that need the results of several
-    remote calls. Only independent calls — ones that do not need each
-    other's results — can be batched this way; when one call depends on
-    the result of another, the two have to run sequentially. Through
-    <classname>Yar_Client</classname> the calls are sent one after
-    another, each paying its full round-trip time; with the concurrent
-    client they are sent at the same time, so the overall waiting time
-    drops to the duration of the single slowest call.
-   </simpara>
-   <note>
-    <simpara>
-     Only HTTP(S) services are supported for concurrent calls. They are
-     sent concurrently through curl's multi-handle interface, which the
-     TCP/Unix socket transport does not implement.
-    </simpara>
-   </note>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yar-concurrent-client.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Yar_Concurrent_Client</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-concurrent-client')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Concurrent_Client'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.yar.entities.yar-concurrent-client;
-
-</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/yar/yar-server-exception.xml b/reference/yar/yar-server-exception.xml
deleted file mode 100644
index c77aeeb170f6..000000000000
--- a/reference/yar/yar-server-exception.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server_Exception class</title>
- <titleabbrev>Yar_Server_Exception</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yar_Server_Exception intro -->
-  <section xml:id="yar-server-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown on the client side when the RPC request failed on the server.
-    If the remote service method itself threw an exception, its message,
-    code, file, line and class name are carried over, and
-    <methodname>Yar_Server_Exception::getType</methodname> returns the
-    class name of the original exception.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yar-server-exception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Server_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>string</type>
-     <varname linkend="yar-server-exception.props.type">_type</varname>
-     <initializer>"Yar_Exception_Server"</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-
-    <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:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Yar_Server_Exception properties -->
-  <section xml:id="yar-server-exception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yar-server-exception.props.type">
-     <term><varname>_type</varname></term>
-     <listitem>
-      <simpara>
-       The class name of the exception thrown by the remote service, or
-       <literal>"Yar_Exception_Server"</literal> if the error was not
-       caused by a userland exception. Read via
-       <methodname>Yar_Server_Exception::getType</methodname>.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.yar.entities.yar-server-exception;
-
-</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/yar/yar-server-output-exception.xml b/reference/yar/yar-server-output-exception.xml
deleted file mode 100644
index 37fb140c2b95..000000000000
--- a/reference/yar/yar-server-output-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server-output-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server_Output_Exception class</title>
- <titleabbrev>Yar_Server_Output_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-server-output-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the server cannot capture the output of the service method (exception code <constant>YAR_ERR_OUTPUT</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-server-output-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Server_Output_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Server_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-server-packager-exception.xml b/reference/yar/yar-server-packager-exception.xml
deleted file mode 100644
index 192d4e519b4e..000000000000
--- a/reference/yar/yar-server-packager-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server-packager-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server_Packager_Exception class</title>
- <titleabbrev>Yar_Server_Packager_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-server-packager-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the request body cannot be unpacked with the packager announced in the request (exception code <constant>YAR_ERR_PACKAGER</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-server-packager-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Server_Packager_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Server_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-server-protocol-exception.xml b/reference/yar/yar-server-protocol-exception.xml
deleted file mode 100644
index 52d5aa9f6e4d..000000000000
--- a/reference/yar/yar-server-protocol-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server-protocol-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server_Protocol_Exception class</title>
- <titleabbrev>Yar_Server_Protocol_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-server-protocol-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the incoming request violates the Yar protocol, for example a malformed request header (exception code <constant>YAR_ERR_PROTOCOL</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-server-protocol-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Server_Protocol_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Server_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-server-request-exception.xml b/reference/yar/yar-server-request-exception.xml
deleted file mode 100644
index f2eae9ff66bf..000000000000
--- a/reference/yar/yar-server-request-exception.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server-request-exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server_Request_Exception class</title>
- <titleabbrev>Yar_Server_Request_Exception</titleabbrev>
-
- <partintro>
-
-  <section xml:id="yar-server-request-exception.intro">
-   &reftitle.intro;
-   <simpara>
-    Thrown when the requested remote method does not exist on the server object, or is not public (exception code <constant>YAR_ERR_REQUEST</constant>).
-   </simpara>
-  </section>
-
-  <section xml:id="yar-server-request-exception.synopsis">
-   &reftitle.classsynopsis;
-
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Yar_Server_Request_Exception</exceptionname>
-    </ooexception>
-
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Yar_Server_Exception</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))"/>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server-exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server_Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Exception'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])"/>
-   </classsynopsis>
-
-  </section>
-
- </partintro>
-
-</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/yar/yar-server.xml b/reference/yar/yar-server.xml
deleted file mode 100644
index 4ffdc1203f36..000000000000
--- a/reference/yar/yar-server.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.yar-server" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The Yar_Server class</title>
- <titleabbrev>Yar_Server</titleabbrev>
-
- <partintro>
-
-<!-- {{{ Yar_Server intro -->
-  <section xml:id="yar-server.intro">
-   &reftitle.intro;
-   <simpara>
-    Wraps an object and exposes all of its public methods as a remote
-    service, served over HTTP by
-    <methodname>Yar_Server::handle</methodname>.
-   </simpara>
-   <simpara>
-    The PHP extension only provides an HTTP server. A TCP and Unix
-    socket server speaking the same Yar protocol is provided by the
-    <link xlink:href="&url.git.hub;laruence/yar-c">Yar C framework</link>.
-   </simpara>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="yar-server.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <classname>Yar_Server</classname>
-    </ooclass>
-
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>protected</modifier>
-     <type>object</type>
-     <varname linkend="yar-server.props.executor">_executor</varname>
-     <initializer>null</initializer>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Yar_Server'])"/>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.yar-server')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Yar_Server'])"/>
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Yar_Server properties -->
-  <section xml:id="yar-server.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="yar-server.props.executor">
-     <term><varname>_executor</varname></term>
-     <listitem>
-      <simpara>
-       The object whose public methods are exposed as RPC services.
-      </simpara>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
- </partintro>
-
- &reference.yar.entities.yar-server;
-
-</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/yar/yar_client/call.xml b/reference/yar/yar_client/call.xml
deleted file mode 100644
index cfb5ccc8dc2d..000000000000
--- a/reference/yar/yar_client/call.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-client.call" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Client::call</refname>
-  <refpurpose>Call a remote service</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Client">
-   <modifier>public</modifier> <type>mixed</type><methodname>Yar_Client::call</methodname>
-   <methodparam><type>string</type><parameter>method</parameter></methodparam>
-   <methodparam><type>array</type><parameter>arguments</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Issues an RPC call to the remote method <literal>method</literal>. This
-   is exactly what happens when a non-existent method is invoked on a
-   <classname>Yar_Client</classname> object (via PHP's
-   <literal>__call</literal> magic method);
-   <methodname>Yar_Client::call</methodname> only exists so that remote
-   methods literally named <literal>call</literal> or
-   <literal>__call</literal> can still be reached.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>method</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the remote service method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>arguments</parameter></term>
-    <listitem>
-     <simpara>
-      The list of arguments passed to the remote method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the return value of the remote service method.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   When the remote method does not exist on the server, or is not
-   public, the client throws a
-   <exceptionname>Yar_Client_Exception</exceptionname> with the code
-   <constant>YAR_ERR_REQUEST</constant>. See
-   <link linkend="class.yar-client-exception">Yar_Client_Exception</link>
-   for the other client-side failures and their exception classes.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Client::call</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-/* The usual way: invoke the remote method as if it were local.
- * This is translated into call("add", array(1, 2)) behind the scenes. */
-var_dump($client->add(1, 2));
-
-/* Equivalent: call the method explicitly by name */
-var_dump($client->call("add", array(1, 2)));
-
-/* Needed only when the remote service literally exposes a method
- * named call (or __call), which the magic __call cannot reach */
-var_dump($client->call("call", array($some_argument)));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(3)
-int(3)
-...
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Client::setOpt</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/yar/yar_client/construct.xml b/reference/yar/yar_client/construct.xml
deleted file mode 100644
index 6e2bde9899fd..000000000000
--- a/reference/yar/yar_client/construct.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-client.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Client::__construct</refname>
-  <refpurpose>Create a client</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="Yar_Client">
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>Yar_Client::__construct</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>options</parameter><initializer>null</initializer></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates a <classname>Yar_Client</classname> for the RPC service located
-   at <literal>uri</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>
-      Address of the RPC service. The protocol is derived from the scheme:
-      <literal>http://</literal> and <literal>https://</literal> select the
-      HTTP transport, <literal>tcp://</literal> selects the TCP transport,
-      and <literal>unix://</literal> selects the Unix socket transport.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An &array; of client options, keyed by the
-      <literal>YAR_OPT_*</literal> constants, equivalent to calling
-      <methodname>Yar_Client::setOpt</methodname> for each entry. Invalid
-      options are silently skipped.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   A new <classname>Yar_Client</classname> instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   If the URI does not start with a supported scheme, a
-   <exceptionname>Yar_Client_Protocol_Exception</exceptionname> is thrown.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Client::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-/* with options */
-$client = new Yar_Client("http://api.example.com/operator.php", [
-    YAR_OPT_TIMEOUT => 1000,
-    YAR_OPT_PACKAGER => "json",
-]);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Client::call</methodname></member>
-   <member><methodname>Yar_Client::setOpt</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/yar/yar_client/getopt.xml b/reference/yar/yar_client/getopt.xml
deleted file mode 100644
index b701db0ccbe0..000000000000
--- a/reference/yar/yar_client/getopt.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-client.getopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Client::getOpt</refname>
-  <refpurpose>Read a client option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Client">
-   <modifier>public</modifier> <type>mixed</type><methodname>Yar_Client::getOpt</methodname>
-   <methodparam><type>int</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Returns the value previously set with
-   <methodname>Yar_Client::setOpt</methodname>, or with the
-   <literal>options</literal> parameter of
-   <methodname>Yar_Client::__construct</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <literal>YAR_OPT_*</literal> constants, see
-      <methodname>Yar_Client::setOpt</methodname>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The option value, or &false; if the option has not been set on this
-   client or the option name is unknown.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Client::getOpt</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("http://api.example.com/operator.php");
-$client->setOpt(YAR_OPT_TIMEOUT, 1000);
-
-var_dump($client->getOpt(YAR_OPT_TIMEOUT));
-var_dump($client->getOpt(YAR_OPT_PACKAGER));
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-int(1000)
-bool(false)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Client::setOpt</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/yar/yar_client/setopt.xml b/reference/yar/yar_client/setopt.xml
deleted file mode 100644
index 860c7776a5d3..000000000000
--- a/reference/yar/yar_client/setopt.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-client.setopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Client::setOpt</refname>
-  <refpurpose>Set client options</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Client">
-   <modifier>public</modifier> <type class="union"><type>Yar_Client</type><type>bool</type></type><methodname>Yar_Client::setOpt</methodname>
-   <methodparam><type>int</type><parameter>name</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <simpara>
-   Sets an option on the client. Options are evaluated when a call is
-   issued, so they can be changed between calls.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>name</parameter></term>
-    <listitem>
-     <simpara>
-      One of the <literal>YAR_OPT_*</literal> constants:
-     </simpara>
-     <simplelist>
-      <member><constant>YAR_OPT_PACKAGER</constant> — a packager name: <literal>php</literal>, <literal>json</literal> or, when built with msgpack support, <literal>msgpack</literal></member>
-      <member><constant>YAR_OPT_PERSISTENT</constant> — a boolean persistent-connection flag (HTTP keep-alive)</member>
-      <member><constant>YAR_OPT_TIMEOUT</constant> — a timeout in milliseconds, overriding <link linkend="ini.yar.timeout">yar.timeout</link></member>
-      <member><constant>YAR_OPT_CONNECT_TIMEOUT</constant> — a connect timeout in milliseconds, overriding <link linkend="ini.yar.connect-timeout">yar.connect_timeout</link></member>
-      <member><constant>YAR_OPT_HEADER</constant> (as of 2.0.4) — an &array; of additional HTTP header lines</member>
-      <member><constant>YAR_OPT_RESOLVE</constant> (as of 2.1.0) — an &array; of hostname resolution entries</member>
-      <member><constant>YAR_OPT_PROXY</constant> (as of 2.2.0) — an HTTP proxy address</member>
-      <member><constant>YAR_OPT_PROVIDER</constant> (as of 2.3.0) — the provider identity, up to 32 bytes</member>
-      <member><constant>YAR_OPT_TOKEN</constant> (as of 2.3.0) — the authentication token, up to 32 bytes</member>
-     </simplelist>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <simpara>
-      The option value. An invalid value raises a warning and makes the call
-      return &false;.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the client object itself, allowing a fluent interface, or
-   &false; when the option name is unknown, the value is invalid, or the
-   option does not apply to the protocol the client was created with.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   Conditions that make the call return &false; also raise a warning:
-  </simpara>
-  <itemizedlist>
-   <listitem>
-    <simpara>
-     <constant>YAR_OPT_HEADER</constant>,
-     <constant>YAR_OPT_RESOLVE</constant> and
-     <constant>YAR_OPT_PROXY</constant> only work with the HTTP protocol;
-     using them with a <literal>tcp://</literal> or
-     <literal>unix://</literal> client raises a warning.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     <constant>YAR_OPT_RESOLVE</constant> additionally requires libcurl
-     &gt;= 7.21.3.
-    </simpara>
-   </listitem>
-   <listitem>
-    <simpara>
-     Each option expects a specific value type (string, boolean, integer or
-     array), described on the
-     <link linkend="yar.constants">constants</link> page.
-    </simpara>
-   </listitem>
-  </itemizedlist>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Client::setOpt</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-/* Set timeout to 1s */
-$client->setOpt(YAR_OPT_TIMEOUT, 1000);
-
-/* Set packager to JSON */
-$client->setOpt(YAR_OPT_PACKAGER, "json");
-
-/* Set custom headers */
-$client->setOpt(YAR_OPT_HEADER, ["X-Api-Key: value"]);
-
-/* Route through an HTTP proxy */
-$client->setOpt(YAR_OPT_PROXY, "127.0.0.1:8888");
-
-/* call remote service */
-$result = $client->some_method("parameter");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Client::getOpt</methodname></member>
-   <member><methodname>Yar_Client::call</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/yar/yar_client_exception/gettype.xml b/reference/yar/yar_client_exception/gettype.xml
deleted file mode 100644
index 9b664bb3b641..000000000000
--- a/reference/yar/yar_client_exception/gettype.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-client-exception.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Client_Exception::getType</refname>
-  <refpurpose>Retrieve exception's type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Client_Exception">
-   <modifier>public</modifier> <type>string</type><methodname>Yar_Client_Exception::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Returns the type of the exception. Client-side exceptions are raised by
-   the client itself (transport failures, protocol errors and so on), so
-   the type is always the fixed string
-   <literal>"Yar_Exception_Client"</literal>. Use
-   <methodname>Exception::getCode</methodname> to tell the individual
-   failure apart; the code is one of the <literal>YAR_ERR_*</literal>
-   constants.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns <literal>"Yar_Exception_Client"</literal>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Client_Exception::getType</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-try {
-    $client->some_method("parameter");
-} catch (Yar_Client_Exception $e) {
-    var_dump($e->getType());
-    var_dump($e->getCode());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(20) "Yar_Exception_Client"
-int(16)
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Server_Exception::getType</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/yar/yar_concurrent_client/call.xml b/reference/yar/yar_concurrent_client/call.xml
deleted file mode 100644
index 79d6fb89e5a0..000000000000
--- a/reference/yar/yar_concurrent_client/call.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-concurrent-client.call" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Concurrent_Client::call</refname>
-  <refpurpose>Register a concurrent call</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Concurrent_Client">
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>int</type><type>false</type><type>null</type></type><methodname>Yar_Concurrent_Client::call</methodname>
-   <methodparam><type>string</type><parameter>uri</parameter></methodparam>
-   <methodparam><type>string</type><parameter>method</parameter></methodparam>
-   <methodparam choice="opt"><type class="union"><type>array</type><type>null</type></type><parameter>parameters</parameter><initializer>null</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter><initializer>null</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>error_callback</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>
-  </methodsynopsis>
-  <simpara>
-   Registers a remote RPC call. The request is not sent immediately; all
-   registered calls are sent together by
-   <methodname>Yar_Concurrent_Client::loop</methodname>, and the responses
-   are handled as they arrive.
-  </simpara>
-  <note>
-   <simpara>
-    Only HTTP and HTTPS URIs are supported. Concurrent calls are sent
-    simultaneously using curl's multi-handle interface, and the TCP/Unix
-    socket transport does not provide this facility.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>uri</parameter></term>
-    <listitem>
-     <simpara>
-      Address of the RPC service, starting with
-      <literal>http://</literal> or <literal>https://</literal>.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>method</parameter></term>
-    <listitem>
-     <simpara>
-      The name of the remote service method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>parameters</parameter></term>
-    <listitem>
-     <simpara>
-      The list of arguments passed to the remote method.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>callable</type> invoked when the response for this call
-      arrives, with two arguments: the response value, and a
-      <literal>callinfo</literal> &array; describing the call:
-     </simpara>
-     <simplelist>
-      <member><literal>sequence</literal> — the sequence number returned
-       when the call was registered</member>
-      <member><literal>uri</literal> — the address of the service</member>
-      <member><literal>method</literal> — the name of the remote method</member>
-     </simplelist>
-     <simpara>
-      If omitted, the <literal>callback</literal> of
-      <methodname>Yar_Concurrent_Client::loop</methodname> is used;
-      see that method for what happens when neither is given.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_callback</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>callable</type> invoked when this call fails, with three
-      arguments: the error type (one of the <literal>YAR_ERR_*</literal>
-      codes), the error message, and the <literal>callinfo</literal>
-      &array; described above. If omitted, the
-      <literal>error_callback</literal> of
-      <methodname>Yar_Concurrent_Client::loop</methodname> is used;
-      see that method for what happens when neither is given.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An &array; of client options, keyed by the
-      <literal>YAR_OPT_*</literal> constants, see
-      <methodname>Yar_Client::setOpt</methodname>. Applied to this call
-      only.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns the sequence number of the registered call, a unique ID
-   starting from <literal>1</literal> that identifies the call. Returns
-   &false; when the concurrent client is already inside
-   <methodname>Yar_Concurrent_Client::loop</methodname> or when the maximum
-   of <literal>128</literal> registered calls is reached; in both cases a
-   warning is raised. Returns &null; if the URI or method name is empty, or
-   the URI is not an HTTP(S) address, with a warning.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <informalexample>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-function callback($retval, $callinfo)
-{
-    var_dump($retval);
-}
-
-function error_callback($type, $error, $callinfo)
-{
-    error_log($error);
-}
-
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"), "callback");
-
-/* If the callback is not specified, the callback of loop() will be used */
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"));
-
-/* This server accepts the JSON packager */
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"), "callback", NULL, array(YAR_OPT_PACKAGER => "json"));
-
-/* Custom timeout */
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"), "callback", NULL, array(YAR_OPT_TIMEOUT => 1000));
-
-/* The requests are not sent yet */
-]]>
-   </programlisting>
-  </informalexample>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Concurrent_Client::loop</methodname></member>
-   <member><methodname>Yar_Concurrent_Client::reset</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/yar/yar_concurrent_client/loop.xml b/reference/yar/yar_concurrent_client/loop.xml
deleted file mode 100644
index 8376bc566d4f..000000000000
--- a/reference/yar/yar_concurrent_client/loop.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-concurrent-client.loop" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Concurrent_Client::loop</refname>
-  <refpurpose>Send and wait for all registered calls</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Concurrent_Client">
-   <modifier>public</modifier> <modifier>static</modifier> <type class="union"><type>bool</type><type>null</type></type><methodname>Yar_Concurrent_Client::loop</methodname>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>callback</parameter><initializer>null</initializer></methodparam>
-   <methodparam choice="opt"><type class="union"><type>callable</type><type>null</type></type><parameter>error_callback</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>
-  </methodsynopsis>
-  <simpara>
-   Sends all calls registered with
-   <methodname>Yar_Concurrent_Client::call</methodname> in parallel and
-   blocks until every response has arrived and been handled. The call list
-   is emptied when this method returns.
-  </simpara>
-  <simpara>
-   Because the calls run simultaneously, the loop takes only as long as
-   the slowest single call rather than the sum of all calls. The
-   callbacks, however, are not invoked in the order the calls were
-   registered: a callback fires as soon as its response arrives. To find
-   out which call a response belongs to, check the
-   <literal>sequence</literal> entry of the <literal>callinfo</literal>
-   argument against the sequence number returned by
-   <methodname>Yar_Concurrent_Client::call</methodname>. The
-   <literal>callinfo</literal> &array; holds the
-   <literal>sequence</literal>, <literal>uri</literal> and
-   <literal>method</literal> of the call; see
-   <methodname>Yar_Concurrent_Client::call</methodname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>callback</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>callable</type> used to handle responses for calls that were
-      registered without their own callback. Right after all requests have
-      been sent, it is additionally called once with two &null; arguments,
-      before any response arrives.
-     </simpara>
-     <simpara>
-      If this parameter is omitted, the return value of a successful call
-      is simply printed when its response arrives.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>error_callback</parameter></term>
-    <listitem>
-     <simpara>
-      A <type>callable</type> used to handle errors for calls that were
-      registered without their own error callback. It receives three
-      arguments: the error type (one of the <literal>YAR_ERR_*</literal>
-      codes), the error message, and the <literal>callinfo</literal>
-      &array;.
-     </simpara>
-     <simpara>
-      If this parameter is omitted, a failed call raises a PHP warning
-      instead; unlike the synchronous
-      <classname>Yar_Client</classname>, no exception is thrown.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>options</parameter></term>
-    <listitem>
-     <simpara>
-      An &array; of client options, keyed by the
-      <literal>YAR_OPT_*</literal> constants, applied to every registered
-      call that does not override them.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true; when every registered call has been handled, or when no
-   calls have been registered at all. Returns &false; if the concurrent
-   client is already running inside another loop; in that case a warning is
-   raised.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Concurrent_Client::loop</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function callback($retval, $callinfo) {
-    if ($callinfo == NULL) {
-        echo "Now, all requests are sent, and no response available\n";
-    } else {
-        echo "This is a remote call response, the method name is ", $callinfo["method"],
-             ". calling sequence is ", $callinfo["sequence"], "\n";
-        var_dump($retval);
-    }
-}
-
-function error_callback($type, $error, $callinfo) {
-    error_log($error);
-}
-
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"), "callback");
-
-/* if the callback is not specified, the callback of loop() will be used */
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"));
-
-Yar_Concurrent_Client::loop("callback", "error_callback");
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-Now, all requests are sent, and no response available
-This is a remote call response, the method name is some_method. calling sequence is 2
-string(11) "some_method"
-This is a remote call response, the method name is some_method. calling sequence is 1
-string(11) "some_method"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Concurrent_Client::call</methodname></member>
-   <member><methodname>Yar_Concurrent_Client::reset</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/yar/yar_concurrent_client/reset.xml b/reference/yar/yar_concurrent_client/reset.xml
deleted file mode 100644
index c05960ff6f98..000000000000
--- a/reference/yar/yar_concurrent_client/reset.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-concurrent-client.reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Concurrent_Client::reset</refname>
-  <refpurpose>Clean all registered calls</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Concurrent_Client">
-   <modifier>public</modifier> <modifier>static</modifier> <type>bool</type><methodname>Yar_Concurrent_Client::reset</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Discards all calls registered with
-   <methodname>Yar_Concurrent_Client::call</methodname> that have not been
-   sent yet.
-  </simpara>
-  <note>
-   <simpara>
-    <methodname>Yar_Concurrent_Client::loop</methodname> empties the call
-    list automatically once it has finished, so reset is only needed to
-    abort a batch that was never sent.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true;, or &false; when the concurrent client is currently inside
-   <methodname>Yar_Concurrent_Client::loop</methodname>, in which case an
-   <constant>E_WARNING</constant>-level error is raised.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><function>Yar_Concurrent_Client::reset</function> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-function callback($retval, $callinfo) {
-    var_dump($retval);
-}
-
-Yar_Concurrent_Client::call("http://api.example.com/operator.php", "some_method", array("parameters"), "callback");
-
-/* never sent: throw the registered call away */
-Yar_Concurrent_Client::reset();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Concurrent_Client::call</methodname></member>
-   <member><methodname>Yar_Concurrent_Client::loop</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/yar/yar_server/construct.xml b/reference/yar/yar_server/construct.xml
deleted file mode 100644
index c8cd795f3a78..000000000000
--- a/reference/yar/yar_server/construct.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-server.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Server::__construct</refname>
-  <refpurpose>Create an RPC server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="Yar_Server">
-   <modifier>final</modifier> <modifier>public</modifier> <methodname>Yar_Server::__construct</methodname>
-   <methodparam><type>object</type><parameter>executor</parameter></methodparam>
-  </constructorsynopsis>
-  <simpara>
-   Creates a Yar HTTP RPC server. All public methods of
-   <parameter>executor</parameter> are registered as RPC services.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>executor</parameter></term>
-    <listitem>
-     <simpara>
-      Any object whose public methods should be exposed as RPC
-      services. Protected and private methods, and methods whose name
-      starts with an underscore, are not exposed.
-     </simpara>
-     <simpara>
-      The executor can optionally define two protected magic methods,
-      which are recognized by
-      <methodname>Yar_Server::handle</methodname> and never exposed as
-      RPC endpoints:
-     </simpara>
-     <itemizedlist>
-      <listitem>
-       <simpara>
-        <literal>protected function __info(string $markup):
-        string</literal> — as of Yar 2.3.0. Called when the service
-        information page is requested; it receives the markup of the
-        page Yar would otherwise render, and if it returns a &string;,
-        that string is sent to the client instead. See
-        <methodname>Yar_Server::handle</methodname>.
-       </simpara>
-      </listitem>
-      <listitem>
-       <simpara>
-        <literal>protected function __auth(string $provider, string
-        $token): bool</literal> — as of Yar 2.3.0. Called at the very
-        beginning of every request with the
-        <literal>provider</literal> and <literal>token</literal>
-        fields of the request header, set by the client with the
-        <constant>YAR_OPT_PROVIDER</constant> and
-        <constant>YAR_OPT_TOKEN</constant> options. Returning exactly
-        &false; rejects the request; any other return value lets it
-        proceed. See <methodname>Yar_Server::handle</methodname>.
-       </simpara>
-      </listitem>
-     </itemizedlist>
-     <simpara>
-      Both methods only take effect when they are
-      <literal>protected</literal>; a public or private method with
-      the same name is ignored.
-     </simpara>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   An instance of <classname>Yar_Server</classname>.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Server::__construct</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class API {
-    /**
-     * The doc block is shown on the service info page.
-     * @param string $parameter
-     * @return string
-     */
-    public function some_method($parameter, $option = "foo") {
-         return "some_method";
-    }
-
-    protected function client_can_not_see() {
-    }
-}
-
-$service = new Yar_Server(new API());
-$service->handle();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yar_Server::handle</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/yar/yar_server/handle.xml b/reference/yar/yar_server/handle.xml
deleted file mode 100644
index feaa5ef686c5..000000000000
--- a/reference/yar/yar_server/handle.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-server.handle" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Server::handle</refname>
-  <refpurpose>Start the RPC server</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Server">
-   <modifier>public</modifier> <type>bool</type><methodname>Yar_Server::handle</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   Starts handling the incoming RPC request.
-  </simpara>
-  <note>
-   <simpara>
-    Usual RPC calls are issued as HTTP POST requests. If an HTTP GET
-    request is issued instead, the service information page, generated
-    from the public methods and their doc comments of the executor
-    object, is printed. This behaviour can be disabled with the
-    <link linkend="ini.yar.expose-info">yar.expose_info</link>
-    directive, in which case a GET request throws a
-    <exceptionname>Yar_Server_Exception</exceptionname>.
-   </simpara>
-  </note>
-  <note>
-   <simpara>
-    As of Yar 2.3.0, the executor object may define the protected
-    magic methods <literal>__info</literal> and
-    <literal>__auth</literal> to customize the service information
-    page and to authenticate requests; see
-    <methodname>Yar_Server::__construct</methodname> for details.
-   </simpara>
-  </note>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   Returns &true;.
-  </simpara>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   <table>
-    <title><methodname>Yar_Server::handle</methodname> errors</title>
-    <tgroup cols="2">
-     <thead>
-      <row>
-       <entry>Condition</entry>
-       <entry>Exception</entry>
-      </row>
-     </thead>
-     <tbody>
-      <row>
-       <entry>
-        The remote method threw an exception.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Exception</exceptionname> (with the
-        original class name in its <literal>_type</literal> property).
-       </entry>
-      </row>
-      <row>
-       <entry>
-        The remote method was not found or is not public.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Request_Exception</exceptionname>.
-       </entry>
-      </row>
-      <row>
-       <entry>
-        The request body could not be unpacked.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Packager_Exception</exceptionname>.
-       </entry>
-      </row>
-      <row>
-       <entry>
-        The request is malformed on the protocol level.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Protocol_Exception</exceptionname>.
-       </entry>
-      </row>
-      <row>
-       <entry>
-        The server output could not be captured.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Output_Exception</exceptionname>.
-       </entry>
-      </row>
-      <row>
-       <entry>
-        Authentication failed, or the info page was requested while
-        <link linkend="ini.yar.expose-info">yar.expose_info</link> is
-        off.
-       </entry>
-       <entry>
-        <exceptionname>Yar_Server_Exception</exceptionname> with code
-        <constant>YAR_ERR_FORBIDDEN</constant>.
-       </entry>
-      </row>
-     </tbody>
-    </tgroup>
-   </table>
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Server::handle</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class API {
-    /**
-     * The doc block is shown on the service info page.
-     * @param string $parameter
-     * @return string
-     */
-    public function some_method($parameter, $option = "foo") {
-        return "some_method";
-    }
-
-    protected function client_can_not_see() {
-    }
-}
-
-$service = new Yar_Server(new API());
-$service->handle();
-?>
-]]>
-   </programlisting>
-  </example>
-  <example>
-   <title>Customizing the service information page with
-   <literal>__info</literal> (as of Yar 2.3.0)</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-class API {
-    public function some_method($parameter, $option = "foo") {
-        return "some_method";
-    }
-
-    /*
-     * Must be protected. It is called on GET requests with the markup of
-     * the page Yar would otherwise render, and its string return value is
-     * sent to the client instead.
-     */
-    protected function __info($markup) {
-        return "Hello world";
-    }
-}
-
-$service = new Yar_Server(new API());
-$service->handle();
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Yar_Server::__construct</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/yar/yar_server_exception/gettype.xml b/reference/yar/yar_server_exception/gettype.xml
deleted file mode 100644
index e9edbdbad86d..000000000000
--- a/reference/yar/yar_server_exception/gettype.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="yar-server-exception.gettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Yar_Server_Exception::getType</refname>
-  <refpurpose>Retrieve exception's type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="Yar_Server_Exception">
-   <modifier>public</modifier> <type class="union"><type>string</type><type>int</type></type><methodname>Yar_Server_Exception::getType</methodname>
-   <void />
-  </methodsynopsis>
-  <simpara>
-   When a remote method throws an exception, the server embeds the original
-   exception in the response and the client re-throws it as a
-   <exceptionname>Yar_Server_Exception</exceptionname>. This method returns the
-   class name of that original exception.
-  </simpara>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <simpara>
-   The class name of the exception thrown by the remote service, or
-   <literal>"Yar_Exception_Server"</literal> when the server-side exception
-   carried no class name.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title><methodname>Yar_Server_Exception::getType</methodname> example</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Server.php */
-class Custom_Exception extends Exception {};
-
-class API {
-    public function throw_exception($name) {
-        throw new Custom_Exception($name);
-    }
-}
-
-$service = new Yar_Server(new API());
-$service->handle();
-?>
-]]>
-   </programlisting>
-   <programlisting role="php">
-<![CDATA[
-<?php
-/* Client.php */
-$client = new Yar_Client("http://api.example.com/operator.php");
-
-try {
-    $client->throw_exception("client");
-} catch (Yar_Server_Exception $e) {
-    var_dump($e->getType());
-    var_dump($e->getMessage());
-}
-?>
-]]>
-   </programlisting>
-   &example.outputs.similar;
-   <screen>
-<![CDATA[
-string(16) "Custom_Exception"
-string(6) "client"
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Yar_Client_Exception::getType</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/yaz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/yaz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/yaz/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/yaz/book.xml b/reference/yaz/book.xml
deleted file mode 100644
index 0df63a7f066f..000000000000
--- a/reference/yaz/book.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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 -->
- <preface xml:id="intro.yaz">
-  &reftitle.intro;
-  <para>
-   This extension offers a PHP interface to the
-   <productname>YAZ</productname> toolkit that implements the
-   <link xlink:href="&url.yaz-loc;">Z39.50
-   Protocol for Information Retrieval</link>.
-   With this extension you can easily implement a Z39.50 origin (client)
-   that searches or scans Z39.50 targets (servers) in parallel.
-  </para>
-  <para>
-   The module hides most of the complexity of Z39.50 so it should be
-   fairly easy to use. It supports persistent stateless connections very
-   similar to those offered by the various RDB APIs that are available
-   for PHP. This means that sessions are stateless but shared among
-   users, thus saving the connect and initialize phase steps in most
-   cases.
-  </para>
-  <para>
-   <productname>YAZ</productname> is available at <link
-   xlink:href="&url.yaz;">&url.yaz;</link>. You can find news information,
-   example scripts, etc. for this extension at <link
-   xlink:href="&url.yaz-phpyaz;">&url.yaz-phpyaz;</link>.
-  </para>
-  <note>
-   <para>
-    &pecl.moved-ver;5.0.0.
-   </para>
-  </note>
- </preface>
- <!-- }}} -->
-
- &reference.yaz.setup;
- &reference.yaz.examples;
- &reference.yaz.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/yaz/configure.xml b/reference/yaz/configure.xml
deleted file mode 100644
index d400cd6c3c4c..000000000000
--- a/reference/yaz/configure.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<section xml:id="yaz.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;yaz">&url.pecl.package;yaz</link>
- </para>
- <para>
-  &pecl.windows.download;
- </para>
- <note>
-  <title>Information specific to Windows users</title>
-  <para>
-   <filename>php_yaz.dll</filename> depends on 
-   <filename>yaz.dll</filename>. The <filename>yaz.dll</filename>
-   is part of the Win32 ZIP from the PHP site. It is also part 
-   of the Windows YAZ install available from the
-   <link xlink:href="&url.yaz.ftp.win32;">YAZ WIN32 area</link>.
-  </para>
-  <para>
-   On windows, don't forget to add the PHP directory to the <envar>PATH</envar>,
-   so that the <filename>yaz.dll</filename> file can be found by the system.
-  </para>
- </note>
-
- &warn.imaprecodeyaz;
-
-</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/yaz/examples.xml b/reference/yaz/examples.xml
deleted file mode 100644
index dd1d52e7ba8d..000000000000
--- a/reference/yaz/examples.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaz.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.examples;
- <para>
-  PHP/YAZ keeps track of connections with targets
-  (Z-Associations). A resource represents a connection to a
-  target.
- </para>
- <para>
-  The script below demonstrates the parallel searching feature of
-  the API. When invoked with no arguments it prints a query form; else
-  (arguments are supplied) it searches the targets as given in array
-  <literal>host</literal>.
- </para>
- <para>
-  <example>
-   <title>Parallel searching using Yaz</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$host=$_REQUEST[host];
-$query=$_REQUEST[query];
-$num_hosts = count($host);
-if (empty($query) || count($host) == 0) {
-    echo '<form method="get">
-    <input type="checkbox"
-    name="host[]" value="bagel.indexdata.dk/gils" />
-        GILS test
-    <input type="checkbox"
-    name="host[]" value="localhost:9999/Default" />
-        local test
-    <input type="checkbox" checked="checked"
-    name="host[]" value="z3950.loc.gov:7090/voyager" />
-        Library of Congress
-    <br />
-    RPN Query:
-    <input type="text" size="30" name="query" />
-    <input type="submit" name="action" value="Search" />
-    </form>
-    ';        
-} else {
-    echo 'You searched for ' . htmlspecialchars($query) . '<br />';
-    for ($i = 0; $i < $num_hosts; $i++) {
-        $id[] = yaz_connect($host[$i]);
-        yaz_syntax($id[$i], "usmarc");
-        yaz_range($id[$i], 1, 10);
-        yaz_search($id[$i], "rpn", $query);
-    }
-    yaz_wait();
-    for ($i = 0; $i < $num_hosts; $i++) {
-        echo '<hr />' . $host[$i] . ':';
-        $error = yaz_error($id[$i]);
-        if (!empty($error)) {
-            echo "Error: $error";
-        } else {
-            $hits = yaz_hits($id[$i]);
-            echo "Result Count $hits";
-        }
-        echo '<dl>';
-        for ($p = 1; $p <= 10; $p++) {
-            $rec = yaz_record($id[$i], $p, "string");
-            if (empty($rec)) continue;
-            echo "<dt><b>$p</b></dt><dd>";
-            echo nl2br($rec);
-            echo "</dd>";
-        }
-        echo '</dl>';
-    }
-}
-?>
-]]>
-   </programlisting>
-  </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/yaz/functions/yaz-addinfo.xml b/reference/yaz/functions/yaz-addinfo.xml
deleted file mode 100644
index 9cacab957200..000000000000
--- a/reference/yaz/functions/yaz-addinfo.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-addinfo" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_addinfo</refname>
-  <refpurpose>Returns additional error information</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>yaz_addinfo</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns additional error information for the last request on the server.
-  </para>
-  <para>
-   With some servers, this function may return the same string as 
-   <function>yaz_error</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A string containing additional error information or an empty string if the
-   last operation was successful or if no additional information was provided
-   by the server.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_error</function></member>
-    <member><function>yaz_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/yaz/functions/yaz-ccl-conf.xml b/reference/yaz/functions/yaz-ccl-conf.xml
deleted file mode 100644
index 38f7caf346cd..000000000000
--- a/reference/yaz/functions/yaz-ccl-conf.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-ccl-conf" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_ccl_conf</refname>
-  <refpurpose>Configure CCL parser</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_ccl_conf</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>array</type><parameter>config</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function configures the CCL query parser for a server with 
-   definitions of access points (CCL qualifiers) and their mapping to RPN.
-  </para>
-  <para>
-   To map a specific CCL query to RPN afterwards call the 
-   <function>yaz_ccl_parse</function> function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>config</parameter></term>
-     <listitem>
-      <para>
-       An array of configuration. Each key of the array is the name of a CCL
-       field and the corresponding value holds a string that specifies a 
-       mapping to RPN.
-      </para>
-      <para>
-       The mapping is a sequence of attribute-type, attribute-value pairs. 
-       Attribute-type and attribute-value is separated by an equal sign 
-       (<literal>=</literal>). Each pair is separated by white space.
-      </para>
-      <para>
-       Additional information can be found on the <link 
-       xlink:href="&url.yaz-ccl;">CCL</link> page.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   In the example below, the CCL parser is configured to support three CCL
-   fields: <literal>ti</literal>, <literal>au</literal> and
-   <literal>isbn</literal>. Each field is mapped to their BIB-1 equivalent.
-   It is assumed that variable <literal>$id</literal> is the connection ID.
-  </para>
-  <example>
-   <title>CCL configuration</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$fields = array(
-  "ti" => "1=4",
-  "au"   => "1=1",
-  "isbn" => "1=7"
-);
-yaz_ccl_conf($id, $fields);
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_ccl_parse</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/yaz/functions/yaz-ccl-parse.xml b/reference/yaz/functions/yaz-ccl-parse.xml
deleted file mode 100644
index b6b0350cf646..000000000000
--- a/reference/yaz/functions/yaz-ccl-parse.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-ccl-parse" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_ccl_parse</refname>
-  <refpurpose>Invoke CCL Parser</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_ccl_parse</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function invokes a CCL parser. It converts a given CCL FIND query to
-   an RPN query which may be passed to the <function>yaz_search</function> 
-   function to perform a search.
-  </para>
-  <para>
-   To define a set of valid CCL fields call <function>yaz_ccl_conf</function> 
-   prior to this function.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The CCL FIND query.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       If the function was executed successfully, this will be an array 
-       containing the valid RPN query under the key <literal>rpn</literal>.
-      </para>
-      <para>
-       Upon failure, three indexes are set in this array to indicate the cause
-       of failure: 
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>errorcode</literal> - the CCL error code (integer)
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <literal>errorstring</literal> - the CCL error string
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <literal>errorpos</literal> - approximate position in query of failure
-          (integer is character position)
-         </para>
-        </listitem> 
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>CCL Parsing</title>
-   <para>
-    We will try to search using CCL. In the example below,  
-    <literal>$ccl</literal> is a CCL query. 
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-yaz_ccl_conf($id, $fields);  // see example for yaz_ccl_conf
-if (!yaz_ccl_parse($id, $ccl, $cclresult)) {
-    echo 'Error: ' . $cclresult["errorstring"];
-} else {
-    $rpn = $cclresult["rpn"];
-    yaz_search($id, "rpn", $rpn);
-}
-?>
-]]>
-   </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/yaz/functions/yaz-close.xml b/reference/yaz/functions/yaz-close.xml
deleted file mode 100644
index 898d2eea4183..000000000000
--- a/reference/yaz/functions/yaz-close.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-close" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_close</refname>
-  <refpurpose>Close YAZ connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_close</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Closes the connection given by parameter <parameter>id</parameter>.
-  </para>
-  <note>
-   <para>
-    This function will only close a non-persistent connection opened by
-    setting the <literal>persistent</literal> option to &false; with
-    <function>yaz_connect</function>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</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>yaz_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/yaz/functions/yaz-connect.xml b/reference/yaz/functions/yaz-connect.xml
deleted file mode 100644
index cbae972fb0dc..000000000000
--- a/reference/yaz/functions/yaz-connect.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_connect</refname>
-  <refpurpose>
-   Prepares for a connection to a Z39.50 server
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>yaz_connect</methodname>
-   <methodparam><type>string</type><parameter>zurl</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function returns a connection resource on success, zero on
-   failure.
-  </para>
-  <para>
-   <function>yaz_connect</function> prepares for a connection to a
-   Z39.50 server. 
-   This function is non-blocking and does not attempt to establish
-   a connection  - it merely prepares a connect to be performed later when
-   <function>yaz_wait</function> is called.
-  </para>
-  <note>
-   <para>
-    The <link xlink:href="&url.yaz-proxy;">YAZ proxy</link> is a
-    freely available Z39.50 proxy.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>zurl</parameter></term>
-     <listitem>
-      <para>
-       A string that takes the form <literal>host[:port][/database]</literal>.
-       If port is omitted, port 210 is used. If database is omitted 
-       <literal>Default</literal> is used.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       If given as a string, it is treated as the Z39.50 V2 authentication 
-       string (OpenAuth).
-      </para>
-      <para>
-       If given as an array, the contents of the array serves as options.
-       <variablelist>
-        <varlistentry>
-         <term>user</term>
-         <listitem>
-          <para>
-           Username for authentication.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>group</term>
-         <listitem>
-          <para>
-           Group for authentication.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>password</term>
-          <listitem>
-           <para>
-            Password for authentication.
-           </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>cookie</term>
-         <listitem>
-          <para>
-           Cookie for session (YAZ proxy).
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>proxy</term>
-         <listitem>
-          <para>
-           Proxy for connection (YAZ proxy).
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>persistent</term>
-         <listitem>
-          <para>
-           A boolean. If &true; the connection is persistent; If &false; the
-           connection is not persistent. By default connections are persistent.
-          </para>
-          <note>
-           <para>
-            If you open a persistent connection, you won't be able to close 
-            it later with <function>yaz_close</function>.
-           </para>
-          </note>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>piggyback</term>
-         <listitem>
-          <para>
-           A boolean. If &true; piggyback is enabled for searches; If &false;
-           piggyback is disabled. By default piggyback is enabled.
-          </para>
-          <para>
-           Enabling piggyback is more efficient and usually saves a 
-           network-round-trip for first time fetches of records. However, a 
-           few Z39.50 servers do not support piggyback or they ignore element
-           set names. For those, piggyback should be disabled.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term>charset</term>
-         <listitem>
-          <para>
-           A string that specifies character set to be used in Z39.50 
-           language and character set negotiation. Use strings such as:
-           <literal>ISO-8859-1</literal>, <literal>UTF-8</literal>, 
-           <literal>UTF-16</literal>.
-          </para>
-          <para>
-           Most Z39.50 servers do not support this feature (and thus, this is
-           ignored). Many servers use the ISO-8859-1 encoding for queries and
-           messages. MARC21/USMARC records are not affected by this setting.
-          </para>
-         </listitem>
-        </varlistentry>
-
-        <varlistentry>
-         <term>preferredMessageSize</term>
-         <listitem>
-          <para>
-           An integer that specifies the maximum byte size of all records
-           to be returned by a target during retrieval. See the
-           <link xlink:href="&url.yaz.z3950.4;">Z39.50 standard</link> for more
-           information.
-          </para>
-          <note>
-           <para>
-            This option is supported in PECL YAZ 1.0.5 or later.
-           </para>
-          </note>
-         </listitem>
-        </varlistentry>
-
-        <varlistentry>
-         <term>maximumRecordSize</term>
-         <listitem>
-          <para>
-           An integer that specifies the maximum byte size of a single record
-           to be returned by a target during retrieval. This
-           entity is referred to as Exceptional-record-size in the
-          <link xlink:href="&url.yaz.z3950.4;">Z39.50 standard</link>.
-          </para>
-          <note>
-           <para>
-            This option is supported in PECL YAZ 1.0.5 or later.
-           </para>
-          </note>
-         </listitem>
-        </varlistentry>
-
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   A connection resource on success, &false; on error.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_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/yaz/functions/yaz-database.xml b/reference/yaz/functions/yaz-database.xml
deleted file mode 100644
index 6b240dc20f8f..000000000000
--- a/reference/yaz/functions/yaz-database.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-database" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_database</refname>
-  <refpurpose>
-   Specifies the databases within a session
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_database</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>databases</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function allows you to change databases within a session by 
-   specifying one or more databases to be used in search, retrieval, etc.
-   - overriding databases specified in call to 
-   <function>yaz_connect</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>databases</parameter></term>
-     <listitem>
-      <para>
-       A string containing one or more databases. Multiple databases are 
-       separated by a plus sign <literal>+</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/yaz/functions/yaz-element.xml b/reference/yaz/functions/yaz-element.xml
deleted file mode 100644
index bf5e402648bd..000000000000
--- a/reference/yaz/functions/yaz-element.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-element" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_element</refname>
-  <refpurpose>
-   Specifies Element-Set Name for retrieval
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_element</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>elementset</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function sets the element set name for retrieval.
-  </para>
-  <para>
-   Call this function before <function>yaz_search</function> or
-   <function>yaz_present</function> to specify the element set name for
-   records to be retrieved.
-  </para>
-  <note>
-   <para>
-    If this function appears to have no effect, see the description of the 
-    <literal>piggybacking</literal> option in 
-    <function>yaz_connect</function>.
-   </para>
-  </note>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>elementset</parameter></term>
-     <listitem>
-      <para>
-       Most servers support <literal>F</literal> (for full records) and
-       <literal>B</literal> (for brief records).
-      </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/yaz/functions/yaz-errno.xml b/reference/yaz/functions/yaz-errno.xml
deleted file mode 100644
index 7d2cd74c0d8c..000000000000
--- a/reference/yaz/functions/yaz-errno.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-errno" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_errno</refname>
-  <refpurpose>Returns error number</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>yaz_errno</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns an error number for the server (last request) identified by
-   <parameter>id</parameter>.
-  </para>
-  <para>
-   <function>yaz_errno</function> should be called after network activity for
-   each server - (after <function>yaz_wait</function> returns) to determine the
-   success or failure of the last operation (e.g. search).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an error code. The error code is either a Z39.50 diagnostic code
-   (usually a Bib-1 diagnostic) or a client side error code which is 
-   generated by PHP/YAZ itself, such as "Connect failed", "Init Rejected", 
-   etc.  
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_error</function></member>
-    <member><function>yaz_addinfo</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/yaz/functions/yaz-error.xml b/reference/yaz/functions/yaz-error.xml
deleted file mode 100644
index 2def601a9438..000000000000
--- a/reference/yaz/functions/yaz-error.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-error" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_error</refname>
-  <refpurpose>Returns error description</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>yaz_error</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_error</function> returns an English text message
-   corresponding to the last error number as returned by
-   <function>yaz_errno</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an error text message for server (last request), identified by
-   parameter <parameter>id</parameter>. An empty string is returned if the
-   last operation was successful.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_errno</function></member>
-    <member><function>yaz_addinfo</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/yaz/functions/yaz-es-result.xml b/reference/yaz/functions/yaz-es-result.xml
deleted file mode 100644
index 8acb4fdc7b20..000000000000
--- a/reference/yaz/functions/yaz-es-result.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-es-result" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_es_result</refname>
-  <refpurpose>
-   Inspects Extended Services Result
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>yaz_es_result</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This function inspects the last returned Extended Service
-   result from a server. An Extended Service is  initiated
-   by either <function>yaz_item_order</function> or
-   <function>yaz_es</function>.
-  </para>
-
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns array with element <literal>targetReference</literal>
-   for the reference for the extended service operation (generated
-   and returned from the server).
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_es</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/yaz/functions/yaz-es.xml b/reference/yaz/functions/yaz-es.xml
deleted file mode 100644
index bd2a9f491c7e..000000000000
--- a/reference/yaz/functions/yaz-es.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-es" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_es</refname>
-  <refpurpose>
-   Prepares for an Extended Service Request
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_es</methodname>
-   <methodparam>
-    <type>resource</type><parameter>id</parameter>
-   </methodparam>
-   <methodparam>
-    <type>string</type><parameter>type</parameter>
-   </methodparam>
-   <methodparam>
-    <type>array</type><parameter>args</parameter>
-   </methodparam>
-  </methodsynopsis>
-  <simpara>
-   This function prepares for an Extended Service Request.
-   Extended Services is a family of various Z39.50 facilities, such
-   as Record Update, Item Order, Database administration etc.
-  </simpara>
-  <note>
-   <para>
-    Many Z39.50 Servers do not support Extended Services.
-   </para>
-  </note>
-  <para>
-   The <function>yaz_es</function> creates an Extended Service Request
-   packages and puts it into a queue of operations.
-   Use <function>yaz_wait</function> to send the request(s) to the server.
-   After completion of <function>yaz_wait</function> the result of
-   the Extended Service operation should be expected with
-   a call to <function>yaz_es_result</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       A string which represents the type of the Extended Service: 
-       <literal>itemorder</literal> (Item Order),
-       <literal>create</literal> (Create Database),
-       <literal>drop</literal> (Drop Database),
-       <literal>commit</literal> (Commit Operation),
-       <literal>update</literal> (Update Record),
-       <literal>xmlupdate</literal> (XML Update).
-       Each type is specified in the following section.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       An array with extended service options plus
-       package specific options. The options are identical to
-       those offered in the C API of ZOOM C. Refer to
-       the ZOOM <link xlink:href="&url.yaz.zoom.ext;">Extended Services</link>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
-
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Record Update</title>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$con = yaz_connect("myhost/database");
-$args = array (
-    "record" => "<gils><title>some title</title></gils>",
-    "syntax" => "xml",
-    "action" => "specialUpdate"
-);
-yaz_es($con, "update", $args);
-yaz_wait();
-$result = yaz_es_result($id);
-?>
-]]>
-   </programlisting>
-   </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><function>yaz_es_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/yaz/functions/yaz-get-option.xml b/reference/yaz/functions/yaz-get-option.xml
deleted file mode 100644
index 36f0b7f60d86..000000000000
--- a/reference/yaz/functions/yaz-get-option.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-get-option" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_get_option</refname>
-  <refpurpose>Returns value of option for connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>yaz_get_option</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of the option specified with <parameter>name</parameter>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter></term>
-     <listitem>
-      <para>
-       The option name.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of the specified option or an empty string if the option
-   wasn't set.
-  </para>
- </refsect1>
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member>
-     The description of <function>yaz_set_option</function> for available 
-     options
-    </member>
-   </simplelist>
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaz/functions/yaz-hits.xml b/reference/yaz/functions/yaz-hits.xml
deleted file mode 100644
index e2b4212a71d4..000000000000
--- a/reference/yaz/functions/yaz-hits.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-hits" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_hits</refname>
-  <refpurpose>Returns number of hits for last search</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>int</type><methodname>yaz_hits</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">searchresult</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_hits</function> returns the number of hits for the last
-   search. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>searchresult</parameter></term>
-     <listitem>
-      <para>
-       Result array for detailed search result information.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the number of hits for the last search or 0 if no search was 
-   performed.
-  </para>
-  <para>
-   The search result array (if supplied) holds information that
-   is returned by a Z39.50 server in the SearchResult-1
-   format part of a search response.
-   The SearchResult-1 format can be used to obtain information
-   about hit counts for various parts of the query (subquery).
-   In particular, it is possible to obtain hit counts for the individual
-   search terms in a query. Information for first
-   subquery is in $array[0], second subquery in $array[1], and so forth.
-  </para>
-  <table>
-   <title>searchresult members</title>
-   <tgroup cols="2">
-    <colspec colwidth="1*" colname="element"/>
-    <colspec colwidth="2*" colname="description"/>
-    <thead>
-     <row>
-      <entry>Element</entry>
-      <entry>Description</entry>
-     </row>
-    </thead>
-    <tbody>
-     <row>
-      <entry><literal>id</literal></entry>
-      <entry>Sub query ID2 (string)</entry>
-     </row>
-     <row>
-      <entry><literal>count</literal></entry>
-      <entry>Result count / hits (integer)</entry>
-     </row>
-     <row>
-      <entry><literal>subquery.term</literal></entry>
-      <entry>Sub query term (string)</entry>
-     </row>
-     <row>
-      <entry><literal>interpretation.term</literal></entry>
-      <entry>Interpretated sub query term (string)</entry>
-     </row>
-     <row>
-      <entry><literal>recommendation.term</literal></entry>
-      <entry>Recommended sub query term (string)</entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>     
-  <note>
-   <para>
-    The SearchResult facility requires PECL YAZ 1.0.5
-    or later and YAZ 2.1.9 or later.
-   </para>
-  </note>
-  <note>
-   <para>
-    Very few Z39.50 implementations support the SearchResult facility.
-   </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/yaz/functions/yaz-itemorder.xml b/reference/yaz/functions/yaz-itemorder.xml
deleted file mode 100644
index 507dad05de0c..000000000000
--- a/reference/yaz/functions/yaz-itemorder.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-itemorder" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_itemorder</refname>
-  <refpurpose>
-   Prepares for Z39.50 Item Order with an ILL-Request package
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_itemorder</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>array</type><parameter>args</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function prepares for an Extended Services request using the
-   Profile for the Use of Z39.50 Item Order Extended Service to
-   Transport ILL (Profile/1). See <link xlink:href="&url.yaz.ill;">this</link>
-   and the <link xlink:href="&url.yaz.specs;">specification</link>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>args</parameter></term>
-     <listitem>
-      <para>
-       Must be an associative array with information about the Item Order 
-       request to be sent. The key of the hash is the name of the 
-       corresponding ASN.1 tag path. For example, the ISBN below the Item-ID
-       has the key item-id,ISBN. 
-      </para>
-      <para>
-       The ILL-Request parameters are:
-      </para>
-      <literallayout>
-protocol-version-num
-transaction-id,initial-requester-id,person-or-institution-symbol,person
-transaction-id,initial-requester-id,person-or-institution-symbol,institution
-transaction-id,initial-requester-id,name-of-person-or-institution,name-of-person
-transaction-id,initial-requester-id,name-of-person-or-institution,name-of-institution
-transaction-id,transaction-group-qualifier
-transaction-id,transaction-qualifier
-transaction-id,sub-transaction-qualifier
-service-date-time,this,date
-service-date-time,this,time
-service-date-time,original,date
-service-date-time,original,time
-requester-id,person-or-institution-symbol,person
-requester-id,person-or-institution-symbol,institution
-requester-id,name-of-person-or-institution,name-of-person
-requester-id,name-of-person-or-institution,name-of-institution
-responder-id,person-or-institution-symbol,person
-responder-id,person-or-institution-symbol,institution
-responder-id,name-of-person-or-institution,name-of-person
-responder-id,name-of-person-or-institution,name-of-institution
-transaction-type
-delivery-address,postal-address,name-of-person-or-institution,name-of-person
-delivery-address,postal-address,name-of-person-or-institution,name-of-institution
-delivery-address,postal-address,extended-postal-delivery-address
-delivery-address,postal-address,street-and-number
-delivery-address,postal-address,post-office-box
-delivery-address,postal-address,city
-delivery-address,postal-address,region
-delivery-address,postal-address,country
-delivery-address,postal-address,postal-code
-delivery-address,electronic-address,telecom-service-identifier
-delivery-address,electronic-address,telecom-service-addreess
-billing-address,postal-address,name-of-person-or-institution,name-of-person
-billing-address,postal-address,name-of-person-or-institution,name-of-institution
-billing-address,postal-address,extended-postal-delivery-address
-billing-address,postal-address,street-and-number
-billing-address,postal-address,post-office-box
-billing-address,postal-address,city
-billing-address,postal-address,region
-billing-address,postal-address,country
-billing-address,postal-address,postal-code
-billing-address,electronic-address,telecom-service-identifier
-billing-address,electronic-address,telecom-service-addreess
-ill-service-type
-requester-optional-messages,can-send-RECEIVED
-requester-optional-messages,can-send-RETURNED
-requester-optional-messages,requester-SHIPPED
-requester-optional-messages,requester-CHECKED-IN
-search-type,level-of-service
-search-type,need-before-date
-search-type,expiry-date
-search-type,expiry-flag
-place-on-hold
-client-id,client-name
-client-id,client-status
-client-id,client-identifier
-item-id,item-type
-item-id,call-number
-item-id,author
-item-id,title
-item-id,sub-title
-item-id,sponsoring-body
-item-id,place-of-publication
-item-id,publisher
-item-id,series-title-number
-item-id,volume-issue
-item-id,edition
-item-id,publication-date
-item-id,publication-date-of-component
-item-id,author-of-article
-item-id,title-of-article
-item-id,pagination
-item-id,ISBN
-item-id,ISSN
-item-id,additional-no-letters
-item-id,verification-reference-source
-copyright-complicance
-retry-flag
-forward-flag
-requester-note
-forward-note
-      </literallayout>
-      <para>
-       There are also a few parameters that are part of the Extended
-       Services Request package and the ItemOrder package:
-      </para>
-      <literallayout>
-package-name
-user-id
-contact-name
-contact-phone
-contact-email
-itemorder-item
-      </literallayout>
-     </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/yaz/functions/yaz-present.xml b/reference/yaz/functions/yaz-present.xml
deleted file mode 100644
index f4d6e18ee9a2..000000000000
--- a/reference/yaz/functions/yaz-present.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-present" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_present</refname>
-  <refpurpose>
-   Prepares for retrieval (Z39.50 present)
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_present</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function prepares for retrieval of records after a successful search.
-  </para>
-  <para>
-   The <function>yaz_range</function> function should be called prior to this
-   function to specify the range of records to be retrieved. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</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/yaz/functions/yaz-range.xml b/reference/yaz/functions/yaz-range.xml
deleted file mode 100644
index 1b05e732477e..000000000000
--- a/reference/yaz/functions/yaz-range.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-range" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_range</refname>
-  <refpurpose>
-   Specifies a range of records to retrieve
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_range</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>int</type><parameter>start</parameter></methodparam>
-   <methodparam><type>int</type><parameter>number</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Specifies a range of records to retrieve.
-  </para>
-  <para>
-   This function should be called before <function>yaz_search</function> or 
-   <function>yaz_present</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>start</parameter></term>
-     <listitem>
-      <para>
-       Specifies the position of the first record to be retrieved. The 
-       records numbers goes from 1 to <function>yaz_hits</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>number</parameter></term>
-     <listitem>
-      <para>
-       Specifies the number of records to be retrieved.
-      </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/yaz/functions/yaz-record.xml b/reference/yaz/functions/yaz-record.xml
deleted file mode 100644
index 9b4c7767ade6..000000000000
--- a/reference/yaz/functions/yaz-record.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-record" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_record</refname>
-  <refpurpose>Returns a record</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>string</type><methodname>yaz_record</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>int</type><parameter>pos</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The <function>yaz_record</function> function inspects a record in the
-   current result set at the position specified by parameter
-   <parameter>pos</parameter>. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>pos</parameter></term>
-     <listitem>
-      <para>
-       The record position. Records positions in a result set are numbered 1,
-       2, ... $hits where $hits is the count returned by <function>yaz_hits</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The <parameter>type</parameter> specifies the form of the
-       returned record.
-      </para>
-      <note>
-       <para>
-        It is the application which is responsible for actually
-        ensuring that the records are returned from the Z39.50/SRW server
-        in the proper format. The type given only specifies a conversion
-        to take place on the client side (in PHP/YAZ).
-       </para>
-      </note>
-      <para>
-       Besides conversion of the transfer record to a string/array, PHP/YAZ
-       it is also possible to perform a character set conversion of the
-       record. Especially for USMARC/MARC21 that is recommended since
-       these are typically returned in the character set MARC-8 that is
-       not supported by browsers, etc. To specify a conversion, add
-       <literal>; charset=</literal><replaceable>from</replaceable><literal>,
-       </literal><replaceable>to</replaceable> where
-       <replaceable>from</replaceable> is the original character set 
-       of the record and <replaceable>to</replaceable> is the resulting character
-       set (as seen by PHP).
-      </para>
-      <variablelist>
-       <varlistentry>
-        <term><literal>string</literal></term>
-        <listitem>
-         <para>
-          The record is returned as a string for simple display.
-          In this mode, all MARC records are converted to a line-by-line format
-          since ISO2709 is hardly readable.
-          XML records and SUTRS are returned in their original format.
-          GRS-1 are returned in a (ugly) line-by-line format.
-         </para>
-         <para>
-          This format is suitable if records are to be displayed in a quick
-          way - for debugging - or because it is not feasible to perform
-          proper display.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><literal>xml</literal></term>
-        <listitem>
-         <para>
-          The record is returned as an XML string if possible.
-          In this mode, all MARC records are converted to 
-          <link xlink:href="&url.yaz-marcxml;">MARCXML</link>.
-          XML records and SUTRS are returned in their original format.
-          GRS-1 is not supported.
-         </para>
-         <para>
-          This format is similar to <parameter>string</parameter> except that
-          MARC records are converted to MARCXML
-         </para>
-         <para>
-          This format is suitable if records are processed by an XML parser
-          or XSLT processor afterwards.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><literal>raw</literal></term>
-        <listitem>
-         <para>
-          The record is returned as a string in its original form.
-          This type is suitable for MARC, XML and SUTRS. It does not
-          work for GRS-1.
-         </para>
-         <para>
-          MARC records are returned as a ISO2709 string. XML and SUTRS are
-          returned as strings.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><literal>syntax</literal></term>
-        <listitem>
-         <para>
-          The syntax of the record is returned as a string, i.e.
-          <literal>USmarc</literal>, <literal>GRS-1</literal>,
-          <literal>XML</literal>, etc.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><literal>database</literal></term>
-        <listitem>
-         <para>
-          The name of database associated with record at the position
-          is returned as a string.
-         </para>
-        </listitem>
-       </varlistentry>
-       <varlistentry>
-        <term><literal>array</literal></term>
-        <listitem>
-         <para>
-          The record is returned as an array that reflects the GRS-1
-          structure. This type is suitable for MARC and GRS-1. XML, SUTRS
-          are not supported and if the actual record is XML or SUTRS an
-          empty string will be returned.
-         </para>
-         <para>
-          The array returned consists of a list corresponding to
-          each leaf/internal node of GRS-1. Each list item consists
-          a sub list with first element <emphasis>path</emphasis> and
-          <emphasis>data</emphasis> (if data is available).
-         </para>
-         <para>
-          The path which is a string holds a list of each tree component (of
-          the structured GRS-1 record) from root to leaf. Each component is
-          a tag type, tag value pair of the form
-          <literal>(</literal><replaceable>type</replaceable><literal>,</literal>
-          <replaceable>value</replaceable>
-         </para>
-         <para>
-          String tags normally has a corresponding tag type 3.
-          MARC can also be returned as an array (they are converted to
-          GRS-1 internally).
-         </para>
-        </listitem>
-       </varlistentry>
-      </variablelist>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>    
-   Returns the record at position <parameter>pos</parameter> or an empty
-   string if no record exists at the given position.
-  </para>
-  <para>
-   If no database record exists at the given position an empty string is 
-   returned.
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Array for GRS-1 record</title>
-   <para>
-    Consider this GRS-1 record:
-    <screen>
-<![CDATA[
-(4,52)Robert M. Pirsig
-(4,70)
-      (4,90)
-            (2,7)Transworld Publishers, ltd.
-]]>
-    </screen>
-    This record has two nodes at root level. First element at root level is
-    (4,52) [tag type 4, tag value 52], and has data <literal>Robert M. 
-    Pirsig</literal>. Second element at root level (4,70) has a subtree with
-    a single element (4,90). (4,90) has yet another sub tree (2,7) with data
-    <literal>Transworld Publishers, ltd.</literal>.
-   </para>
-   <para>
-    If this record is present at position $p, then
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-$ar = yaz_record($id, $p, "array");
-print_r($ar);
-
-?>
-]]>
-    </programlisting>
-    will output:
-    <screen>
-<![CDATA[
-Array
-(
-    [0] => Array
-        (
-            [0] => (4,52)
-            [1] => Robert M. Pirsig
-        )
-    [1] => Array
-        (
-            [0] => (4,70)
-        )
-    [2] => Array
-        (
-            [0] => (4,70)(4,90)
-        )
-    [3] => Array
-        (
-            [0] => (4,70)(4,90)(2,7)
-            [1] => Transworld Publishers, ltd.
-        )
-)      
-]]>
-    </screen>
-   </para>
-  </example>
-  <example>
-   <title>Working with MARCXML</title>
-   <para>
-    The following PHP snippet returns a MARC21/USMARC record as MARCXML. 
-    The original record is returned in marc-8 (unknown to most XML parsers),
-    so we convert it to UTF-8 (which all XML parsers must support).
-    <programlisting role="php">
-<![CDATA[
-<?php
-$rec = yaz_record($id, $p, "xml; charset=marc-8,utf-8");
-?>
-]]>
-    </programlisting>
-   </para>
-   <para>
-    The record <literal>$rec</literal> can be processed with the 
-    Sablotron XSLT processor as follows:
-   </para>
-   <para>
-    <programlisting role="php">
-<![CDATA[ 
-<?php
-
-$xslfile = 'display.xsl';
-$processor = xslt_create();
-$parms = array('/_xml' => $rec);
-$res = xslt_process($processor, 'arg:/_xml', $xslfile, NULL, $parms);
-xslt_free($processor);
-$res = preg_replace("'</?html[^>]*>'", '', $res);
-echo $res;
-
-?>
-]]>
-    </programlisting>
-   </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaz/functions/yaz-scan-result.xml b/reference/yaz/functions/yaz-scan-result.xml
deleted file mode 100644
index 3d8795ec7cb0..000000000000
--- a/reference/yaz/functions/yaz-scan-result.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-scan-result" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_scan_result</refname>
-  <refpurpose>Returns Scan Response result</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>array</type><methodname>yaz_scan_result</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">result</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_scan_result</function> returns terms and associated
-   information as received from the server in the last performed
-   <function>yaz_scan</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>result</parameter></term>
-     <listitem>
-      <para>
-       If given, this array will be modified to hold additional information 
-       taken from the Scan Response:
-       <itemizedlist>
-        <listitem>
-         <para>
-          <literal>number</literal> - Number of entries returned
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <literal>stepsize</literal> - Step size
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <literal>position</literal> - Position of term
-         </para>
-        </listitem> 
-        <listitem>
-         <para>
-          <literal>status</literal> - Scan status
-         </para>
-        </listitem> 
-       </itemizedlist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array (0..n-1) where n is the number of terms returned. Each 
-   value is a pair where the first item is the term, and the second item is 
-   the result-count.
-  </para>
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaz/functions/yaz-scan.xml b/reference/yaz/functions/yaz-scan.xml
deleted file mode 100644
index d2006b3be756..000000000000
--- a/reference/yaz/functions/yaz-scan.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-scan" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_scan</refname>
-  <refpurpose>Prepares for a scan</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_scan</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>startterm</parameter></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter>flags</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function prepares for a Z39.50 Scan Request on the specified 
-   connection.
-  </para>
-  <para>
-   To actually transfer the Scan Request to the server and receive the
-   Scan Response, <function>yaz_wait</function> must be called. Upon
-   completion of <function>yaz_wait</function> call
-   <function>yaz_error</function> and <function>yaz_scan_result</function> to
-   handle the response.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       Currently only type <literal>rpn</literal> is supported.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>startterm</parameter></term>
-     <listitem>
-      <para>
-       Starting term point for the scan.
-      </para>
-      <para>
-       The form in which the starting term is specified is given by parameter
-       <parameter>type</parameter>.
-      </para>
-      <para>
-       The syntax this parameter is similar to the RPN query as described in
-       <function>yaz_search</function>. It consists of zero or more 
-       <literal>@attr</literal>-operator specifications, then followed by 
-       exactly one token.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>flags</parameter></term>
-     <listitem>
-      <para>
-       This optional parameter specifies additional information to control 
-       the behaviour of the scan request. Three indexes are currently read 
-       from the flags array:
-       <literal>number</literal> (number of terms requested),
-       <literal>position</literal> (preferred position of term) and
-       <literal>stepSize</literal> (preferred step size).
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <para>
-   <example>
-    <title>PHP function that scans titles</title>
-    <programlisting role="php">
-<![CDATA[
-<?php
-function scan_titles($id, $startterm) 
-{
-  yaz_scan($id, "rpn", "@attr 1=4 " . $startterm);
-  yaz_wait();
-  $errno = yaz_errno($id);
-  if ($errno == 0) {
-    $ar = yaz_scan_result($id, $options);
-    echo 'Scan ok; ';
-    foreach ($options as $key => $val) {
-      echo "$key = $val &nbsp;";
-    }
-    echo '<br /><table>';
-    while (list($key, list($k, $term, $tcount)) = each($ar)) {
-      if (empty($k)) continue;
-      echo "<tr><td>$term</td><td>$tcount</td></tr>";
-    }
-    echo '</table>';
-  } else {
-    echo "Scan failed. Error: " . yaz_error($id) . "<br />";
-  }
-}
-?>
-]]>
-    </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/yaz/functions/yaz-schema.xml b/reference/yaz/functions/yaz-schema.xml
deleted file mode 100644
index 2f59272cc491..000000000000
--- a/reference/yaz/functions/yaz-schema.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-schema" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_schema</refname>
-  <refpurpose>
-   Specifies schema for retrieval
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_schema</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>schema</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_schema</function> specifies the schema for retrieval.
-  </para>
-  <para>
-   This function should be called before 
-   <function>yaz_search</function> or <function>yaz_present</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>schema</parameter></term>
-     <listitem>
-      <para>
-       Must be specified as an OID (Object Identifier) in a raw dot-notation 
-       (like <literal>1.2.840.10003.13.4</literal>) or as one of the known 
-       registered schemas: <literal>GILS-schema</literal>, 
-       <literal>Holdings</literal>, <literal>Zthes</literal>, ...
-      </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/yaz/functions/yaz-search.xml b/reference/yaz/functions/yaz-search.xml
deleted file mode 100644
index 8b972d52ac1a..000000000000
--- a/reference/yaz/functions/yaz-search.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-search" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>yaz_search</refname>
-  <refpurpose>Prepares for a search</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>bool</type><methodname>yaz_search</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>type</parameter></methodparam>
-   <methodparam><type>string</type><parameter>query</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_search</function> prepares for a search on the given 
-   connection.
-  </para>
-  <para>
-   Like <function>yaz_connect</function> this function is non-blocking and
-   only prepares for a search to be executed later when 
-   <function>yaz_wait</function> is called.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       This parameter represents the query type - only <literal>"rpn"</literal>
-       is supported now in which case the third argument specifies a Type-1 
-       query in prefix query notation. 
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>query</parameter></term>
-     <listitem>
-      <para>
-       The RPN query is a textual representation of the Type-1 query as
-       defined by the Z39.50 standard. However, in the text representation
-       as used by YAZ a prefix notation is used, that is the operator
-       precedes the operands. The query string is a sequence of tokens where
-       white space is ignored unless surrounded by double quotes. Tokens beginning
-       with an at-character (<literal>@</literal>) are considered operators,
-       otherwise they are treated as search terms.
-      </para>
-      <table>
-       <title>RPN Operators</title>
-       <tgroup cols="2">
-        <colspec colwidth="1*" colname="construct"/>
-        <colspec colwidth="2*" colname="description"/>
-        <thead>
-         <row>
-          <entry>Construct</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry><literal>@and</literal> query1 query2</entry>
-          <entry>intersection of query1 and query2</entry>
-         </row>
-         <row>
-          <entry><literal>@or</literal> query1 query2</entry>
-          <entry>union of query1 and query2</entry>
-         </row>
-         <row>
-          <entry><literal>@not</literal> query1 query2</entry>
-          <entry>query1 and not query2</entry>
-         </row>
-         <row>
-          <entry><literal>@set</literal> name</entry>
-          <entry>result set reference</entry>
-         </row>
-         <row>
-          <entry><literal>@attrset</literal> set query</entry>
-          <entry>
-           specifies attribute-set for query. This construction is only allowed
-           once - in the beginning of the whole query
-          </entry>
-         </row>
-         <row>
-          <entry><literal>@attr</literal> [set] type=value query</entry>
-          <entry>
-           applies attribute to query. The type and value are integers 
-           specifying the attribute-type and attribute-value respectively. 
-           The set, if given, specifies the attribute-set.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>     
-      <para>
-       You can find information about attributes at the 
-       <link xlink:href="&url.yaz-loc-bib1;">Z39.50 Maintenance Agency</link>
-       site.
-      </para>
-      <note>
-       <para>
-        If you would like to use a more friendly notation,
-        use the CCL parser - functions <function>yaz_ccl_conf</function> and 
-        <function>yaz_ccl_parse</function>.
-       </para>
-      </note>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Query Examples</title>
-   <para>
-    You can search for simple terms, like this:
-    <screen>
-<![CDATA[
-computer
-]]>
-    </screen>
-    which matches documents where "computer" occur. No attributes are 
-    specified.
-   </para>
-   <para>
-    The query 
-    <screen>
-<![CDATA[
-"knuth donald"
-]]>
-    </screen>
-    matches documents where "knuth donald" occur (provided that the
-    server supports phrase search).
-   </para>
-   <para>
-    This query applies two attributes for the same phrase.
-    <screen>@attr 1=1003 @attr 4=1 "knuth donald"</screen>
-    First attribute is type 1 (Bib-1 use), attribute value is 1003
-    (Author).
-    Second attribute has is type 4 (structure), value 1 (phrase),
-    so this should match documents where Donald Knuth is author.
-   </para>
-   <para>
-    The query
-    <screen>
-<![CDATA[
-@and @or a b @not @or c d e
-]]>
-    </screen>
-    would in infix notation look like <literal>(a or b) and ((c or d) not 
-    e)</literal>.
-   </para>
-   <para>
-    Another, more complex, one:
-    <screen>
-<![CDATA[
-@attrset gils @and @attr 1=4 art @attr 1=2000 company
-]]>
-    </screen>
-    The query as a whole uses the GILS attributeset. The query matches
-    documents where <literal>art</literal> occur in the title (GILS,BIB-1)
-    and in which <literal>company</literal> occur as Distributor (GILS).
-   </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaz/functions/yaz-set-option.xml b/reference/yaz/functions/yaz-set-option.xml
deleted file mode 100644
index ab399d3c197a..000000000000
--- a/reference/yaz/functions/yaz-set-option.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-set-option" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_set_option</refname>
-  <refpurpose>Sets one or more options for connection</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_set_option</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>name</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_set_option</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>array</type><parameter>options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets one or more options on the given connection.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>name</parameter> or <parameter>options</parameter></term>
-     <listitem>
-      <para>
-       May be either a string or an array.
-      </para>
-      <para>
-       If given as a string, this will be the name of the option to set. You'll
-       need to give it's <parameter>value</parameter>.
-      </para>
-      <para>
-       If given as an array, this will be an associative array (option name 
-       => option value).
-      </para>
-      <table>
-       <title>PHP/YAZ Connection Options</title>
-       <tgroup cols="2">
-        <colspec colwidth="2*" colname="name"/>
-        <colspec colwidth="5*" colname="description"/>
-        <thead>
-         <row>
-          <entry>Name</entry>
-          <entry>Description</entry>
-         </row>
-        </thead>
-        <tbody>
-         <row>
-          <entry>implementationName</entry>
-          <entry>implementation name of server</entry>
-         </row>
-         <row>
-          <entry>implementationVersion</entry>
-          <entry>implementation version of server</entry>
-         </row>
-         <row>
-          <entry>implementationId</entry>
-          <entry>implementation ID of server</entry>
-         </row>
-         <row>
-          <entry>schema</entry>
-          <entry>
-           schema for retrieval. By default, no schema is used. Setting this
-           option is equivalent to using function 
-           <function>yaz_schema</function>
-          </entry>
-         </row>
-         <row>
-          <entry>preferredRecordSyntax</entry>
-          <entry>
-           record syntax for retrieval. By default, no syntax is used. Setting
-           this option is equivalent to using function 
-           <function>yaz_syntax</function>
-          </entry>
-         </row>
-         <row>
-          <entry>start</entry>
-          <entry>
-           offset for first record to be retrieved via 
-           <function>yaz_search</function> or <function>yaz_present</function>.
-           First record is numbered has a start value of 0. Second record has
-           start value 1.
-           Setting this option in combination with option
-           <literal>count</literal> has the same effect as calling
-           <function>yaz_range</function> except that records are
-           numbered from 1 in <function>yaz_range</function>
-          </entry>
-         </row>
-         <row>
-          <entry>count</entry>
-          <entry>maximum number of records to be retrieved via
-           <function>yaz_search</function> or <function>yaz_present</function>.
-          </entry>
-         </row>
-         <row>
-          <entry>elementSetName</entry>
-          <entry>element-set-name for retrieval. Setting this option is
-           equivalent to calling <function>yaz_element</function>.
-          </entry>
-         </row>
-        </tbody>
-       </tgroup>
-      </table>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The new value of the option. Use this only if the previous argument is
-       a string.
-      </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/yaz/functions/yaz-sort.xml b/reference/yaz/functions/yaz-sort.xml
deleted file mode 100644
index 6c5e7a3bb99b..000000000000
--- a/reference/yaz/functions/yaz-sort.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-sort" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_sort</refname>
-  <refpurpose>Sets sorting criteria</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_sort</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>criteria</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function sets sorting criteria and enables Z39.50 Sort.
-  </para>
-  <para>
-   Call this function <emphasis>before</emphasis> <function>yaz_search</function>.
-   Using this function alone does not have any effect. When used in conjunction
-   with <function>yaz_search</function>, a Z39.50 Sort will be sent after a
-   search response has been received and before any records are retrieved with
-   Z39.50 Present (<function>yaz_present</function>. 
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>criteria</parameter></term>
-     <listitem>
-      <para>
-       A string that takes the form <replaceable>field1 flags1 field2 
-       flags2</replaceable> where field1 specifies the primary attributes for
-       sort, field2 seconds, etc.. 
-      </para>
-      <para>
-       The field specifies either a numerical attribute combinations consisting
-       of type=value pairs separated by comma (e.g. <literal>1=4,2=1</literal>)
-       ; or the field may specify a plain string criteria (e.g. 
-       <literal>title</literal>. The flags is a sequence of the following 
-       characters which may not be separated by any white space.
-      </para>
-      <para>
-       <variablelist>
-        <title>Sort Flags</title>
-        <varlistentry>
-         <term><literal>a</literal></term>
-         <listitem>
-          <para>
-           Sort ascending
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><literal>d</literal></term>
-         <listitem>
-          <para>
-           Sort descending
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><literal>i</literal></term>
-         <listitem>
-          <para>
-           Case insensitive sorting
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><literal>s</literal></term>
-         <listitem>
-          <para>
-           Case sensitive sorting
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example>
-   <title>Sort Criterias</title>
-   <para>
-    To sort on Bib1 attribute title, case insensitive, and ascending you
-    would use the following sort criteria:
-    <screen>
-<![CDATA[
-1=4 ia
-]]>
-    </screen>
-   </para>
-   <para>
-    If the secondary sorting criteria should be author, case sensitive and 
-    ascending you would use:
-    <screen>
-<![CDATA[
-1=4 ia 1=1003 sa
-]]>
-    </screen>
-   </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
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/yaz/functions/yaz-syntax.xml b/reference/yaz/functions/yaz-syntax.xml
deleted file mode 100644
index 8578c67f0df2..000000000000
--- a/reference/yaz/functions/yaz-syntax.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-syntax" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_syntax</refname>
-  <refpurpose>
-   Specifies the preferred record syntax for retrieval
-  </refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>yaz_syntax</methodname>
-   <methodparam><type>resource</type><parameter>id</parameter></methodparam>
-   <methodparam><type>string</type><parameter>syntax</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   <function>yaz_syntax</function> specifies the preferred record syntax for
-   retrieval
-  </para>
-  <para>
-   This function should be called before <function>yaz_search</function> or 
-   <function>yaz_present</function>.
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>id</parameter></term>
-     <listitem>
-      <para>
-       The connection resource returned by <function>yaz_connect</function>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>syntax</parameter></term>
-     <listitem>
-      <para>
-       The syntax must be specified as an OID (Object Identifier) in a raw
-       dot-notation (like <literal>1.2.840.10003.5.10</literal>) or as one of
-       the known registered record syntaxes (sutrs, usmarc, grs1, xml, etc.). 
-      </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/yaz/functions/yaz-wait.xml b/reference/yaz/functions/yaz-wait.xml
deleted file mode 100644
index 3fb05130dcdb..000000000000
--- a/reference/yaz/functions/yaz-wait.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.yaz-wait" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>yaz_wait</refname>
-  <refpurpose>Wait for Z39.50 requests to complete</refpurpose>
- </refnamediv>
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>mixed</type><methodname>yaz_wait</methodname>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">options</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   This function carries out networked (blocked) activity for outstanding
-   requests which have been prepared by the functions 
-   <function>yaz_connect</function>, <function>yaz_search</function>, 
-   <function>yaz_present</function>, <function>yaz_scan</function> and 
-   <function>yaz_itemorder</function>.
-  </para>
-  <para>
-   <function>yaz_wait</function> returns when all servers have either
-   completed all requests or aborted (in case of errors).
-  </para>
- </refsect1>
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>options</parameter></term>
-     <listitem>
-      <para>
-       An associative array of options:
-       <variablelist>
-        <varlistentry>
-         <term><literal>timeout</literal></term>
-         <listitem>
-          <para>
-           Sets timeout in seconds. If a server has not responded within the
-           timeout it is considered dead and <function>yaz_wait</function>
-           returns. The default value for timeout is 15 seconds.
-          </para>
-         </listitem>
-        </varlistentry>
-        <varlistentry>
-         <term><literal>event</literal></term>
-         <listitem>
-          <para>
-           A boolean.
-          </para>
-         </listitem>
-        </varlistentry>
-       </variablelist>
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-   In event mode, returns resource &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/yaz/reference.xml b/reference/yaz/reference.xml
deleted file mode 100644
index 011dd8d8df73..000000000000
--- a/reference/yaz/reference.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<reference xml:id="ref.yaz" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>YAZ &Functions;</title>
-
- &reference.yaz.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/yaz/setup.xml b/reference/yaz/setup.xml
deleted file mode 100644
index 1794435d245a..000000000000
--- a/reference/yaz/setup.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="yaz.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <section xml:id="yaz.requirements">
-  &reftitle.required;
-  <para>
-   Obtain YAZ (ANSI/NISO Z39.50 support) and install it.
-   YAZ can be fetched in source or in various prebuilt packages
-   from the <link xlink:href="&url.yaz.ftp;">YAZ archive</link>.
-   Systems such as Debian GNU/Linux, Suse Linux, FreeBSD also has YAZ
-   as part of their distribution.
-  </para>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
- &reference.yaz.configure;
- <!-- }}} -->
-
-</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/yaz/versions.xml b/reference/yaz/versions.xml
deleted file mode 100644
index 1803dd33d316..000000000000
--- a/reference/yaz/versions.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='yaz_addinfo' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_ccl_conf' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_ccl_parse' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_close' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_connect' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_database' from='PHP 4 &gt;= 4.0.6, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_element' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_errno' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_error' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_es' from='PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_es_result' from='PHP 4 &gt;= 4.2.0, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_get_option' from='PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_hits' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_itemorder' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_present' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_range' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_record' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_scan' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_scan_result' from='PHP 4 &gt;= 4.0.5, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_schema' from='PHP 4 &gt;= 4.2.0, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_search' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_set_option' from='PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_sort' from='PHP 4 &gt;= 4.0.7, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_syntax' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.0'/>
- <function name='yaz_wait' from='PHP 4 &gt;= 4.0.1, PECL yaz &gt;= 0.9.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/zmq/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/zmq/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/zmq/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/zmq/book.xml b/reference/zmq/book.xml
deleted file mode 100644
index bc7d18d235a5..000000000000
--- a/reference/zmq/book.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<!-- State: experimental -->
-
-<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>
-
- <preface xml:id="intro.zmq">
-  &reftitle.intro;
-  <para>
-   &warn.experimental;
-   "ØMQ is a software library that lets you quickly design and implement a fast message-based application." --0MQ Website
-  </para>
-  <para>
-   For more information about 0MQ, see <link xlink:href="&url.zeromq;">&url.zeromq;</link>.
-  </para>
- </preface>
-
- &reference.zmq.setup;
-
- &reference.zmq.zmq;
- &reference.zmq.zmqexception;
-
- &reference.zmq.zmqcontext;
- &reference.zmq.zmqcontextexception;
-
- &reference.zmq.zmqsocket;
- &reference.zmq.zmqsocketexception;
-
- &reference.zmq.zmqpoll;
- &reference.zmq.zmqpollexception;
-
- &reference.zmq.zmqdevice;
- &reference.zmq.zmqdeviceexception;
-
-
-</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/zmq/setup.xml b/reference/zmq/setup.xml
deleted file mode 100644
index fca5c22d7a67..000000000000
--- a/reference/zmq/setup.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="zmq.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <section xml:id="zmq.requirements">
-  &reftitle.required;
-  <para>
-   ZMQ extension requires 0MQ version 2.0.7 or higher. 0MQ can be acquired from <link xlink:href="&url.zeromq;area:download">&url.zeromq;area:download</link>.
-  </para> 
- </section>
-
- <section xml:id="zmq.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.package;zmq">&url.pecl.package;zmq</link>
-  </para>
-  <para>
-   &pecl.windows.download.avail;
-  </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/zmq/versions.xml b/reference/zmq/versions.xml
deleted file mode 100644
index 39ee0e83c2c9..000000000000
--- a/reference/zmq/versions.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
-  <!-- Methods -->
- <function name='zmq' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmq::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontext' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontext::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontext::getsocket' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontext::ispersistent' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontext::getopt' from='PECL zmq &gt;= 1.0.4'/>
- <function name='zmqcontext::setopt' from='PECL zmq &gt;= 1.0.4'/>
- <function name='zmqsocket' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::send' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::sendmulti' from='PECL zmq &gt;= 0.8.0'/>
- <function name='zmqsocket::recv' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::recvmulti' from='PECL zmq &gt;= 0.8.0'/>
- <function name='zmqsocket::bind' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::connect' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::setsockopt' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::getendpoints' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::getsockettype' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::ispersistent' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::getpersistentid' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::getsockopt' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocket::unbind' from='PECL zmq &gt;= 1.0.4'/>
- <function name='zmqsocket::disconnect' from='PECL zmq &gt;= 1.0.4'/>
- <function name='zmqpoll' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::add' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::poll' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::getlasterrors' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::remove' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::count' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpoll::clear' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdevice' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdevice::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::__clone' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::getmessage' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::getcode' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::getfile' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::getline' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::gettrace' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::getprevious' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::gettraceasstring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqexception::__tostring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::__clone' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::getmessage' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::getcode' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::getfile' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::getline' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::gettrace' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::getprevious' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::gettraceasstring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqcontextexception::__tostring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::__clone' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::getmessage' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::getcode' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::getfile' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::getline' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::gettrace' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::getprevious' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::gettraceasstring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqsocketexception::__tostring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::__clone' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::getmessage' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::getcode' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::getfile' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::getline' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::gettrace' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::getprevious' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::gettraceasstring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqpollexception::__tostring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::__clone' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::__construct' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::getmessage' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::getcode' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::getfile' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::getline' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::gettrace' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::getprevious' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::gettraceasstring' from='PECL zmq &gt;= 0.5.0'/>
- <function name='zmqdeviceexception::__tostring' from='PECL zmq &gt;= 0.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/zmq/zmq.xml b/reference/zmq/zmq.xml
deleted file mode 100644
index f4cc7482ae82..000000000000
--- a/reference/zmq/zmq.xml
+++ /dev/null
@@ -1,782 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmq" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQ class</title>
- <titleabbrev>ZMQ</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQ intro -->
-  <section xml:id="zmq.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmq.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQ</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQ</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-pair">ZMQ::SOCKET_PAIR</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-pub">ZMQ::SOCKET_PUB</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-sub">ZMQ::SOCKET_SUB</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-req">ZMQ::SOCKET_REQ</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-rep">ZMQ::SOCKET_REP</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-xreq">ZMQ::SOCKET_XREQ</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-xrep">ZMQ::SOCKET_XREP</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-push">ZMQ::SOCKET_PUSH</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-pull">ZMQ::SOCKET_PULL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-router">ZMQ::SOCKET_ROUTER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-dealer">ZMQ::SOCKET_DEALER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-xpub">ZMQ::SOCKET_XPUB</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-xsub">ZMQ::SOCKET_XSUB</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.socket-stream">ZMQ::SOCKET_STREAM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-hwm">ZMQ::SOCKOPT_HWM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-sndhwm">ZMQ::SOCKOPT_SNDHWM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-rcvhwm">ZMQ::SOCKOPT_RCVHWM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-affinity">ZMQ::SOCKOPT_AFFINITY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-identity">ZMQ::SOCKOPT_IDENTITY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-subscribe">ZMQ::SOCKOPT_SUBSCRIBE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-unsubscribe">ZMQ::SOCKOPT_UNSUBSCRIBE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-rate">ZMQ::SOCKOPT_RATE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-recovery-ivl">ZMQ::SOCKOPT_RECOVERY_IVL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-reconnect-ivl">ZMQ::SOCKOPT_RECONNECT_IVL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-reconnect-ivl-max">ZMQ::SOCKOPT_RECONNECT_IVL_MAX</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-mcast-loop">ZMQ::SOCKOPT_MCAST_LOOP</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-sndbuf">ZMQ::SOCKOPT_SNDBUF</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-rcvbuf">ZMQ::SOCKOPT_RCVBUF</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-rcvmore">ZMQ::SOCKOPT_RCVMORE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-type">ZMQ::SOCKOPT_TYPE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-linger">ZMQ::SOCKOPT_LINGER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-backlog">ZMQ::SOCKOPT_BACKLOG</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-maxmsgsize">ZMQ::SOCKOPT_MAXMSGSIZE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-sndtimeo">ZMQ::SOCKOPT_SNDTIMEO</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-rcvtimeo">ZMQ::SOCKOPT_RCVTIMEO</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-ipv4only">ZMQ::SOCKOPT_IPV4ONLY</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-last-endpoint">ZMQ::SOCKOPT_LAST_ENDPOINT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-tcp-keepalive-idle">ZMQ::SOCKOPT_TCP_KEEPALIVE_IDLE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-tcp-keepalive-cnt">ZMQ::SOCKOPT_TCP_KEEPALIVE_CNT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-tcp-keepalive-intvl">ZMQ::SOCKOPT_TCP_KEEPALIVE_INTVL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-tcp-accept-filter">ZMQ::SOCKOPT_TCP_ACCEPT_FILTER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-tcp-accept-filter">ZMQ::SOCKOPT_TCP_ACCEPT_FILTER</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-delay-attach-on-connect">ZMQ::SOCKOPT_DELAY_ATTACH_ON_CONNECT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-xpub-verbose">ZMQ::SOCKOPT_XPUB_VERBOSE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-router-raw">ZMQ::SOCKOPT_ROUTER_RAW</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.sockopt-ipv6">ZMQ::SOCKOPT_IPV6</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.ctxopt-max-sockets">ZMQ::CTXOPT_MAX_SOCKETS</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.poll-in">ZMQ::POLL_IN</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.poll-out">ZMQ::POLL_OUT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.mode-noblock">ZMQ::MODE_NOBLOCK</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.mode-dontwait">ZMQ::MODE_DONTWAIT</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.mode-sndmore">ZMQ::MODE_SNDMORE</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.err-internal">ZMQ::ERR_INTERNAL</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.err-eagain">ZMQ::ERR_EAGAIN</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.err-enotsup">ZMQ::ERR_ENOTSUP</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.err-efsm">ZMQ::ERR_EFSM</varname>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zmq.constants.err-eterm">ZMQ::ERR_ETERM</varname>
-    </fieldsynopsis>
-
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zmq')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ ZMQ constants -->
-  <section xml:id="zmq.constants">
-   &reftitle.constants;
-   <section xml:id="zmq.constants.types">
-    <title>ZMQ Constant Types</title>
-    <variablelist>
-
-     <varlistentry xml:id="zmq.constants.socket-pair">
-      <term><constant>ZMQ::SOCKET_PAIR</constant></term>
-      <listitem>
-       <para>Exclusive pair pattern</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-pub">
-      <term><constant>ZMQ::SOCKET_PUB</constant></term>
-      <listitem>
-       <para>Publisher socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-sub">
-      <term><constant>ZMQ::SOCKET_SUB</constant></term>
-      <listitem>
-       <para>Subscriber socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-req">
-      <term><constant>ZMQ::SOCKET_REQ</constant></term>
-      <listitem>
-       <para>Request socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-rep">
-      <term><constant>ZMQ::SOCKET_REP</constant></term>
-      <listitem>
-       <para>Reply socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-xreq">
-      <term><constant>ZMQ::SOCKET_XREQ</constant></term>
-      <listitem>
-       <para>Alias for SOCKET_DEALER</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-xrep">
-      <term><constant>ZMQ::SOCKET_XREP</constant></term>
-      <listitem>
-       <para>Alias for SOCKET_ROUTER</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-push">
-      <term><constant>ZMQ::SOCKET_PUSH</constant></term>
-      <listitem>
-       <para>Pipeline upstream push socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-pull">
-      <term><constant>ZMQ::SOCKET_PULL</constant></term>
-      <listitem>
-       <para>Pipeline downstream pull socket</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-router">
-      <term><constant>ZMQ::SOCKET_ROUTER</constant></term>
-      <listitem>
-       <para>Extended REP socket that can route replies to requesters</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-dealer">
-      <term><constant>ZMQ::SOCKET_DEALER</constant></term>
-      <listitem>
-       <para>Extended REQ socket that load balances to all connected peers</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-xpub">
-      <term><constant>ZMQ::SOCKET_XPUB</constant></term>
-      <listitem>
-       <para>Similar to SOCKET_PUB, except you can receive subscriptions as messages.
-             The subscription message is 0 (unsubscribe) or 1 (subscribe) followed by the topic.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-xsub">
-      <term><constant>ZMQ::SOCKET_XSUB</constant></term>
-      <listitem>
-       <para>Similar to SOCKET_SUB, except you can send subscriptions as messages. See SOCKET_XPUB for format.</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.socket-stream">
-      <term><constant>ZMQ::SOCKET_STREAM</constant></term>
-      <listitem>
-       <para>Used to send and receive TCP data from a non-ØMQ peer. Available if compiled against ZeroMQ 4.x or higher (Value: &integer;).</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-hwm">
-      <term><constant>ZMQ::SOCKOPT_HWM</constant></term>
-      <listitem>
-       <para>The high water mark for inbound and outbound messages is a hard limit on the maximum number of outstanding messages ØMQ shall queue in memory for any single peer that the specified socket is communicating with. Setting this option on a socket will only affect connections made after the option has been set. On ZeroMQ 3.x this is a wrapper for setting both SNDHWM and RCVHWM. (Value: &integer;).</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-sndhwm">
-      <term><constant>ZMQ::SOCKOPT_SNDHWM</constant></term>
-      <listitem>
-       <para>The ZMQ_SNDHWM option shall set the high water mark for outbound messages on the specified socket. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;).</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-rcvhwm">
-      <term><constant>ZMQ::SOCKOPT_RCVHWM</constant></term>
-      <listitem>
-       <para>The SOCKOPT_RCVHWM option shall set the high water mark for inbound messages on the specified socket. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;).</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-affinity">
-      <term><constant>ZMQ::SOCKOPT_AFFINITY</constant></term>
-      <listitem>
-       <para>Set I/O thread affinity (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-identity">
-      <term><constant>ZMQ::SOCKOPT_IDENTITY</constant></term>
-      <listitem>
-       <para>Set socket identity (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-subscribe">
-      <term><constant>ZMQ::SOCKOPT_SUBSCRIBE</constant></term>
-      <listitem>
-       <para>Establish message filter. Valid for subscriber socket (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-unsubscribe">
-      <term><constant>ZMQ::SOCKOPT_UNSUBSCRIBE</constant></term>
-      <listitem>
-       <para>Remove message filter. Valid for subscriber socket (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-rate">
-      <term><constant>ZMQ::SOCKOPT_RATE</constant></term>
-      <listitem>
-       <para>Set rate for multicast sockets (pgm) (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-recovery-ivl">
-      <term><constant>ZMQ::SOCKOPT_RECOVERY_IVL</constant></term>
-      <listitem>
-       <para>Set multicast recovery interval (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-reconnect-ivl">
-      <term><constant>ZMQ::SOCKOPT_RECONNECT_IVL</constant></term>
-      <listitem>
-       <para> Set the initial reconnection interval (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-reconnect-ivl-max">
-      <term><constant>ZMQ::SOCKOPT_RECONNECT_IVL_MAX</constant></term>
-      <listitem>
-       <para> Set the max reconnection interval (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-mcast-loop">
-      <term><constant>ZMQ::SOCKOPT_MCAST_LOOP</constant></term>
-      <listitem>
-       <para> Control multicast loopback (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-sndbuf">
-      <term><constant>ZMQ::SOCKOPT_SNDBUF</constant></term>
-      <listitem>
-       <para>Set kernel transmit buffer size (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-rcvbuf">
-      <term><constant>ZMQ::SOCKOPT_RCVBUF</constant></term>
-      <listitem>
-       <para> Set kernel receive buffer size (Value: &integer; >= 0)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-rcvmore">
-      <term><constant>ZMQ::SOCKOPT_RCVMORE</constant></term>
-      <listitem>
-       <para>Receive multi-part messages (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-type">
-      <term><constant>ZMQ::SOCKOPT_TYPE</constant></term>
-      <listitem>
-       <para>Get the socket type. Valid for getSockOpt (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-linger">
-      <term><constant>ZMQ::SOCKOPT_LINGER</constant></term>
-      <listitem>
-       <para>The linger value of the socket. Specifies how long the socket blocks
-             trying flush messages after it has been closed (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-backlog">
-      <term><constant>ZMQ::SOCKOPT_BACKLOG</constant></term>
-      <listitem>
-       <para>The SOCKOPT_BACKLOG option shall set the maximum length of the queue of outstanding peer connections for the specified socket; this only applies to connection-oriented transports. (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-maxmsgsize">
-      <term><constant>ZMQ::SOCKOPT_MAXMSGSIZE</constant></term>
-      <listitem>
-       <para>Limits the maximum size of the inbound message. Value -1 means no limit. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-sndtimeo">
-      <term><constant>ZMQ::SOCKOPT_SNDTIMEO</constant></term>
-      <listitem>
-       <para>Sets the timeout for send operation on the socket. Value -1 means no limit. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-rcvtimeo">
-      <term><constant>ZMQ::SOCKOPT_RCVTIMEO</constant></term>
-      <listitem>
-       <para>Sets the timeout for receive operation on the socket. Value -1 means no limit. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-ipv4only">
-      <term><constant>ZMQ::SOCKOPT_IPV4ONLY</constant></term>
-      <listitem>
-       <para>Disable IPV6 support if 1. Available if compiled against ZeroMQ 3.x (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-last-endpoint">
-      <term><constant>ZMQ::SOCKOPT_LAST_ENDPOINT</constant></term>
-      <listitem>
-       <para>Retrieve the last connected endpoint - for use with * wildcard ports. Available if compiled against ZeroMQ 3.x or higher (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-tcp-keepalive-idle">
-      <term><constant>ZMQ::SOCKOPT_TCP_KEEPALIVE_IDLE</constant></term>
-      <listitem>
-       <para>Idle time for TCP keepalive. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-tcp-keepalive-cnt">
-      <term><constant>ZMQ::SOCKOPT_TCP_KEEPALIVE_CNT</constant></term>
-      <listitem>
-       <para>Count time for TCP keepalive. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-tcp-keepalive-intvl">
-      <term><constant>ZMQ::SOCKOPT_TCP_KEEPALIVE_INTVL</constant></term>
-      <listitem>
-       <para>Interval for TCP keepalive. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-delay-attach-on-connect">
-      <term><constant>ZMQ::SOCKOPT_DELAY_ATTACH_ON_CONNECT</constant></term>
-      <listitem>
-       <para>Set a CIDR string to match against incoming TCP connections. Available if compiled against ZeroMQ 3.x or higher (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-      <varlistentry xml:id="zmq.constants.sockopt-tcp-accept-filter">
-       <term><constant>ZMQ::SOCKOPT_TCP_ACCEPT_FILTER</constant></term>
-       <listitem>
-        <para>Set a CIDR string to match against incoming TCP connections. Available if compiled against ZeroMQ 3.x or higher (Value: &string;)</para>
-       </listitem>
-      </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-xpub-verbose">
-      <term><constant>ZMQ::SOCKOPT_XPUB_VERBOSE</constant></term>
-      <listitem>
-       <para>Set the XPUB to receive an application message on each instance of a subscription. Available if compiled against ZeroMQ 3.x or higher (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-router-raw">
-      <term><constant>ZMQ::SOCKOPT_ROUTER_RAW</constant></term>
-      <listitem>
-       <para>Sets the raw mode on the ROUTER, when set to 1. In raw mode when using tcp:// transport the socket will read and write without ZeroMQ framing.
-               Available if compiled against ZeroMQ 4.0 or higher (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.sockopt-ipv6">
-      <term><constant>ZMQ::SOCKOPT_IPV6</constant></term>
-      <listitem>
-       <para>Enable IPV6. Available if compiled against ZeroMQ 4.0 or higher (Value: &string;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.ctxopt-max-sockets">
-      <term><constant>ZMQ::CTXOPT_MAX_SOCKETS</constant></term>
-      <listitem>
-       <para>The socket limit for this context. Available if compiled against ZeroMQ 3.x or higher (Value: &integer;)</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.poll-in">
-      <term><constant>ZMQ::POLL_IN</constant></term>
-      <listitem>
-       <para>Poll for incoming data</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.poll-out">
-      <term><constant>ZMQ::POLL_OUT</constant></term>
-      <listitem>
-       <para>Poll for outgoing data</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.mode-noblock">
-      <term><constant>ZMQ::MODE_NOBLOCK</constant></term>
-      <listitem>
-       <para>Non-blocking operation. Deprecated, use ZMQ::MODE_DONTWAIT instead</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.mode-dontwait">
-      <term><constant>ZMQ::MODE_DONTWAIT</constant></term>
-      <listitem>
-       <para>Non-blocking operation</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.mode-sndmore">
-      <term><constant>ZMQ::MODE_SNDMORE</constant></term>
-      <listitem>
-       <para>Send multi-part message</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.device-forwarder">
-      <term><constant>ZMQ::DEVICE_FORWARDER</constant></term>
-      <listitem>
-       <para>Forwarder device</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.device-queue">
-      <term><constant>ZMQ::DEVICE_QUEUE</constant></term>
-      <listitem>
-       <para>Queue device</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.device-streamer">
-      <term><constant>ZMQ::DEVICE_STREAMER</constant></term>
-      <listitem>
-       <para>Streamer device</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.err-internal">
-      <term><constant>ZMQ::ERR_INTERNAL</constant></term>
-      <listitem>
-       <para>ZMQ extension internal error</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.err-eagain">
-      <term><constant>ZMQ::ERR_EAGAIN</constant></term>
-      <listitem>
-       <para>Implies that the operation would block when ZMQ::MODE_DONTWAIT is used</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.err-enotsup">
-      <term><constant>ZMQ::ERR_ENOTSUP</constant></term>
-      <listitem>
-       <para>The operation is not supported by the socket type</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.err-efsm">
-      <term><constant>ZMQ::ERR_EFSM</constant></term>
-      <listitem>
-       <para>The operation can not be executed because the socket is not in correct state</para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry xml:id="zmq.constants.err-eterm">
-      <term><constant>ZMQ::ERR_ETERM</constant></term>
-      <listitem>
-       <para>The context has been terminated</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
- &reference.zmq.entities.zmq;
-
-</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/zmq/zmq/construct.xml b/reference/zmq/zmq/construct.xml
deleted file mode 100644
index b1e0db4ec21c..000000000000
--- a/reference/zmq/zmq/construct.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmq.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQ::__construct</refname>
-  <refpurpose>ZMQ constructor</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>private</modifier> <methodname>ZMQ::__construct</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Private constructor to prevent direct initialization. This class holds the constants for ZMQ extension.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqcontext.xml b/reference/zmq/zmqcontext.xml
deleted file mode 100644
index 708619fe4b8e..000000000000
--- a/reference/zmq/zmqcontext.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqcontext" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQContext class</title>
- <titleabbrev>ZMQContext</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQContext intro -->
-  <section xml:id="zmqcontext.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqcontext.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQContext</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQContext</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zmqcontext')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.zmq.entities.zmqcontext;
-
-</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/zmq/zmqcontext/construct.xml b/reference/zmq/zmqcontext/construct.xml
deleted file mode 100644
index 1fe671965737..000000000000
--- a/reference/zmq/zmqcontext/construct.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqcontext.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQContext::__construct</refname>
-  <refpurpose>Construct a new ZMQContext object</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>ZMQContext::__construct</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>io_threads</parameter><initializer>1</initializer></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>is_persistent</parameter><initializer>&true;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a new ZMQ context. The context is used to initialize sockets. A persistent context is required 
-   to initialize persistent sockets. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>io_threads</parameter></term>
-     <listitem>
-      <para>
-       Number of io-threads in the context.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>is_persistent</parameter></term>
-     <listitem>
-      <para>
-       Whether the context is persistent. Persistent context is stored
-       over multiple requests and is a requirement for persistent sockets.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-   <example>
-    <title>A <function>ZMQContext</function> example</title>
-    <para>
-     Construct a new context and allocate request socket from it
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Allocate a new context */
-$context = new ZMQContext();
-
-/* Create a new socket */
-$socket = $context->getSocket(ZMQ::SOCKET_REQ, 'my sock');
-
-/* Connect the socket */
-$socket->connect("tcp://example.com:1234");
-
-/* Send a request */
-$socket->send("Hello there");
-
-/* Receive back the response */
-$message = $socket->recv();
-?>
-]]>
-    </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/zmq/zmqcontext/getopt.xml b/reference/zmq/zmqcontext/getopt.xml
deleted file mode 100644
index 1b53bfd3e815..000000000000
--- a/reference/zmq/zmqcontext/getopt.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqcontext.getopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQContext::getOpt</refname>
-  <refpurpose>Get context option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>ZMQContext::getOpt</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of a context option. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       An integer representing the option.
-       See the <constant>ZMQ::CTXOPT_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns either a &string; or an &integer; depending on <parameter>key</parameter>. Throws
-   ZMQContextException on error. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqcontext/getsocket.xml b/reference/zmq/zmqcontext/getsocket.xml
deleted file mode 100644
index 1aa6e0dab85d..000000000000
--- a/reference/zmq/zmqcontext/getsocket.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqcontext.getsocket" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQContext::getSocket</refname>
-  <refpurpose>Create a new socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQContext::getSocket</methodname>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>persistent_id</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>on_new_socket</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Shortcut for creating new sockets from the context. If the context is not persistent the <parameter>persistent_id</parameter> 
-   parameter is ignored and the socket falls back to being non-persistent. The <parameter>on_new_socket</parameter> is called only
-   when a new underlying socket structure is created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       <constant>ZMQ::SOCKET_<replaceable>*</replaceable></constant> constant to specify socket type.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>persistent_id</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>persistent_id</parameter> is specified the socket will be persisted over multiple requests.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>on_new_socket</parameter></term>
-     <listitem>
-      <para>
-       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. The callback takes ZMQSocket and persistent_id as two arguments.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-   <example>
-    <title>A <function>ZMQContext</function> example</title>
-    <para>
-     Basic usage
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Allocate a new context */
-$context = new ZMQContext();
-
-/* Create a new socket */
-$socket = $context->getSocket(ZMQ::SOCKET_REQ, 'my sock');
-
-/* Connect the socket */
-$socket->connect("tcp://example.com:1234");
-
-/* Send a request */
-$socket->send("Hello there");
-
-/* Receive back the response */
-$message = $socket->recv();
-echo "Received message: {$message}\n";
-?>
-]]>
-    </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/zmq/zmqcontext/ispersistent.xml b/reference/zmq/zmqcontext/ispersistent.xml
deleted file mode 100644
index 60d3d431a4e8..000000000000
--- a/reference/zmq/zmqcontext/ispersistent.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqcontext.ispersistent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQContext::isPersistent</refname>
-  <refpurpose>Whether the context is persistent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ZMQContext::isPersistent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-    Whether the context is persistent. Persistent context is needed for persistent connections as each
-    socket is allocated from a context.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns &true; if the context is persistent and &false; if the context is non-persistent.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqcontext/setopt.xml b/reference/zmq/zmqcontext/setopt.xml
deleted file mode 100644
index 15a42ccb857c..000000000000
--- a/reference/zmq/zmqcontext/setopt.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqcontext.setopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQContext::setOpt</refname>
-  <refpurpose>Set a socket option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQContext</type><methodname>ZMQContext::setOpt</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a ZMQ context option. The type of the <parameter>value</parameter> depends on the <parameter>key</parameter>.
-   See <link linkend="zmq.constants">ZMQ Constant Types</link> for more information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>ZMQ::CTXOPT_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current object. Throws ZMQContextException on error.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqcontextexception.xml b/reference/zmq/zmqcontextexception.xml
deleted file mode 100644
index 8e744abec2b1..000000000000
--- a/reference/zmq/zmqcontextexception.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqcontextexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQContextException class</title>
- <titleabbrev>ZMQContextException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQContextException intro -->
-  <section xml:id="zmqcontextexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqcontextexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQContextException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQContextException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZMQException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <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>
-
-
-<!-- {{{ ZMQContextException properties -->
-  <section xml:id="zmqcontextexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="zmqcontextexception.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqcontextexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqcontextexception.props.file">
-     <term><varname>file</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqcontextexception.props.line">
-     <term><varname>line</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/zmq/zmqdevice.xml b/reference/zmq/zmqdevice.xml
deleted file mode 100644
index 0f3c0da36af8..000000000000
--- a/reference/zmq/zmqdevice.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqdevice" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQDevice class</title>
- <titleabbrev>ZMQDevice</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQDevice intro -->
-  <section xml:id="zmqdevice.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqdevice.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQDevice</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQDevice</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zmqdevice')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.zmq.entities.zmqdevice;
-
-</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/zmq/zmqdevice/construct.xml b/reference/zmq/zmqdevice/construct.xml
deleted file mode 100644
index 98d6c044da50..000000000000
--- a/reference/zmq/zmqdevice/construct.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::__construct</refname>
-  <refpurpose>Construct a new device</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>ZMQDevice::__construct</methodname>
-   <methodparam><type>ZMQSocket</type><parameter>frontend</parameter></methodparam>
-   <methodparam><type>ZMQSocket</type><parameter>backend</parameter></methodparam>
-   <methodparam choice="opt"><type>ZMQSocket</type><parameter>listener</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   "ØMQ devices can do intermediation of addresses, services, queues, or any other abstraction you care to define above the message and socket layers." -- zguide
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>frontend</parameter></term>
-    <listitem>
-     <para>
-      Frontend parameter for the devices. Usually where there messages
-      are coming.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>backend</parameter></term>
-    <listitem>
-     <para>
-       Backend parameter for the devices. Usually where there messages
-       going to.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>listener</parameter></term>
-    <listitem>
-     <para>
-       Listener socket, which receives a copy of all messages going both directions.
-       The type of this socket should be SUB, PULL or DEALER.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Call to this method will prepare the device. Usually devices are very long
-   running processes so running this method from interactive script is not recommended. This
-   method throw ZMQDeviceException if the device cannot be started.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqdevice/getidletimeout.xml b/reference/zmq/zmqdevice/getidletimeout.xml
deleted file mode 100644
index 90d70b05f099..000000000000
--- a/reference/zmq/zmqdevice/getidletimeout.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.getidletimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::getIdleTimeout</refname>
-  <refpurpose>Get the idle timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::getIdleTimeout</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the idle callback timeout value. Added in ZMQ extension version 1.1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the idle callback timeout value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqdevice/gettimertimeout.xml b/reference/zmq/zmqdevice/gettimertimeout.xml
deleted file mode 100644
index 535b197399cb..000000000000
--- a/reference/zmq/zmqdevice/gettimertimeout.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.gettimertimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::getTimerTimeout</refname>
-  <refpurpose>Get the timer timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::getTimerTimeout</methodname>
-   <void/>
-  </methodsynopsis>
-  <para>
-   Gets the timer callback timeout value. Added in ZMQ extension version 1.1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   This method returns the timer timeout value.
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqdevice/run.xml b/reference/zmq/zmqdevice/run.xml
deleted file mode 100644
index 06ff8c2f99c4..000000000000
--- a/reference/zmq/zmqdevice/run.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.run" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::run</refname>
-  <refpurpose>Run the new device</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>void</type><methodname>ZMQDevice::run</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Runs the device.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Call to this method will block until the device is running. It is not recommended
-   that devices are used from interactive scripts. On failure this method will throw
-   ZMQDeviceException.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqdevice/setidlecallback.xml b/reference/zmq/zmqdevice/setidlecallback.xml
deleted file mode 100644
index 0ea5342bb6dd..000000000000
--- a/reference/zmq/zmqdevice/setidlecallback.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.setidlecallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::setIdleCallback</refname>
-  <refpurpose>Set the idle callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::setIdleCallback</methodname>
-   <methodparam><type>callable</type><parameter>cb_func</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>user_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the idle callback function. If idle timeout is defined the idle callback function
-   shall be called if the internal poll loop times out without events. If the callback function
-   returns false or a value that evaluates to false the device is stopped.
-
-   The callback function signature is callback (mixed $user_data).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cb_func</parameter></term>
-    <listitem>
-     <para>
-      Callback function to invoke when the device is idle. Returning false
-      or a value that evaluates to false from this function will cause the 
-      device to stop.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      How often to invoke the idle callback in milliseconds. The idle callback is invoked
-      periodically when there is no activity on the device.
-      The timeout value guarantees that there is at least this amount of milliseconds between
-      invocations of the callback function.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_data</parameter></term>
-    <listitem>
-     <para>
-      Additional data to pass to the callback function.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success 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/zmq/zmqdevice/setidletimeout.xml b/reference/zmq/zmqdevice/setidletimeout.xml
deleted file mode 100644
index 2f046330cbd6..000000000000
--- a/reference/zmq/zmqdevice/setidletimeout.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.setidletimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::setIdleTimeout</refname>
-  <refpurpose>Set the idle timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::setIdleTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the idle callback timeout value. The idle callback is invoked periodically when the device is
-   idle.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      The idle callback timeout value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success 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/zmq/zmqdevice/settimercallback.xml b/reference/zmq/zmqdevice/settimercallback.xml
deleted file mode 100644
index ee71791076dc..000000000000
--- a/reference/zmq/zmqdevice/settimercallback.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.settimercallback" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::setTimerCallback</refname>
-  <refpurpose>Set the timer callback function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::setTimerCallback</methodname>
-   <methodparam><type>callable</type><parameter>cb_func</parameter></methodparam>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-   <methodparam choice="opt"><type>mixed</type><parameter>user_data</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the timer callback function. The timer callback will be invoked after timeout has
-   passed. The difference between idle and timer callbacks are that idle callback is invoked
-   only when the device is idle.
-
-   The callback function signature is callback (mixed $user_data). Added in ZMQ extension version 1.1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>cb_func</parameter></term>
-    <listitem>
-     <simpara>
-      Callback function to invoke when the timer fires. Returning false
-      or a value that evaluates to false from this function will cause the 
-      device to stop.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <simpara>
-      How often to invoke the timer callback in milliseconds. The timer callback is invoked
-      periodically.
-      The timeout value guarantees that there is at least this amount of milliseconds between
-      invocations of the callback function.
-     </simpara>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>user_data</parameter></term>
-    <listitem>
-     <para>
-      Additional data to pass to the callback function.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success 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/zmq/zmqdevice/settimertimeout.xml b/reference/zmq/zmqdevice/settimertimeout.xml
deleted file mode 100644
index 269d0e8e03c7..000000000000
--- a/reference/zmq/zmqdevice/settimertimeout.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqdevice.settimertimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQDevice::setTimerTimeout</refname>
-  <refpurpose>Set the timer timeout</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQDevice</type><methodname>ZMQDevice::setTimerTimeout</methodname>
-   <methodparam><type>int</type><parameter>timeout</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets the timer callback timeout value. The timer callback is invoked periodically if it's set.
-   Added in ZMQ extension version 1.1.0.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>timeout</parameter></term>
-    <listitem>
-     <para>
-      The timer callback timeout value.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   On success 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/zmq/zmqdeviceexception.xml b/reference/zmq/zmqdeviceexception.xml
deleted file mode 100644
index e95f91086f7d..000000000000
--- a/reference/zmq/zmqdeviceexception.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqdeviceexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQDeviceException class</title>
- <titleabbrev>ZMQDeviceException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQDeviceException intro -->
-  <section xml:id="zmqdeviceexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqdeviceexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQDeviceException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQDeviceException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZMQException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <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>
-
-
-<!-- {{{ ZMQDeviceException properties -->
-  <section xml:id="zmqdeviceexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="zmqdeviceexception.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqdeviceexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqdeviceexception.props.file">
-     <term><varname>file</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqdeviceexception.props.line">
-     <term><varname>line</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/zmq/zmqexception.xml b/reference/zmq/zmqexception.xml
deleted file mode 100644
index 3e13057ef24e..000000000000
--- a/reference/zmq/zmqexception.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQException class</title>
- <titleabbrev>ZMQException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQException intro -->
-  <section xml:id="zmqexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <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>
-
-
-<!-- {{{ ZMQException properties -->
-  <section xml:id="zmqexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="zmqexception.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqexception.props.file">
-     <term><varname>file</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqexception.props.line">
-     <term><varname>line</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/zmq/zmqpoll.xml b/reference/zmq/zmqpoll.xml
deleted file mode 100644
index 512c0e41c71e..000000000000
--- a/reference/zmq/zmqpoll.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqpoll" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQPoll class</title>
- <titleabbrev>ZMQPoll</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQPoll intro -->
-  <section xml:id="zmqpoll.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqpoll.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQPoll</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQPoll</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zmqpoll')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.zmq.entities.zmqpoll;
-
-</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/zmq/zmqpoll/add.xml b/reference/zmq/zmqpoll/add.xml
deleted file mode 100644
index d75662f7c462..000000000000
--- a/reference/zmq/zmqpoll/add.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::add</refname>
-  <refpurpose>Add item to the poll set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ZMQPoll::add</methodname>
-   <methodparam><type>mixed</type><parameter>entry</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Adds a new item to the poll set and returns the internal id of the added item. The item can be removed
-   from the poll set using the returned string id.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>entry</parameter></term>
-     <listitem>
-      <para>
-       ZMQSocket object or a PHP stream resource
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       Defines what activity the socket is polled for. 
-       See <constant>ZMQ::POLL_IN</constant> and <constant>ZMQ::POLL_OUT</constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a string id of the added item which can be later used to remove the item. 
-   Throws ZMQPollException on error.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqpoll/clear.xml b/reference/zmq/zmqpoll/clear.xml
deleted file mode 100644
index 8e78a4939a77..000000000000
--- a/reference/zmq/zmqpoll/clear.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.clear" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::clear</refname>
-  <refpurpose>Clear the poll set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQPoll</type><methodname>ZMQPoll::clear</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Clears all elements from the poll set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   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/zmq/zmqpoll/count.xml b/reference/zmq/zmqpoll/count.xml
deleted file mode 100644
index 2bc78c0aafb6..000000000000
--- a/reference/zmq/zmqpoll/count.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.count" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::count</refname>
-  <refpurpose>Count items in the poll set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ZMQPoll::count</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Count the items in the poll set.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an &integer; representing the amount of items in the poll set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqpoll/getlasterrors.xml b/reference/zmq/zmqpoll/getlasterrors.xml
deleted file mode 100644
index fa2dbc1e6233..000000000000
--- a/reference/zmq/zmqpoll/getlasterrors.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.getlasterrors" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::getLastErrors</refname>
-  <refpurpose>Get poll errors</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ZMQPoll::getLastErrors</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the ids of the objects that had errors in the last poll.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing ids for the items that had errors in the last poll. Empty array is 
-   returned if there were no 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/zmq/zmqpoll/poll.xml b/reference/zmq/zmqpoll/poll.xml
deleted file mode 100644
index 58325577d42f..000000000000
--- a/reference/zmq/zmqpoll/poll.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.poll" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::poll</refname>
-  <refpurpose>Poll the items</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ZMQPoll::poll</methodname>
-   <methodparam><type>array</type><parameter role="reference">readable</parameter></methodparam>
-   <methodparam><type>array</type><parameter role="reference">writable</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>timeout</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Polls the items in the current poll set. The readable and writable items are returned in the 
-   <parameter>readable</parameter> and <parameter>writable</parameter> parameters. 
-   <function>ZMQPoll::getLastErrors</function> can be used to check if there were errors.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>readable</parameter></term>
-     <listitem>
-      <para>
-       Array where readable ZMQSockets/PHP streams are returned. The array
-       will be cleared at the beginning of the operation.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>writable</parameter></term>
-     <listitem>
-      <para>
-       Array where writable ZMQSockets/PHP streams are returned. The array
-       will be cleared at the beginning of the operation.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>timeout</parameter></term>
-     <listitem>
-      <para>
-       Timeout for the operation. -1 means that poll waits until
-       at least one item has activity. Please note that starting from 
-       version 1.0.0 the poll timeout is defined in milliseconds, rather
-       than microseconds.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-   <example>
-    <title>A <function>ZMQPoll</function> example</title>
-    <para>
-     Create a simple poll server
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create socket, request-reply pattern (reply socket) */
-$context = new ZMQContext();
-$server  = $context->getSocket(ZMQ::SOCKET_REP);
-
-/* Bind to port 5555 on 127.0.0.1 */
-$server->bind("tcp://127.0.0.1:5555");
-
-/* Create new pollset for incoming/outgoing message */
-$poll = new ZMQPoll();
-
-/* Add the object and listen for poll in/out */
-$id = $poll->add($server, ZMQ::POLL_IN | ZMQ::POLL_OUT);
-echo "Added object with id " . $id . "\n";
-
-/* Initialise readable and writable arrays */
-$readable = array();
-$writable = array();
-
-while (true) {
-   /* Amount of events retrieved */
-   $events = 0;
-
-   try {
-       /* Poll until there is something to do */
-       $events = $poll->poll($readable, $writable, -1);
-       $errors = $poll->getLastErrors();
-
-       if (count($errors) > 0) {
-           foreach ($errors as $error) {
-               echo "Error polling object " . $error . "\n";
-           }
-       }
-   } catch (ZMQPollException $e) {
-       echo "poll failed: " . $e->getMessage() . "\n";
-   }
-
-   if ($events > 0) {
-       /* Loop through readable objects and recv messages */
-       foreach ($readable as $r) {
-           try {
-               echo "Received message: " . $r->recv() . "\n";
-           } catch (ZMQException $e) {
-               echo "recv failed: " . $e->getMessage() . "\n";
-           }
-       }
-
-       /* Loop through writable and send back messages */
-       foreach ($writable as $w) {
-           try {
-               $w->send("Got it!");
-           } catch (ZMQException $e) {
-               echo "send failed: " . $e->getMessage() . "\n";
-           }
-       }
-   }
-}
-?>
-]]>
-    </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/zmq/zmqpoll/remove.xml b/reference/zmq/zmqpoll/remove.xml
deleted file mode 100644
index f7dfdcce6172..000000000000
--- a/reference/zmq/zmqpoll/remove.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqpoll.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQPoll::remove</refname>
-  <refpurpose>Remove item from poll set</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ZMQPoll::remove</methodname>
-   <methodparam><type>mixed</type><parameter>item</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Remove item from the poll set. The <parameter>item</parameter> parameter can be ZMQSocket object,
-   a stream resource or the id returned from <function>ZMQPoll::add</function> method.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>item</parameter></term>
-     <listitem>
-      <para>
-       The ZMQSocket object, PHP stream or &string; id of the item.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns true if the item was removed and false if the object 
-   with given id does not exist in the poll set.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqpollexception.xml b/reference/zmq/zmqpollexception.xml
deleted file mode 100644
index ef8a93989741..000000000000
--- a/reference/zmq/zmqpollexception.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqpollexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQPollException class</title>
- <titleabbrev>ZMQPollException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQPollException intro -->
-  <section xml:id="zmqpollexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqpollexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQPollException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQPollException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZMQException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <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>
-
-
-<!-- {{{ ZMQPollException properties -->
-  <section xml:id="zmqpollexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="zmqpollexception.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqpollexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqpollexception.props.file">
-     <term><varname>file</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqpollexception.props.line">
-     <term><varname>line</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/zmq/zmqsocket.xml b/reference/zmq/zmqsocket.xml
deleted file mode 100644
index b31f6ef0b703..000000000000
--- a/reference/zmq/zmqsocket.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqsocket" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQSocket class</title>
- <titleabbrev>ZMQSocket</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQSocket intro -->
-  <section xml:id="zmqsocket.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqsocket.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQSocket</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQSocket</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zmqsocket')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.zmq.entities.zmqsocket;
-
-</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/zmq/zmqsocket/bind.xml b/reference/zmq/zmqsocket/bind.xml
deleted file mode 100644
index 92a66e3cbe11..000000000000
--- a/reference/zmq/zmqsocket/bind.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.bind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::bind</refname>
-  <refpurpose>Bind the socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::bind</methodname>
-   <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>force</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Bind the socket to an endpoint. The endpoint is defined in format <literal>transport://address</literal> where 
-   transport is one of the following: inproc, ipc, tcp, pgm or epgm.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dsn</parameter></term>
-     <listitem>
-      <para>
-       The bind dsn, for example <literal>transport://address</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>force</parameter></term>
-     <listitem>
-      <para>
-       Tries to bind even if the socket has already been bound to the given endpoint.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/connect.xml b/reference/zmq/zmqsocket/connect.xml
deleted file mode 100644
index fe6612f5ffed..000000000000
--- a/reference/zmq/zmqsocket/connect.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::connect</refname>
-  <refpurpose>Connect the socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::connect</methodname>
-   <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-   <methodparam choice="opt"><type>bool</type><parameter>force</parameter><initializer>&false;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Connect the socket to a remote endpoint. The endpoint is defined in format <literal>transport://address</literal> where 
-   transport is one of the following: inproc, ipc, tcp, pgm or epgm.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dsn</parameter></term>
-     <listitem>
-      <para>
-       The connect dsn, for example <literal>transport://address</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>force</parameter></term>
-     <listitem>
-      <para>
-       Tries to connect even if the socket has already been connected to given endpoint.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-   <example>
-    <title>A <function>ZMQContext</function> example</title>
-    <para>
-     Construct a new context and allocate request socket from it
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-/* Server hostname */
-$dsn = "tcp://127.0.0.1:5555";
-
-/* Create a socket */
-$socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'my socket');
-
-/* Get list of connected endpoints */
-$endpoints = $socket->getEndpoints();
-
-/* Check if the socket is connected */
-if (!in_array($dsn, $endpoints['connect'])) {
-    echo "<p>Connecting to $dsn</p>";
-    $socket->connect($dsn);
-} else {
-    echo "<p>Already connected to $dsn</p>";
-}
-
-/* Send and receive */
-$socket->send("Hello!");
-$message = $socket->recv();
-
-echo "<p>Server said: {$message}</p>";
-?>
-]]>
-    </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/zmq/zmqsocket/construct.xml b/reference/zmq/zmqsocket/construct.xml
deleted file mode 100644
index b6f7a2cad176..000000000000
--- a/reference/zmq/zmqsocket/construct.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::__construct</refname>
-  <refpurpose>Construct a new ZMQSocket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <methodname>ZMQSocket::__construct</methodname>
-   <methodparam><type>ZMQContext</type><parameter>context</parameter></methodparam>
-   <methodparam><type>int</type><parameter>type</parameter></methodparam>
-   <methodparam choice="opt"><type>string</type><parameter>persistent_id</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>on_new_socket</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Constructs a ZMQSocket object. <parameter>persistent_id</parameter> parameter can be used to allocated a persistent
-   socket. A persistent socket has to be allocated from a persistent context and it stays connected over multiple requests.
-   The <parameter>persistent_id</parameter> parameter can be used to recall the same socket over multiple requests. The     
-   <parameter>on_new_socket</parameter> is called only when a new underlying socket structure is created.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>context</parameter></term>
-     <listitem>
-      <para>
-       ZMQContext object.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>type</parameter></term>
-     <listitem>
-      <para>
-       The socket type. See <constant>ZMQ::SOCKET_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>persistent_id</parameter></term>
-     <listitem>
-      <para>
-       If <parameter>persistent_id</parameter> is specified the socket will be persisted over multiple requests.
-       If <parameter>context</parameter> is not persistent the socket falls back to non-persistent mode.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>on_new_socket</parameter></term>
-     <listitem>
-      <para>
-       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="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
-
-/*
-  The socket is persistent so this function is called only on the 
-  first request to the script.
-*/
-function on_new_socket_cb(ZMQSocket $socket, $persistent_id = null)
-{
-    if ($persistent_id === 'server') {
-        $socket->bind("tcp://localhost:12122");
-    } else {
-        $socket->connect("tcp://localhost:12122");
-    }
-}
-
-/* Allocate a new context */
-$context = new ZMQContext();
-
-/* Create a new socket */
-$socket = $context->getSocket(ZMQ::SOCKET_REP, 'server', 'on_new_socket_cb');
-
-$message = $socket->recv();
-echo "Received message: {$message}\n";
-?>
-]]>
-    </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/zmq/zmqsocket/disconnect.xml b/reference/zmq/zmqsocket/disconnect.xml
deleted file mode 100644
index 2b499c6b164f..000000000000
--- a/reference/zmq/zmqsocket/disconnect.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.disconnect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::disconnect</refname>
-  <refpurpose>Disconnect a socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::disconnect</methodname>
-   <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Disconnect the socket from a previously connected remote endpoint. The endpoint is defined in format
-   <literal>transport://address</literal> where transport is one of the following: inproc, ipc, tcp, pgm or epgm.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dsn</parameter></term>
-     <listitem>
-      <para>
-       The connect dsn, for example <literal>transport://address</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-    </variablelist>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/getendpoints.xml b/reference/zmq/zmqsocket/getendpoints.xml
deleted file mode 100644
index bc0a84698e39..000000000000
--- a/reference/zmq/zmqsocket/getendpoints.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.getendpoints" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::getEndpoints</refname>
-  <refpurpose>Get list of endpoints</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ZMQSocket::getEndpoints</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns a list of endpoints where the socket is connected or bound to.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array containing elements 'bind' and 'connect'. 
-  </para>
- </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/getpersistentid.xml b/reference/zmq/zmqsocket/getpersistentid.xml
deleted file mode 100644
index c05ed4293090..000000000000
--- a/reference/zmq/zmqsocket/getpersistentid.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.getpersistentid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::getPersistentId</refname>
-  <refpurpose>Get the persistent id</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ZMQSocket::getPersistentId</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Returns the persistent id of the socket.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the persistent id string assigned of the object and &null; if socket is not persistent.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/getsockettype.xml b/reference/zmq/zmqsocket/getsockettype.xml
deleted file mode 100644
index c4770fd9c2c0..000000000000
--- a/reference/zmq/zmqsocket/getsockettype.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.getsockettype" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::getSocketType</refname>
-  <refpurpose>Get the socket type</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>int</type><methodname>ZMQSocket::getSocketType</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Gets the socket type.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an integer representing the socket type. The integer can be compared against
-   <constant>ZMQ::SOCKET_<replaceable>*</replaceable></constant> constants.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/getsockopt.xml b/reference/zmq/zmqsocket/getsockopt.xml
deleted file mode 100644
index 1630f353d2e7..000000000000
--- a/reference/zmq/zmqsocket/getsockopt.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.getsockopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::getSockOpt</refname>
-  <refpurpose>Get socket option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>mixed</type><methodname>ZMQSocket::getSockOpt</methodname>
-   <methodparam><type>string</type><parameter>key</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Returns the value of a socket option. 
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       An integer representing the option.
-       See the <constant>ZMQ::SOCKOPT_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns either a &string; or an &integer; depending on <parameter>key</parameter>. Throws
-   ZMQSocketException on error. 
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/ispersistent.xml b/reference/zmq/zmqsocket/ispersistent.xml
deleted file mode 100644
index 0d7e31c0cecf..000000000000
--- a/reference/zmq/zmqsocket/ispersistent.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.ispersistent" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::isPersistent</refname>
-  <refpurpose>Whether the socket is persistent</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>bool</type><methodname>ZMQSocket::isPersistent</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   Check whether the socket is persistent.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns a &boolean; based on whether the socket is persistent or not.
-  </para>
- </refsect1>
-
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/recv.xml b/reference/zmq/zmqsocket/recv.xml
deleted file mode 100644
index 1800d9aa5c3a..000000000000
--- a/reference/zmq/zmqsocket/recv.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.recv" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::recv</refname>
-  <refpurpose>Receives a message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>string</type><methodname>ZMQSocket::recv</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Receive a message from a socket. By default receiving will block until a message is available unless
-   <constant>ZMQ::MODE_DONTWAIT</constant> flag is used. <constant>ZMQ::SOCKOPT_RCVMORE</constant>
-   socket option can be used for receiving multi-part messages. See <function>ZMQSocket::setSockOpt</function> 
-   for more information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Pass mode flags to receive multipart messages or non-blocking operation. 
-       See <constant>ZMQ::MODE_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </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>
-   <example>
-    <title>A send/recv example</title>
-    <para>
-     Non-blocking send / receive
-    </para>
-    <programlisting role="php">
-<![CDATA[
-<?php
-
-/* Create new queue object, there needs to be a server at the other end */
-$queue = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ);
-$queue->connect("tcp://127.0.0.1:5555");
-
-/* Assign socket 1 to the queue, send and receive */
-$retries = 5;
-$sending = true;
-
-/* Start a loop */
-do {
-    try {
-        /* Try to send / receive */
-        if ($sending) {
-            echo "Sending message\n";
-            $queue->send("This is a message", ZMQ::MODE_DONTWAIT);
-            $sending = false;
-        } else {
-            echo "Got response: " . $queue->recv(ZMQ::MODE_DONTWAIT) . "\n";
-            break;
-        }
-    } catch (ZMQSocketException $e) {
-        /* EAGAIN means that the operation would have blocked, retry */
-        if ($e->getCode() === ZMQ::ERR_EAGAIN) {
-            echo " - Got EAGAIN, retrying ($retries)\n";
-        } else {
-            die(" - Error: " . $e->getMessage());
-        }
-    }
-    /* Sleep a bit between operations */
-    usleep(5);
-} while (--$retries);
-?>
-]]>
-    </programlisting>
-    &example.outputs.similar;
-    <screen>
-<![CDATA[
-Sending message
- - Unable to execute operation, retrying (4)
-Got response: This is a message
-]]>
-    </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/zmq/zmqsocket/recvmulti.xml b/reference/zmq/zmqsocket/recvmulti.xml
deleted file mode 100644
index a080bb9f085c..000000000000
--- a/reference/zmq/zmqsocket/recvmulti.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.recvmulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::recvMulti</refname>
-  <refpurpose>Receives a multipart message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>array</type><methodname>ZMQSocket::recvMulti</methodname>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Receive an array multipart message from a socket. By default receiving will block until a message is available unless
-   <constant>ZMQ::MODE_NOBLOCK</constant> flag is used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Pass mode flags to receive multipart messages or non-blocking operation. 
-       See <constant>ZMQ::MODE_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the array of message parts. Throws ZMQSocketException in error. 
-   If <constant>ZMQ::MODE_NOBLOCK</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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/send.xml b/reference/zmq/zmqsocket/send.xml
deleted file mode 100644
index f8adc4f3fd94..000000000000
--- a/reference/zmq/zmqsocket/send.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.send" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::send</refname>
-  <refpurpose>Sends a message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::send</methodname>
-   <methodparam><type>string</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Send a message using the socket. The operation can block unless <constant>ZMQ::MODE_NOBLOCK</constant> is used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>message</parameter></term>
-     <listitem>
-      <para>
-       The message to send.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Pass mode flags to receive multipart messages or non-blocking operation. 
-       See <constant>ZMQ::MODE_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current object. Throws ZMQSocketException on error. 
-   If <constant>ZMQ::MODE_NOBLOCK</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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/sendmulti.xml b/reference/zmq/zmqsocket/sendmulti.xml
deleted file mode 100644
index 4e5b33265a15..000000000000
--- a/reference/zmq/zmqsocket/sendmulti.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.sendmulti" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::sendmulti</refname>
-  <refpurpose>Sends a multipart message</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::sendmulti</methodname>
-   <methodparam><type>array</type><parameter>message</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>mode</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   Send a multipart message using the socket. The operation can block unless <constant>ZMQ::MODE_NOBLOCK</constant> is used.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>message</parameter></term>
-     <listitem>
-      <para>
-       The message to send - an array of strings
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>mode</parameter></term>
-     <listitem>
-      <para>
-       Pass mode flags to receive multipart messages or non-blocking operation. 
-       See <constant>ZMQ::MODE_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </para>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the current object. Throws ZMQSocketException on error. 
-   If <constant>ZMQ::MODE_NOBLOCK</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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/setsockopt.xml b/reference/zmq/zmqsocket/setsockopt.xml
deleted file mode 100644
index 0a826c248252..000000000000
--- a/reference/zmq/zmqsocket/setsockopt.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.setsockopt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::setSockOpt</refname>
-  <refpurpose>Set a socket option</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::setSockOpt</methodname>
-   <methodparam><type>int</type><parameter>key</parameter></methodparam>
-   <methodparam><type>mixed</type><parameter>value</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Sets a ZMQ socket option. The type of the <parameter>value</parameter> depends on the <parameter>key</parameter>.
-   See <link linkend="zmq.constants">ZMQ Constant Types</link> for more information.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>key</parameter></term>
-     <listitem>
-      <para>
-       One of the <constant>ZMQ::SOCKOPT_<replaceable>*</replaceable></constant> constants.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
-     <term><parameter>value</parameter></term>
-     <listitem>
-      <para>
-       The value of the parameter.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocket/unbind.xml b/reference/zmq/zmqsocket/unbind.xml
deleted file mode 100644
index 60eda037f379..000000000000
--- a/reference/zmq/zmqsocket/unbind.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zmqsocket.unbind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZMQSocket::unbind</refname>
-  <refpurpose>Unbind the socket</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <modifier>public</modifier> <type>ZMQSocket</type><methodname>ZMQSocket::unbind</methodname>
-   <methodparam><type>string</type><parameter>dsn</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   Unbind the socket from an endpoint. The endpoint is defined in format <literal>transport://address</literal> where 
-   transport is one of the following: inproc, ipc, tcp, pgm or epgm.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <para>
-   <variablelist>
-    <varlistentry>
-     <term><parameter>dsn</parameter></term>
-     <listitem>
-      <para>
-       The previously bound dsn, for example <literal>transport://address</literal>.
-      </para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </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
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"~/.phpdoc/manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
diff --git a/reference/zmq/zmqsocketexception.xml b/reference/zmq/zmqsocketexception.xml
deleted file mode 100644
index edd00f49f73d..000000000000
--- a/reference/zmq/zmqsocketexception.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zmqsocketexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <title>The ZMQSocketException class</title>
- <titleabbrev>ZMQSocketException</titleabbrev>
-
- <partintro>
-
-<!-- {{{ ZMQSocketException intro -->
-  <section xml:id="zmqsocketexception.intro">
-   &reftitle.intro;
-   <para>
-
-   </para>
-  </section>
-<!-- }}} -->
-
-  <section xml:id="zmqsocketexception.synopsis">
-   &reftitle.classsynopsis;
-
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZMQSocketException</classname></ooclass>
-
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZMQSocketException</classname>
-     </ooclass>
-
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZMQException</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-
-
-    <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>
-
-
-<!-- {{{ ZMQSocketException properties -->
-  <section xml:id="zmqsocketexception.props">
-   &reftitle.properties;
-   <variablelist>
-    <varlistentry xml:id="zmqsocketexception.props.message">
-     <term><varname>message</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqsocketexception.props.code">
-     <term><varname>code</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqsocketexception.props.file">
-     <term><varname>file</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-    <varlistentry xml:id="zmqsocketexception.props.line">
-     <term><varname>line</varname></term>
-     <listitem>
-      <para></para>
-     </listitem>
-    </varlistentry>
-   </variablelist>
-  </section>
-<!-- }}} -->
-
-
- </partintro>
-
-</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/zookeeper/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md b/reference/zookeeper/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
deleted file mode 100644
index acfdeb7ed6b8..000000000000
--- a/reference/zookeeper/MOVING_TO_DOC_EXTENSIONS_DO_NOT_CHANGE_HERE.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# This extension is moving to php/doc-extensions
-
-Per [the RFC on separation of third-party extension documentation](https://wiki.php.net/rfc/third_party_ext_documentation),
-the documentation for this extension is being migrated to the [php/doc-extensions](https://github.com/php/doc-extensions) repository.
-
-**Do not make changes to this extension's documentation in doc-en.**
-Any changes made here after this file was added will be discarded during the migration.
-Please direct all contributions to [php/doc-extensions](https://github.com/php/doc-extensions) instead.
-
-The migration plan and progress are tracked in [php/doc-extensions#13](https://github.com/php/doc-extensions/issues/13),
-and the final list of migrated extensions in [php/doc-extensions#12](https://github.com/php/doc-extensions/issues/12).
diff --git a/reference/zookeeper/book.xml b/reference/zookeeper/book.xml
deleted file mode 100644
index e3b9a21eddbb..000000000000
--- a/reference/zookeeper/book.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $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>
-
- <!-- {{{ preface -->
- <preface xml:id="intro.zookeeper">
-  &reftitle.intro;
-  <para>
-  This extension uses libzookeeper library to provide API for communicating with ZooKeeper service.
-  </para>
-  <para>
-   ZooKeeper is an Apache project that enables centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
-  </para>
- </preface>
- <!-- }}} -->
-
- &reference.zookeeper.setup;
-
- &reference.zookeeper.reference;
-
- &reference.zookeeper.zookeeper;
- &reference.zookeeper.zookeeperconfig;
-
- &reference.zookeeper.zookeeperexception;
- &reference.zookeeper.zookeeperauthenticationexception;
- &reference.zookeeper.zookeeperconnectionexception;
- &reference.zookeeper.zookeepermarshallingexception;
- &reference.zookeeper.zookeepernonodeexception;
- &reference.zookeeper.zookeeperoperationtimeoutexception;
- &reference.zookeeper.zookeepersessionexception;
-
-</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/zookeeper/configure.xml b/reference/zookeeper/configure.xml
deleted file mode 100644
index dec2af8721a1..000000000000
--- a/reference/zookeeper/configure.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="zookeeper.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;zookeeper">&url.pecl.package;zookeeper</link>.
- </para>
-
- <para>
-  To enable zookeeper support, configure with 
-  <option role="configure">--with-libzookeeper-dir=DIR</option>. DIR is the install prefix of ZooKeeper C Binding, which must contain the <filename>include/zookeeper/zookeeper.h</filename>
- </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/zookeeper/functions/zookeeper_dispatch.xml b/reference/zookeeper/functions/zookeeper_dispatch.xml
deleted file mode 100644
index 6e248f2b681e..000000000000
--- a/reference/zookeeper/functions/zookeeper_dispatch.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-<refentry xml:id="function.zookeeper-dispatch" xmlns="http://docbook.org/ns/docbook">
- <refnamediv>
-  <refname>zookeeper_dispatch</refname>
-  <refpurpose>Calls callbacks for pending operations</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis>
-   <type>void</type><methodname>zookeeper_dispatch</methodname>
-   <void/>
-  </methodsynopsis>
-
-  <para>
-   The <function>zookeeper_dispatch</function> function calls the callbacks passed by operations like <methodname>Zookeeper::get</methodname> or <methodname>Zookeeper::exists</methodname>.
-  </para>
-
-  <caution>
-   <para>
-    Since version 0.4.0, this function must be called manually to achieve asynchronous operations. If you want that to be done automatically, you also can declare ticks at the beginning of your program.
-   </para>
-  </caution>
-
-  <para>
-   After PHP 7.1, you can ignore this function. This extension uses EG(vm_interrupt) to implement async dispatch.
-  </para>
-
- </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>
-   This method emits PHP warning when callback could not be invoked.
-  </para>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="function.zookeeper-dispatch.example.1">
-   <title><methodname>zookeeper_dispatch</methodname> example #1</title>
-   <para>
-     Dispatch callbacks manually.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Zookeeper();
-$client->connect('localhost:2181');
-$client->get('/zookeeper', function() {
-    echo "Callback was called".PHP_EOL;
-});
-while(true) {
-    sleep(1);
-    zookeeper_dispatch();
-}
-?>
-]]>
-   </programlisting>
-  </example>
-
-  <example xml:id="function.zookeeper-dispatch.example.2">
-   <title><methodname>zookeeper_dispatch</methodname> example #2</title>
-   <para>
-     Declare ticks.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-declare(ticks=1);
-
-$client = new Zookeeper();
-$client->connect('localhost:2181');
-$client->get('/zookeeper', function() {
-    echo "Callback was called".PHP_EOL;
-});
-while(true) {
-    sleep(1);
-}
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <para>
-   <simplelist>
-    <member><methodname>Zookeeper::addAuth</methodname></member>
-    <member><methodname>Zookeeper::connect</methodname></member>
-    <member><methodname>Zookeeper::__construct</methodname></member>
-    <member><methodname>Zookeeper::exists</methodname></member>
-    <member><methodname>Zookeeper::get</methodname></member>
-    <member><methodname>Zookeeper::getChildren</methodname></member>
-    <member><methodname>Zookeeper::setWatcher</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/zookeeper/ini.xml b/reference/zookeeper/ini.xml
deleted file mode 100644
index 93fd72812fbe..000000000000
--- a/reference/zookeeper/ini.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<section xml:id="zookeeper.configuration" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.runtime;
- &extension.runtime;
-
- <para>
-  <table>
-   <title>Zookeeper &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.zookeeper.recv_timeout">zookeeper.recv_timeout</link></entry>
-      <entry>10000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.zookeeper.session_lock">zookeeper.session_lock</link></entry>
-      <entry>1</entry>
-      <entry><constant>INI_SYSTEM</constant></entry>
-      <entry></entry>
-     </row>
-     <row>
-      <entry><link linkend="ini.zookeeper.sess_lock_wait">zookeeper.sess_lock_wait</link></entry>
-      <entry>150000</entry>
-      <entry><constant>INI_ALL</constant></entry>
-      <entry></entry>
-     </row>
-    </tbody>
-   </tgroup>
-  </table>
-
-  &ini.php.constants;
-
- </para>
-
- &ini.descriptions.title;
-
- <para>
-  <variablelist>
-
-   <varlistentry xml:id="ini.zookeeper.recv_timeout">
-    <term>
-     <parameter>zookeeper.recv_timeout</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Default the timeout for any ZooKeeper session.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.zookeeper.session_lock">
-    <term>
-     <parameter>zookeeper.session_lock</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <para>
-      Enable PHP session locking.
-     </para>
-    </listitem>
-   </varlistentry>
-
-   <varlistentry xml:id="ini.zookeeper.sess_lock_wait">
-    <term>
-     <parameter>zookeeper.sess_lock_wait</parameter>
-     <type>int</type>
-    </term>
-    <listitem>
-     <simpara>
-      PHP Session spin lock retry wait time in microseconds. Be careful when setting this value. Valid values are integers, where 0 is interpreted as the default value. Negative values result in a reduces locking to a try lock.
-     </simpara>
-    </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/zookeeper/reference.xml b/reference/zookeeper/reference.xml
deleted file mode 100644
index 5a88422bcbce..000000000000
--- a/reference/zookeeper/reference.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="ref.zookeeper" xmlns="http://docbook.org/ns/docbook">
- <title>ZooKeeper &Functions;</title>
-
- &reference.zookeeper.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/zookeeper/setup.xml b/reference/zookeeper/setup.xml
deleted file mode 100644
index 193091963ceb..000000000000
--- a/reference/zookeeper/setup.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<chapter xml:id="zookeeper.setup" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- &reftitle.setup;
-
- <!-- {{{ Requirements -->
- <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>
- </section>
- <!-- }}} -->
-
- <!-- {{{ Installation -->
-  &reference.zookeeper.configure;
- <!-- or &reference.zookeeper.entities.configure; -->
- <!-- }}} -->
-
- <!-- {{{ Configuration -->
-  &reference.zookeeper.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/zookeeper/versions.xml b/reference/zookeeper/versions.xml
deleted file mode 100644
index b5fe4c36a056..000000000000
--- a/reference/zookeeper/versions.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?do-not-translate?>
-
-<versions>
- <function name='zookeeper' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::addauth' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::connect' from='PECL zookeeper &gt;= 0.2.0'/>
- <function name='zookeeper::__construct' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::close' from='PECL zookeeper &gt;= 0.5.0'/>
- <function name='zookeeper::create' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::delete' from='PECL zookeeper &gt;= 0.2.0'/>
- <function name='zookeeper::exists' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::get' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getacl' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getchildren' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getclientid' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getrecvtimeout' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getstate' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::isrecoverable' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::set' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::setacl' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::setdebuglevel' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::setdeterministicconnorder' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::setlogstream' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::setwatcher' from='PECL zookeeper &gt;= 0.1.0'/>
- <function name='zookeeper::getconfig' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.5.0'/>
-
- <function name='zookeeperexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeeperoperationtimeoutexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeeperconnectionexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeepermarshallingexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeeperauthenticationexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeepersessionexception' from='PECL zookeeper &gt;= 0.3.0'/>
- <function name='zookeepernonodeexception' from='PECL zookeeper &gt;= 0.3.0'/>
-
- <function name='zookeeper_dispatch' from='PECL zookeeper &gt;= 0.4.0'/>
-
- <function name='zookeeperconfig' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.5.0'/>
- <function name='zookeeperconfig::get' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.5.0'/>
- <function name='zookeeperconfig::set' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.5.0'/>
- <function name='zookeeperconfig::add' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.5.0'/>
- <function name='zookeeperconfig::remove' from='PECL zookeeper &gt;= 0.6.0, ZooKeeper &gt;= 3.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/zookeeper/zookeeper.xml b/reference/zookeeper/zookeeper.xml
deleted file mode 100644
index 87c76c403e35..000000000000
--- a/reference/zookeeper/zookeeper.xml
+++ /dev/null
@@ -1,827 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeper"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The Zookeeper class</title>
- <titleabbrev>Zookeeper</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeper.intro">
-   &reftitle.intro;
-   <para>
-    Represents ZooKeeper session.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeper.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>Zookeeper</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>Zookeeper</classname>
-     </ooclass>
- 
-    </classsynopsisinfo>
-<!-- }}} -->
- 
-<!-- {{{ Class methods -->
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zookeeper')/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.zookeeper')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-<!-- }}} -->
-
-<!-- {{{ Class constants -->
-    <classsynopsisinfo role="comment">&Constants;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-read">PERM_READ</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-write">PERM_WRITE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-create">PERM_CREATE</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-delete">PERM_DELETE</varname>
-     <initializer>8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-admin">PERM_ADMIN</varname>
-     <initializer>16</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.perm-all">PERM_ALL</varname>
-     <initializer>31</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.ephemeral">EPHEMERAL</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.sequence">SEQUENCE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.log-level-error">LOG_LEVEL_ERROR</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.log-level-warn">LOG_LEVEL_WARN</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.log-level-info">LOG_LEVEL_INFO</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.log-level-debug">LOG_LEVEL_DEBUG</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.expired-session-state">EXPIRED_SESSION_STATE</varname>
-     <initializer>-112</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.auth-failed-state">AUTH_FAILED_STATE</varname>
-     <initializer>-113</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.connecting-state">CONNECTING_STATE</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.associating-state">ASSOCIATING_STATE</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.connected-state">CONNECTED_STATE</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.readonly-state">READONLY_STATE</varname>
-     <initializer>5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.notconnected-state">NOTCONNECTED_STATE</varname>
-     <initializer>999</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.created-event">CREATED_EVENT</varname>
-     <initializer>1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.deleted-event">DELETED_EVENT</varname>
-     <initializer>2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.changed-event">CHANGED_EVENT</varname>
-     <initializer>3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.child-event">CHILD_EVENT</varname>
-     <initializer>4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.session-event">SESSION_EVENT</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.notwatching-event">NOTWATCHING_EVENT</varname>
-     <initializer>-2</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.systemerror">SYSTEMERROR</varname>
-     <initializer>-1</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.runtimeinconsistency">RUNTIMEINCONSISTENCY</varname>
-     <initializer>-2</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.datainconsistency">DATAINCONSISTENCY</varname>
-     <initializer>-3</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.connectionloss">CONNECTIONLOSS</varname>
-     <initializer>-4</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.marshallingerror">MARSHALLINGERROR</varname>
-     <initializer>-5</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.unimplemented">UNIMPLEMENTED</varname>
-     <initializer>-6</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.operationtimeout">OPERATIONTIMEOUT</varname>
-     <initializer>-7</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.badarguments">BADARGUMENTS</varname>
-     <initializer>-8</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.invalidstate">INVALIDSTATE</varname>
-     <initializer>-9</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.newconfignoquorum">NEWCONFIGNOQUORUM</varname>
-     <initializer>-13</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.reconfiginprogress">RECONFIGINPROGRESS</varname>
-     <initializer>-14</initializer>
-    </fieldsynopsis>
-
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.ok">OK</varname>
-     <initializer>0</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.apierror">APIERROR</varname>
-     <initializer>-100</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.nonode">NONODE</varname>
-     <initializer>-101</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.noauth">NOAUTH</varname>
-     <initializer>-102</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.badversion">BADVERSION</varname>
-     <initializer>-103</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.nochildrenforephemerals">NOCHILDRENFOREPHEMERALS</varname>
-     <initializer>-108</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.nodeexists">NODEEXISTS</varname>
-     <initializer>-110</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.notempty">NOTEMPTY</varname>
-     <initializer>-111</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.sessionexpired">SESSIONEXPIRED</varname>
-     <initializer>-112</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.invalidcallback">INVALIDCALLBACK</varname>
-     <initializer>-113</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.invalidacl">INVALIDACL</varname>
-     <initializer>-114</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.authfailed">AUTHFAILED</varname>
-     <initializer>-115</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.closing">CLOSING</varname>
-     <initializer>-116</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.nothing">NOTHING</varname>
-     <initializer>-117</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.sessionmoved">SESSIONMOVED</varname>
-     <initializer>-118</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.notreadonly">NOTREADONLY</varname>
-     <initializer>-119</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.ephemeralonlocalsession">EPHEMERALONLOCALSESSION</varname>
-     <initializer>-120</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.nowatcher">NOWATCHER</varname>
-     <initializer>-121</initializer>
-    </fieldsynopsis>
-    <fieldsynopsis>
-     <modifier>const</modifier>
-     <type>int</type>
-     <varname linkend="zookeeper.constants.reconfigdisabled">RECONFIGDISABLED</varname>
-     <initializer>-122</initializer>
-    </fieldsynopsis>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
-<!-- {{{ Constants -->
-  <section xml:id="zookeeper.class.constants">
-   &reftitle.constants;
-
-<!-- {{{ Constants Permissions -->
-   <section xml:id="zookeeper.constants.perms">
-    <title><acronym>ZooKeeper</acronym> Permissions</title>
-    <variablelist>
-
-     <varlistentry xml:id="zookeeper.constants.perm-read">
-      <term><constant>Zookeeper::PERM_READ</constant></term>
-      <listitem>
-       <para>Can read nodes value and list its children</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.perm-write">
-      <term><constant>Zookeeper::PERM_WRITE</constant></term>
-      <listitem>
-       <para>Can set the nodes value</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.perm-create">
-      <term><constant>Zookeeper::PERM_CREATE</constant></term>
-      <listitem>
-       <para>Can create children</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.perm-delete">
-      <term><constant>Zookeeper::PERM_DELETE</constant></term>
-      <listitem>
-       <para>Can delete children</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.perm-admin">
-      <term><constant>Zookeeper::PERM_ADMIN</constant></term>
-      <listitem>
-       <para>Can execute set_acl()</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.perm-all">
-      <term><constant>Zookeeper::PERM_ALL</constant></term>
-      <listitem>
-       <para>All of the above flags ORd together</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants Create Flags -->
-   <section xml:id="zookeeper.constants.create-flags">
-    <title><acronym>ZooKeeper</acronym> Create Flags</title>
-    <variablelist>
-
-     <varlistentry xml:id="zookeeper.constants.ephemeral">
-      <term><constant>Zookeeper::EPHEMERAL</constant></term>
-      <listitem>
-       <para>If Zookeeper::EPHEMERAL flag is set, the node will automatically get removed if the client session goes away.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.sequence">
-      <term><constant>Zookeeper::SEQUENCE</constant></term>
-      <listitem>
-       <para>If the Zookeeper::SEQUENCE flag is set, a unique monotonically increasing sequence number is appended to the path name. The sequence number is always fixed length of 10 digits, 0 padded.</para>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants Log Levels -->
-   <section xml:id="zookeeper.constants.log-levels">
-    <title><acronym>ZooKeeper</acronym> Log Levels</title>
-    <variablelist>
-
-     <varlistentry xml:id="zookeeper.constants.log-level-error">
-      <term><constant>Zookeeper::LOG_LEVEL_ERROR</constant></term>
-      <listitem>
-       <simpara>Outputs only error messages</simpara>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.log-level-warn">
-      <term><constant>Zookeeper::LOG_LEVEL_WARN</constant></term>
-      <listitem>
-       <para>Outputs errors/warnings</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.log-level-info">
-      <term><constant>Zookeeper::LOG_LEVEL_INFO</constant></term>
-      <listitem>
-       <para>Outputs big action messages besides errors/warnings</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.log-level-debug">
-      <term><constant>Zookeeper::LOG_LEVEL_DEBUG</constant></term>
-      <listitem>
-       <para>Outputs all</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants States -->
-   <section xml:id="zookeeper.constants.states">
-    <title><acronym>ZooKeeper</acronym> States</title>
-    <variablelist>
-
-     <varlistentry xml:id="zookeeper.constants.expired-session-state">
-      <term><constant>Zookeeper::EXPIRED_SESSION_STATE</constant></term>
-      <listitem>
-       <para>Connected but session expired</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.auth-failed-state">
-      <term><constant>Zookeeper::AUTH_FAILED_STATE</constant></term>
-      <listitem>
-       <para>Connected but auth failed</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.connecting-state">
-      <term><constant>Zookeeper::CONNECTING_STATE</constant></term>
-      <listitem>
-       <para>Connecting</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.associating-state">
-      <term><constant>Zookeeper::ASSOCIATING_STATE</constant></term>
-      <listitem>
-       <para>Associating</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.connected-state">
-      <term><constant>Zookeeper::CONNECTED_STATE</constant></term>
-      <listitem>
-       <para>Connected</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.readonly-state">
-      <term><constant>Zookeeper::READONLY_STATE</constant></term>
-      <listitem>
-       <para>TODO: help us improve this extension.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.notconnected-state">
-      <term><constant>Zookeeper::NOTCONNECTED_STATE</constant></term>
-      <listitem>
-       <para>Connection failed</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants Watch Types -->
-   <section xml:id="zookeeper.constants.watch-types">
-    <title><acronym>ZooKeeper</acronym> Watch Types</title>
-    <variablelist>
-
-     <varlistentry xml:id="zookeeper.constants.created-event">
-      <term><constant>Zookeeper::CREATED_EVENT</constant></term>
-      <listitem>
-       <para>A node has been created</para>
-       <para>This is only generated by watches on non-existent nodes. These watches are set using Zookeeper::exists.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.deleted-event">
-      <term><constant>Zookeeper::DELETED_EVENT</constant></term>
-      <listitem>
-       <para>A node has been deleted</para>
-       <para>This is only generated by watches on nodes. These watches are set using Zookeeper::exists and Zookeeper::get.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.changed-event">
-      <term><constant>Zookeeper::CHANGED_EVENT</constant></term>
-      <listitem>
-       <para>A node has changed</para>
-       <para>This is only generated by watches on nodes. These watches are set using Zookeeper::exists and Zookeeper::get.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.child-event">
-      <term><constant>Zookeeper::CHILD_EVENT</constant></term>
-      <listitem>
-       <simpara>A change has occurred in the list of children</simpara>
-       <para>This is only generated by watches on the child list of a node. These watches are set using Zookeeper::getChildren.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.session-event">
-      <term><constant>Zookeeper::SESSION_EVENT</constant></term>
-      <listitem>
-       <para>A session has been lost</para>
-       <para>This is generated when a client loses contact or reconnects with a server.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.notwatching-event">
-      <term><constant>Zookeeper::NOTWATCHING_EVENT</constant></term>
-      <listitem>
-       <para>A watch has been removed</para>
-       <para>This is generated when the server for some reason, probably a resource constraint, will no longer watch a node for a client.</para>
-      </listitem>
-     </varlistentry>
-
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants System and Server-side Errors -->
-   <section xml:id="zookeeper.constants.system-n-server-side-errors">
-    <title><acronym>ZooKeeper</acronym> System and Server-side Errors</title>
-    <variablelist>
-     <varlistentry xml:id="zookeeper.constants.systemerror">
-      <term><constant>Zookeeper::SYSTEMERROR</constant></term>
-      <listitem>
-       <para>This is never thrown by the server, it shouldn't be used other than to indicate a range. Specifically error codes greater than this value, but lesser than Zookeeper::APIERROR, are system errors.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.runtimeinconsistency">
-      <term><constant>Zookeeper::RUNTIMEINCONSISTENCY</constant></term>
-      <listitem>
-       <para>A runtime inconsistency was found.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.datainconsistency">
-      <term><constant>Zookeeper::DATAINCONSISTENCY</constant></term>
-      <listitem>
-       <para>A data inconsistency was found.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.connectionloss">
-      <term><constant>Zookeeper::CONNECTIONLOSS</constant></term>
-      <listitem>
-       <para>Connection to the server has been lost.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.marshallingerror">
-      <term><constant>Zookeeper::MARSHALLINGERROR</constant></term>
-      <listitem>
-       <para>Error while marshalling or unmarshalling data.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.unimplemented">
-      <term><constant>Zookeeper::UNIMPLEMENTED</constant></term>
-      <listitem>
-       <para>Operation is unimplemented.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.operationtimeout">
-      <term><constant>Zookeeper::OPERATIONTIMEOUT</constant></term>
-      <listitem>
-       <para>Operation timeout.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.badarguments">
-      <term><constant>Zookeeper::BADARGUMENTS</constant></term>
-      <listitem>
-       <para>Invalid arguments.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.invalidstate">
-      <term><constant>Zookeeper::INVALIDSTATE</constant></term>
-      <listitem>
-       <para>Invalid zhandle state.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.newconfignoquorum">
-      <term><constant>Zookeeper::NEWCONFIGNOQUORUM</constant></term>
-      <listitem>
-       <para>No quorum of new config is connected and up-to-date with the leader of last committed config - try invoking reconfiguration after new servers are connected and synced.</para>
-       <para>Available as of ZooKeeper 3.5.0</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.reconfiginprogress">
-      <term><constant>Zookeeper::RECONFIGINPROGRESS</constant></term>
-      <listitem>
-       <para>Reconfiguration requested while another reconfiguration is currently in progress. This is currently not supported. Please retry.</para>
-       <para>Available as of ZooKeeper 3.5.0</para>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-<!-- {{{ Constants API Errors -->
-   <section xml:id="zookeeper.constants.api-errors">
-    <title><acronym>ZooKeeper</acronym> API Errors</title>
-    <variablelist>
-     <varlistentry xml:id="zookeeper.constants.ok">
-      <term><constant>Zookeeper::OK</constant></term>
-      <listitem>
-       <para>Everything is OK.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.apierror">
-      <term><constant>Zookeeper::APIERROR</constant></term>
-      <listitem>
-       <para>This is never thrown by the server, it shouldn't be used other than to indicate a range. Specifically error codes greater than this value are API errors (while values less than this indicate a Zookeeper::SYSTEMERROR).</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.nonode">
-      <term><constant>Zookeeper::NONODE</constant></term>
-      <listitem>
-       <para>Node does not exist.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.noauth">
-      <term><constant>Zookeeper::NOAUTH</constant></term>
-      <listitem>
-       <para>Not authenticated.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.badversion">
-      <term><constant>Zookeeper::BADVERSION</constant></term>
-      <listitem>
-       <para>Version conflict.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.nochildrenforephemerals">
-      <term><constant>Zookeeper::NOCHILDRENFOREPHEMERALS</constant></term>
-      <listitem>
-       <para>Ephemeral nodes may not have children.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.nodeexists">
-      <term><constant>Zookeeper::NODEEXISTS</constant></term>
-      <listitem>
-       <para>The node already exists.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.notempty">
-      <term><constant>Zookeeper::NOTEMPTY</constant></term>
-      <listitem>
-       <para>The node has children.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.sessionexpired">
-      <term><constant>Zookeeper::SESSIONEXPIRED</constant></term>
-      <listitem>
-       <para>The session has been expired by the server.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.invalidcallback">
-      <term><constant>Zookeeper::INVALIDCALLBACK</constant></term>
-      <listitem>
-       <para>Invalid callback specified.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.invalidacl">
-      <term><constant>Zookeeper::INVALIDACL</constant></term>
-      <listitem>
-       <para>Invalid ACL specified.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.authfailed">
-      <term><constant>Zookeeper::AUTHFAILED</constant></term>
-      <listitem>
-       <para>Client authentication failed.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.closing">
-      <term><constant>Zookeeper::CLOSING</constant></term>
-      <listitem>
-       <para>ZooKeeper is closing.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.nothing">
-      <term><constant>Zookeeper::NOTHING</constant></term>
-      <listitem>
-       <para>(not error) No server responses to process.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.sessionmoved">
-      <term><constant>Zookeeper::SESSIONMOVED</constant></term>
-      <listitem>
-       <para>Session moved to another server, so operation is ignored.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.notreadonly">
-      <term><constant>Zookeeper::NOTREADONLY</constant></term>
-      <listitem>
-       <para>State-changing request is passed to read-only server.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.ephemeralonlocalsession">
-      <term><constant>Zookeeper::EPHEMERALONLOCALSESSION</constant></term>
-      <listitem>
-       <para>Attempt to create ephemeral node on a local session.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.nowatcher">
-      <term><constant>Zookeeper::NOWATCHER</constant></term>
-      <listitem>
-       <para>The watcher couldn't be found.</para>
-      </listitem>
-     </varlistentry>
-     <varlistentry xml:id="zookeeper.constants.reconfigdisabled">
-      <term><constant>Zookeeper::RECONFIGDISABLED</constant></term>
-      <listitem>
-       <para>Attempts to perform a reconfiguration operation when reconfiguration feature is disabled.</para>
-      </listitem>
-     </varlistentry>
-    </variablelist>
-   </section>
-<!-- }}} -->
-
-  </section>
-
-<!-- }}} -->
- 
- </partintro>
- 
- &reference.zookeeper.entities.zookeeper;
- 
-</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/zookeeper/zookeeper/addauth.xml b/reference/zookeeper/zookeeper/addauth.xml
deleted file mode 100644
index b28095692632..000000000000
--- a/reference/zookeeper/zookeeper/addauth.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.addauth" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::addAuth</refname>
-  <refpurpose>Specify application credentials</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::addAuth</methodname>
-   <methodparam><type>string</type><parameter>scheme</parameter></methodparam>
-   <methodparam><type>string</type><parameter>cert</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>completion_cb</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   The application calls this function to specify its credentials for purposes of authentication. The server will use the security provider specified by the scheme parameter to authenticate the client connection. If the authentication request has failed:
-    - the server connection is dropped.
-    - the watcher is called with the ZOO_AUTH_FAILED_STATE value as the state parameter.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>scheme</parameter></term>
-    <listitem>
-     <para>
-      The id of authentication scheme. Natively supported: "digest" password-based authentication
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>cert</parameter></term>
-    <listitem>
-     <para>
-      Application credentials. The actual value depends on the scheme.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>completion_cb</parameter></term>
-    <listitem>
-     <para>
-      The routine to invoke when the request completes. One of the following result codes may be passed into the completion callback:
-      - ZOK operation completed successfully
-      - ZAUTHFAILED authentication failed
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or operation fails.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.addauth.example.basic">
-   <title><methodname>Zookeeper::addAuth</methodname> example</title>
-   <para>
-     Add auth before requesting node value.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$value = 'nodevalue';
-$zookeeper->set($path, $value);
-
-$zookeeper->addAuth('digest', 'user0:passwd0');
-$r = $zookeeper->get($path);
-if ($r)
-  echo $r;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-nodevalue
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::setAcl</methodname></member>
-   <member><methodname>Zookeeper::getAcl</methodname></member>
-   <member><link linkend="zookeeper.constants.states">ZooKeeper States</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/close.xml b/reference/zookeeper/zookeeper/close.xml
deleted file mode 100644
index b49f8c66da92..000000000000
--- a/reference/zookeeper/zookeeper/close.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.close" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::close</refname>
-  <refpurpose>Close the zookeeper handle and free up any resources</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>void</type><methodname>Zookeeper::close</methodname>
-   <void />
-  </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;
-  <simpara>
-   This method emits <classname>ZookeeperException</classname> and its derivatives when closing an uninitialized instance.
-  </simpara>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/connect.xml b/reference/zookeeper/zookeeper/connect.xml
deleted file mode 100644
index 3d5881b84359..000000000000
--- a/reference/zookeeper/zookeeper/connect.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.connect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::connect</refname>
-  <refpurpose>Create a handle used to communicate with zookeeper</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>void</type><methodname>Zookeeper::connect</methodname>
-   <methodparam><type>string</type><parameter>host</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>recv_timeout</parameter><initializer>10000</initializer></methodparam>
-  </methodsynopsis>
-
-  <para>
-   This method creates a new handle and a zookeeper session that corresponds to that handle. Session establishment is asynchronous, meaning that the session should not be considered established until (and unless) an event of state ZOO_CONNECTED_STATE is received.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      Comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002"
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      The global watcher callback function. When notifications are triggered this function will be invoked.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recv_timeout</parameter></term>
-    <listitem>
-     <para>
-      The timeout for this session, only valid if the connection is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or could not init instance.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/construct.xml b/reference/zookeeper/zookeeper/construct.xml
deleted file mode 100644
index 98aa2a1cac93..000000000000
--- a/reference/zookeeper/zookeeper/construct.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::__construct</refname>
-  <refpurpose>Create a handle to used communicate with zookeeper</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <constructorsynopsis role="oop">
-   <modifier>public</modifier>
-   <methodname>Zookeeper::__construct</methodname>
-   <methodparam choice="opt"><type>string</type><parameter>host</parameter><initializer>''</initializer></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>recv_timeout</parameter><initializer>10000</initializer></methodparam>
-  </constructorsynopsis>
-  <para>
-   This method creates a new handle and a zookeeper session that corresponds to that handle. Session establishment is asynchronous, meaning that the session should not be considered established until (and unless) an event of state ZOO_CONNECTED_STATE is received.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>host</parameter></term>
-    <listitem>
-     <para>
-      comma separated host:port pairs, each corresponding to a zk server. e.g. "127.0.0.1:3000,127.0.0.1:3001,127.0.0.1:3002"
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      the global watcher callback function. When notifications are triggered this function will be invoked.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>recv_timeout</parameter></term>
-    <listitem>
-     <para>
-      the timeout for this session, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE).
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or could not init instance.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/create.xml b/reference/zookeeper/zookeeper/create.xml
deleted file mode 100644
index 8918f1e89fbd..000000000000
--- a/reference/zookeeper/zookeeper/create.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.create" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::create</refname>
-  <refpurpose>Create a node synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>string</type><methodname>Zookeeper::create</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam><type>array</type><parameter>acls</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>flags</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
-  <para>
-   This method will create a node in ZooKeeper. A node can only be created if it does not already exists. The Create Flags affect the creation of nodes. If ZOO_EPHEMERAL flag is set, the node will automatically get removed if the client session goes away. If the ZOO_SEQUENCE flag is set, a unique monotonically increasing sequence number is appended to the path name.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The data to be stored in the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>acls</parameter></term>
-    <listitem>
-     <para>
-      The initial ACL of the node. The ACL must not be null or empty.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>flags</parameter></term>
-    <listitem>
-     <para>
-      this parameter can be set to 0 for normal create or an OR of the Create Flags
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the path of the new node (this might be different than the supplied path because of the ZOO_SEQUENCE flag) on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to create node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.create.example.basic">
-   <title><methodname>Zookeeper::create</methodname> example</title>
-   <para>
-     Create a new node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$aclArray = array(
-  array(
-    'perms'  => Zookeeper::PERM_ALL,
-    'scheme' => 'world',
-    'id'     => 'anyone',
-  )
-);
-$path = '/path/to/newnode';
-$realPath = $zookeeper->create($path, null, $aclArray);
-if ($realPath)
-  echo $realPath;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-/path/to/newnode
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::delete</methodname></member>
-   <member><methodname>Zookeeper::getChildren</methodname></member>
-   <member><link linkend="zookeeper.constants.perms">ZooKeeper Permissions</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/delete.xml b/reference/zookeeper/zookeeper/delete.xml
deleted file mode 100644
index 1640ad57e9f6..000000000000
--- a/reference/zookeeper/zookeeper/delete.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.delete" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::delete</refname>
-  <refpurpose>Delete a node in zookeeper synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::delete</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>version</parameter><initializer>-1</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the node. The function will fail if the actual version of the node does not match the expected version. If -1 is used the version check will not take place.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to delete node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.delete.example.basic">
-   <title><methodname>Zookeeper::delete</methodname> example</title>
-   <para>
-     Delete an existing node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$r = $zookeeper->delete($path);
-if ($r)
-  echo 'SUCCESS';
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-SUCCESS
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::getChildren</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/exists.xml b/reference/zookeeper/zookeeper/exists.xml
deleted file mode 100644
index f5a655138932..000000000000
--- a/reference/zookeeper/zookeeper/exists.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.exists" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::exists</refname>
-  <refpurpose>Checks the existence of a node in zookeeper synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>array</type><methodname>Zookeeper::exists</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      if nonzero, a watch will be set at the server to notify the client if the node changes. The watch will be set even if the node does not
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the value of stat for the path if the given node exists, otherwise false.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to check the existence of a node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.exists.example.basic">
-   <title><methodname>Zookeeper::exists</methodname> example</title>
-   <para>
-     Check the existence of a node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$r = $zookeeper->exists($path);
-if ($r)
-  echo 'EXISTS';
-else
-  echo 'N/A or ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-EXISTS
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::get</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/get.xml b/reference/zookeeper/zookeeper/get.xml
deleted file mode 100644
index 5d5616eb6c95..000000000000
--- a/reference/zookeeper/zookeeper/get.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::get</refname>
-  <refpurpose>Gets the data associated with a node synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>string</type><methodname>Zookeeper::get</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>max_size</parameter><initializer>0</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      If nonzero, a watch will be set at the server to notify the client if the node changes.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>max_size</parameter></term>
-    <listitem>
-     <para>
-      Max size of the data. If 0 is used, this method will return the whole data.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the data on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to get value from node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.get.example.basic">
-   <title><methodname>Zookeeper::get</methodname> example</title>
-   <para>
-     Get value from node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$value = 'nodevalue';
-$zookeeper->set($path, $value);
-
-$r = $zookeeper->get($path);
-if ($r)
-  echo $r;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-nodevalue
-]]>
-   </screen>
-  </example>
-
-  <example xml:id="zookeeper.get.example.stat">
-   <title><methodname>Zookeeper::get</methodname> stat example</title>
-   <para>
-     Get node stat info.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$stat = [];
-$zookeeper->get($path, null, $stat);
-var_dump($stat);
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(11) {
-  ["czxid"]=>
-  float(0)
-  ["mzxid"]=>
-  float(0)
-  ["ctime"]=>
-  float(0)
-  ["mtime"]=>
-  float(0)
-  ["version"]=>
-  int(0)
-  ["cversion"]=>
-  int(-2)
-  ["aversion"]=>
-  int(0)
-  ["ephemeralOwner"]=>
-  float(0)
-  ["dataLength"]=>
-  int(0)
-  ["numChildren"]=>
-  int(2)
-  ["pzxid"]=>
-  float(0)
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::set</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/getacl.xml b/reference/zookeeper/zookeeper/getacl.xml
deleted file mode 100644
index e9b614393762..000000000000
--- a/reference/zookeeper/zookeeper/getacl.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getacl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getAcl</refname>
-  <refpurpose>Gets the acl associated with a node synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>array</type><methodname>Zookeeper::getAcl</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Return acl array on success and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to get ACL of a node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.getacl.example.basic">
-   <title><methodname>Zookeeper::getAcl</methodname> example</title>
-   <para>
-     Get ACL of a node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$aclArray = array(
-  array(
-    'perms'  => Zookeeper::PERM_ALL,
-    'scheme' => 'world',
-    'id'     => 'anyone',
-  )
-);
-$path = '/path/to/newnode';
-$zookeeper->setAcl($path, $aclArray);
-
-$r = $zookeeper->getAcl($path);
-if ($r)
-  var_dump($r);
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(3) {
-    ["perms"]=>
-    int(31)
-    ["scheme"]=>
-    string(5) "world"
-    ["id"]=>
-    string(6) "anyone"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::setAcl</methodname></member>
-   <member><link linkend="zookeeper.constants.perms">ZooKeeper Permissions</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/getchildren.xml b/reference/zookeeper/zookeeper/getchildren.xml
deleted file mode 100644
index 3a88fd1641a0..000000000000
--- a/reference/zookeeper/zookeeper/getchildren.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getchildren" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getChildren</refname>
-  <refpurpose>Lists the children of a node synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>array</type><methodname>Zookeeper::getChildren</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      If nonzero, a watch will be set at the server to notify the client if the node changes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns an array with children paths on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to list children of a node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.getchildren.example.basic">
-   <title><methodname>Zookeeper::getChildren</methodname> example</title>
-   <para>
-     Lists children of a node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/zookeeper';
-$r = $zookeeper->getchildren($path);
-
-if ($r) {
-    var_dump($r);
-} else {
-    echo 'ERR';
-}
-
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  string(6) "config"
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::delete</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/getclientid.xml b/reference/zookeeper/zookeeper/getclientid.xml
deleted file mode 100644
index 3972ef6aefd7..000000000000
--- a/reference/zookeeper/zookeeper/getclientid.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getclientid" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getClientId</refname>
-  <refpurpose>Return the client session id, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE)</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>int</type><methodname>Zookeeper::getClientId</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the client session id on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when it could not get client session id.
-  </para>
-  <caution>
-    <para>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </para>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><methodname>Zookeeper::getState</methodname></member>
-   <member><link linkend="zookeeper.constants.states">ZooKeeper States</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/getconfig.xml b/reference/zookeeper/zookeeper/getconfig.xml
deleted file mode 100644
index a9ed2c8fa570..000000000000
--- a/reference/zookeeper/zookeeper/getconfig.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getconfig" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getConfig</refname>
-  <refpurpose>Get instance of ZookeeperConfig</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>ZookeeperConfig</type><methodname>Zookeeper::getConfig</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns instance of <classname>ZookeeperConfig</classname>.
-  </para>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><classname>ZookeeperConfig</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/zookeeper/zookeeper/getrecvtimeout.xml b/reference/zookeeper/zookeeper/getrecvtimeout.xml
deleted file mode 100644
index 11f45fe130fe..000000000000
--- a/reference/zookeeper/zookeeper/getrecvtimeout.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getrecvtimeout" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getRecvTimeout</refname>
-  <refpurpose>Return the timeout for this session, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE). This value may change after a server re-connect</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>int</type><methodname>Zookeeper::getRecvTimeout</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the timeout for this session on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when operation fails.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/getstate.xml b/reference/zookeeper/zookeeper/getstate.xml
deleted file mode 100644
index 94234acac5cb..000000000000
--- a/reference/zookeeper/zookeeper/getstate.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.getstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::getState</refname>
-  <refpurpose>Get the state of the zookeeper connection</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>int</type><methodname>Zookeeper::getState</methodname>
-   <void />
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the state of zookeeper connection on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when it fails to get state of zookeeper connection.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><methodname>Zookeeper::getClientId</methodname></member>
-   <member><link linkend="zookeeper.constants.states">ZooKeeper States</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/isrecoverable.xml b/reference/zookeeper/zookeeper/isrecoverable.xml
deleted file mode 100644
index 5a1984b9a7c8..000000000000
--- a/reference/zookeeper/zookeeper/isrecoverable.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.isrecoverable" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::isRecoverable</refname>
-  <refpurpose>Checks if the current zookeeper connection state can be recovered</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::isRecoverable</methodname>
-   <void />
-  </methodsynopsis>
-  <para>
-   The application must close the handle and try to reconnect.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  &no.function.parameters;
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns true/false on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when operation fails.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><methodname>Zookeeper::getClientId</methodname></member>
-   <member><link linkend="zookeeper.constants.states">ZooKeeper States</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/set.xml b/reference/zookeeper/zookeeper/set.xml
deleted file mode 100644
index 9b103f2a9308..000000000000
--- a/reference/zookeeper/zookeeper/set.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::set</refname>
-  <refpurpose>Sets the data associated with a node</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::set</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>string</type><parameter>value</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>version</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>value</parameter></term>
-    <listitem>
-     <para>
-      The data to be stored in the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the node. The function will fail if the actual version of the node does not match the expected version. If -1 is used the version check will not take place.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to save value to node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.set.example.basic">
-   <title><methodname>Zookeeper::set</methodname> example</title>
-   <para>
-     Save value to node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$path = '/path/to/node';
-$value = 'nodevalue';
-$r = $zookeeper->set($path, $value);
-if ($r)
-  echo 'SUCCESS';
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-SUCCESS
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::get</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/setacl.xml b/reference/zookeeper/zookeeper/setacl.xml
deleted file mode 100644
index a8864d223881..000000000000
--- a/reference/zookeeper/zookeeper/setacl.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.setacl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::setAcl</refname>
-  <refpurpose>Sets the acl associated with a node synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::setAcl</methodname>
-   <methodparam><type>string</type><parameter>path</parameter></methodparam>
-   <methodparam><type>int</type><parameter>version</parameter></methodparam>
-   <methodparam><type>array</type><parameter>acl</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>path</parameter></term>
-    <listitem>
-     <para>
-      The name of the node. Expressed as a file name with slashes separating ancestors of the node.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the path.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>acl</parameter></term>
-    <listitem>
-     <para>
-      The acl to be set on the path.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to set ACL for a node.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.setacl.example.basic">
-   <title><methodname>Zookeeper::setAcl</methodname> example</title>
-   <para>
-     Set ACL for a node.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zookeeper = new Zookeeper('localhost:2181');
-$aclArray = array(
-  array(
-    'perms'  => Zookeeper::PERM_ALL,
-    'scheme' => 'world',
-    'id'     => 'anyone',
-  )
-);
-$path = '/path/to/newnode';
-$zookeeper->setAcl($path, $aclArray);
-
-$r = $zookeeper->getAcl($path);
-if ($r)
-  var_dump($r);
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-array(1) {
-  [0]=>
-  array(3) {
-    ["perms"]=>
-    int(31)
-    ["scheme"]=>
-    string(5) "world"
-    ["id"]=>
-    string(6) "anyone"
-  }
-}
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::create</methodname></member>
-   <member><methodname>Zookeeper::getAcl</methodname></member>
-   <member><link linkend="zookeeper.constants.perms">ZooKeeper Permissions</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/setdebuglevel.xml b/reference/zookeeper/zookeeper/setdebuglevel.xml
deleted file mode 100644
index c3feca4533a6..000000000000
--- a/reference/zookeeper/zookeeper/setdebuglevel.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.setdebuglevel" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::setDebugLevel</refname>
-  <refpurpose>Sets the debugging level for the library</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>bool</type><methodname>Zookeeper::setDebugLevel</methodname>
-   <methodparam><type>int</type><parameter>logLevel</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>logLevel</parameter></term>
-    <listitem>
-     <para>
-      ZooKeeper log level constants.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to set debug level.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeper.setdebuglevel.example.basic">
-   <title><methodname>Zookeeper::setDebugLevel</methodname> example</title>
-   <para>
-     Set debugl level.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$r = Zookeeper::setDebugLevel(Zookeeper::LOG_LEVEL_WARN);
-if ($r)
-  echo 'SUCCESS';
-else
-  echo 'ERR';
-?>
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-SUCCESS
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><link linkend="zookeeper.constants.log-levels">ZooKeeper Log Levels</link></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/setdeterministicconnorder.xml b/reference/zookeeper/zookeeper/setdeterministicconnorder.xml
deleted file mode 100644
index 75424e7357f2..000000000000
--- a/reference/zookeeper/zookeeper/setdeterministicconnorder.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.setdeterministicconnorder" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::setDeterministicConnOrder</refname>
-  <refpurpose>Enable/disable quorum endpoint order randomization</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <modifier>static</modifier>
-   <type>bool</type><methodname>Zookeeper::setDeterministicConnOrder</methodname>
-   <methodparam><type>bool</type><parameter>yesOrNo</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   If passed a true value, will make the client connect to quorum peers in the order as specified in the zookeeper_init() call. A false value causes zookeeper_init() to permute the peer endpoints which is good for more even client connection distribution among the quorum peers.
-   ZooKeeper C Client uses false by default.
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>yesOrNo</parameter></term>
-    <listitem>
-     <para>
-      Disable/enable quorum endpoint order randomization.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or operation fails.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::__construct</methodname></member>
-   <member><methodname>Zookeeper::connect</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/setlogstream.xml b/reference/zookeeper/zookeeper/setlogstream.xml
deleted file mode 100644
index 40981d708774..000000000000
--- a/reference/zookeeper/zookeeper/setlogstream.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.setlogstream" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::setLogStream</refname>
-  <refpurpose>Sets the stream to be used by the library for logging</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::setLogStream</methodname>
-   <methodparam><type>resource</type><parameter>stream</parameter></methodparam>
-  </methodsynopsis>
-  <para>
-   The zookeeper library uses stderr as its default log stream. Application must make sure the stream is writable. Passing in NULL resets the stream to its default value (stderr).
-  </para>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>stream</parameter></term>
-    <listitem>
-     <para>
-      The stream to be used by the library for logging.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or operation fails.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::setDebugLevel</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeper/setwatcher.xml b/reference/zookeeper/zookeeper/setwatcher.xml
deleted file mode 100644
index 84bb849bd633..000000000000
--- a/reference/zookeeper/zookeeper/setwatcher.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeper.setwatcher" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>Zookeeper::setWatcher</refname>
-  <refpurpose>Set a watcher function</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>bool</type><methodname>Zookeeper::setWatcher</methodname>
-   <methodparam><type>callable</type><parameter>watcher_cb</parameter></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      A watch will be set at the server to notify the client if the node changes.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.success;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <para>
-   This method emits PHP error/warning when parameters count or types are wrong or fail to set watcher.
-  </para>
-  <caution>
-    <simpara>
-      Since version 0.3.0, this method emits <classname>ZookeeperException</classname> and its derivatives.
-    </simpara>
-  </caution>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>Zookeeper::exists</methodname></member>
-   <member><methodname>Zookeeper::get</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeperauthenticationexception.xml b/reference/zookeeper/zookeeperauthenticationexception.xml
deleted file mode 100644
index 7a4f3e6aaa60..000000000000
--- a/reference/zookeeper/zookeeperauthenticationexception.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeperauthenticationexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperAuthenticationException class</title>
- <titleabbrev>ZookeeperAuthenticationException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeperauthenticationexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper authentication exception handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeperauthenticationexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperAuthenticationException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperAuthenticationException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeeperconfig.xml b/reference/zookeeper/zookeeperconfig.xml
deleted file mode 100644
index 152b128e5dd2..000000000000
--- a/reference/zookeeper/zookeeperconfig.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeperconfig"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperConfig class</title>
- <titleabbrev>ZookeeperConfig</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeperconfig.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper Config handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeperconfig.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperConfig</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperConfig</classname>
-     </ooclass>
-    </classsynopsisinfo>
-<!-- }}} -->
-
-<!-- {{{ Class methods -->
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.zookeeperconfig')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])"/>
-<!-- }}} -->
-
-   </classsynopsis>
-<!-- }}} -->
-
-  </section>
-
- </partintro>
-
- &reference.zookeeper.entities.zookeeperconfig;
-
-</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/zookeeper/zookeeperconfig/add.xml b/reference/zookeeper/zookeeperconfig/add.xml
deleted file mode 100644
index 18ac63bc1800..000000000000
--- a/reference/zookeeper/zookeeperconfig/add.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeperconfig.add" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZookeeperConfig::add</refname>
-  <refpurpose>Add servers to the ensemble</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>void</type><methodname>ZookeeperConfig::add</methodname>
-   <methodparam><type>string</type><parameter>members</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>version</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>members</parameter></term>
-    <listitem>
-     <para>
-      Comma separated list of servers to be added to the ensemble. Each has a configuration line for a server to be added (as would appear in a
- configuration file), only for maj. quorums.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the node. The function will fail if the actual version of the node does not match the expected version. If -1 is used the version check will not take place.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   This method emits <classname>ZookeeperException</classname> and its derivatives when parameters count or types are wrong or fail to save value to node.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeperconfig.add.example.basic">
-   <title><methodname>ZookeeperConfig::add</methodname> example</title>
-   <para>
-     Add members.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Zookeeper();
-$client->connect('localhost:2181');
-$client->addAuth('digest', 'timandes:timandes');
-$zkConfig = $client->getConfig();
-$zkConfig->set("server.1=localhost:2888:3888:participant;0.0.0.0:2181");
-$zkConfig->add("server.2=localhost:2889:3889:participant;0.0.0.0:2182");
-$r = $zkConfig->get();
-if ($r)
-  echo $r;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-server.1=localhost:2888:3888:participant;0.0.0.0:2181
-server.2=localhost:2889:3889:participant;0.0.0.0:2182
-version=0xca01e881a2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>ZookeeperConfig::get</methodname></member>
-   <member><methodname>ZookeeperConfig::set</methodname></member>
-   <member><methodname>ZookeeperConfig::remove</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeperconfig/get.xml b/reference/zookeeper/zookeeperconfig/get.xml
deleted file mode 100644
index f736dc6cbf0f..000000000000
--- a/reference/zookeeper/zookeeperconfig/get.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeperconfig.get" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZookeeperConfig::get</refname>
-  <refpurpose>Gets the last committed configuration of the ZooKeeper cluster as it is known to the server to which the client is connected, synchronously</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>string</type><methodname>ZookeeperConfig::get</methodname>
-   <methodparam choice="opt"><type>callable</type><parameter>watcher_cb</parameter><initializer>&null;</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>watcher_cb</parameter></term>
-    <listitem>
-     <para>
-      If nonzero, a watch will be set at the server to notify the client if the node changes.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   Returns the configuration string on success, and false on failure.
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   This method emits <classname>ZookeeperException</classname> and its derivatives when parameters count or types are wrong or fail to get configuration.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeperconfig.get.example.basic">
-   <title><methodname>ZookeeperConfig::get</methodname> example</title>
-   <para>
-     Get configuration.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$zk = new Zookeeper();
-$zk->connect('localhost:2181');
-$zk->addAuth('digest', 'timandes:timandes');
-$zkConfig = $zk->getConfig();
-$r = $zkConfig->get();
-if ($r)
-  echo $r;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-server.1=localhost:2888:3888:participant;0.0.0.0:2181
-version=0xca01e881a2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>ZookeeperConfig::set</methodname></member>
-   <member><methodname>ZookeeperConfig::add</methodname></member>
-   <member><methodname>ZookeeperConfig::remove</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeperconfig/remove.xml b/reference/zookeeper/zookeeperconfig/remove.xml
deleted file mode 100644
index e2564daf1eb3..000000000000
--- a/reference/zookeeper/zookeeperconfig/remove.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeperconfig.remove" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZookeeperConfig::remove</refname>
-  <refpurpose>Remove servers from the ensemble</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>void</type><methodname>ZookeeperConfig::remove</methodname>
-   <methodparam><type>string</type><parameter>id_list</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>version</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>id_list</parameter></term>
-    <listitem>
-     <para>
-      Comma separated list of server IDs to be removed from the ensemble. Each has an id of a server to be removed, only for maj. quorums.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the node. The function will fail if the actual version of the node does not match the expected version. If -1 is used the version check will not take place.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   This method emits <classname>ZookeeperException</classname> and its derivatives when parameters count or types are wrong or fail to save value to node.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeperconfig.remove.example.basic">
-   <title><methodname>ZookeeperConfig::remove</methodname> example</title>
-   <para>
-     Remove members.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Zookeeper();
-$client->connect('localhost:2181');
-$client->addAuth('digest', 'timandes:timandes');
-$zkConfig = $client->getConfig();
-$zkConfig->set("server.1=localhost:2888:3888:participant;0.0.0.0:2181,server.2=localhost:2889:3889:participant;0.0.0.0:2182");
-$zkConfig->remove("2");
-echo $zkConfig->get();
-if ($r)
-  echo $r;
-else
-  echo 'ERR';
-?>
-]]>
-   </programlisting>
-   &example.outputs;
-   <screen>
-<![CDATA[
-server.1=localhost:2888:3888:participant;0.0.0.0:2181
-version=0xca01e881a2
-]]>
-   </screen>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>ZookeeperConfig::get</methodname></member>
-   <member><methodname>ZookeeperConfig::add</methodname></member>
-   <member><methodname>ZookeeperConfig::set</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeperconfig/set.xml b/reference/zookeeper/zookeeperconfig/set.xml
deleted file mode 100644
index e09eeaf8acba..000000000000
--- a/reference/zookeeper/zookeeperconfig/set.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<refentry xml:id="zookeeperconfig.set" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
- <refnamediv>
-  <refname>ZookeeperConfig::set</refname>
-  <refpurpose>Change ZK cluster ensemble membership and roles of ensemble peers</refpurpose>
- </refnamediv>
-
- <refsect1 role="description">
-  &reftitle.description;
-  <methodsynopsis role="oop">
-   <modifier>public</modifier>
-   <type>void</type><methodname>ZookeeperConfig::set</methodname>
-   <methodparam><type>string</type><parameter>members</parameter></methodparam>
-   <methodparam choice="opt"><type>int</type><parameter>version</parameter><initializer>-1</initializer></methodparam>
-   <methodparam choice="opt"><type>array</type><parameter role="reference">stat</parameter><initializer>&null;</initializer></methodparam>
-  </methodsynopsis>
- </refsect1>
-
- <refsect1 role="parameters">
-  &reftitle.parameters;
-  <variablelist>
-   <varlistentry>
-    <term><parameter>members</parameter></term>
-    <listitem>
-     <para>
-      Comma separated list of new membership (e.g., contents of a membership configuration file) - for use only with a non-incremental reconfiguration.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>version</parameter></term>
-    <listitem>
-     <para>
-      The expected version of the node. The function will fail if the actual version of the node does not match the expected version. If -1 is used the version check will not take place.
-     </para>
-    </listitem>
-   </varlistentry>
-   <varlistentry>
-    <term><parameter>stat</parameter></term>
-    <listitem>
-     <para>
-      If not NULL, will hold the value of stat for the path on return.
-     </para>
-    </listitem>
-   </varlistentry>
-  </variablelist>
- </refsect1>
-
- <refsect1 role="returnvalues">
-  &reftitle.returnvalues;
-  <para>
-   &return.void;
-  </para>
- </refsect1>
-
- <refsect1 role="errors">
-  &reftitle.errors;
-  <simpara>
-   This method emits <classname>ZookeeperException</classname> and its derivatives when parameters count or types are wrong or fail to save value to node.
-  </simpara>
- </refsect1>
-
- <refsect1 role="examples">
-  &reftitle.examples;
-  <example xml:id="zookeeperconfig.set.example.basic">
-   <title><methodname>ZookeeperConfig::set</methodname> example</title>
-   <para>
-     Reconfig.
-   </para>
-   <programlisting role="php">
-<![CDATA[
-<?php
-$client = new Zookeeper();
-$client->connect('localhost:2181');
-$client->addAuth('digest', 'timandes:timandes');
-$zkConfig = $client->getConfig();
-$zkConfig->set("server.1=localhost:2888:3888:participant;0.0.0.0:2181");
-?>
-]]>
-   </programlisting>
-  </example>
- </refsect1>
-
- <refsect1 role="seealso">
-  &reftitle.seealso;
-  <simplelist>
-   <member><methodname>ZookeeperConfig::get</methodname></member>
-   <member><methodname>ZookeeperConfig::add</methodname></member>
-   <member><methodname>ZookeeperConfig::remove</methodname></member>
-   <member><classname>ZookeeperException</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/zookeeper/zookeeperconnectionexception.xml b/reference/zookeeper/zookeeperconnectionexception.xml
deleted file mode 100644
index ad72686a22e4..000000000000
--- a/reference/zookeeper/zookeeperconnectionexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeperconnectionexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperConnectionException class</title>
- <titleabbrev>ZookeeperConnectionException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeperconnectionexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper connection exception handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeperconnectionexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperConnectionException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperConnectionException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeeperexception.xml b/reference/zookeeper/zookeeperexception.xml
deleted file mode 100644
index df657076bdd8..000000000000
--- a/reference/zookeeper/zookeeperexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeperexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperException class</title>
- <titleabbrev>ZookeeperException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeperexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper exception handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeperexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>Exception</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeepermarshallingexception.xml b/reference/zookeeper/zookeepermarshallingexception.xml
deleted file mode 100644
index 8eb8816f8c5c..000000000000
--- a/reference/zookeeper/zookeepermarshallingexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeepermarshallingexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperMarshallingException class</title>
- <titleabbrev>ZookeeperMarshallingException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeepermarshallingexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper exception (while marshalling or unmarshalling data) handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeepermarshallingexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperMarshallingException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperMarshallingException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeepernonodeexception.xml b/reference/zookeeper/zookeepernonodeexception.xml
deleted file mode 100644
index eade14e4cfbb..000000000000
--- a/reference/zookeeper/zookeepernonodeexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeepernonodeexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperNoNodeException class</title>
- <titleabbrev>ZookeeperNoNodeException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeepernonodeexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper exception (when node does not exist) handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeepernonodeexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperNoNodeException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperNoNodeException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeeperoperationtimeoutexception.xml b/reference/zookeeper/zookeeperoperationtimeoutexception.xml
deleted file mode 100644
index f7421e26f321..000000000000
--- a/reference/zookeeper/zookeeperoperationtimeoutexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeeperoperationtimeoutexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperOperationTimeoutException class</title>
- <titleabbrev>ZookeeperOperationTimeoutException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeeperoperationtimeoutexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper operation timeout exception handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeeperoperationtimeoutexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperOperationTimeoutException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperOperationTimeoutException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/zookeeper/zookeepersessionexception.xml b/reference/zookeeper/zookeepersessionexception.xml
deleted file mode 100644
index a41274735807..000000000000
--- a/reference/zookeeper/zookeepersessionexception.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision$ -->
-
-<reference xml:id="class.zookeepersessionexception"
- role="class"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://docbook.org/ns/docbook">
- <title>The ZookeeperSessionException class</title>
- <titleabbrev>ZookeeperSessionException</titleabbrev>
- 
- <partintro>
- 
-<!-- {{{ Zookeeper intro -->
-  <section xml:id="zookeepersessionexception.intro">
-   &reftitle.intro;
-   <para>
-    The ZooKeeper session exception handling class.
-   </para>
-  </section>
-<!-- }}} -->
- 
-  <section xml:id="zookeepersessionexception.synopsis">
-   &reftitle.classsynopsis;
- 
-<!-- {{{ Synopsis -->
-   <classsynopsis>
-    <ooclass><classname>ZookeeperSessionException</classname></ooclass>
- 
-<!-- {{{ Class synopsis -->
-    <classsynopsisinfo>
-     <ooclass>
-      <classname>ZookeeperSessionException</classname>
-     </ooclass>
-     <ooclass>
-      <modifier>extends</modifier>
-      <classname>ZookeeperException</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.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
-   </classsynopsis>
-
-<!-- }}} -->
-
-  </section>
-
- </partintro>
- 
-</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/security/database.xml b/security/database.xml
index eb0b3dafb6d1..bc2af8e30ed2 100644
--- a/security/database.xml
+++ b/security/database.xml
@@ -336,8 +336,8 @@ $result = mssql_query($query);
       <literal>mssql</literal> extension, which was
       <link linkend="migration70.removed-exts-sapis">removed in PHP 7.0.0</link>.
       It is used here only to illustrate the attack; current code connecting
-      to MSSQL Server should use the <link linkend="book.sqlsrv">sqlsrv</link> or
-      <link linkend="ref.pdo-sqlsrv">pdo_sqlsrv</link> extensions instead.
+      to MSSQL Server should use the <link xlink:href="../extensions/book.sqlsrv.php">sqlsrv</link> or
+      <link xlink:href="../extensions/ref.pdo-sqlsrv.php">pdo_sqlsrv</link> extensions instead.
      </simpara>
     </note>
     <note>